support signin and signup userflow (Azure#18690)

- add signIn and signUp flow for aadb2c
- b2c code refactor

Author: backwind1233

sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/README.md

@@ -52,12 +52,10 @@ azure:
         sign-up-or-sign-in: ${your-sign-up-or-in-user-flow}
         profile-edit: ${your-profile-edit-user-flow}      # optional
         password-reset: ${your-password-reset-user-flow}  # optional
+        sign-in: ${your-sign-in-user-flow} # optional  
+        sign-up: ${your-sign-up-user-flow} # optional
 ```
 
-#### Templates greeting.html and home.html
-1. Fill in the `${your-profile-edit-user-flow}` and `${your-password-reset-user-flow}` from the portal `User flows`.
-Please make sure that these two placeholders should be the same as `application.yml` respectively.
-
 ### Run with Maven
 ```
 cd azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc

sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/java/com/azure/spring/sample/aad/b2c/controller/WebController.java

@@ -3,6 +3,8 @@
 
 package com.azure.spring.sample.aad.b2c.controller;
 
+import com.azure.spring.autoconfigure.b2c.AADB2CProperties;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Controller;
@@ -12,6 +14,9 @@
 @Controller
 public class WebController {
 
+    @Autowired
+    AADB2CProperties aadb2CProperties;
+
     private void initializeModel(Model model, OAuth2AuthenticationToken token) {
         if (token != null) {
             final OAuth2User user = token.getPrincipal();
@@ -20,26 +25,14 @@ private void initializeModel(Model model, OAuth2AuthenticationToken token) {
             model.addAllAttributes(user.getAttributes());
             model.addAttribute("name", user.getName());
         }
+        model.addAttribute("aadb2c_profileedit", aadb2CProperties.getUserFlows().getProfileEdit());
+        model.addAttribute("aadb2c_passwordreset", aadb2CProperties.getUserFlows().getPasswordReset());
     }
 
-    @GetMapping(value = "/")
+    @GetMapping(value = { "/", "/home", "/greeting" })
     public String index(Model model, OAuth2AuthenticationToken token) {
         initializeModel(model, token);
-
         return "home";
     }
 
-    @GetMapping(value = "/greeting")
-    public String greeting(Model model, OAuth2AuthenticationToken token) {
-        initializeModel(model, token);
-
-        return "greeting";
-    }
-
-    @GetMapping(value = "/home")
-    public String home(Model model, OAuth2AuthenticationToken token) {
-        initializeModel(model, token);
-
-        return "home";
-    }
 }

sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/resources/application.yml

@@ -12,3 +12,5 @@ azure:
         sign-up-or-sign-in: ${your-sign-up-or-in-user-flow}
         profile-edit: ${your-profile-edit-user-flow}     # optional
         password-reset: ${your-password-reset-user-flow} # optional
+        sign-in: ${your-sign-in-user-flow} # optional
+        sign-up: ${your-sign-up-user-flow} # optional

sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/resources/templates/greeting.html

@@ -19,11 +19,13 @@ <h1>Home Page</h1>
         <button class="btn btn-md btn-primary btn-block" type="submit">Log out</button>
     </form>
 
-    <form style="display:inline" method="get" action="/oauth2/authorization/${your-profile-edit-user-flow}">
+    <form th:if="${aadb2c_profileedit != null}" style="display:inline" method="get"
+          th:action="${'/oauth2/authorization/' + aadb2c_profileedit}">
         <button class="btn btn-md btn-primary btn-block" type="submit">Profile edit</button>
     </form>
 
-    <form style="display:inline" method="get" action="/oauth2/authorization/${your-password-reset-user-flow}">
+    <form th:if="${aadb2c_passwordreset != null}" style="display:inline" method="get"
+          th:action="${'/oauth2/authorization/' + aadb2c_passwordreset}">
         <button class="btn btn-md btn-primary btn-block" type="submit">Password reset</button>
     </form>
 </div>

sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/src/main/resources/templates/home.html

@@ -124,11 +124,12 @@ private void addB2CClientRegistration(@NonNull List<ClientRegistration> registra
         @Bean
         @ConditionalOnMissingBean
         public ClientRegistrationRepository clientRegistrationRepository() {
-            final List<ClientRegistration> signUpOrSignInRegistrations = new ArrayList<>(1);
+            final List<ClientRegistration> signUpOrSignInRegistrations = new ArrayList<>(3);
             final List<ClientRegistration> otherRegistrations = new ArrayList<>();
 
-
             addB2CClientRegistration(signUpOrSignInRegistrations, properties.getUserFlows().getSignUpOrSignIn());
+            addB2CClientRegistration(signUpOrSignInRegistrations, properties.getUserFlows().getSignIn());
+            addB2CClientRegistration(signUpOrSignInRegistrations, properties.getUserFlows().getSignUp());
             addB2CClientRegistration(otherRegistrations, properties.getUserFlows().getProfileEdit());
             addB2CClientRegistration(otherRegistrations, properties.getUserFlows().getPasswordReset());
 

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/b2c/AADB2CAutoConfiguration.java

@@ -32,6 +32,10 @@ public class AADB2CProperties {
 
     public static final String USER_FLOW_SIGN_UP_OR_SIGN_IN = USER_FLOWS + ".sign-up-or-sign-in";
 
+    public static final String USER_FLOW_SIGN_UP = USER_FLOWS + ".sign-up";
+
+    public static final String USER_FLOW_SIGN_IN = USER_FLOWS + ".sign-in";
+
     public static final String DEFAULT_LOGOUT_SUCCESS_URL = "http://localhost:8080/login";
 
     public static final String PREFIX = "azure.activedirectory.b2c";
@@ -96,8 +100,11 @@ public String getLoginProcessingUrl() {
         return getReplyURLPath(replyUrl);
     }
 
+    /**
+     * UserFlows
+     */
     @Validated
-    protected static class UserFlows {
+    public static class UserFlows {
 
         protected UserFlows() {
 
@@ -119,6 +126,32 @@ protected UserFlows() {
          */
         private String passwordReset;
 
+        /**
+         * The sign-up user flow which is created under b2c tenant.
+         */
+        private String signUp;
+
+        /**
+         * The sign-in user flow which is created under b2c tenant.
+         */
+        private String signIn;
+
+        public String getSignUp() {
+            return signUp;
+        }
+
+        public void setSignUp(String signUp) {
+            this.signUp = signUp;
+        }
+
+        public String getSignIn() {
+            return signIn;
+        }
+
+        public void setSignIn(String signIn) {
+            this.signIn = signIn;
+        }
+
         public String getSignUpOrSignIn() {
             return signUpOrSignIn;
         }

sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/b2c/AADB2CProperties.java

@@ -20,6 +20,8 @@ public class AADB2CAutoConfigurationTest {
             String.format("%s=%s", AADB2CConstants.REPLY_URL, AADB2CConstants.TEST_REPLY_URL),
             String.format("%s=%s", AADB2CConstants.LOGOUT_SUCCESS_URL, AADB2CConstants.TEST_LOGOUT_SUCCESS_URL),
             String.format("%s=%s", AADB2CConstants.SIGN_UP_OR_SIGN_IN, AADB2CConstants.TEST_SIGN_UP_OR_IN_NAME),
+            String.format("%s=%s", AADB2CConstants.SIGN_UP, AADB2CConstants.TEST_SIGN_UP_NAME),
+            String.format("%s=%s", AADB2CConstants.SIGN_IN, AADB2CConstants.TEST_SIGN_IN_NAME),
             String.format("%s=%s", AADB2CConstants.CONFIG_PROMPT, AADB2CConstants.TEST_PROMPT),
             String.format("%s=%s", AADB2CConstants.CONFIG_LOGIN_HINT, AADB2CConstants.TEST_LOGIN_HINT),
             String.format("%s=%s", AADB2CConstants.USER_NAME_ATTRIBUTE_NAME, AADB2CConstants.TEST_ATTRIBUTE_NAME)
@@ -47,11 +49,15 @@ public void testPropertiesBean() {
             assertThat(properties.getUserNameAttributeName()).isEqualTo(AADB2CConstants.TEST_ATTRIBUTE_NAME);
 
             final String signUpOrSignIn = properties.getUserFlows().getSignUpOrSignIn();
+            final String signIn = properties.getUserFlows().getSignIn();
+            final String signUp = properties.getUserFlows().getSignUp();
             final Object prompt = properties.getAuthenticateAdditionalParameters().get(AADB2CConstants.PROMPT);
             final String loginHint =
                 String.valueOf(properties.getAuthenticateAdditionalParameters().get(AADB2CConstants.LOGIN_HINT));
 
             assertThat(signUpOrSignIn).isEqualTo(AADB2CConstants.TEST_SIGN_UP_OR_IN_NAME);
+            assertThat(signIn).isEqualTo(AADB2CConstants.TEST_SIGN_IN_NAME);
+            assertThat(signUp).isEqualTo(AADB2CConstants.TEST_SIGN_UP_NAME);
             assertThat(prompt).isEqualTo(AADB2CConstants.TEST_PROMPT);
             assertThat(loginHint).isEqualTo(AADB2CConstants.TEST_LOGIN_HINT);
         });

sdk/spring/azure-spring-boot/src/test/java/com/azure/spring/autoconfigure/b2c/AADB2CAutoConfigurationTest.java

@@ -4,6 +4,8 @@
 
 
 import static com.azure.spring.autoconfigure.b2c.AADB2CProperties.PREFIX;
+import static com.azure.spring.autoconfigure.b2c.AADB2CProperties.USER_FLOW_SIGN_IN;
+import static com.azure.spring.autoconfigure.b2c.AADB2CProperties.USER_FLOW_SIGN_UP;
 import static com.azure.spring.autoconfigure.b2c.AADB2CProperties.USER_FLOW_SIGN_UP_OR_SIGN_IN;
 
 public class AADB2CConstants {
@@ -30,6 +32,10 @@ public class AADB2CConstants {
 
     public static final String TEST_SIGN_UP_OR_IN_NAME = "fake-sign-in-or-up";
 
+    public static final Object TEST_SIGN_IN_NAME = "fake-sign-in";
+
+    public static final Object TEST_SIGN_UP_NAME = "fake-sign-up";
+
     public static final String TEST_LOGOUT_SUCCESS_URL = "https://fake-logout-success-url";
 
     public static final String TENANT = String.format("%s.%s", PREFIX, "tenant");
@@ -48,6 +54,10 @@ public class AADB2CConstants {
 
     public static final String SIGN_UP_OR_SIGN_IN = String.format("%s.%s", PREFIX, USER_FLOW_SIGN_UP_OR_SIGN_IN);
 
+    public static final String SIGN_UP = String.format("%s.%s", PREFIX, USER_FLOW_SIGN_UP);
+
+    public static final String SIGN_IN = String.format("%s.%s", PREFIX, USER_FLOW_SIGN_IN);
+
     public static final Object CONFIG_PROMPT = String.format("%s.%s", PREFIX,
         AUTHENTICATE_ADDITIONAL_PARAMETERS_PROMPT);