Skip to content

#3895 login redirect fix #3932

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
chpy04 merged 7 commits into from
Feb 5, 2026
Merged

#3895 login redirect fix #3932

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a8f51b9
#3895 login redirect fix
Steph375 Jan 29, 2026
753ef96
adding comments
Steph375 Jan 29, 2026
1449320
adding comments
Steph375 Jan 29, 2026
a3af9ad
prettier
Steph375 Jan 29, 2026
4f9d592
extras
Steph375 Feb 2, 2026
9abfba7
Small changes made
Steph375 Feb 3, 2026
f979384
Merge branch 'develop' into 3895-Login-Fix
chpy04 Feb 5, 2026
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
11 changes: 10 additions & 1 deletion src/frontend/src/pages/LoginPage/Login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import { FormEvent, useState } from 'react';
import { useHistory } from 'react-router-dom';
import { Redirect, useHistory } from 'react-router-dom';
import { useToggleTheme } from '../../hooks/theme.hooks';
import { useAuth } from '../../hooks/auth.hooks';
import { routes } from '../../utils/routes';
Expand All @@ -25,8 +25,17 @@ const Login = () => {
const auth = useAuth();
const organizationContext = useOrganization();

if (!auth.user && !auth.triedCurrent) {
auth.signInCurrent();
return <LoadingIndicator />;
}

if (auth.isLoading) return <LoadingIndicator />;

if (auth.user) {
return <Redirect to={routes.HOME} />;
}

/**
* Produce the path of the page redirected from the login page.
* @param queryArgs the query args sent from the login page, containing page, value1, value2, ..., and other args
Expand Down