From 2efb3c6a62c1d3fa1cbf894431a2dfe7fd00b3da Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Thu, 5 Jun 2025 11:01:35 +0200
Subject: [PATCH] logout redirects

---
 apps/login/src/components/sessions-clear-list.tsx | 8 +++++++-
 apps/login/src/lib/cookies.ts                     | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/login/src/components/sessions-clear-list.tsx b/apps/login/src/components/sessions-clear-list.tsx
index 56711cc6dd..901dc7489f 100644
--- a/apps/login/src/components/sessions-clear-list.tsx
+++ b/apps/login/src/components/sessions-clear-list.tsx
@@ -27,6 +27,7 @@ export function SessionsClearList({
   const router = useRouter();
 
   async function clearHintedSession() {
+    console.log("Clearing session for login hint:", loginHint);
     // If a login hint is provided, we logout that specific session
     const sessionIdToBeCleared = sessions.find((session) => {
       return session.factors?.user?.loginName === loginHint;
@@ -35,6 +36,9 @@ export function SessionsClearList({
     if (sessionIdToBeCleared) {
       const clearSessionResponse = await clearSession({
         sessionId: sessionIdToBeCleared,
+      }).catch((error) => {
+        console.error("Error clearing session:", error);
+        return;
       });
 
       if (!clearSessionResponse) {
@@ -58,7 +62,9 @@ export function SessionsClearList({
   }
 
   useEffect(() => {
-    clearHintedSession();
+    if (loginHint) {
+      clearHintedSession();
+    }
   }, []);
 
   return sessions ? (
diff --git a/apps/login/src/lib/cookies.ts b/apps/login/src/lib/cookies.ts
index 28393f1321..7de87a98e7 100644
--- a/apps/login/src/lib/cookies.ts
+++ b/apps/login/src/lib/cookies.ts
@@ -141,7 +141,7 @@ export async function removeSessionFromCookie<T>({
   session: SessionCookie<T>;
   cleanup?: boolean;
   sameSite?: boolean | "lax" | "strict" | "none" | undefined;
-}): Promise<any> {
+}) {
   const cookiesList = await cookies();
   const stringifiedCookie = cookiesList.get("sessions");