feat(web): add SessionWatcher component for session management and handle session expiration
This commit is contained in:
@@ -1,10 +1,12 @@
|
||||
import { ReactNode } from "react";
|
||||
import Sidebar from "@/components/sidebar";
|
||||
import { ReactQueryProvider } from "@/components/query-provider";
|
||||
import { SessionWatcher } from "@/components/session-watcher";
|
||||
|
||||
export default function DashboardLayout({ children }: { children: ReactNode }) {
|
||||
return (
|
||||
<div className="flex h-dvh bg-background">
|
||||
<SessionWatcher />
|
||||
<Sidebar />
|
||||
|
||||
{/* Main content */}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import type { Metadata } from "next";
|
||||
import { Geist_Mono, Noto_Sans, Saira } from "next/font/google";
|
||||
import { Toast } from "@heroui/react";
|
||||
import "./globals.css";
|
||||
|
||||
const fontSaira = Saira({
|
||||
@@ -33,6 +34,7 @@ export default function RootLayout({
|
||||
<body
|
||||
className={`${fontSaira.variable} ${fontNotoSans.variable} ${fontMono.variable} antialiased`}
|
||||
>
|
||||
<Toast.Provider />
|
||||
{children}
|
||||
</body>
|
||||
</html>
|
||||
|
||||
44
apps/web/components/session-watcher.tsx
Normal file
44
apps/web/components/session-watcher.tsx
Normal file
@@ -0,0 +1,44 @@
|
||||
"use client";
|
||||
|
||||
import { useCallback, useEffect, useRef } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { toast } from "@heroui/react";
|
||||
import { useSession, signOut } from "@/lib/auth-client";
|
||||
|
||||
export function SessionWatcher() {
|
||||
const router = useRouter();
|
||||
const { data: session, isPending } = useSession();
|
||||
const wasLoggedIn = useRef(false);
|
||||
const isHandling = useRef(false);
|
||||
|
||||
const handleExpired = useCallback(async () => {
|
||||
if (isHandling.current) return;
|
||||
isHandling.current = true;
|
||||
try {
|
||||
await signOut({ fetchOptions: { credentials: "include" } });
|
||||
} catch {
|
||||
// ignore sign-out errors
|
||||
}
|
||||
toast.warning("登录已过期,请重新登录");
|
||||
router.push("/login");
|
||||
}, [router]);
|
||||
|
||||
// Detect session becoming null after being valid (e.g. server-side expiry)
|
||||
useEffect(() => {
|
||||
if (isPending) return;
|
||||
if (session) {
|
||||
wasLoggedIn.current = true;
|
||||
} else if (wasLoggedIn.current) {
|
||||
handleExpired();
|
||||
}
|
||||
}, [session, isPending, handleExpired]);
|
||||
|
||||
// Detect 401 responses from the API (dispatched by apiFetch)
|
||||
useEffect(() => {
|
||||
const handler = () => handleExpired();
|
||||
window.addEventListener("session:expired", handler);
|
||||
return () => window.removeEventListener("session:expired", handler);
|
||||
}, [handleExpired]);
|
||||
|
||||
return null;
|
||||
}
|
||||
@@ -10,6 +10,9 @@ async function apiFetch<T>(path: string, init?: RequestInit): Promise<T> {
|
||||
credentials: "include",
|
||||
});
|
||||
if (!res.ok) {
|
||||
if (res.status === 401 && typeof window !== "undefined") {
|
||||
window.dispatchEvent(new CustomEvent("session:expired"));
|
||||
}
|
||||
const text = await res.text().catch(() => res.statusText);
|
||||
throw new Error(`API ${path} failed (${res.status}): ${text}`);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user