Merge pull request #2222 from AzureAD/fidelianawar/update_ciam_lab6

Update CIAM automation test for MSIDLABCIAM6

Author: fidelianawar

MSAL/IdentityCore

@@ -90,8 +90,8 @@ + (void)initialize
         }
     }
 
-    __auto_type authorityCIAM = [NSString stringWithFormat:@"https://msidlabciam1.ciamlogin.com"];
-    __auto_type authorityCIAMTenant = [NSString stringWithFormat:@"https://msidlabciam1.ciamlogin.com/msidlabciam1.onmicrosoft.com"];
+    __auto_type authorityCIAM = [NSString stringWithFormat:@"https://msidlabciam2.ciamlogin.com"];
+    __auto_type authorityCIAMTenant = [NSString stringWithFormat:@"https://msidlabciam2.ciamlogin.com/msidlabciam2.onmicrosoft.com"];
     [authorities addObjectsFromArray: @[authorityCIAM, authorityCIAMTenant]];
 
     s_authorities = authorities;

MSAL/test/app/MSALTestAppSettings.m

@@ -44,8 +44,9 @@ - (void)setUp
     self.testEnvironment = self.class.confProvider.wwEnvironment;
 
     MSIDTestAutomationAccountConfigurationRequest *accountConfigurationRequest = [MSIDTestAutomationAccountConfigurationRequest new];
-    accountConfigurationRequest.federationProviderType = MSIDTestAccountFederationProviderTypeCIAM;
-    
+    accountConfigurationRequest.federationProviderType = MSIDTestAccountFederationProviderTypeCIAMCUD;
+    accountConfigurationRequest.additionalQueryParameters = @{@"signInAudience": @"azureadmyorg"};
+
     [self loadTestAccount:accountConfigurationRequest];
 
     MSIDTestAutomationAppConfigurationRequest *appConfigurationRequest = [MSIDTestAutomationAppConfigurationRequest new];
@@ -62,15 +63,15 @@ - (void)setUp
     (void)testInteractiveAndSilentCIAMLogin_withPromptAlways_noLoginHint_andSystemWebView
 {
     MSIDAutomationTestRequest *request = [self.class.confProvider defaultAppRequest:self.testEnvironment targetTenantId:self.primaryAccount.targetTenantId];
-    request.configurationAuthority = @"https://msidlabciam2.ciamlogin.com";
-    request.expectedResultAuthority = @"https://msidlabciam2.ciamlogin.com/f7416cc8-8ea1-4e5c-b230-0c978f81dfc6";
-    request.cacheAuthority = @"https://msidlabciam2.ciamlogin.com/f7416cc8-8ea1-4e5c-b230-0c978f81dfc6";
+    request.configurationAuthority = @"https://msidlabciam6.ciamlogin.com";
+    request.expectedResultAuthority = @"https://msidlabciam6.ciamlogin.com/fe362aec-5d43-45d1-b730-9755e60dc3b9";
+    request.cacheAuthority = @"https://msidlabciam6.ciamlogin.com/fe362aec-5d43-45d1-b730-9755e60dc3b9";
     request.acquireTokenAuthority = request.cacheAuthority;
     request.requestScopes = self.testApplication.defaultScopes.msidToString;
     request.promptBehavior = @"force";
     request.redirectUri = @"msauth.com.microsoft.msalautomationapp://auth";
 
-    // 1. Do intevractive login
+    // 1. Do interactive login
     NSString *homeAccountId = [self runSharedAADLoginWithTestRequest:request];
     XCTAssertNotNil(homeAccountId);