Update components/auth-guard.tsx

components/auth-guard.tsx

@@ -1,7 +1,6 @@
 "use client"
 
 import type React from "react"
-
 import { useState, useEffect } from "react"
 import { useRouter, usePathname } from "next/navigation"
 import { ThemeProvider } from "@/components/theme-provider"
@@ -13,46 +12,32 @@ export default function AuthGuard({ children }: { children: React.ReactNode }) {
   const pathname = usePathname()
 
   useEffect(() => {
-    // Check for user data in URL (from Google OAuth)
-    const url = new URL(window.location.href)
-    const userDataParam = url.searchParams.get("userData")
-
-    if (userDataParam) {
+    async function checkAuth() {
       try {
-        const userData = JSON.parse(decodeURIComponent(userDataParam))
-        localStorage.setItem("user", JSON.stringify(userData))
-
-        // Clean URL by removing the userData parameter
-        url.searchParams.delete("userData")
-        window.history.replaceState({}, document.title, url.toString())
+        const response = await fetch(`${process.env.NEXT_PUBLIC_BACKEND_URL}/auth/me`, {
+          credentials: 'include',
+        })
+        if (response.ok) {
+          setIsAuthenticated(true)
+        } else {
+          setIsAuthenticated(false)
+        }
       } catch (error) {
-        console.error("Error parsing user data from URL:", error)
+        console.error('Error checking auth status:', error)
+        setIsAuthenticated(false)
+      } finally {
+        setIsLoading(false)
       }
     }
 
-    // Check if user is authenticated with more robust validation
-    let isAuth = false
-    try {
-      const userStr = localStorage.getItem("user")
-      if (userStr && userStr !== "undefined" && userStr !== "null") {
-        const user = JSON.parse(userStr)
-        // Check if user object has required properties
-        isAuth = !!(user && user.id && user.email)
-      }
-    } catch (error) {
-      console.error("Error parsing user data:", error)
-      localStorage.removeItem("user") // Clear invalid data
-    }
-
-    setIsAuthenticated(isAuth)
-    setIsLoading(false)
+    checkAuth()
+  }, [pathname, router])
 
-    // Simple redirect logic - only redirect if trying to access protected pages while not authenticated
-    // Never redirect away from auth pages - let users access them freely
-    if (!isAuth && pathname && !pathname.startsWith("/auth/") && pathname !== "/") {
-      router.push("/auth/login")
+  useEffect(() => {
+    if (!isLoading && !isAuthenticated && pathname && !pathname.startsWith('/auth/') && pathname !== '/') {
+      router.push('/auth/login')
     }
-  }, [pathname, router])
+  }, [isLoading, isAuthenticated, pathname, router])
 
   if (isLoading) {
     return (
@@ -67,8 +52,6 @@ export default function AuthGuard({ children }: { children: React.ReactNode }) {
     )
   }
 
-  // Always allow access to auth pages and home page
-  // Only protect other pages if not authenticated
   return (
     <ThemeProvider attribute="class" defaultTheme="dark" enableSystem={false} disableTransitionOnChange>
       {children}