diff --git a/apps/user/app/auth/email2/register-form.tsx b/apps/user/app/auth/email2/register-form.tsx index 3b2dffa..674ec1b 100644 --- a/apps/user/app/auth/email2/register-form.tsx +++ b/apps/user/app/auth/email2/register-form.tsx @@ -13,13 +13,12 @@ import { } from '@workspace/airo-ui/components/form'; import { Input } from '@workspace/airo-ui/components/input'; import { Icon } from '@workspace/airo-ui/custom-components/icon'; -import { Markdown } from '@workspace/airo-ui/custom-components/markdown'; import { useRouter } from 'next/navigation'; import { Dispatch, SetStateAction, useEffect, useRef, useState } from 'react'; import { useForm } from 'react-hook-form'; import { z } from 'zod'; import SendCode from '../send-code'; -import CloudFlareTurnstile, { TurnstileRef } from '../turnstile'; +import { TurnstileRef } from '../turnstile'; export default function RegisterForm({ loading, @@ -35,35 +34,15 @@ export default function RegisterForm({ onSwitchForm: Dispatch>; }) { const { common } = useGlobalStore(); - const { verify, auth, invite } = common; const router = useRouter(); - const handleCheckUser = async (email: string) => { - try { - if (!auth.email.enable_domain_suffix) return true; - const domain = email.split('@')[1]; - const isValid = auth.email?.domain_suffix_list.split('\n').includes(domain || ''); - return isValid; - } catch (error) { - console.log('Error checking user:', error); - return false; - } - }; const formSchema = z .object({ - email: z.string().email('请输入有效的电子邮件地址。').refine(handleCheckUser, { - message: '电子邮件域名不在允许的白名单中。', - }), + email: z.string().email('请输入有效的电子邮件地址。'), password: z.string().min(1, '请输入密码'), // 必填提示 repeat_password: z.string().min(1, '请重复输入密码'), // 必填 - code: auth.email.enable_verify - ? z.string().min(1, '请输入验证码') // 必填 - : z.string().nullish(), - invite: invite.forced_invite ? z.string().min(1, '请输入邀请码') : z.string().nullish(), - cf_token: - verify.enable_register_verify && verify.turnstile_site_key - ? z.string() - : z.string().nullish(), + code: z.string().min(1, '请输入验证码'), // 必填, + invite: z.string().nullish(), }) .superRefine(({ password, repeat_password }, ctx) => { if (password !== repeat_password) { @@ -103,155 +82,137 @@ export default function RegisterForm({ <>
线路优化
- {auth.register.stop_register ? ( - 尊敬的用户,您好 - ) : ( -
- -
- ( - - - - - - - )} - /> - ( - - - - - - - )} - /> - ( - - - - - - - )} - /> - {auth.email.enable_verify && ( - ( - - -
- - -
-
- -
- )} - /> + + +
+ ( + + + + + + )} + /> + ( + + + + + + + )} + /> + ( + + + + + + + )} + /> + { ( - +
+ + +
)} /> - {verify.enable_register_verify && ( - ( - - - - - - - )} - /> + } + ( + + + + + + )} -
+ /> +
-
- 已有账户?  - -
-
- - {loading && } - 注册 - -
-
- - )} +
+ 已有账户?  + +
+
+ + {loading && } + 注册 + +
+ + ); } diff --git a/apps/user/components/providers.tsx b/apps/user/components/providers.tsx index b61519f..a15d624 100644 --- a/apps/user/components/providers.tsx +++ b/apps/user/components/providers.tsx @@ -33,7 +33,7 @@ export default function Providers({ const { setCommon, setUser } = useGlobalStore(); const pathname = usePathname(); - const whiteList = ['/']; + const whiteList = ['/', '/register']; const isWhite = whiteList.includes(pathname); useEffect(() => {