Skip to content

Commit 6666d35

Browse files
committed
Migrate CIAM tests to use Key Vault-based GetCIAMUserAsync method
- Added GetCIAMUserAsync() method in LabUserHelper using Key Vault secrets - Updated all 4 CIAM integration tests to use new method instead of direct API calls - Verified all tests pass with Key Vault cached data - Improves reliability by removing dependency on msidlab.com API calls
1 parent a4d6dfd commit 6666d35

File tree

3 files changed

+9
-36
lines changed

3 files changed

+9
-36
lines changed

tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/CiamIntegrationTests.cs

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ public async Task ROPC_Ciam_StandardDomains_CompletesSuccessfully()
3232
{
3333
string authority;
3434
//Get lab details
35-
var labResponse = await LabUserHelper.GetLabUserDataAsync(new UserQuery()
36-
{
37-
FederationProvider = FederationProvider.CIAMCUD,
38-
SignInAudience = SignInAudience.AzureAdMyOrg
39-
}).ConfigureAwait(false);
35+
var labResponse = await LabUserHelper.GetCIAMUserAsync().ConfigureAwait(false);
4036

4137
//https://tenantName.ciamlogin.com/
4238
authority = string.Format("https://{0}.ciamlogin.com/", labResponse.User.LabName);
@@ -89,11 +85,7 @@ public async Task ClientCredentialCiam_WithClientCredentials_ReturnsValidTokens(
8985
{
9086
string authority;
9187
//Get lab details
92-
var labResponse = await LabUserHelper.GetLabUserDataAsync(new UserQuery()
93-
{
94-
FederationProvider = FederationProvider.CIAMCUD,
95-
SignInAudience = SignInAudience.AzureAdMyOrg
96-
}).ConfigureAwait(false);
88+
var labResponse = await LabUserHelper.GetCIAMUserAsync().ConfigureAwait(false);
9789

9890

9991
//https://tenantName.ciamlogin.com/
@@ -158,11 +150,7 @@ public async Task OBOCiam_CustomDomain_ReturnsValidTokens()
158150
string ciamWebApi = "634de702-3173-4a71-b336-a4fab786a479";
159151

160152
//Get lab details
161-
LabResponse labResponse = await LabUserHelper.GetLabUserDataAsync(new UserQuery()
162-
{
163-
FederationProvider = FederationProvider.CIAMCUD,
164-
SignInAudience = SignInAudience.AzureAdMyOrg
165-
}).ConfigureAwait(false);
153+
LabResponse labResponse = await LabUserHelper.GetCIAMUserAsync().ConfigureAwait(false);
166154

167155
//Acquire tokens
168156
var msalPublicClient = PublicClientApplicationBuilder
@@ -220,11 +208,7 @@ public async Task OBOCiam_CustomDomain_ReturnsValidTokens()
220208
public async Task WithOidcAuthority_ValidatesIssuerSuccessfully()
221209
{
222210
//Get lab details
223-
var labResponse = await LabUserHelper.GetLabUserDataAsync(new UserQuery()
224-
{
225-
FederationProvider = FederationProvider.CIAMCUD,
226-
SignInAudience = SignInAudience.AzureAdMyOrg
227-
}).ConfigureAwait(false);
211+
var labResponse = await LabUserHelper.GetCIAMUserAsync().ConfigureAwait(false);
228212

229213
//Test with standard and CUD CIAM authorities
230214
string[] authorities =

tests/Microsoft.Identity.Test.Integration.netcore/SeleniumTests/InteractiveFlowTests.NetFwk.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,6 @@ public async Task Arlington_Interactive_AADAsync()
5656
await RunTestForUserAsync(labResponse, false).ConfigureAwait(false);
5757
}
5858

59-
//[RunOn(TargetFrameworks.NetCore)]
60-
//[TestCategory(TestCategories.MSA)]
61-
// Disabled as this test is flaky. This will be reenabled as part of https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/5240
62-
public async Task Interactive_MsaUser_Async()
63-
{
64-
// Arrange
65-
LabResponse labResponse = await LabUserHelper.GetMsaUserAsync().ConfigureAwait(false);
66-
await RunTestForUserAsync(labResponse).ConfigureAwait(false);
67-
}
68-
6959
[RunOn(TargetFrameworks.NetCore)]
7060
public async Task InteractiveConsentPromptAsync()
7161
{

tests/Microsoft.Identity.Test.LabInfrastructure/LabUserHelper.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,6 @@ public static Task<LabResponse> GetDefaultAdfsUserAsync()
166166
return MergeKVLabDataAsync("MSAL-USER-FedDefault-JSON", "ID4SLAB1", "MSAL-App-Default-JSON");
167167
}
168168

169-
public static Task<LabResponse> GetMsaUserAsync()
170-
{
171-
return GetLabUserDataAsync(UserQuery.MsaUserQuery);
172-
}
173-
174169
public static Task<LabResponse> GetHybridSpaAccontAsync()
175170
{
176171
return MergeKVLabDataAsync("MSAL-User-Default-JSON", "ID4SLAB1", "MSAL-App-Default-JSON");
@@ -194,7 +189,11 @@ public static Task<LabResponse> GetArlingtonADFSUserAsync()
194189
response.Result.User.AzureEnvironment = AzureEnvironment.azureusgovernment;
195190
return response;
196191
}
197-
192+
public static Task<LabResponse> GetCIAMUserAsync()
193+
{
194+
return MergeKVLabDataAsync("MSAL-User-CIAM-JSON", "MSIDLABCIAM6", "MSAL-App-CIAM-JSON");
195+
}
196+
198197
public static Task<LabResponse> GetAdfsUserAsync(FederationProvider federationProvider, bool federated = true)
199198
{
200199
var query = new UserQuery()

0 commit comments

Comments
 (0)