Client/ppanel-web
5
0
Fork 0
mirror of https://github.com/perfect-panel/ppanel-web.git synced 2026-02-15 04:41:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

🐛 fix(turnstile): Turnstile_site_key

Browse Source
This commit is contained in:
web@ppanel 2024-12-07 17:03:29 +07:00
parent 34e24b813d
commit 0327b73708
6 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/admin/app/(auth)/user-login-form.tsx
View File

@ -7,7 +7,6 @@ import { useForm } from '@shadcn/ui/lib/react-hook-form';
import { z, zodResolver } from '@shadcn/ui/lib/zod'; import { z, zodResolver } from '@shadcn/ui/lib/zod';
import { useTranslations } from 'next-intl'; import { useTranslations } from 'next-intl';
import { Dispatch, SetStateAction } from 'react'; import { Dispatch, SetStateAction } from 'react';
import CloudFlareTurnstile from './turnstile'; import CloudFlareTurnstile from './turnstile';
export default function UserLoginForm({ export default function UserLoginForm({
@ -30,7 +29,8 @@ export default function UserLoginForm({
const formSchema = z.object({ const formSchema = z.object({
email: z.string(), email: z.string(),
password: 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>>({ const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema), resolver: zodResolver(formSchema),

6
apps/admin/app/(auth)/user-register-form.tsx
View File

@ -10,7 +10,6 @@ import { z, zodResolver } from '@shadcn/ui/lib/zod';
import { useCountDown } from 'ahooks'; import { useCountDown } from 'ahooks';
import { useTranslations } from 'next-intl'; import { useTranslations } from 'next-intl';
import { Dispatch, SetStateAction, useState } from 'react'; import { Dispatch, SetStateAction, useState } from 'react';
import CloudFlareTurnstile from './turnstile'; import CloudFlareTurnstile from './turnstile';
export default function UserRegisterForm({ export default function UserRegisterForm({
@ -52,7 +51,10 @@ export default function UserRegisterForm({
repeat_password: z.string(), repeat_password: z.string(),
code: register.enable_email_verify ? z.string() : z.string().nullish(), code: register.enable_email_verify ? z.string() : z.string().nullish(),
invite: invite.forced_invite ? 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) => { .superRefine(({ password, repeat_password }, ctx) => {
if (password !== repeat_password) { if (password !== repeat_password) {

6
apps/admin/app/(auth)/user-reset-form.tsx
View File

@ -9,7 +9,6 @@ import { z, zodResolver } from '@shadcn/ui/lib/zod';
import { useCountDown } from 'ahooks'; import { useCountDown } from 'ahooks';
import { useTranslations } from 'next-intl'; import { useTranslations } from 'next-intl';
import { Dispatch, SetStateAction, useState } from 'react'; import { Dispatch, SetStateAction, useState } from 'react';
import CloudFlareTurnstile from './turnstile'; import CloudFlareTurnstile from './turnstile';
export default function UserResetForm({ export default function UserResetForm({
@ -49,7 +48,10 @@ export default function UserResetForm({
email: z.string(), email: z.string(),
password: z.string(), password: z.string(),
code: register.enable_email_verify ? z.string() : z.string().nullish(), 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>>({ const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema), resolver: zodResolver(formSchema),

3
apps/user/app/auth/user-login-form.tsx
View File

@ -29,7 +29,8 @@ export default function UserLoginForm({
const formSchema = z.object({ const formSchema = z.object({
email: z.string(), email: z.string(),
password: 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>>({ const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema), resolver: zodResolver(formSchema),

5
apps/user/app/auth/user-register-form.tsx
View File

@ -51,7 +51,10 @@ export default function UserRegisterForm({
repeat_password: z.string(), repeat_password: z.string(),
code: register.enable_email_verify ? z.string() : z.string().nullish(), code: register.enable_email_verify ? z.string() : z.string().nullish(),
invite: invite.forced_invite ? 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) => { .superRefine(({ password, repeat_password }, ctx) => {
if (password !== repeat_password) { if (password !== repeat_password) {

6
apps/user/app/auth/user-reset-form.tsx
View File

@ -9,7 +9,6 @@ import { z, zodResolver } from '@shadcn/ui/lib/zod';
import { useCountDown } from 'ahooks'; import { useCountDown } from 'ahooks';
import { useTranslations } from 'next-intl'; import { useTranslations } from 'next-intl';
import { Dispatch, SetStateAction, useState } from 'react'; import { Dispatch, SetStateAction, useState } from 'react';
import CloudFlareTurnstile from './turnstile'; import CloudFlareTurnstile from './turnstile';
export default function UserResetForm({ export default function UserResetForm({
@ -49,7 +48,10 @@ export default function UserResetForm({
email: z.string(), email: z.string(),
password: z.string(), password: z.string(),
code: register.enable_email_verify ? z.string() : z.string().nullish(), 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>>({ const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema), resolver: zodResolver(formSchema),