add check for password enabled

clerk · Dec 20, 2024 · ec46476 · ec46476
1 parent 69fd8a9
commit ec46476
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx b/packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx
@@ -387,6 +387,7 @@ export function _SignInStart(): JSX.Element {
         signUpMode: userSettings.signUp.mode,
         redirectUrl,
         redirectUrlComplete,
+        passwordEnabled: userSettings.attributes.password.required,
       });
     } else {
       handleError(e, [identifierField, instantPasswordField], card.setError);

diff --git a/packages/clerk-js/src/ui/components/SignIn/handleCombinedFlowTransfer.ts b/packages/clerk-js/src/ui/components/SignIn/handleCombinedFlowTransfer.ts
@@ -14,6 +14,7 @@ type HandleCombinedFlowTransferProps = {
   handleError: (err: any) => void;
   redirectUrl?: string;
   redirectUrlComplete?: string;
+  passwordEnabled: boolean;
 };
 
 /**
@@ -31,6 +32,7 @@ export function handleCombinedFlowTransfer({
   handleError,
   redirectUrl,
   redirectUrlComplete,
+  passwordEnabled,
 }: HandleCombinedFlowTransferProps): Promise<unknown> | void {
   if (signUpMode === SIGN_UP_MODES.WAITLIST) {
     const waitlistUrl = clerk.buildWaitlistUrl(
@@ -54,7 +56,7 @@ export function handleCombinedFlowTransfer({
   // Attempt to transfer directly to sign up verification if email or phone was used and there are no optional fields. The signUp.create() call will
   // inform us if the instance is eligible for moving directly to verification.
   if (
-    (!hasOptionalFields(clerk.client.signUp) && identifierAttribute === 'emailAddress') ||
+    (!passwordEnabled && !hasOptionalFields(clerk.client.signUp) && identifierAttribute === 'emailAddress') ||
     identifierAttribute === 'phoneNumber'
   ) {
     return clerk.client.signUp