Various fixes for automated tests

Author: Avery-Dunn

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,7 +49,7 @@ 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);
     }
@@ -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);
     }

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";

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 {

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();
     }