From 0327b73708a7ad62f5fa8a13cf43d3d57809028e Mon Sep 17 00:00:00 2001 From: "web@ppanel" Date: Sat, 7 Dec 2024 17:03:29 +0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(turnstile):=20Turnstile=5Fsi?= =?UTF-8?q?te=5Fkey?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/app/(auth)/user-login-form.tsx | 4 ++-- apps/admin/app/(auth)/user-register-form.tsx | 6 ++++-- apps/admin/app/(auth)/user-reset-form.tsx | 6 ++++-- apps/user/app/auth/user-login-form.tsx | 3 ++- apps/user/app/auth/user-register-form.tsx | 5 ++++- apps/user/app/auth/user-reset-form.tsx | 6 ++++-- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/apps/admin/app/(auth)/user-login-form.tsx b/apps/admin/app/(auth)/user-login-form.tsx index 2db5d98..b59f89a 100644 --- 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>({ resolver: zodResolver(formSchema), diff --git a/apps/admin/app/(auth)/user-register-form.tsx b/apps/admin/app/(auth)/user-register-form.tsx index a0d12de..da297fe 100644 --- 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 index 6412d92..0fc1260 100644 --- 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>({ resolver: zodResolver(formSchema), diff --git a/apps/user/app/auth/user-login-form.tsx b/apps/user/app/auth/user-login-form.tsx index f518c75..f7e8ebe 100644 --- 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>({ resolver: zodResolver(formSchema), diff --git a/apps/user/app/auth/user-register-form.tsx b/apps/user/app/auth/user-register-form.tsx index c351790..15458b6 100644 --- 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 index 17d39d4..af1e9ce 100644 --- 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>({ resolver: zodResolver(formSchema),