add constant for easier maintenance

Author: fadidurah

LabApiUtilities/src/main/com/microsoft/identity/labapi/utilities/constants/LabConstants.java

@@ -26,6 +26,7 @@ public class LabConstants {
     private static final String NONE = "none";
 
     public static final String DEFAULT_LAB_CLIENT_ID = "f62c5ae3-bf3a-4af5-afa8-a68b800396e9";
+    public static final String DEFAULT_ID4SLAB2_CLIENT_ID = "c6bb302a-1e38-408e-9754-87c18fe81c80";
     public static final String DEFAULT_LAB_SCOPE = "https://request.msidlab.com/.default";
     public static final String KEYVAULT_SCOPE = "https://vault.azure.net/.default";
     public static final String DEFAULT_LAB_CERT_ALIAS = "LabAuth.MSIDLab.com";

common/src/test/java/com/microsoft/identity/common/internal/controllers/LocalMsalControllerTest.java

@@ -45,6 +45,7 @@
 import com.microsoft.identity.labapi.utilities.client.ILabAccount;
 import com.microsoft.identity.labapi.utilities.client.ILabClient;
 import com.microsoft.identity.labapi.utilities.client.LabClient;
+import com.microsoft.identity.labapi.utilities.constants.LabConstants;
 import com.microsoft.identity.labapi.utilities.constants.UserType;
 import com.microsoft.identity.labapi.utilities.exception.LabApiException;
 import com.microsoft.identity.labapi.utilities.jwt.IJWTParser;
@@ -77,8 +78,6 @@ public class LocalMsalControllerTest {
 
     private static final String AUTHORITY_URL = "https://login.microsoftonline.com/organizations";
 
-    private static final String CLIENT_ID = "c6bb302a-1e38-408e-9754-87c18fe81c80";
-
     private static final String REDIRECT_URI = "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D";
 
     private static final String SCOPE = "User.read";
@@ -155,7 +154,7 @@ private RopcTokenCommandParameters createRopcCommandParameters() {
                 .username(sTestAccount.getUsername())
                 .password(sTestAccount.getPassword())
                 .authority(Authority.getAuthorityFromAuthorityUrl(AUTHORITY_URL))
-                .clientId(CLIENT_ID)
+                .clientId(LabConstants.DEFAULT_ID4SLAB2_CLIENT_ID)
                 .correlationId(UUID.randomUUID().toString())
                 .redirectUri(REDIRECT_URI)
                 .platformComponents(mPlatformComponents)
@@ -170,7 +169,7 @@ private RopcTokenCommandParameters createRopcCommandParameters() {
     private SilentTokenCommandParameters createSilentTokenCommandParameters(@NonNull final IAccountRecord accountRecord) {
         return SilentTokenCommandParameters.builder()
                 .authority(Authority.getAuthorityFromAuthorityUrl(AUTHORITY_URL))
-                .clientId(CLIENT_ID)
+                .clientId(LabConstants.DEFAULT_ID4SLAB2_CLIENT_ID)
                 .correlationId(UUID.randomUUID().toString())
                 .redirectUri(REDIRECT_URI)
                 .platformComponents(mPlatformComponents)

common/src/test/java/com/microsoft/identity/common/internal/request/MsalBrokerRequestAdapterTests.java

@@ -54,6 +54,7 @@
 import com.microsoft.identity.common.java.ui.BrowserDescriptor;
 import com.microsoft.identity.common.java.util.RequestHeaderSerializationUtil;
 import com.microsoft.identity.common.java.util.StringUtil;
+import com.microsoft.identity.labapi.utilities.constants.LabConstants;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -68,8 +69,6 @@
 @RunWith(RobolectricTestRunner.class)
 public class MsalBrokerRequestAdapterTests {
 
-    final String CLIENT_ID = "c6bb302a-1e38-408e-9754-87c18fe81c80";
-
     @Test
     public void test_getRequestBundleForSsoToken() {
         final String anAccountName = "anAccountName";
@@ -121,7 +120,7 @@ public void test_getRequestBundleForAcquireTokenInteractive() {
         final InteractiveTokenCommandParameters params = InteractiveTokenCommandParameters.builder()
                 .platformComponents(components)
                 .correlationId(CORRELATION_ID)
-                .clientId(CLIENT_ID)
+                .clientId(LabConstants.DEFAULT_ID4SLAB2_CLIENT_ID)
                 .applicationName(CALLER_PACKAGE_NAME)
                 .applicationVersion(VERSION)
                 .redirectUri(REDIRECT_URI)
@@ -156,7 +155,7 @@ public void test_getRequestBundleForAcquireTokenInteractive_forAccountTransfer()
         final InteractiveTokenCommandParameters params = InteractiveTokenCommandParameters.builder()
                 .platformComponents(components)
                 .correlationId(CORRELATION_ID)
-                .clientId(CLIENT_ID)
+                .clientId(LabConstants.DEFAULT_ID4SLAB2_CLIENT_ID)
                 .applicationName(CALLER_PACKAGE_NAME)
                 .applicationVersion(VERSION)
                 .redirectUri(REDIRECT_URI)
@@ -195,7 +194,7 @@ public void test_BrokerRequestFromAcquireTokenParameters_SignInWithGoogleParamet
         final AndroidInteractiveTokenCommandParameters params = AndroidInteractiveTokenCommandParameters.builder()
                 .platformComponents(components)
                 .correlationId("987d8962-3f4d-4054-a852-ac0c4b6a602e")
-                .clientId(CLIENT_ID)
+                .clientId(LabConstants.DEFAULT_ID4SLAB2_CLIENT_ID)
                 .redirectUri("msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D")
                 .applicationName("com.microsoft.identity.client.sample.local")
                 .applicationVersion("1.0.0")
@@ -297,7 +296,7 @@ private void test_BrokerRequestFromAcquireTokenParametersInternal(final boolean
         final InteractiveTokenCommandParameters params = InteractiveTokenCommandParameters.builder()
                 .platformComponents(components)
                 .correlationId("987d8962-3f4d-4054-a852-ac0c4b6a602e")
-                .clientId(CLIENT_ID)
+                .clientId(LabConstants.DEFAULT_ID4SLAB2_CLIENT_ID)
                 .redirectUri("msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D")
                 .applicationName("com.microsoft.identity.client.sample.local")
                 .applicationVersion("1.0.0")