Skip to content
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

fix: Login form GUI crash after closing 2FA modal #31625

Merged
merged 5 commits into from
Feb 6, 2024
Merged

fix: Login form GUI crash after closing 2FA modal #31625

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
8b94deb
added cursor and closehandler
abhipatel0211 Feb 2, 2024
93c79bf
close button fix
abhipatel0211 Feb 2, 2024
fbc9a6f
fix: :bug: GUI crash when 2fa is canceled/closed
rique223 Feb 2, 2024
98098c1
Create tall-bears-compete.md
rique223 Feb 2, 2024
1649545
Merge branch 'develop' into fix_cursor_added_closeHandler
kodiakhq[bot] Feb 6, 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
5 changes: 5 additions & 0 deletions .changeset/tall-bears-compete.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/web-ui-registration": patch
---

Fixed a bug that caused the Login page to crash when closing the Two-Factor Authentication modal using the Cancel button or the X button.
7 changes: 6 additions & 1 deletion packages/web-ui-registration/src/LoginForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const LOGIN_SUBMIT_ERRORS = {
},
} as const;

export type LoginErrors = keyof typeof LOGIN_SUBMIT_ERRORS;
export type LoginErrors = keyof typeof LOGIN_SUBMIT_ERRORS | 'totp-canceled';

export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRouter }): ReactElement => {
const {
Expand Down Expand Up @@ -111,7 +111,12 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
}, [errorOnSubmit]);

const renderErrorOnSubmit = (error: LoginErrors) => {
if (error === 'totp-canceled') {
return null;
}

const { type, i18n } = LOGIN_SUBMIT_ERRORS[error];

return (
<Callout id={`${usernameId}-error`} aria-live='assertive' type={type}>
{t(i18n)}
Expand Down
Loading