diff --git a/common b/common index a68f495634..3f21b46bfb 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit a68f495634dea8d237ce9444d9166c89d6f7ff1e +Subproject commit 3f21b46bfb593b33231d6ff585d37a15b9859c1b diff --git a/docs/access_token-pop.md b/docs/access_token-pop.md index 6242f303b2..fb3339c49f 100644 --- a/docs/access_token-pop.md +++ b/docs/access_token-pop.md @@ -28,7 +28,7 @@ In order to use PoP with MSAL, the `minimum_required_broker_protocol_version` mu `app_config.json` ```json { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "broker_redirect_uri_registered": true, "minimum_required_broker_protocol_version" : "4.0", diff --git a/msal/build.gradle b/msal/build.gradle index a954071653..eb54e2f88b 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -281,9 +281,9 @@ dependencies { testImplementation ("org.robolectric:robolectric:$rootProject.ext.robolectricVersion") testImplementation "androidx.test:core:$rootProject.ext.androidxTestCoreVersion" testLocalImplementation project(':testutils') + testLocalImplementation project(':LabApiUtilities') testDistImplementation("com.microsoft.identity:testutils:0.0+") { exclude module: 'common' - exclude group: 'com.microsoft.identity', module: 'LabApiUtilities' } testImplementation("org.mockito.kotlin:mockito-kotlin:$rootProject.ext.mockitoKotlinVersion") { exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib' diff --git a/msal/src/androidTest/res/raw/test_msal_config_multiple_account.json b/msal/src/androidTest/res/raw/test_msal_config_multiple_account.json index b77f087158..3588f18d72 100644 --- a/msal/src/androidTest/res/raw/test_msal_config_multiple_account.json +++ b/msal/src/androidTest/res/raw/test_msal_config_multiple_account.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":true, diff --git a/msal/src/androidTest/res/raw/test_msal_config_single_account.json b/msal/src/androidTest/res/raw/test_msal_config_single_account.json index 2c9371a6f4..27566924fa 100644 --- a/msal/src/androidTest/res/raw/test_msal_config_single_account.json +++ b/msal/src/androidTest/res/raw/test_msal_config_single_account.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":true, diff --git a/msal/src/androidTest/res/raw/test_pcaconfig_empty_redirect.json b/msal/src/androidTest/res/raw/test_pcaconfig_empty_redirect.json index 4113a435c6..37281862a3 100644 --- a/msal/src/androidTest/res/raw/test_pcaconfig_empty_redirect.json +++ b/msal/src/androidTest/res/raw/test_pcaconfig_empty_redirect.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "", "multiple_clouds_supported":true, diff --git a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/AcquireTokenAbstractTest.java b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/AcquireTokenAbstractTest.java index 669b8f4527..00c177ffee 100644 --- a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/AcquireTokenAbstractTest.java +++ b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/AcquireTokenAbstractTest.java @@ -28,6 +28,9 @@ import com.microsoft.identity.client.e2e.utils.AcquireTokenTestHelper; import com.microsoft.identity.http.MockHttpClient; import com.microsoft.identity.internal.testutils.TestUtils; +import com.microsoft.identity.labapi.utilities.BuildConfig; +import com.microsoft.identity.labapi.utilities.authentication.LabApiAuthenticationClient; +import com.microsoft.identity.labapi.utilities.client.LabClient; import org.junit.After; import org.junit.Before; @@ -44,6 +47,9 @@ public abstract class AcquireTokenAbstractTest extends PublicClientApplicationAb protected String[] mScopes; protected final MockHttpClient mockHttpClient = MockHttpClient.install(); + private final LabApiAuthenticationClient labApiAuthenticationClient = new LabApiAuthenticationClient(BuildConfig.LAB_CLIENT_SECRET); + public final LabClient labClient = new LabClient(labApiAuthenticationClient); + @Before public void setup() { mScopes = getScopes(); diff --git a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/mocked/DeviceCodeFlowWithClaimsApiTest.java b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/mocked/DeviceCodeFlowWithClaimsApiTest.java index 087ae3f3aa..51b937899e 100644 --- a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/mocked/DeviceCodeFlowWithClaimsApiTest.java +++ b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/mocked/DeviceCodeFlowWithClaimsApiTest.java @@ -22,56 +22,17 @@ // THE SOFTWARE. package com.microsoft.identity.client.e2e.tests.mocked; -import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.MULTIPLE_ACCOUNT_MODE_AAD_CONFIG_FILE_PATH; -import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.MULTIPLE_ACCOUNT_MODE_AAD_USGOV_CONFIG_FILE_PATH; import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.SINGLE_ACCOUNT_DCF_TEST_CONFIG_FILE_PATH; - -import android.content.Context; - -import androidx.annotation.NonNull; -import androidx.test.core.app.ApplicationProvider; - -import com.microsoft.identity.client.IAuthenticationResult; -import com.microsoft.identity.client.IPublicClientApplication; -import com.microsoft.identity.client.PublicClientApplication; -import com.microsoft.identity.client.PublicClientApplicationConfiguration; import com.microsoft.identity.client.claims.ClaimsRequest; import com.microsoft.identity.client.claims.RequestedClaimAdditionalInformation; -import com.microsoft.identity.client.e2e.shadows.ShadowDeviceCodeFlowCommandAuthError; -import com.microsoft.identity.client.e2e.shadows.ShadowDeviceCodeFlowCommandSuccessful; -import com.microsoft.identity.client.e2e.shadows.ShadowDeviceCodeFlowCommandTokenError; import com.microsoft.identity.client.e2e.tests.PublicClientApplicationAbstractTest; -import com.microsoft.identity.client.e2e.utils.RoboTestUtils; -import com.microsoft.identity.client.exception.MsalException; -import com.microsoft.identity.common.java.authorities.Authority; -import com.microsoft.identity.common.java.exception.ClientException; -import com.microsoft.identity.common.java.exception.ErrorStrings; -import com.microsoft.identity.common.java.providers.microsoft.microsoftsts.MicrosoftStsAuthorizationErrorResponse; -import com.microsoft.identity.common.java.providers.microsoft.microsoftsts.MicrosoftStsAuthorizationRequest; -import com.microsoft.identity.common.java.providers.microsoft.microsoftsts.MicrosoftStsAuthorizationResponse; -import com.microsoft.identity.common.java.providers.microsoft.microsoftsts.MicrosoftStsTokenRequest; -import com.microsoft.identity.common.java.providers.oauth2.AuthorizationResult; -import com.microsoft.identity.common.java.providers.oauth2.OAuth2Strategy; -import com.microsoft.identity.common.java.providers.oauth2.OAuth2StrategyParameters; -import com.microsoft.identity.common.java.providers.oauth2.TokenRequest; -import com.microsoft.identity.common.java.providers.oauth2.TokenResult; -import com.microsoft.identity.common.java.util.ResultFuture; -import com.microsoft.identity.common.java.util.StringUtil; -import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; -import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; import java.util.UUID; -import java.util.concurrent.TimeUnit; /** * Testing class for the device code flow protocol. Currently only supporting testing for the API-side diff --git a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenAADTest.java b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenAADTest.java index bd57aeaacf..73d518a3a6 100644 --- a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenAADTest.java +++ b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenAADTest.java @@ -25,9 +25,11 @@ import com.microsoft.identity.client.e2e.utils.AcquireTokenTestHelper; import com.microsoft.identity.internal.testutils.labutils.LabConstants; import com.microsoft.identity.internal.testutils.labutils.LabUserQuery; +import com.microsoft.identity.labapi.utilities.constants.UserType; import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.MULTIPLE_ACCOUNT_MODE_AAD_CONFIG_FILE_PATH; import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.MULTIPLE_ACCOUNT_MODE_AAD_MOONCAKE_CONFIG_FILE_PATH; +import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.MULTIPLE_ACCOUNT_MODE_AAD_USGOV_CONFIG_FILE_PATH; import static com.microsoft.identity.internal.testutils.TestConstants.Scopes.AD_GRAPH_USER_READ_SCOPE; import static com.microsoft.identity.internal.testutils.TestConstants.Scopes.OFFICE_USER_READ_SCOPE; import static com.microsoft.identity.internal.testutils.TestConstants.Scopes.USER_READ_SCOPE; @@ -54,19 +56,20 @@ public String getAuthority() { public static class AzureWorldWideCloudUser extends AcquireTokenAADTest { @Override - public LabUserQuery getLabUserQuery() { - final LabUserQuery query = new LabUserQuery(); - query.azureEnvironment = LabConstants.AzureEnvironment.AZURE_CLOUD; - return query; + public UserType getUserType() { + return UserType.BASIC; } } public static class AzureUsGovCloudUser extends AcquireTokenAADTest { @Override - public LabUserQuery getLabUserQuery() { - final LabUserQuery query = new LabUserQuery(); - query.azureEnvironment = LabConstants.AzureEnvironment.AZURE_US_GOVERNMENT; - return query; + public String getConfigFilePath() { + return MULTIPLE_ACCOUNT_MODE_AAD_USGOV_CONFIG_FILE_PATH; + } + + @Override + public UserType getUserType() { + return UserType.USGOV; } } @@ -77,10 +80,8 @@ public String getConfigFilePath() { } @Override - public LabUserQuery getLabUserQuery() { - final LabUserQuery query = new LabUserQuery(); - query.azureEnvironment = LabConstants.AzureEnvironment.AZURE_CHINA_CLOUD; - return query; + public UserType getUserType() { + return UserType.CHINA; } } @@ -91,10 +92,8 @@ public String[] getScopes() { } @Override - public LabUserQuery getLabUserQuery() { - final LabUserQuery query = new LabUserQuery(); - query.protectionPolicy = LabConstants.ProtectionPolicy.MAM_CA; - return query; + public UserType getUserType() { + return UserType.MAM_CA; } } @@ -105,10 +104,9 @@ public String[] getScopes() { } @Override - public LabUserQuery getLabUserQuery() { - final LabUserQuery query = new LabUserQuery(); - query.protectionPolicy = LabConstants.ProtectionPolicy.MAM_SPO; - return query; + public UserType getUserType() { + return UserType.MAM_ON_SPO; } + } } diff --git a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenB2CTest.java b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenB2CTest.java index 8b0de1b8ee..d767852727 100644 --- a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenB2CTest.java +++ b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenB2CTest.java @@ -24,6 +24,7 @@ import com.microsoft.identity.internal.testutils.labutils.LabConstants; import com.microsoft.identity.internal.testutils.labutils.LabUserQuery; +import com.microsoft.identity.labapi.utilities.constants.UserType; import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.B2C_CUSTOM_DOMAIN_CONFIG_FILE_PATH; import static com.microsoft.identity.internal.testutils.TestConstants.Configurations.B2C_GLOBAL_DOMAIN_CONFIG_FILE_PATH; @@ -57,11 +58,8 @@ public String getConfigFilePath() { } @Override - public LabUserQuery getLabUserQuery() { - final LabUserQuery query = new LabUserQuery(); - query.userType = LabConstants.UserType.B2C; - query.b2cProvider = LabConstants.B2CProvider.LOCAL; - return query; + public UserType getUserType() { + return UserType.B2C; } } @@ -74,13 +72,8 @@ public String getConfigFilePath() { } @Override - public LabUserQuery getLabUserQuery() { - final LabUserQuery query = new LabUserQuery(); - query.userType = LabConstants.UserType.B2C; - query.b2cProvider = LabConstants.B2CProvider.LOCAL; - return query; + public UserType getUserType() { + return UserType.B2C; } - } - } diff --git a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenCIAMTest.java b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenCIAMTest.java index 5736c44087..8bbd94e5e8 100644 --- a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenCIAMTest.java +++ b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenCIAMTest.java @@ -30,6 +30,7 @@ import com.microsoft.identity.common.internal.util.StringUtil; import com.microsoft.identity.internal.testutils.labutils.LabConstants; import com.microsoft.identity.internal.testutils.labutils.LabUserQuery; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Ignore; @@ -62,10 +63,8 @@ public String getAuthority() { } @Override - public LabUserQuery getLabUserQuery() { - final LabUserQuery query = new LabUserQuery(); - query.federationProvider = LabConstants.FederationProvider.CIAM; - return query; + public UserType getUserType() { + return UserType.CIAM; } public static AuthenticationCallback successfulVerifyIssuerCallback() { diff --git a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenNetworkTest.java b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenNetworkTest.java index 6a0f48f78e..b9f6bce9b7 100644 --- a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenNetworkTest.java +++ b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenNetworkTest.java @@ -31,8 +31,8 @@ import com.microsoft.identity.client.e2e.utils.AcquireTokenTestHelper; import com.microsoft.identity.client.e2e.utils.ErrorCodes; import com.microsoft.identity.internal.testutils.TestUtils; -import com.microsoft.identity.internal.testutils.labutils.LabUserHelper; -import com.microsoft.identity.internal.testutils.labutils.LabUserQuery; +import com.microsoft.identity.labapi.utilities.client.ILabAccount; +import com.microsoft.identity.labapi.utilities.exception.LabApiException; import org.junit.Before; import org.junit.Rule; @@ -62,8 +62,13 @@ public abstract class AcquireTokenNetworkTest extends AcquireTokenAbstractTest i @Before public void setup() { AcquireTokenTestHelper.setAccount(null); - final LabUserQuery query = getLabUserQuery(); - mUsername = LabUserHelper.loadUserForTest(query); + try { + ILabAccount user = labClient.getAccountFromLabJsonStringInMobileBuildVault(getUserType()); + mUsername = user.getUsername(); + } catch (LabApiException e){ + throw new AssertionError(e); + } + super.setup(); } diff --git a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/IAcquireTokenNetworkTest.java b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/IAcquireTokenNetworkTest.java index 2c90f42d3d..97b7ddb908 100644 --- a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/IAcquireTokenNetworkTest.java +++ b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/IAcquireTokenNetworkTest.java @@ -23,11 +23,11 @@ package com.microsoft.identity.client.e2e.tests.network; import com.microsoft.identity.client.e2e.tests.IAcquireTokenTest; -import com.microsoft.identity.internal.testutils.labutils.LabUserQuery; +import com.microsoft.identity.labapi.utilities.constants.UserType; public interface IAcquireTokenNetworkTest extends IAcquireTokenTest { - LabUserQuery getLabUserQuery(); + UserType getUserType(); } diff --git a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/MultiAccountAndResourceAcquireTokenNetworkTests.java b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/MultiAccountAndResourceAcquireTokenNetworkTests.java index e6711879de..e1972407e8 100644 --- a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/MultiAccountAndResourceAcquireTokenNetworkTests.java +++ b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/MultiAccountAndResourceAcquireTokenNetworkTests.java @@ -29,8 +29,7 @@ import com.microsoft.identity.client.e2e.shadows.ShadowAndroidSdkStorageEncryptionManager; import com.microsoft.identity.client.e2e.tests.AcquireTokenAbstractTest; import com.microsoft.identity.client.e2e.utils.AcquireTokenTestHelper; -import com.microsoft.identity.internal.testutils.labutils.LabUserHelper; -import com.microsoft.identity.internal.testutils.labutils.LabUserQuery; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Rule; import org.junit.Test; @@ -75,15 +74,20 @@ public String getConfigFilePath() { @Test // test that accounts belonging to multiple clouds can live together in the app public void testAcquireTokenAndSilentWithMultipleCloudAccountsSuccess() { - final LabUserQuery[] queries = new LabUserQuery[]{ - new AcquireTokenAADTest.AzureWorldWideCloudUser().getLabUserQuery(), - new AcquireTokenAADTest.AzureUsGovCloudUser().getLabUserQuery()}; + final UserType[] userTypes = new UserType[]{ + new AcquireTokenAADTest.AzureWorldWideCloudUser().getUserType(), + new AcquireTokenAADTest.AzureUsGovCloudUser().getUserType()}; - final IAccount[] accounts = new IAccount[queries.length]; + final IAccount[] accounts = new IAccount[userTypes.length]; // perform interactive call for each account - for (int i = 0; i < queries.length; i++) { - final String username = LabUserHelper.loadUserForTest(queries[i]); + for (int i = 0; i < userTypes.length; i++) { + final String username; + try { + username = labClient.getAccountFromLabJsonStringInMobileBuildVault(userTypes[i]).getUsername(); + } catch (Exception e) { + throw new AssertionError(e); + } performInteractiveAcquireTokenCall(username); accounts[i] = getAccount(); } @@ -96,9 +100,12 @@ public void testAcquireTokenAndSilentWithMultipleCloudAccountsSuccess() { @Test // test that we can use mrrt to get a token silently for other resources public void testAcquireTokenSilentUsingMrrtSuccess() { - final LabUserQuery query = new AcquireTokenAADTest.AzureWorldWideCloudUser().getLabUserQuery(); - - final String username = LabUserHelper.loadUserForTest(query); + final String username; + try { + username = labClient.getAccountFromLabJsonStringInMobileBuildVault(new AcquireTokenAADTest.AzureWorldWideCloudUser().getUserType()).getUsername(); + } catch (Exception e) { + throw new AssertionError(e); + } final AcquireTokenParameters parameters = new AcquireTokenParameters.Builder() .startAuthorizationFromActivity(mActivity) diff --git a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/nativeauth/NativeAuthPublicClientApplicationAbstractTest.kt b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/nativeauth/NativeAuthPublicClientApplicationAbstractTest.kt index e5f31af8b9..354d235100 100644 --- a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/nativeauth/NativeAuthPublicClientApplicationAbstractTest.kt +++ b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/nativeauth/NativeAuthPublicClientApplicationAbstractTest.kt @@ -34,11 +34,12 @@ import com.microsoft.identity.client.exception.MsalException import com.microsoft.identity.common.internal.controllers.CommandDispatcherHelper import com.microsoft.identity.common.java.nativeauth.BuildValues import com.microsoft.identity.internal.testutils.TestUtils -import com.microsoft.identity.internal.testutils.labutils.LabConstants -import com.microsoft.identity.internal.testutils.labutils.LabUserHelper -import com.microsoft.identity.internal.testutils.labutils.LabUserQuery import com.microsoft.identity.internal.testutils.nativeauth.ConfigType import com.microsoft.identity.internal.testutils.nativeauth.api.models.NativeAuthTestConfig +import com.microsoft.identity.labapi.utilities.BuildConfig +import com.microsoft.identity.labapi.utilities.authentication.LabApiAuthenticationClient +import com.microsoft.identity.labapi.utilities.client.LabClient +import com.microsoft.identity.labapi.utilities.constants.UserType import com.microsoft.identity.nativeauth.INativeAuthPublicClientApplication import com.microsoft.identity.nativeauth.NativeAuthPublicClientApplicationParameters import kotlinx.coroutines.Dispatchers @@ -67,6 +68,10 @@ abstract class NativeAuthPublicClientApplicationAbstractTest : IPublicClientAppl const val INVALID_EMAIL = "email" const val INVALID_PASSWORD = "password" const val INCORRECT_CODE = "00000000" + + private val labApiAuthenticationClient: LabApiAuthenticationClient = + LabApiAuthenticationClient(BuildConfig.LAB_CLIENT_SECRET) + val labClient: LabClient = LabClient(labApiAuthenticationClient) } private lateinit var context: Context @@ -95,11 +100,7 @@ abstract class NativeAuthPublicClientApplicationAbstractTest : IPublicClientAppl } fun getSafePassword(): String { - val query = LabUserQuery() - query.federationProvider = LabConstants.FederationProvider.CIAM_CUD - query.signInAudience = LabConstants.SignInAudience.AZURE_AD_MY_ORG - val credential = LabUserHelper.getCredentials(query) - return credential.password + return labClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.CIAM).password } private fun getConfigsThroughBuildValue(): Map? { diff --git a/msal/src/test/res/raw/aad_capabilities_cp1.json b/msal/src/test/res/raw/aad_capabilities_cp1.json index b7204b2e3b..8de0c9b149 100644 --- a/msal/src/test/res/raw/aad_capabilities_cp1.json +++ b/msal/src/test/res/raw/aad_capabilities_cp1.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":true, diff --git a/msal/src/test/res/raw/aad_capabilities_none.json b/msal/src/test/res/raw/aad_capabilities_none.json index 30a067f5a5..47ecfc5ed5 100644 --- a/msal/src/test/res/raw/aad_capabilities_none.json +++ b/msal/src/test/res/raw/aad_capabilities_none.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":true, diff --git a/msal/src/test/res/raw/multiple_account_aad_test_config.json b/msal/src/test/res/raw/multiple_account_aad_test_config.json index 30a067f5a5..47ecfc5ed5 100644 --- a/msal/src/test/res/raw/multiple_account_aad_test_config.json +++ b/msal/src/test/res/raw/multiple_account_aad_test_config.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":true, diff --git a/msal/src/test/res/raw/multiple_account_mock_test_config.json b/msal/src/test/res/raw/multiple_account_mock_test_config.json index 0bc6a6f4b4..94adbc68fb 100644 --- a/msal/src/test/res/raw/multiple_account_mock_test_config.json +++ b/msal/src/test/res/raw/multiple_account_mock_test_config.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":false, diff --git a/msal/src/test/res/raw/single_account_aad_test_config.json b/msal/src/test/res/raw/single_account_aad_test_config.json index 2c9371a6f4..27566924fa 100644 --- a/msal/src/test/res/raw/single_account_aad_test_config.json +++ b/msal/src/test/res/raw/single_account_aad_test_config.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":true, diff --git a/msal/src/test/res/raw/single_account_dcf_test_config.json b/msal/src/test/res/raw/single_account_dcf_test_config.json index 9f18594358..d62e05cdbf 100644 --- a/msal/src/test/res/raw/single_account_dcf_test_config.json +++ b/msal/src/test/res/raw/single_account_dcf_test_config.json @@ -1,5 +1,5 @@ { - "client_id": "d335d85e-5aa7-4f03-8c2f-81b2699f30a6", + "client_id": "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent": "DEFAULT", "redirect_uri": "msauth://com.onmicrosoft.fadiorgorg/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "account_mode" : "SINGLE", @@ -8,7 +8,7 @@ "type": "AAD", "audience": { "type": "AzureADMyOrg", - "tenant_id": "2d94acaa-ef23-4d35-9678-8995364ac965" + "tenant_id": "c7cef333-42af-492c-afb0-21f74a661133" } } ] diff --git a/msal/src/test/res/raw/single_account_mock_test_config.json b/msal/src/test/res/raw/single_account_mock_test_config.json index 2ef3ecb8b0..2439f64732 100644 --- a/msal/src/test/res/raw/single_account_mock_test_config.json +++ b/msal/src/test/res/raw/single_account_mock_test_config.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":false, diff --git a/msal/src/test/res/raw/webauthn_capable.json b/msal/src/test/res/raw/webauthn_capable.json index d0c7f4ca03..e8d461a71e 100644 --- a/msal/src/test/res/raw/webauthn_capable.json +++ b/msal/src/test/res/raw/webauthn_capable.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "WEBVIEW", "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":true, diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/AbstractGuestAccountMsalUiTest.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/AbstractGuestAccountMsalUiTest.java index 02634545b0..776d96794c 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/AbstractGuestAccountMsalUiTest.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/AbstractGuestAccountMsalUiTest.java @@ -36,8 +36,8 @@ import com.microsoft.identity.common.java.net.UrlConnectionHttpClient; import com.microsoft.identity.labapi.utilities.BuildConfig; import com.microsoft.identity.labapi.utilities.authentication.LabApiAuthenticationClient; +import com.microsoft.identity.labapi.utilities.client.ILabAccount; import com.microsoft.identity.labapi.utilities.client.LabClient; -import com.microsoft.identity.labapi.utilities.client.LabGuestAccount; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.exception.LabApiException; @@ -60,7 +60,7 @@ public abstract class AbstractGuestAccountMsalUiTest implements IMsalTest, ILabT public ActivityTestRule mActivityRule = new ActivityTestRule(MainActivity.class); protected Activity mActivity; protected IBrowser mBrowser; - protected LabGuestAccount mGuestUser; + protected ILabAccount mGuestUser; protected LabClient mLabClient; @Before @@ -73,7 +73,7 @@ public void setup() throws LabApiException { ); mLabClient = new LabClient(authenticationClient); - mGuestUser = mLabClient.loadGuestAccountFromLab(getLabQuery()); + mGuestUser = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(getJsonUserType()); } @After @@ -121,4 +121,8 @@ public IBrowser getBrowser() { public int getConfigFileResourceId() { return R.raw.msal_config_default; } + + public int getMSIDLAB4ConfigFileResourceId() { + return R.raw.msal_config_msidlab4; + } } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/AbstractMsalUiTest.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/AbstractMsalUiTest.java index 0ae3f7f5c9..47133c9f08 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/AbstractMsalUiTest.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/AbstractMsalUiTest.java @@ -111,9 +111,9 @@ public void setup() { } private void loadLabUser() { - if (getLabQuery() != null) { + if (getJsonUserType() != null) { try { - mLabAccount = mLabClient.getLabAccount(getLabQuery()); + mLabAccount = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(getJsonUserType()); } catch (final LabApiException e) { throw new AssertionError(e); } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/b2c/AbstractB2CTest.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/b2c/AbstractB2CTest.java deleted file mode 100644 index 978f164f21..0000000000 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/b2c/AbstractB2CTest.java +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// All rights reserved. -// -// This code is licensed under the MIT License. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files(the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions : -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -package com.microsoft.identity.client.msal.automationapp.testpass.b2c; - -import com.microsoft.identity.client.msal.automationapp.AbstractMsalUiTest; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.B2CProvider; -import com.microsoft.identity.labapi.utilities.constants.TempUserType; -import com.microsoft.identity.labapi.utilities.constants.UserType; - -public abstract class AbstractB2CTest extends AbstractMsalUiTest implements IB2CTest { - - @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.B2C) - .b2cProvider(B2CProvider.fromName(getB2cProvider().getProviderName())) - .build(); - } - - @Override - public TempUserType getTempUserType() { - return null; - } - - @Override - public String[] getScopes() { - return new String[]{"https://msidlabb2c.onmicrosoft.com/msidlabb2capi/read"}; - } - - @Override - public String getAuthority() { - return mApplication.getConfiguration().getDefaultAuthority().getAuthorityURL().toString(); - } -} diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/b2c/B2CIdLabSisoPolicyTest.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/b2c/B2CIdLabSisoPolicyTest.java deleted file mode 100644 index 1ec53f882d..0000000000 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/b2c/B2CIdLabSisoPolicyTest.java +++ /dev/null @@ -1,142 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// All rights reserved. -// -// This code is licensed under the MIT License. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files(the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions : -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -package com.microsoft.identity.client.msal.automationapp.testpass.b2c; - -import androidx.annotation.NonNull; - -import com.microsoft.identity.client.Prompt; -import com.microsoft.identity.client.msal.automationapp.R; -import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthResult; -import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams; -import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; -import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; -import com.microsoft.identity.client.ui.automation.app.IApp; -import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; -import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; -import com.microsoft.identity.client.ui.automation.interaction.b2c.B2CPromptHandlerParameters; -import com.microsoft.identity.client.ui.automation.interaction.b2c.B2CProviderWrapper; -import com.microsoft.identity.client.ui.automation.interaction.b2c.IdLabB2cSisoPolicyPromptHandler; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import java.util.Arrays; - -@RunWith(Parameterized.class) -@RetryOnFailure -public class B2CIdLabSisoPolicyTest extends AbstractB2CTest { - - final static B2CProviderWrapper[] b2CProviderWrappers = new B2CProviderWrapper[]{ - // B2CProviderWrapper.Google, // This is breaking on Pipeline - B2CProviderWrapper.Local, - B2CProviderWrapper.MSA, - // B2CProviderWrapper.Facebook, // This is currently breaking, "Facebook Login is currently unavailable for this app" - }; - - @Parameterized.Parameters(name = "{0}") - public static B2CProviderWrapper[] data() { - return b2CProviderWrappers; - } - - private final B2CProviderWrapper mB2cProviderWrapper; - - public B2CIdLabSisoPolicyTest(@NonNull final B2CProviderWrapper b2CProvider) { - mB2cProviderWrapper = b2CProvider; - } - - @Override - public B2CProviderWrapper getB2cProvider() { - return mB2cProviderWrapper; - } - - @Test - public void testCanLoginWithLocalAndSocialAccounts() throws Throwable { - final String username = mLabAccount.getUsername(); - final String password = mLabAccount.getPassword(); - - final MsalSdk msalSdk = new MsalSdk(); - - final MsalAuthTestParams authTestParams = MsalAuthTestParams.builder() - .activity(mActivity) - .loginHint(username) - .scopes(Arrays.asList(mScopes)) - .promptParameter(Prompt.SELECT_ACCOUNT) - .msalConfigResourceId(getConfigFileResourceId()) - .build(); - - final MsalAuthResult authResult = msalSdk.acquireTokenInteractive(authTestParams, new OnInteractionRequired() { - @Override - public void handleUserInteraction() { - ((IApp) mBrowser).handleFirstRun(); - - final B2CPromptHandlerParameters promptHandlerParameters = B2CPromptHandlerParameters.builder() - .prompt(PromptParameter.SELECT_ACCOUNT) - .loginHint(username) - .sessionExpected(false) - .consentPageExpected(false) - .speedBumpExpected(false) - .broker(null) - .expectingBrokerAccountChooserActivity(false) - .b2cProvider(getB2cProvider()) - .build(); - - new IdLabB2cSisoPolicyPromptHandler(promptHandlerParameters) - .handlePrompt(username, password); - } - },TokenRequestTimeout.LONG); - - authResult.assertSuccess(); - - // ------ do silent request ------ - final MsalAuthTestParams authTestSilentParams = MsalAuthTestParams.builder() - .activity(mActivity) - .authority(getAuthority()) - .loginHint(username) - .forceRefresh(false) - .scopes(Arrays.asList(mScopes)) - .msalConfigResourceId(getConfigFileResourceId()) - .build(); - - final MsalAuthResult authSilentResult = msalSdk.acquireTokenSilent(authTestSilentParams, TokenRequestTimeout.SILENT); - authSilentResult.assertSuccess(); - - // ------ do force refresh silent request ------ - final MsalAuthTestParams silentForceParams = MsalAuthTestParams.builder() - .activity(mActivity) - .authority(getAuthority()) - .loginHint(username) - .forceRefresh(true) - .scopes(Arrays.asList(mScopes)) - .msalConfigResourceId(getConfigFileResourceId()) - .build(); - - final MsalAuthResult authSilentForceResult = msalSdk.acquireTokenSilent(silentForceParams, TokenRequestTimeout.SILENT); - authSilentForceResult.assertSuccess(); - } - - @Override - public int getConfigFileResourceId() { - return R.raw.msal_config_b2c_siso; - } -} diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/b2c/IB2CTest.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/b2c/IB2CTest.java deleted file mode 100644 index d0a0ac3ac1..0000000000 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/b2c/IB2CTest.java +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// All rights reserved. -// -// This code is licensed under the MIT License. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files(the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions : -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -package com.microsoft.identity.client.msal.automationapp.testpass.b2c; - -import com.microsoft.identity.client.ui.automation.interaction.b2c.B2CProviderWrapper; - -/** - * An interface describing basic requirements to write a B2C e2e UI Test - */ -public interface IB2CTest { - - B2CProviderWrapper getB2cProvider(); - -} diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/atpop/TestCase1922511.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/atpop/TestCase1922511.java index 2c8fcd4121..1a831336a7 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/atpop/TestCase1922511.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/atpop/TestCase1922511.java @@ -29,15 +29,13 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.constants.AuthScheme; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; @@ -46,7 +44,6 @@ // [Non-Joined] Acquire PoP token interactive followed by Silent // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/1922511 -@RetryOnFailure(retryCount = 2) public class TestCase1922511 extends AbstractMsalBrokerTest { @Test public void test_1922511_Pop_NonJoined_ATPopTokenThenATS() throws Throwable { @@ -105,10 +102,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/atpop/TestCase1922513.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/atpop/TestCase1922513.java index ea79822ee7..3efcdc8cc9 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/atpop/TestCase1922513.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/atpop/TestCase1922513.java @@ -34,9 +34,8 @@ import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; @@ -104,10 +103,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1561087.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1561087.java index fe9e3b4e6f..6a8d903869 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1561087.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1561087.java @@ -27,12 +27,10 @@ import com.microsoft.identity.client.msal.automationapp.R; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.annotations.LocalBrokerHostDebugUiTest; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.broker.BrokerHost; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Assume; @@ -42,7 +40,6 @@ // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/1561087 @SupportedBrokers(brokers = BrokerHost.class) @LocalBrokerHostDebugUiTest -@RetryOnFailure public class TestCase1561087 extends AbstractMsalBrokerTest { @Test public void test_1561087_brokerhostFlightingTest() { @@ -89,10 +86,8 @@ public void test_1561087_brokerhostFlightingTest() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1561136.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1561136.java index d3c32439dd..21a3a7f1c4 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1561136.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1561136.java @@ -30,7 +30,6 @@ import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; import com.microsoft.identity.client.ui.automation.annotations.LocalBrokerHostDebugUiTest; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.broker.BrokerHost; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; @@ -38,11 +37,10 @@ import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandler; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandlerParameters; import com.microsoft.identity.labapi.utilities.client.ILabAccount; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; + import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import java.util.Arrays; import java.util.List; @@ -50,7 +48,6 @@ // Get Broker Accounts // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/1561136 @SupportedBrokers(brokers = BrokerHost.class) -@RetryOnFailure(retryCount = 2) @LocalBrokerHostDebugUiTest public class TestCase1561136 extends AbstractMsalBrokerTest { @@ -114,10 +111,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1561652.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1561652.java index b28ac8b204..8ac824ce6f 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1561652.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1561652.java @@ -30,12 +30,11 @@ import com.microsoft.identity.client.msal.automationapp.R; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.annotations.LocalBrokerHostDebugUiTest; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.broker.BrokerHost; import com.microsoft.identity.common.java.util.StringUtil; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; @@ -47,7 +46,6 @@ // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/1561652 @SupportedBrokers(brokers = {BrokerHost.class}) @LocalBrokerHostDebugUiTest -@RetryOnFailure public class TestCase1561652 extends AbstractMsalBrokerTest { @Test public void test_1561652_brokerhostSSOToken() { @@ -64,7 +62,7 @@ public void test_1561652_brokerhostSSOToken() { } @Override - public LabQuery getLabQuery() { + public UserType getJsonUserType() { return null; } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1600567.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1600567.java index 5d529cc88b..5e0dfdffe3 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1600567.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase1600567.java @@ -28,14 +28,12 @@ import com.microsoft.identity.client.msal.automationapp.BuildConfig; import com.microsoft.identity.client.msal.automationapp.R; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.broker.BrokerHost; import com.microsoft.identity.client.ui.automation.broker.BrokerMicrosoftAuthenticator; import com.microsoft.identity.client.ui.automation.utils.UiAutomatorUtils; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Assume; @@ -47,7 +45,6 @@ // Invoke each API from non-allowed apps. the request should be blocked. // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/1600567 @SupportedBrokers(brokers = {BrokerMicrosoftAuthenticator.class}) -@RetryOnFailure public class TestCase1600567 extends AbstractMsalBrokerTest { @Test public void test_1600567_nonAllowedBrokerApp() throws Throwable { @@ -96,10 +93,8 @@ public void test_1600567_nonAllowedBrokerApp() throws Throwable { @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase3571739.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase3571739.java index 5cf1d3da99..a71ab39297 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase3571739.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/brokerapi/TestCase3571739.java @@ -82,9 +82,8 @@ public class TestCase3571739 extends AbstractMsalBrokerTest { @Test public void test_3571739_webAppsOperations() throws Throwable { - final ILabAccount basicLabAccount = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.BASIC); - final String username = basicLabAccount.getUsername(); - final String password = basicLabAccount.getPassword(); + final String username = mLabAccount.getUsername(); + final String password = mLabAccount.getPassword(); final BrokerHost brokerHost = (BrokerHost) mBroker; @@ -270,10 +269,8 @@ private void setCheckbox(final String resourceId, final boolean checked) { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1400731.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1400731.java index 92439335f9..eef4be0a6c 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1400731.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1400731.java @@ -24,8 +24,6 @@ import android.text.TextUtils; -import androidx.annotation.NonNull; - import com.microsoft.identity.client.Prompt; import com.microsoft.identity.client.msal.automationapp.R; import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthResult; @@ -33,9 +31,6 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; -import com.microsoft.identity.labapi.utilities.client.LabGuestAccount; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.LabConstants; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; @@ -47,16 +42,13 @@ // [Joined] Guest Support: Interactive and Silent Auth with MSAL Test app (Authenticator or Company Portal) // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/1400731/ -@RetryOnFailure(retryCount = 2) public class TestCase1400731 extends AbstractMsalBrokerTest { @Test public void test_1400731_CrossCloud_Joined_GuestATThenATS() throws Throwable { // load a guest user account from the Lab - final LabGuestAccount labGuest = mLabClient.loadGuestAccountFromLab(getLabQuery()); - - final String username = "gcidlab@msidlab4.onmicrosoft.com"; - final String password = mLabClient.getPasswordForGuestUser(labGuest); + final String username = mLabAccount.getUsername(); + final String password = mLabAccount.getPassword(); //perform device registration mBroker.performDeviceRegistration(username, password); @@ -68,7 +60,7 @@ public void test_1400731_CrossCloud_Joined_GuestATThenATS() throws Throwable { .loginHint(username) .scopes(Arrays.asList(mScopes)) .promptParameter(Prompt.SELECT_ACCOUNT) - .authority(LabConstants.MSID_LAB3) + .authority(LabConstants.ID4SLAB1) .msalConfigResourceId(getConfigFileResourceId()) .build(); @@ -87,11 +79,11 @@ public void handleUserInteraction() { .loginHint(username) .scopes(Arrays.asList(mScopes)) .promptParameter(Prompt.SELECT_ACCOUNT) - .authority(LabConstants.MSID_LAB4) + .authority(LabConstants.ID4SLAB2) .msalConfigResourceId(getConfigFileResourceId()) .build(); - // start interactive acquire token request in MSAL for msidlab4 (should succeed and be silent) + // start interactive acquire token request in MSAL for id4slab2 (should succeed and be silent) final MsalAuthResult authResult2 = msalSdk.acquireTokenInteractive(authTestParams2, new com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired() { @Override public void handleUserInteraction() { @@ -107,35 +99,33 @@ public void handleUserInteraction() { final MsalAuthTestParams silentParams = MsalAuthTestParams.builder() .activity(mActivity) .loginHint(username) - .authority(LabConstants.MSID_LAB3) + .authority(LabConstants.ID4SLAB1) .forceRefresh(true) .scopes(Arrays.asList(mScopes)) .msalConfigResourceId(getConfigFileResourceId()) .build(); - // get a token silently for msidlab3 + // get a token silently for id4slab1 final MsalAuthResult silentAuthResult = msalSdk.acquireTokenSilent(silentParams, TokenRequestTimeout.SILENT); silentAuthResult.assertSuccess(); final MsalAuthTestParams silentParams2 = MsalAuthTestParams.builder() .activity(mActivity) .loginHint(username) - .authority(LabConstants.MSID_LAB4) + .authority(LabConstants.ID4SLAB2) .forceRefresh(true) .scopes(Arrays.asList(mScopes)) .msalConfigResourceId(getConfigFileResourceId()) .build(); - // get a token silently for msidlab4 + // get a token silently for id4slab2 final MsalAuthResult silentAuthResult2 = msalSdk.acquireTokenSilent(silentParams2, TokenRequestTimeout.SILENT); silentAuthResult2.assertSuccess(); } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.GUEST) - .build(); + public UserType getJsonUserType() { + return UserType.GUEST; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1420494.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1420494.java index 27b66be69f..fc67ef4c45 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1420494.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1420494.java @@ -24,7 +24,6 @@ import android.text.TextUtils; -import androidx.annotation.NonNull; import com.microsoft.identity.client.Prompt; import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthResult; @@ -34,56 +33,30 @@ import com.microsoft.identity.client.ui.automation.TestContext; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; import com.microsoft.identity.client.ui.automation.annotations.RunOnAPI29Minus; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.constants.GlobalConstants; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.GuestHomeAzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.GuestHomedIn; import com.microsoft.identity.labapi.utilities.constants.UserType; import org.json.JSONObject; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import java.util.Arrays; -import java.util.Collection; -import java.util.concurrent.TimeUnit; // Acquire token for cross cloud guest account (with broker) // https://identitydivision.visualstudio.com/DefaultCollection/IDDP/_workitems/edit/1420494 -@RetryOnFailure(retryCount = 2) -@RunWith(Parameterized.class) @RunOnAPI29Minus("Keep me signed in") public class TestCase1420494 extends AbstractGuestAccountMsalBrokerUiTest { - - private final GuestHomeAzureEnvironment mGuestHomeAzureEnvironment; - - public TestCase1420494(final String name, final @NonNull GuestHomeAzureEnvironment guestHomeAzureEnvironment) { - mGuestHomeAzureEnvironment = guestHomeAzureEnvironment; - } - - // US GOV is covered by other tests, will just test china here - @Parameterized.Parameters(name = "{0}") - public static Collection guestHomeAzureEnvironment() { - return Arrays.asList(new Object[][]{ - {"AZURE_CHINA_CLOUD", GuestHomeAzureEnvironment.AZURE_CHINA_CLOUD}, - }); - } - /** * Tests Acquiring token for Cross cloud Guest account with broker. */ @Test public void test_1420494_CrossCloud_NonJoined_GuestATThenATS() throws Throwable { - final String userName = mGuestUser.getHomeUpn(); - final String password = mLabClient.getPasswordForGuestUser(mGuestUser); + final String userName = mGuestUser.getUsername(); + final String password = mGuestUser.getPassword(); // Handler for Interactive auth call final OnInteractionRequired interactionHandler = () -> { @@ -127,13 +100,8 @@ public void test_1420494_CrossCloud_NonJoined_GuestATThenATS() throws Throwable } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.GUEST) - .guestHomeAzureEnvironment(mGuestHomeAzureEnvironment) - .guestHomedIn(GuestHomedIn.HOST_AZURE_AD) - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.CHINA_GUEST; } @Override @@ -143,7 +111,7 @@ public String[] getScopes() { @Override public String getAuthority() { - return "https://login.microsoftonline.com/" + mGuestUser.getGuestLabTenants().get(0); + return "https://login.microsoftonline.com/" + mGuestUser.getGuestTenantId(); } } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1592465.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1592465.java index fabcd7edfa..8e9498d3c0 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1592465.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1592465.java @@ -24,8 +24,6 @@ import android.text.TextUtils; -import androidx.annotation.NonNull; - import com.microsoft.identity.client.Prompt; import com.microsoft.identity.client.exception.MsalUiRequiredException; import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthResult; @@ -33,53 +31,29 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractGuestAccountMsalBrokerUiTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; import com.microsoft.identity.common.java.util.ThreadUtils; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.GuestHomeAzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.GuestHomedIn; import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import java.util.Arrays; -import java.util.Collection; // Acquire Token from Cross Cloud after acquiring token from home cloud // https://identitydivision.visualstudio.com/DefaultCollection/IDDP/_workitems/edit/1592465 -@RunWith(Parameterized.class) -@RetryOnFailure(retryCount = 2) public class TestCase1592465 extends AbstractGuestAccountMsalBrokerUiTest { - private final GuestHomeAzureEnvironment mGuestHomeAzureEnvironment; - private final String mHomeCloud; - private final String mCrossCloud; - - public TestCase1592465(final String name, final @NonNull GuestHomeAzureEnvironment guestHomeAzureEnvironment, final String homeCloud, final String crossCloud) { - mGuestHomeAzureEnvironment = guestHomeAzureEnvironment; - mHomeCloud = homeCloud; - mCrossCloud = crossCloud; - } - - @Parameterized.Parameters(name = "{0}") - public static Collection guestHomeAzureEnvironment() { - return Arrays.asList(new Object[][]{ - {"AZURE_US_GOV", GuestHomeAzureEnvironment.AZURE_US_GOVERNMENT, /*homeCloud*/"https://login.microsoftonline.us", /*crossCloud*/"https://login.microsoftonline.com"}, - }); - } + private final String mHomeCloud = "https://login.microsoftonline.us"; + private final String mCrossCloud = "https://login.microsoftonline.com"; @Test public void test_1592465_CrossCloud_CrossCloudATThenHomeCloudAT() throws Throwable { - final String userName = mGuestUser.getHomeUpn(); - final String password = mLabClient.getPasswordForGuestUser(mGuestUser); + final String userName = mGuestUser.getUsername(); + final String password = mGuestUser.getPassword(); final OnInteractionRequired homeCloudInteractionHandler = () -> { final PromptHandlerParameters promptHandlerParameters = @@ -98,7 +72,7 @@ public void test_1592465_CrossCloud_CrossCloudATThenHomeCloudAT() throws Throwab .scopes(Arrays.asList(getScopes())) .promptParameter(Prompt.SELECT_ACCOUNT) .authority(getHomeCloudAuthority()) - .msalConfigResourceId(getConfigFileResourceId()) + .msalConfigResourceId(getMSIDLAB4ConfigFileResourceId()) .build(); final MsalSdk msalSdk = new MsalSdk(); @@ -112,7 +86,7 @@ public void test_1592465_CrossCloud_CrossCloudATThenHomeCloudAT() throws Throwab .scopes(Arrays.asList(getScopes())) .promptParameter(Prompt.SELECT_ACCOUNT) .authority(getCrossCloudAuthority()) - .msalConfigResourceId(getConfigFileResourceId()) + .msalConfigResourceId(getMSIDLAB4ConfigFileResourceId()) .build(); // Acquire token silently from cross cloud, expected to throw UiRequired exception @@ -133,13 +107,8 @@ public void test_1592465_CrossCloud_CrossCloudATThenHomeCloudAT() throws Throwab } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.GUEST) - .guestHomeAzureEnvironment(mGuestHomeAzureEnvironment) - .guestHomedIn(GuestHomedIn.HOST_AZURE_AD) - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.USGOV_GUEST; } @Override @@ -157,6 +126,6 @@ private String getHomeCloudAuthority() { } private String getCrossCloudAuthority() { - return mCrossCloud + "/" + mGuestUser.getGuestLabTenants().get(0); + return mCrossCloud + "/" + mGuestUser.getGuestTenantId(); } } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1592510.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1592510.java index f17cb594d8..7319605bdb 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1592510.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/crosscloud/TestCase1592510.java @@ -24,7 +24,6 @@ import android.text.TextUtils; -import androidx.annotation.NonNull; import com.microsoft.identity.client.Prompt; import com.microsoft.identity.client.exception.MsalUiRequiredException; @@ -33,55 +32,30 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractGuestAccountMsalBrokerUiTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.RunOnAPI29Minus; import com.microsoft.identity.client.ui.automation.constants.GlobalConstants; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.GuestHomeAzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.GuestHomedIn; import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import java.util.Arrays; -import java.util.Collection; // Acquire Token from home cloud after acquiring token from cross cloud // https://identitydivision.visualstudio.com/DefaultCollection/IDDP/_workitems/edit/1592510 -@RunWith(Parameterized.class) -@RetryOnFailure(retryCount = 2) @RunOnAPI29Minus("Keep me signed in") public class TestCase1592510 extends AbstractGuestAccountMsalBrokerUiTest { - - private final GuestHomeAzureEnvironment mGuestHomeAzureEnvironment; - private final String mHomeCloud; - private final String mCrossCloud; - - public TestCase1592510(final String name, final @NonNull GuestHomeAzureEnvironment guestHomeAzureEnvironment, final String homeCloud, final String crossCloud) { - mGuestHomeAzureEnvironment = guestHomeAzureEnvironment; - mHomeCloud = homeCloud; - mCrossCloud = crossCloud; - } - - @Parameterized.Parameters(name = "{0}") - public static Collection guestHomeAzureEnvironment() { - return Arrays.asList(new Object[][]{ - {"AZURE_US_GOV", GuestHomeAzureEnvironment.AZURE_US_GOVERNMENT, /*homeCloud*/"https://login.microsoftonline.us", /*crossCloud*/"https://login.microsoftonline.com"}, - }); - } + private final String mHomeCloud = "https://login.microsoftonline.us"; + private final String mCrossCloud = "https://login.microsoftonline.com"; @Test public void test_1592510_CrossCloud_HomeCloudATThenCrossCloudAT() throws Throwable { - final String userName = mGuestUser.getHomeUpn(); - final String password = mLabClient.getPasswordForGuestUser(mGuestUser); + final String userName = mGuestUser.getUsername(); + final String password = mGuestUser.getPassword(); final OnInteractionRequired crossCloudInteractionHandler = () -> { final PromptHandlerParameters promptHandlerParameters = @@ -101,7 +75,7 @@ public void test_1592510_CrossCloud_HomeCloudATThenCrossCloudAT() throws Throwab .scopes(Arrays.asList(getScopes())) .promptParameter(Prompt.SELECT_ACCOUNT) .authority(getCrossCloudAuthority()) - .msalConfigResourceId(getConfigFileResourceId()) + .msalConfigResourceId(getMSIDLAB4ConfigFileResourceId()) .build(); final MsalSdk msalSdk = new MsalSdk(); @@ -115,7 +89,7 @@ public void test_1592510_CrossCloud_HomeCloudATThenCrossCloudAT() throws Throwab .scopes(Arrays.asList(getScopes())) .promptParameter(Prompt.SELECT_ACCOUNT) .authority(getHomeCloudAuthority()) - .msalConfigResourceId(getConfigFileResourceId()) + .msalConfigResourceId(getMSIDLAB4ConfigFileResourceId()) .build(); // Acquire token silently from home cloud, expected to throw an exception @@ -133,13 +107,8 @@ public void test_1592510_CrossCloud_HomeCloudATThenCrossCloudAT() throws Throwab } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.GUEST) - .guestHomeAzureEnvironment(mGuestHomeAzureEnvironment) - .guestHomedIn(GuestHomedIn.HOST_AZURE_AD) - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.USGOV_GUEST; } @Override @@ -157,6 +126,6 @@ private String getHomeCloudAuthority() { } private String getCrossCloudAuthority() { - return mCrossCloud + "/" + mGuestUser.getGuestLabTenants().get(0); + return mCrossCloud + "/" + mGuestUser.getGuestTenantId(); } } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/dcf/AbstractSignInFromOtherDeviceTest.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/dcf/AbstractSignInFromOtherDeviceTest.java index dd53d405bd..d510dde429 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/dcf/AbstractSignInFromOtherDeviceTest.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/dcf/AbstractSignInFromOtherDeviceTest.java @@ -24,22 +24,15 @@ import androidx.annotation.NonNull; -import com.microsoft.identity.client.Prompt; import com.microsoft.identity.client.msal.automationapp.R; import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams; import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadLoginComponentHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - import java.util.AbstractMap; import java.util.ArrayList; import java.util.Arrays; @@ -49,22 +42,19 @@ // Brokered Auth verify "Sign In from other device" option. abstract class AbstractSignInFromOtherDeviceTest extends AbstractMsalBrokerTest { - private AzureEnvironment mAzureEnvironment; + private UserType mUserType; - public AbstractSignInFromOtherDeviceTest(@NonNull AzureEnvironment environment) { - mAzureEnvironment = environment; + public AbstractSignInFromOtherDeviceTest(@NonNull UserType userType) { + mUserType = userType; } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.CLOUD) - .azureEnvironment(mAzureEnvironment) - .build(); + public UserType getJsonUserType() { + return mUserType; } - public void setAzureEnvironment(@NonNull AzureEnvironment environment) { - mAzureEnvironment = environment; + public void setJsonUserType(@NonNull UserType userType) { + mUserType = userType; } @Override @@ -100,7 +90,7 @@ protected void testSignInFromOtherDevice() throws Throwable { @Override public int getConfigFileResourceId() { - if (mAzureEnvironment == AzureEnvironment.AZURE_US_GOVERNMENT) { + if (mUserType == UserType.USGOV) { return R.raw.msal_config_arlington; } return R.raw.msal_config_default; diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/dcf/TestCase2828864.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/dcf/TestCase2828864.java index 12ccf0d2f9..a53b390c81 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/dcf/TestCase2828864.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/dcf/TestCase2828864.java @@ -28,11 +28,9 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams; import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadLoginComponentHandler; import com.microsoft.identity.client.ui.automation.utils.UiAutomatorUtils; -import com.microsoft.identity.common.java.util.ThreadUtils; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; @@ -41,11 +39,10 @@ // Brokered Auth verify "Sign In from other device" option and remote login url. // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2828864 -@RetryOnFailure(retryCount = 2) public class TestCase2828864 extends AbstractSignInFromOtherDeviceTest { public TestCase2828864() { - super(AzureEnvironment.AZURE_CLOUD); + super(UserType.BASIC); } @Test @@ -69,6 +66,7 @@ public void test_2828864_DCF_CheckSignInFromOtherDeviceOptionAvailable() throws UiAutomatorUtils.pressBack(); UiAutomatorUtils.pressBack(); UiAutomatorUtils.pressBack(); + UiAutomatorUtils.pressBack(); // First, try with AZURE_CLOUD this.testSignInFromOtherDevice(); @@ -77,9 +75,10 @@ public void test_2828864_DCF_CheckSignInFromOtherDeviceOptionAvailable() throws UiAutomatorUtils.pressBack(); UiAutomatorUtils.pressBack(); UiAutomatorUtils.pressBack(); + UiAutomatorUtils.pressBack(); // Second, try with AZURE_US_GOVERNMENT - this.setAzureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT); + this.setJsonUserType(UserType.USGOV); this.testSignInFromOtherDevice(); } } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase2495140.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase2495140.java index 4c5e7714d2..de0a73cc8c 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase2495140.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase2495140.java @@ -38,7 +38,6 @@ import com.microsoft.identity.client.ui.automation.TestContext; import com.microsoft.identity.client.ui.automation.TokenRequestLatch; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.app.AzureSampleApp; import com.microsoft.identity.client.ui.automation.broker.BrokerHost; @@ -50,9 +49,7 @@ import com.microsoft.identity.common.internal.util.StringUtil; import com.microsoft.identity.common.java.util.ThreadUtils; import com.microsoft.identity.labapi.utilities.client.ILabAccount; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; -import com.microsoft.identity.labapi.utilities.constants.UserRole; import com.microsoft.identity.labapi.utilities.constants.UserType; import com.microsoft.identity.labapi.utilities.exception.LabApiException; @@ -66,7 +63,6 @@ // and clean all data. // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/2495140 @SupportedBrokers(brokers = {BrokerMicrosoftAuthenticator.class, BrokerHost.class}) -@RetryOnFailure public class TestCase2495140 extends AbstractMsalBrokerTest { final String TAG = TestCase2495140.class.getSimpleName(); @@ -91,14 +87,10 @@ public void test_2495140_FLW_SDMGlobalSignoutClearsDataAndExistingRequests() thr ICurrentAccountResult currentAccountResult = singleAccountPCA.getCurrentAccount(); Assert.assertNull("There is already a signed in account...", currentAccountResult.getCurrentAccount()); Logger.i(TAG, "Fetching another user from same tenant from lab account"); - final LabQuery labQuery = LabQuery.builder() - .userType(UserType.CLOUD) - .build(); - - final ILabAccount labAccount = mLabClient.getLabAccount(labQuery); + final ILabAccount labAccount2 = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.BASIC); - final String username2 = labAccount.getUsername(); - final String password2 = labAccount.getPassword(); + final String username2 = labAccount2.getUsername(); + final String password2 = labAccount2.getPassword(); Assert.assertNotEquals(username1, username2); @@ -205,10 +197,8 @@ public int getConfigFileResourceId() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userRole(UserRole.CLOUD_DEVICE_ADMINISTRATOR) - .build(); + public UserType getJsonUserType() { + return UserType.DEVICE_ADMIN; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833511.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833511.java index 5f6edf8ec6..ec3b9a7c54 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833511.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833511.java @@ -31,12 +31,10 @@ import com.microsoft.identity.client.msal.automationapp.R; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.broker.BrokerMicrosoftAuthenticator; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; @@ -44,7 +42,6 @@ // End My Shift - Perform shared device registration with non-admin account. // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/833511 @SupportedBrokers(brokers = {BrokerMicrosoftAuthenticator.class}) -@RetryOnFailure(retryCount = 2) public class TestCase833511 extends AbstractMsalBrokerTest { @Test @@ -70,10 +67,8 @@ public void test_833511_FLW_SDMFailsForNonAdminAccount() { sharedDeviceConfirmation.exists()); } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833513.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833513.java index b34e29d4ef..4702a664a6 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833513.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833513.java @@ -41,10 +41,8 @@ import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; import com.microsoft.identity.common.java.exception.ClientException; import com.microsoft.identity.labapi.utilities.client.ILabAccount; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; -import com.microsoft.identity.labapi.utilities.constants.UserRole; +import com.microsoft.identity.labapi.utilities.constants.UserType; import com.microsoft.identity.labapi.utilities.exception.LabApiException; import org.junit.Assert; @@ -63,11 +61,7 @@ public void test_833513_FLW_SDMATOnlyPossibleFromTheSameTenant() throws MsalExce final String password1 = mLabAccount.getPassword(); // query to load a user from a different tenant that is used for WPJ - final LabQuery query = LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build(); - - final ILabAccount difTenantAccount = mLabClient.getLabAccount(query); + final ILabAccount difTenantAccount = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.USGOV); final String username2 = difTenantAccount.getUsername(); final String password2 = difTenantAccount.getPassword(); @@ -115,10 +109,8 @@ public void test_833513_FLW_SDMATOnlyPossibleFromTheSameTenant() throws MsalExce } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userRole(UserRole.CLOUD_DEVICE_ADMINISTRATOR) - .build(); + public UserType getJsonUserType() { + return UserType.DEVICE_ADMIN; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833514.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833514.java index 8c9486bd26..a948f8faf1 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833514.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833514.java @@ -36,8 +36,6 @@ import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestLatch; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; -import com.microsoft.identity.client.ui.automation.annotations.RunOnAPI29Minus; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.app.AzureSampleApp; import com.microsoft.identity.client.ui.automation.broker.BrokerHost; @@ -45,9 +43,7 @@ import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandlerParameters; import com.microsoft.identity.labapi.utilities.client.ILabAccount; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; -import com.microsoft.identity.labapi.utilities.constants.UserRole; import com.microsoft.identity.labapi.utilities.constants.UserType; import com.microsoft.identity.labapi.utilities.exception.LabApiException; @@ -60,7 +56,6 @@ // End My Shift - In Shared device mode, an account signed in through App A can be used by App B. // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/833514 @SupportedBrokers(brokers = {BrokerMicrosoftAuthenticator.class, BrokerHost.class}) -@RetryOnFailure(retryCount = 2) public class TestCase833514 extends AbstractMsalBrokerTest { @Test @@ -89,12 +84,8 @@ public void test_833514_FLW_SDM_SSO() throws MsalException, InterruptedException Assert.assertTrue(mApplication.isSharedDevice()); // query to load a user from the same tenant that was used for WPJ - final LabQuery query = LabQuery.builder() - .userType(UserType.CLOUD) - .build(); - // get username and password for this account - final ILabAccount user2 = mLabClient.getLabAccount(query); + final ILabAccount user2 = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.BASIC); final String username2 = user2.getUsername(); final String password2 = user2.getPassword(); @@ -189,10 +180,8 @@ public void onError(@NonNull MsalException exception) { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userRole(UserRole.CLOUD_DEVICE_ADMINISTRATOR) - .build(); + public UserType getJsonUserType() { + return UserType.DEVICE_ADMIN; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833515.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833515.java index cbd2aea225..0c78fab99e 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833515.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833515.java @@ -35,7 +35,6 @@ import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestLatch; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.app.AzureSampleApp; import com.microsoft.identity.client.ui.automation.app.OutlookApp; @@ -48,9 +47,7 @@ import com.microsoft.identity.client.ui.automation.utils.UiAutomatorUtils; import com.microsoft.identity.common.java.util.ThreadUtils; import com.microsoft.identity.labapi.utilities.client.ILabAccount; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; -import com.microsoft.identity.labapi.utilities.constants.UserRole; import com.microsoft.identity.labapi.utilities.constants.UserType; import com.microsoft.identity.labapi.utilities.exception.LabApiException; @@ -63,7 +60,6 @@ // End My Shift - In Shared device mode, global sign out should work. // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/833515 @SupportedBrokers(brokers = {BrokerMicrosoftAuthenticator.class, BrokerHost.class}) -@RetryOnFailure(retryCount = 2) public class TestCase833515 extends AbstractMsalBrokerTest { @Test @@ -99,11 +95,7 @@ public void test_833515_FLW_SDMGlobalSignOut() throws MsalException, Interrupted Assert.assertNull("There is already a signed in account...", currentAccountResult.getCurrentAccount()); // fetching another user from lab account - final LabQuery labQuery = LabQuery.builder() - .userType(UserType.CLOUD) - .build(); - - final ILabAccount labAccount = mLabClient.getLabAccount(labQuery); + final ILabAccount labAccount = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.BASIC); final String username2 = labAccount.getUsername(); final String password2 = labAccount.getPassword(); Thread.sleep(TimeUnit.SECONDS.toMillis(30)); @@ -194,10 +186,8 @@ public int getConfigFileResourceId() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userRole(UserRole.CLOUD_DEVICE_ADMINISTRATOR) - .build(); + public UserType getJsonUserType() { + return UserType.DEVICE_ADMIN; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833516.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833516.java index 44b4184ae5..f5809bd0a2 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833516.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833516.java @@ -32,7 +32,6 @@ import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestLatch; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.broker.BrokerHost; import com.microsoft.identity.client.ui.automation.broker.BrokerMicrosoftAuthenticator; @@ -40,11 +39,8 @@ import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; import com.microsoft.identity.labapi.utilities.client.ILabAccount; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.ProtectionPolicy; import com.microsoft.identity.labapi.utilities.constants.TempUserType; -import com.microsoft.identity.labapi.utilities.constants.UserRole; +import com.microsoft.identity.labapi.utilities.constants.UserType; import com.microsoft.identity.labapi.utilities.exception.LabApiException; import org.junit.Assert; @@ -55,7 +51,6 @@ // End My Shift - In Shared device mode, there can be only one sign-in account. // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/833516 @SupportedBrokers(brokers = {BrokerMicrosoftAuthenticator.class, BrokerHost.class}) -@RetryOnFailure(retryCount = 2) public class TestCase833516 extends AbstractMsalBrokerTest { @Test @@ -84,11 +79,7 @@ public void test_833516_FLW_SDMOnlyOneAccount() throws MsalException, Interrupte Assert.assertTrue(mApplication.isSharedDevice()); // query to load a user from a same tenant that was used for WPJ - final LabQuery query = LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); - - final ILabAccount sameTenantUser = mLabClient.getLabAccount(query); + final ILabAccount sameTenantUser = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.BASIC); final String username2 = sameTenantUser.getUsername(); final String password2 = sameTenantUser.getPassword(); @@ -123,12 +114,7 @@ public void test_833516_FLW_SDMOnlyOneAccount() throws MsalException, Interrupte // try sign in with a different account - it should fail // query to load another user from the same tenant - final LabQuery query2 = LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .protectionPolicy(ProtectionPolicy.MAM_CA) - .build(); - - final ILabAccount difTenantUser = mLabClient.getLabAccount(query2); + final ILabAccount difTenantUser = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.MAM_CA); final String difTenantUsername = difTenantUser.getUsername(); final TokenRequestLatch latch2 = new TokenRequestLatch(1); @@ -146,10 +132,8 @@ public void test_833516_FLW_SDMOnlyOneAccount() throws MsalException, Interrupte } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userRole(UserRole.CLOUD_DEVICE_ADMINISTRATOR) - .build(); + public UserType getJsonUserType() { + return UserType.DEVICE_ADMIN; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833517.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833517.java index 17d4920739..69d550ec5a 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833517.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/flw/TestCase833517.java @@ -40,7 +40,6 @@ import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestLatch; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.app.AzureSampleApp; import com.microsoft.identity.client.ui.automation.broker.BrokerMicrosoftAuthenticator; @@ -51,10 +50,7 @@ import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; import com.microsoft.identity.client.ui.automation.logging.Logger; import com.microsoft.identity.labapi.utilities.client.ILabAccount; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; -import com.microsoft.identity.labapi.utilities.constants.UserRole; import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; @@ -65,7 +61,6 @@ // End My Shift - In Shared device mode, MSAL should notify the app if the sign-out account is changed. // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/833517 @SupportedBrokers(brokers = {BrokerMicrosoftAuthenticator.class}) -@RetryOnFailure(retryCount = 2) public class TestCase833517 extends AbstractMsalBrokerTest { final String TAG = TestCase833517.class.getSimpleName(); @Test @@ -78,8 +73,7 @@ public void test_833517_FLW_SDMAccountSignOutNotification() throws Throwable{ (SingleAccountPublicClientApplication) PublicClientApplication.create(mContext, getConfigFileResourceId()); Logger.i(TAG, "Fetching another user from same tenant from lab account"); - final LabQuery labQuery = LabQuery.builder().userType(UserType.CLOUD).build(); - final ILabAccount labAccount = mLabClient.getLabAccount(labQuery); + final ILabAccount labAccount = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.BASIC); final String username = labAccount.getUsername(); final String password = labAccount.getPassword(); @@ -142,11 +136,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .userRole(UserRole.CLOUD_DEVICE_ADMINISTRATOR) - .build(); + public UserType getJsonUserType() { + return UserType.DEVICE_ADMIN; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/foci/TestCase833544.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/foci/TestCase833544.java index d8fea62317..c947882c3e 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/foci/TestCase833544.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/foci/TestCase833544.java @@ -27,7 +27,6 @@ import com.microsoft.identity.client.msal.automationapp.R; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.annotations.LongUIAutomationTest; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.app.AzureSampleApp; import com.microsoft.identity.client.ui.automation.app.OutlookApp; @@ -41,8 +40,6 @@ import com.microsoft.identity.client.ui.automation.utils.UiAutomatorUtils; import com.microsoft.identity.common.java.util.ThreadUtils; import com.microsoft.identity.labapi.utilities.client.ILabAccount; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; import com.microsoft.identity.labapi.utilities.exception.LabApiException; @@ -56,7 +53,6 @@ // [Non-joined][FoCl] FoCl (Multi-users) with Outlook and Word // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/833544 @SupportedBrokers(brokers = {BrokerMicrosoftAuthenticator.class}) -@RetryOnFailure @LongUIAutomationTest public class TestCase833544 extends AbstractMsalBrokerTest { @@ -130,12 +126,7 @@ public void test_833544_NonJoined_FOCI_SSO() throws LabApiException { azureSample.confirmSignedIn("None"); // fetch another account from lab - someone from a different tenant - final LabQuery govAccountQuery = LabQuery.builder() - .userType(UserType.CLOUD) - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build(); - - final ILabAccount govAccount = mLabClient.getLabAccount(govAccountQuery); + final ILabAccount govAccount = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.USGOV); final String usernameGov = govAccount.getUsername(); final String passwordGov = govAccount.getPassword(); @@ -211,10 +202,8 @@ public void test_833544_NonJoined_FOCI_SSO() throws LabApiException { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase1561125.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase1561125.java index 4b16498141..3e6ad46cae 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase1561125.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase1561125.java @@ -38,7 +38,6 @@ import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestLatch; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; @@ -46,22 +45,18 @@ import com.microsoft.identity.common.internal.util.StringUtil; import com.microsoft.identity.common.java.providers.oauth2.IDToken; import com.microsoft.identity.labapi.utilities.client.ILabAccount; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import com.microsoft.identity.labapi.utilities.exception.LabApiException; - import org.junit.Assert; import org.junit.Test; - import java.util.Arrays; import java.util.Map; import java.util.concurrent.CountDownLatch; // [Joined][MSAL] In-line WPJ: Perform Device registration with deviceid claim // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/1561125 -@RetryOnFailure(retryCount = 2) public class TestCase1561125 extends AbstractMsalBrokerTest { final String TAG = TestCase1561125.class.getSimpleName(); private IAccount mTempAccount = null; @@ -192,10 +187,8 @@ private ClaimsRequest deviceIdClaimsRequest() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase1561147.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase1561147.java index 03631888df..2b7b38984c 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase1561147.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase1561147.java @@ -30,25 +30,19 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandler; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandlerParameters; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; -import org.junit.Ignore; import org.junit.Test; import java.util.Arrays; // [Joined][MSAL] Broker Auth - Federated User // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/1561147 -@RetryOnFailure(retryCount = 2) -@Ignore("Federated Account in LAB is not working at the moment") public class TestCase1561147 extends AbstractMsalBrokerTest { @Test public void test_1561147_Joined_FederatedUser() throws Throwable { @@ -100,11 +94,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .userType(UserType.FEDERATED) - .build(); + public UserType getJsonUserType() { + return UserType.FEDERATED; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase714567.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase714567.java index 0722706de7..8163314968 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase714567.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase714567.java @@ -33,7 +33,6 @@ import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TestContext; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.broker.BrokerMicrosoftAuthenticator; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; @@ -42,11 +41,8 @@ import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; import com.microsoft.identity.client.ui.automation.utils.UiAutomatorUtils; import com.microsoft.identity.labapi.utilities.client.ILabAccount; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; -import com.microsoft.identity.labapi.utilities.constants.UserRole; -import com.microsoft.identity.labapi.utilities.exception.LabApiException; - +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; @@ -55,7 +51,6 @@ // [Broker] Device registration via Settings page (with Authenticator as broker) // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/714567 @SupportedBrokers(brokers = BrokerMicrosoftAuthenticator.class) -@RetryOnFailure public class TestCase714567 extends AbstractMsalBrokerTest { @Test @@ -148,10 +143,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userRole(UserRole.CLOUD_DEVICE_ADMINISTRATOR) - .build(); + public UserType getJsonUserType() { + return UserType.DEVICE_ADMIN; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase832430.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase832430.java index 4552bc06f3..3f296a9c1d 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase832430.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase832430.java @@ -31,26 +31,21 @@ import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TestContext; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.RunOnAPI29Minus; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.ProtectionPolicy; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; -import java.util.Arrays; import java.util.concurrent.TimeUnit; // [Joined][MSAL] Acquire Token + Acquire Token Silent with resource (Prompt.SELECT_ACCOUNT) // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/832430 -@RetryOnFailure(retryCount = 2) @RunOnAPI29Minus public class TestCase832430 extends AbstractMsalBrokerTest { @@ -81,7 +76,7 @@ public void handleUserInteraction() { .speedBumpExpected(false) .broker(mBroker) .expectingBrokerAccountChooserActivity(false) - .registerPageExpected(true) + .registerPageExpected(false) .build(); new AadPromptHandler(promptHandlerParameters) @@ -180,7 +175,7 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { + public UserType getJsonUserType() { return null; } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2572249.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2572249.java new file mode 100644 index 0000000000..cbfd434935 --- /dev/null +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2572249.java @@ -0,0 +1,153 @@ +// Copyright (c) Microsoft Corporation. +// All rights reserved. +// +// This code is licensed under the MIT License. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files(the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions : +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +package com.microsoft.identity.client.msal.automationapp.testpass.broker.ltw; + +import androidx.annotation.NonNull; + +import com.microsoft.identity.client.msal.automationapp.BuildConfig; +import com.microsoft.identity.client.msal.automationapp.R; +import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; +import com.microsoft.identity.client.ui.automation.annotations.LTWTests; +import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; +import com.microsoft.identity.client.ui.automation.app.MsalTestApp; +import com.microsoft.identity.client.ui.automation.app.OneAuthTestApp; +import com.microsoft.identity.client.ui.automation.broker.BrokerLTW; +import com.microsoft.identity.client.ui.automation.broker.BrokerMicrosoftAuthenticator; +import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; +import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandlerParameters; +import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import java.util.Arrays; +import java.util.List; + +// Updated LTW, Updated Auth app and uninstall LTW +// https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2572249 +@LTWTests +@SupportedBrokers(brokers = {BrokerLTW.class}) +@RunWith(Parameterized.class) +public class TestCase2572249 extends AbstractMsalBrokerTest { + + private final UserType mUserType; + + public TestCase2572249(@NonNull UserType userType) { + mUserType = userType; + } + + @Parameterized.Parameters(name = "{0}") + public static List userType() { + return Arrays.asList( + UserType.MSA, + UserType.BASIC + ); + } + + @Test + public void test_2572249_LTW_SSOAfterLTWUninstallIfAuthenticatorPresent() throws Throwable { + if (BuildConfig.COPY_OF_LOCAL_FLIGHTS_FOR_TEST_PURPOSES.contains("EnableBrokerDiscoveryV2Protocol:true")) { + // No longer applicable with V2 protocol. + return; + } + + + final String username = mLabAccount.getUsername(); + final String password = mLabAccount.getPassword(); + + // install updated auth app + final BrokerMicrosoftAuthenticator brokerMicrosoftAuthenticator = new BrokerMicrosoftAuthenticator(); + brokerMicrosoftAuthenticator.install(); + + // acquire token interactively in MsalTestApp + final MsalTestApp msalTestApp = new MsalTestApp(); + msalTestApp.install(); + msalTestApp.launch(); + msalTestApp.handleFirstRunBasedOnUserType(mUserType); + + final MicrosoftStsPromptHandlerParameters promptHandlerParametersMsal = MicrosoftStsPromptHandlerParameters.builder() + .prompt(PromptParameter.SELECT_ACCOUNT) + .loginHint(username) + .sessionExpected(false) + .broker(mBroker) + .expectingBrokerAccountChooserActivity(false) + .expectingProvidedAccountInBroker(false) + .expectingLoginPageAccountPicker(false) + .expectingProvidedAccountInCookie(false) + .consentPageExpected(false) + .passwordPageExpected(true) + .speedBumpExpected(false) + .registerPageExpected(false) + .enrollPageExpected(false) + .staySignedInPageExpected(false) + .verifyYourIdentityPageExpected(false) + .howWouldYouLikeToSignInExpected(false) + .build(); + + String tokenMsal = msalTestApp.acquireToken(username, password, promptHandlerParametersMsal, true); + Assert.assertNotNull(tokenMsal); + + // uninstall LTW + mBroker.uninstall(); + + // install OneAuthTestApp + final OneAuthTestApp oneAuthTestApp = new OneAuthTestApp(); + oneAuthTestApp.install(); + oneAuthTestApp.launch(); + oneAuthTestApp.handleFirstRunBasedOnUserType(mUserType); + + // sign in to OneAuthTestApp + // should not prompt for password + oneAuthTestApp.handleUserNameInput(username); + oneAuthTestApp.handleSignInWithoutPrompt(); + } + + + @Override + public UserType getJsonUserType() { + return mUserType; + } + + @Override + public TempUserType getTempUserType() { + return null; + } + + @Override + public String[] getScopes() { + return new String[]{"User.read"}; + } + + @Override + public String getAuthority() { + return mApplication.getConfiguration().getDefaultAuthority().getAuthorityURL().toString(); + } + + @Override + public int getConfigFileResourceId() { + return R.raw.msal_config_default; + } +} \ No newline at end of file diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2572280.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2572280.java index 48b7de0d61..260aad1b19 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2572280.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2572280.java @@ -22,36 +22,25 @@ // THE SOFTWARE. package com.microsoft.identity.client.msal.automationapp.testpass.broker.ltw; -import androidx.annotation.NonNull; - import com.microsoft.identity.client.msal.automationapp.R; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.annotations.LTWTests; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.app.MsalTestApp; import com.microsoft.identity.client.ui.automation.broker.BrokerCompanyPortal; import com.microsoft.identity.client.ui.automation.broker.BrokerLTW; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandlerParameters; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.Arrays; -import java.util.List; // LTW has higher priority than CP // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2572280 @LTWTests -@RetryOnFailure @SupportedBrokers(brokers = {BrokerLTW.class}) -@RunWith(Parameterized.class) public class TestCase2572280 extends AbstractMsalBrokerTest { private final UserType mUserType = UserType.MSA; @@ -95,11 +84,10 @@ public void test_2572280_LTW_LTWHasHigherPriorityThanCP() throws Throwable { final String activeBroker = msalTestApp.getActiveBrokerPackageName(); Assert.assertEquals("Active broker pkg name : " + BrokerLTW.BROKER_LTW_APP_PACKAGE_NAME, activeBroker); } + @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.MSA) - .build(); + public UserType getJsonUserType() { + return mUserType; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2582292.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2582292.java index 6c1c709fde..aa51dbff5f 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2582292.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2582292.java @@ -28,7 +28,6 @@ import com.microsoft.identity.client.msal.automationapp.R; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.annotations.LTWTests; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.app.MsalTestApp; import com.microsoft.identity.client.ui.automation.broker.BrokerHost; @@ -37,10 +36,7 @@ import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandlerParameters; import com.microsoft.identity.labapi.utilities.client.ILabAccount; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; -import com.microsoft.identity.labapi.utilities.constants.UserRole; import com.microsoft.identity.labapi.utilities.constants.UserType; import com.microsoft.identity.labapi.utilities.exception.LabApiException; @@ -53,7 +49,6 @@ // If LTW is the active broker, and request is made through Authenticator from an old MSAL in shared device mode, nothing should break // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2582292 @LTWTests -@RetryOnFailure @SupportedBrokers(brokers = {BrokerLTW.class}) public class TestCase2582292 extends AbstractMsalBrokerTest { @@ -103,11 +98,7 @@ public void test_2582292_LTW_LTWActiveBrokerShouldNotBreakSDMMSALAuthenticatorRe Assert.assertTrue(mode.contains("Single Account - Shared device")); // performs AcquireToken with an account from the same tenant with the WPJed account. - final LabQuery query = LabQuery.builder() - .userType(UserType.CLOUD) - .build(); - - final ILabAccount difAccount = mLabClient.getLabAccount(query); + final ILabAccount difAccount = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.BASIC); final String username2 = difAccount.getUsername(); final String password2 = difAccount.getPassword(); @@ -149,11 +140,8 @@ public void test_2582292_LTW_LTWActiveBrokerShouldNotBreakSDMMSALAuthenticatorRe } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .userRole(UserRole.CLOUD_DEVICE_ADMINISTRATOR) - .build(); + public UserType getJsonUserType() { + return UserType.DEVICE_ADMIN; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2584410.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2584410.java index 4746c55492..13ab90e283 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2584410.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase2584410.java @@ -22,13 +22,10 @@ // THE SOFTWARE. package com.microsoft.identity.client.msal.automationapp.testpass.broker.ltw; -import androidx.annotation.NonNull; - import com.microsoft.identity.client.msal.automationapp.BuildConfig; import com.microsoft.identity.client.msal.automationapp.R; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.annotations.LTWTests; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.app.MsalTestApp; import com.microsoft.identity.client.ui.automation.broker.BrokerCompanyPortal; @@ -36,26 +33,18 @@ import com.microsoft.identity.client.ui.automation.broker.BrokerMicrosoftAuthenticator; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandlerParameters; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.Arrays; -import java.util.List; // Authenticator has highest priority - Case3 (Auth, LTW, CP) // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2584410 @LTWTests -@RetryOnFailure @SupportedBrokers(brokers = {BrokerMicrosoftAuthenticator.class}) -@RunWith(Parameterized.class) public class TestCase2584410 extends AbstractMsalBrokerTest { - private final UserType mUserType = UserType.CLOUD; + private final UserType mUserType = UserType.BASIC; @Test public void test_2584410_LTW_AuthenticatorHighestPriorityAuthLTWCP() throws Throwable { @@ -107,10 +96,8 @@ public void test_2584410_LTW_AuthenticatorHighestPriorityAuthLTWCP() throws Thro } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(mUserType) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase3029738.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase3029738.java index 4f464c8ccd..21b83ad266 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase3029738.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TestCase3029738.java @@ -24,21 +24,15 @@ import androidx.annotation.NonNull; -import com.microsoft.identity.client.msal.automationapp.BuildConfig; import com.microsoft.identity.client.msal.automationapp.R; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.annotations.LTWTests; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.app.MsalTestApp; -import com.microsoft.identity.client.ui.automation.app.OneAuthTestApp; import com.microsoft.identity.client.ui.automation.broker.BrokerLTW; -import com.microsoft.identity.client.ui.automation.broker.BrokerMicrosoftAuthenticator; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandlerParameters; import com.microsoft.identity.client.ui.automation.utils.UiAutomatorUtils; -import com.microsoft.identity.common.java.util.ThreadUtils; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; @@ -53,7 +47,6 @@ // Sign in with AAD and MSA account // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/3029738 @LTWTests -@RetryOnFailure @SupportedBrokers(brokers = {BrokerLTW.class}) @RunWith(Parameterized.class) public class TestCase3029738 extends AbstractMsalBrokerTest { @@ -64,13 +57,11 @@ public TestCase3029738(@NonNull UserType userType) { mUserType = userType; } - private final String TAG = TestCase3029738.class.getSimpleName(); - @Parameterized.Parameters(name = "{0}") public static List userType() { return Arrays.asList( UserType.MSA, - UserType.CLOUD + UserType.BASIC ); } @@ -122,38 +113,11 @@ public void test_3029738_LTW_AT() throws Throwable { } else { Assert.assertTrue(UiAutomatorUtils.obtainUiObjectWithText("Work or school account").exists()); } - - if (BuildConfig.COPY_OF_LOCAL_FLIGHTS_FOR_TEST_PURPOSES.contains("EnableBrokerDiscoveryV2Protocol:true")) { - // No longer applicable with V2 protocol. - return; - } - - // install updated auth app - final BrokerMicrosoftAuthenticator brokerMicrosoftAuthenticator = new BrokerMicrosoftAuthenticator(); - brokerMicrosoftAuthenticator.install(); - - ThreadUtils.sleepSafely(5000, TAG, "Waiting for 5 seconds to let the Authenticator app settle."); - - // uninstall LTW - mBroker.uninstall(); - - // install OneAuthTestApp - final OneAuthTestApp oneAuthTestApp = new OneAuthTestApp(); - oneAuthTestApp.install(); - oneAuthTestApp.launch(); - oneAuthTestApp.handleFirstRunBasedOnUserType(mUserType); - - // sign in to OneAuthTestApp - // should not prompt for password - oneAuthTestApp.handleUserNameInput(username); - oneAuthTestApp.handleSignInWithoutPrompt(); } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(mUserType) - .build(); + public UserType getJsonUserType() { + return mUserType; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TransferToken/TestCase3026421.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TransferToken/TestCase3026421.java index 103bd2d013..8b278c8905 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TransferToken/TestCase3026421.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/ltw/TransferToken/TestCase3026421.java @@ -32,31 +32,25 @@ import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; import com.microsoft.identity.client.ui.automation.annotations.LTWTests; -import com.microsoft.identity.client.ui.automation.annotations.LocalBrokerHostDebugUiTest; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.broker.BrokerHost; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assume; -import org.junit.Before; import org.junit.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - // Transfer token generation and restore // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/3026421 @LTWTests -@RetryOnFailure @SupportedBrokers(brokers = {BrokerHost.class}) public class TestCase3026421 extends AbstractMsalBrokerTest { @@ -110,10 +104,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.MSA) - .build(); + public UserType getJsonUserType() { + return UserType.MSA; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase2506936.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase2506936.kt index c148d3e6ed..48296c7434 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase2506936.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase2506936.kt @@ -24,7 +24,6 @@ package com.microsoft.identity.client.msal.automationapp.testpass.broker.mam import com.microsoft.identity.client.msal.automationapp.R import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers import com.microsoft.identity.client.ui.automation.app.TeamsApp import com.microsoft.identity.client.ui.automation.broker.BrokerCompanyPortal @@ -32,8 +31,6 @@ import com.microsoft.identity.client.ui.automation.broker.IMdmAgent import com.microsoft.identity.client.ui.automation.installer.LocalApkInstaller import com.microsoft.identity.client.ui.automation.interaction.FirstPartyAppPromptHandlerParameters import com.microsoft.identity.client.ui.automation.interaction.PromptParameter -import com.microsoft.identity.labapi.utilities.client.LabQuery -import com.microsoft.identity.labapi.utilities.constants.ProtectionPolicy import com.microsoft.identity.labapi.utilities.constants.TempUserType import com.microsoft.identity.labapi.utilities.constants.UserType import org.junit.Test @@ -41,7 +38,6 @@ import org.junit.Test // TrueMAM: Sign In with Teams and then SignOut and Sign Back In // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2506936 @SupportedBrokers(brokers = [BrokerCompanyPortal::class]) -@RetryOnFailure class TestCase2506936 : AbstractMsalBrokerTest(){ @Test @@ -111,11 +107,8 @@ class TestCase2506936 : AbstractMsalBrokerTest(){ return R.raw.msal_config_default } - override fun getLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .protectionPolicy(ProtectionPolicy.TRUE_MAM_CA) - .build() + override fun getJsonUserType(): UserType? { + return UserType.TRUE_MAM_CA } override fun getTempUserType(): TempUserType? { diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase2516571.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase2516571.kt index a45249eeaa..ee7247090c 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase2516571.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase2516571.kt @@ -25,7 +25,6 @@ package com.microsoft.identity.client.msal.automationapp.testpass.broker.mam import com.microsoft.identity.client.msal.automationapp.BuildConfig import com.microsoft.identity.client.msal.automationapp.AbstractMsalUiTest import com.microsoft.identity.client.msal.automationapp.R -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure import com.microsoft.identity.client.ui.automation.app.OutlookApp import com.microsoft.identity.client.ui.automation.broker.BrokerCompanyPortal import com.microsoft.identity.client.ui.automation.broker.BrokerHost @@ -35,8 +34,6 @@ import com.microsoft.identity.client.ui.automation.interaction.FirstPartyAppProm import com.microsoft.identity.client.ui.automation.interaction.PromptParameter import com.microsoft.identity.client.ui.automation.utils.UiAutomatorUtils import com.microsoft.identity.common.java.util.ThreadUtils -import com.microsoft.identity.labapi.utilities.client.LabQuery -import com.microsoft.identity.labapi.utilities.constants.ProtectionPolicy import com.microsoft.identity.labapi.utilities.constants.TempUserType import com.microsoft.identity.labapi.utilities.constants.UserType import org.junit.Assert @@ -45,7 +42,6 @@ import org.junit.Test // Using TrueMAM account will require a broker, and will require CP instead of Authenticator // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2516571 -@RetryOnFailure class TestCase2516571 : AbstractMsalUiTest(){ @Test @@ -157,7 +153,7 @@ class TestCase2516571 : AbstractMsalUiTest(){ // Not totally sure what prompts outlook to take the snackbar away, sometimes it still appears after re-authentication // We wait a bit and relaunch outlook twice, this seems improve the chance of the snackbar disappearing - ThreadUtils.sleepSafely(20000, "sleeping", "interrupted sleep") + ThreadUtils.sleepSafely(35000, "sleeping", "interrupted sleep") outlook.forceStop() outlook.launch() outlook.forceStop() @@ -179,11 +175,8 @@ class TestCase2516571 : AbstractMsalUiTest(){ return R.raw.msal_config_default } - override fun getLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .protectionPolicy(ProtectionPolicy.TRUE_MAM_CA) - .build() + override fun getJsonUserType(): UserType? { + return UserType.TRUE_MAM_CA } override fun getTempUserType(): TempUserType? { diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase2798415.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase2798415.kt index 4998deded3..f721b53010 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase2798415.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase2798415.kt @@ -25,7 +25,6 @@ package com.microsoft.identity.client.msal.automationapp.testpass.broker.mam import com.microsoft.identity.client.exception.MsalException import com.microsoft.identity.client.msal.automationapp.R import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers import com.microsoft.identity.client.ui.automation.app.TeamsApp import com.microsoft.identity.client.ui.automation.broker.BrokerCompanyPortal @@ -35,11 +34,9 @@ import com.microsoft.identity.client.ui.automation.installer.LocalApkInstaller import com.microsoft.identity.client.ui.automation.interaction.FirstPartyAppPromptHandlerParameters import com.microsoft.identity.client.ui.automation.interaction.PromptParameter import com.microsoft.identity.client.ui.automation.logging.Logger +import com.microsoft.identity.common.java.util.ThreadUtils import com.microsoft.identity.labapi.utilities.client.ILabAccount -import com.microsoft.identity.labapi.utilities.client.LabQuery -import com.microsoft.identity.labapi.utilities.constants.ProtectionPolicy import com.microsoft.identity.labapi.utilities.constants.TempUserType -import com.microsoft.identity.labapi.utilities.constants.UserRole import com.microsoft.identity.labapi.utilities.constants.UserType import com.microsoft.identity.labapi.utilities.exception.LabApiException import org.junit.Test @@ -47,15 +44,13 @@ import org.junit.Test // Shared device mode - TrueMAM: Sign In with Teams and then SignOut and Sign Back In // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2798415 @SupportedBrokers(brokers = [BrokerMicrosoftAuthenticator::class]) -@RetryOnFailure class TestCase2798415 : AbstractMsalBrokerTest() { private val TAG = TestCase2798415::class.java.simpleName @Test @Throws(MsalException::class, InterruptedException::class, LabApiException::class) - fun test_2506936_SDM_MAM_TeamsSignInThenOutThenInAgain() { - val adminUserLabQuery = getAdminAccountLabQuery() + fun test_2798415_SDM_MAM_TeamsSignInThenOutThenInAgain() { - val admin: ILabAccount = mLabClient.getLabAccount(adminUserLabQuery) + val admin: ILabAccount = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.DEVICE_ADMIN) Logger.i(TAG, "Performing Shared Device Registration.") mBroker.performSharedDeviceRegistration(admin.username, admin.password) @@ -86,6 +81,8 @@ class TestCase2798415 : AbstractMsalBrokerTest() { teams.addFirstAccount(username, password, teamsPromptHandlerParameters) // handle app protection policy in CP i.e. setup PIN when asked (companyPortal as IMdmAgent).handleAppProtectionPolicy() + ThreadUtils.sleepSafely(10000, "sleeping", "interrupted sleep") + teams.forceStop() // Teams sometimes seems to like to pop up on screen randomly teams.signOutSharedDeviceMode() @@ -127,20 +124,11 @@ class TestCase2798415 : AbstractMsalBrokerTest() { return R.raw.msal_config_default } - override fun getLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .protectionPolicy(ProtectionPolicy.TRUE_MAM_CA) - .build() + override fun getJsonUserType(): UserType? { + return UserType.TRUE_MAM_CA } override fun getTempUserType(): TempUserType? { return null } - - fun getAdminAccountLabQuery() : LabQuery { - return LabQuery.builder() - .userRole(UserRole.CLOUD_DEVICE_ADMINISTRATOR) - .build() - } } \ No newline at end of file diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mdm/TestCase831126.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mdm/TestCase831126.java index 1456ca474b..d55b02f446 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mdm/TestCase831126.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mdm/TestCase831126.java @@ -28,15 +28,9 @@ import androidx.test.uiautomator.UiObject; -import com.microsoft.identity.client.IAccount; import com.microsoft.identity.client.msal.automationapp.BuildConfig; import com.microsoft.identity.client.msal.automationapp.R; -import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthResult; -import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams; -import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; -import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.app.OutlookApp; import com.microsoft.identity.client.ui.automation.app.WordApp; @@ -47,21 +41,15 @@ import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.utils.CommonUtils; import com.microsoft.identity.client.ui.automation.utils.UiAutomatorUtils; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.ProtectionPolicy; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; -import java.util.Arrays; - // [Joined][MDM] Device Admin MDM: MDM Account with Microsoft Outlook and Word // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/831126 @SupportedBrokers(brokers = {BrokerCompanyPortal.class}) -@RetryOnFailure public class TestCase831126 extends AbstractMsalBrokerTest { @Test @@ -150,12 +138,8 @@ public void test_831126_MDM_FirstPartyAppSignIn() throws Throwable { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.CLOUD) - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .protectionPolicy(ProtectionPolicy.MDM_CA) - .build(); + public UserType getJsonUserType() { + return UserType.MDM_CA; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mdm/TestCase833526.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mdm/TestCase833526.java index 39c14c3d80..571c253d1a 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mdm/TestCase833526.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mdm/TestCase833526.java @@ -29,7 +29,6 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.broker.BrokerCompanyPortal; import com.microsoft.identity.client.ui.automation.broker.IMdmAgent; @@ -38,10 +37,8 @@ import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.UiResponse; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.ProtectionPolicy; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Test; @@ -50,7 +47,6 @@ // [Joined][MSAL] Device Admin MDM: Broker Auth for MDM account + PKeyAuth flow // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/833526 @SupportedBrokers(brokers = BrokerCompanyPortal.class) -@RetryOnFailure(retryCount = 2) public class TestCase833526 extends AbstractMsalBrokerTest { @Test @@ -169,11 +165,8 @@ public void handleUserInteraction() { @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .protectionPolicy(ProtectionPolicy.MDM_CA) - .build(); + public UserType getJsonUserType() { + return UserType.MDM_CA; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/AbstractMsaBrokerTest.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/AbstractMsaBrokerTest.kt index 0bdaa59ff0..98125864d9 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/AbstractMsaBrokerTest.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/AbstractMsaBrokerTest.kt @@ -23,15 +23,8 @@ package com.microsoft.identity.client.msal.automationapp.testpass.broker.msa import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest -import com.microsoft.identity.client.ui.automation.broker.BrokerHost -import com.microsoft.identity.client.ui.automation.utils.CommonUtils -import com.microsoft.identity.client.ui.automation.utils.UiAutomatorUtils -import com.microsoft.identity.labapi.utilities.client.ILabAccount -import com.microsoft.identity.labapi.utilities.client.LabQuery import com.microsoft.identity.labapi.utilities.constants.TempUserType import com.microsoft.identity.labapi.utilities.constants.UserType -import org.junit.Assert -import org.junit.Before /** * Parent class for Brokered MSA tests. Ensures PRTv3 is enabled before tests are run @@ -42,10 +35,8 @@ abstract class AbstractMsaBrokerTest : AbstractMsalBrokerTest() { return mApplication.configuration.defaultAuthority.toString() } - override fun getLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.MSA) - .build() + override fun getJsonUserType(): UserType? { + return UserType.MSA } override fun getTempUserType(): TempUserType? { diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/TestCase2637829.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/TestCase2637829.kt index 4d83d25baa..4bb42496b2 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/TestCase2637829.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/TestCase2637829.kt @@ -28,7 +28,6 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk import com.microsoft.identity.client.ui.automation.TokenRequestTimeout import com.microsoft.identity.client.ui.automation.annotations.LocalBrokerHostDebugUiTest -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers import com.microsoft.identity.client.ui.automation.broker.BrokerHost import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters @@ -44,7 +43,6 @@ import java.util.* // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2637846 @SupportedBrokers(brokers = [BrokerHost::class]) @LocalBrokerHostDebugUiTest -@RetryOnFailure class TestCase2637829 : AbstractMsaBrokerTest() { @Test @Throws(Throwable::class) diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/TestCase2637882.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/TestCase2637882.kt index f67893c3cb..185de05164 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/TestCase2637882.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/TestCase2637882.kt @@ -28,7 +28,6 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk import com.microsoft.identity.client.ui.automation.TokenRequestTimeout import com.microsoft.identity.client.ui.automation.annotations.LocalBrokerHostDebugUiTest -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers import com.microsoft.identity.client.ui.automation.broker.BrokerHost import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters @@ -41,7 +40,6 @@ import java.util.* // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2637882 @SupportedBrokers(brokers = [BrokerHost::class]) @LocalBrokerHostDebugUiTest -@RetryOnFailure class TestCase2637882 : AbstractMsaBrokerTest() { @Test @Throws(Throwable::class) diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/TestCase3007768.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/TestCase3007768.kt index 9823889da0..443ec1625b 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/TestCase3007768.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/msa/TestCase3007768.kt @@ -28,7 +28,6 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest import com.microsoft.identity.client.ui.automation.TokenRequestTimeout -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers import com.microsoft.identity.client.ui.automation.broker.BrokerMicrosoftAuthenticator import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters @@ -36,7 +35,6 @@ import com.microsoft.identity.client.ui.automation.interaction.PromptParameter import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler import com.microsoft.identity.client.ui.automation.utils.CommonUtils import com.microsoft.identity.client.ui.automation.utils.UiAutomatorUtils -import com.microsoft.identity.labapi.utilities.client.LabQuery import com.microsoft.identity.labapi.utilities.constants.TempUserType import com.microsoft.identity.labapi.utilities.constants.UserType import org.junit.Assert @@ -47,7 +45,6 @@ import java.util.Arrays // [Brokered] Sign up flow for MSA Accounts // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/3007768 @SupportedBrokers(brokers = [BrokerMicrosoftAuthenticator::class]) -@RetryOnFailure class TestCase3007768 : AbstractMsalBrokerTest(){ @Test @Throws(Throwable::class) @@ -122,10 +119,8 @@ class TestCase3007768 : AbstractMsalBrokerTest(){ return R.raw.msal_config_msa_only } - override fun getLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.MSA) - .build() + override fun getJsonUserType(): UserType? { + return UserType.MSA } override fun getTempUserType(): TempUserType? { diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2519783.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2519783.kt index 05b930da3c..ef6c05979b 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2519783.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2519783.kt @@ -25,12 +25,9 @@ package com.microsoft.identity.client.msal.automationapp.testpass.broker.mwpj import com.microsoft.identity.client.msal.automationapp.R import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest import com.microsoft.identity.client.ui.automation.annotations.LocalBrokerHostDebugUiTest -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers import com.microsoft.identity.client.ui.automation.broker.BrokerHost import com.microsoft.identity.labapi.utilities.client.ILabAccount -import com.microsoft.identity.labapi.utilities.client.LabQuery -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment import com.microsoft.identity.labapi.utilities.constants.TempUserType import com.microsoft.identity.labapi.utilities.constants.UserType import org.junit.Assert @@ -42,7 +39,6 @@ import org.junit.Test // [MWPJ] Install WPJ certificate for browser access in both registrations. @LocalBrokerHostDebugUiTest @SupportedBrokers(brokers = [BrokerHost::class]) -@RetryOnFailure class TestCase2519783 : AbstractMsalBrokerTest() { private lateinit var mUsGovAccount: ILabAccount @@ -61,26 +57,17 @@ class TestCase2519783 : AbstractMsalBrokerTest() { mBrokerHostApp.multipleWpjApiFragment.installCertificate(deviceRegistrationRecords[1]["TenantId"] as String) } - override fun getLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .build() + override fun getJsonUserType(): UserType? { + return UserType.BASIC } override fun getTempUserType(): TempUserType? { return null } - private fun getUsGovLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build() - } - @Before fun before() { - mUsGovAccount = mLabClient.getLabAccount(getUsGovLabQuery()) + mUsGovAccount = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.USGOV) mBrokerHostApp = broker as BrokerHost Assume.assumeFalse( "performNonSharedWpjWithHardwareKey flight is enabled, Test will be skipped", mBrokerHostApp.flights.contains("\"performNonSharedWpjWithHardwareKey\":\"true\"")); diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2519809.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2519809.kt index 5eee1a83f7..74c5886916 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2519809.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2519809.kt @@ -28,8 +28,6 @@ import com.microsoft.identity.client.ui.automation.annotations.LocalBrokerHostDe import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers import com.microsoft.identity.client.ui.automation.broker.BrokerHost import com.microsoft.identity.labapi.utilities.client.ILabAccount -import com.microsoft.identity.labapi.utilities.client.LabQuery -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment import com.microsoft.identity.labapi.utilities.constants.TempUserType import com.microsoft.identity.labapi.utilities.constants.UserType import org.junit.Assert @@ -41,14 +39,14 @@ import org.junit.Test @SupportedBrokers(brokers = [BrokerHost::class]) @LocalBrokerHostDebugUiTest class TestCase2519809 : AbstractMsalBrokerTest() { - private lateinit var mUsGovAccount: ILabAccount + private lateinit var mGuestAccount: ILabAccount private lateinit var mBrokerHostApp: BrokerHost @Test fun test_2519809_MWPJ_Unregister() { // Register 2 accounts from different tenants mBrokerHostApp.multipleWpjApiFragment.performDeviceRegistration(mLabAccount.username, mLabAccount.password) - mBrokerHostApp.multipleWpjApiFragment.performDeviceRegistration(mUsGovAccount.username, mUsGovAccount.password) + mBrokerHostApp.multipleWpjApiFragment.performDeviceRegistration(mGuestAccount.username, mGuestAccount.password) val deviceRegistrationRecords = mBrokerHostApp.multipleWpjApiFragment.allRecords Assert.assertEquals(2, deviceRegistrationRecords.size) @@ -58,26 +56,17 @@ class TestCase2519809 : AbstractMsalBrokerTest() { Assert.assertEquals(0, mBrokerHostApp.multipleWpjApiFragment.allRecords.size) } - override fun getLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .build() + override fun getJsonUserType(): UserType? { + return UserType.BASIC } override fun getTempUserType(): TempUserType? { return null } - private fun getUsGovLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build() - } - @Before fun before() { - mUsGovAccount = mLabClient.getLabAccount(getUsGovLabQuery()) + mGuestAccount = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.GUEST) mBrokerHostApp = broker as BrokerHost mBrokerHostApp.enableMultipleWpj() } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2519833.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2519833.kt index 8bef95057c..e7e59aa67b 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2519833.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2519833.kt @@ -28,8 +28,6 @@ import com.microsoft.identity.client.ui.automation.annotations.LocalBrokerHostDe import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers import com.microsoft.identity.client.ui.automation.broker.BrokerHost import com.microsoft.identity.labapi.utilities.client.ILabAccount -import com.microsoft.identity.labapi.utilities.client.LabQuery -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment import com.microsoft.identity.labapi.utilities.constants.TempUserType import com.microsoft.identity.labapi.utilities.constants.UserType import org.junit.Assert @@ -41,13 +39,13 @@ import org.junit.Test @SupportedBrokers(brokers = [BrokerHost::class]) @LocalBrokerHostDebugUiTest class TestCase2519833 : AbstractMsalBrokerTest() { - private lateinit var mUsGovAccount: ILabAccount + private lateinit var mGuestAccount: ILabAccount private lateinit var mBrokerHostApp: BrokerHost @Test fun test_2519833_MWPJ_GetRecordsByTenenantIdAndUpn() { // Register 2 accounts from different tenants - mBrokerHostApp.multipleWpjApiFragment.performDeviceRegistration(mUsGovAccount.username, mUsGovAccount.password) + mBrokerHostApp.multipleWpjApiFragment.performDeviceRegistration(mGuestAccount.username, mGuestAccount.password) mBrokerHostApp.multipleWpjApiFragment.performDeviceRegistration(mLabAccount.username, mLabAccount.password) val deviceRegistrationRecords = mBrokerHostApp.multipleWpjApiFragment.allRecords Assert.assertEquals(2, deviceRegistrationRecords.size) @@ -65,26 +63,17 @@ class TestCase2519833 : AbstractMsalBrokerTest() { Assert.assertEquals(deviceRegistrationRecords[1], record3) } - override fun getLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .build() + override fun getJsonUserType(): UserType? { + return UserType.BASIC } override fun getTempUserType(): TempUserType? { return null } - private fun getUsGovLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build() - } - @Before fun before() { - mUsGovAccount = mLabClient.getLabAccount(getUsGovLabQuery()) + mGuestAccount = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.GUEST) mBrokerHostApp = broker as BrokerHost mBrokerHostApp.enableMultipleWpj() } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2521768.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2521768.kt index 641036791d..ea3110ad89 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2521768.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2521768.kt @@ -37,7 +37,6 @@ import com.microsoft.identity.client.ui.automation.interaction.PromptParameter import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandler import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandlerParameters import com.microsoft.identity.labapi.utilities.client.ILabAccount -import com.microsoft.identity.labapi.utilities.client.LabQuery import com.microsoft.identity.labapi.utilities.constants.TempUserType import com.microsoft.identity.labapi.utilities.constants.UserType import com.microsoft.identity.labapi.utilities.jwt.JWTParserFactory @@ -143,10 +142,8 @@ class TestCase2521768 : AbstractMsalBrokerTest() { return R.raw.msal_config_default } - override fun getLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .build() + override fun getJsonUserType(): UserType? { + return UserType.BASIC } override fun getTempUserType(): TempUserType? { diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2521946.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2521946.kt index b69fc74e09..8d02ba4a70 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2521946.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2521946.kt @@ -30,8 +30,6 @@ import com.microsoft.identity.client.ui.automation.broker.BrokerHost import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters import com.microsoft.identity.client.ui.automation.interaction.PromptParameter import com.microsoft.identity.labapi.utilities.client.ILabAccount -import com.microsoft.identity.labapi.utilities.client.LabQuery -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment import com.microsoft.identity.labapi.utilities.constants.TempUserType import com.microsoft.identity.labapi.utilities.constants.UserType import org.junit.Assert @@ -43,18 +41,18 @@ import org.junit.Test @SupportedBrokers(brokers = [BrokerHost::class]) @LocalBrokerHostDebugUiTest class TestCase2521946 : AbstractMsalBrokerTest() { - private lateinit var mUsGovAccount: ILabAccount + private lateinit var mGuestAccount: ILabAccount private lateinit var mBrokerHostApp: BrokerHost @Test fun test_2521946_MWPJ_RegistrationEntryMigrationSameUpn() { // Register 2 accounts from different tenants - mBrokerHostApp.multipleWpjApiFragment.performDeviceRegistration(mUsGovAccount.username, mUsGovAccount.password) + mBrokerHostApp.multipleWpjApiFragment.performDeviceRegistration(mGuestAccount.username, mGuestAccount.password) mBrokerHostApp.multipleWpjApiFragment.performDeviceRegistration(mLabAccount.username, mLabAccount.password) Assert.assertEquals(2, mBrokerHostApp.multipleWpjApiFragment.allRecords.size) // Unregister the device from the legacy space - mBrokerHostApp.multipleWpjApiFragment.unregister(mUsGovAccount.username) + mBrokerHostApp.multipleWpjApiFragment.unregister(mGuestAccount.username) // Verify that the device is still registered for the second account using the MWPJ API. val recordInExtendedSpace = mBrokerHostApp.multipleWpjApiFragment.getRecordByUpn(mLabAccount.username) @@ -82,26 +80,18 @@ class TestCase2521946 : AbstractMsalBrokerTest() { } - override fun getLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .build() + override fun getJsonUserType(): UserType? { + return UserType.BASIC } override fun getTempUserType(): TempUserType? { return null } - private fun getUsGovLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build() - } @Before fun before() { - mUsGovAccount = mLabClient.getLabAccount(getUsGovLabQuery()) + mGuestAccount = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.GUEST) mBrokerHostApp = broker as BrokerHost mBrokerHostApp.enableMultipleWpj() } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2563668.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2563668.kt index 0e11a60a90..8abfb8fbda 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2563668.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2563668.kt @@ -30,8 +30,6 @@ import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers import com.microsoft.identity.client.ui.automation.broker.BrokerHost import com.microsoft.identity.client.ui.automation.broker.ITestBroker import com.microsoft.identity.labapi.utilities.client.ILabAccount -import com.microsoft.identity.labapi.utilities.client.LabQuery -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment import com.microsoft.identity.labapi.utilities.constants.TempUserType import com.microsoft.identity.labapi.utilities.constants.UserType import com.microsoft.identity.labapi.utilities.jwt.JWTParserFactory @@ -100,26 +98,17 @@ class TestCase2563668 : AbstractMsalBrokerTest() , ICustomBrokerInstallationTest Assert.assertTrue(claims2.containsKey("nonce")) } - override fun getLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .build() + override fun getJsonUserType(): UserType? { + return UserType.BASIC } override fun getTempUserType(): TempUserType? { return null } - private fun getUsGovLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build() - } - @Before fun before() { - mUsGovAccount = mLabClient.getLabAccount(getUsGovLabQuery()) + mUsGovAccount = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.USGOV) mBrokerHostApp = broker as BrokerHost mBrokerHostApp.launch() } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2578879.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2578879.kt index e3edbe4cad..a433d0d093 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2578879.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2578879.kt @@ -31,14 +31,12 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest import com.microsoft.identity.client.ui.automation.TokenRequestTimeout import com.microsoft.identity.client.ui.automation.annotations.LocalBrokerHostDebugUiTest -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers import com.microsoft.identity.client.ui.automation.broker.BrokerHost import com.microsoft.identity.client.ui.automation.interaction.PromptParameter import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandler import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandlerParameters import com.microsoft.identity.labapi.utilities.client.ILabAccount -import com.microsoft.identity.labapi.utilities.client.LabQuery import com.microsoft.identity.labapi.utilities.constants.TempUserType import com.microsoft.identity.labapi.utilities.constants.UserType import com.microsoft.identity.labapi.utilities.jwt.JWTParserFactory @@ -50,7 +48,6 @@ import org.junit.Test // [MWPJ] An account with no PRT use no Joined flow even if the tenant is registered (Pkey AUth enable) @SupportedBrokers(brokers = [BrokerHost::class]) @LocalBrokerHostDebugUiTest -@RetryOnFailure class TestCase2578879 : AbstractMsalBrokerTest() { private lateinit var mLabAccount2: ILabAccount @@ -154,10 +151,8 @@ class TestCase2578879 : AbstractMsalBrokerTest() { return R.raw.msal_config_pkey_auth_silent } - override fun getLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .build() + override fun getJsonUserType(): UserType? { + return UserType.BASIC } override fun getTempUserType(): TempUserType? { diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2579654.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2579654.kt index ee8c3a8eae..fadc0c8a72 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2579654.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mwpj/TestCase2579654.kt @@ -31,7 +31,6 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest import com.microsoft.identity.client.ui.automation.TokenRequestTimeout import com.microsoft.identity.client.ui.automation.annotations.LocalBrokerHostDebugUiTest -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers import com.microsoft.identity.client.ui.automation.broker.BrokerHost import com.microsoft.identity.client.ui.automation.interaction.PromptParameter @@ -39,8 +38,6 @@ import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.Micr import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandlerParameters import com.microsoft.identity.client.ui.automation.rules.LoadLabUserTestRule import com.microsoft.identity.labapi.utilities.client.ILabAccount -import com.microsoft.identity.labapi.utilities.client.LabQuery -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment import com.microsoft.identity.labapi.utilities.constants.TempUserType import com.microsoft.identity.labapi.utilities.constants.UserType import com.microsoft.identity.labapi.utilities.jwt.JWTParserFactory @@ -54,28 +51,22 @@ import org.junit.rules.TestRule // [MWPJ] After entry migration PRT is still usable without extra prompts. @LocalBrokerHostDebugUiTest @SupportedBrokers(brokers = [BrokerHost::class]) -@RetryOnFailure class TestCase2579654 : AbstractMsalBrokerTest() { - private lateinit var mUsGovAccount: ILabAccount + private lateinit var mGuestAccount: ILabAccount private lateinit var mLabAccount2: ILabAccount private lateinit var mBrokerHostApp: BrokerHost - @get:Rule - val loadUsGovLabAccountUserRule: TestRule = LoadLabUserTestRule(getAdditionalLabQuery()) - @get:Rule - val loadAdditionalLabUserRule: TestRule = LoadLabUserTestRule(TempUserType.BASIC) - @Test fun test_2579654_MWPJ_EntryMigrationPRTStillUsable() { // Register 2 accounts from different tenants - mBrokerHostApp.multipleWpjApiFragment.performDeviceRegistration(mUsGovAccount.username, mUsGovAccount.password) + mBrokerHostApp.multipleWpjApiFragment.performDeviceRegistration(mGuestAccount.username, mGuestAccount.password) mBrokerHostApp.multipleWpjApiFragment.performDeviceRegistration(mLabAccount.username, mLabAccount.password) val deviceRegistrationRecords = mBrokerHostApp.multipleWpjApiFragment.allRecords Assert.assertEquals(2, deviceRegistrationRecords.size) // Unregister the device from the legacy space - mBrokerHostApp.multipleWpjApiFragment.unregister(mUsGovAccount.username) + mBrokerHostApp.multipleWpjApiFragment.unregister(mGuestAccount.username) // Verify the device registration records via the MWPJ API after unregistering val deviceRegistrationRecordsAfterLeave = mBrokerHostApp.multipleWpjApiFragment.allRecords @@ -119,27 +110,18 @@ class TestCase2579654 : AbstractMsalBrokerTest() { Assert.assertTrue("Device id claim is present", claims2.containsKey("deviceid")) } - override fun getLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .build() + override fun getJsonUserType(): UserType? { + return UserType.BASIC } override fun getTempUserType(): TempUserType? { return null } - private fun getAdditionalLabQuery(): LabQuery { - return LabQuery.builder() - .userType(UserType.CLOUD) - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build() - } - @Before fun before() { - mUsGovAccount = (loadUsGovLabAccountUserRule as LoadLabUserTestRule).labAccount - mLabAccount2 = (loadAdditionalLabUserRule as LoadLabUserTestRule).labAccount + mGuestAccount = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.GUEST) + mLabAccount2 = mLabClient.createTempAccount(TempUserType.BASIC) Assert.assertEquals( "Lab accounts are not in the same tenant", mLabAccount2.homeTenantId, mLabAccount.homeTenantId diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/NestedAppHelper.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/NestedAppHelper.java index 80ab5d27ac..777c69eb46 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/NestedAppHelper.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/NestedAppHelper.java @@ -75,7 +75,7 @@ public class NestedAppHelper { private static final String HUB_APP_CLIENT_ID_AAD = "1fec8e78-bce4-4aaf-ab1b-5451cc387264"; - private static final String NESTED_APP_CLIENT_ID = "9668f2bd-6103-4292-9024-84fa2d1b6fb2"; + private static final String NESTED_APP_CLIENT_ID = "700c5153-ef50-4176-8d7a-4131d649020e"; private static final String NESTED_APP_US_GOV_CLIENT_ID = "cb7faed4-b8c0-49ee-b421-f5ed16894c83"; diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2688459.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2688459.java index 6043a9e031..2a83a73eb5 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2688459.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2688459.java @@ -28,7 +28,6 @@ import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.broker.BrokerHost; import com.microsoft.identity.common.java.dto.AccountRecord; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; import com.microsoft.identity.client.ui.automation.annotations.LocalBrokerHostDebugUiTest; @@ -58,7 +57,7 @@ public TestCase2688459(@NonNull UserType userType) { public static List userType() { return Arrays.asList( UserType.MSA, - UserType.CLOUD + UserType.BASIC ); } @@ -82,10 +81,8 @@ public void test_2688459_NAA_ATS() throws Throwable { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(mUserType) - .build(); + public UserType getJsonUserType() { + return mUserType; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2688462.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2688462.java index 4d00aa0ebd..88fa12c88f 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2688462.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2688462.java @@ -27,14 +27,11 @@ import com.microsoft.identity.client.msal.automationapp.R; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.annotations.LocalBrokerHostDebugUiTest; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.broker.BrokerHost; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -46,7 +43,6 @@ // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2688462 @SupportedBrokers(brokers = BrokerHost.class) @LocalBrokerHostDebugUiTest -@RetryOnFailure @RunWith(Parameterized.class) public class TestCase2688462 extends AbstractMsalBrokerTest { private final UserType mUserType; @@ -59,7 +55,7 @@ public TestCase2688462(@NonNull UserType userType) { public static List userType() { return Arrays.asList( UserType.MSA, - UserType.CLOUD + UserType.BASIC ); } @@ -73,10 +69,8 @@ public void test_2688462_NAA_ATSucceedsThenNoAccountRecords() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(mUserType) - .build(); + public UserType getJsonUserType() { + return mUserType; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2688468.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2688468.java index 272abc4106..ba89e9bc3e 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2688468.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2688468.java @@ -26,20 +26,16 @@ import com.microsoft.identity.client.msal.automationapp.R; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.annotations.LocalBrokerHostDebugUiTest; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.broker.BrokerHost; import com.microsoft.identity.common.java.dto.AccountRecord; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; -import org.junit.Before; import org.junit.Test; // Nested app interactive token request after device is WPJd // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2688468 -@RetryOnFailure @LocalBrokerHostDebugUiTest @SupportedBrokers(brokers = {BrokerHost.class}) public class TestCase2688468 extends AbstractMsalBrokerTest { @@ -61,10 +57,8 @@ public void test_2688468_NAA_ATAfterWPJ() throws Throwable { @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2703171.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2703171.java index 0de017a43c..4ffd352fb6 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2703171.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/TestCase2703171.java @@ -29,12 +29,9 @@ import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.broker.BrokerHost; import com.microsoft.identity.common.java.dto.AccountRecord; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; -import org.junit.Before; import org.junit.Test; // Nested app auth with US Gov account @@ -60,11 +57,8 @@ public void test_2703171_NAA_USGov_AT() throws Throwable { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.CLOUD) - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build(); + public UserType getJsonUserType() { + return UserType.USGOV; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase1592509.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase1592509.java index 57c4d1c5ab..0475e56ae5 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase1592509.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase1592509.java @@ -29,28 +29,23 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.ILabAccount; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; // [MSAL] Mooncake: Silent Auth w/o cache w/o MFA w/ Prompt Auto w/ Broker // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/1592509 -@RetryOnFailure(retryCount = 2) public class TestCase1592509 extends AbstractMsalBrokerTest { @Test public void test_1592509_NonJoined_Mooncake() throws Throwable { - final ILabAccount labAccount = mLabClient.getLabAccount("idlab@mncmsidlab1.partner.onmschina.cn"); - final String username = labAccount.getUsername(); - final String password = labAccount.getPassword(); + final String username = mLabAccount.getUsername(); + final String password = mLabAccount.getPassword(); final MsalSdk msalSdk = new MsalSdk(); @@ -104,10 +99,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.CHINA; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase1600592.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase1600592.java index e5e8313020..1993309edc 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase1600592.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase1600592.java @@ -30,14 +30,13 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.RunOnAPI29Minus; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; @@ -46,7 +45,6 @@ // [Non-joined] A single-tenant app makes a silent request with common authority. It should fail. // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/1600592 -@RetryOnFailure(retryCount = 2) @RunOnAPI29Minus("Consent Page") public class TestCase1600592 extends AbstractMsalBrokerTest { @@ -102,7 +100,7 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { + public UserType getJsonUserType() { return null; } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase2139526.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase2139526.java index 5cf3b41310..bfd30f4bd7 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase2139526.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase2139526.java @@ -32,13 +32,13 @@ import com.microsoft.identity.client.ui.automation.TestContext; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; import com.microsoft.identity.client.ui.automation.annotations.LongUIAutomationTest; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.ProtectionPolicy; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; + import org.junit.Test; import java.util.Arrays; @@ -46,7 +46,6 @@ // Acquire Token Silent After Policy Change Should Fail // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2139526 -@RetryOnFailure @LongUIAutomationTest public class TestCase2139526 extends AbstractMsalBrokerTest { @@ -87,8 +86,8 @@ public void handleUserInteraction() { authResult.assertSuccess(); - // Change the policy to MAM_CA - mLabClient.enablePolicy(username, ProtectionPolicy.MAM_CA); + // Change the policy to GLOBAL_MFA, any policy will work as long as it blocks silent request + mLabClient.enablePolicy(username, ProtectionPolicy.GLOBAL_MFA); // It takes some time for the policy change to reflect Thread.sleep(TimeUnit.MINUTES.toMillis(3)); @@ -115,7 +114,7 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { + public UserType getJsonUserType() { return null; } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase3139972.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase3139972.java index 9ab3fe0890..7797c82c8a 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase3139972.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase3139972.java @@ -30,11 +30,9 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; @@ -44,7 +42,6 @@ // [Non-joined][MSAL] Acquire Token + Acquire Token Silent, no loginhint (Prompt.SELECT_ACCOUNT) // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/3139972 -@RetryOnFailure(retryCount = 2) public class TestCase3139972 extends AbstractMsalBrokerTest { @Test @@ -100,10 +97,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase497069.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase497069.java index dabb475319..1c35b01b1b 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase497069.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase497069.java @@ -29,12 +29,10 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; @@ -44,7 +42,6 @@ // Broker Auth for non-joined account - select_account // https://identitydivision.visualstudio.com/DefaultCollection/DevEx/_workitems/edit/497069 -@RetryOnFailure(retryCount = 2) public class TestCase497069 extends AbstractMsalBrokerTest { @Test @@ -112,10 +109,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase833546.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase833546.java index 4ca5c5486a..5c9ef1af86 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase833546.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase833546.java @@ -33,14 +33,11 @@ import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Test; -import java.util.Arrays; - // [MSAL] Broker Auth for Non-Joined Account - Multiple Resources // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/833546 public class TestCase833546 extends AbstractMsalBrokerTest { @@ -97,10 +94,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase833553.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase833553.java index baf3f14cf4..be0bcb9933 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase833553.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase833553.java @@ -30,15 +30,10 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandler; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandlerParameters; -import com.microsoft.identity.labapi.utilities.client.LabGuestAccount; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.FederationProvider; -import com.microsoft.identity.labapi.utilities.constants.GuestHomedIn; +import com.microsoft.identity.labapi.utilities.client.ILabAccount; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; @@ -49,26 +44,17 @@ // [MSAL] Broker Auth for Non-Joined Account (Federated User) // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/833553 -@RetryOnFailure() -@Ignore("Federated Account in LAB is not working at the moment") +@Ignore("Ignoring until On-Prem is setup") public class TestCase833553 extends AbstractMsalBrokerTest { @Test public void test_833553_NonJoined_Federated() throws Throwable { final String username = mLabAccount.getUsername(); - // query to load another user from the same tenant - final LabQuery queryForUserB = LabQuery.builder() - .userType(UserType.GUEST) - .guestHomedIn(GuestHomedIn.ON_PREM) - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .federationProvider(FederationProvider.ADFS_V4) - .build(); - // load this other user - final LabGuestAccount userB = mLabClient.loadGuestAccountFromLab(queryForUserB); + final ILabAccount userB = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.ONPREM); - final String usernameB = userB.getHomeUpn(); - final String password = mLabClient.getPasswordForGuestUser(userB); + final String usernameB = userB.getUsername(); + final String password = userB.getPassword(); final MsalSdk msalSdk = new MsalSdk(); @@ -149,12 +135,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.FEDERATED) - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .federationProvider(FederationProvider.ADFS_V4) - .build(); + public UserType getJsonUserType() { + return UserType.FEDERATED; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase850455.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase850455.java index 90f8bbe535..38c7de23c0 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase850455.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase850455.java @@ -32,13 +32,11 @@ import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TestContext; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.RunOnAPI29Minus; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; @@ -50,7 +48,6 @@ // [Non-joined][MSAL] Acquire Token + Acquire Token Silent (Prompt.SELECT_ACCOUNT) // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/850455 -@RetryOnFailure(retryCount = 2) @RunOnAPI29Minus public class TestCase850455 extends AbstractMsalBrokerTest { @@ -190,7 +187,7 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { + public UserType getJsonUserType() { return null; } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/strongkey/TestCase3321136.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/strongkey/TestCase3321136.kt index 7e7bb188c8..dddbfdb455 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/strongkey/TestCase3321136.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/strongkey/TestCase3321136.kt @@ -30,15 +30,12 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest import com.microsoft.identity.client.ui.automation.TokenRequestTimeout -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers import com.microsoft.identity.client.ui.automation.broker.BrokerMicrosoftAuthenticator import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters import com.microsoft.identity.client.ui.automation.interaction.PromptParameter import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler -import com.microsoft.identity.labapi.utilities.client.LabQuery -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment import com.microsoft.identity.labapi.utilities.constants.TempUserType import com.microsoft.identity.labapi.utilities.constants.UserType import org.junit.Assume @@ -47,7 +44,6 @@ import org.junit.Test // [StrongKey] Upgrade from regular WPJ to StrongKey WPJ (via CA) // https://identitydivision.visualstudio.com/Engineering/_testPlans/define?planId=2007357&suiteId=3321136 @SupportedBrokers(brokers = [BrokerMicrosoftAuthenticator::class]) -@RetryOnFailure class TestCase3321136 : AbstractMsalBrokerTest() { @Test fun test_3321136_UpgradeFromRegularWpjToStrongKeyWpj() { @@ -56,17 +52,18 @@ class TestCase3321136 : AbstractMsalBrokerTest() { BuildConfig.COPY_OF_LOCAL_FLIGHTS_FOR_TEST_PURPOSES.contains("performNonSharedWpjWithHardwareKey:true") ) - val basicUser = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.TOKEN_BINDING) + val username = mLabAccount.getUsername() + val password = mLabAccount.getPassword() (mBroker as BrokerMicrosoftAuthenticator).setShouldUseDeviceSettingsPage(false) - mBroker.performDeviceRegistration(basicUser.username, basicUser.password) + mBroker.performDeviceRegistration(username, password) val msalSdk = MsalSdk() //acquiring token val authTestParams: MsalAuthTestParams = MsalAuthTestParams.builder() .activity(mActivity) - .loginHint(basicUser.username) + .loginHint(username) .scopes(listOf(*mScopes)) .promptParameter(Prompt.SELECT_ACCOUNT) .msalConfigResourceId(configFileResourceId) @@ -78,7 +75,7 @@ class TestCase3321136 : AbstractMsalBrokerTest() { val promptHandlerParameters: PromptHandlerParameters = PromptHandlerParameters.builder() .prompt(PromptParameter.SELECT_ACCOUNT) - .loginHint(basicUser.username) + .loginHint(username) .passwordPageExpected(false) .sessionExpected(true) .broker(mBroker) @@ -86,17 +83,15 @@ class TestCase3321136 : AbstractMsalBrokerTest() { .build() AadPromptHandler(promptHandlerParameters) - .handlePrompt(basicUser.username, basicUser.password) + .handlePrompt(username, password) } }, TokenRequestTimeout.MEDIUM) authResult.assertSuccess() } - override fun getLabQuery(): LabQuery? { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build() + override fun getJsonUserType(): UserType? { + return UserType.TOKEN_BINDING } override fun getTempUserType(): TempUserType? { diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/strongkey/TestCase3321139.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/strongkey/TestCase3321139.kt index e85114499e..fd8aa8669a 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/strongkey/TestCase3321139.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/strongkey/TestCase3321139.kt @@ -29,15 +29,12 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest import com.microsoft.identity.client.ui.automation.TokenRequestTimeout -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers import com.microsoft.identity.client.ui.automation.broker.BrokerMicrosoftAuthenticator import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters import com.microsoft.identity.client.ui.automation.interaction.PromptParameter import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler -import com.microsoft.identity.labapi.utilities.client.LabQuery -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment import com.microsoft.identity.labapi.utilities.constants.TempUserType import com.microsoft.identity.labapi.utilities.constants.UserType import org.junit.Test @@ -45,18 +42,18 @@ import org.junit.Test // [StrongKey] Signs in with Token Protection-CA account // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/3321139 @SupportedBrokers(brokers = [BrokerMicrosoftAuthenticator::class]) -@RetryOnFailure class TestCase3321139 : AbstractMsalBrokerTest() { @Test fun test_3321139_SignInWithTpCaAccount() { - val basicUser = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.TOKEN_BINDING) + val username = mLabAccount.username + val password = mLabAccount.password val msalSdk = MsalSdk() //acquiring token val authTestParams: MsalAuthTestParams = MsalAuthTestParams.builder() .activity(mActivity) - .loginHint(basicUser.username) + .loginHint(username) .scopes(listOf(*mScopes)) .promptParameter(Prompt.SELECT_ACCOUNT) .msalConfigResourceId(configFileResourceId) @@ -68,7 +65,7 @@ class TestCase3321139 : AbstractMsalBrokerTest() { val promptHandlerParameters: PromptHandlerParameters = PromptHandlerParameters.builder() .prompt(PromptParameter.SELECT_ACCOUNT) - .loginHint(basicUser.username) + .loginHint(username) .consentPageExpected(false) .speedBumpExpected(false) .broker(mBroker) @@ -77,17 +74,15 @@ class TestCase3321139 : AbstractMsalBrokerTest() { .build() AadPromptHandler(promptHandlerParameters) - .handlePrompt(basicUser.username, basicUser.password) + .handlePrompt(username, password) } }, TokenRequestTimeout.MEDIUM) authResult.assertSuccess() } - override fun getLabQuery(): LabQuery? { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build() + override fun getJsonUserType(): UserType? { + return UserType.TOKEN_BINDING } override fun getTempUserType(): TempUserType? { @@ -103,6 +98,6 @@ class TestCase3321139 : AbstractMsalBrokerTest() { } override fun getConfigFileResourceId(): Int { - return R.raw.msal_config_default + return R.raw.msal_config_msidlab4 } } \ No newline at end of file diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/strongkey/TestCase3522687.kt b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/strongkey/TestCase3522687.kt index 1bfe784a59..02d2959932 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/strongkey/TestCase3522687.kt +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/strongkey/TestCase3522687.kt @@ -30,11 +30,8 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest import com.microsoft.identity.client.ui.automation.TokenRequestTimeout -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers import com.microsoft.identity.client.ui.automation.broker.BrokerMicrosoftAuthenticator -import com.microsoft.identity.labapi.utilities.client.LabQuery -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment import com.microsoft.identity.labapi.utilities.constants.TempUserType import com.microsoft.identity.labapi.utilities.constants.UserType import org.junit.Assume @@ -42,7 +39,6 @@ import org.junit.Test // [StrongKey] WPJ should be registered with strongkey by default - non shared device. @SupportedBrokers(brokers = [BrokerMicrosoftAuthenticator::class]) -@RetryOnFailure class TestCase3522687 : AbstractMsalBrokerTest() { @Test @@ -52,16 +48,17 @@ class TestCase3522687 : AbstractMsalBrokerTest() { BuildConfig.COPY_OF_LOCAL_FLIGHTS_FOR_TEST_PURPOSES.contains("performNonSharedWpjWithHardwareKey:true") ) - val basicUser = mLabClient.getAccountFromLabJsonStringInMobileBuildVault(UserType.TOKEN_BINDING) + val username = mLabAccount.getUsername() + val password = mLabAccount.getPassword() (mBroker as BrokerMicrosoftAuthenticator).setShouldUseDeviceSettingsPage(false) - mBroker.performDeviceRegistration(basicUser.username, basicUser.password) + mBroker.performDeviceRegistration(username, password) //acquiring token, no password prompt, no wpj upgrade prompt. val msalSdk = MsalSdk() val authTestParams: MsalAuthTestParams = MsalAuthTestParams.builder() .activity(mActivity) - .loginHint(basicUser.username) + .loginHint(username) .scopes(listOf(*mScopes)) .promptParameter(Prompt.SELECT_ACCOUNT) .msalConfigResourceId(configFileResourceId) @@ -75,10 +72,8 @@ class TestCase3522687 : AbstractMsalBrokerTest() { authResult.assertSuccess() } - override fun getLabQuery(): LabQuery? { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build() + override fun getJsonUserType(): UserType? { + return UserType.TOKEN_BINDING } override fun getTempUserType(): TempUserType? { diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase796048.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase796048.java index 454c29d68a..80518b3a4d 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase796048.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase796048.java @@ -30,13 +30,10 @@ import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TestContext; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; @@ -44,7 +41,6 @@ // [USGOV][Broker][Non-Joined] Acquire Token with Resource with instance_aware = true // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/796048 -@RetryOnFailure(retryCount = 2) public class TestCase796048 extends AbstractMsalBrokerTest { @Test @@ -103,11 +99,8 @@ public void handleUserInteraction() { @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.CLOUD) - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build(); + public UserType getJsonUserType() { + return UserType.USGOV; } @Override @@ -127,6 +120,6 @@ public String getAuthority() { @Override public int getConfigFileResourceId() { - return R.raw.msal_config_instance_aware_common; + return R.raw.msal_config_msidlab4_instance_aware; } } \ No newline at end of file diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase796049.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase796049.java index fc0ebd1bbe..fff95596ab 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase796049.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase796049.java @@ -29,13 +29,10 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; @@ -43,7 +40,6 @@ // [USGOV][Broker][Non-Joined] Acquire Token with Resource // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/796049 -@RetryOnFailure public class TestCase796049 extends AbstractMsalBrokerTest { @Test @@ -84,11 +80,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.CLOUD) - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build(); + public UserType getJsonUserType() { + return UserType.USGOV; } @Override @@ -108,6 +101,6 @@ public String getAuthority() { @Override public int getConfigFileResourceId() { - return R.raw.msal_config_instance_aware_common; + return R.raw.msal_config_msidlab4_instance_aware; } } \ No newline at end of file diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase938447.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase938447.java index b4fc0f8840..f06ffe0529 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase938447.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase938447.java @@ -32,8 +32,6 @@ import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; @@ -87,11 +85,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.CLOUD) - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build(); + public UserType getJsonUserType() { + return UserType.USGOV; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase940421.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase940421.java index a70844a936..4a66d59850 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase940421.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase940421.java @@ -40,8 +40,6 @@ import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; @@ -121,11 +119,8 @@ private void assertDeviceIdClaimSuccess(@NonNull final IAccount account) { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.CLOUD) - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build(); + public UserType getJsonUserType() { + return UserType.USGOV; } @Override @@ -145,6 +140,6 @@ public String getAuthority() { @Override public int getConfigFileResourceId() { - return R.raw.msal_config_instance_aware_common; + return R.raw.msal_config_msidlab4_instance_aware; } } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase948676.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase948676.java index 7c6db61bc9..69d32a364b 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase948676.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/usgov/TestCase948676.java @@ -29,12 +29,9 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; @@ -44,7 +41,6 @@ // [USGOV][Broker][Joined] Acquire token with instance_aware=true // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/948676 -@RetryOnFailure public class TestCase948676 extends AbstractMsalBrokerTest { @Test @@ -89,11 +85,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.CLOUD) - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build(); + public UserType getJsonUserType() { + return UserType.USGOV; } @Override @@ -113,6 +106,6 @@ public String getAuthority() { @Override public int getConfigFileResourceId() { - return R.raw.msal_config_instance_aware_common; + return R.raw.msal_config_msidlab4_instance_aware; } } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/wpj/TestCase833547.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/wpj/TestCase833547.java index afa638c2ab..c7f20d44ac 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/wpj/TestCase833547.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/wpj/TestCase833547.java @@ -26,11 +26,9 @@ import com.microsoft.identity.client.msal.automationapp.R; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.broker.BrokerMicrosoftAuthenticator; import com.microsoft.identity.client.ui.automation.utils.UiAutomatorUtils; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; @@ -40,7 +38,6 @@ // Broker Add Account via Account Manager // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/833547 @SupportedBrokers(brokers = {BrokerMicrosoftAuthenticator.class}) -@RetryOnFailure public class TestCase833547 extends AbstractMsalBrokerTest { @Test @@ -63,10 +60,8 @@ public void test_833547_WPJ_AddAccountWithAccountManager() { @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/wpj/TestCase833561.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/wpj/TestCase833561.java index 0848c99180..15bdb2c4ca 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/wpj/TestCase833561.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/wpj/TestCase833561.java @@ -25,13 +25,11 @@ import com.microsoft.identity.client.msal.automationapp.BuildConfig; import com.microsoft.identity.client.msal.automationapp.R; import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.SupportedBrokers; import com.microsoft.identity.client.ui.automation.broker.BrokerHost; import com.microsoft.identity.client.ui.automation.broker.BrokerMicrosoftAuthenticator; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assume; import org.junit.Test; @@ -39,7 +37,6 @@ // [WPJ] Install WPJ Certificate for Browser Access // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/833561 @SupportedBrokers(brokers = {BrokerMicrosoftAuthenticator.class, BrokerHost.class}) -//@RetryOnFailure(retryCount = 2) public class TestCase833561 extends AbstractMsalBrokerTest { @Test @@ -61,10 +58,8 @@ public void test_833561_WPJ_InstallCertificateForBrowserAccess() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/atpop/TestCase1954181.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/atpop/TestCase1954181.java index a71880a4c6..ae92abd354 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/atpop/TestCase1954181.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/atpop/TestCase1954181.java @@ -30,15 +30,13 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams; import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.constants.AuthScheme; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; @@ -47,7 +45,6 @@ // Acquire PoP token interactive followed by Silent // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/1954181 -@RetryOnFailure(retryCount = 2) public class TestCase1954181 extends AbstractMsalUiTest { @Test public void test_1954181_Pop_MsalOnly_PopTokenFollowedBySilent() throws Throwable { @@ -106,10 +103,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase532736.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase532736.java index 327712175a..10ba5633a9 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase532736.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase532736.java @@ -34,15 +34,13 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams; import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.browser.BrowserChrome; import com.microsoft.identity.client.ui.automation.device.settings.ISettings; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.utils.CommonUtils; import com.microsoft.identity.client.ui.automation.utils.UiAutomatorUtils; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.After; import org.junit.Assert; @@ -56,7 +54,6 @@ // MSAL Falls Back on WebView When All Browsers are Disabled // https://identitydivision.visualstudio.com/DevEx/_workitems/edit/532736 @RunWith(Parameterized.class) -@RetryOnFailure public class TestCase532736 extends AbstractMsalUiTest { private final int mConfigFileResourceId; @@ -117,10 +114,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99267.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99267.java index a2aa633d6c..00b9976c90 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99267.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99267.java @@ -29,15 +29,14 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams; import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.RunOnAPI29Minus; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.UiResponse; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Test; @@ -45,7 +44,6 @@ // Interactive Auth with select_account (no consent record) // https://identitydivision.visualstudio.com/DefaultCollection/IDDP/_workitems/edit/99267 -@RetryOnFailure @RunOnAPI29Minus("Consent Page") public class TestCase99267 extends AbstractMsalUiTest { @@ -82,7 +80,7 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { + public UserType getJsonUserType() { return null; } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99274.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99274.java index 2e2eb3d58f..5fef05bbec 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99274.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99274.java @@ -29,15 +29,14 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams; import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.RunOnAPI29Minus; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.UiResponse; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Test; @@ -46,7 +45,6 @@ // Interactive Auth with select_account (with consent record) // https://identitydivision.visualstudio.com/DefaultCollection/IDDP/_workitems/edit/99274 @RunOnAPI29Minus("Consent Page") -@RetryOnFailure public class TestCase99274 extends AbstractMsalUiTest { @Test @@ -110,7 +108,7 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { + public UserType getJsonUserType() { return null; } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99563.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99563.java index b357139ca4..36803c32f6 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99563.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99563.java @@ -30,15 +30,13 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams; import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.app.IApp; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Test; @@ -46,7 +44,6 @@ // Silent Auth with force_refresh // https://identitydivision.visualstudio.com/DefaultCollection/IDDP/_workitems/edit/99563 -@RetryOnFailure public class TestCase99563 extends AbstractMsalUiTest { @Test @@ -100,10 +97,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.BASIC; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99652.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99652.java index acb77effee..832811d0f6 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99652.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/basic/TestCase99652.java @@ -30,15 +30,14 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams; import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.RunOnAPI29Minus; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.UiResponse; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; @@ -48,7 +47,6 @@ // Interactive auth with force_login for managed account (with consent record) // https://identitydivision.visualstudio.com/DefaultCollection/IDDP/_workitems/edit/99652 @RunOnAPI29Minus("Consent Page") -@RetryOnFailure public class TestCase99652 extends AbstractMsalUiTest { @Test @@ -128,7 +126,7 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { + public UserType getJsonUserType() { return null; } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/crosscloud/TestCase1420484.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/crosscloud/TestCase1420484.java index 153bfbcc47..92cd25c410 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/crosscloud/TestCase1420484.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/crosscloud/TestCase1420484.java @@ -24,8 +24,6 @@ import android.text.TextUtils; -import androidx.annotation.NonNull; - import com.microsoft.identity.client.Prompt; import com.microsoft.identity.client.msal.automationapp.AbstractGuestAccountMsalUiTest; import com.microsoft.identity.client.msal.automationapp.sdk.Constants; @@ -34,49 +32,25 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.ui.automation.TestContext; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.RunOnAPI29Minus; -import com.microsoft.identity.client.ui.automation.app.IApp; import com.microsoft.identity.client.ui.automation.constants.GlobalConstants; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.GuestHomeAzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.GuestHomedIn; import com.microsoft.identity.labapi.utilities.constants.UserType; import org.json.JSONObject; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import java.util.Arrays; -import java.util.Collection; // [CrossCloud] Acquire token (Interactive and silent) for cross cloud guest account (Msal Only) // https://identitydivision.visualstudio.com/DefaultCollection/IDDP/_workitems/edit/1420484 -@RunWith(Parameterized.class) -@RetryOnFailure @RunOnAPI29Minus("Keep me signed in") public class TestCase1420484 extends AbstractGuestAccountMsalUiTest { - private final GuestHomeAzureEnvironment mGuestHomeAzureEnvironment; - - public TestCase1420484(final String name, final @NonNull GuestHomeAzureEnvironment guestHomeAzureEnvironment) { - mGuestHomeAzureEnvironment = guestHomeAzureEnvironment; - } - - @Parameterized.Parameters(name = "{0}") - public static Collection guestHomeAzureEnvironment() { - return Arrays.asList(new Object[][]{ - {"AZURE_CHINA_CLOUD", GuestHomeAzureEnvironment.AZURE_CHINA_CLOUD}, - }); - } - /** * Tests Acquiring token for Cross cloud Guest account without broker. */ @@ -85,12 +59,12 @@ public void test_1420484_CrossCloud_MsalOnlyATForGuestAccount() throws Throwable // Clearing browser seems to help with this case mBrowser.clear(); - final String userName = mGuestUser.getHomeUpn(); - final String password = mLabClient.getPasswordForGuestUser(mGuestUser); + final String userName = mGuestUser.getUsername(); + final String password = mGuestUser.getPassword(); // Handler for Interactive auth call final OnInteractionRequired interactionHandler = () -> { - ((IApp) mBrowser).handleFirstRun(); + (mBrowser).handleFirstRun(); final PromptHandlerParameters promptHandlerParameters = PromptHandlerParameters.builder() .prompt(PromptParameter.SELECT_ACCOUNT) @@ -132,13 +106,8 @@ public void test_1420484_CrossCloud_MsalOnlyATForGuestAccount() throws Throwable } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.GUEST) - .guestHomeAzureEnvironment(mGuestHomeAzureEnvironment) - .guestHomedIn(GuestHomedIn.HOST_AZURE_AD) - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.CHINA_GUEST; } @Override @@ -148,6 +117,6 @@ public String[] getScopes() { @Override public String getAuthority() { - return "https://login.microsoftonline.com/" + mGuestUser.getGuestLabTenants().get(0); + return "https://login.microsoftonline.com/" + mGuestUser.getGuestTenantId(); } } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/crosscloud/TestCase1616315.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/crosscloud/TestCase1616315.java index 9c565db68c..39b095d449 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/crosscloud/TestCase1616315.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/crosscloud/TestCase1616315.java @@ -24,8 +24,6 @@ import android.text.TextUtils; -import androidx.annotation.NonNull; - import com.microsoft.identity.client.Prompt; import com.microsoft.identity.client.exception.MsalArgumentException; import com.microsoft.identity.client.msal.automationapp.AbstractGuestAccountMsalUiTest; @@ -40,47 +38,24 @@ import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.GuestHomeAzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.GuestHomedIn; import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import java.util.Arrays; -import java.util.Collection; // [CrossCloud] AcquireToken from Cross/foreign Cloud after acquiring token from home cloud // https://identitydivision.visualstudio.com/DefaultCollection/IDDP/_workitems/edit/1616315 -@RunWith(Parameterized.class) @RunOnAPI29Minus("Keep me signed in") public class TestCase1616315 extends AbstractGuestAccountMsalUiTest { - - private final GuestHomeAzureEnvironment mGuestHomeAzureEnvironment; - private final String mHomeCloud; - private final String mCrossCloud; - - public TestCase1616315(final String name, final @NonNull GuestHomeAzureEnvironment guestHomeAzureEnvironment, final String homeCloud, final String crossCloud) { - mGuestHomeAzureEnvironment = guestHomeAzureEnvironment; - mHomeCloud = homeCloud; - mCrossCloud = crossCloud; - } - - @Parameterized.Parameters(name = "{0}") - public static Collection guestHomeAzureEnvironment() { - return Arrays.asList(new Object[][]{ - {"AZURE_US_GOV", GuestHomeAzureEnvironment.AZURE_US_GOVERNMENT, /*homeCloud*/"https://login.microsoftonline.us", /*crossCloud*/"https://login.microsoftonline.com"}, - }); - } + private final String mHomeCloud = "https://login.microsoftonline.us"; + private final String mCrossCloud = "https://login.microsoftonline.com"; @Test public void test_1616315_CrossCloud_MsalOnlyATFromCrossCloudAfterATFromHomeCloud() throws Throwable { - final String userName = mGuestUser.getHomeUpn(); - final String password = mLabClient.getPasswordForGuestUser(mGuestUser); + final String userName = mGuestUser.getUsername(); + final String password = mGuestUser.getPassword(); mBrowser.clear(); final OnInteractionRequired homeCloudInteractionHandler = () -> { mBrowser.handleFirstRun(); @@ -113,7 +88,7 @@ public void test_1616315_CrossCloud_MsalOnlyATFromCrossCloudAfterATFromHomeCloud .scopes(Arrays.asList(getScopes())) .promptParameter(Prompt.SELECT_ACCOUNT) .authority(getHomeAuthority()) - .msalConfigResourceId(getConfigFileResourceId()) + .msalConfigResourceId(getMSIDLAB4ConfigFileResourceId()) .build(); final MsalAuthTestParams acquireTokenCrossCloudAuthParams = MsalAuthTestParams.builder() @@ -122,7 +97,7 @@ public void test_1616315_CrossCloud_MsalOnlyATFromCrossCloudAfterATFromHomeCloud .scopes(Arrays.asList(getScopes())) .promptParameter(Prompt.SELECT_ACCOUNT) .authority(getCrossCloudAuthority()) - .msalConfigResourceId(getConfigFileResourceId()) + .msalConfigResourceId(getMSIDLAB4ConfigFileResourceId()) .build(); final MsalSdk msalSdk = new MsalSdk(); @@ -145,13 +120,8 @@ public void test_1616315_CrossCloud_MsalOnlyATFromCrossCloudAfterATFromHomeCloud } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.GUEST) - .guestHomeAzureEnvironment(mGuestHomeAzureEnvironment) - .guestHomedIn(GuestHomedIn.HOST_AZURE_AD) - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.USGOV_GUEST; } @Override @@ -169,6 +139,6 @@ private String getHomeAuthority() { } private String getCrossCloudAuthority() { - return mCrossCloud + "/" + mGuestUser.getGuestLabTenants().get(0); + return mCrossCloud + "/" + mGuestUser.getGuestTenantId(); } } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/crosscloud/TestCase1616316.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/crosscloud/TestCase1616316.java index 51c0699b1e..5e244c56f1 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/crosscloud/TestCase1616316.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/crosscloud/TestCase1616316.java @@ -24,8 +24,6 @@ import android.text.TextUtils; -import androidx.annotation.NonNull; - import com.microsoft.identity.client.Prompt; import com.microsoft.identity.client.exception.MsalArgumentException; import com.microsoft.identity.client.msal.automationapp.AbstractGuestAccountMsalUiTest; @@ -40,47 +38,25 @@ import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.GuestHomeAzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.GuestHomedIn; import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import java.util.Arrays; -import java.util.Collection; // [CrossCloud] AcquireToken from home Cloud after acquiring token from cross/foreign cloud // https://identitydivision.visualstudio.com/DefaultCollection/IDDP/_workitems/edit/1616315 -@RunWith(Parameterized.class) @RunOnAPI29Minus("Keep me signed in") public class TestCase1616316 extends AbstractGuestAccountMsalUiTest { - private final GuestHomeAzureEnvironment mGuestHomeAzureEnvironment; - private final String mHomeCloud; - private final String mCrossCloud; - - public TestCase1616316(final String name, final @NonNull GuestHomeAzureEnvironment guestHomeAzureEnvironment, final String homeCloud, final String crossCloud) { - mGuestHomeAzureEnvironment = guestHomeAzureEnvironment; - mHomeCloud = homeCloud; - mCrossCloud = crossCloud; - } - - @Parameterized.Parameters(name = "{0}") - public static Collection guestHomeAzureEnvironment() { - return Arrays.asList(new Object[][]{ - {"AZURE_US_GOV", GuestHomeAzureEnvironment.AZURE_US_GOVERNMENT, /*homeCloud*/"https://login.microsoftonline.us", /*crossCloud*/"https://login.microsoftonline.com"}, - }); - } + private final String mHomeCloud = "https://login.microsoftonline.us"; + private final String mCrossCloud = "https://login.microsoftonline.com"; @Test public void test_1616316_CrossCloud_MsalOnlyATFromHomeCloudAfterATFromCrossCloud() throws Throwable { - final String userName = mGuestUser.getHomeUpn(); - final String password = mLabClient.getPasswordForGuestUser(mGuestUser); + final String userName = mGuestUser.getUsername(); + final String password = mGuestUser.getPassword(); mBrowser.clear(); final OnInteractionRequired crossCloudInteractionHandler = () -> { @@ -117,7 +93,7 @@ public void test_1616316_CrossCloud_MsalOnlyATFromHomeCloudAfterATFromCrossCloud .scopes(Arrays.asList(getScopes())) .promptParameter(Prompt.SELECT_ACCOUNT) .authority(getHomeAuthority()) - .msalConfigResourceId(getConfigFileResourceId()) + .msalConfigResourceId(getMSIDLAB4ConfigFileResourceId()) .build(); final MsalAuthTestParams acquireTokenCrossCloudAuthParams = MsalAuthTestParams.builder() @@ -126,7 +102,7 @@ public void test_1616316_CrossCloud_MsalOnlyATFromHomeCloudAfterATFromCrossCloud .scopes(Arrays.asList(getScopes())) .promptParameter(Prompt.SELECT_ACCOUNT) .authority(getCrossCloudAuthority()) - .msalConfigResourceId(getConfigFileResourceId()) + .msalConfigResourceId(getMSIDLAB4ConfigFileResourceId()) .build(); final MsalSdk msalSdk = new MsalSdk(); @@ -148,13 +124,8 @@ public void test_1616316_CrossCloud_MsalOnlyATFromHomeCloudAfterATFromCrossCloud } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .userType(UserType.GUEST) - .guestHomeAzureEnvironment(mGuestHomeAzureEnvironment) - .guestHomedIn(GuestHomedIn.HOST_AZURE_AD) - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); + public UserType getJsonUserType() { + return UserType.USGOV_GUEST; } @Override @@ -172,6 +143,6 @@ private String getHomeAuthority() { } private String getCrossCloudAuthority() { - return mCrossCloud + "/" + mGuestUser.getGuestLabTenants().get(0); + return mCrossCloud + "/" + mGuestUser.getGuestTenantId(); } } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938365.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938365.java index abda9158a7..4ebacae146 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938365.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938365.java @@ -29,15 +29,13 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams; import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.app.IApp; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Test; @@ -46,7 +44,6 @@ // [USGOV][MSAL-ONLY] Acquire token with instance_aware=true, no login hint, and cloud account, // and WW common authority // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/938365 -@RetryOnFailure public class TestCase938365 extends AbstractMsalUiTest { @Test @@ -85,10 +82,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build(); + public UserType getJsonUserType() { + return UserType.USGOV; } @Override @@ -108,6 +103,6 @@ public String getAuthority() { @Override public int getConfigFileResourceId() { - return R.raw.msal_config_instance_aware_common; + return R.raw.msal_config_msidlab4_instance_aware; } } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938367.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938367.java index e682ccab82..9ade8c7c0d 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938367.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938367.java @@ -29,15 +29,13 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams; import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.app.IApp; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Test; @@ -46,7 +44,6 @@ // [USGOV][MSAL-ONLY] Acquire token acquisition with instance_aware=true, login hint present, // and cloud account, and WW organizations authority // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/938367 -@RetryOnFailure(retryCount = 2) public class TestCase938367 extends AbstractMsalUiTest { @Test @@ -86,10 +83,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build(); + public UserType getJsonUserType() { + return UserType.USGOV; } @Override @@ -109,6 +104,6 @@ public String getAuthority() { @Override public int getConfigFileResourceId() { - return R.raw.msal_config_instance_aware_organization; + return R.raw.msal_config_msidlab4_instance_aware_organization; } } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938368.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938368.java index 7e44537bc2..62daad216b 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938368.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938368.java @@ -31,7 +31,6 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams; import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.annotations.RunOnAPI29Minus; import com.microsoft.identity.client.ui.automation.app.IApp; import com.microsoft.identity.client.ui.automation.browser.BrowserChrome; @@ -41,8 +40,6 @@ import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.MicrosoftStsPromptHandlerParameters; import com.microsoft.identity.client.ui.automation.utils.UiAutomatorUtils; import com.microsoft.identity.common.java.util.ThreadUtils; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; import com.microsoft.identity.labapi.utilities.constants.UserType; @@ -56,9 +53,7 @@ // and federated account, and WW common authority // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/938368 // Adding a retry on failure, sometimes arlington login page fails to load -@RetryOnFailure(retryCount = 2) @RunOnAPI29Minus("Speed Bump Page") -@Ignore("Federated Account in LAB is not working at the moment") public class TestCase938368 extends AbstractMsalUiTest { @Test @@ -110,11 +105,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .userType(UserType.FEDERATED) - .build(); + public UserType getJsonUserType() { + return UserType.FEDERATED; } @Override diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938383.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938383.java index e607ed70f3..ad685c6997 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938383.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938383.java @@ -31,15 +31,13 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.ui.automation.TestContext; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.app.IApp; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Test; @@ -47,7 +45,6 @@ // [USGOV][MSAL-ONLY] Acquire token silent with unexpired RT with USGov authority // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/938383 -@RetryOnFailure public class TestCase938383 extends AbstractMsalUiTest { @Test @@ -104,10 +101,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build(); + public UserType getJsonUserType() { + return UserType.USGOV; } @Override @@ -127,6 +122,6 @@ public String getAuthority() { @Override public int getConfigFileResourceId() { - return R.raw.msal_config_instance_aware_common; + return R.raw.msal_config_msidlab4_instance_aware; } } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938384.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938384.java index 5d51313dcd..df2003ada2 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938384.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/msalonly/usgov/TestCase938384.java @@ -29,15 +29,13 @@ import com.microsoft.identity.client.msal.automationapp.sdk.MsalAuthTestParams; import com.microsoft.identity.client.msal.automationapp.sdk.MsalSdk; import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.annotations.RetryOnFailure; import com.microsoft.identity.client.ui.automation.app.IApp; import com.microsoft.identity.client.ui.automation.interaction.OnInteractionRequired; import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; import com.microsoft.identity.labapi.utilities.constants.TempUserType; +import com.microsoft.identity.labapi.utilities.constants.UserType; import org.junit.Test; @@ -45,7 +43,6 @@ // [USGOV][MSAL-ONLY] Acquire token with USGov Authority // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/938384 -@RetryOnFailure(retryCount = 2) public class TestCase938384 extends AbstractMsalUiTest { @Test @@ -85,10 +82,8 @@ public void handleUserInteraction() { } @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_US_GOVERNMENT) - .build(); + public UserType getJsonUserType() { + return UserType.USGOV; } @Override @@ -108,6 +103,6 @@ public String getAuthority() { @Override public int getConfigFileResourceId() { - return R.raw.msal_config_default; + return R.raw.msal_config_msidlab4; } } diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/perf/TestCasePerf.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/perf/TestCasePerf.java deleted file mode 100644 index 367ac2a074..0000000000 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/perf/TestCasePerf.java +++ /dev/null @@ -1,171 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// All rights reserved. -// -// This code is licensed under the MIT License. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files(the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions : -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -package com.microsoft.identity.client.msal.automationapp.testpass.perf; - -import com.microsoft.identity.client.AcquireTokenParameters; -import com.microsoft.identity.client.AcquireTokenSilentParameters; -import com.microsoft.identity.client.IAccount; -import com.microsoft.identity.client.Prompt; -import com.microsoft.identity.client.msal.automationapp.AbstractMsalUiTest; -import com.microsoft.identity.client.msal.automationapp.R; -import com.microsoft.identity.client.msal.automationapp.interaction.InteractiveRequest; -import com.microsoft.identity.client.msal.automationapp.interaction.OnInteractionRequired; -import com.microsoft.identity.client.ui.automation.TokenRequestLatch; -import com.microsoft.identity.client.ui.automation.TokenRequestTimeout; -import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; -import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; -import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.client.ui.automation.logging.appender.FileAppender; -import com.microsoft.identity.client.ui.automation.logging.formatter.SimpleTextFormatter; -import com.microsoft.identity.client.ui.automation.utils.CommonUtils; -import com.microsoft.identity.common.java.marker.PerfConstants; -import com.microsoft.identity.common.java.marker.CodeMarkerManager; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.TempUserType; - -import org.junit.Test; - -import java.io.IOException; -import java.util.Arrays; -import java.util.concurrent.TimeUnit; - -// Silent Auth with force_refresh -// https://identitydivision.visualstudio.com/DefaultCollection/IDDP/_workitems/edit/99563 -public class TestCasePerf extends AbstractMsalUiTest { - - @Test - public void test_acquireTokenSilentlyWithoutBroker() { - CodeMarkerManager codeMarkerManager = CodeMarkerManager.getInstance(); - final TokenRequestLatch latch = new TokenRequestLatch(1); - final int numberOfOccurrenceOfTest = 10; - final String outputFilenamePrefix = "PerfDataTarget"; - - final String username = mLabAccount.getUsername(); - final String password = mLabAccount.getPassword(); - - final AcquireTokenParameters parameters = new AcquireTokenParameters.Builder() - .startAuthorizationFromActivity(mActivity) - .withLoginHint(username) - .withScopes(Arrays.asList(mScopes)) - .withCallback(successfulInteractiveCallback(latch)) - .withPrompt(Prompt.SELECT_ACCOUNT) - .build(); - - - final InteractiveRequest interactiveRequest = new InteractiveRequest( - mApplication, - parameters, - new OnInteractionRequired() { - @Override - public void handleUserInteraction() { - final PromptHandlerParameters promptHandlerParameters = PromptHandlerParameters.builder() - .prompt(PromptParameter.SELECT_ACCOUNT) - .loginHint(username) - .sessionExpected(false) - .consentPageExpected(false) - .speedBumpExpected(false) - .build(); - - new AadPromptHandler(promptHandlerParameters) - .handlePrompt(username, password); - } - } - ); - - interactiveRequest.execute(); - latch.await(TokenRequestTimeout.SHORT); - - final IAccount account = getAccount(); - codeMarkerManager.setEnableCodeMarker(true); - //Setting up scenario code. 100 -> Non Brokered, 200 -> Brokered - codeMarkerManager.setPrefixScenarioCode(PerfConstants.ScenarioConstants.SCENARIO_NON_BROKERED_ACQUIRE_TOKEN_SILENTLY); - - for(int i = 0; i < numberOfOccurrenceOfTest; i++) { - codeMarkerManager.clearMarkers(); - final TokenRequestLatch silentLatch = new TokenRequestLatch(1); - - final AcquireTokenSilentParameters silentParameters = new AcquireTokenSilentParameters.Builder() - .forAccount(account) - .fromAuthority(account.getAuthority()) - .forceRefresh(true) - .withScopes(Arrays.asList(mScopes)) - .withCallback(successfulSilentCallback(silentLatch)) - .build(); - - mApplication.acquireTokenSilentAsync(silentParameters); - silentLatch.await(TokenRequestTimeout.SILENT); - try { - FileAppender fileAppender = new FileAppender(outputFilenamePrefix + i + ".txt", new SimpleTextFormatter()); - fileAppender.append(codeMarkerManager.getFileContent()); - CommonUtils.copyFileToFolderInSdCard( - fileAppender.getLogFile(), - "automation" - ); - } catch (IOException e) { - throw new AssertionError("IOException while writing Perf data file"); - } - - // If this is not the last iteration, then we need either to clear cache of access token manually or wait for 30 seconds. - if(i < numberOfOccurrenceOfTest - 1) { - // CommandDispatcherHelper.clear(); - try { - // Sleep for 30 seconds so that the cache access token cache is cleared. - Thread.sleep(TimeUnit.SECONDS.toMillis(30)); - } catch (InterruptedException e) { - throw new AssertionError("Interrupted while sleeping for 30 seconds so that old access token could have been out of chache"); - } - } - } - codeMarkerManager.clearMarkers(); - codeMarkerManager.setEnableCodeMarker(false); - } - - - @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .build(); - } - - @Override - public TempUserType getTempUserType() { - return null; - } - - @Override - public String[] getScopes() { - return new String[]{"User.read"}; - } - - @Override - public String getAuthority() { - return mApplication.getConfiguration().getDefaultAuthority().toString(); - } - - @Override - public int getConfigFileResourceId() { - return R.raw.msal_config_webview; - } -} diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/perf/TestCasePerfBrokered.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/perf/TestCasePerfBrokered.java deleted file mode 100644 index 86b9812c9a..0000000000 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/perf/TestCasePerfBrokered.java +++ /dev/null @@ -1,175 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// All rights reserved. -// -// This code is licensed under the MIT License. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files(the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions : -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -package com.microsoft.identity.client.msal.automationapp.testpass.perf; - -import com.microsoft.identity.client.AcquireTokenParameters; -import com.microsoft.identity.client.AcquireTokenSilentParameters; -import com.microsoft.identity.client.IAccount; -import com.microsoft.identity.client.Prompt; -import com.microsoft.identity.client.msal.automationapp.R; -import com.microsoft.identity.client.msal.automationapp.interaction.InteractiveRequest; -import com.microsoft.identity.client.msal.automationapp.interaction.OnInteractionRequired; -import com.microsoft.identity.client.msal.automationapp.testpass.broker.AbstractMsalBrokerTest; -import com.microsoft.identity.client.ui.automation.TokenRequestLatch; -import com.microsoft.identity.client.ui.automation.interaction.PromptHandlerParameters; -import com.microsoft.identity.client.ui.automation.interaction.PromptParameter; -import com.microsoft.identity.client.ui.automation.interaction.microsoftsts.AadPromptHandler; -import com.microsoft.identity.client.ui.automation.logging.appender.FileAppender; -import com.microsoft.identity.client.ui.automation.logging.formatter.SimpleTextFormatter; -import com.microsoft.identity.client.ui.automation.utils.CommonUtils; -import com.microsoft.identity.common.java.marker.CodeMarkerManager; -import com.microsoft.identity.common.java.marker.PerfConstants; -import com.microsoft.identity.labapi.utilities.client.LabQuery; -import com.microsoft.identity.labapi.utilities.constants.AzureEnvironment; -import com.microsoft.identity.labapi.utilities.constants.ProtectionPolicy; -import com.microsoft.identity.labapi.utilities.constants.TempUserType; - -import org.junit.Test; - -import java.io.IOException; -import java.util.concurrent.TimeUnit; - -//Perf test case with Joined AcquireToken test with MSAL and Broker -//This test case is build over the test case number 832430 -public class TestCasePerfBrokered extends AbstractMsalBrokerTest { - - @Test - public void test_acquireTokenSilentlyWithBroker() throws InterruptedException { - CodeMarkerManager codeMarkerManager = CodeMarkerManager.getInstance(); - final int numberOfOccurrenceOfTest = 10; - final String outputFilenamePrefix = "PerfDataTargetBrokerHostWR"; // With Resource - final String username = mLabAccount.getUsername(); - final String password = mLabAccount.getPassword(); - - //acquiring token - final TokenRequestLatch latch = new TokenRequestLatch(1); - - final AcquireTokenParameters parameters = new AcquireTokenParameters.Builder() - .startAuthorizationFromActivity(mActivity) - .withLoginHint(username) - .withCallback(successfulInteractiveCallback(latch)) - .withPrompt(Prompt.SELECT_ACCOUNT) - .withResource(mScopes[0]) - .build(); - - final InteractiveRequest interactiveRequest = new InteractiveRequest( - mApplication, - parameters, - new OnInteractionRequired() { - @Override - public void handleUserInteraction() { - final PromptHandlerParameters promptHandlerParameters = PromptHandlerParameters.builder() - .prompt(PromptParameter.SELECT_ACCOUNT) - .loginHint(username) - .sessionExpected(false) - .consentPageExpected(false) - .speedBumpExpected(false) - .broker(mBroker) - .expectingBrokerAccountChooserActivity(false) - .registerPageExpected(true) - .build(); - - new AadPromptHandler(promptHandlerParameters) - .handlePrompt(username, password); - } - } - ); - - interactiveRequest.execute(); - latch.await(); - - final IAccount account = getAccount(); - codeMarkerManager.setEnableCodeMarker(true); - //Setting up scenario code. 100 -> Non Brokered, 200 -> Brokered - codeMarkerManager.setPrefixScenarioCode(PerfConstants.ScenarioConstants.SCENARIO_BROKERED_ACQUIRE_TOKEN_SILENTLY); - //acquiring token silently - - for(int i = 0; i < numberOfOccurrenceOfTest; i++) { - codeMarkerManager.clearMarkers(); - final TokenRequestLatch silentLatch = new TokenRequestLatch(1); - - final AcquireTokenSilentParameters silentParameters = new AcquireTokenSilentParameters.Builder() - .forAccount(account) - .fromAuthority(account.getAuthority()) - .withResource(mScopes[0]) - .withCallback(successfulSilentCallback(silentLatch)) - .build(); - - mApplication.acquireTokenSilentAsync(silentParameters); - silentLatch.await(); - - try { - FileAppender fileAppender = new FileAppender(outputFilenamePrefix + i + ".txt", new SimpleTextFormatter()); - fileAppender.append(codeMarkerManager.getFileContent()); - CommonUtils.copyFileToFolderInSdCard( - fileAppender.getLogFile(), - "automation" - ); - } catch (IOException e) { - throw new AssertionError("IOException while writing Perf data file"); - } - // If this is not the last iteration, then we need either to clear cache of access token manually or wait for 30 seconds. - if (i < numberOfOccurrenceOfTest - 1) { - // CommandDispatcherHelper.clear(); - try { - // Sleep for 30 seconds so that the cache access token cache is cleared. - Thread.sleep(TimeUnit.SECONDS.toMillis(30)); - } catch (InterruptedException e) { - throw new AssertionError("Interrupted while sleeping for 30 seconds so that old access token could have been out of cache"); - } - } - } - - codeMarkerManager.clearMarkers(); - codeMarkerManager.setEnableCodeMarker(false); - } - - @Override - public LabQuery getLabQuery() { - return LabQuery.builder() - .azureEnvironment(AzureEnvironment.AZURE_CLOUD) - .protectionPolicy(ProtectionPolicy.MAM_CA) - .build(); - } - - @Override - public TempUserType getTempUserType() { - return null; - } - - @Override - public String[] getScopes() { - return new String[]{"00000003-0000-0ff1-ce00-000000000000"}; - } - - @Override - public String getAuthority() { - return mApplication.getConfiguration().getDefaultAuthority().toString(); - } - - @Override - public int getConfigFileResourceId() { - return R.raw.msal_config_default; - } - -} diff --git a/msalautomationapp/src/main/res/raw/msal_automation_config.json b/msalautomationapp/src/main/res/raw/msal_automation_config.json index 8ecf04ec91..91841065fa 100644 --- a/msalautomationapp/src/main/res/raw/msal_automation_config.json +++ b/msalautomationapp/src/main/res/raw/msal_automation_config.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":true, diff --git a/msalautomationapp/src/main/res/raw/msal_config_browser.json b/msalautomationapp/src/main/res/raw/msal_config_browser.json index 826ed8ce5f..314199e7ad 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_browser.json +++ b/msalautomationapp/src/main/res/raw/msal_config_browser.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "BROWSER", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "authorities" : [ diff --git a/msalautomationapp/src/main/res/raw/msal_config_default.json b/msalautomationapp/src/main/res/raw/msal_config_default.json index e010c6d7ae..e775b0c2b0 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_default.json +++ b/msalautomationapp/src/main/res/raw/msal_config_default.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "default", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "authorities" : [ diff --git a/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common.json b/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common.json index b1cdaa5820..86231e1207 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common.json +++ b/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":true, diff --git a/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common_skip_broker.json b/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common_skip_broker.json index 28439de996..f674b6987d 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common_skip_broker.json +++ b/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common_skip_broker.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "BROWSER", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":true, diff --git a/msalautomationapp/src/main/res/raw/msal_config_instance_aware_organization.json b/msalautomationapp/src/main/res/raw/msal_config_instance_aware_organization.json index 18b568840b..f14f9c0299 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_instance_aware_organization.json +++ b/msalautomationapp/src/main/res/raw/msal_config_instance_aware_organization.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":true, diff --git a/msalautomationapp/src/main/res/raw/msal_config_msa.json b/msalautomationapp/src/main/res/raw/msal_config_msa.json index f46c169316..bceb207063 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_msa.json +++ b/msalautomationapp/src/main/res/raw/msal_config_msa.json @@ -1,5 +1,5 @@ { - "client_id" : "9668f2bd-6103-4292-9024-84fa2d1b6fb2", + "client_id" : "700c5153-ef50-4176-8d7a-4131d649020e", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "authorities" : [ diff --git a/msalautomationapp/src/main/res/raw/msal_config_msa_only.json b/msalautomationapp/src/main/res/raw/msal_config_msa_only.json index ac3d82f158..91e4e4e4d0 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_msa_only.json +++ b/msalautomationapp/src/main/res/raw/msal_config_msa_only.json @@ -1,5 +1,5 @@ { - "client_id" : "9668f2bd-6103-4292-9024-84fa2d1b6fb2", + "client_id" : "700c5153-ef50-4176-8d7a-4131d649020e", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "authorities" : [ diff --git a/msalautomationapp/src/main/res/raw/msal_config_msidlab4.json b/msalautomationapp/src/main/res/raw/msal_config_msidlab4.json new file mode 100644 index 0000000000..e010c6d7ae --- /dev/null +++ b/msalautomationapp/src/main/res/raw/msal_config_msidlab4.json @@ -0,0 +1,18 @@ +{ + "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "authorization_user_agent" : "default", + "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", + "authorities" : [ + { + "type": "AAD", + "audience": { + "type": "AzureADMultipleOrgs" + } + } + ], + "logging": { + "pii_enabled": false, + "log_level": "VERBOSE", + "logcat_enabled": false + } +} diff --git a/msalautomationapp/src/main/res/raw/msal_config_msidlab4_instance_aware.json b/msalautomationapp/src/main/res/raw/msal_config_msidlab4_instance_aware.json new file mode 100644 index 0000000000..b1cdaa5820 --- /dev/null +++ b/msalautomationapp/src/main/res/raw/msal_config_msidlab4_instance_aware.json @@ -0,0 +1,17 @@ +{ + "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "authorization_user_agent" : "DEFAULT", + "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", + "multiple_clouds_supported":true, + "authorities" : [ + { + "type": "AAD", + "authority_url": "https://login.microsoftonline.com/common" + } + ], + "logging": { + "pii_enabled": false, + "log_level": "VERBOSE", + "logcat_enabled": false + } +} diff --git a/msalautomationapp/src/main/res/raw/msal_config_msidlab4_instance_aware_organization.json b/msalautomationapp/src/main/res/raw/msal_config_msidlab4_instance_aware_organization.json new file mode 100644 index 0000000000..18b568840b --- /dev/null +++ b/msalautomationapp/src/main/res/raw/msal_config_msidlab4_instance_aware_organization.json @@ -0,0 +1,17 @@ +{ + "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "authorization_user_agent" : "DEFAULT", + "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", + "multiple_clouds_supported":true, + "authorities" : [ + { + "type": "AAD", + "authority_url": "https://login.microsoftonline.com/organizations" + } + ], + "logging": { + "pii_enabled": false, + "log_level": "VERBOSE", + "logcat_enabled": false + } +} diff --git a/msalautomationapp/src/main/res/raw/msal_config_no_admin_consent.json b/msalautomationapp/src/main/res/raw/msal_config_no_admin_consent.json index aa6575be74..bb79b28f6f 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_no_admin_consent.json +++ b/msalautomationapp/src/main/res/raw/msal_config_no_admin_consent.json @@ -1,5 +1,5 @@ { - "client_id" : "a8c8bb57-55f3-4e95-9cf2-a3aac32f0d7a", + "client_id" : "bf7b5f44-990f-47d3-ae20-974b6ae48fb3", "authorization_user_agent" : "WEBVIEW", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "authorities" : [ @@ -7,7 +7,7 @@ "type": "AAD", "audience": { "type": "AzureADMyOrg", - "tenant_id": "f645ad92-e38d-4d1a-b510-d1b09a74a8ca" + "tenant_id": "c7cef333-42af-492c-afb0-21f74a661133" } } ], diff --git a/msalautomationapp/src/main/res/raw/msal_config_pkey_auth_silent.json b/msalautomationapp/src/main/res/raw/msal_config_pkey_auth_silent.json index 542621cba0..2566fba5ec 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_pkey_auth_silent.json +++ b/msalautomationapp/src/main/res/raw/msal_config_pkey_auth_silent.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "handle_null_taskaffinity": true, diff --git a/msalautomationapp/src/main/res/raw/msal_config_webview.json b/msalautomationapp/src/main/res/raw/msal_config_webview.json index 6b4be1a6c1..cae14dcdc5 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_webview.json +++ b/msalautomationapp/src/main/res/raw/msal_config_webview.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "WEBVIEW", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "authorities" : [ diff --git a/testapps/testapp/src/main/res/raw/msal_config_browser.json b/testapps/testapp/src/main/res/raw/msal_config_browser.json index 53179c4200..2194414cd9 100644 --- a/testapps/testapp/src/main/res/raw/msal_config_browser.json +++ b/testapps/testapp/src/main/res/raw/msal_config_browser.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "BROWSER", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "authorities" : [ diff --git a/testapps/testapp/src/main/res/raw/msal_config_browser_skip_broker.json b/testapps/testapp/src/main/res/raw/msal_config_browser_skip_broker.json index 0e1d59622b..3391d40644 100644 --- a/testapps/testapp/src/main/res/raw/msal_config_browser_skip_broker.json +++ b/testapps/testapp/src/main/res/raw/msal_config_browser_skip_broker.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "BROWSER", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "broker_redirect_uri_registered": false, diff --git a/testapps/testapp/src/main/res/raw/msal_config_default.json b/testapps/testapp/src/main/res/raw/msal_config_default.json index 2b1df0e043..919f5e2262 100644 --- a/testapps/testapp/src/main/res/raw/msal_config_default.json +++ b/testapps/testapp/src/main/res/raw/msal_config_default.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "handle_null_taskaffinity": true, diff --git a/testapps/testapp/src/main/res/raw/msal_config_instance_aware_common.json b/testapps/testapp/src/main/res/raw/msal_config_instance_aware_common.json index 8fb70bcbf5..a729a32b9a 100644 --- a/testapps/testapp/src/main/res/raw/msal_config_instance_aware_common.json +++ b/testapps/testapp/src/main/res/raw/msal_config_instance_aware_common.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":true, diff --git a/testapps/testapp/src/main/res/raw/msal_config_instance_aware_common_skip_broker.json b/testapps/testapp/src/main/res/raw/msal_config_instance_aware_common_skip_broker.json index 318b881c59..272289322f 100644 --- a/testapps/testapp/src/main/res/raw/msal_config_instance_aware_common_skip_broker.json +++ b/testapps/testapp/src/main/res/raw/msal_config_instance_aware_common_skip_broker.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "BROWSER", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":true, diff --git a/testapps/testapp/src/main/res/raw/msal_config_instance_aware_organization.json b/testapps/testapp/src/main/res/raw/msal_config_instance_aware_organization.json index 5a6fcd89e8..ea1d707496 100644 --- a/testapps/testapp/src/main/res/raw/msal_config_instance_aware_organization.json +++ b/testapps/testapp/src/main/res/raw/msal_config_instance_aware_organization.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "multiple_clouds_supported":true, diff --git a/testapps/testapp/src/main/res/raw/msal_config_msa.json b/testapps/testapp/src/main/res/raw/msal_config_msa.json index 6ea9982260..200d9077a6 100644 --- a/testapps/testapp/src/main/res/raw/msal_config_msa.json +++ b/testapps/testapp/src/main/res/raw/msal_config_msa.json @@ -1,5 +1,5 @@ { - "client_id" : "9668f2bd-6103-4292-9024-84fa2d1b6fb2", + "client_id" : "700c5153-ef50-4176-8d7a-4131d649020e", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "authorities" : [ diff --git a/testapps/testapp/src/main/res/raw/msal_config_msa_only.json b/testapps/testapp/src/main/res/raw/msal_config_msa_only.json index 0485b0d2de..10e83de565 100644 --- a/testapps/testapp/src/main/res/raw/msal_config_msa_only.json +++ b/testapps/testapp/src/main/res/raw/msal_config_msa_only.json @@ -1,5 +1,5 @@ { - "client_id" : "9668f2bd-6103-4292-9024-84fa2d1b6fb2", + "client_id" : "700c5153-ef50-4176-8d7a-4131d649020e", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "authorities" : [ diff --git a/testapps/testapp/src/main/res/raw/msal_config_no_admin_consent.json b/testapps/testapp/src/main/res/raw/msal_config_no_admin_consent.json index 3102ad4c8a..8c1044ffac 100644 --- a/testapps/testapp/src/main/res/raw/msal_config_no_admin_consent.json +++ b/testapps/testapp/src/main/res/raw/msal_config_no_admin_consent.json @@ -1,5 +1,5 @@ { - "client_id" : "a8c8bb57-55f3-4e95-9cf2-a3aac32f0d7a", + "client_id" : "bf7b5f44-990f-47d3-ae20-974b6ae48fb3", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "authorities" : [ @@ -7,7 +7,7 @@ "type": "AAD", "audience": { "type": "AzureADMyOrg", - "tenant_id": "f645ad92-e38d-4d1a-b510-d1b09a74a8ca" + "tenant_id": "c7cef333-42af-492c-afb0-21f74a661133" } } ] diff --git a/testapps/testapp/src/main/res/raw/msal_config_onebox.json b/testapps/testapp/src/main/res/raw/msal_config_onebox.json index c5c826dd59..f41923fdb1 100644 --- a/testapps/testapp/src/main/res/raw/msal_config_onebox.json +++ b/testapps/testapp/src/main/res/raw/msal_config_onebox.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "handle_null_taskaffinity": true, diff --git a/testapps/testapp/src/main/res/raw/msal_config_pkey_auth_silent.json b/testapps/testapp/src/main/res/raw/msal_config_pkey_auth_silent.json index 93c15427cf..a035cc372a 100644 --- a/testapps/testapp/src/main/res/raw/msal_config_pkey_auth_silent.json +++ b/testapps/testapp/src/main/res/raw/msal_config_pkey_auth_silent.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "DEFAULT", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "handle_null_taskaffinity": true, diff --git a/testapps/testapp/src/main/res/raw/msal_config_webview.json b/testapps/testapp/src/main/res/raw/msal_config_webview.json index cf4c4c4105..44d1ba3e13 100644 --- a/testapps/testapp/src/main/res/raw/msal_config_webview.json +++ b/testapps/testapp/src/main/res/raw/msal_config_webview.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "WEBVIEW", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "webauthn_capable" : true, diff --git a/testapps/testapp/src/main/res/raw/msal_config_webview_msa.json b/testapps/testapp/src/main/res/raw/msal_config_webview_msa.json index cb7bcbc90f..0e5385fcda 100644 --- a/testapps/testapp/src/main/res/raw/msal_config_webview_msa.json +++ b/testapps/testapp/src/main/res/raw/msal_config_webview_msa.json @@ -1,5 +1,5 @@ { - "client_id" : "9668f2bd-6103-4292-9024-84fa2d1b6fb2", + "client_id" : "700c5153-ef50-4176-8d7a-4131d649020e", "authorization_user_agent" : "WEBVIEW", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "webauthn_capable" : true, diff --git a/testapps/testapp/src/main/res/raw/msal_config_webview_msa_passkey_reg.json b/testapps/testapp/src/main/res/raw/msal_config_webview_msa_passkey_reg.json index 5ea002cff6..ebfe9b6e4c 100644 --- a/testapps/testapp/src/main/res/raw/msal_config_webview_msa_passkey_reg.json +++ b/testapps/testapp/src/main/res/raw/msal_config_webview_msa_passkey_reg.json @@ -1,5 +1,5 @@ { - "client_id" : "9668f2bd-6103-4292-9024-84fa2d1b6fb2", + "client_id" : "700c5153-ef50-4176-8d7a-4131d649020e", "authorization_user_agent" : "WEBVIEW", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "webauthn_capable" : true, diff --git a/testapps/testapp/src/main/res/raw/msal_config_webview_skip_broker.json b/testapps/testapp/src/main/res/raw/msal_config_webview_skip_broker.json index 3498162801..463732b1e6 100644 --- a/testapps/testapp/src/main/res/raw/msal_config_webview_skip_broker.json +++ b/testapps/testapp/src/main/res/raw/msal_config_webview_skip_broker.json @@ -1,5 +1,5 @@ { - "client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0", + "client_id" : "c6bb302a-1e38-408e-9754-87c18fe81c80", "authorization_user_agent" : "WEBVIEW", "redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D", "broker_redirect_uri_registered": false,