AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.
fix(platform): Turnstile CAPTCHA reset after failed login attempts (#10056)
Bently692f32a35078
diff --git a/autogpt_platform/frontend/src/app/(platform)/login/page.tsx b/autogpt_platform/frontend/src/app/(platform)/login/page.tsxindex b13cfc8acd..78cdf49dd0 100644--- a/autogpt_platform/frontend/src/app/(platform)/login/page.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/login/page.tsx@@ -163,6 +163,7 @@ export default function LoginPage() {onVerify={turnstile.handleVerify}onExpire={turnstile.handleExpire}onError={turnstile.handleError}+ setWidgetId={turnstile.setWidgetId}action="login"shouldRender={turnstile.shouldRender}/>diff --git a/autogpt_platform/frontend/src/app/(platform)/reset_password/page.tsx b/autogpt_platform/frontend/src/app/(platform)/reset_password/page.tsxindex 116dbfdff5..934e2add93 100644--- a/autogpt_platform/frontend/src/app/(platform)/reset_password/page.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/reset_password/page.tsx@@ -188,6 +188,7 @@ export default function ResetPasswordPage() {onVerify={changePasswordTurnstile.handleVerify}onExpire={changePasswordTurnstile.handleExpire}onError={changePasswordTurnstile.handleError}+ setWidgetId={changePasswordTurnstile.setWidgetId}action="change_password"shouldRender={changePasswordTurnstile.shouldRender}/>@@ -230,6 +231,7 @@ export default function ResetPasswordPage() {onVerify={sendEmailTurnstile.handleVerify}onExpire={sendEmailTurnstile.handleExpire}onError={sendEmailTurnstile.handleError}+ setWidgetId={sendEmailTurnstile.setWidgetId}action="reset_password"shouldRender={sendEmailTurnstile.shouldRender}/>diff --git a/autogpt_platform/frontend/src/app/(platform)/signup/page.tsx b/autogpt_platform/frontend/src/app/(platform)/signup/page.tsxindex 68871c77f2..aceb96fe1b 100644--- a/autogpt_platform/frontend/src/app/(platform)/signup/page.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/signup/page.tsx@@ -164,6 +164,7 @@ export default function SignupPage() {onVerify={turnstile.handleVerify}onExpire={turnstile.handleExpire}onError={turnstile.handleError}+ setWidgetId={turnstile.setWidgetId}action="signup"shouldRender={turnstile.shouldRender}/>diff --git a/autogpt_platform/frontend/src/components/auth/Turnstile.tsx b/autogpt_platform/frontend/src/components/auth/Turnstile.tsxindex 018406a7f6..a0e2ccc872 100644--- a/autogpt_platform/frontend/src/components/auth/Turnstile.tsx+++ b/autogpt_platform/frontend/src/components/auth/Turnstile.tsx@@ -11,6 +11,7 @@ export interface TurnstileProps {className?: string;id?: string;shouldRender?: boolean;+ setWidgetId?: (id: string | null) => void;}export function Turnstile({@@ -22,6 +23,7 @@ export function Turnstile({className,id = "cf-turnstile",shouldRender = true,+ setWidgetId,}: TurnstileProps) {const containerRef = useRef<HTMLDivElement>(null);const widgetIdRef = useRef<string | null>(null);@@ -68,7 +70,11 @@ export function Turnstile({// Reset any existing widgetif (widgetIdRef.current && window.turnstile) {- window.turnstile.reset(widgetIdRef.current);+ try {+ window.turnstile.reset(widgetIdRef.current);+ } catch (err) {+ console.warn("Failed to reset existing Turnstile widget:", err);+ }}// Render a new widget@@ -86,15 +92,32 @@ export function Turnstile({},action,});++ // Notify the hook about the widget ID+ setWidgetId?.(widgetIdRef.current);}return () => {if (widgetIdRef.current && window.turnstile) {- window.turnstile.remove(widgetIdRef.current);+ try {+ window.turnstile.remove(widgetIdRef.current);+ } catch (err) {+ console.warn("Failed to remove Turnstile widget:", err);+ }+ setWidgetId?.(null);widgetIdRef.current = null;}};- }, [loaded, siteKey, onVerify, onExpire, onError, action, shouldRender]);+ }, [+ loaded,+ siteKey,+ onVerify,+ onExpire,+ onError,+ action,+ shouldRender,+ setWidgetId,+ ]);// Method to reset the widget manuallyconst reset = useCallback(() => {diff --git a/autogpt_platform/frontend/src/hooks/useTurnstile.ts b/autogpt_platform/frontend/src/hooks/useTurnstile.tsindex 29f93fbf8e..edb7e9b6fa 100644--- a/autogpt_platform/frontend/src/hooks/useTurnstile.ts+++ b/autogpt_platform/frontend/src/hooks/useTurnstile.ts@@ -21,6 +21,7 @@ interface UseTurnstileResult {reset: () => void;siteKey: string;shouldRender: boolean;+ setWidgetId: (id: string | null) => void;}const TURNSTILE_SITE_KEY =@@ -34,7 +35,7 @@ export function useTurnstile({autoVerify = true,onSuccess,onError,- resetOnError = false,+ resetOnError = true,}: UseTurnstileOptions = {}): UseTurnstileResult {const [token, setToken] = useState<string | null>(null);const [verifying, setVerifying] = useState(false);@@ -60,26 +61,30 @@ export function useTurnstile({}}, [token, autoVerify, shouldRender]);- useEffect(() => {- if (typeof window !== "undefined" && window.turnstile) {- const originalRender = window.turnstile.render;- window.turnstile.render = (container, options) => {- const id = originalRender(container, options);- setWidgetId(id);- return id;- };- }+ const setWidgetIdCallback = useCallback((id: string | null) => {+ setWidgetId(id);}, []);const reset = useCallback(() => {- if (shouldRender && window.turnstile && widgetId) {- window.turnstile.reset(widgetId);-- // Always reset the state when reset is called- setToken(null);- setVerified(false);- setVerifying(false);- setError(null);+ // Always reset the state when reset is called, regardless of shouldRender+ // This ensures users can retry CAPTCHA after failed attempts+ setToken(null);+ setVerified(false);+ setVerifying(false);+ setError(null);++ // Only reset the actual Turnstile widget if it exists and shouldRender is true+ if (+ shouldRender &&+ typeof window !== "undefined" &&+ window.turnstile &&+ widgetId+ ) {+ try {+ window.turnstile.reset(widgetId);+ } catch (err) {+ console.warn("Failed to reset Turnstile widget:", err);+ }}}, [shouldRender, widgetId]);@@ -106,6 +111,7 @@ export function useTurnstile({setError(newError);if (onError) onError(newError);if (resetOnError) {+ setToken(null);setVerified(false);}}@@ -119,6 +125,7 @@ export function useTurnstile({: new Error("Unknown error during verification");setError(newError);if (resetOnError) {+ setToken(null);setVerified(false);}setVerifying(false);@@ -138,6 +145,7 @@ export function useTurnstile({if (shouldRender) {setToken(null);setVerified(false);+ setError(null);}}, [shouldRender]);@@ -146,6 +154,7 @@ export function useTurnstile({if (shouldRender) {setError(err);if (resetOnError) {+ setToken(null);setVerified(false);}if (onError) onError(err);@@ -165,5 +174,6 @@ export function useTurnstile({reset,siteKey: TURNSTILE_SITE_KEY,shouldRender,+ setWidgetId: setWidgetIdCallback,};}