Skip to content

Lab Migration #1002

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

Open
wants to merge 12 commits into
base: dev
Choose a base branch
from
Open

Lab Migration #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2693f86
Working proof-of-concept
Avery-Dunn Nov 14, 2025
2774c9f
Non-working, removed all references to old test infrastructure classes
Avery-Dunn Nov 19, 2025
5ec7b2f
Non-working, removed ADFS 2019 and unnecessary Arlington tests
Avery-Dunn Nov 19, 2025
40a6b06
Working OBO, CIAM, MSA, and device code tests
Avery-Dunn Nov 19, 2025
0e87e7e
ADFS cleanup
Avery-Dunn Nov 20, 2025
d776f36
Refactor Selenium tests
Avery-Dunn Nov 20, 2025
b67c93e
Fix interactive, auth code, device code, and silent tests
Avery-Dunn Nov 21, 2025
a71e033
Use multi-tenant app in certain public client scenarios
Avery-Dunn Nov 21, 2025
4583a7d
Remove unused code, limit scopes, and restore final tests
Avery-Dunn Nov 24, 2025
e274837
Refactor and clean up new test infrastructure and existing Selenium h…
Avery-Dunn Nov 24, 2025
dde7260
Final cleanup, remove old labapi package and rename the new labapi2 p…
Avery-Dunn Nov 24, 2025
a8a8073
New dependencies are only for tests
Avery-Dunn Nov 24, 2025
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
12 changes: 12 additions & 0 deletions msal4j-sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,18 @@
<version>2.14.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-certificates</artifactId>
<version>4.5.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.10.0</version>
<scope>test</scope>
</dependency>
</dependencies>

<!-- force https -->
Expand Down
113 changes: 44 additions & 69 deletions msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/AcquireTokenInteractiveIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,14 @@

package com.microsoft.aad.msal4j;

import labapi.*;
import com.microsoft.aad.msal4j.labapi.*;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;

Expand All @@ -29,14 +26,6 @@
class AcquireTokenInteractiveIT extends SeleniumTest {
private static final Logger LOG = LoggerFactory.getLogger(AcquireTokenInteractiveIT.class);

private Config cfg;


@BeforeAll
public void setupUserProvider() {
setUpLapUserProvider();
}

@AfterEach
public void stopBrowser() {
cleanUp();
Expand All @@ -47,79 +36,65 @@ public void startBrowser() {
startUpBrowser();
}

@ParameterizedTest
@MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
void acquireTokenInteractive_ManagedUser(String environment) {
cfg = new Config(environment);
@Test
void acquireTokenInteractive_ManagedUser() {
LabResponse labResponse = LabUserHelper.getDefaultUserMultiTenantAppPublicClient();
LabUser user = labResponse.getUser();

User user = labUserProvider.getDefaultUser(cfg.azureEnvironment);
assertAcquireTokenCommon(user, cfg.commonAuthority(), cfg.graphDefaultScope());
assertAcquireTokenCommon(user, labResponse.getApp().getAppId(), labResponse.getApp().getAuthority()+ "common", TestConstants.GRAPH_DEFAULT_SCOPE);
}

@Test()
@DisabledIfSystemProperty(named = "adfs.disabled", matches = "true")
void acquireTokenInteractive_ADFSv2019_OnPrem() {
User user = labUserProvider.getOnPremAdfsUser(FederationProvider.ADFS_2019);
assertAcquireTokenCommon(user, TestConstants.ADFS_AUTHORITY, TestConstants.ADFS_SCOPE);
}

@ParameterizedTest
@MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
@DisabledIfSystemProperty(named = "adfs.disabled", matches = "true")
void acquireTokenInteractive_ADFSv2019_Federated(String environment) {
cfg = new Config(environment);
@Test
void acquireTokenInteractive_Arlington() {
LabResponse labResponse = LabUserHelper.getArlingtonUser();
LabUser user = labResponse.getUser();

User user = labUserProvider.getFederatedAdfsUser(cfg.azureEnvironment, FederationProvider.ADFS_2019);
assertAcquireTokenCommon(user, cfg.organizationsAuthority(), cfg.graphDefaultScope());
assertAcquireTokenCommon(user, labResponse.getApp().getAppId(), labResponse.getApp().getAuthority()+ "common", TestConstants.GRAPH_DEFAULT_SCOPE);
}

@ParameterizedTest
@MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
@Test()
@DisabledIfSystemProperty(named = "adfs.disabled", matches = "true")
void acquireTokenInteractive_ADFSv4_Federated(String environment) {
cfg = new Config(environment);
void acquireTokenInteractive_ADFSv2022() {
LabResponse labResponse = LabUserHelper.getDefaultAdfsUser();

User user = labUserProvider.getFederatedAdfsUser(cfg.azureEnvironment, FederationProvider.ADFS_4);
assertAcquireTokenCommon(user, cfg.organizationsAuthority(), cfg.graphDefaultScope());
LabUser user = labResponse.getUser();
assertAcquireTokenCommon(user, labResponse.getApp().getAppId(), labResponse.getApp().getAuthority() + "organizations/", TestConstants.ADFS_SCOPE);
}

@ParameterizedTest
@MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
void acquireTokenWithAuthorizationCode_B2C_Local(String environment) {
cfg = new Config(environment);

User user = labUserProvider.getB2cUser(cfg.azureEnvironment, B2CProvider.LOCAL);
@Test
void acquireTokenWithAuthorizationCode_B2C_Local() {
LabResponse labResponse = LabUserHelper.getB2CLocalAccount();
LabUser user = labResponse.getUser();
assertAcquireTokenB2C(user, TestConstants.B2C_AUTHORITY);
}

@ParameterizedTest
@MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
void acquireTokenWithAuthorizationCode_B2C_LegacyFormat(String environment) {
cfg = new Config(environment);

User user = labUserProvider.getB2cUser(cfg.azureEnvironment, B2CProvider.LOCAL);
@Test
void acquireTokenWithAuthorizationCode_B2C_LegacyFormat() {
LabResponse labResponse = LabUserHelper.getB2CLocalAccount();
LabUser user = labResponse.getUser();
assertAcquireTokenB2C(user, TestConstants.B2C_AUTHORITY_LEGACY_FORMAT);
}

@Test
void acquireTokenInteractive_ManagedUser_InstanceAware() {
cfg = new Config(AzureEnvironment.AZURE);

User user = labUserProvider.getDefaultUser(AzureEnvironment.AZURE_US_GOVERNMENT);
assertAcquireTokenInstanceAware(user);
LabResponse labResponse = LabUserHelper.getArlingtonUser();
LabUser user = labResponse.getUser();
assertAcquireTokenInstanceAware(user, labResponse.getApp().getAppId(), labResponse.getLab().getTenantId());
}

@Test
void acquireTokenInteractive_Ciam() {
User user = labUserProvider.getCiamCudUser();
LabResponse labResponse = LabUserHelper.getCiamCudUser();
LabUser user = labResponse.getUser();
LabApp app = labResponse.getApp();

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

PublicClientApplication pca;
try {
pca = PublicClientApplication.builder(
user.getAppId()).
authority("https://" + user.getLabName() + ".ciamlogin.com/")
app.getAppId()).
authority(app.getAuthority())
.build();
} catch (MalformedURLException ex) {
throw new RuntimeException(ex.getMessage());
Expand Down Expand Up @@ -153,8 +128,8 @@ void acquireTokenInteractive_Ciam() {
assertEquals(user.getUpn(), result.account().username());
}

private void assertAcquireTokenCommon(User user, String authority, String scope) {
PublicClientApplication pca = IntegrationTestHelper.createPublicApp(user.getAppId(), authority);
private void assertAcquireTokenCommon(LabUser user, String appId, String authority, String scope) {
PublicClientApplication pca = IntegrationTestHelper.createPublicApp(appId, authority);

IAuthenticationResult result = acquireTokenInteractive(
user,
Expand All @@ -165,7 +140,7 @@ private void assertAcquireTokenCommon(User user, String authority, String scope)
assertEquals(user.getUpn(), result.account().username());
}

private void assertAcquireTokenB2C(User user, String authority) {
private void assertAcquireTokenB2C(LabUser user, String authority) {

PublicClientApplication pca;
try {
Expand All @@ -181,10 +156,10 @@ private void assertAcquireTokenB2C(User user, String authority) {
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
}

private void assertAcquireTokenInstanceAware(User user) {
PublicClientApplication pca = IntegrationTestHelper.createPublicApp(user.getAppId(), TestConstants.MICROSOFT_AUTHORITY_HOST + user.getTenantID());
private void assertAcquireTokenInstanceAware(LabUser user, String appId, String tenantId) {
PublicClientApplication pca = IntegrationTestHelper.createPublicApp(appId, TestConstants.MICROSOFT_AUTHORITY_HOST + tenantId);

IAuthenticationResult result = acquireTokenInteractive_instanceAware(user, pca, cfg.graphDefaultScope());
IAuthenticationResult result = acquireTokenInteractive_instanceAware(user, pca, TestConstants.GRAPH_DEFAULT_SCOPE);

IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
assertEquals(user.getUpn(), result.account().username());
Expand All @@ -197,7 +172,7 @@ private void assertAcquireTokenInstanceAware(User user) {

IAuthenticationResult cachedResult;
try {
cachedResult = acquireTokenSilently(pca, result.account(), cfg.graphDefaultScope());
cachedResult = acquireTokenSilently(pca, result.account(), TestConstants.GRAPH_DEFAULT_SCOPE);
} catch (Exception ex) {
throw new RuntimeException(ex.getMessage());
}
Expand All @@ -213,7 +188,7 @@ private IAuthenticationResult acquireTokenSilently(IPublicClientApplication pca,
}

private IAuthenticationResult acquireTokenInteractive(
User user,
LabUser user,
PublicClientApplication pca,
String scope) {

Expand Down Expand Up @@ -243,7 +218,7 @@ private IAuthenticationResult acquireTokenInteractive(
}

private IAuthenticationResult acquireTokenInteractive_instanceAware(
User user,
LabUser user,
PublicClientApplication pca,
String scope) {

Expand Down Expand Up @@ -274,10 +249,10 @@ private IAuthenticationResult acquireTokenInteractive_instanceAware(

class SeleniumOpenBrowserAction implements OpenBrowserAction {

private User user;
private LabUser user;
private PublicClientApplication pca;

SeleniumOpenBrowserAction(User user, PublicClientApplication pca) {
SeleniumOpenBrowserAction(LabUser user, PublicClientApplication pca) {
this.user = user;
this.pca = pca;
}
Expand Down
Loading
Loading