nextauthz 1.3.24 → 1.3.26

package/dist/index.d.mts

@@ -29,8 +29,9 @@ type RoleGuardProps = {
     allowedRoles: string[];
     redirectTo?: string;
     fallback?: React__default.ReactNode;
+    roleProp?: string;
 };
-declare const RoleGuard: ({ children, allowedRoles, redirectTo, fallback, }: RoleGuardProps) => react_jsx_runtime.JSX.Element | null;
+declare const RoleGuard: ({ children, allowedRoles, redirectTo, fallback, roleProp, }: RoleGuardProps) => react_jsx_runtime.JSX.Element | null;
 
 type User = Record<string, any>;
 /**

package/dist/index.d.ts

@@ -29,8 +29,9 @@ type RoleGuardProps = {
     allowedRoles: string[];
     redirectTo?: string;
     fallback?: React__default.ReactNode;
+    roleProp?: string;
 };
-declare const RoleGuard: ({ children, allowedRoles, redirectTo, fallback, }: RoleGuardProps) => react_jsx_runtime.JSX.Element | null;
+declare const RoleGuard: ({ children, allowedRoles, redirectTo, fallback, roleProp, }: RoleGuardProps) => react_jsx_runtime.JSX.Element | null;
 
 type User = Record<string, any>;
 /**

package/dist/index.js

@@ -178,22 +178,29 @@ var RoleGuard = ({
   children,
   allowedRoles,
   redirectTo = "/unauthorized",
-  fallback = null
+  fallback = null,
+  roleProp
 }) => {
   const router = (0, import_navigation2.useRouter)();
-  const { role, isAuthChecked, isAuthenticated } = useAuthStore();
+  const { role: storeRole, setRole, isAuthChecked, isAuthenticated, user } = useAuthStore();
+  const roleToCheck = roleProp ?? storeRole ?? (user && (user.account_type ?? (user.role ?? null)));
+  (0, import_react3.useEffect)(() => {
+    if (!storeRole && roleToCheck) {
+      setRole(roleToCheck);
+    }
+  }, [roleToCheck, storeRole, setRole]);
   (0, import_react3.useEffect)(() => {
     if (!isAuthChecked) return;
-    if (!role || !allowedRoles.includes(role)) {
+    if (!roleToCheck || !allowedRoles.includes(roleToCheck)) {
       router.replace(redirectTo);
     }
-  }, [role, isAuthChecked, allowedRoles, redirectTo, router]);
+  }, [roleToCheck, 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;
+  if (!roleToCheck || !allowedRoles.includes(roleToCheck)) return null;
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, { children });
 };
 var RoleGuard_default = RoleGuard;

package/dist/index.mjs

@@ -151,22 +151,29 @@ var RoleGuard = ({
   children,
   allowedRoles,
   redirectTo = "/unauthorized",
-  fallback = null
+  fallback = null,
+  roleProp
 }) => {
   const router = useRouter2();
-  const { role, isAuthChecked, isAuthenticated } = useAuthStore();
+  const { role: storeRole, setRole, isAuthChecked, isAuthenticated, user } = useAuthStore();
+  const roleToCheck = roleProp ?? storeRole ?? (user && (user.account_type ?? (user.role ?? null)));
+  useEffect3(() => {
+    if (!storeRole && roleToCheck) {
+      setRole(roleToCheck);
+    }
+  }, [roleToCheck, storeRole, setRole]);
   useEffect3(() => {
     if (!isAuthChecked) return;
-    if (!role || !allowedRoles.includes(role)) {
+    if (!roleToCheck || !allowedRoles.includes(roleToCheck)) {
       router.replace(redirectTo);
     }
-  }, [role, isAuthChecked, allowedRoles, redirectTo, router]);
+  }, [roleToCheck, 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;
+  if (!roleToCheck || !allowedRoles.includes(roleToCheck)) return null;
   return /* @__PURE__ */ jsx3(Fragment2, { children });
 };
 var RoleGuard_default = RoleGuard;

package/package.json

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

package/src/AuthProvider.tsx

@@ -96,7 +96,7 @@ export function createAuthContext<UserType extends User = User>(option?: {
       if (userData) setUser(userData)
       setRole(role ?? null)
       setAuth(true);
-      setAuthChecked(true);
+      setAuthChecked(true)
     }
 
     /* ---------------------------------- */

package/src/RoleGuard.tsx

@@ -9,6 +9,7 @@ type RoleGuardProps = {
   allowedRoles: string[]
   redirectTo?: string
   fallback?: React.ReactNode
+  roleProp?: string // pass role explicitly if store role is empty
 }
 
 const RoleGuard = ({
@@ -16,18 +17,30 @@ const RoleGuard = ({
   allowedRoles,
   redirectTo = '/unauthorized',
   fallback = null,
+  roleProp,
 }: RoleGuardProps) => {
   const router = useRouter()
-  const { role, isAuthChecked, isAuthenticated } = useAuthStore()
+  const { role: storeRole, setRole, isAuthChecked, isAuthenticated, user } = useAuthStore()
+
+  // Determine which role to check
+  const roleToCheck =
+    roleProp ?? storeRole ?? (user && (user.account_type ?? (user.role ?? null)))
+
+  // Update store role if missing
+  useEffect(() => {
+    if (!storeRole && roleToCheck) {
+      setRole(roleToCheck)
+    }
+  }, [roleToCheck, storeRole, setRole])
 
   useEffect(() => {
     if (!isAuthChecked) return
 
     // If role not allowed, redirect
-    if (!role || !allowedRoles.includes(role)) {
+    if (!roleToCheck || !allowedRoles.includes(roleToCheck)) {
       router.replace(redirectTo)
     }
-  }, [role, isAuthChecked, allowedRoles, redirectTo, router])
+  }, [roleToCheck, isAuthChecked, allowedRoles, redirectTo, router])
 
   if (!isAuthChecked) return <>{fallback}</>
 
@@ -35,10 +48,9 @@ const RoleGuard = ({
     router.replace(redirectTo)
     return null
   }
-  
 
   // Block rendering if role is not allowed
-  if (!role || !allowedRoles.includes(role)) return null
+  if (!roleToCheck || !allowedRoles.includes(roleToCheck)) return null
 
   return <>{children}</>
 }