From 9915eb7c59a87fb369dac59445cb71f2da2bbc74 Mon Sep 17 00:00:00 2001 From: Alberto Defendi <1369-ahl-berto@users.noreply.gitlab.inf.unibz.it> Date: Thu, 6 May 2021 14:02:43 +0200 Subject: [PATCH] Replace email with username. --- .../AuthUser/SignInForm/SignInForm.tsx | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/components/AuthUser/SignInForm/SignInForm.tsx b/src/components/AuthUser/SignInForm/SignInForm.tsx index 5d6912d..841da5c 100644 --- a/src/components/AuthUser/SignInForm/SignInForm.tsx +++ b/src/components/AuthUser/SignInForm/SignInForm.tsx @@ -11,12 +11,12 @@ export const SignInForm: FC = () => { const history = useHistory(); interface FormData { - email: string; + username: string; password: string; } const defaultValues: FormData = { - email: '', + username: '', password: '', }; @@ -29,8 +29,9 @@ export const SignInForm: FC = () => { .post( '/api/web/login', { - username: values.email, + username: values.username, password: values.password, + csrfmiddlewaretoken: sessionStorage.getItem('X-CSRFTOKEN'), }, { headers: { @@ -40,9 +41,9 @@ export const SignInForm: FC = () => { ) .then((response) => { if (response.data.status === 'fail') { - setError('email', { + setError('username', { type: 'server', - message: 'Something went wrong with email', + message: 'Something went wrong with username', }); setError('password', { type: 'server', @@ -63,19 +64,17 @@ export const SignInForm: FC = () => { data-testid="Form" > <InputField - name="email" + name="username" control={control} rules={{ - validate: (value: string) => - /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i.test(value), required: { value: true, - message: 'Email is not valid', + message: 'Username is not valid', }, }} - label="Email" - error={!!errors.email} - errorMessage="Insert email" + label="username" + error={!!errors.username} + errorMessage="Insert username" /> <InputField -- GitLab