Compare commits

...
2 Commits
+5 -3
View File
@@ -15,9 +15,10 @@ function LoginPage() {
useEffect(() => { useEffect(() => {
if (!loading && user) { if (!loading && user) {
navigate('/'); const redirect = searchParams.get('redirect');
navigate(redirect ? decodeURIComponent(redirect) : '/');
} }
}, [user, loading, navigate]); }, [user, loading, navigate, searchParams]);
const saveRedirectAndGo = (oauthUrl: string) => { const saveRedirectAndGo = (oauthUrl: string) => {
const redirect = searchParams.get('redirect'); const redirect = searchParams.get('redirect');
@@ -40,7 +41,8 @@ function LoginPage() {
setGuestLoading(true); setGuestLoading(true);
const token = await guestLogin(); const token = await guestLogin();
await login(token); await login(token);
const redirect = searchParams.get('redirect'); const redirect = searchParams.get('redirect') || sessionStorage.getItem('oauth_redirect');
sessionStorage.removeItem('oauth_redirect');
navigate(redirect ? decodeURIComponent(redirect) : '/'); navigate(redirect ? decodeURIComponent(redirect) : '/');
} catch (err) { } catch (err) {
console.error('Guest login failed:', err); console.error('Guest login failed:', err);