Add aad b2c integration test in china cloud (Azure#19435)

Author: Moary Chen

sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml

@@ -51,6 +51,18 @@
       <version>1.0.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-test-selenium-common;current} -->
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
   </dependencies>
 
 </project>

sdk/spring/azure-spring-boot-test-aad-b2c/src/test/java/com/azure/test/aad/b2c/selenium/AADB2CIT.java

@@ -79,7 +79,10 @@ public static class DumbApp extends WebSecurityConfigurerAdapter {
 
         private final AADB2COidcLoginConfigurer configurer;
 
+        private final String profileEdit;
+
         public DumbApp(AADB2COidcLoginConfigurer configurer) {
+            this.profileEdit = AAD_B2C_PROFILE_EDIT;
             this.configurer = configurer;
         }
 
@@ -105,6 +108,7 @@ private void initializeModel(Model model, OAuth2AuthenticationToken token) {
                 model.addAttribute("grant_type", user.getAuthorities());
                 model.addAllAttributes(user.getAttributes());
             }
+            model.addAttribute("aadb2c_profileedit", profileEdit);
         }
     }
 }

sdk/spring/azure-spring-boot-test-aad-b2c/src/test/java/com/azure/test/aad/b2c/selenium/AADB2CSeleniumITHelper.java

@@ -8,19 +8,27 @@
 import static com.azure.spring.test.EnvironmentVariable.AAD_B2C_BASE_URI;
 import static com.azure.spring.test.EnvironmentVariable.AAD_B2C_USER_EMAIL;
 import static com.azure.spring.test.EnvironmentVariable.AAD_B2C_USER_PASSWORD;
+import static com.azure.spring.test.EnvironmentVariable.AZURE_CLOUD_TYPE;
 import static org.openqa.selenium.support.ui.ExpectedConditions.presenceOfElementLocated;
 
+import com.azure.spring.test.Constant;
 import com.azure.test.aad.common.SeleniumITHelper;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AADB2CSeleniumITHelper extends SeleniumITHelper {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(AADB2CSeleniumITHelper.class);
+
     private String userEmail;
     private String userPassword;
+    private boolean isAzureCloudGlobal;
 
     public static Map<String, String> createDefaultProperteis() {
         Map<String, String> defaultProperteis = new HashMap<>();
@@ -39,20 +47,37 @@ public AADB2CSeleniumITHelper(Class<?> appClass, Map<String, String> properties)
         super(appClass, properties);
         userEmail = AAD_B2C_USER_EMAIL;
         userPassword = AAD_B2C_USER_PASSWORD;
+        isAzureCloudGlobal = Constant.AZURE_CLOUD_TYPE_GLOBAL.equalsIgnoreCase(AZURE_CLOUD_TYPE);
     }
 
     public void logIn() {
         driver.get(app.root());
-        wait.until(presenceOfElementLocated(By.id("email"))).sendKeys(userEmail);
+        LOGGER.info("Current url is " + driver.getCurrentUrl());
+        wait.until(ExpectedConditions.urlMatches("^https://"));
+        if (isAzureCloudGlobal) {
+            wait.until(presenceOfElementLocated(By.id("email"))).sendKeys(userEmail);
+        } else {
+            wait.until(presenceOfElementLocated(By.id("logonIdentifier"))).sendKeys(userEmail);
+        }
+
         wait.until(presenceOfElementLocated(By.id("password"))).sendKeys(userPassword);
-        wait.until(presenceOfElementLocated(By.cssSelector("button[type='submit']"))).sendKeys(Keys.ENTER);
+
+        if (isAzureCloudGlobal) {
+            wait.until(presenceOfElementLocated(By.cssSelector("button[type='submit']"))).sendKeys(Keys.ENTER);
+        } else {
+            wait.until(presenceOfElementLocated(By.id("next"))).sendKeys(Keys.ENTER);
+        }
         manualRedirection();
     }
 
     public void profileEditJobTitle(String newJobTitle) {
         wait.until(presenceOfElementLocated(By.id("profileEdit"))).click();
         changeJobTile(newJobTitle);
-        wait.until(ExpectedConditions.elementToBeClickable(By.cssSelector("button[type='submit']"))).click();
+        if (isAzureCloudGlobal) {
+            wait.until(ExpectedConditions.elementToBeClickable(By.cssSelector("button[type='submit']"))).click();
+        } else {
+            wait.until(presenceOfElementLocated(By.id("continue"))).sendKeys(Keys.ENTER);
+        }
         manualRedirection();
     }
 
@@ -99,6 +124,10 @@ public String getUserFlowName() {
     }
 
     public String getSignInButtonText() {
-        return wait.until(ExpectedConditions.elementToBeClickable(By.cssSelector("button[type='submit']"))).getText();
+        if (isAzureCloudGlobal) {
+            return wait.until(ExpectedConditions.elementToBeClickable(By.cssSelector("button[type='submit']"))).getText();
+        } else {
+            return wait.until(ExpectedConditions.elementToBeClickable(By.id("next"))).getText();
+        }
     }
 }

sdk/spring/azure-spring-boot-test-aad-b2c/src/test/resources/logback.xml

@@ -0,0 +1,11 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>

sdk/spring/azure-spring-boot-test-aad-b2c/src/test/resources/templates/index.html

@@ -11,7 +11,8 @@
 
 <h1>Home page</h1>
 <div>
-    <form style="display:inline" method="get" action="/oauth2/authorization/B2C_1_profileediting1">
+    <form th:if="${aadb2c_profileedit != null}" style="display:inline" method="get"
+          th:action="${'/oauth2/authorization/' + aadb2c_profileedit}">
         <button id="profileEdit" class="btn btn-md btn-primary btn-block" type="submit">Profile edit</button>
     </form>
     <form style="display:inline" method="get" action="/logout">

sdk/spring/azure-spring-boot-test-core/src/main/java/com/azure/spring/test/Constant.java

@@ -9,4 +9,7 @@ public class Constant {
     public static String toFullNameScope(String clientId, String scope) {
         return "api://" + clientId + "/" + scope;
     }
+
+    public static final String AZURE_CLOUD_TYPE_CHINA = "China";
+    public static final String AZURE_CLOUD_TYPE_GLOBAL = "Global";
 }

sdk/spring/azure-spring-boot-test-selenium-common/src/main/java/com/azure/test/aad/common/SeleniumITHelper.java

@@ -17,7 +17,7 @@
 import java.util.Map;
 
 public class SeleniumITHelper {
-    private static Logger logger = LoggerFactory.getLogger(SeleniumITHelper.class);
+    private static Logger LOGGER = LoggerFactory.getLogger(SeleniumITHelper.class);
     private static String WEB_DRIVER_FOLDER_NAME = "webdriver";
 
     protected AppRunner app;
@@ -39,7 +39,7 @@ protected void createDriver() {
             options.addArguments("--headless");
             options.addArguments("--incognito", "--no-sandbox", "--disable-dev-shm-usage");
             driver = new ChromeDriver(options);
-            wait = new WebDriverWait(driver, 10);
+            wait = new WebDriverWait(driver, 15);
         }
     }
 
@@ -68,7 +68,7 @@ public void destroy() {
 
     private void setPathExecutableRecursively(File file) {
         if (!file.exists()) {
-            logger.warn("Path " + file + " does not exist!");
+            LOGGER.warn("Path " + file + " does not exist!");
             return;
         }
 
@@ -78,7 +78,7 @@ private void setPathExecutableRecursively(File file) {
             }
         } else {
             if (!file.setExecutable(true)) {
-                logger.error("Failed to set executable for " + file);
+                LOGGER.error("Failed to set executable for " + file);
             }
         }
     }

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/AADAuthenticationProperties.java

@@ -8,7 +8,6 @@
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 
@@ -144,18 +143,6 @@ public boolean allowedGroupsConfigured() {
                        .orElse(false);
     }
 
-    public boolean isResourceServer() {
-        return ClassUtils.isPresent(
-            "org.springframework.security.oauth2.server.resource.BearerTokenAuthenticationToken",
-            this.getClass().getClassLoader());
-    }
-
-    public boolean isWebApplication() {
-        return ClassUtils.isPresent(
-            "org.springframework.security.oauth2.client.registration.ClientRegistrationRepository",
-            this.getClass().getClassLoader());
-    }
-
     public UserGroupProperties getUserGroup() {
         return userGroup;
     }

sdk/spring/spring-test-template.yml

@@ -65,6 +65,10 @@ parameters:
     AAD_SINGLE_TENANT_CLIENT_SECRET: $(java-spring-aad-single-tenant-secret)
     AAD_SINGLE_TENANT_CLIENT_ID_WITH_ROLE: $(java-spring-aad-single-tenant-id-with-role)
     AAD_SINGLE_TENANT_CLIENT_SECRET_WITH_ROLE: $(java-spring-aad-single-tenant-secret-with-role)
+    AAD_USER_NAME_ON_DEMAND: "user$(System.JobId)-$(Build.BuildId)@aadittest1.onmicrosoft.com"
+    AAD_USER_PASSWORD_ON_DEMAND: $(java-spring-aad-user-password-1)
+    AAD_SERVICE_PRICIPAL_CLIENT_ID: $(java-spring-aad-service-principal-client-id)
+    AAD_SERVICE_PRICIPAL_CLIENT_SECRET: $(java-spring-aad-service-principal-client-secret)
     AAD_B2C_USER_EMAIL: "chrisgreen@abc.com"
     AAD_B2C_BASE_URI: "https://B2CITTest1.b2clogin.com/B2CITTest1.onmicrosoft.com"
     AAD_B2C_REPLY_URL: "http://localhost:8080/login/oauth2/code/"
@@ -73,10 +77,6 @@ parameters:
     AAD_B2C_USER_PASSWORD: $(java-spring-aad-b2c-user-password)
     AAD_B2C_CLIENT_ID: $(java-spring-aad-b2c-client-id)
     AAD_B2C_CLIENT_SECRET: $(java-spring-aad-b2c-client-secret)
-    AAD_USER_NAME_ON_DEMAND: "user$(System.JobId)-$(Build.BuildId)@aadittest1.onmicrosoft.com"
-    AAD_USER_PASSWORD_ON_DEMAND: $(java-spring-aad-user-password-1)
-    AAD_SERVICE_PRICIPAL_CLIENT_ID: $(java-spring-aad-service-principal-client-id)
-    AAD_SERVICE_PRICIPAL_CLIENT_SECRET: $(java-spring-aad-service-principal-client-secret)
     AZURE_CLOUD_TYPE: "Global"
 
 stages:

sdk/spring/tests.yml

@@ -13,6 +13,9 @@ stages:
           - name: azure-spring-boot-test-aad
             groupId: com.azure.spring
             safeName: azurespringboottestaad
+          - name: azure-spring-boot-test-aad-b2c
+            groupId: com.azure.spring
+            safeName: azurespringboottestaadb2c
         EnvVars:
           AZURE_TEST_MODE: LIVE
           AAD_TENANT_ID_1: $(java-spring-aad-tenant-id-1-cn)
@@ -31,4 +34,12 @@ stages:
           AAD_USER_PASSWORD_ON_DEMAND: $(java-spring-aad-user-password-1-cn)
           AAD_SERVICE_PRICIPAL_CLIENT_ID: $(java-spring-aad-service-principal-client-id-cn)
           AAD_SERVICE_PRICIPAL_CLIENT_SECRET: $(java-spring-aad-service-principal-client-secret-cn)
+          AAD_B2C_USER_EMAIL: "moary@126.com"
+          AAD_B2C_BASE_URI: "https://moaryb2c.b2clogin.cn/moaryb2c.partner.onmschina.cn"
+          AAD_B2C_REPLY_URL: "http://localhost:8080/login/oauth2/code/"
+          AAD_B2C_SIGN_UP_OR_SIGN_IN: "B2C_1_signupsignin1"
+          AAD_B2C_PROFILE_EDIT: "B2C_1_profileediting1"
+          AAD_B2C_USER_PASSWORD: $(java-spring-aad-b2c-user-password-cn)
+          AAD_B2C_CLIENT_ID: $(java-spring-aad-b2c-client-id-cn)
+          AAD_B2C_CLIENT_SECRET: $(java-spring-aad-b2c-client-secret-cn)
           AZURE_CLOUD_TYPE: "China"