fix: redirection login

SocialGouv · Jan 20, 2025 · 412914f · 412914f
1 parent bf0c606
commit 412914f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/packages/app/src/app/(default)/layout.tsx b/packages/app/src/app/(default)/layout.tsx
@@ -1,15 +1,20 @@
+import { authConfig } from "@api/core-domain/infra/auth/config";
+import { getServerSession } from "next-auth";
 import { type PropsWithChildren } from "react";
 
 import { Footer } from "../Footer";
 import { Header } from "../Header";
 // TODO watch https://github.com/vercel/next.js/discussions/49607
 // for resolution of "[css url] was preloaded using link preload but not used within a few seconds from the window's load event." warning in dev mode
 import styles from "./default.module.css";
+import { LoginRedirect } from "./login/LoginRedirect";
 import { Navigation } from "./Navigation";
 
 const DefaultLayout = async ({ children }: PropsWithChildren) => {
+  const session = await getServerSession(authConfig);
   return (
     <div className={styles.app}>
+      <LoginRedirect session={session} />
       <Header auth navigation={<Navigation />} />
       <main role="main" id="content" className={styles.content}>
         {children}

diff --git a/packages/app/src/app/(default)/login/LoginRedirect.tsx b/packages/app/src/app/(default)/login/LoginRedirect.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { useRouter } from "next/navigation";
 import { type Session } from "next-auth";
 import { useEffect } from "react";
 
@@ -15,25 +16,32 @@ function getUriFromUrl(urlString: string): string {
 }
 
 interface LoginRedirectProps {
-  callbackUrl: string;
+  callbackUrl?: string;
   session: Session | null;
 }
 
 export function LoginRedirect({ session, callbackUrl }: LoginRedirectProps) {
+  const router = useRouter();
+
   useEffect(() => {
     if (callbackUrl) {
-      localStorage.setItem("egapro_callback_url", 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", callbackUrl);
+      }
     }
   }, [callbackUrl]);
 
   useEffect(() => {
-    if (session?.user) {
-      const savedCallbackUrl = localStorage.getItem("egapro_callback_url");
+    const savedCallbackUrl = localStorage.getItem("egapro_callback_url");
+    if (session?.user && savedCallbackUrl) {
       const redirectUrl = savedCallbackUrl ? getUriFromUrl(savedCallbackUrl) : "/";
       localStorage.removeItem("egapro_callback_url");
-      window.location.href = redirectUrl;
+      router.push(redirectUrl);
     }
-  }, [session?.user]);
+  }, [session?.user, router]);
 
   return null;
 }
diff --git a/packages/app/src/app/(default)/login/page.tsx b/packages/app/src/app/(default)/login/page.tsx
@@ -7,6 +7,7 @@ import { getServerSession } from "next-auth";
 
 import { EmailLogin } from "./EmailLogin";
 import { GithubLogin } from "./GithubLogin";
+import { LoginRedirect } from "./LoginRedirect";
 import { ProConnectLogin } from "./ProConnectLogin";
 
 const title = "Connexion";
@@ -42,7 +43,7 @@ const LoginPage = async ({ searchParams }: NextServerPageProps<never, "callbackU
 
   return (
     <CenteredContainer py="6w">
-      {/*<LoginRedirect session={session} callbackUrl={callbackUrl} />*/}
+      <LoginRedirect session={session} callbackUrl={callbackUrl} />
       <h1>{title}</h1>
       {session?.user ? (
         <Alert severity="success" title={session?.user.email} description="Vous êtes déjà connecté·e." />