Skip to content

fix: Login email verification flow #31583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 5 commits into from
Jan 31, 2024
Merged

fix: Login email verification flow #31583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7bd8832
fix: :bug: Login email verification flow
rique223 Jan 30, 2024
707f046
Adapt tests to new logic
rique223 Jan 30, 2024
dc3afd8
Fix tests
rique223 Jan 30, 2024
be505af
Create flat-windows-juggle.md
hugocostadev Jan 31, 2024
1a624a4
Merge branch 'develop' into fix/email-verification-login
kodiakhq[bot] Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/flat-windows-juggle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/web-ui-registration": patch
---

Fixed login email verification flow when a user tries to join with username
1 change: 0 additions & 1 deletion apps/meteor/tests/e2e/page-objects/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ export class Registration {
return this.page.locator('role=button[name="Reset"]');
}


get btnLogin(): Locator {
return this.page.locator('role=button[name="Login"]');
}
Expand Down
6 changes: 4 additions & 2 deletions packages/web-ui-registration/src/EmailConfirmationForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import { useLoginSendEmailConfirmation } from './hooks/useLoginSendEmailConfirma
export const EmailConfirmationForm = ({ email, onBackToLogin }: { email?: string; onBackToLogin: () => void }): ReactElement => {
const { t } = useTranslation();

const basicEmailRegex = /^[^@]+@[^@]+$/;
const isEmail = basicEmailRegex.test(email || '');

const {
register,
handleSubmit,
Expand All @@ -17,7 +20,7 @@ export const EmailConfirmationForm = ({ email, onBackToLogin }: { email?: string
email: string;
}>({
defaultValues: {
email,
email: isEmail ? email : '',
},
});

Expand Down Expand Up @@ -45,7 +48,6 @@ export const EmailConfirmationForm = ({ email, onBackToLogin }: { email?: string
{...register('email', {
required: true,
})}
disabled={Boolean(email)}
error={errors.email && t('registration.component.form.requiredField')}
aria-invalid={errors?.email?.type === 'required'}
placeholder={t('registration.component.form.emailPlaceholder')}
Expand Down
22 changes: 11 additions & 11 deletions packages/web-ui-registration/src/LoginForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
clearErrors,
getValues,
formState: { errors },
} = useForm<{ username: string; password: string }>({
} = useForm<{ usernameOrEmail: string; password: string }>({
mode: 'onBlur',
});

Expand All @@ -83,12 +83,12 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
useDocumentTitle(t('registration.component.login'), false);

const loginMutation = useMutation({
mutationFn: (formData: { username: string; password: string }) => {
return login(formData.username, formData.password);
mutationFn: (formData: { usernameOrEmail: string; password: string }) => {
return login(formData.usernameOrEmail, formData.password);
},
onError: (error: any) => {
if ([error.error, error.errorType].includes('error-invalid-email')) {
setError('username', { type: 'invalid-email', message: t('registration.page.login.errors.invalidEmail') });
setError('usernameOrEmail', { type: 'invalid-email', message: t('registration.page.login.errors.invalidEmail') });
}

if ('error' in error && error.error !== 403) {
Expand Down Expand Up @@ -119,8 +119,8 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
);
};

if (errors.username?.type === 'invalid-email') {
return <EmailConfirmationForm onBackToLogin={() => clearErrors('username')} email={getValues('username')} />;
if (errors.usernameOrEmail?.type === 'invalid-email') {
return <EmailConfirmationForm onBackToLogin={() => clearErrors('usernameOrEmail')} email={getValues('usernameOrEmail')} />;
}

return (
Expand All @@ -144,19 +144,19 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
</FieldLabel>
<FieldRow>
<TextInput
{...register('username', {
{...register('usernameOrEmail', {
required: t('registration.component.form.requiredField'),
})}
placeholder={usernameOrEmailPlaceholder || t('registration.component.form.emailPlaceholder')}
error={errors.username?.message}
aria-invalid={errors.username || errorOnSubmit ? 'true' : 'false'}
error={errors.usernameOrEmail?.message}
aria-invalid={errors.usernameOrEmail || errorOnSubmit ? 'true' : 'false'}
aria-describedby={`${usernameId}-error`}
id={usernameId}
/>
</FieldRow>
{errors.username && (
{errors.usernameOrEmail && (
<FieldError aria-live='assertive' id={`${usernameId}-error`}>
{errors.username.message}
{errors.usernameOrEmail.message}
</FieldError>
)}
</Field>
Expand Down