From 7df01f836282cb5484d70ade6474e68ce2eb8cac Mon Sep 17 00:00:00 2001
From: Fred <98240+farnoux@users.noreply.github.com>
Date: Mon, 10 Feb 2025 15:43:35 +0100
Subject: [PATCH] fix

---
 packages/auth/app/login/page.tsx         |  5 +++
 packages/auth/src/supabase/middleware.ts | 56 ++++++++++++------------
 packages/auth/src/supabase/server.ts     | 20 ---------
 3 files changed, 33 insertions(+), 48 deletions(-)
 delete mode 100644 packages/auth/src/supabase/server.ts

diff --git a/packages/auth/app/login/page.tsx b/packages/auth/app/login/page.tsx
index 73a0bd78b1..497d26d33a 100644
--- a/packages/auth/app/login/page.tsx
+++ b/packages/auth/app/login/page.tsx
@@ -1,3 +1,4 @@
+import { createClient } from '@/api/utils/supabase/server-client';
 import { LoginPageClient } from './page.client';
 
 /**
@@ -19,6 +20,10 @@ export default async function LoginPage({
 }) {
   const { view, email, otp, redirect_to } = await searchParams;
 
+  // Log out to clear old auth cookie
+  const supabase = await createClient();
+  await supabase.auth.signOut();
+
   return (
     <LoginPageClient
       view={view}
diff --git a/packages/auth/src/supabase/middleware.ts b/packages/auth/src/supabase/middleware.ts
index 5b66ba8e1a..1ef52dbb55 100644
--- a/packages/auth/src/supabase/middleware.ts
+++ b/packages/auth/src/supabase/middleware.ts
@@ -71,34 +71,34 @@ export async function updateSessionOrRedirect(request: NextRequest) {
 
   // For all other cases → redirect to the app
 
-  if (url.hostname.endsWith('.territoiresentransitions.fr')) {
-    const cookiesToDelete = request.cookies
-      .getAll()
-      .filter(
-        (cookie) =>
-          cookie.name.startsWith('sb-') && !cookie.name.startsWith('sb-tet')
-      );
-
-    if (cookiesToDelete.length > 0) {
-      cookiesToDelete.forEach((cookie) => {
-        // supabaseResponse.cookies.delete({
-        //   name: cookie.name,
-        //   domain: `.${url.hostname}`,
-        // });
-
-        supabaseResponse.cookies.set(cookie.name, cookie.value, {
-          domain: `.${getRootDomain(url.hostname)}`,
-          path: '/',
-          // expires: new Date(0),
-          maxAge: 100000000,
-          secure: process.env.NODE_ENV === 'production',
-          sameSite: 'lax',
-        });
-      });
-
-      // return supabaseResponse;
-    }
-  }
+  // if (url.hostname.endsWith('.territoiresentransitions.fr')) {
+  //   const cookiesToDelete = request.cookies
+  //     .getAll()
+  //     .filter(
+  //       (cookie) =>
+  //         cookie.name.startsWith('sb-') && !cookie.name.startsWith('sb-tet')
+  //     );
+
+  //   if (cookiesToDelete.length > 0) {
+  //     cookiesToDelete.forEach((cookie) => {
+  //       // supabaseResponse.cookies.delete({
+  //       //   name: cookie.name,
+  //       //   domain: `.${url.hostname}`,
+  //       // });
+
+  //       supabaseResponse.cookies.set(cookie.name, cookie.value, {
+  //         domain: `.${getRootDomain(url.hostname)}`,
+  //         path: '/',
+  //         // expires: new Date(0),
+  //         maxAge: 100000000,
+  //         secure: process.env.NODE_ENV === 'production',
+  //         sameSite: 'lax',
+  //       });
+  //     });
+
+  //     // return supabaseResponse;
+  //   }
+  // }
 
   const searchParams = url.searchParams;
   const redirectTo = searchParams.get('redirect_to');
diff --git a/packages/auth/src/supabase/server.ts b/packages/auth/src/supabase/server.ts
deleted file mode 100644
index 24bba8ae7b..0000000000
--- a/packages/auth/src/supabase/server.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Database } from '@/api';
-import { createServerClient } from '@supabase/ssr';
-import { cookies } from 'next/headers';
-
-/**
- * Pour accéder à supabase depuis les composants serveur
- */
-export function createClient(cookieStore: ReturnType<typeof cookies>) {
-  return createServerClient<Database>(
-    process.env.NEXT_PUBLIC_SUPABASE_URL!,
-    process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
-    {
-      cookies: {
-        get(name: string) {
-          return cookieStore.get(name)?.value;
-        },
-      },
-    }
-  );
-}