Skip to content

fix(Authentication): handle login error properly #1426

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
merged 1 commit into from
Oct 8, 2024
Merged

fix(Authentication): handle login error properly #1426

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 23 additions & 22 deletions src/containers/Authentication/Authentication.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function Authentication({closable = false}: AuthenticationProps) {
const history = useHistory();
const location = useLocation();

const [authenticate, {error, isLoading}] = authenticationApi.useAuthenticateMutation(undefined);
const [authenticate, {isLoading}] = authenticationApi.useAuthenticateMutation(undefined);
Copy link
Collaborator

@astandrik astandrik Oct 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why didn't it work as expected?
I mean isn't auth mutation supposed to return error on error?

Copy link
Member Author

@artemmufazalov artemmufazalov Oct 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mutation result is always {data, error}, it cannot be processed by catch without .unwrap(). In previous version code in .then always ran, that caused the bug with error being ignored. I could use only .then as well - .then(({data, error}) -> {}), but form with explicit .catch looks better for me


const {returnUrl} = parseQuery(location);

Expand All @@ -34,15 +34,6 @@ function Authentication({closable = false}: AuthenticationProps) {
const [passwordError, setPasswordError] = React.useState('');
const [showPassword, setShowPassword] = React.useState(false);

React.useEffect(() => {
if (isUserError(error)) {
setLoginError(error.data.error);
}
if (isPasswordError(error)) {
setPasswordError(error.data.error);
}
}, [error]);

const onLoginUpdate = (value: string) => {
setLogin(value);
setLoginError('');
Expand All @@ -54,18 +45,28 @@ function Authentication({closable = false}: AuthenticationProps) {
};

const onLoginClick = () => {
authenticate({user: login, password}).then(() => {
if (returnUrl) {
const decodedUrl = decodeURIComponent(returnUrl.toString());

// to prevent page reload we use router history
// history navigates relative to origin
// so we remove origin to make it work properly
const url = new URL(decodedUrl);
const path = url.pathname + url.search;
history.replace(path);
}
});
authenticate({user: login, password})
.unwrap()
.then(() => {
if (returnUrl) {
const decodedUrl = decodeURIComponent(returnUrl.toString());

// to prevent page reload we use router history
// history navigates relative to origin
// so we remove origin to make it work properly
const url = new URL(decodedUrl);
const path = url.pathname + url.search;
history.replace(path);
}
})
.catch((error) => {
if (isUserError(error)) {
setLoginError(error.data.error);
}
if (isPasswordError(error)) {
setPasswordError(error.data.error);
}
});
};

const onEnterClick = (e: React.KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>) => {
Expand Down
Loading