nextauthz 1.3.26 → 1.3.28

package/dist/index.d.mts

@@ -1,12 +1,11 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import * as React from 'react';
-import React__default from 'react';
+import React, { ReactNode } from 'react';
 
-type User$1 = {
+type User = {
     [key: string]: any;
 };
 
-type AuthContextType<UserType extends User$1 = User$1> = {
+type AuthContextType<UserType extends User = User> = {
     user: UserType | null;
     role: string | null;
     isAuthenticated: boolean;
@@ -16,33 +15,31 @@ type AuthContextType<UserType extends User$1 = User$1> = {
     setUser: (user: UserType | null) => void;
     tokenKey: string;
 };
+declare function createAuthContext<UserType extends User = User>(option?: {
+    storage?: 'localStorage' | 'sessionStorage' | 'cookie';
+    tokenKey?: string;
+    rolePath?: string;
+}): {
+    AuthProvider: ({ children }: {
+        children: ReactNode;
+    }) => react_jsx_runtime.JSX.Element;
+    useAuth: () => AuthContextType<UserType>;
+    tokenKey: string;
+};
 
 type AuthGuardProps = {
-    children: React__default.ReactNode;
+    children: React.ReactNode;
     redirectTo?: string;
-    fallback?: React__default.ReactNode;
+    fallback?: React.ReactNode;
 };
 declare const AuthGuard: ({ children, redirectTo, fallback, }: AuthGuardProps) => react_jsx_runtime.JSX.Element | null;
 
 type RoleGuardProps = {
-    children: React__default.ReactNode;
+    children: React.ReactNode;
     allowedRoles: string[];
     redirectTo?: string;
-    fallback?: React__default.ReactNode;
-    roleProp?: string;
-};
-declare const RoleGuard: ({ children, allowedRoles, redirectTo, fallback, roleProp, }: RoleGuardProps) => react_jsx_runtime.JSX.Element | null;
-
-type User = Record<string, any>;
-/**
- * Factory to create isolated auth instance
- */
-declare function createAppAuth(storage: 'localStorage' | 'sessionStorage' | 'cookie', tokenKey?: string): {
-    AuthProvider: ({ children }: {
-        children: React.ReactNode;
-    }) => react_jsx_runtime.JSX.Element;
-    useAuth: () => AuthContextType<User$1>;
-    tokenKey: string;
+    fallback?: React.ReactNode;
 };
+declare const RoleGuard: ({ children, allowedRoles, redirectTo, fallback, }: RoleGuardProps) => react_jsx_runtime.JSX.Element | null;
 
-export { AuthGuard, RoleGuard, type User, createAppAuth };
+export { AuthGuard, RoleGuard, createAuthContext };

package/dist/index.d.ts

@@ -1,12 +1,11 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import * as React from 'react';
-import React__default from 'react';
+import React, { ReactNode } from 'react';
 
-type User$1 = {
+type User = {
     [key: string]: any;
 };
 
-type AuthContextType<UserType extends User$1 = User$1> = {
+type AuthContextType<UserType extends User = User> = {
     user: UserType | null;
     role: string | null;
     isAuthenticated: boolean;
@@ -16,33 +15,31 @@ type AuthContextType<UserType extends User$1 = User$1> = {
     setUser: (user: UserType | null) => void;
     tokenKey: string;
 };
+declare function createAuthContext<UserType extends User = User>(option?: {
+    storage?: 'localStorage' | 'sessionStorage' | 'cookie';
+    tokenKey?: string;
+    rolePath?: string;
+}): {
+    AuthProvider: ({ children }: {
+        children: ReactNode;
+    }) => react_jsx_runtime.JSX.Element;
+    useAuth: () => AuthContextType<UserType>;
+    tokenKey: string;
+};
 
 type AuthGuardProps = {
-    children: React__default.ReactNode;
+    children: React.ReactNode;
     redirectTo?: string;
-    fallback?: React__default.ReactNode;
+    fallback?: React.ReactNode;
 };
 declare const AuthGuard: ({ children, redirectTo, fallback, }: AuthGuardProps) => react_jsx_runtime.JSX.Element | null;
 
 type RoleGuardProps = {
-    children: React__default.ReactNode;
+    children: React.ReactNode;
     allowedRoles: string[];
     redirectTo?: string;
-    fallback?: React__default.ReactNode;
-    roleProp?: string;
-};
-declare const RoleGuard: ({ children, allowedRoles, redirectTo, fallback, roleProp, }: RoleGuardProps) => react_jsx_runtime.JSX.Element | null;
-
-type User = Record<string, any>;
-/**
- * Factory to create isolated auth instance
- */
-declare function createAppAuth(storage: 'localStorage' | 'sessionStorage' | 'cookie', tokenKey?: string): {
-    AuthProvider: ({ children }: {
-        children: React.ReactNode;
-    }) => react_jsx_runtime.JSX.Element;
-    useAuth: () => AuthContextType<User$1>;
-    tokenKey: string;
+    fallback?: React.ReactNode;
 };
+declare const RoleGuard: ({ children, allowedRoles, redirectTo, fallback, }: RoleGuardProps) => react_jsx_runtime.JSX.Element | null;
 
-export { AuthGuard, RoleGuard, type User, createAppAuth };
+export { AuthGuard, RoleGuard, createAuthContext };

package/dist/index.js

@@ -23,7 +23,7 @@ var index_exports = {};
 __export(index_exports, {
   AuthGuard: () => AuthGuard_default,
   RoleGuard: () => RoleGuard_default,
-  createAppAuth: () => createAppAuth
+  createAuthContext: () => createAuthContext
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -64,7 +64,7 @@ function createAuthContext(option) {
   const AuthProvider = ({ children }) => {
     const storage = option?.storage ?? "cookie";
     const tokenKey = option?.tokenKey ?? "access_token";
-    console.log("storage", storage);
+    const rolePath = option?.rolePath ?? "role";
     (0, import_react.useEffect)(() => {
       (0, import_react_token_manager.configureTokenManager)({ storage });
     }, [storage]);
@@ -80,6 +80,10 @@ function createAuthContext(option) {
       setAuth,
       setAuthChecked
     } = useAuthStore();
+    const extractRole = (userObj) => {
+      if (!userObj || !rolePath) return null;
+      return rolePath.split(".").reduce((acc, key) => acc?.[key], userObj) ?? null;
+    };
     (0, import_react.useEffect)(() => {
       const storedUser = manager.getSingleToken("user");
       const token = manager.getSingleToken(tokenKey);
@@ -89,7 +93,7 @@ function createAuthContext(option) {
           if (storedUser) {
             const parsedUser = JSON.parse(storedUser);
             setUser(parsedUser);
-            setRole(parsedUser?.role ?? null);
+            setRole(extractRole(parsedUser));
           }
         } catch {
           resetAuth();
@@ -107,7 +111,7 @@ function createAuthContext(option) {
         user: JSON.stringify(userData ?? null)
       });
       if (userData) setUser(userData);
-      setRole(role2 ?? null);
+      setRole(role2 ?? extractRole(userData));
       setAuth(true);
       setAuthChecked(true);
     };
@@ -178,40 +182,28 @@ var RoleGuard = ({
   children,
   allowedRoles,
   redirectTo = "/unauthorized",
-  fallback = null,
-  roleProp
+  fallback = null
 }) => {
   const router = (0, import_navigation2.useRouter)();
-  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]);
+  const { role, isAuthChecked, isAuthenticated } = useAuthStore();
   (0, import_react3.useEffect)(() => {
     if (!isAuthChecked) return;
-    if (!roleToCheck || !allowedRoles.includes(roleToCheck)) {
+    if (!role || !allowedRoles.includes(role)) {
       router.replace(redirectTo);
     }
-  }, [roleToCheck, isAuthChecked, allowedRoles, redirectTo, router]);
+  }, [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 (!roleToCheck || !allowedRoles.includes(roleToCheck)) return null;
+  if (!role || !allowedRoles.includes(role)) return null;
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, { children });
 };
 var RoleGuard_default = RoleGuard;
-
-// src/index.ts
-function createAppAuth(storage, tokenKey = "access_token") {
-  return createAuthContext({ storage, tokenKey });
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AuthGuard,
   RoleGuard,
-  createAppAuth
+  createAuthContext
 });

package/dist/index.mjs

@@ -37,7 +37,7 @@ function createAuthContext(option) {
   const AuthProvider = ({ children }) => {
     const storage = option?.storage ?? "cookie";
     const tokenKey = option?.tokenKey ?? "access_token";
-    console.log("storage", storage);
+    const rolePath = option?.rolePath ?? "role";
     useEffect(() => {
       configureTokenManager({ storage });
     }, [storage]);
@@ -53,6 +53,10 @@ function createAuthContext(option) {
       setAuth,
       setAuthChecked
     } = useAuthStore();
+    const extractRole = (userObj) => {
+      if (!userObj || !rolePath) return null;
+      return rolePath.split(".").reduce((acc, key) => acc?.[key], userObj) ?? null;
+    };
     useEffect(() => {
       const storedUser = manager.getSingleToken("user");
       const token = manager.getSingleToken(tokenKey);
@@ -62,7 +66,7 @@ function createAuthContext(option) {
           if (storedUser) {
             const parsedUser = JSON.parse(storedUser);
             setUser(parsedUser);
-            setRole(parsedUser?.role ?? null);
+            setRole(extractRole(parsedUser));
           }
         } catch {
           resetAuth();
@@ -80,7 +84,7 @@ function createAuthContext(option) {
         user: JSON.stringify(userData ?? null)
       });
       if (userData) setUser(userData);
-      setRole(role2 ?? null);
+      setRole(role2 ?? extractRole(userData));
       setAuth(true);
       setAuthChecked(true);
     };
@@ -151,39 +155,27 @@ var RoleGuard = ({
   children,
   allowedRoles,
   redirectTo = "/unauthorized",
-  fallback = null,
-  roleProp
+  fallback = null
 }) => {
   const router = useRouter2();
-  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]);
+  const { role, isAuthChecked, isAuthenticated } = useAuthStore();
   useEffect3(() => {
     if (!isAuthChecked) return;
-    if (!roleToCheck || !allowedRoles.includes(roleToCheck)) {
+    if (!role || !allowedRoles.includes(role)) {
       router.replace(redirectTo);
     }
-  }, [roleToCheck, isAuthChecked, allowedRoles, redirectTo, router]);
+  }, [role, isAuthChecked, allowedRoles, redirectTo, router]);
   if (!isAuthChecked) return /* @__PURE__ */ jsx3(Fragment2, { children: fallback });
   if (!isAuthenticated) {
     router.replace(redirectTo);
     return null;
   }
-  if (!roleToCheck || !allowedRoles.includes(roleToCheck)) return null;
+  if (!role || !allowedRoles.includes(role)) return null;
   return /* @__PURE__ */ jsx3(Fragment2, { children });
 };
 var RoleGuard_default = RoleGuard;
-
-// src/index.ts
-function createAppAuth(storage, tokenKey = "access_token") {
-  return createAuthContext({ storage, tokenKey });
-}
 export {
   AuthGuard_default as AuthGuard,
   RoleGuard_default as RoleGuard,
-  createAppAuth
+  createAuthContext
 };

package/package.json

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

package/src/AuthProvider.tsx

@@ -26,14 +26,14 @@ export type AuthContextType<UserType extends User = User> = {
 export function createAuthContext<UserType extends User = User>(option?: {
   storage?: 'localStorage' | 'sessionStorage' | 'cookie'
   tokenKey?: string
+  rolePath?: string // e.g. 'role' or 'profile.role'
 }) {
   const AuthContext = createContext<AuthContextType<UserType> | undefined>(undefined)
 
   const AuthProvider = ({ children }: { children: ReactNode }) => {
     const storage = option?.storage ?? 'cookie'
     const tokenKey = option?.tokenKey ?? 'access_token'
-
-    console.log('storage', storage);
+    const rolePath = option?.rolePath ?? 'role'
 
     useEffect(() => {
       configureTokenManager({ storage })
@@ -52,6 +52,14 @@ export function createAuthContext<UserType extends User = User>(option?: {
       setAuthChecked,
     } = useAuthStore()
 
+    /* ---------------------------------- */
+    /* Helper: get role from path */
+    /* ---------------------------------- */
+    const extractRole = (userObj: any) => {
+      if (!userObj || !rolePath) return null
+      return rolePath.split('.').reduce((acc: any, key: string) => acc?.[key], userObj) ?? null
+    }
+
     /* ---------------------------------- */
     /* Hydrate user from storage */
     /* ---------------------------------- */
@@ -67,7 +75,7 @@ export function createAuthContext<UserType extends User = User>(option?: {
           if (storedUser) {
             const parsedUser = JSON.parse(storedUser) as UserType
             setUser(parsedUser)
-            setRole((parsedUser as any)?.role ?? null)
+            setRole(extractRole(parsedUser))
           }
         } catch {
           resetAuth()
@@ -94,8 +102,8 @@ export function createAuthContext<UserType extends User = User>(option?: {
       })
 
       if (userData) setUser(userData)
-      setRole(role ?? null)
-      setAuth(true);
+      setRole(role ?? extractRole(userData))
+      setAuth(true)
       setAuthChecked(true)
     }
 

package/src/RoleGuard.tsx

@@ -9,7 +9,6 @@ type RoleGuardProps = {
   allowedRoles: string[]
   redirectTo?: string
   fallback?: React.ReactNode
-  roleProp?: string // pass role explicitly if store role is empty
 }
 
 const RoleGuard = ({
@@ -17,30 +16,18 @@ const RoleGuard = ({
   allowedRoles,
   redirectTo = '/unauthorized',
   fallback = null,
-  roleProp,
 }: RoleGuardProps) => {
   const router = useRouter()
-  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])
+  const { role, isAuthChecked, isAuthenticated } = useAuthStore()
 
   useEffect(() => {
     if (!isAuthChecked) return
 
     // If role not allowed, redirect
-    if (!roleToCheck || !allowedRoles.includes(roleToCheck)) {
+    if (!role || !allowedRoles.includes(role)) {
       router.replace(redirectTo)
     }
-  }, [roleToCheck, isAuthChecked, allowedRoles, redirectTo, router])
+  }, [role, isAuthChecked, allowedRoles, redirectTo, router])
 
   if (!isAuthChecked) return <>{fallback}</>
 
@@ -50,7 +37,7 @@ const RoleGuard = ({
   }
 
   // Block rendering if role is not allowed
-  if (!roleToCheck || !allowedRoles.includes(roleToCheck)) return null
+  if (!role || !allowedRoles.includes(role)) return null
 
   return <>{children}</>
 }

package/src/index.ts

@@ -1,18 +1,7 @@
 'use client'
 
-import { createAuthContext } from './AuthProvider'
+export { createAuthContext } from './AuthProvider'
 
 export { default as AuthGuard } from './AuthGuard'
 export { default as RoleGuard } from './RoleGuard'
 
-export type User = Record<string, any>
-
-/**
- * Factory to create isolated auth instance
- */
-export function createAppAuth(
-  storage: 'localStorage' | 'sessionStorage' | 'cookie',
-  tokenKey: string = 'access_token' // <-- default token key
-) {
-  return createAuthContext({ storage, tokenKey })
-}