From 497f244858bbefd4bcc8ed7bee44c0f9fa3d87a1 Mon Sep 17 00:00:00 2001
From: Xiao Yijun <xiaoyijun@silverhand.io>
Date: Mon, 20 Mar 2023 16:07:01 +0800
Subject: [PATCH] fix(console): parse onboarding sie config (#3535)

---
 .../pages/SignInExperience/utils.ts           | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/packages/console/src/onboarding/pages/SignInExperience/utils.ts b/packages/console/src/onboarding/pages/SignInExperience/utils.ts
index 335f239d0..986568ed4 100644
--- a/packages/console/src/onboarding/pages/SignInExperience/utils.ts
+++ b/packages/console/src/onboarding/pages/SignInExperience/utils.ts
@@ -46,8 +46,17 @@ const onboardSieConfigToSignInExperience = (
   const { logo, color: onboardConfigColor, identifier, authentications, socialTargets } = config;
   const { color: baseColorConfig, branding: baseBranding } = basedConfig;
 
-  const isPasswordSetup = authentications.includes(Authentication.Password);
-  const isVerificationCodeSetup = identifier !== SignInIdentifier.Username;
+  // Map to sign-up config
+  const shouldSetPasswordAtSignUp =
+    identifier === SignInIdentifier.Username || authentications.includes(Authentication.Password);
+  const shouldVerifyAtSignUp = identifier !== SignInIdentifier.Username;
+
+  // Map to sign-in methods
+  const isSignInByPasswordEnabled =
+    identifier === SignInIdentifier.Username || authentications.includes(Authentication.Password);
+  const isSignInByVerificationCodeEnabled =
+    identifier !== SignInIdentifier.Username &&
+    authentications.includes(Authentication.VerificationCode);
 
   const signInExperience: SignInExperience = {
     ...basedConfig,
@@ -62,16 +71,16 @@ const onboardSieConfigToSignInExperience = (
     },
     signUp: {
       identifiers: [identifier],
-      password: isPasswordSetup,
-      verify: isVerificationCodeSetup,
+      verify: shouldVerifyAtSignUp,
+      password: shouldSetPasswordAtSignUp,
     },
     signIn: {
       methods: [
         {
           identifier,
-          password: isPasswordSetup,
-          verificationCode: isVerificationCodeSetup,
-          isPasswordPrimary: isPasswordSetup,
+          password: isSignInByPasswordEnabled,
+          verificationCode: isSignInByVerificationCodeEnabled,
+          isPasswordPrimary: isSignInByPasswordEnabled,
         },
       ],
     },