🐛 fix(turnstile): Turnstile_site_key

perfect-panel · Dec 7, 2024 · 0327b73 · 0327b73
1 parent 34e24b8
commit 0327b73
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/apps/admin/app/(auth)/user-login-form.tsx b/apps/admin/app/(auth)/user-login-form.tsx
@@ -7,7 +7,6 @@ import { useForm } from '@shadcn/ui/lib/react-hook-form';
 import { z, zodResolver } from '@shadcn/ui/lib/zod';
 import { useTranslations } from 'next-intl';
 import { Dispatch, SetStateAction } from 'react';
-
 import CloudFlareTurnstile from './turnstile';
 
 export default function UserLoginForm({
@@ -30,7 +29,8 @@ export default function UserLoginForm({
   const formSchema = z.object({
     email: z.string(),
     password: z.string(),
-    cf_token: verify.enable_login_verify ? z.string() : z.string().optional(),
+    cf_token:
+      verify.enable_login_verify && verify.turnstile_site_key ? z.string() : z.string().optional(),
   });
   const form = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),

diff --git a/apps/admin/app/(auth)/user-register-form.tsx b/apps/admin/app/(auth)/user-register-form.tsx
@@ -10,7 +10,6 @@ import { z, zodResolver } from '@shadcn/ui/lib/zod';
 import { useCountDown } from 'ahooks';
 import { useTranslations } from 'next-intl';
 import { Dispatch, SetStateAction, useState } from 'react';
-
 import CloudFlareTurnstile from './turnstile';
 
 export default function UserRegisterForm({
@@ -52,7 +51,10 @@ export default function UserRegisterForm({
       repeat_password: z.string(),
       code: register.enable_email_verify ? z.string() : z.string().nullish(),
       invite: invite.forced_invite ? z.string() : z.string().nullish(),
-      cf_token: verify.enable_register_verify ? z.string() : z.string().nullish(),
+      cf_token:
+        verify.enable_register_verify && verify.turnstile_site_key
+          ? z.string()
+          : z.string().nullish(),
     })
     .superRefine(({ password, repeat_password }, ctx) => {
       if (password !== repeat_password) {

diff --git a/apps/admin/app/(auth)/user-reset-form.tsx b/apps/admin/app/(auth)/user-reset-form.tsx
@@ -9,7 +9,6 @@ import { z, zodResolver } from '@shadcn/ui/lib/zod';
 import { useCountDown } from 'ahooks';
 import { useTranslations } from 'next-intl';
 import { Dispatch, SetStateAction, useState } from 'react';
-
 import CloudFlareTurnstile from './turnstile';
 
 export default function UserResetForm({
@@ -49,7 +48,10 @@ export default function UserResetForm({
     email: z.string(),
     password: z.string(),
     code: register.enable_email_verify ? z.string() : z.string().nullish(),
-    cf_token: verify.enable_register_verify ? z.string() : z.string().nullish(),
+    cf_token:
+      verify.enable_register_verify && verify.turnstile_site_key
+        ? z.string()
+        : z.string().nullish(),
   });
   const form = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),

diff --git a/apps/user/app/auth/user-login-form.tsx b/apps/user/app/auth/user-login-form.tsx
@@ -29,7 +29,8 @@ export default function UserLoginForm({
   const formSchema = z.object({
     email: z.string(),
     password: z.string(),
-    cf_token: verify.enable_login_verify ? z.string() : z.string().optional(),
+    cf_token:
+      verify.enable_login_verify && verify.turnstile_site_key ? z.string() : z.string().optional(),
   });
   const form = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),

diff --git a/apps/user/app/auth/user-register-form.tsx b/apps/user/app/auth/user-register-form.tsx
@@ -51,7 +51,10 @@ export default function UserRegisterForm({
       repeat_password: z.string(),
       code: register.enable_email_verify ? z.string() : z.string().nullish(),
       invite: invite.forced_invite ? z.string() : z.string().nullish(),
-      cf_token: verify.enable_register_verify ? z.string() : z.string().nullish(),
+      cf_token:
+        verify.enable_register_verify && verify.turnstile_site_key
+          ? z.string()
+          : z.string().nullish(),
     })
     .superRefine(({ password, repeat_password }, ctx) => {
       if (password !== repeat_password) {

diff --git a/apps/user/app/auth/user-reset-form.tsx b/apps/user/app/auth/user-reset-form.tsx
@@ -9,7 +9,6 @@ import { z, zodResolver } from '@shadcn/ui/lib/zod';
 import { useCountDown } from 'ahooks';
 import { useTranslations } from 'next-intl';
 import { Dispatch, SetStateAction, useState } from 'react';
-
 import CloudFlareTurnstile from './turnstile';
 
 export default function UserResetForm({
@@ -49,7 +48,10 @@ export default function UserResetForm({
     email: z.string(),
     password: z.string(),
     code: register.enable_email_verify ? z.string() : z.string().nullish(),
-    cf_token: verify.enable_register_verify ? z.string() : z.string().nullish(),
+    cf_token:
+      verify.enable_register_verify && verify.turnstile_site_key
+        ? z.string()
+        : z.string().nullish(),
   });
   const form = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),