From b49b07fdd6aa2e5b87b8b2a63879dcc7a67dd116 Mon Sep 17 00:00:00 2001
From: pradeepkumar <kongupradeep@live.com>
Date: Sun, 8 Mar 2026 12:06:07 +0530
Subject: [PATCH] fix: robust logout session clearing with cookie cleanup and
 isLoggingOut guard

- Clear next-auth session cookies directly as backup in logout page
- Add isLoggingOut localStorage flag to prevent TokenSync/PresenceProvider from restoring tokens
- Clear isLoggingOut flag on login page load as safety net
- Add createdAt to AgentSubscription interface (fixes build error)
- Add /education to public routes in middleware
---
 src/app/(auth)/login/page.tsx                 |  5 +++
 src/app/logout/page.tsx                       | 44 +++++++++++++++----
 src/components/layout/CommonHeader.tsx        |  3 ++
 src/components/message/ChatHeader.tsx         | 12 ++---
 src/components/message/MessageInput.tsx       |  1 +
 .../providers/presence-provider.tsx           |  6 +++
 src/components/providers/session-provider.tsx |  5 ++-
 src/middleware.ts                             |  2 +-
 src/services/api.ts                           |  2 +
 src/services/stripe.service.ts                |  1 +
 10 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/src/app/(auth)/login/page.tsx b/src/app/(auth)/login/page.tsx
index 8654103..5d953b3 100644
--- a/src/app/(auth)/login/page.tsx
+++ b/src/app/(auth)/login/page.tsx
@@ -13,6 +13,11 @@ export default function LoginPage() {
   const [error, setError] = useState('');
   const [loading, setLoading] = useState(false);
 
+  // Safety net: clear logout flag when login page loads
+  if (typeof window !== 'undefined') {
+    localStorage.removeItem('isLoggingOut');
+  }
+
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
     setLoading(true);
diff --git a/src/app/logout/page.tsx b/src/app/logout/page.tsx
index 5b39e3f..942efa6 100644
--- a/src/app/logout/page.tsx
+++ b/src/app/logout/page.tsx
@@ -3,6 +3,25 @@
 import { useEffect, useRef } from 'react';
 import { signOut } from 'next-auth/react';
 
+function clearAuthCookies() {
+  // Clear next-auth v5 (Auth.js) and v4 session cookies directly
+  const cookieNames = [
+    'authjs.session-token',
+    '__Secure-authjs.session-token',
+    'authjs.callback-url',
+    'authjs.csrf-token',
+    'next-auth.session-token',
+    '__Secure-next-auth.session-token',
+    'next-auth.callback-url',
+    'next-auth.csrf-token',
+  ];
+
+  cookieNames.forEach((name) => {
+    document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/`;
+    document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=${window.location.hostname}`;
+  });
+}
+
 export default function LogoutPage() {
   const hasStarted = useRef(false);
 
@@ -10,24 +29,31 @@ export default function LogoutPage() {
     if (hasStarted.current) return;
     hasStarted.current = true;
 
+    // Ensure logout flag is set (prevents TokenSync and PresenceProvider from restoring tokens)
+    localStorage.setItem('isLoggingOut', 'true');
+
     // Clear localStorage tokens
     localStorage.removeItem('accessToken');
     localStorage.removeItem('refreshToken');
     localStorage.removeItem('user');
 
+    // Clear auth cookies directly as a robust backup
+    clearAuthCookies();
+
+    const redirectToLogin = () => {
+      clearAuthCookies();
+      // Clear the logout flag right before redirecting
+      localStorage.removeItem('isLoggingOut');
+      window.location.href = '/login';
+    };
+
     // Sign out via NextAuth (clears session cookie), then manually redirect
     signOut({ redirect: false })
-      .then(() => {
-        window.location.href = '/login';
-      })
-      .catch(() => {
-        window.location.href = '/login';
-      });
+      .then(redirectToLogin)
+      .catch(redirectToLogin);
 
     // Safety fallback - if signOut hangs, redirect after 3 seconds
-    setTimeout(() => {
-      window.location.href = '/login';
-    }, 3000);
+    setTimeout(redirectToLogin, 3000);
   }, []);
 
   return (
diff --git a/src/components/layout/CommonHeader.tsx b/src/components/layout/CommonHeader.tsx
index 81830ec..20aae1b 100644
--- a/src/components/layout/CommonHeader.tsx
+++ b/src/components/layout/CommonHeader.tsx
@@ -280,6 +280,9 @@ export function CommonHeader() {
                     <button
                       onClick={() => {
                         setShowProfileMenu(false);
+                        // Set logout flag FIRST so TokenSync and PresenceProvider
+                        // don't restore tokens during the logout navigation
+                        localStorage.setItem('isLoggingOut', 'true');
                         localStorage.removeItem('accessToken');
                         localStorage.removeItem('refreshToken');
                         localStorage.removeItem('user');
diff --git a/src/components/message/ChatHeader.tsx b/src/components/message/ChatHeader.tsx
index c41739d..347ac5c 100644
--- a/src/components/message/ChatHeader.tsx
+++ b/src/components/message/ChatHeader.tsx
@@ -29,15 +29,15 @@ export function ChatHeader({
     <div className="border-b border-[#00293d]/10 pb-4">
       {/* Top row - Name, status, actions */}
       <div className="flex items-center justify-between mb-3">
-        <div className="flex items-center gap-2">
-          <h2 className="font-fractul font-bold text-[14px] leading-[17px] text-[#00293D]">
+        <div className="flex items-center gap-2 min-w-0 flex-1">
+          <h2 className="font-fractul font-bold text-[14px] leading-[17px] text-[#00293D] truncate">
             {name}
           </h2>
-          <span className={`w-2.5 h-2.5 rounded-full ${isOnline ? 'bg-green-500' : 'bg-gray-400'}`} />
-          <span className="font-serif font-normal text-[14px] leading-[19px] text-[#00293D]">
+          <span className={`w-2.5 h-2.5 rounded-full flex-shrink-0 ${isOnline ? 'bg-green-500' : 'bg-gray-400'}`} />
+          <span className="font-serif font-normal text-[14px] leading-[19px] text-[#00293D] hidden sm:inline">
             {role}
           </span>
-          <span className="font-serif font-normal text-[14px] leading-[19px] text-[#00293D]">
+          <span className="font-serif font-normal text-[14px] leading-[19px] text-[#00293D] hidden sm:inline">
             {isTyping ? (
               <span className="text-[#e58625] italic">{typingText}</span>
             ) : (
@@ -45,7 +45,7 @@ export function ChatHeader({
             )}
           </span>
         </div>
-        <div className="flex items-center gap-2">
+        <div className="flex items-center gap-2 flex-shrink-0">
           <button className="p-2 hover:bg-gray-100 rounded-lg transition-colors cursor-pointer">
             <Image
               src="/assets/icons/three-dots-horizontal-icon.svg"
diff --git a/src/components/message/MessageInput.tsx b/src/components/message/MessageInput.tsx
index 9b83999..00c09d8 100644
--- a/src/components/message/MessageInput.tsx
+++ b/src/components/message/MessageInput.tsx
@@ -9,6 +9,7 @@ import { Grid } from '@giphy/react-components';
 
 const gf = new GiphyFetch(process.env.NEXT_PUBLIC_GIPHY_API_KEY || '');
 
+
 interface AttachedFile {
   file: File;
   preview?: string; // Object URL for image preview
diff --git a/src/components/providers/presence-provider.tsx b/src/components/providers/presence-provider.tsx
index d0581ee..ef73687 100644
--- a/src/components/providers/presence-provider.tsx
+++ b/src/components/providers/presence-provider.tsx
@@ -75,6 +75,12 @@ export function PresenceProvider({ children }: { children: React.ReactNode }) {
   // Handle auth errors (token expiry) — single global handler
   useEffect(() => {
     const unsubscribe = socketService.onAuthError(async () => {
+      // Skip token refresh if logout is in progress
+      if (typeof window !== 'undefined' && localStorage.getItem('isLoggingOut') === 'true') {
+        console.log('[Presence] Auth error during logout, skipping refresh');
+        return;
+      }
+
       console.log('[Presence] Auth error, refreshing token...');
       try {
         const refreshToken = localStorage.getItem('refreshToken');
diff --git a/src/components/providers/session-provider.tsx b/src/components/providers/session-provider.tsx
index 6d6ea34..d5b1c26 100644
--- a/src/components/providers/session-provider.tsx
+++ b/src/components/providers/session-provider.tsx
@@ -9,7 +9,10 @@ function TokenSync() {
   const hasInitialized = useRef(false);
 
   useEffect(() => {
-    if (status === "authenticated" && session?.user) {
+    // Never restore tokens if a logout is in progress
+    const loggingOut = localStorage.getItem("isLoggingOut") === "true";
+
+    if (status === "authenticated" && session?.user && !loggingOut) {
       const user = session.user as { accessToken?: string; refreshToken?: string };
 
       // Only sync tokens from NextAuth to localStorage if:
diff --git a/src/middleware.ts b/src/middleware.ts
index b0a3aec..39552d6 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -5,7 +5,7 @@ import { NextResponse } from "next/server";
 const authRoutes = ["/login", "/signup", "/forgot-password", "/reset-password", "/verify-email"];
 
 // Public routes - accessible to everyone (logged in or not)
-const publicRoutes = ["/", "/contact", "/about", "/faq", "/logout", "/user/dashboard", "/user/profiles", "/user/profile"];
+const publicRoutes = ["/", "/contact", "/about", "/faq", "/education", "/logout", "/user/dashboard", "/user/profiles", "/user/profile"];
 
 export default auth((req) => {
   const { nextUrl } = req;
diff --git a/src/services/api.ts b/src/services/api.ts
index 146259a..64cde76 100644
--- a/src/services/api.ts
+++ b/src/services/api.ts
@@ -33,6 +33,8 @@ const forceLogout = () => {
   if (isLoggingOut) return; // Prevent multiple redirects
   isLoggingOut = true;
   if (typeof window !== 'undefined') {
+    // Set flag first so TokenSync/PresenceProvider don't restore tokens
+    localStorage.setItem('isLoggingOut', 'true');
     localStorage.removeItem('accessToken');
     localStorage.removeItem('refreshToken');
     localStorage.removeItem('user');
diff --git a/src/services/stripe.service.ts b/src/services/stripe.service.ts
index 588ff7d..9f58012 100644
--- a/src/services/stripe.service.ts
+++ b/src/services/stripe.service.ts
@@ -24,6 +24,7 @@ export interface AgentSubscription {
   currentPeriodEnd: string | null;
   cancelAtPeriodEnd: boolean;
   canceledAt: string | null;
+  createdAt: string;
   plan: SubscriptionPlan;
 }