nextauthz 1.3.21 → 1.3.22

package/dist/index.js

@@ -46,11 +46,12 @@ var useAuthStore = (0, import_zustand.create)((set) => ({
   setAuthChecked: (checked) => set({ isAuthChecked: checked }),
   setLoading: (loading) => set({ loading }),
   setError: (err) => set({ error: err }),
-  resetAuth: () => set({
+  resetAuth: (logout = false) => set({
     user: null,
     role: null,
     isAuthenticated: false,
-    isAuthChecked: false,
+    isAuthChecked: logout ? true : false,
+    // ✅ true if logout, false if initial load failed
     loading: false,
     error: null
   })
@@ -111,8 +112,6 @@ function createAuthContext(option) {
     };
     const logout = () => {
       manager.clearTokens();
-      setAuth(false);
-      setAuthChecked(true);
       resetAuth();
     };
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
@@ -162,7 +161,10 @@ var AuthGuard = ({
     }
   }, [isAuthenticated, isAuthChecked, redirectTo, router]);
   if (!isAuthChecked) return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_jsx_runtime2.Fragment, { children: fallback });
-  if (!isAuthenticated) return null;
+  if (!isAuthenticated) {
+    router.replace(redirectTo);
+    return null;
+  }
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_jsx_runtime2.Fragment, { children });
 };
 var AuthGuard_default = AuthGuard;
@@ -178,7 +180,7 @@ var RoleGuard = ({
   fallback = null
 }) => {
   const router = (0, import_navigation2.useRouter)();
-  const { role, isAuthChecked } = useAuthStore();
+  const { role, isAuthChecked, isAuthenticated } = useAuthStore();
   (0, import_react3.useEffect)(() => {
     if (!isAuthChecked) return;
     if (!role || !allowedRoles.includes(role)) {
@@ -186,6 +188,10 @@ var RoleGuard = ({
     }
   }, [role, isAuthChecked, allowedRoles, redirectTo, router]);
   if (!isAuthChecked) return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, { children: fallback });
+  if (!isAuthenticated) {
+    router.replace(redirectTo);
+    return null;
+  }
   if (!role || !allowedRoles.includes(role)) return null;
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, { children });
 };

package/dist/index.mjs

@@ -19,11 +19,12 @@ var useAuthStore = create((set) => ({
   setAuthChecked: (checked) => set({ isAuthChecked: checked }),
   setLoading: (loading) => set({ loading }),
   setError: (err) => set({ error: err }),
-  resetAuth: () => set({
+  resetAuth: (logout = false) => set({
     user: null,
     role: null,
     isAuthenticated: false,
-    isAuthChecked: false,
+    isAuthChecked: logout ? true : false,
+    // ✅ true if logout, false if initial load failed
     loading: false,
     error: null
   })
@@ -84,8 +85,6 @@ function createAuthContext(option) {
     };
     const logout = () => {
       manager.clearTokens();
-      setAuth(false);
-      setAuthChecked(true);
       resetAuth();
     };
     return /* @__PURE__ */ jsx(
@@ -135,7 +134,10 @@ var AuthGuard = ({
     }
   }, [isAuthenticated, isAuthChecked, redirectTo, router]);
   if (!isAuthChecked) return /* @__PURE__ */ jsx2(Fragment, { children: fallback });
-  if (!isAuthenticated) return null;
+  if (!isAuthenticated) {
+    router.replace(redirectTo);
+    return null;
+  }
   return /* @__PURE__ */ jsx2(Fragment, { children });
 };
 var AuthGuard_default = AuthGuard;
@@ -151,7 +153,7 @@ var RoleGuard = ({
   fallback = null
 }) => {
   const router = useRouter2();
-  const { role, isAuthChecked } = useAuthStore();
+  const { role, isAuthChecked, isAuthenticated } = useAuthStore();
   useEffect3(() => {
     if (!isAuthChecked) return;
     if (!role || !allowedRoles.includes(role)) {
@@ -159,6 +161,10 @@ var RoleGuard = ({
     }
   }, [role, isAuthChecked, allowedRoles, redirectTo, router]);
   if (!isAuthChecked) return /* @__PURE__ */ jsx3(Fragment2, { children: fallback });
+  if (!isAuthenticated) {
+    router.replace(redirectTo);
+    return null;
+  }
   if (!role || !allowedRoles.includes(role)) return null;
   return /* @__PURE__ */ jsx3(Fragment2, { children });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextauthz",
-  "version": "1.3.21",
+  "version": "1.3.22",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/AuthGuard.tsx

@@ -29,7 +29,11 @@ const AuthGuard = ({
 
   if (!isAuthChecked) return <>{fallback}</>
 
-  if (!isAuthenticated) return null
+  if (!isAuthenticated) {
+    router.replace(redirectTo)
+    return null
+  }
+  
 
   return <>{children}</>
 }

package/src/AuthProvider.tsx

@@ -104,8 +104,6 @@ export function createAuthContext<UserType extends User = User>(option?: {
 
     const logout = () => {
       manager.clearTokens()
-      setAuth(false);
-      setAuthChecked(true); // mark that auth is now checked
       resetAuth()
     }
 

package/src/RoleGuard.tsx

@@ -18,7 +18,7 @@ const RoleGuard = ({
   fallback = null,
 }: RoleGuardProps) => {
   const router = useRouter()
-  const { role, isAuthChecked } = useAuthStore()
+  const { role, isAuthChecked, isAuthenticated } = useAuthStore()
 
   useEffect(() => {
     if (!isAuthChecked) return
@@ -29,9 +29,14 @@ const RoleGuard = ({
     }
   }, [role, isAuthChecked, allowedRoles, redirectTo, router])
 
-  // Show fallback while loading
   if (!isAuthChecked) return <>{fallback}</>
 
+  if (!isAuthenticated) {
+    router.replace(redirectTo)
+    return null
+  }
+  
+
   // Block rendering if role is not allowed
   if (!role || !allowedRoles.includes(role)) return null
 

package/store/useGuardStore.ts

@@ -41,13 +41,13 @@ export const useAuthStore = create<AuthState>((set) => ({
   setLoading: (loading) => set({ loading }),
   setError: (err) => set({ error: err }),
 
-  resetAuth: () =>
+  resetAuth: (logout = false) =>
     set({
       user: null,
       role: null,
       isAuthenticated: false,
-      isAuthChecked: false,
+      isAuthChecked: logout ? true : false, // ✅ true if logout, false if initial load failed
       loading: false,
       error: null,
-    }),
+    }),  
 }))