From d3a07af9540f58230a826a2bb891a6910c53018a Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sat, 13 Dec 2025 23:41:19 +0000 Subject: [PATCH 1/3] login redirect stuff --- frontend/src/proprietary/routes/Login.tsx | 48 +++++++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/frontend/src/proprietary/routes/Login.tsx b/frontend/src/proprietary/routes/Login.tsx index 4bca34d43..ab282a1b2 100644 --- a/frontend/src/proprietary/routes/Login.tsx +++ b/frontend/src/proprietary/routes/Login.tsx @@ -1,5 +1,5 @@ -import { useEffect, useState } from 'react'; -import { Navigate, useNavigate, useSearchParams } from 'react-router-dom'; +import { useEffect, useMemo, useState } from 'react'; +import { Navigate, useLocation, useNavigate, useSearchParams, type Location } from 'react-router-dom'; import { Text, Stack, Alert } from '@mantine/core'; import { springAuth } from '@app/auth/springAuthClient'; import { useAuth } from '@app/auth/UseSession'; @@ -19,7 +19,6 @@ import ErrorMessage from '@app/routes/login/ErrorMessage'; import EmailPasswordForm from '@app/routes/login/EmailPasswordForm'; import OAuthButtons, { DEBUG_SHOW_ALL_PROVIDERS, oauthProviderConfig } from '@app/routes/login/OAuthButtons'; import DividerWithText from '@app/components/shared/DividerWithText'; -import LoggedInState from '@app/routes/login/LoggedInState'; export default function Login() { const navigate = useNavigate(); @@ -39,8 +38,32 @@ export default function Login() { const backendProbe = useBackendProbe(); const [isFirstTimeSetup, setIsFirstTimeSetup] = useState(false); const [showDefaultCredentials, setShowDefaultCredentials] = useState(false); + const location = useLocation(); const loginDisabled = backendProbe.loginDisabled === true || _enableLogin === false; + const redirectTarget = useMemo(() => { + const fromParam = searchParams.get('from'); + const stateFrom = + location.state && typeof location.state === 'object' + ? (location.state as { from?: Location })?.from + : undefined; + + const requestedPath = fromParam || (stateFrom ? `${stateFrom.pathname}${stateFrom.search || ''}` : null); + if (!requestedPath) return null; + + // Strip BASE_PATH if it was captured in the URL (e.g., when running under a subpath) + const basePath = BASE_PATH || ''; + const normalizedPath = requestedPath.startsWith(basePath) ? requestedPath.slice(basePath.length) || '/' : requestedPath; + + // Only allow same-site relative navigations to non-auth routes + const blockedPrefixes = ['/login', '/signup', '/auth/', '/invite/']; + if (!normalizedPath.startsWith('/') || blockedPrefixes.some(prefix => normalizedPath.startsWith(prefix))) { + return null; + } + + return normalizedPath; + }, [location.state, searchParams]); + // Periodically probe while backend isn't up so the screen can auto-advance when it comes online useEffect(() => { if (backendProbe.status === 'up' || backendProbe.loginDisabled) { @@ -64,10 +87,12 @@ export default function Login() { // Redirect immediately if user has valid session (JWT already validated by AuthProvider) useEffect(() => { if (!loading && session) { - console.debug('[Login] User already authenticated, redirecting to home'); - navigate('/', { replace: true }); + const target = redirectTarget || '/'; + console.debug('[Login] User already authenticated, redirecting to', target); + // Use a full replace to ensure the destination route fully mounts (avoids stale login view) + window.location.replace(`${BASE_PATH}${target}`); } - }, [session, loading, navigate]); + }, [session, loading, redirectTarget]); // If backend reports login is disabled, redirect to home (anonymous mode) useEffect(() => { @@ -189,9 +214,16 @@ export default function Login() { return ; } - // Show logged in state if authenticated + // Show a lightweight placeholder while the redirect effect runs if (session && !loading) { - return ; + return ( + + +
+ {t('login.redirectingMessage', 'Taking you back to where you left off...')} +
+ + ); } // If backend isn't ready yet, show a lightweight status screen instead of the form From 3fea64834b9fff8547e103827f8d599fbe8c4335 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sat, 13 Dec 2025 23:52:58 +0000 Subject: [PATCH 2/3] remove transltions --- frontend/src/proprietary/routes/Login.tsx | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/frontend/src/proprietary/routes/Login.tsx b/frontend/src/proprietary/routes/Login.tsx index ab282a1b2..d637651a5 100644 --- a/frontend/src/proprietary/routes/Login.tsx +++ b/frontend/src/proprietary/routes/Login.tsx @@ -214,16 +214,9 @@ export default function Login() { return ; } - // Show a lightweight placeholder while the redirect effect runs + // Redirect effect runs immediately via window.location.replace() - no UI needed if (session && !loading) { - return ( - - -
- {t('login.redirectingMessage', 'Taking you back to where you left off...')} -
- - ); + return null; } // If backend isn't ready yet, show a lightweight status screen instead of the form From 53671ef13f3d23a7a4c4903aa5409378320e10bd Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Mon, 15 Dec 2025 10:43:15 +0000 Subject: [PATCH 3/3] login test fix --- frontend/src/proprietary/routes/Login.test.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/proprietary/routes/Login.test.tsx b/frontend/src/proprietary/routes/Login.test.tsx index 218eb7efb..afd28d415 100644 --- a/frontend/src/proprietary/routes/Login.test.tsx +++ b/frontend/src/proprietary/routes/Login.test.tsx @@ -157,6 +157,13 @@ describe('Login', () => { refreshSession: vi.fn(), }); + // Mock window.location.replace + const mockLocationReplace = vi.fn(); + Object.defineProperty(window, 'location', { + writable: true, + value: { replace: mockLocationReplace } + }); + render( @@ -166,7 +173,7 @@ describe('Login', () => { ); await waitFor(() => { - expect(mockNavigate).toHaveBeenCalledWith('/', { replace: true }); + expect(mockLocationReplace).toHaveBeenCalledWith('/'); }); });