Skip to content

Commit 8648fa2

Browse files
Avery-DunnAvery-Dunn
committed
Remove ID Lab API code, rename classes/methods for better clarity, add more comments
1 parent a8a8073 commit 8648fa2

27 files changed

Lines changed: 254 additions & 848 deletions

‎msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/AcquireTokenInteractiveIT.java‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -38,55 +38,56 @@ public void startBrowser() {
3838

3939
@Test
4040
void acquireTokenInteractive_ManagedUser() {
41-
LabResponse labResponse = LabUserHelper.getDefaultUserMultiTenantAppPublicClient();
42-
LabUser user = labResponse.getUser();
41+
LabResponse labResponse = LabConfigHelper.getMultiTenantAppPublicClientConfig();
42+
UserConfig user = labResponse.getUser();
4343

4444
assertAcquireTokenCommon(user, labResponse.getApp().getAppId(), labResponse.getApp().getAuthority()+ "common", TestConstants.GRAPH_DEFAULT_SCOPE);
4545
}
4646

4747
@Test
4848
void acquireTokenInteractive_Arlington() {
49-
LabResponse labResponse = LabUserHelper.getArlingtonUser();
50-
LabUser user = labResponse.getUser();
49+
LabResponse labResponse = LabConfigHelper.getArlingtonConfig();
50+
UserConfig user = labResponse.getUser();
5151

5252
assertAcquireTokenCommon(user, labResponse.getApp().getAppId(), labResponse.getApp().getAuthority()+ "common", TestConstants.GRAPH_DEFAULT_SCOPE);
5353
}
5454

5555
@Test()
5656
@DisabledIfSystemProperty(named = "adfs.disabled", matches = "true")
5757
void acquireTokenInteractive_ADFSv2022() {
58-
LabResponse labResponse = LabUserHelper.getDefaultAdfsUser();
58+
LabResponse labResponse = LabConfigHelper.getAdfsConfig();
5959

60-
LabUser user = labResponse.getUser();
60+
UserConfig user = labResponse.getUser();
6161
assertAcquireTokenCommon(user, labResponse.getApp().getAppId(), labResponse.getApp().getAuthority() + "organizations/", TestConstants.ADFS_SCOPE);
6262
}
6363

6464
@Test
6565
void acquireTokenWithAuthorizationCode_B2C_Local() {
66-
LabResponse labResponse = LabUserHelper.getB2CLocalAccount();
67-
LabUser user = labResponse.getUser();
68-
assertAcquireTokenB2C(user, TestConstants.B2C_AUTHORITY);
66+
LabResponse labResponse = LabConfigHelper.getB2CConfig();
67+
UserConfig user = labResponse.getUser();
68+
assertAcquireTokenB2C(user, TestConstants.B2C_AUTHORITY, labResponse.getApp().getAppId());
6969
}
7070

7171
@Test
7272
void acquireTokenWithAuthorizationCode_B2C_LegacyFormat() {
73-
LabResponse labResponse = LabUserHelper.getB2CLocalAccount();
74-
LabUser user = labResponse.getUser();
75-
assertAcquireTokenB2C(user, TestConstants.B2C_AUTHORITY_LEGACY_FORMAT);
73+
LabResponse labResponse = LabConfigHelper.getB2CConfig();
74+
UserConfig user = labResponse.getUser();
75+
assertAcquireTokenB2C(user, TestConstants.B2C_AUTHORITY_LEGACY_FORMAT, labResponse.getApp().getAppId());
7676
}
7777

7878
@Test
7979
void acquireTokenInteractive_ManagedUser_InstanceAware() {
80-
LabResponse labResponse = LabUserHelper.getArlingtonUser();
81-
LabUser user = labResponse.getUser();
80+
LabResponse labResponse = LabConfigHelper.getArlingtonConfig();
81+
UserConfig user = labResponse.getUser();
82+
8283
assertAcquireTokenInstanceAware(user, labResponse.getApp().getAppId(), labResponse.getLab().getTenantId());
8384
}
8485

8586
@Test
8687
void acquireTokenInteractive_Ciam() {
87-
LabResponse labResponse = LabUserHelper.getCiamCudUser();
88-
LabUser user = labResponse.getUser();
89-
LabApp app = labResponse.getApp();
88+
LabResponse labResponse = LabConfigHelper.getCiamConfig();
89+
UserConfig user = labResponse.getUser();
90+
AppConfig app = labResponse.getApp();
9091

9192
Map<String, String> extraQueryParameters = new HashMap<>();
9293

@@ -128,7 +129,7 @@ void acquireTokenInteractive_Ciam() {
128129
assertEquals(user.getUpn(), result.account().username());
129130
}
130131

131-
private void assertAcquireTokenCommon(LabUser user, String appId, String authority, String scope) {
132+
private void assertAcquireTokenCommon(UserConfig user, String appId, String authority, String scope) {
132133
PublicClientApplication pca = IntegrationTestHelper.createPublicApp(appId, authority);
133134

134135
IAuthenticationResult result = acquireTokenInteractive(
@@ -140,23 +141,23 @@ private void assertAcquireTokenCommon(LabUser user, String appId, String authori
140141
assertEquals(user.getUpn(), result.account().username());
141142
}
142143

143-
private void assertAcquireTokenB2C(LabUser user, String authority) {
144+
private void assertAcquireTokenB2C(UserConfig user, String authority, String appId) {
144145

145146
PublicClientApplication pca;
146147
try {
147148
pca = PublicClientApplication.builder(
148-
user.getAppId()).
149+
appId).
149150
b2cAuthority(authority + TestConstants.B2C_SIGN_IN_POLICY).
150151
build();
151152
} catch (MalformedURLException ex) {
152153
throw new RuntimeException(ex.getMessage());
153154
}
154155

155-
IAuthenticationResult result = acquireTokenInteractive(user, pca, user.getAppId());
156+
IAuthenticationResult result = acquireTokenInteractive(user, pca, appId);
156157
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
157158
}
158159

159-
private void assertAcquireTokenInstanceAware(LabUser user, String appId, String tenantId) {
160+
private void assertAcquireTokenInstanceAware(UserConfig user, String appId, String tenantId) {
160161
PublicClientApplication pca = IntegrationTestHelper.createPublicApp(appId, TestConstants.MICROSOFT_AUTHORITY_HOST + tenantId);
161162

162163
IAuthenticationResult result = acquireTokenInteractive_instanceAware(user, pca, TestConstants.GRAPH_DEFAULT_SCOPE);
@@ -188,7 +189,7 @@ private IAuthenticationResult acquireTokenSilently(IPublicClientApplication pca,
188189
}
189190

190191
private IAuthenticationResult acquireTokenInteractive(
191-
LabUser user,
192+
UserConfig user,
192193
PublicClientApplication pca,
193194
String scope) {
194195

@@ -218,7 +219,7 @@ private IAuthenticationResult acquireTokenInteractive(
218219
}
219220

220221
private IAuthenticationResult acquireTokenInteractive_instanceAware(
221-
LabUser user,
222+
UserConfig user,
222223
PublicClientApplication pca,
223224
String scope) {
224225

@@ -249,10 +250,10 @@ private IAuthenticationResult acquireTokenInteractive_instanceAware(
249250

250251
class SeleniumOpenBrowserAction implements OpenBrowserAction {
251252

252-
private LabUser user;
253+
private UserConfig user;
253254
private PublicClientApplication pca;
254255

255-
SeleniumOpenBrowserAction(LabUser user, PublicClientApplication pca) {
256+
SeleniumOpenBrowserAction(UserConfig user, PublicClientApplication pca) {
256257
this.user = user;
257258
this.pca = pca;
258259
}

‎msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/AcquireTokenSilentIT.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ void acquireTokenSilent_OrganizationAuthority_TokenRefreshed() throws Exception
3434
@Test
3535
void acquireTokenSilent_LabAuthority_TokenNotRefreshed() throws Exception {
3636
// Access token should be returned from cache, and not using refresh token
37-
LabResponse labResponse = LabUserHelper.getDefaultUser();
38-
LabUser user = labResponse.getUser();
37+
LabResponse labResponse = LabConfigHelper.getDefaultConfig();
38+
UserConfig user = labResponse.getUser();
3939

4040
PublicClientApplication pca = PublicClientApplication.builder(
4141
labResponse.getApp().getAppId()).
@@ -57,8 +57,8 @@ void acquireTokenSilent_LabAuthority_TokenNotRefreshed() throws Exception {
5757

5858
@Test
5959
void acquireTokenSilent_ForceRefresh() throws Exception {
60-
LabResponse labResponse = LabUserHelper.getDefaultUser();
61-
LabUser user = labResponse.getUser();
60+
LabResponse labResponse = LabConfigHelper.getDefaultConfig();
61+
UserConfig user = labResponse.getUser();
6262

6363
PublicClientApplication pca = PublicClientApplication.builder(
6464
labResponse.getApp().getAppId()).
@@ -80,16 +80,16 @@ void acquireTokenSilent_ForceRefresh() throws Exception {
8080

8181
@Test
8282
void acquireTokenSilent_usingOrganizationsAuthority_returnCachedAt() throws Exception {
83-
LabResponse labResponse = LabUserHelper.getDefaultUser();
84-
LabUser user = labResponse.getUser();
83+
LabResponse labResponse = LabConfigHelper.getDefaultConfig();
84+
UserConfig user = labResponse.getUser();
8585

8686
acquireTokenSilent_returnCachedTokens(labResponse.getApp().getAppId(), TestConstants.ORGANIZATIONS_AUTHORITY, user);
8787
}
8888

8989
@Test
9090
void acquireTokenSilent_usingTenantSpecificAuthority_returnCachedAt() throws Exception {
91-
LabResponse labResponse = LabUserHelper.getDefaultUser();
92-
LabUser user = labResponse.getUser();
91+
LabResponse labResponse = LabConfigHelper.getDefaultConfig();
92+
UserConfig user = labResponse.getUser();
9393

9494
acquireTokenSilent_returnCachedTokens(labResponse.getApp().getAppId(), TestConstants.MICROSOFT_AUTHORITY_HOST + labResponse.getUser().getTenantId(), user);
9595
}
@@ -144,8 +144,8 @@ void acquireTokenSilent_ConfidentialClient_acquireTokenSilentDifferentScopeThrow
144144

145145
@Test
146146
void acquireTokenSilent_WithRefreshOn() throws Exception {
147-
LabResponse labResponse = LabUserHelper.getDefaultUser();
148-
LabUser user = labResponse.getUser();
147+
LabResponse labResponse = LabConfigHelper.getDefaultConfig();
148+
UserConfig user = labResponse.getUser();
149149

150150
PublicClientApplication pca = PublicClientApplication.builder(
151151
labResponse.getApp().getAppId()).
@@ -189,8 +189,8 @@ void acquireTokenSilent_WithRefreshOn() throws Exception {
189189

190190
@Test
191191
void acquireTokenSilent_TenantAsParameter() throws Exception {
192-
LabResponse labResponse = LabUserHelper.getDefaultUser();
193-
LabUser user = labResponse.getUser();
192+
LabResponse labResponse = LabConfigHelper.getDefaultConfig();
193+
UserConfig user = labResponse.getUser();
194194

195195
PublicClientApplication pca = PublicClientApplication.builder(
196196
labResponse.getApp().getAppId()).
@@ -219,8 +219,8 @@ void acquireTokenSilent_TenantAsParameter() throws Exception {
219219

220220
@Test
221221
void acquireTokenSilent_emptyStringScope() throws Exception {
222-
LabResponse labResponse = LabUserHelper.getDefaultUser();
223-
LabUser user = labResponse.getUser();
222+
LabResponse labResponse = LabConfigHelper.getDefaultConfig();
223+
UserConfig user = labResponse.getUser();
224224

225225
PublicClientApplication pca = PublicClientApplication.builder(
226226
labResponse.getApp().getAppId()).
@@ -239,8 +239,8 @@ void acquireTokenSilent_emptyStringScope() throws Exception {
239239

240240
@Test
241241
void acquireTokenSilent_emptyScopeSet() throws Exception {
242-
LabResponse labResponse = LabUserHelper.getDefaultUser();
243-
LabUser user = labResponse.getUser();
242+
LabResponse labResponse = LabConfigHelper.getDefaultConfig();
243+
UserConfig user = labResponse.getUser();
244244

245245
Set<String> scopes = new HashSet<>();
246246
PublicClientApplication pca = PublicClientApplication.builder(
@@ -268,8 +268,8 @@ void acquireTokenSilent_emptyScopeSet() throws Exception {
268268

269269
@Test
270270
public void acquireTokenSilent_ClaimsForceRefresh() throws Exception {
271-
LabResponse labResponse = LabUserHelper.getDefaultUser();
272-
LabUser user = labResponse.getUser();
271+
LabResponse labResponse = LabConfigHelper.getDefaultConfig();
272+
UserConfig user = labResponse.getUser();
273273

274274
Set<String> scopes = new HashSet<>();
275275
PublicClientApplication pca = PublicClientApplication.builder(
@@ -320,7 +320,7 @@ private IConfidentialClientApplication getConfidentialClientApplications() throw
320320
build();
321321
}
322322

323-
private void acquireTokenSilent_returnCachedTokens(String appId, String authority, LabUser user) throws Exception {
323+
private void acquireTokenSilent_returnCachedTokens(String appId, String authority, UserConfig user) throws Exception {
324324

325325
PublicClientApplication pca = PublicClientApplication.builder(
326326
appId).
@@ -343,8 +343,8 @@ private void acquireTokenSilent_returnCachedTokens(String appId, String authorit
343343

344344
private IPublicClientApplication getPublicClientApplicationWithTokensInCache()
345345
throws Exception {
346-
LabResponse labResponse = LabUserHelper.getDefaultUser();
347-
LabUser user = labResponse.getUser();
346+
LabResponse labResponse = LabConfigHelper.getDefaultConfig();
347+
UserConfig user = labResponse.getUser();
348348

349349
PublicClientApplication pca = PublicClientApplication.builder(
350350
labResponse.getApp().getAppId()).
@@ -363,7 +363,7 @@ private IAuthenticationResult acquireTokenSilently(IPublicClientApplication pca,
363363
.get();
364364
}
365365

366-
private IAuthenticationResult acquireTokenUsernamePassword(LabUser user, IPublicClientApplication pca, String scope) throws InterruptedException, ExecutionException {
366+
private IAuthenticationResult acquireTokenUsernamePassword(UserConfig user, IPublicClientApplication pca, String scope) throws InterruptedException, ExecutionException {
367367
Map<String, String> map = new HashMap<>();
368368
map.put("test","test");
369369
return pca.acquireToken(UserNamePasswordParameters.

‎msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/AuthorizationCodeIT.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,26 @@ public void startBrowser() {
3939

4040
@Test
4141
public void acquireTokenWithAuthorizationCode_ManagedUser() {
42-
LabResponse labResponse = LabUserHelper.getDefaultUserMultiTenantAppPublicClient();
43-
LabUser user = labResponse.getUser();
42+
LabResponse labResponse = LabConfigHelper.getMultiTenantAppPublicClientConfig();
43+
UserConfig user = labResponse.getUser();
4444

4545
assertAcquireTokenAAD(user, labResponse.getApp().getAppId(), null);
4646
}
4747

4848
@Test
4949
public void acquireTokenWithAuthorizationCode_B2C_Local() {
50-
LabResponse labResponse = LabUserHelper.getB2CLocalAccount();
51-
LabUser user = labResponse.getUser();
50+
LabResponse labResponse = LabConfigHelper.getDefaultConfig();
51+
UserConfig user = labResponse.getUser();
5252
assertAcquireTokenB2C(user);
5353
}
5454

5555
@Test
5656
public void acquireTokenWithAuthorizationCode_CiamCud() throws Exception {
5757
String authorityCud = "https://login.msidlabsciam.com/fe362aec-5d43-45d1-b730-9755e60dc3b9/v2.0/";
5858

59-
LabResponse labResponse = LabUserHelper.getCiamCudUser();
60-
LabUser user = labResponse.getUser();
61-
LabApp app = labResponse.getApp();
59+
LabResponse labResponse = LabConfigHelper.getCiamConfig();
60+
UserConfig user = labResponse.getUser();
61+
AppConfig app = labResponse.getApp();
6262

6363
PublicClientApplication pca = PublicClientApplication.builder(
6464
app.getAppId()).
@@ -90,13 +90,13 @@ public void acquireTokenWithAuthorizationCode_CiamCud() throws Exception {
9090
@Test
9191
@DisabledIfSystemProperty(named = "adfs.disabled", matches = "true")
9292
void acquireTokenWithAuthorizationCode_ADFSv2022() {
93-
LabResponse labResponse = LabUserHelper.getDefaultAdfsUser();
93+
LabResponse labResponse = LabConfigHelper.getAdfsConfig();
9494

95-
LabUser user = labResponse.getUser();
95+
UserConfig user = labResponse.getUser();
9696
assertAcquireTokenADFS(user, labResponse.getApp().getAppId(), labResponse.getApp().getAuthority() + "organizations/");
9797
}
9898

99-
private void assertAcquireTokenADFS(LabUser user, String appId, String authority) {
99+
private void assertAcquireTokenADFS(UserConfig user, String appId, String authority) {
100100
PublicClientApplication pca;
101101
try {
102102
pca = PublicClientApplication.builder(
@@ -117,7 +117,7 @@ private void assertAcquireTokenADFS(LabUser user, String appId, String authority
117117
assertEquals(user.getUpn(), result.account().username());
118118
}
119119

120-
private void assertAcquireTokenAAD(LabUser user, String appId, Map<String, Set<String>> parameters) {
120+
private void assertAcquireTokenAAD(UserConfig user, String appId, Map<String, Set<String>> parameters) {
121121

122122
PublicClientApplication pca = IntegrationTestHelper.createPublicApp(appId, TestConstants.COMMON_AUTHORITY);
123123

@@ -131,7 +131,7 @@ private void assertAcquireTokenAAD(LabUser user, String appId, Map<String, Set<S
131131
assertEquals(user.getUpn(), result.account().username());
132132
}
133133

134-
private void assertAcquireTokenB2C(LabUser user) {
134+
private void assertAcquireTokenB2C(UserConfig user) {
135135

136136
String appId = KeyVaultRegistry.getMsidLabProvider().getSecretByName(TestConstants.B2C_CONFIDENTIAL_CLIENT_LAB_APP_ID).getValue();
137137
String appSecret = KeyVaultRegistry.getMsidLabProvider().getSecretByName(TestConstants.B2C_CONFIDENTIAL_CLIENT_APP_SECRETID).getValue();
@@ -192,7 +192,7 @@ private IAuthenticationResult acquireTokenInteractiveB2C(ConfidentialClientAppli
192192
}
193193

194194
private String acquireAuthorizationCodeAutomated(
195-
LabUser user,
195+
UserConfig user,
196196
AbstractClientApplicationBase app,
197197
Map<String, Set<String>> parameters) {
198198

‎msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/AzureEnvironmentIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ class AzureEnvironmentIT {
1515

1616
@Test
1717
void acquireTokenWithUsernamePassword_AzureGovernment() throws Exception {
18-
LabResponse labResponse = LabUserHelper.getArlingtonUser();
19-
LabUser user = labResponse.getUser();
20-
LabApp app = labResponse.getApp();
18+
LabResponse labResponse = LabConfigHelper.getArlingtonConfig();
19+
UserConfig user = labResponse.getUser();
20+
AppConfig app = labResponse.getApp();
2121

2222
PublicClientApplication pca = PublicClientApplication.builder(
2323
app.getAppId()).

0 commit comments

Comments
 (0)