PC-20260115JRSN\Administrator
1 semana atrás
3 arquivos alterados com 22 adições e 15 exclusões
Visão unificada
Opções de diferenças
-
+1 -4src/app/layout.tsx
-
+20 -10src/components/LoginPage/LoginRedirectIfAuthenticated.tsx
-
+1 -1src/routes.ts
+ 1
- 4
src/app/layout.tsx
Ver arquivo
| @@ -3,7 +3,6 @@ import type { Metadata, Viewport } from "next"; | |||||
| // import ThemeRegistry from "@/theme/ThemeRegistry"; | // import ThemeRegistry from "@/theme/ThemeRegistry"; | ||||
| import { detectLanguage } from "../i18n"; | import { detectLanguage } from "../i18n"; | ||||
| import ThemeRegistry from "../theme/ThemeRegistry"; | import ThemeRegistry from "../theme/ThemeRegistry"; | ||||
| import SessionProviderWrapper from "@/components/SessionProviderWrapper/SessionProviderWrapper"; | |||||
| export const metadata: Metadata = { | export const metadata: Metadata = { | ||||
| title: "FPSMS", | title: "FPSMS", | ||||
| @@ -28,9 +27,7 @@ export default async function RootLayout({ | |||||
| return ( | return ( | ||||
| <html lang={lang}> | <html lang={lang}> | ||||
| <body> | <body> | ||||
| <SessionProviderWrapper> | |||||
| <ThemeRegistry lang={lang}>{children}</ThemeRegistry> | |||||
| </SessionProviderWrapper> | |||||
| <ThemeRegistry lang={lang}>{children}</ThemeRegistry> | |||||
| </body> | </body> | ||||
| </html> | </html> | ||||
| ); | ); | ||||
+ 20
- 10
src/components/LoginPage/LoginRedirectIfAuthenticated.tsx
Ver arquivo
| @@ -1,13 +1,14 @@ | |||||
| "use client"; | "use client"; | ||||
| import { useSession } from "next-auth/react"; | |||||
| import { getSession } from "next-auth/react"; | |||||
| import { useSearchParams } from "next/navigation"; | import { useSearchParams } from "next/navigation"; | ||||
| import { useRouter } from "next/navigation"; | import { useRouter } from "next/navigation"; | ||||
| import { useEffect, type ReactNode } from "react"; | |||||
| import { useEffect, useState, type ReactNode } from "react"; | |||||
| /** | /** | ||||
| * Client-side only: redirect to "/" when user is authenticated and this page | * Client-side only: redirect to "/" when user is authenticated and this page | ||||
| * was not opened after a 401 (session=expired). Relies on useSearchParams() so | |||||
| * was not opened after a 401 (session=expired). Uses getSession() so it works | |||||
| * without SessionProvider (login page is outside (main)). useSearchParams() so | |||||
| * it works in production where server searchParams can be undefined. | * it works in production where server searchParams can be undefined. | ||||
| */ | */ | ||||
| export default function LoginRedirectIfAuthenticated({ | export default function LoginRedirectIfAuthenticated({ | ||||
| @@ -15,17 +16,26 @@ export default function LoginRedirectIfAuthenticated({ | |||||
| }: { | }: { | ||||
| children: ReactNode; | children: ReactNode; | ||||
| }) { | }) { | ||||
| const { status } = useSession(); | |||||
| const searchParams = useSearchParams(); | const searchParams = useSearchParams(); | ||||
| const router = useRouter(); | const router = useRouter(); | ||||
| const [checked, setChecked] = useState(false); | |||||
| useEffect(() => { | useEffect(() => { | ||||
| if (status !== "authenticated") return; | |||||
| const sessionExpired = searchParams.get("session") === "expired"; | |||||
| if (!sessionExpired) { | |||||
| router.replace("/"); | |||||
| } | |||||
| }, [status, searchParams, router]); | |||||
| let cancelled = false; | |||||
| getSession().then((session) => { | |||||
| if (cancelled) return; | |||||
| setChecked(true); | |||||
| if (!session) return; | |||||
| const sessionExpired = searchParams.get("session") === "expired"; | |||||
| if (!sessionExpired) { | |||||
| router.replace("/"); | |||||
| } | |||||
| }); | |||||
| return () => { | |||||
| cancelled = true; | |||||
| }; | |||||
| }, [searchParams, router]); | |||||
| if (!checked) return <>{children}</>; | |||||
| return <>{children}</>; | return <>{children}</>; | ||||
| } | } | ||||
+ 1
- 1
src/routes.ts
Ver arquivo
| @@ -1,9 +1,9 @@ | |||||
| export const PRIVATE_ROUTES = [ | export const PRIVATE_ROUTES = [ | ||||
| "/analytics", | "/analytics", | ||||
| "/dashboard", | "/dashboard", | ||||
| "/dashboard", | |||||
| "/testing", | "/testing", | ||||
| "/ps", | "/ps", | ||||
| "/bagPrint", | |||||
| "/report", | "/report", | ||||
| "/invoice", | "/invoice", | ||||
| "/projects", | "/projects", | ||||