Skip to content

Refactor and simplify Microsoft.Identity.Test.LabInfrastructure #5631

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
Avery-Dunn merged 8 commits into from
Jan 9, 2026
Merged

Refactor and simplify Microsoft.Identity.Test.LabInfrastructure #5631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d8b23ad
Refactor and simplify Microsoft.Identity.Test.LabInfrastructure
Avery-Dunn Jan 5, 2026
fe462ea
Address PR feedback
Avery-Dunn Jan 6, 2026
8079e87
Fix test config
Avery-Dunn Jan 6, 2026
f6a18ed
Use correct app type in failing tests
Avery-Dunn Jan 6, 2026
b4a0579
Merge branch 'main' into avdunn/lab-migration
Avery-Dunn Jan 6, 2026
85e4b35
Remove commented-out test
Avery-Dunn Jan 6, 2026
2462f65
Merge branch 'avdunn/lab-migration' of https://github.com/AzureAD/mic…
Avery-Dunn Jan 6, 2026
6148046
Merge branch 'main' into avdunn/lab-migration
Avery-Dunn Jan 7, 2026
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
11 changes: 6 additions & 5 deletions tests/CacheCompat/CommonCache.Test.Unit/CacheExecutionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ public class CacheExecutionTests

private static async Task<LabUserData> GetPublicAadUserDataAsync()
{
var labUser = await LabUserHelper.GetDefaultUserAsync().ConfigureAwait(false);
var user = await LabResponseHelper.GetUserConfigAsync(KeyVaultSecrets.UserPublicCloud).ConfigureAwait(false);
var app = await LabResponseHelper.GetAppConfigAsync(KeyVaultSecrets.AppPCAClient).ConfigureAwait(false);
return new LabUserData(
labUser.User.Upn,
labUser.User.GetOrFetchPassword(),
labUser.App.AppId,
labUser.User.TenantId);
user.Upn,
user.GetOrFetchPassword(),
app.AppId,
user.TenantId);
}

[AssemblyInitialize]
Expand Down
61 changes: 32 additions & 29 deletions tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/CiamIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,40 +32,41 @@ public async Task ROPC_Ciam_StandardDomains_CompletesSuccessfully()
{
string authority;
//Get lab details
var labResponse = await LabUserHelper.GetCIAMUserAsync().ConfigureAwait(false);
var user = await LabResponseHelper.GetUserConfigAsync(KeyVaultSecrets.UserCiam).ConfigureAwait(false);
var app = await LabResponseHelper.GetAppConfigAsync(KeyVaultSecrets.MsalAppCiam).ConfigureAwait(false);

//https://tenantName.ciamlogin.com/
authority = string.Format("https://{0}.ciamlogin.com/", labResponse.User.LabName);
await RunCiamRopcTest(authority, labResponse).ConfigureAwait(false);
authority = string.Format("https://{0}.ciamlogin.com/", user.LabName);
await RunCiamRopcTest(authority, user, app).ConfigureAwait(false);

//https://tenantName.ciamlogin.com/tenantName.onmicrosoft.com
authority = string.Format("https://{0}.ciamlogin.com/{1}.onmicrosoft.com", labResponse.User.LabName, labResponse.User.LabName);
await RunCiamRopcTest(authority, labResponse).ConfigureAwait(false);
authority = string.Format("https://{0}.ciamlogin.com/{1}.onmicrosoft.com", user.LabName, user.LabName);
await RunCiamRopcTest(authority, user, app).ConfigureAwait(false);

//https://tenantName.ciamlogin.com/tenantGuid
authority = string.Format("https://{0}.ciamlogin.com/{1}", labResponse.User.LabName, labResponse.Lab.TenantId);
await RunCiamRopcTest(authority, labResponse).ConfigureAwait(false);
authority = string.Format("https://{0}.ciamlogin.com/{1}", user.LabName, user.TenantId);
await RunCiamRopcTest(authority, user, app).ConfigureAwait(false);
}

private async Task RunCiamRopcTest(string authority, LabResponse labResponse)
private async Task RunCiamRopcTest(string authority, UserConfig user, AppConfig app)
{
//Acquire tokens
var msalPublicClient = PublicClientApplicationBuilder
.Create(labResponse.App.AppId)
.Create(app.AppId)
.WithAuthority(new Uri(authority), false)
.WithRedirectUri(_ciamRedirectUri)
.Build();

#pragma warning disable CS0618 // Type or member is obsolete
var result = await msalPublicClient
.AcquireTokenByUsernamePassword(_ciamScopes, labResponse.User.Upn, labResponse.User.GetOrFetchPassword())
.AcquireTokenByUsernamePassword(_ciamScopes, user.Upn, user.GetOrFetchPassword())
.ExecuteAsync()
.ConfigureAwait(false);
#pragma warning restore CS0618

Assert.IsNotNull(result.AccessToken);
Assert.AreEqual(TokenSource.IdentityProvider, result.AuthenticationResultMetadata.TokenSource);
Assert.AreEqual($"{labResponse.User.LabName}{Constants.CiamAuthorityHostSuffix}".ToLower(), result.Account.Environment);
Assert.AreEqual($"{user.LabName}{Constants.CiamAuthorityHostSuffix}".ToLower(), result.Account.Environment);

//Fetch cached tokens
var accounts = await msalPublicClient.GetAccountsAsync().ConfigureAwait(false);
Expand All @@ -77,28 +78,28 @@ private async Task RunCiamRopcTest(string authority, LabResponse labResponse)

Assert.IsNotNull(result.AccessToken);
Assert.AreEqual(TokenSource.Cache, result.AuthenticationResultMetadata.TokenSource);
Assert.AreEqual($"{labResponse.User.LabName}{Constants.CiamAuthorityHostSuffix}".ToLower(), result.Account.Environment);
Assert.AreEqual($"{user.LabName}{Constants.CiamAuthorityHostSuffix}".ToLower(), result.Account.Environment);
}

[TestMethod]
public async Task ClientCredentialCiam_WithClientCredentials_ReturnsValidTokens()
{
string authority;
//Get lab details
var labResponse = await LabUserHelper.GetCIAMUserAsync().ConfigureAwait(false);

var user = await LabResponseHelper.GetUserConfigAsync(KeyVaultSecrets.UserCiam).ConfigureAwait(false);
var app = await LabResponseHelper.GetAppConfigAsync(KeyVaultSecrets.MsalAppCiam).ConfigureAwait(false);

//https://tenantName.ciamlogin.com/
authority = string.Format("https://{0}.ciamlogin.com/", labResponse.User.LabName);
await RunCiamCCATest(authority, labResponse.App.AppId).ConfigureAwait(false);
authority = string.Format("https://{0}.ciamlogin.com/", user.LabName);
await RunCiamCCATest(authority, app.AppId).ConfigureAwait(false);

//https://tenantName.ciamlogin.com/tenantName.onmicrosoft.com
authority = string.Format("https://{0}.ciamlogin.com/{1}.onmicrosoft.com", labResponse.User.LabName, labResponse.User.LabName);
await RunCiamCCATest(authority, labResponse.App.AppId).ConfigureAwait(false);
authority = string.Format("https://{0}.ciamlogin.com/{1}.onmicrosoft.com", user.LabName, user.LabName);
await RunCiamCCATest(authority, app.AppId).ConfigureAwait(false);

//https://tenantName.ciamlogin.com/tenantGuid
authority = string.Format("https://{0}.ciamlogin.com/{1}", labResponse.User.LabName, labResponse.Lab.TenantId);
await RunCiamCCATest(authority, labResponse.App.AppId).ConfigureAwait(false);
authority = string.Format("https://{0}.ciamlogin.com/{1}", user.LabName, user.TenantId);
await RunCiamCCATest(authority, app.AppId).ConfigureAwait(false);

//Ciam CUD
authority = "https://login.msidlabsciam.com/fe362aec-5d43-45d1-b730-9755e60dc3b9/v2.0/";
Expand Down Expand Up @@ -150,18 +151,19 @@ public async Task OBOCiam_CustomDomain_ReturnsValidTokens()
string ciamWebApi = "634de702-3173-4a71-b336-a4fab786a479";

//Get lab details
LabResponse labResponse = await LabUserHelper.GetCIAMUserAsync().ConfigureAwait(false);
var user = await LabResponseHelper.GetUserConfigAsync(KeyVaultSecrets.UserCiam).ConfigureAwait(false);
var app = await LabResponseHelper.GetAppConfigAsync(KeyVaultSecrets.MsalAppCiam).ConfigureAwait(false);

//Acquire tokens
var msalPublicClient = PublicClientApplicationBuilder
.Create(labResponse.App.AppId)
.WithAuthority(labResponse.App.Authority, false)
.WithRedirectUri(labResponse.App.RedirectUri)
.Create(app.AppId)
.WithAuthority(app.Authority, false)
.WithRedirectUri(app.RedirectUri)
.Build();

#pragma warning disable CS0618 // Type or member is obsolete
var result = await msalPublicClient
.AcquireTokenByUsernamePassword(new[] { labResponse.App.DefaultScopes }, labResponse.User.Upn, labResponse.User.GetOrFetchPassword())
.AcquireTokenByUsernamePassword(new[] { app.DefaultScopes }, user.Upn, user.GetOrFetchPassword())
.ExecuteAsync()
.ConfigureAwait(false);
#pragma warning restore CS0618
Expand Down Expand Up @@ -208,18 +210,19 @@ public async Task OBOCiam_CustomDomain_ReturnsValidTokens()
public async Task WithOidcAuthority_ValidatesIssuerSuccessfully()
{
//Get lab details
var labResponse = await LabUserHelper.GetCIAMUserAsync().ConfigureAwait(false);
var user = await LabResponseHelper.GetUserConfigAsync(KeyVaultSecrets.UserCiam).ConfigureAwait(false);
var app = await LabResponseHelper.GetAppConfigAsync(KeyVaultSecrets.MsalAppCiam).ConfigureAwait(false);

//Test with standard and CUD CIAM authorities
string[] authorities =
{
string.Format("https://{0}.ciamlogin.com/{1}/v2.0/", labResponse.Lab.TenantId, labResponse.Lab.TenantId),
string.Format("https://login.msidlabsciam.com/{0}/v2.0/", labResponse.Lab.TenantId)
string.Format("https://{0}.ciamlogin.com/{1}/v2.0/", user.TenantId, user.TenantId),
string.Format("https://login.msidlabsciam.com/{0}/v2.0/", user.TenantId)
};

foreach (var authority in authorities)
{
await RunCiamCCATest(authority, labResponse.App.AppId, true).ConfigureAwait(false);
await RunCiamCCATest(authority, app.AppId, true).ConfigureAwait(false);
}
}

Expand Down
31 changes: 16 additions & 15 deletions ...icrosoft.Identity.Test.Integration.netcore/HeadlessTests/ClientCredentialsTests.NetFwk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,26 +223,27 @@ public async Task WithOnBeforeTokenRequest_TestAsync(Cloud cloud, TargetFramewor
public async Task ByRefreshTokenTestAsync()
{
// Arrange
var labResponse = await LabUserHelper.GetDefaultUserAsync().ConfigureAwait(false);
var user = await LabResponseHelper.GetUserConfigAsync(KeyVaultSecrets.UserPublicCloud).ConfigureAwait(false);
var app = await LabResponseHelper.GetAppConfigAsync(KeyVaultSecrets.AppPCAClient).ConfigureAwait(false);

var msalPublicClient = PublicClientApplicationBuilder
.Create(labResponse.App.AppId)
.Create(app.AppId)
.WithTestLogging()
.WithAuthority(labResponse.Lab.Authority, "organizations")
.WithAuthority(app.Authority, "organizations")
.BuildConcrete();

#pragma warning disable CS0618 // Type or member is obsolete
AuthenticationResult authResult = await msalPublicClient
.AcquireTokenByUsernamePassword(s_scopes, labResponse.User.Upn, labResponse.User.GetOrFetchPassword())
.AcquireTokenByUsernamePassword(s_scopes, user.Upn, user.GetOrFetchPassword())
.ExecuteAsync(CancellationToken.None)
.ConfigureAwait(false);
#pragma warning restore CS0618

var confidentialApp = ConfidentialClientApplicationBuilder
.Create(labResponse.App.AppId)
.WithAuthority(labResponse.Lab.Authority, labResponse.User.TenantId)
.WithTestLogging()
.BuildConcrete();
var confidentialApp = ConfidentialClientApplicationBuilder
.Create(app.AppId)
.WithAuthority(app.Authority, user.TenantId)
.WithTestLogging()
.BuildConcrete();

var rt = msalPublicClient.UserTokenCacheInternal.Accessor.GetAllRefreshTokens().FirstOrDefault();

Expand All @@ -262,12 +263,12 @@ public async Task ByRefreshTokenTestAsync()

// Assert
Assert.IsNotNull(authResult);
Assert.AreEqual(labResponse.User.Upn, authResult.Account.Username);
Assert.AreEqual(labResponse.User.ObjectId.ToString(), authResult.Account.HomeAccountId.ObjectId);
Assert.AreEqual(labResponse.User.TenantId, authResult.Account.HomeAccountId.TenantId);
Assert.AreEqual(labResponse.User.Upn, account2.Username);
Assert.AreEqual(labResponse.User.ObjectId.ToString(), account2.HomeAccountId.ObjectId);
Assert.AreEqual(labResponse.User.TenantId, account2.HomeAccountId.TenantId);
Assert.AreEqual(user.Upn, authResult.Account.Username);
Assert.AreEqual(user.ObjectId.ToString(), authResult.Account.HomeAccountId.ObjectId);
Assert.AreEqual(user.TenantId, authResult.Account.HomeAccountId.TenantId);
Assert.AreEqual(user.Upn, account2.Username);
Assert.AreEqual(user.ObjectId.ToString(), account2.HomeAccountId.ObjectId);
Assert.AreEqual(user.TenantId, account2.HomeAccountId.TenantId);
}

private static void ModifyRequest(OnBeforeTokenRequestData data, X509Certificate2 certificate)
Expand Down
22 changes: 11 additions & 11 deletions ...soft.Identity.Test.Integration.netcore/HeadlessTests/InstanceDiscoveryIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ public class InstanceDiscoveryIntegrationTests
[TestMethod]
public async Task AuthorityMigrationAsync()
{
LabResponse labResponse = await LabUserHelper.GetDefaultUserAsync().ConfigureAwait(false);
LabUser user = labResponse.User;
var user = await LabResponseHelper.GetUserConfigAsync(KeyVaultSecrets.UserPublicCloud).ConfigureAwait(false);
var app = await LabResponseHelper.GetAppConfigAsync(KeyVaultSecrets.AppPCAClient).ConfigureAwait(false);

IPublicClientApplication pca = PublicClientApplicationBuilder
.Create(labResponse.App.AppId)
.WithAuthority("https://login.windows.net/" + labResponse.Lab.TenantId + "/")
.Create(app.AppId)
.WithAuthority("https://login.windows.net/" + user.TenantId + "/")
.WithTestLogging()
.Build();

Expand All @@ -49,7 +49,7 @@ public async Task AuthorityMigrationAsync()
// BugBug https://identitydivision.visualstudio.com/Engineering/_workitems/edit/776308/
// sts.windows.net fails when doing instance discovery, e.g.:
// https://sts.windows.net/common/discovery/instance?api-version=1.1&authorization_endpoint=https%3A%2F%2Fsts.windows.net%2Ff645ad92-e38d-4d1a-b510-d1b09a74a8ca%2Foauth2%2Fv2.0%2Fauthorize
.WithTenantId(labResponse.Lab.TenantId)
.WithTenantId(user.TenantId)
.ExecuteAsync()
.ConfigureAwait(false);
#pragma warning restore CS0618
Expand All @@ -69,11 +69,11 @@ public async Task AuthorityMigrationAsync()
[TestMethod]
public async Task FailedAuthorityValidationTestAsync()
{
LabResponse labResponse = await LabUserHelper.GetDefaultUserWithMultiTenantAppAsync().ConfigureAwait(false);
LabUser user = labResponse.User;
var user = await LabResponseHelper.GetUserConfigAsync(KeyVaultSecrets.UserPublicCloud).ConfigureAwait(false);
var app = await LabResponseHelper.GetAppConfigAsync(KeyVaultSecrets.MsalAppAzureAdMultipleOrgs).ConfigureAwait(false);

IPublicClientApplication pca = PublicClientApplicationBuilder
.Create(labResponse.App.AppId)
.Create(app.AppId)
.WithAuthority("https://bogus.microsoft.com/common")
.WithTestLogging()
.Build();
Expand All @@ -97,11 +97,11 @@ public async Task FailedAuthorityValidationTestAsync()
[TestMethod]
public async Task AuthorityValidationTestWithFalseValidateAuthorityAsync()
{
LabResponse labResponse = await LabUserHelper.GetDefaultUserWithMultiTenantAppAsync().ConfigureAwait(false);
LabUser user = labResponse.User;
var user = await LabResponseHelper.GetUserConfigAsync(KeyVaultSecrets.UserPublicCloud).ConfigureAwait(false);
var app = await LabResponseHelper.GetAppConfigAsync(KeyVaultSecrets.MsalAppAzureAdMultipleOrgs).ConfigureAwait(false);

IPublicClientApplication pca = PublicClientApplicationBuilder
.Create(labResponse.App.AppId)
.Create(app.AppId)
.WithAuthority("https://bogus.microsoft.com/common", false)
.WithTestLogging()
.Build();
Expand Down
Loading