feat: added redirecting if routing to auth routes

Author: emdevelopa

frontend/src/components/AuthGuard.tsx

@@ -1,31 +1,28 @@
 "use client";
 
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
+import { useRouter, usePathname } from "next/navigation";
+import { useMerchantHydrated, useMerchantSession } from "@/lib/merchant-store";
 
 export default function AuthGuard({ children }: { children: React.ReactNode }) {
+  const hydrated = useMerchantHydrated();
+  const session = useMerchantSession();
+  const router = useRouter();
+  const pathname = usePathname();
+  const [mounted, setMounted] = useState(false);
+
   useEffect(() => {
-    // Component mounted
+    setMounted(true);
   }, []);
 
-  // useEffect(() => {
-  //   const isBypass = typeof window !== "undefined" && 
-  //     (window.location.search.includes("bypass=true") || process.env.NEXT_PUBLIC_DEV_BYPASS === "true");
-
-  //   if (mounted && hydrated && !session && !isBypass) {
-  //     router.push(`/login?callbackUrl=${encodeURIComponent(pathname)}`);
-  //   }
-  // }, [mounted, hydrated, session, router, pathname]);
-
-  // if (!mounted || !hydrated) {
-  //   return null;
-  // }
-
-  // const isBypass = typeof window !== "undefined" && 
-  //   (window.location.search.includes("bypass=true") || process.env.NEXT_PUBLIC_DEV_BYPASS === "true");
+  useEffect(() => {
+    if (mounted && hydrated && !session) {
+      router.push(`/login?callbackUrl=${encodeURIComponent(pathname)}`);
+    }
+  }, [mounted, hydrated, session, router, pathname]);
 
-  // if (!session && !isBypass) {
-  //   return null;
-  // }
+  if (!mounted || !hydrated) return null;
+  if (!session) return null;
 
   return <>{children}</>;
 }

frontend/src/components/MerchantProfileCard.tsx

@@ -42,7 +42,7 @@ export default function MerchantProfileCard() {
   const handleLogout = () => {
     logout();
     setShowDropdown(false);
-    window.location.href = "/";
+    window.location.href = "/login";
   };
 
   return (

frontend/src/lib/merchant-store.ts

@@ -231,8 +231,15 @@ export const useMerchantStore = create<MerchantStore>((set) => ({
   logout: () => {
     if (typeof window !== "undefined") {
       localStorage.removeItem(TOKEN_KEY);
+      localStorage.removeItem(API_KEY_KEY);
+      localStorage.removeItem(MERCHANT_KEY);
     }
-    set({ token: null, session: null });
+    set({
+      token: null,
+      session: null,
+      apiKey: null,
+      merchant: null,
+    });
   },
 }));