* ♻️ refactor: Login form improvement * display error message when API is down * add loading animation to Login form while fetching data * optimize startupConfig to fetch data only on initial render to prevent unnecessary API calls * 🚑 fix: clear authentication error messages on successful login * ♻️ refactor: componentize duplicate codes on registration and login screens * chore: update types * refactor: layout rendering order * refactor: startup title fix * refactor: reset/request-reset-password under new AuthLayout * ci: fix Login.spec.ts * ci: fix registration.spec.tsx --------- Co-authored-by: Danny Avila <danny@librechat.ai>
169 lines
6.2 KiB
TypeScript
169 lines
6.2 KiB
TypeScript
import { useForm } from 'react-hook-form';
|
|
import React, { useState, useEffect } from 'react';
|
|
import { useNavigate, useOutletContext } from 'react-router-dom';
|
|
import { useRegisterUserMutation } from 'librechat-data-provider/react-query';
|
|
import type { TRegisterUser, TError } from 'librechat-data-provider';
|
|
import type { TLoginLayoutContext } from '~/common';
|
|
import { ErrorMessage } from './ErrorMessage';
|
|
import { useLocalize } from '~/hooks';
|
|
|
|
const Registration: React.FC = () => {
|
|
const navigate = useNavigate();
|
|
const localize = useLocalize();
|
|
const { startupConfig, startupConfigError, isFetching } = useOutletContext<TLoginLayoutContext>();
|
|
|
|
const {
|
|
register,
|
|
watch,
|
|
handleSubmit,
|
|
formState: { errors },
|
|
} = useForm<TRegisterUser>({ mode: 'onChange' });
|
|
|
|
const [error, setError] = useState<boolean>(false);
|
|
const [errorMessage, setErrorMessage] = useState<string>('');
|
|
const registerUser = useRegisterUserMutation();
|
|
const password = watch('password');
|
|
|
|
const onRegisterUserFormSubmit = async (data: TRegisterUser) => {
|
|
try {
|
|
await registerUser.mutateAsync(data);
|
|
navigate('/c/new');
|
|
} catch (error) {
|
|
setError(true);
|
|
if ((error as TError).response?.data?.message) {
|
|
setErrorMessage((error as TError).response?.data?.message ?? '');
|
|
}
|
|
}
|
|
};
|
|
|
|
useEffect(() => {
|
|
if (startupConfig?.registrationEnabled === false) {
|
|
navigate('/login');
|
|
}
|
|
}, [startupConfig, navigate]);
|
|
|
|
const renderInput = (id: string, label: string, type: string, validation: object) => (
|
|
<div className="mb-2">
|
|
<div className="relative">
|
|
<input
|
|
id={id}
|
|
type={type}
|
|
autoComplete={id}
|
|
aria-label={localize(label)}
|
|
{...register(
|
|
id as 'name' | 'email' | 'username' | 'password' | 'confirm_password',
|
|
validation,
|
|
)}
|
|
aria-invalid={!!errors[id]}
|
|
className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-gray-300 bg-transparent px-3.5 pb-3.5 pt-4 text-sm text-gray-900 focus:border-green-500 focus:outline-none focus:ring-0 dark:border-gray-600 dark:text-white dark:focus:border-green-500"
|
|
placeholder=" "
|
|
data-testid={id}
|
|
/>
|
|
<label
|
|
htmlFor={id}
|
|
className="absolute start-1 top-2 z-10 origin-[0] -translate-y-4 scale-75 transform bg-white px-3 text-sm text-gray-500 duration-100 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-2 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-3 peer-focus:text-green-600 dark:bg-gray-900 dark:text-gray-400 dark:peer-focus:text-green-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4"
|
|
>
|
|
{localize(label)}
|
|
</label>
|
|
</div>
|
|
{errors[id] && (
|
|
<span role="alert" className="mt-1 text-sm text-red-500 dark:text-red-900">
|
|
{String(errors[id]?.message) ?? ''}
|
|
</span>
|
|
)}
|
|
</div>
|
|
);
|
|
|
|
return (
|
|
<>
|
|
{error && (
|
|
<ErrorMessage>
|
|
{localize('com_auth_error_create')} {errorMessage}
|
|
</ErrorMessage>
|
|
)}
|
|
|
|
{!startupConfigError && !isFetching && (
|
|
<>
|
|
<form
|
|
className="mt-6"
|
|
aria-label="Registration form"
|
|
method="POST"
|
|
onSubmit={handleSubmit(onRegisterUserFormSubmit)}
|
|
>
|
|
{renderInput('name', 'com_auth_full_name', 'text', {
|
|
required: localize('com_auth_name_required'),
|
|
minLength: {
|
|
value: 3,
|
|
message: localize('com_auth_name_min_length'),
|
|
},
|
|
maxLength: {
|
|
value: 80,
|
|
message: localize('com_auth_name_max_length'),
|
|
},
|
|
})}
|
|
{renderInput('username', 'com_auth_username', 'text', {
|
|
minLength: {
|
|
value: 2,
|
|
message: localize('com_auth_username_min_length'),
|
|
},
|
|
maxLength: {
|
|
value: 80,
|
|
message: localize('com_auth_username_max_length'),
|
|
},
|
|
})}
|
|
{renderInput('email', 'com_auth_email', 'email', {
|
|
required: localize('com_auth_email_required'),
|
|
minLength: {
|
|
value: 1,
|
|
message: localize('com_auth_email_min_length'),
|
|
},
|
|
maxLength: {
|
|
value: 120,
|
|
message: localize('com_auth_email_max_length'),
|
|
},
|
|
pattern: {
|
|
value: /\S+@\S+\.\S+/,
|
|
message: localize('com_auth_email_pattern'),
|
|
},
|
|
})}
|
|
{renderInput('password', 'com_auth_password', 'password', {
|
|
required: localize('com_auth_password_required'),
|
|
minLength: {
|
|
value: 8,
|
|
message: localize('com_auth_password_min_length'),
|
|
},
|
|
maxLength: {
|
|
value: 128,
|
|
message: localize('com_auth_password_max_length'),
|
|
},
|
|
})}
|
|
{renderInput('confirm_password', 'com_auth_password_confirm', 'password', {
|
|
validate: (value: string) =>
|
|
value === password || localize('com_auth_password_not_match'),
|
|
})}
|
|
<div className="mt-6">
|
|
<button
|
|
disabled={Object.keys(errors).length > 0}
|
|
type="submit"
|
|
aria-label="Submit registration"
|
|
className="w-full transform rounded-md bg-green-500 px-4 py-3 tracking-wide text-white transition-colors duration-200 hover:bg-green-550 focus:bg-green-550 focus:outline-none disabled:cursor-not-allowed disabled:hover:bg-green-500"
|
|
>
|
|
{localize('com_auth_continue')}
|
|
</button>
|
|
</div>
|
|
</form>
|
|
|
|
<p className="my-4 text-center text-sm font-light text-gray-700 dark:text-white">
|
|
{localize('com_auth_already_have_account')}{' '}
|
|
<a href="/login" aria-label="Login" className="p-1 text-green-500">
|
|
{localize('com_auth_login')}
|
|
</a>
|
|
</p>
|
|
</>
|
|
)}
|
|
</>
|
|
);
|
|
};
|
|
|
|
export default Registration;
|