From fa423465cb94dbd48997d4a9e572d0211d222232 Mon Sep 17 00:00:00 2001 From: Jonathan Perrault Date: Wed, 29 Jan 2025 08:35:02 +0100 Subject: [PATCH] fix: remove old redirection fix --- .../src/app/(default)/login/LoginRedirect.tsx | 25 ------------------- .../app/(default)/login/RegisterRedirect.tsx | 23 ----------------- packages/app/src/app/(default)/login/page.tsx | 2 -- packages/app/src/app/(default)/page.tsx | 7 ++---- 4 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 packages/app/src/app/(default)/login/LoginRedirect.tsx delete mode 100644 packages/app/src/app/(default)/login/RegisterRedirect.tsx diff --git a/packages/app/src/app/(default)/login/LoginRedirect.tsx b/packages/app/src/app/(default)/login/LoginRedirect.tsx deleted file mode 100644 index b921ed8eb..000000000 --- a/packages/app/src/app/(default)/login/LoginRedirect.tsx +++ /dev/null @@ -1,25 +0,0 @@ -"use client"; - -import { useRouter } from "next/navigation"; -import { type Session } from "next-auth"; -import { useEffect } from "react"; - -interface LoginRedirectProps { - session: Session | null; -} - -export function LoginRedirect({ session }: LoginRedirectProps) { - const router = useRouter(); - - useEffect(() => { - const savedCallbackUrl = localStorage.getItem("egapro_callback_url"); - console.log("savedCallbackUrl", savedCallbackUrl); - console.log("session", session); - if (session?.user && savedCallbackUrl) { - localStorage.removeItem("egapro_callback_url"); - router.push(savedCallbackUrl); - } else return router.push("/"); - }, [session, router]); - - return null; -} diff --git a/packages/app/src/app/(default)/login/RegisterRedirect.tsx b/packages/app/src/app/(default)/login/RegisterRedirect.tsx deleted file mode 100644 index f348fcaab..000000000 --- a/packages/app/src/app/(default)/login/RegisterRedirect.tsx +++ /dev/null @@ -1,23 +0,0 @@ -"use client"; - -import { useEffect } from "react"; - -interface RegisterRedirectProps { - callbackUrl: string; -} - -export function RegisterRedirect({ callbackUrl }: RegisterRedirectProps) { - useEffect(() => { - if (callbackUrl) { - const callbackUrlObj = new URL(callbackUrl); - const currentOrigin = window.location.origin; - - if (callbackUrlObj.origin !== currentOrigin) { - console.log("Invalid callback URL:", callbackUrl); - localStorage.setItem("egapro_callback_url", callbackUrlObj.pathname); - } - } - }, [callbackUrl]); - - return null; -} diff --git a/packages/app/src/app/(default)/login/page.tsx b/packages/app/src/app/(default)/login/page.tsx index 7f38f4ad9..1078ae01f 100644 --- a/packages/app/src/app/(default)/login/page.tsx +++ b/packages/app/src/app/(default)/login/page.tsx @@ -8,7 +8,6 @@ import { getServerSession } from "next-auth"; import { EmailLogin } from "./EmailLogin"; import { GithubLogin } from "./GithubLogin"; import { ProConnectLogin } from "./ProConnectLogin"; -import { RegisterRedirect } from "./RegisterRedirect"; const title = "Connexion"; @@ -43,7 +42,6 @@ const LoginPage = async ({ searchParams }: NextServerPageProps -

{title}

{session?.user ? ( diff --git a/packages/app/src/app/(default)/page.tsx b/packages/app/src/app/(default)/page.tsx index ffdff54d9..50c0db856 100644 --- a/packages/app/src/app/(default)/page.tsx +++ b/packages/app/src/app/(default)/page.tsx @@ -1,17 +1,14 @@ -import { authConfig } from "@api/core-domain/infra/auth/config"; import ButtonsGroup from "@codegouvfr/react-dsfr/ButtonsGroup"; import Card from "@codegouvfr/react-dsfr/Card"; import { Box, Container, Grid, GridCol, Heading, ImgHome } from "@design-system"; -import { getServerSession } from "next-auth"; import styles from "./index.module.css"; -import { LoginRedirect } from "./login/LoginRedirect"; + +export const dynamic = "force-static"; const Home = async () => { - const session = await getServerSession(authConfig); return ( <> -