From 65e06883c379b62945c298f05f5b0cbd351397fe Mon Sep 17 00:00:00 2001
From: Bryce Kalow <bryce@clerk.dev>
Date: Thu, 7 Nov 2024 22:00:46 -0600
Subject: [PATCH 1/2] support SignIn.Captcha within sso-callback step

---
 .../app/sign-in/[[...sign-in]]/page.tsx       |  1 +
 .../third-party/third-party.actors.ts         |  4 --
 .../elements/src/react/sign-in/captcha.tsx    | 70 +++++++++++++++++++
 .../src/react/sign-in/sso-callback.tsx        | 13 ++++
 packages/elements/src/react/sign-in/step.tsx  |  8 ++-
 5 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 packages/elements/src/react/sign-in/captcha.tsx
 create mode 100644 packages/elements/src/react/sign-in/sso-callback.tsx

diff --git a/packages/elements/examples/nextjs/app/sign-in/[[...sign-in]]/page.tsx b/packages/elements/examples/nextjs/app/sign-in/[[...sign-in]]/page.tsx
index e99e7cfbc93..d428a07f6de 100644
--- a/packages/elements/examples/nextjs/app/sign-in/[[...sign-in]]/page.tsx
+++ b/packages/elements/examples/nextjs/app/sign-in/[[...sign-in]]/page.tsx
@@ -499,6 +499,7 @@ export default function SignInPage() {
             <CustomSubmit>Update Password</CustomSubmit>
           </div>
         </SignIn.Step>
+        <SignIn.Step name='sso-callback'></SignIn.Step>
       </div>
     </SignIn.Root>
   );
diff --git a/packages/elements/src/internals/machines/third-party/third-party.actors.ts b/packages/elements/src/internals/machines/third-party/third-party.actors.ts
index 592f273814f..e80a48b2e9c 100644
--- a/packages/elements/src/internals/machines/third-party/third-party.actors.ts
+++ b/packages/elements/src/internals/machines/third-party/third-party.actors.ts
@@ -78,10 +78,6 @@ export const handleRedirectCallback = fromCallback<AnyEventObject, HandleRedirec
 
     void loadedClerk.handleRedirectCallback(
       {
-        signInForceRedirectUrl: ClerkJSNavigationEvent.complete,
-        signInFallbackRedirectUrl: ClerkJSNavigationEvent.complete,
-        signUpForceRedirectUrl: ClerkJSNavigationEvent.complete,
-        signUpFallbackRedirectUrl: ClerkJSNavigationEvent.complete,
         continueSignUpUrl: ClerkJSNavigationEvent.continue,
         firstFactorUrl: ClerkJSNavigationEvent.signIn,
         resetPasswordUrl: ClerkJSNavigationEvent.resetPassword,
diff --git a/packages/elements/src/react/sign-in/captcha.tsx b/packages/elements/src/react/sign-in/captcha.tsx
new file mode 100644
index 00000000000..41f88613dba
--- /dev/null
+++ b/packages/elements/src/react/sign-in/captcha.tsx
@@ -0,0 +1,70 @@
+import { Slot } from '@radix-ui/react-slot';
+import * as React from 'react';
+
+import { CAPTCHA_ELEMENT_ID } from '~/internals/constants';
+import { ClerkElementsRuntimeError } from '~/internals/errors';
+
+import { useActiveTags } from '../hooks';
+import { SignInRouterCtx } from './context';
+
+export type SignInCaptchaElement = React.ElementRef<'div'>;
+
+type CaptchaElementProps = Omit<
+  React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>,
+  'id' | 'children'
+>;
+
+export type SignInCaptchaProps =
+  | ({
+      asChild: true;
+      /* Must only be a self-closing element/component */
+      children: React.ReactElement;
+    } & CaptchaElementProps)
+  | ({ asChild?: false; children?: undefined } & CaptchaElementProps);
+
+/**
+ * The `<SignIn.Captcha>` component is used to render the Cloudflare Turnstile widget. It must be used within the `<SignIn.Step name="sso-callback">` component.
+ *
+ * If utilizing the `asChild` prop, the component must be a self-closing element or component. Any children passed to the immediate child component of <SignIn.Captcha> will be ignored.
+ *
+ * @param {boolean} [asChild] - If true, `<Captcha />` will render as its child element, passing along any necessary props.
+ *
+ * @example
+ * <SignIn.Root>
+ *   <SignIn.Step name="sso-callback">
+ *     <SignIn.Captcha />
+ *   </SignIn.Step>
+ * </SignIn.Root>
+ *
+ * @example
+ * <SignIn.Root>
+ *   <SignIn.Step name="sso-callback">
+ *     <SignIn.Captcha asChild>
+ *       <aside/>
+ *     </SignIn.Captcha>
+ *   </SignIn.Step>
+ * </SignIn.Root>
+ */
+
+export const SignInCaptcha = React.forwardRef<SignInCaptchaElement, SignInCaptchaProps>(
+  ({ asChild, children, ...rest }, forwardedRef) => {
+    const routerRef = SignInRouterCtx.useActorRef();
+    const activeState = useActiveTags(routerRef, 'step:callback');
+
+    if (!activeState) {
+      throw new ClerkElementsRuntimeError(
+        '<Captcha> must be used within the <SignIn.Step name="sso-callback"> component.',
+      );
+    }
+
+    const Comp = asChild ? Slot : 'div';
+
+    return (
+      <Comp
+        id={CAPTCHA_ELEMENT_ID}
+        {...rest}
+        ref={forwardedRef}
+      />
+    );
+  },
+);
diff --git a/packages/elements/src/react/sign-in/sso-callback.tsx b/packages/elements/src/react/sign-in/sso-callback.tsx
new file mode 100644
index 00000000000..1bb5c62c2ba
--- /dev/null
+++ b/packages/elements/src/react/sign-in/sso-callback.tsx
@@ -0,0 +1,13 @@
+import type { PropsWithChildren } from 'react';
+
+import { useActiveTags } from '~/react/hooks';
+import { SignInRouterCtx } from '~/react/sign-in/context';
+
+export type SignInSSOCallbackProps = PropsWithChildren;
+
+export function SignInSSOCallback({ children }: SignInSSOCallbackProps) {
+  const routerRef = SignInRouterCtx.useActorRef();
+  const activeState = useActiveTags(routerRef, 'step:callback');
+
+  return activeState ? children : null;
+}
diff --git a/packages/elements/src/react/sign-in/step.tsx b/packages/elements/src/react/sign-in/step.tsx
index 89a5be4f9c1..9d7f70aa4a4 100644
--- a/packages/elements/src/react/sign-in/step.tsx
+++ b/packages/elements/src/react/sign-in/step.tsx
@@ -6,6 +6,8 @@ import { ClerkElementsRuntimeError } from '~/internals/errors';
 import { SignInChooseSession, type SignInChooseSessionProps } from './choose-session';
 import { SignInChooseStrategy, type SignInChooseStrategyProps, SignInForgotPassword } from './choose-strategy';
 import { SignInResetPassword, type SignInResetPasswordProps } from './reset-password';
+import type { SignInSSOCallbackProps } from './sso-callback';
+import { SignInSSOCallback } from './sso-callback';
 import { SignInStart, type SignInStartProps } from './start';
 import { SignInVerifications, type SignInVerificationsProps } from './verifications';
 
@@ -16,6 +18,7 @@ export const SIGN_IN_STEPS = {
   'choose-session': 'choose-session',
   'forgot-password': 'forgot-password',
   'reset-password': 'reset-password',
+  'sso-callback': 'sso-callback',
 } as const;
 
 export type TSignInStep = (typeof SIGN_IN_STEPS)[keyof typeof SIGN_IN_STEPS];
@@ -26,7 +29,8 @@ export type SignInStepProps =
   | StepWithProps<'verifications', SignInVerificationsProps>
   | StepWithProps<'choose-strategy' | 'forgot-password', SignInChooseStrategyProps>
   | StepWithProps<'reset-password', SignInResetPasswordProps>
-  | StepWithProps<'choose-session', SignInChooseSessionProps>;
+  | StepWithProps<'choose-session', SignInChooseSessionProps>
+  | StepWithProps<'sso-callback', SignInSSOCallbackProps>;
 
 /**
  * Render different steps of the sign-in flow. Initially the `'start'` step is rendered. Once a sign-in attempt has been created, `'verifications'` will be displayed. If during that verification step the user decides to choose a different method of signing in or verifying, the `'choose-strategy'` step will be displayed.
@@ -63,6 +67,8 @@ export function SignInStep(props: SignInStepProps) {
       return <SignInResetPassword {...props} />;
     case SIGN_IN_STEPS['choose-session']:
       return <SignInChooseSession {...props} />;
+    case SIGN_IN_STEPS['sso-callback']:
+      return <SignInSSOCallback {...props} />;
     default:
       throw new ClerkElementsRuntimeError(`Invalid step name. Use: ${Object.keys(SIGN_IN_STEPS).join(',')}.`);
   }

From 3f5b95469d4fc99a905f81415d3f80f4511b82e7 Mon Sep 17 00:00:00 2001
From: Bryce Kalow <bryce@clerk.dev>
Date: Thu, 7 Nov 2024 22:02:35 -0600
Subject: [PATCH 2/2] adds changeset

---
 .changeset/rich-badgers-pump.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/rich-badgers-pump.md

diff --git a/.changeset/rich-badgers-pump.md b/.changeset/rich-badgers-pump.md
new file mode 100644
index 00000000000..91a13ed5201
--- /dev/null
+++ b/.changeset/rich-badgers-pump.md
@@ -0,0 +1,5 @@
+---
+'@clerk/elements': minor
+---
+
+Introduce support for `<SignIn.Captcha />` and `<SignIn.Step name='sso-callback'>`. This allows rendering of a CAPTCHA widget when a sign in attempt is transferred to a sign up attempt.