refactor: Update logout functionality to include API call and error handling; adjust route method to POST

Author: codevoid048

client-test/src/components/Admin/Dashboard.tsx

@@ -112,7 +112,7 @@ export default function Dashboard() {
   // Calculate weekly user registration data from actual database
   useEffect(() => {
     if (users.length > 0) {
-      console.log("Processing weekly user data...", users);
+      // console.log("Processing weekly user data...", users);
 
       // Get the last 7 days
       const today = new Date();
@@ -142,7 +142,7 @@ export default function Dashboard() {
         });
       }
 
-      console.log("Weekly user data calculated:", weeklyData);
+      // console.log("Weekly user data calculated:", weeklyData);
       setUserWeeklyData(weeklyData);
     }
   }, [users]);
@@ -152,7 +152,7 @@ export default function Dashboard() {
     if (users.length > 0) {
       // Create college distribution data
       const collegeDistribution: Record<string, number> = {};
-      console.log(users, "users data in dashboard")
+      // console.log(users, "users data in dashboard")
 
       users.forEach(user => {
         if (user.collegeName) {

client-test/src/components/ErrorBoundary.tsx

@@ -2,6 +2,7 @@ import React, { Component, ErrorInfo, ReactNode } from 'react';
 import { AlertTriangle, RefreshCw, Home } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { navigateTo } from '../lib/axios';
 
 interface Props {
   children: ReactNode;
@@ -58,7 +59,7 @@ export class ErrorBoundary extends Component<Props, State> {
   };
 
   handleGoHome = () => {
-    window.location.href = '/';
+    navigateTo('/');
   };
 
   render() {

client-test/src/context/AdminContext.tsx

@@ -209,8 +209,15 @@ export const useAdminStore = create<AdminState>((set, get) => {
       set({ token, isAdminAuthenticated: true });
     },
 
-    // Logout function to remove token from local storage
-    logout: () => {
+    logout: async () => {
+      try {
+        await axios.post(`${import.meta.env.VITE_API_BASE_URL}/auth/admin/logout`, {}, {
+          withCredentials: true,
+        });
+      } catch (error) {
+        console.error('Admin logout API call failed:', error);
+      }
+      
       localStorage.removeItem("Admintoken");
       set({ token: null, isAdminAuthenticated: false, users: [], pagination: null, filterOptions: null });
     },

client-test/src/context/AuthContext.tsx

@@ -2,6 +2,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import React, { createContext, useState, useEffect, ReactNode } from "react";
 import axios from "axios";
+import { navigateTo } from "../lib/axios";
 // Define the user type
 interface User {
   _id: string;
@@ -85,11 +86,15 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({ children }) => {
       setUser(null);
       setIsAuthenticated(false);
       setToken(null);
-      // localStorage.removeItem('auth_token');
 
-      window.location.href = "/";
+      navigateTo("/");
     } catch (error) {
       console.error("Logout failed:", error);
+      // Even if API call fails, clear local state and redirect
+      setUser(null);
+      setIsAuthenticated(false);
+      setToken(null);
+      navigateTo("/");
     }
   };
 

client-test/src/lib/axios.ts

@@ -18,6 +18,8 @@ const navigateTo = (path: string) => {
   }
 };
 
+export { navigateTo };
+
 // API Error Response interface
 interface ApiErrorResponse {
   message: string;

server/controllers/adminAuthController.js

@@ -96,7 +96,11 @@ export const adminLogout = async (req, res) => {
             ip: req.ip
         });
 
-        res.cookie('Admintoken', "").json({ message: "Logged out" });
+        res.clearCookie('Admintoken', {
+            httpOnly: true,
+            secure: process.env.NODE_ENV === "production",
+            sameSite: process.env.NODE_ENV === "production" ? "Strict" : "Lax",
+        }).status(200).json({ message: "Logged out successfully" });
     } catch (err) {
         auditService.error('Admin logout error', err, {
             requestId: req.auditContext?.requestId,

server/controllers/authController.js

@@ -417,23 +417,37 @@ export const githubAuthCallback = (req, res) => {
 
 
 export const logoutUser = async (req, res) => {
-  // console.log("Logout API hit"); // Debugging log
+  try {
+    auditService.userAction('user_logout', {
+      requestId: req.auditContext?.requestId,
+      userId: req.user?._id?.toString(),
+      email: req.user?.email,
+      ip: req.ip
+    });
 
-  // Clear JWT cookie
-  res.clearCookie("jwt", {
-    httpOnly: true,
-    secure: process.env.NODE_ENV === "production",
-    sameSite: process.env.NODE_ENV === "production" ? "None" : "Lax",
-  });
+    // Clear JWT cookie
+    res.clearCookie("jwt", {
+      httpOnly: true,
+      secure: process.env.NODE_ENV === "production",
+      sameSite: process.env.NODE_ENV === "production" ? "Strict" : "Lax",
+    });
 
-  // Clear user cookie
-  res.clearCookie("user", {
-    httpOnly: true,
-    secure: process.env.NODE_ENV === "production",
-    sameSite: process.env.NODE_ENV === "production" ? "None" : "Lax",
-  });
+    // Clear user cookie
+    res.clearCookie("user", {
+      httpOnly: true,
+      secure: process.env.NODE_ENV === "production",
+      sameSite: process.env.NODE_ENV === "production" ? "Strict" : "Lax",
+    });
 
-  res.status(200).json({ message: "Logged out successfully" });
+    res.status(200).json({ message: "Logged out successfully" });
+  } catch (error) {
+    auditService.error('User logout error', error, {
+      requestId: req.auditContext?.requestId,
+      userId: req.user?._id?.toString(),
+      ip: req.ip
+    });
+    res.status(500).json({ error: "Server error during logout" });
+  }
 };
 
 

server/routes/adminAuthRoutes.js

@@ -8,6 +8,6 @@ router.get('/',(req,res)=>{
     res.send("Admin Route");
 });
 router.post('/login', adminLogin);
-router.get('/logout', protectAdmin, adminLogout);
+router.post('/logout', protectAdmin, adminLogout);
 
 export default router;

server/routes/authRoutes.js

@@ -16,7 +16,7 @@ router.get("/github", passport.authenticate("github", { scope: ["user:email"], s
 router.get("/google/callback", handleGoogleCallback, googleAuthCallback);
 router.get("/github/callback", handleGithubCallback, githubAuthCallback);
 
-router.post("/logout", logoutUser);
+router.post("/logout", protect, logoutUser);
 router.post("/forgot-password", forgotPassword);
 router.post("/reset-password/:token", resetPassword);
 router.get("/me", protect, getCurrentUser);