Skip to content

Add Object_Id support for Managed Identity #4215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gladjohn merged 9 commits into from
Jul 11, 2023
Merged

Add Object_Id support for Managed Identity #4215

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a8cc5b8
initial commit
GladwinJohnson Jul 7, 2023
280a7b1
Merge branch 'main' into gladjohn/mi_obj_id
gladjohn Jul 7, 2023
ec8c11b
Update ManagedIdentityTests.cs
gladjohn Jul 8, 2023
562e6c4
Merge branch 'main' into gladjohn/mi_obj_id
gladjohn Jul 10, 2023
5b4296c
pr comments
GladwinJohnson Jul 10, 2023
d2acd7f
Merge branch 'gladjohn/mi_obj_id' of https://github.com/AzureAD/micro…
GladwinJohnson Jul 10, 2023
7d0ece0
Merge branch 'main' into gladjohn/mi_obj_id
gladjohn Jul 10, 2023
c1330e7
pr comments
GladwinJohnson Jul 11, 2023
2c2e006
Merge branch 'gladjohn/mi_obj_id' of https://github.com/AzureAD/micro…
GladwinJohnson Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/Microsoft.Identity.Test.Common/Core/Mocks/MockHttpManagerExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,17 +350,17 @@ public static void AddManagedIdentityMockHandler(

if (userAssignedIdentityId == UserAssignedIdentityId.ClientId)
{
httpMessageHandler.ExpectedQueryParams.Add("client_id", userAssignedId);
httpMessageHandler.ExpectedQueryParams.Add(TestConstants.ManagedIdentityClientId, userAssignedId);
}

if (userAssignedIdentityId == UserAssignedIdentityId.ResourceId)
{
httpMessageHandler.ExpectedQueryParams.Add("mi_res_id", userAssignedId);
httpMessageHandler.ExpectedQueryParams.Add(TestConstants.ManagedIdentityResourceId, userAssignedId);
}

if (userAssignedIdentityId == UserAssignedIdentityId.ObjectId)
{
httpMessageHandler.ExpectedQueryParams.Add("object_id", userAssignedId);
httpMessageHandler.ExpectedQueryParams.Add(TestConstants.ManagedIdentityObjectId, userAssignedId);
}

httpMessageHandler.ResponseMessage = responseMessage;
Expand Down
4 changes: 4 additions & 0 deletions tests/Microsoft.Identity.Test.Common/TestConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,10 @@ public static IDictionary<string, string> ExtraQueryParameters
public const string MsalArlingtonCCAKeyVaultUri = "https://msidlabs.vault.azure.net:443/secrets/ARLMSIDLAB1-IDLASBS-App-CC-Secret";
public const string MsalArlingtonCCAKeyVaultSecretName = "ARLMSIDLAB1-IDLASBS-App-CC-Secret";

public const string ManagedIdentityClientId = "client_id";
public const string ManagedIdentityObjectId = "object_id";
public const string ManagedIdentityResourceId = "mi_res_id";

public enum AuthorityType { B2C };
public static string[] s_prodEnvAliases = new[] {
"login.microsoftonline.com",
Expand Down
18 changes: 3 additions & 15 deletions tests/Microsoft.Identity.Test.Unit/AppConfigTests/ManagedIdentityApplicationBuilderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,26 +85,14 @@ public void TestConstructor_WithCreateUserAssignedId()
[DataRow("resourceId", UserAssignedIdentityId.ResourceId)]
[DataRow("resourceId/subscription", UserAssignedIdentityId.ResourceId)]
[DataRow(TestConstants.ObjectId, UserAssignedIdentityId.ObjectId)]
public void TestConstructor_WithUserAssignedManagedIdentity_ResourceId(string userAssignedId, UserAssignedIdentityId userAssignedIdentityId)
public void TestConstructor_WithUserAssignedManagedIdentity(string userAssignedId, UserAssignedIdentityId userAssignedIdentityId)
{
ManagedIdentityApplication mi = CreateMIABuilder(userAssignedId, userAssignedIdentityId).BuildConcrete();

Assert.AreEqual(userAssignedId, mi.ServiceBundle.Config.ClientId);
Assert.IsNotNull(mi.ServiceBundle.Config.ManagedIdentityId);

if (userAssignedIdentityId == UserAssignedIdentityId.ClientId)
{
Assert.AreEqual(ManagedIdentityIdType.ClientId, mi.ServiceBundle.Config.ManagedIdentityId.IdType);
}
else if(userAssignedIdentityId == UserAssignedIdentityId.ResourceId)
{
Assert.AreEqual(ManagedIdentityIdType.ResourceId, mi.ServiceBundle.Config.ManagedIdentityId.IdType);
}
else
{
Assert.AreEqual(ManagedIdentityIdType.ObjectId, mi.ServiceBundle.Config.ManagedIdentityId.IdType);
}


Assert.AreEqual(userAssignedIdentityId.ToString(), mi.ServiceBundle.Config.ManagedIdentityId.IdType.ToString());
Assert.AreEqual(userAssignedId, mi.ServiceBundle.Config.ManagedIdentityId.UserAssignedId);
}

Expand Down