Skip to content

O3-4478: Redirect logged-in users from login page to home page #1429

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

O3-4478: Redirect logged-in users from login page to home page #1429

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36aef34
fix(login): redirect logged-in users away from login page
Willie-theBeastMutua Jul 22, 2025
c412932
Merge branch 'main' into fix/login-redirect-session
jwnasambu Jul 30, 2025
e188f42
Merge branch 'main' into fix/login-redirect-session
Willie-theBeastMutua Sep 8, 2025
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
27 changes: 21 additions & 6 deletions packages/apps/esm-login-app/src/login/login.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
useConnectivity,
useSession,
} from '@openmrs/esm-framework';
import { getSessionStore } from '@openmrs/esm-api';
import { type ConfigSchema } from '../config-schema';
import Logo from '../logo.component';
import Footer from '../footer.component';
Expand Down Expand Up @@ -39,14 +40,28 @@ const Login: React.FC = () => {
const usernameInputRef = useRef<HTMLInputElement>(null);

useEffect(() => {
if (!user) {
if (loginProvider.type === 'oauth2') {
openmrsNavigate({ to: loginProvider.loginUrl });
} else if (!username && location.pathname === '/login/confirm') {
navigate('/login');
async function redirectIfLoggedIn() {
if (!user) {
if (loginProvider.type === 'oauth2') {
openmrsNavigate({ to: loginProvider.loginUrl });
} else if (!username && location.pathname === '/login/confirm') {
navigate('/login');
}
} else {
const session = getSessionStore().getState();
const locationSet = session?.session?.sessionLocation != null;

if (locationSet) {
const to = loginLinks?.loginSuccess || '/home';
openmrsNavigate({ to });
} else {
navigate('/login/location');
}
}
}
}, [username, navigate, location, user, loginProvider]);

redirectIfLoggedIn();
}, [user, loginProvider, username, location.pathname, navigate, loginLinks]);

useEffect(() => {
if (showPasswordOnSeparateScreen) {
Expand Down