Merge branch 'dev' of https://github.com/AzureAD/microsoft-authentication-library-for-java into avdunn/expose-refreshon

Avery-Dunn · Avery-Dunn · commit 2af8552ac040 · 2024-06-26T09:55:54.000-07:00
diff --git a/msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/AcquireTokenInteractiveIT.java b/msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/AcquireTokenInteractiveIT.java
@@ -80,24 +80,6 @@ void acquireTokenInteractive_ADFSv4_Federated(String environment) {
         assertAcquireTokenCommon(user, cfg.organizationsAuthority(), cfg.graphDefaultScope());
     }
 
-    @ParameterizedTest
-    @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
-    void acquireTokenInteractive_ADFSv3_Federated(String environment) {
-        cfg = new Config(environment);
-
-        User user = labUserProvider.getFederatedAdfsUser(cfg.azureEnvironment, FederationProvider.ADFS_3);
-        assertAcquireTokenCommon(user, cfg.organizationsAuthority(), cfg.graphDefaultScope());
-    }
-
-    @ParameterizedTest
-    @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
-    void acquireTokenInteractive_ADFSv2_Federated(String environment) {
-        cfg = new Config(environment);
-
-        User user = labUserProvider.getFederatedAdfsUser(cfg.azureEnvironment, FederationProvider.ADFS_2);
-        assertAcquireTokenCommon(user, cfg.organizationsAuthority(), cfg.graphDefaultScope());
-    }
-
     @ParameterizedTest
     @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
     void acquireTokenWithAuthorizationCode_B2C_Local(String environment) {
diff --git a/msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/AuthorizationCodeIT.java b/msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/AuthorizationCodeIT.java
@@ -81,24 +81,6 @@ public void acquireTokenWithAuthorizationCode_ADFSv4_Federated(String environmen
         assertAcquireTokenAAD(user, null);
     }
 
-    @ParameterizedTest
-    @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
-    public void acquireTokenWithAuthorizationCode_ADFSv3_Federated(String environment) {
-        cfg = new Config(environment);
-
-        User user = labUserProvider.getFederatedAdfsUser(cfg.azureEnvironment, FederationProvider.ADFS_3);
-        assertAcquireTokenAAD(user, null);
-    }
-
-    @ParameterizedTest
-    @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
-    public void acquireTokenWithAuthorizationCode_ADFSv2_Federated(String environment) {
-        cfg = new Config(environment);
-
-        User user = labUserProvider.getFederatedAdfsUser(cfg.azureEnvironment, FederationProvider.ADFS_2);
-        assertAcquireTokenAAD(user, null);
-    }
-
     @ParameterizedTest
     @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
     public void acquireTokenWithAuthorizationCode_B2C_Local(String environment) {
diff --git a/msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/ClientCredentialsIT.java b/msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/ClientCredentialsIT.java
@@ -40,7 +40,7 @@ void init() throws CertificateException, UnrecoverableKeyException, NoSuchAlgori
 
     @Test
     void acquireTokenClientCredentials_ClientCertificate() throws Exception {
-        String clientId = "2afb0add-2f32-4946-ac90-81a02aa4550e";
+        String clientId = TestConstants.MSIDLAB_CLIENT_ID;
         assertAcquireTokenCommon(clientId, certificate, TestConstants.MICROSOFT_AUTHORITY);
     }
 
@@ -49,14 +49,14 @@ void acquireTokenClientCredentials_ClientSecret() throws Exception {
         AppCredentialProvider appProvider = new AppCredentialProvider(AzureEnvironment.AZURE);
         final String clientId = appProvider.getLabVaultAppId();
         final String password = appProvider.getLabVaultPassword();
-        IClientCredential credential = ClientCredentialFactory.createFromSecret(password);
+        IClientCredential credential = CertificateHelper.getClientCertificate();
 
         assertAcquireTokenCommon(clientId, credential, TestConstants.MICROSOFT_AUTHORITY);
     }
 
     @Test
     void acquireTokenClientCredentials_ClientAssertion() throws Exception {
-        String clientId = "2afb0add-2f32-4946-ac90-81a02aa4550e";
+        String clientId = TestConstants.MSIDLAB_CLIENT_ID;
 
         ClientAssertion clientAssertion = getClientAssertion(clientId);
 
@@ -90,7 +90,7 @@ void acquireTokenClientCredentials_ClientSecret_Ciam() throws Exception {
 
     @Test
     void acquireTokenClientCredentials_Callback() throws Exception {
-        String clientId = "2afb0add-2f32-4946-ac90-81a02aa4550e";
+        String clientId = TestConstants.MSIDLAB_CLIENT_ID;
 
         // Creates a valid client assertion using a callback, and uses it to build the client app and make a request
         Callable<String> callable = () -> {
@@ -116,11 +116,9 @@ void acquireTokenClientCredentials_Callback() throws Exception {
     void acquireTokenClientCredentials_DefaultCacheLookup() throws Exception {
         AppCredentialProvider appProvider = new AppCredentialProvider(AzureEnvironment.AZURE);
         final String clientId = appProvider.getLabVaultAppId();
-        final String password = appProvider.getLabVaultPassword();
-        IClientCredential credential = ClientCredentialFactory.createFromSecret(password);
 
         ConfidentialClientApplication cca = ConfidentialClientApplication.builder(
-                clientId, credential).
+                clientId, CertificateHelper.getClientCertificate()).
                 authority(TestConstants.MICROSOFT_AUTHORITY).
                 build();
 
@@ -152,7 +150,7 @@ void acquireTokenClientCredentials_DefaultCacheLookup() throws Exception {
 
     @Test
     void acquireTokenClientCredentials_Regional() throws Exception {
-        String clientId = "2afb0add-2f32-4946-ac90-81a02aa4550e";
+        String clientId = TestConstants.MSIDLAB_CLIENT_ID;
 
         assertAcquireTokenCommon_withRegion(clientId, certificate, "westus", TestConstants.REGIONAL_MICROSOFT_AUTHORITY_BASIC_HOST_WESTUS);
     }
diff --git a/msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/TestConstants.java b/msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/TestConstants.java
@@ -9,8 +9,9 @@
 
 public class TestConstants {
     public final static String KEYVAULT_DEFAULT_SCOPE = "https://vault.azure.net/.default";
-    public final static String MSIDLAB_DEFAULT_SCOPE = "https://msidlab.com/.default";
+    public final static String MSIDLAB_DEFAULT_SCOPE = "https://request.msidlab.com/.default";
     public final static String MSIDLAB_VAULT_URL = "https://msidlabs.vault.azure.net/";
+    public final static String MSIDLAB_CLIENT_ID = "f62c5ae3-bf3a-4af5-afa8-a68b800396e9";
     public final static String GRAPH_DEFAULT_SCOPE = "https://graph.windows.net/.default";
     public final static String USER_READ_SCOPE = "user.read";
     public final static String DEFAULT_SCOPE = ".default";
@@ -54,6 +55,7 @@ public class TestConstants {
     public final static String B2C_READ_SCOPE = "https://msidlabb2c.onmicrosoft.com/msidlabb2capi/read";
     public final static String B2C_MICROSOFTLOGIN_AUTHORITY = "https://msidlabb2c.b2clogin.com/tfp/msidlabb2c.onmicrosoft.com/";
     public final static String B2C_MICROSOFTLOGIN_ROPC = B2C_MICROSOFTLOGIN_AUTHORITY + B2C_ROPC_POLICY;
+    public final static String B2C_UPN = "b2clocal@msidlabb2c.onmicrosoft.com";
 
     public final static String LOCALHOST = "http://localhost:";
 
diff --git a/msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/UsernamePasswordIT.java b/msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/UsernamePasswordIT.java
@@ -78,36 +78,6 @@ void acquireTokenWithUsernamePassword_ADFSv4(String environment) throws Exceptio
         assertAcquireTokenCommon(user, cfg.organizationsAuthority(), cfg.graphDefaultScope(), user.getAppId());
     }
 
-    @ParameterizedTest
-    @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
-    void acquireTokenWithUsernamePassword_ADFSv3(String environment) throws Exception {
-        cfg = new Config(environment);
-
-        UserQueryParameters query = new UserQueryParameters();
-        query.parameters.put(UserQueryParameters.AZURE_ENVIRONMENT, cfg.azureEnvironment);
-        query.parameters.put(UserQueryParameters.FEDERATION_PROVIDER, FederationProvider.ADFS_3);
-        query.parameters.put(UserQueryParameters.USER_TYPE, UserType.FEDERATED);
-
-        User user = labUserProvider.getLabUser(query);
-
-        assertAcquireTokenCommon(user, cfg.organizationsAuthority(), cfg.graphDefaultScope(), user.getAppId());
-    }
-
-    @ParameterizedTest
-    @MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
-    void acquireTokenWithUsernamePassword_ADFSv2(String environment) throws Exception {
-        cfg = new Config(environment);
-
-        UserQueryParameters query = new UserQueryParameters();
-        query.parameters.put(UserQueryParameters.AZURE_ENVIRONMENT, cfg.azureEnvironment);
-        query.parameters.put(UserQueryParameters.FEDERATION_PROVIDER, FederationProvider.ADFS_2);
-        query.parameters.put(UserQueryParameters.USER_TYPE, UserType.FEDERATED);
-
-        User user = labUserProvider.getLabUser(query);
-
-        assertAcquireTokenCommonAAD(user);
-    }
-
     @Test
     void acquireTokenWithUsernamePassword_AuthorityWithPort() throws Exception {
         User user = labUserProvider.getDefaultUser();
diff --git a/msal4j-sdk/src/integrationtest/java/infrastructure/SeleniumExtensions.java b/msal4j-sdk/src/integrationtest/java/infrastructure/SeleniumExtensions.java
@@ -3,6 +3,7 @@
 
 package infrastructure;
 
+import com.microsoft.aad.msal4j.TestConstants;
 import labapi.FederationProvider;
 import labapi.LabConstants;
 import labapi.User;
@@ -76,14 +77,6 @@ public static void performADOrCiamLogin(WebDriver driver, User user) {
         LOG.info("Loggin in ... Clicking <Next> after username");
         driver.findElement(new By.ById(fields.getAadSignInButtonId())).click();
 
-        if (user.getFederationProvider().equals(FederationProvider.ADFS_2) &&
-                !user.getLabName().equals(LabConstants.ARLINGTON_LAB_NAME)) {
-
-            LOG.info("Loggin in ... ADFS-V2 - Entering the username in ADFSv2 form");
-            driver.findElement(new By.ById(SeleniumConstants.ADFSV2_WEB_USERNAME_INPUT_ID)).
-                    sendKeys(user.getUpn());
-        }
-
         LOG.info("Loggin in ... Entering password");
         By by = new By.ById(fields.getPasswordInputId());
         waitForElementToBeVisibleAndEnable(driver, by).sendKeys(user.getPassword());
@@ -155,7 +148,7 @@ public static void performLocalLogin(WebDriver driver, User user) {
         driver.findElement(new By.ById(SeleniumConstants.B2C_LOCAL_ACCOUNT_ID)).click();
 
         LOG.info("Loggin in ... Entering username");
-        driver.findElement(new By.ById(SeleniumConstants.B2C_LOCAL_USERNAME_ID)).sendKeys(user.getUpn());
+        driver.findElement(new By.ById(SeleniumConstants.B2C_LOCAL_USERNAME_ID)).sendKeys(TestConstants.B2C_UPN);
 
         LOG.info("Loggin in ... Entering password");
         By by = new By.ById(SeleniumConstants.B2C_LOCAL_PASSWORD_ID);
diff --git a/msal4j-sdk/src/integrationtest/java/infrastructure/UserInformationFields.java b/msal4j-sdk/src/integrationtest/java/infrastructure/UserInformationFields.java
@@ -44,20 +44,10 @@ String getADFS2019UserNameInputId() {
 
     private void determineFieldIds() {
         switch (user.getFederationProvider()) {
-            case FederationProvider.ADFS_3:
             case FederationProvider.ADFS_2019:
                 passwordInputId = SeleniumConstants.ADFS2019_PASSWORD_ID;
                 passwordSigInButtonId = SeleniumConstants.ADFS2019_SUBMIT_ID;
                 break;
-            case FederationProvider.ADFS_2:
-                if (LabConstants.ARLINGTON_LAB_NAME.equals(user.getLabName())) {
-                    passwordInputId = SeleniumConstants.ADFSV2_ARLINGTON_WEB_PASSWORD_INPUT_ID;
-                    passwordSigInButtonId = SeleniumConstants.ADFSV2_ARLINGTON_WEB_SUBMIT_BUTTON_ID;
-                } else {
-                    passwordInputId = SeleniumConstants.ADFSV2_WEB_PASSWORD_INPUT_ID;
-                    passwordSigInButtonId = SeleniumConstants.ADFSV2_WEB_SUBMIT_BUTTON_ID;
-                }
-                break;
             case FederationProvider.ADFS_4:
                 passwordInputId = SeleniumConstants.ADFSV4_WEB_PASSWORD_ID;
                 passwordSigInButtonId = SeleniumConstants.ADFSV4_WEB_SUBMIT_ID;
diff --git a/msal4j-sdk/src/integrationtest/java/labapi/FederationProvider.java b/msal4j-sdk/src/integrationtest/java/labapi/FederationProvider.java
@@ -6,12 +6,8 @@
 public class FederationProvider {
 
     public static final String NONE = "none";
-    public static final String ADFS_2 = "adfsv2";
-    public static final String ADFS_3 = "adfsv3";
     public static final String ADFS_4 = "adfsv4";
     public static final String ADFS_2019 = "adfsv2019";
-    public static final String PING = "ping";
-    public static final String SHIBBOLETH = "shibboleth";
     public static final String CIAM = "ciam";
 
 }
diff --git a/msal4j-sdk/src/integrationtest/java/labapi/KeyVaultSecretsProvider.java b/msal4j-sdk/src/integrationtest/java/labapi/KeyVaultSecretsProvider.java
@@ -21,8 +21,8 @@ public class KeyVaultSecretsProvider {
 
     private final SecretClient secretClient;
 
-    private static final String CLIENT_ID = "2afb0add-2f32-4946-ac90-81a02aa4550e";
-    public static String CERTIFICATE_ALIAS = "MsalJavaAutomationRunner";
+    private static final String CLIENT_ID = TestConstants.MSIDLAB_CLIENT_ID;
+    public static String CERTIFICATE_ALIAS = "LabVaultAccessCert";
 
     private static final String WIN_KEYSTORE = "Windows-MY";
     private static final String KEYSTORE_PROVIDER = "SunMSCAPI";
@@ -82,7 +82,7 @@ CLIENT_ID, getClientCredentialFromKeyStore()).
         }
     }
 
-    private IClientCredential getClientCredentialFromKeyStore() {
+    IClientCredential getClientCredentialFromKeyStore() {
         PrivateKey key;
         X509Certificate publicCertificate;
         try {
diff --git a/msal4j-sdk/src/integrationtest/java/labapi/LabService.java b/msal4j-sdk/src/integrationtest/java/labapi/LabService.java
@@ -33,10 +33,9 @@ static void initLabApp() throws MalformedURLException {
         KeyVaultSecretsProvider keyVaultSecretsProvider = new KeyVaultSecretsProvider();
 
         String appID = keyVaultSecretsProvider.getSecret(LabConstants.APP_ID_KEY_VAULT_SECRET);
-        String appSecret = keyVaultSecretsProvider.getSecret(LabConstants.APP_PASSWORD_KEY_VAULT_SECRET);
 
         labApp = ConfidentialClientApplication.builder(
-                appID, ClientCredentialFactory.createFromSecret(appSecret)).
+                appID, keyVaultSecretsProvider.getClientCredentialFromKeyStore()).
                 authority(TestConstants.MICROSOFT_AUTHORITY).
                 build();
     }
diff --git a/msal4j-sdk/src/integrationtest/java/labapi/LabUserProvider.java b/msal4j-sdk/src/integrationtest/java/labapi/LabUserProvider.java
@@ -109,8 +109,6 @@ public User getCiamUser() {
 
         UserQueryParameters query = new UserQueryParameters();
         query.parameters.put(UserQueryParameters.FEDERATION_PROVIDER, FederationProvider.CIAM);
-        query.parameters.put(UserQueryParameters.SIGN_IN_AUDIENCE, "azureadmyorg");
-        query.parameters.put(UserQueryParameters.PUBLIC_CLIENT, "no");
 
         return getLabUser(query);
     }
