ChatGPT/FastGPT
1
0
Fork 0
mirror of https://github.com/labring/FastGPT.git synced 2025-07-29 17:55:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 手机验证码作为用户凭证

Browse Source
This commit is contained in:
archer
2023-04-16 19:53:50 +08:00
parent 36dad6df33
commit faf722fa15
20 changed files with 375 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/pages/login/components/ForgetPasswordForm.tsx
View File

@@ -14,7 +14,7 @@ interface Props {
}
interface RegisterType {
email: string;
username: string;
code: string;
password: string;
password2: string;
@@ -36,10 +36,10 @@ const RegisterForm = ({ setPageType, loginSuccess }: Props) => {
const { codeSending, sendCodeText, sendCode, codeCountDown } = useSendCode();
const onclickSendCode = useCallback(async () => {
const check = await trigger('email');
const check = await trigger('username');
if (!check) return;
sendCode({
email: getValues('email'),
username: getValues('username'),
type: 'findPassword'
});
}, [getValues, sendCode, trigger]);
@@ -47,12 +47,12 @@ const RegisterForm = ({ setPageType, loginSuccess }: Props) => {
const [requesting, setRequesting] = useState(false);
const onclickFindPassword = useCallback(
async ({ email, code, password }: RegisterType) => {
async ({ username, code, password }: RegisterType) => {
setRequesting(true);
try {
loginSuccess(
await postFindPassword({
email,
username,
code,
password
})
@@ -78,23 +78,24 @@ const RegisterForm = ({ setPageType, loginSuccess }: Props) => {
找回 FastGPT 账号
</Box>
<form onSubmit={handleSubmit(onclickFindPassword)}>
<FormControl mt={8} isInvalid={!!errors.email}>
<FormControl mt={8} isInvalid={!!errors.username}>
<Input
placeholder="邮箱"
placeholder="邮箱/手机号"
size={mediaLgMd}
{...register('email', {
required: '邮箱不能为空',
{...register('username', {
required: '邮箱/手机号不能为空',
pattern: {
value: /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/,
message: '邮箱错误'
value:
/(^1[3456789]\d{9}$)|(^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$)/,
message: '邮箱/手机号格式错误'
}
})}
></Input>
<FormErrorMessage position={'absolute'} fontSize="xs">
{!!errors.email && errors.email.message}
{!!errors.username && errors.username.message}
</FormErrorMessage>
</FormControl>
<FormControl mt={8} isInvalid={!!errors.email}>
<FormControl mt={8} isInvalid={!!errors.username}>
<Flex>
<Input
flex={1}

21
src/pages/login/components/LoginForm.tsx
View File

@@ -13,7 +13,7 @@ interface Props {
}
interface LoginFormType {
email: string;
username: string;
password: string;
}
@@ -29,12 +29,12 @@ const LoginForm = ({ setPageType, loginSuccess }: Props) => {
const [requesting, setRequesting] = useState(false);
const onclickLogin = useCallback(
async ({ email, password }: LoginFormType) => {
async ({ username, password }: LoginFormType) => {
setRequesting(true);
try {
loginSuccess(
await postLogin({
email,
username,
password
})
);
@@ -59,20 +59,21 @@ const LoginForm = ({ setPageType, loginSuccess }: Props) => {
登录 FastGPT
</Box>
<form onSubmit={handleSubmit(onclickLogin)}>
<FormControl mt={8} isInvalid={!!errors.email}>
<FormControl mt={8} isInvalid={!!errors.username}>
<Input
placeholder="邮箱"
placeholder="邮箱/手机号"
size={mediaLgMd}
{...register('email', {
required: '邮箱不能为空',
{...register('username', {
required: '邮箱/手机号不能为空',
pattern: {
value: /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/,
message: '邮箱错误'
value:
/(^1[3456789]\d{9}$)|(^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$)/,
message: '邮箱/手机号格式错误'
}
})}
></Input>
<FormErrorMessage position={'absolute'} fontSize="xs">
{!!errors.email && errors.email.message}
{!!errors.username && errors.username.message}
</FormErrorMessage>
</FormControl>
<FormControl mt={8} isInvalid={!!errors.password}>

26
src/pages/login/components/RegisterForm.tsx
View File

@@ -14,7 +14,7 @@ interface Props {
}
interface RegisterType {
email: string;
phone: string;
password: string;
password2: string;
code: string;
@@ -36,10 +36,10 @@ const RegisterForm = ({ setPageType, loginSuccess }: Props) => {
const { codeSending, sendCodeText, sendCode, codeCountDown } = useSendCode();
const onclickSendCode = useCallback(async () => {
const check = await trigger('email');
const check = await trigger('phone');
if (!check) return;
sendCode({
email: getValues('email'),
username: getValues('phone'),
type: 'register'
});
}, [getValues, sendCode, trigger]);
@@ -47,12 +47,12 @@ const RegisterForm = ({ setPageType, loginSuccess }: Props) => {
const [requesting, setRequesting] = useState(false);
const onclickRegister = useCallback(
async ({ email, password, code }: RegisterType) => {
async ({ phone, password, code }: RegisterType) => {
setRequesting(true);
try {
loginSuccess(
await postRegister({
email,
phone,
code,
password
})
@@ -78,23 +78,23 @@ const RegisterForm = ({ setPageType, loginSuccess }: Props) => {
注册 FastGPT 账号
</Box>
<form onSubmit={handleSubmit(onclickRegister)}>
<FormControl mt={8} isInvalid={!!errors.email}>
<FormControl mt={8} isInvalid={!!errors.phone}>
<Input
placeholder="邮箱"
placeholder="手机号"
size={mediaLgMd}
{...register('email', {
required: '邮箱不能为空',
{...register('phone', {
required: '手机号不能为空',
pattern: {
value: /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/,
message: '邮箱错误'
value: /^1[3456789]\d{9}$/,
message: '手机号格式错误'
}
})}
></Input>
<FormErrorMessage position={'absolute'} fontSize="xs">
{!!errors.email && errors.email.message}
{!!errors.phone && errors.phone.message}
</FormErrorMessage>
</FormControl>
<FormControl mt={8} isInvalid={!!errors.email}>
<FormControl mt={8} isInvalid={!!errors.phone}>
<Flex>
<Input
flex={1}