refactor(old app): login migration to new app

lstV2/frontend/src/hooks/useLogout.ts

@@ -1,16 +1,19 @@
-import {useSessionStore} from "@/lib/store/sessionStore";
-import {useRouter} from "@tanstack/react-router";
+import { useRouter } from "@tanstack/react-router";
+import { useSessionStore } from "@/lib/store/sessionStore";
+import { useAuthStore } from "@/lib/store/useAuthStore";
 
 export const useLogout = () => {
-    const {clearSession} = useSessionStore();
-    const router = useRouter();
-    const logout = async () => {
-        router.invalidate();
-        router.clearCache();
-        clearSession();
+	const { clearSession } = useSessionStore();
+	const { clearUser } = useAuthStore();
+	const router = useRouter();
+	const logout = async () => {
+		router.invalidate();
+		router.clearCache();
+		clearSession();
+		clearUser();
 
-        window.location.reload();
-    };
+		window.location.reload();
+	};
 
-    return logout;
+	return logout;
 };

lstV2/frontend/src/hooks/useSession.ts

@@ -1,60 +1,87 @@
 import { useQuery } from "@tanstack/react-query";
-import { useSessionStore } from "../lib/store/sessionStore";
+import axios from "axios";
 import { useEffect } from "react";
+import { useSessionStore } from "../lib/store/sessionStore";
 
 const fetchSession = async () => {
-    const token = localStorage.getItem("auth_token");
+	const token = localStorage.getItem("auth_token");
 
-    if (!token) {
-        throw new Error("No token found");
-    }
+	if (!token) {
+		throw new Error("No token found");
+	}
+	try {
+		const res = await axios.get("/api/auth/session", {
+			headers: {
+				"Content-Type": "application/json",
+			},
+			withCredentials: true,
+		});
 
-    const res = await fetch("/api/auth/session", {
-        headers: {
-            "Content-Type": "application/json",
-            Authorization: `Bearer ${token}`,
-        },
-    });
-    // console.log(res);
-    if (!res.ok) {
-        localStorage.removeItem("auth_token");
-        // remove these for a while if no session just until fully to 2.0 and clearly no one has ran lstv1 in a long time
-        localStorage.removeItem("ally-supports-cache");
-        localStorage.removeItem("auth-storage");
-        localStorage.removeItem("nextauth.message");
-        localStorage.removeItem("prod");
+		if (res.status === 401) {
+			localStorage.removeItem("auth_token");
+			// remove these for a while if no session just until fully to 2.0 and clearly no one has ran lstv1 in a long time
+			localStorage.removeItem("ally-supports-cache");
+			localStorage.removeItem("auth-storage");
+			localStorage.removeItem("nextauth.message");
+			localStorage.removeItem("prod");
 
-        throw new Error("Session not found");
-    }
+			throw new Error("Session not found");
+		}
 
-    return res.json();
+		const userRoles = await axios.get("/api/auth/getuseraccess", {
+			withCredentials: true,
+		});
+
+		const userData = {
+			...res.data,
+			data: {
+				...res.data.data,
+				user: {
+					...res.data.data.user,
+					roles: userRoles.data.data,
+				},
+				token: "Just a token as this will be removed in the future",
+			},
+		};
+
+		return userData;
+	} catch (error) {
+		localStorage.removeItem("auth_token");
+		// remove these for a while if no session just until fully to 2.0 and clearly no one has ran lstv1 in a long time
+		localStorage.removeItem("ally-supports-cache");
+		localStorage.removeItem("auth-storage");
+		localStorage.removeItem("nextauth.message");
+		localStorage.removeItem("prod");
+
+		throw new Error("Session not found");
+	}
 };
 
 export const useSession = () => {
-    const { setSession, clearSession, token } = useSessionStore();
+	const { setSession, clearSession, token } = useSessionStore();
 
-    // Fetch session only if token is available
-    const { data, status, error } = useQuery({
-        queryKey: ["session"],
-        queryFn: fetchSession,
-        enabled: !!token, // Prevents query if token is null
-        staleTime: 60 * 1000,
-        gcTime: 10 * 60 * 1000, // 10 mins
-        refetchOnWindowFocus: true,
-        //refetchInterval: 1000 * 60 * 2, // Auto-refetch every 2 minutes
-    });
-    useEffect(() => {
-        if (data) {
-            setSession(data.data.user, data.data.token);
-        }
-        if (error) {
-            clearSession();
-        }
-    }, [data, error]);
+	// Fetch session only if token is available
+	const { data, status, error } = useQuery({
+		queryKey: ["session"],
+		queryFn: fetchSession,
+		enabled: !!token, // Prevents query if token is null
+		staleTime: 60 * 1000,
+		//gcTime: 10 * 60 * 1000, // 10 mins
+		refetchOnWindowFocus: true,
+		refetchInterval: 1000 * 60 * 2, // Auto-refetch every 2 minutes
+	});
+	useEffect(() => {
+		if (data) {
+			setSession(data.data.user, data.data.token);
+		}
+		if (error) {
+			clearSession();
+		}
+	}, [data, error]);
 
-    return {
-        session: data && token ? { user: data.user, token: data.token } : null,
-        status,
-        error,
-    };
+	return {
+		session: data && token ? { user: data.user, token: data.token } : null,
+		status,
+		error,
+	};
 };