Merge pull request #870 from AzureAD/akaliugonna/broker-test-changes

broker integration tests fix

Author: Avery-Dunn

msal4j-brokers/src/test/java/labapi/KeyVaultSecretsProvider.java

@@ -24,8 +24,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";
+    public final static String CLIENT_ID = "f62c5ae3-bf3a-4af5-afa8-a68b800396e9";
+    public static String CERTIFICATE_ALIAS = "LabAuth.MSIDLab.com";
 
     private static final String WIN_KEYSTORE = "Windows-MY";
     private static final String KEYSTORE_PROVIDER = "SunMSCAPI";
@@ -66,7 +66,7 @@ private AccessToken requestAccessTokenForAutomation() {
             ConfidentialClientApplication cca =
                     ConfidentialClientApplication
                             .builder(CLIENT_ID, getClientCredentialFromKeyStore())
-                            .authority(LabConstants.MICROSOFT_AUTHORITY)
+                            .authority(LabConstants.MICROSOFT_AUTHORITY).sendX5c(true)
                             .build();
             result = cca.acquireToken(ClientCredentialParameters
                                               .builder(Collections.singleton(
@@ -85,7 +85,7 @@ private AccessToken requestAccessTokenForAutomation() {
         }
     }
 
-    private IClientCredential getClientCredentialFromKeyStore() {
+    public IClientCredential getClientCredentialFromKeyStore() {
         PrivateKey key;
         X509Certificate publicCertificate;
         try {

msal4j-brokers/src/test/java/labapi/LabConstants.java

@@ -5,7 +5,7 @@
 
 public class LabConstants {
     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 MICROSOFT_AUTHORITY =

msal4j-brokers/src/test/java/labapi/LabService.java

@@ -34,11 +34,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))
+                         .builder(appID, keyVaultSecretsProvider.getClientCredentialFromKeyStore())
                          .authority(LabConstants.MICROSOFT_AUTHORITY)
                          .build();
     }

msal4j-sdk/pom.xml

@@ -304,7 +304,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.22.1</version>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <goals>