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(frontend/turnstile): Reset on failed login/register (#9948)
Bently6df4dd3739f3
diff --git a/autogpt_platform/frontend/src/app/(platform)/login/page.tsx b/autogpt_platform/frontend/src/app/(platform)/login/page.tsxindex 025ec7541b..4458602dbf 100644--- a/autogpt_platform/frontend/src/app/(platform)/login/page.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/login/page.tsx@@ -35,6 +35,7 @@ export default function LoginPage() {const [feedback, setFeedback] = useState<string | null>(null);const router = useRouter();const [isLoading, setIsLoading] = useState(false);+ const [captchaKey, setCaptchaKey] = useState(0);const turnstile = useTurnstile({action: "login",@@ -64,6 +65,11 @@ export default function LoginPage() {// setFeedback(null);// }, [supabase]);+ const resetCaptcha = useCallback(() => {+ setCaptchaKey((k) => k + 1);+ turnstile.reset();+ }, [turnstile]);+const onLogin = useCallback(async (data: z.infer<typeof loginFormSchema>) => {setIsLoading(true);@@ -76,6 +82,7 @@ export default function LoginPage() {if (!turnstile.verified) {setFeedback("Please complete the CAPTCHA challenge.");setIsLoading(false);+ resetCaptcha();return;}@@ -84,8 +91,7 @@ export default function LoginPage() {setIsLoading(false);if (error) {setFeedback(error);- // Always reset the turnstile on any error- turnstile.reset();+ resetCaptcha();return;}setFeedback(null);@@ -160,6 +166,7 @@ export default function LoginPage() {{/* Turnstile CAPTCHA Component */}<Turnstile+ key={captchaKey}siteKey={turnstile.siteKey}onVerify={turnstile.handleVerify}onExpire={turnstile.handleExpire}diff --git a/autogpt_platform/frontend/src/app/(platform)/reset_password/page.tsx b/autogpt_platform/frontend/src/app/(platform)/reset_password/page.tsxindex c2c9f393d9..23e0e336e4 100644--- a/autogpt_platform/frontend/src/app/(platform)/reset_password/page.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/reset_password/page.tsx@@ -34,6 +34,8 @@ export default function ResetPasswordPage() {const [feedback, setFeedback] = useState<string | null>(null);const [isError, setIsError] = useState(false);const [disabled, setDisabled] = useState(false);+ const [sendEmailCaptchaKey, setSendEmailCaptchaKey] = useState(0);+ const [changePasswordCaptchaKey, setChangePasswordCaptchaKey] = useState(0);const sendEmailTurnstile = useTurnstile({action: "reset_password",@@ -62,6 +64,16 @@ export default function ResetPasswordPage() {},});+ const resetSendEmailCaptcha = useCallback(() => {+ setSendEmailCaptchaKey((k) => k + 1);+ sendEmailTurnstile.reset();+ }, [sendEmailTurnstile]);++ const resetChangePasswordCaptcha = useCallback(() => {+ setChangePasswordCaptchaKey((k) => k + 1);+ changePasswordTurnstile.reset();+ }, [changePasswordTurnstile]);+const onSendEmail = useCallback(async (data: z.infer<typeof sendEmailFormSchema>) => {setIsLoading(true);@@ -76,6 +88,7 @@ export default function ResetPasswordPage() {setFeedback("Please complete the CAPTCHA challenge.");setIsError(true);setIsLoading(false);+ resetSendEmailCaptcha();return;}@@ -87,7 +100,7 @@ export default function ResetPasswordPage() {if (error) {setFeedback(error);setIsError(true);- sendEmailTurnstile.reset();+ resetSendEmailCaptcha();return;}setDisabled(true);@@ -96,7 +109,7 @@ export default function ResetPasswordPage() {);setIsError(false);},- [sendEmailForm, sendEmailTurnstile],+ [sendEmailForm, sendEmailTurnstile, resetSendEmailCaptcha],);const onChangePassword = useCallback(@@ -113,6 +126,7 @@ export default function ResetPasswordPage() {setFeedback("Please complete the CAPTCHA challenge.");setIsError(true);setIsLoading(false);+ resetChangePasswordCaptcha();return;}@@ -124,13 +138,13 @@ export default function ResetPasswordPage() {if (error) {setFeedback(error);setIsError(true);- changePasswordTurnstile.reset();+ resetChangePasswordCaptcha();return;}setFeedback("Password changed successfully. Redirecting to login.");setIsError(false);},- [changePasswordForm, changePasswordTurnstile],+ [changePasswordForm, changePasswordTurnstile, resetChangePasswordCaptcha],);if (isUserLoading) {@@ -184,6 +198,7 @@ export default function ResetPasswordPage() {{/* Turnstile CAPTCHA Component for password change */}<Turnstile+ key={changePasswordCaptchaKey}siteKey={changePasswordTurnstile.siteKey}onVerify={changePasswordTurnstile.handleVerify}onExpire={changePasswordTurnstile.handleExpire}@@ -227,6 +242,7 @@ export default function ResetPasswordPage() {{/* Turnstile CAPTCHA Component for reset email */}<Turnstile+ key={sendEmailCaptchaKey}siteKey={sendEmailTurnstile.siteKey}onVerify={sendEmailTurnstile.handleVerify}onExpire={sendEmailTurnstile.handleExpire}diff --git a/autogpt_platform/frontend/src/app/(platform)/signup/page.tsx b/autogpt_platform/frontend/src/app/(platform)/signup/page.tsxindex b44083d281..09f6be9903 100644--- a/autogpt_platform/frontend/src/app/(platform)/signup/page.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/signup/page.tsx@@ -37,6 +37,7 @@ export default function SignupPage() {const [feedback, setFeedback] = useState<string | null>(null);const router = useRouter();const [isLoading, setIsLoading] = useState(false);+ const [captchaKey, setCaptchaKey] = useState(0);//TODO: Remove after closed betaconst turnstile = useTurnstile({@@ -55,6 +56,11 @@ export default function SignupPage() {},});+ const resetCaptcha = useCallback(() => {+ setCaptchaKey((k) => k + 1);+ turnstile.reset();+ }, [turnstile]);+const onSignup = useCallback(async (data: z.infer<typeof signupFormSchema>) => {setIsLoading(true);@@ -67,6 +73,7 @@ export default function SignupPage() {if (!turnstile.verified) {setFeedback("Please complete the CAPTCHA challenge.");setIsLoading(false);+ resetCaptcha();return;}@@ -75,11 +82,11 @@ export default function SignupPage() {if (error) {if (error === "user_already_exists") {setFeedback("User with this email already exists");- turnstile.reset();+ resetCaptcha();return;} else {setFeedback(error);- turnstile.reset();+ resetCaptcha();}return;}@@ -160,6 +167,7 @@ export default function SignupPage() {{/* Turnstile CAPTCHA Component */}<Turnstile+ key={captchaKey}siteKey={turnstile.siteKey}onVerify={turnstile.handleVerify}onExpire={turnstile.handleExpire}