Lab Migration

msal4j-sdk/pom.xml

@@ -129,6 +129,16 @@
             <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>
+        </dependency>
+        <dependency>
+            <groupId>com.azure</groupId>
+            <artifactId>azure-identity</artifactId>
+            <version>1.10.0</version>
+        </dependency>
     </dependencies>
 
     <!-- force https -->

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

@@ -3,17 +3,14 @@
 
 package com.microsoft.aad.msal4j;
 
-import labapi.*;
+import com.microsoft.aad.msal4j.labapi2.*;
 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;
 
@@ -31,12 +28,6 @@ class AcquireTokenInteractiveIT extends SeleniumTest {
 
     private Config cfg;
 
-
-    @BeforeAll
-    public void setupUserProvider() {
-        setUpLapUserProvider();
-    }
-
     @AfterEach
     public void stopBrowser() {
         cleanUp();
@@ -47,79 +38,76 @@ 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() {
+        cfg = new Config();
 
-        User user = labUserProvider.getDefaultUser(cfg.azureEnvironment);
-        assertAcquireTokenCommon(user, cfg.commonAuthority(), cfg.graphDefaultScope());
-    }
+        LabResponse labResponse = LabUserHelper.getDefaultUserMultiTenantApp();
+        LabUser user = labResponse.getUser();
 
-    @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);
+        assertAcquireTokenCommon(user, labResponse.getApp().getAppId(), labResponse.getApp().getAuthority()+ "common", cfg.graphDefaultScope());
     }
 
-    @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() {
+        cfg = new Config();
+
+        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", cfg.graphDefaultScope());
     }
 
-    @ParameterizedTest
-    @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
+    //TODO: need to sort out ADFS 2022 configuration
+    @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);
+    @Test
+    void acquireTokenWithAuthorizationCode_B2C_Local() {
+        cfg = new Config();
 
-        User user = labUserProvider.getB2cUser(cfg.azureEnvironment, B2CProvider.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);
+    @Test
+    void acquireTokenWithAuthorizationCode_B2C_LegacyFormat() {
+        cfg = new Config();
 
-        User user = labUserProvider.getB2cUser(cfg.azureEnvironment, B2CProvider.LOCAL);
+        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);
+        cfg = new Config();
 
-        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());
@@ -153,8 +141,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,
@@ -165,7 +153,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 {
@@ -181,8 +169,8 @@ 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());
 
@@ -213,7 +201,7 @@ private IAuthenticationResult acquireTokenSilently(IPublicClientApplication pca,
     }
 
     private IAuthenticationResult acquireTokenInteractive(
-            User user,
+            LabUser user,
             PublicClientApplication pca,
             String scope) {
 
@@ -243,7 +231,7 @@ private IAuthenticationResult acquireTokenInteractive(
     }
 
     private IAuthenticationResult acquireTokenInteractive_instanceAware(
-            User user,
+            LabUser user,
             PublicClientApplication pca,
             String scope) {
 
@@ -274,10 +262,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;
         }