feat: add error handling for sessionStorage in redirect logic across multiple pages
This commit is contained in:
@@ -60,7 +60,7 @@ function OAuthCallbackInner() {
|
|||||||
sessionStorage.removeItem('redirect_after_login');
|
sessionStorage.removeItem('redirect_after_login');
|
||||||
redirectTo = saved;
|
redirectTo = saved;
|
||||||
}
|
}
|
||||||
} catch {}
|
} catch { /* sessionStorage may be unavailable */ }
|
||||||
router.push(redirectTo);
|
router.push(redirectTo);
|
||||||
} else {
|
} else {
|
||||||
setError("token_exchange_failed");
|
setError("token_exchange_failed");
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ export default function CalendarPage() {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!isAuthenticated) {
|
if (!isAuthenticated) {
|
||||||
try { sessionStorage.setItem('redirect_after_login', window.location.pathname); } catch {}
|
try { sessionStorage.setItem('redirect_after_login', window.location.pathname); } catch { /* ignore */ }
|
||||||
router.push("/login");
|
router.push("/login");
|
||||||
} else if (!supportsCalendar) {
|
} else if (!supportsCalendar) {
|
||||||
router.push("/");
|
router.push("/");
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ export default function ContactsPage() {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!isAuthenticated) {
|
if (!isAuthenticated) {
|
||||||
try { sessionStorage.setItem('redirect_after_login', window.location.pathname); } catch {}
|
try { sessionStorage.setItem('redirect_after_login', window.location.pathname); } catch { /* ignore */ }
|
||||||
router.push("/login");
|
router.push("/login");
|
||||||
}
|
}
|
||||||
}, [isAuthenticated, router]);
|
}, [isAuthenticated, router]);
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ export default function LoginPage() {
|
|||||||
sessionStorage.removeItem('redirect_after_login');
|
sessionStorage.removeItem('redirect_after_login');
|
||||||
redirectTo = saved;
|
redirectTo = saved;
|
||||||
}
|
}
|
||||||
} catch {}
|
} catch { /* ignore */ }
|
||||||
router.push(redirectTo);
|
router.push(redirectTo);
|
||||||
}
|
}
|
||||||
}, [isAuthenticated, router]);
|
}, [isAuthenticated, router]);
|
||||||
@@ -314,7 +314,7 @@ export default function LoginPage() {
|
|||||||
sessionStorage.removeItem('redirect_after_login');
|
sessionStorage.removeItem('redirect_after_login');
|
||||||
redirectTo = saved;
|
redirectTo = saved;
|
||||||
}
|
}
|
||||||
} catch {}
|
} catch { /* ignore */ }
|
||||||
router.push(redirectTo);
|
router.push(redirectTo);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -329,7 +329,7 @@ export default function LoginPage() {
|
|||||||
sessionStorage.removeItem('redirect_after_login');
|
sessionStorage.removeItem('redirect_after_login');
|
||||||
redirectTo = saved;
|
redirectTo = saved;
|
||||||
}
|
}
|
||||||
} catch {}
|
} catch { /* ignore */ }
|
||||||
router.push(redirectTo);
|
router.push(redirectTo);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -264,7 +264,7 @@ export default function Home() {
|
|||||||
// Redirect to login if not authenticated
|
// Redirect to login if not authenticated
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (initialCheckDone && !isAuthenticated && !authLoading) {
|
if (initialCheckDone && !isAuthenticated && !authLoading) {
|
||||||
try { sessionStorage.setItem('redirect_after_login', window.location.pathname); } catch {}
|
try { sessionStorage.setItem('redirect_after_login', window.location.pathname); } catch { /* ignore */ }
|
||||||
router.push('/login');
|
router.push('/login');
|
||||||
}
|
}
|
||||||
}, [initialCheckDone, isAuthenticated, authLoading, router]);
|
}, [initialCheckDone, isAuthenticated, authLoading, router]);
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ export default function SettingsPage() {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!isAuthenticated) {
|
if (!isAuthenticated) {
|
||||||
try { sessionStorage.setItem('redirect_after_login', window.location.pathname); } catch {}
|
try { sessionStorage.setItem('redirect_after_login', window.location.pathname); } catch { /* ignore */ }
|
||||||
router.push('/login');
|
router.push('/login');
|
||||||
}
|
}
|
||||||
}, [isAuthenticated, router]);
|
}, [isAuthenticated, router]);
|
||||||
|
|||||||
Reference in New Issue
Block a user