nextauthz 1.0.9 → 1.1.0

package/dist/index.d.mts

@@ -1,5 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { ReactNode } from 'react';
+import * as React from 'react';
+import React__default, { ReactNode } from 'react';
 
 type AuthContextType<UserType> = {
     user: UserType | null;
@@ -22,8 +23,29 @@ declare function createAuthContext<UserType>(options?: AuthContextOptions): {
     useAuth: () => AuthContextType<UserType>;
 };
 
+type AuthGuardProps = {
+    children: React__default.ReactNode;
+    redirectTo?: string;
+    tokenKey?: string;
+    refreshToken?: () => Promise<string | null>;
+};
+declare const AuthGuard: ({ children, redirectTo, tokenKey, refreshToken, }: AuthGuardProps) => react_jsx_runtime.JSX.Element | null;
+
+type RoleGuardProps = {
+    children: React__default.ReactNode;
+    allowedRoles: string[];
+    redirectTo?: string;
+};
+declare const RoleGuard: React__default.FC<RoleGuardProps>;
+
 type User = {
     [key: string]: any;
 };
+declare function createAppAuth(storage?: 'localStorage' | 'sessionStorage' | 'cookie'): {
+    AuthProvider: ({ children }: {
+        children: React.ReactNode;
+    }) => react_jsx_runtime.JSX.Element;
+    useAuth: () => AuthContextType<User>;
+};
 
-export { type User, createAuthContext };
+export { AuthGuard, RoleGuard, type User, createAppAuth, createAuthContext };

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { ReactNode } from 'react';
+import * as React from 'react';
+import React__default, { ReactNode } from 'react';
 
 type AuthContextType<UserType> = {
     user: UserType | null;
@@ -22,8 +23,29 @@ declare function createAuthContext<UserType>(options?: AuthContextOptions): {
     useAuth: () => AuthContextType<UserType>;
 };
 
+type AuthGuardProps = {
+    children: React__default.ReactNode;
+    redirectTo?: string;
+    tokenKey?: string;
+    refreshToken?: () => Promise<string | null>;
+};
+declare const AuthGuard: ({ children, redirectTo, tokenKey, refreshToken, }: AuthGuardProps) => react_jsx_runtime.JSX.Element | null;
+
+type RoleGuardProps = {
+    children: React__default.ReactNode;
+    allowedRoles: string[];
+    redirectTo?: string;
+};
+declare const RoleGuard: React__default.FC<RoleGuardProps>;
+
 type User = {
     [key: string]: any;
 };
+declare function createAppAuth(storage?: 'localStorage' | 'sessionStorage' | 'cookie'): {
+    AuthProvider: ({ children }: {
+        children: React.ReactNode;
+    }) => react_jsx_runtime.JSX.Element;
+    useAuth: () => AuthContextType<User>;
+};
 
-export { type User, createAuthContext };
+export { AuthGuard, RoleGuard, type User, createAppAuth, createAuthContext };

package/dist/index.js

@@ -1699,18 +1699,18 @@ var require_react_jsx_runtime_development = __commonJS({
       function isValidElement(object) {
         return "object" === typeof object && null !== object && object.$$typeof === REACT_ELEMENT_TYPE;
       }
-      var React2 = require_react(), REACT_ELEMENT_TYPE = /* @__PURE__ */ Symbol.for("react.transitional.element"), REACT_PORTAL_TYPE = /* @__PURE__ */ Symbol.for("react.portal"), REACT_FRAGMENT_TYPE = /* @__PURE__ */ Symbol.for("react.fragment"), REACT_STRICT_MODE_TYPE = /* @__PURE__ */ Symbol.for("react.strict_mode"), REACT_PROFILER_TYPE = /* @__PURE__ */ Symbol.for("react.profiler"), REACT_CONSUMER_TYPE = /* @__PURE__ */ Symbol.for("react.consumer"), REACT_CONTEXT_TYPE = /* @__PURE__ */ Symbol.for("react.context"), REACT_FORWARD_REF_TYPE = /* @__PURE__ */ Symbol.for("react.forward_ref"), REACT_SUSPENSE_TYPE = /* @__PURE__ */ Symbol.for("react.suspense"), REACT_SUSPENSE_LIST_TYPE = /* @__PURE__ */ Symbol.for("react.suspense_list"), REACT_MEMO_TYPE = /* @__PURE__ */ Symbol.for("react.memo"), REACT_LAZY_TYPE = /* @__PURE__ */ Symbol.for("react.lazy"), REACT_ACTIVITY_TYPE = /* @__PURE__ */ Symbol.for("react.activity"), REACT_CLIENT_REFERENCE = /* @__PURE__ */ Symbol.for("react.client.reference"), ReactSharedInternals = React2.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, hasOwnProperty = Object.prototype.hasOwnProperty, isArrayImpl = Array.isArray, createTask = console.createTask ? console.createTask : function() {
+      var React4 = require_react(), REACT_ELEMENT_TYPE = /* @__PURE__ */ Symbol.for("react.transitional.element"), REACT_PORTAL_TYPE = /* @__PURE__ */ Symbol.for("react.portal"), REACT_FRAGMENT_TYPE = /* @__PURE__ */ Symbol.for("react.fragment"), REACT_STRICT_MODE_TYPE = /* @__PURE__ */ Symbol.for("react.strict_mode"), REACT_PROFILER_TYPE = /* @__PURE__ */ Symbol.for("react.profiler"), REACT_CONSUMER_TYPE = /* @__PURE__ */ Symbol.for("react.consumer"), REACT_CONTEXT_TYPE = /* @__PURE__ */ Symbol.for("react.context"), REACT_FORWARD_REF_TYPE = /* @__PURE__ */ Symbol.for("react.forward_ref"), REACT_SUSPENSE_TYPE = /* @__PURE__ */ Symbol.for("react.suspense"), REACT_SUSPENSE_LIST_TYPE = /* @__PURE__ */ Symbol.for("react.suspense_list"), REACT_MEMO_TYPE = /* @__PURE__ */ Symbol.for("react.memo"), REACT_LAZY_TYPE = /* @__PURE__ */ Symbol.for("react.lazy"), REACT_ACTIVITY_TYPE = /* @__PURE__ */ Symbol.for("react.activity"), REACT_CLIENT_REFERENCE = /* @__PURE__ */ Symbol.for("react.client.reference"), ReactSharedInternals = React4.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, hasOwnProperty = Object.prototype.hasOwnProperty, isArrayImpl = Array.isArray, createTask = console.createTask ? console.createTask : function() {
         return null;
       };
-      React2 = {
+      React4 = {
         react_stack_bottom_frame: function(callStackForError) {
           return callStackForError();
         }
       };
       var specialPropKeyWarningShown;
       var didWarnAboutElementRef = {};
-      var unknownOwnerDebugStack = React2.react_stack_bottom_frame.bind(
-        React2,
+      var unknownOwnerDebugStack = React4.react_stack_bottom_frame.bind(
+        React4,
         UnknownOwner
       )();
       var unknownOwnerDebugTask = createTask(getTaskName(UnknownOwner));
@@ -1757,13 +1757,15 @@ var require_jsx_runtime = __commonJS({
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  AuthGuard: () => AuthGuard_default,
+  RoleGuard: () => RoleGuard_default,
+  createAppAuth: () => createAppAuth,
   createAuthContext: () => createAuthContext
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/AuthProvider.tsx
 var import_react = __toESM(require_react());
-var import_react_token_manager = require("react-token-manager");
 
 // store/useGuardStore.ts
 var import_zustand = require("zustand");
@@ -1789,39 +1791,16 @@ var import_jsx_runtime = __toESM(require_jsx_runtime());
 function createAuthContext(options) {
   const AuthContext = (0, import_react.createContext)(null);
   const AuthProvider = ({ children }) => {
-    const storageType = options?.storage || "cookie";
-    (0, import_react.useEffect)(() => {
-      (0, import_react_token_manager.configureTokenManager)({ storage: storageType });
-    }, [storageType]);
-    const manager = (0, import_react_token_manager.useTokenManager)();
     const [loading, setLoading] = (0, import_react.useState)(true);
     const rawUser = useAuthStore((state) => state.user);
     const error = useAuthStore((state) => state.error);
     const user = rawUser;
-    (0, import_react.useEffect)(() => {
-      const savedUser = manager.getSingleToken("user");
-      if (savedUser) {
-        try {
-          const parsedUser = JSON.parse(savedUser);
-          useAuthStore.getState().setUser(parsedUser);
-          useAuthStore.getState().setError(null);
-        } catch {
-          useAuthStore.getState().resetAuth();
-          useAuthStore.getState().setError(
-            new Error("Failed to parse saved user")
-          );
-        }
-      }
-      setLoading(false);
-    }, [manager]);
     const setUser = (userData) => {
       useAuthStore.getState().setUser(userData);
       useAuthStore.getState().setError(null);
-      manager.setTokens({ user: JSON.stringify(userData) });
     };
     const login = (tokens, userData) => {
       try {
-        manager.setTokens(tokens);
         setUser(userData);
       } catch (err) {
         useAuthStore.getState().setError(
@@ -1831,7 +1810,6 @@ function createAuthContext(options) {
     };
     const logout = () => {
       try {
-        manager.clearTokens();
         useAuthStore.getState().resetAuth();
       } catch (err) {
         useAuthStore.getState().setError(
@@ -1854,8 +1832,101 @@ function createAuthContext(options) {
   };
   return { AuthProvider, useAuth };
 }
+
+// src/AuthGuard.tsx
+var import_react2 = __toESM(require_react());
+var import_navigation = require("next/navigation");
+var import_react_token_manager = require("react-token-manager");
+var import_jsx_runtime2 = __toESM(require_jsx_runtime());
+var AuthGuard = ({
+  children,
+  redirectTo = "/login",
+  tokenKey = "access_token",
+  refreshToken
+}) => {
+  const manager = (0, import_react_token_manager.useTokenManager)();
+  const router = (0, import_navigation.useRouter)();
+  const isAuthChecked = useAuthStore((state) => state.isAuthChecked);
+  const isAuthenticated = useAuthStore((state) => state.isAuthenticated);
+  const error = useAuthStore((state) => state.error);
+  (0, import_react2.useEffect)(() => {
+    const checkAuth = async () => {
+      try {
+        let token = manager.getSingleToken(tokenKey);
+        if (!token || manager.isExpired(token)) {
+          if (refreshToken) {
+            const newToken = await refreshToken();
+            if (newToken) {
+              manager.setTokens({ [tokenKey]: newToken });
+              token = newToken;
+            }
+          }
+        }
+        const isValid = token && !manager.isExpired(token);
+        useAuthStore.getState().setAuth(Boolean(isValid));
+        if (!isValid) {
+          router.replace(redirectTo);
+        }
+      } catch (err) {
+        useAuthStore.getState().setError(err instanceof Error ? err : new Error(String(err)));
+        useAuthStore.getState().setAuth(false);
+        router.replace(redirectTo);
+      } finally {
+        useAuthStore.getState().setAuthChecked(true);
+      }
+    };
+    checkAuth();
+  }, [manager, router, redirectTo, tokenKey, refreshToken]);
+  if (!isAuthChecked) return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { children: "Loading..." });
+  if (error) return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { children: [
+    "Error: ",
+    error.message
+  ] });
+  if (!isAuthenticated) return null;
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_jsx_runtime2.Fragment, { children });
+};
+var AuthGuard_default = AuthGuard;
+
+// src/RoleGuard.tsx
+var import_react3 = __toESM(require_react());
+var import_navigation2 = require("next/navigation");
+
+// src/myAuth.ts
+var auth = createAppAuth();
+
+// src/RoleGuard.tsx
+var import_jsx_runtime3 = __toESM(require_jsx_runtime());
+var RoleGuard = ({
+  children,
+  allowedRoles,
+  redirectTo = "/unauthorized"
+}) => {
+  const { useAuth } = auth;
+  const { user, loading } = useAuth();
+  const router = (0, import_navigation2.useRouter)();
+  const [isChecking, setIsChecking] = (0, import_react3.useState)(true);
+  (0, import_react3.useEffect)(() => {
+    if (!user) return;
+    const hasAccess = allowedRoles.includes(user?.role);
+    if (!hasAccess) {
+      router.replace(redirectTo);
+    }
+    setIsChecking(false);
+  }, [user, allowedRoles, redirectTo, router]);
+  if (loading || !user || isChecking) return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("div", { children: "Loading..." });
+  return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, { children });
+};
+var RoleGuard_default = RoleGuard;
+
+// src/index.ts
+function createAppAuth(storage = "cookie") {
+  return createAuthContext({ storage });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  AuthGuard,
+  RoleGuard,
+  createAppAuth,
   createAuthContext
 });
 /*! Bundled license information:

package/dist/index.mjs

@@ -1693,18 +1693,18 @@ var require_react_jsx_runtime_development = __commonJS({
       function isValidElement(object) {
         return "object" === typeof object && null !== object && object.$$typeof === REACT_ELEMENT_TYPE;
       }
-      var React2 = require_react(), REACT_ELEMENT_TYPE = /* @__PURE__ */ Symbol.for("react.transitional.element"), REACT_PORTAL_TYPE = /* @__PURE__ */ Symbol.for("react.portal"), REACT_FRAGMENT_TYPE = /* @__PURE__ */ Symbol.for("react.fragment"), REACT_STRICT_MODE_TYPE = /* @__PURE__ */ Symbol.for("react.strict_mode"), REACT_PROFILER_TYPE = /* @__PURE__ */ Symbol.for("react.profiler"), REACT_CONSUMER_TYPE = /* @__PURE__ */ Symbol.for("react.consumer"), REACT_CONTEXT_TYPE = /* @__PURE__ */ Symbol.for("react.context"), REACT_FORWARD_REF_TYPE = /* @__PURE__ */ Symbol.for("react.forward_ref"), REACT_SUSPENSE_TYPE = /* @__PURE__ */ Symbol.for("react.suspense"), REACT_SUSPENSE_LIST_TYPE = /* @__PURE__ */ Symbol.for("react.suspense_list"), REACT_MEMO_TYPE = /* @__PURE__ */ Symbol.for("react.memo"), REACT_LAZY_TYPE = /* @__PURE__ */ Symbol.for("react.lazy"), REACT_ACTIVITY_TYPE = /* @__PURE__ */ Symbol.for("react.activity"), REACT_CLIENT_REFERENCE = /* @__PURE__ */ Symbol.for("react.client.reference"), ReactSharedInternals = React2.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, hasOwnProperty = Object.prototype.hasOwnProperty, isArrayImpl = Array.isArray, createTask = console.createTask ? console.createTask : function() {
+      var React4 = require_react(), REACT_ELEMENT_TYPE = /* @__PURE__ */ Symbol.for("react.transitional.element"), REACT_PORTAL_TYPE = /* @__PURE__ */ Symbol.for("react.portal"), REACT_FRAGMENT_TYPE = /* @__PURE__ */ Symbol.for("react.fragment"), REACT_STRICT_MODE_TYPE = /* @__PURE__ */ Symbol.for("react.strict_mode"), REACT_PROFILER_TYPE = /* @__PURE__ */ Symbol.for("react.profiler"), REACT_CONSUMER_TYPE = /* @__PURE__ */ Symbol.for("react.consumer"), REACT_CONTEXT_TYPE = /* @__PURE__ */ Symbol.for("react.context"), REACT_FORWARD_REF_TYPE = /* @__PURE__ */ Symbol.for("react.forward_ref"), REACT_SUSPENSE_TYPE = /* @__PURE__ */ Symbol.for("react.suspense"), REACT_SUSPENSE_LIST_TYPE = /* @__PURE__ */ Symbol.for("react.suspense_list"), REACT_MEMO_TYPE = /* @__PURE__ */ Symbol.for("react.memo"), REACT_LAZY_TYPE = /* @__PURE__ */ Symbol.for("react.lazy"), REACT_ACTIVITY_TYPE = /* @__PURE__ */ Symbol.for("react.activity"), REACT_CLIENT_REFERENCE = /* @__PURE__ */ Symbol.for("react.client.reference"), ReactSharedInternals = React4.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, hasOwnProperty = Object.prototype.hasOwnProperty, isArrayImpl = Array.isArray, createTask = console.createTask ? console.createTask : function() {
         return null;
       };
-      React2 = {
+      React4 = {
         react_stack_bottom_frame: function(callStackForError) {
           return callStackForError();
         }
       };
       var specialPropKeyWarningShown;
       var didWarnAboutElementRef = {};
-      var unknownOwnerDebugStack = React2.react_stack_bottom_frame.bind(
-        React2,
+      var unknownOwnerDebugStack = React4.react_stack_bottom_frame.bind(
+        React4,
         UnknownOwner
       )();
       var unknownOwnerDebugTask = createTask(getTaskName(UnknownOwner));
@@ -1750,7 +1750,6 @@ var require_jsx_runtime = __commonJS({
 
 // src/AuthProvider.tsx
 var import_react = __toESM(require_react());
-import { configureTokenManager, useTokenManager } from "react-token-manager";
 
 // store/useGuardStore.ts
 import { create } from "zustand";
@@ -1776,39 +1775,16 @@ var import_jsx_runtime = __toESM(require_jsx_runtime());
 function createAuthContext(options) {
   const AuthContext = (0, import_react.createContext)(null);
   const AuthProvider = ({ children }) => {
-    const storageType = options?.storage || "cookie";
-    (0, import_react.useEffect)(() => {
-      configureTokenManager({ storage: storageType });
-    }, [storageType]);
-    const manager = useTokenManager();
     const [loading, setLoading] = (0, import_react.useState)(true);
     const rawUser = useAuthStore((state) => state.user);
     const error = useAuthStore((state) => state.error);
     const user = rawUser;
-    (0, import_react.useEffect)(() => {
-      const savedUser = manager.getSingleToken("user");
-      if (savedUser) {
-        try {
-          const parsedUser = JSON.parse(savedUser);
-          useAuthStore.getState().setUser(parsedUser);
-          useAuthStore.getState().setError(null);
-        } catch {
-          useAuthStore.getState().resetAuth();
-          useAuthStore.getState().setError(
-            new Error("Failed to parse saved user")
-          );
-        }
-      }
-      setLoading(false);
-    }, [manager]);
     const setUser = (userData) => {
       useAuthStore.getState().setUser(userData);
       useAuthStore.getState().setError(null);
-      manager.setTokens({ user: JSON.stringify(userData) });
     };
     const login = (tokens, userData) => {
       try {
-        manager.setTokens(tokens);
         setUser(userData);
       } catch (err) {
         useAuthStore.getState().setError(
@@ -1818,7 +1794,6 @@ function createAuthContext(options) {
     };
     const logout = () => {
       try {
-        manager.clearTokens();
         useAuthStore.getState().resetAuth();
       } catch (err) {
         useAuthStore.getState().setError(
@@ -1841,7 +1816,100 @@ function createAuthContext(options) {
   };
   return { AuthProvider, useAuth };
 }
+
+// src/AuthGuard.tsx
+var import_react2 = __toESM(require_react());
+import { useRouter } from "next/navigation";
+import { useTokenManager } from "react-token-manager";
+var import_jsx_runtime2 = __toESM(require_jsx_runtime());
+var AuthGuard = ({
+  children,
+  redirectTo = "/login",
+  tokenKey = "access_token",
+  refreshToken
+}) => {
+  const manager = useTokenManager();
+  const router = useRouter();
+  const isAuthChecked = useAuthStore((state) => state.isAuthChecked);
+  const isAuthenticated = useAuthStore((state) => state.isAuthenticated);
+  const error = useAuthStore((state) => state.error);
+  (0, import_react2.useEffect)(() => {
+    const checkAuth = async () => {
+      try {
+        let token = manager.getSingleToken(tokenKey);
+        if (!token || manager.isExpired(token)) {
+          if (refreshToken) {
+            const newToken = await refreshToken();
+            if (newToken) {
+              manager.setTokens({ [tokenKey]: newToken });
+              token = newToken;
+            }
+          }
+        }
+        const isValid = token && !manager.isExpired(token);
+        useAuthStore.getState().setAuth(Boolean(isValid));
+        if (!isValid) {
+          router.replace(redirectTo);
+        }
+      } catch (err) {
+        useAuthStore.getState().setError(err instanceof Error ? err : new Error(String(err)));
+        useAuthStore.getState().setAuth(false);
+        router.replace(redirectTo);
+      } finally {
+        useAuthStore.getState().setAuthChecked(true);
+      }
+    };
+    checkAuth();
+  }, [manager, router, redirectTo, tokenKey, refreshToken]);
+  if (!isAuthChecked) return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { children: "Loading..." });
+  if (error) return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { children: [
+    "Error: ",
+    error.message
+  ] });
+  if (!isAuthenticated) return null;
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_jsx_runtime2.Fragment, { children });
+};
+var AuthGuard_default = AuthGuard;
+
+// src/RoleGuard.tsx
+var import_react3 = __toESM(require_react());
+import { useRouter as useRouter2 } from "next/navigation";
+
+// src/myAuth.ts
+var auth = createAppAuth();
+
+// src/RoleGuard.tsx
+var import_jsx_runtime3 = __toESM(require_jsx_runtime());
+var RoleGuard = ({
+  children,
+  allowedRoles,
+  redirectTo = "/unauthorized"
+}) => {
+  const { useAuth } = auth;
+  const { user, loading } = useAuth();
+  const router = useRouter2();
+  const [isChecking, setIsChecking] = (0, import_react3.useState)(true);
+  (0, import_react3.useEffect)(() => {
+    if (!user) return;
+    const hasAccess = allowedRoles.includes(user?.role);
+    if (!hasAccess) {
+      router.replace(redirectTo);
+    }
+    setIsChecking(false);
+  }, [user, allowedRoles, redirectTo, router]);
+  if (loading || !user || isChecking) return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("div", { children: "Loading..." });
+  return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, { children });
+};
+var RoleGuard_default = RoleGuard;
+
+// src/index.ts
+function createAppAuth(storage = "cookie") {
+  return createAuthContext({ storage });
+}
 export {
+  AuthGuard_default as AuthGuard,
+  RoleGuard_default as RoleGuard,
+  createAppAuth,
   createAuthContext
 };
 /*! Bundled license information:

package/package.json

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

package/src/AuthGuard.tsx

@@ -1,67 +1,67 @@
-// 'use client'
+'use client'
 
-// import React, { useEffect, useState } from 'react'
-// import { useRouter } from 'next/navigation'
-// import { useTokenManager } from 'react-token-manager'
-// import { useAuthStore } from '../store/useGuardStore'
+import React, { useEffect, useState } from 'react'
+import { useRouter } from 'next/navigation'
+import { useTokenManager } from 'react-token-manager'
+import { useAuthStore } from '../store/useGuardStore'
 
-// type AuthGuardProps = {
-//   children: React.ReactNode
-//   redirectTo?: string
-//   tokenKey?: string
-//   refreshToken?: () => Promise<string | null>
-// }
+type AuthGuardProps = {
+  children: React.ReactNode
+  redirectTo?: string
+  tokenKey?: string
+  refreshToken?: () => Promise<string | null>
+}
 
-// const AuthGuard = ({
-//   children,
-//   redirectTo = '/login',
-//   tokenKey = 'access_token',
-//   refreshToken,
-// }: AuthGuardProps) => {
-//   const manager = useTokenManager()
-//   const router = useRouter()
-//   const isAuthChecked = useAuthStore((state) => state.isAuthChecked)
-//   const isAuthenticated = useAuthStore((state) => state.isAuthenticated)
-//   const error = useAuthStore((state) => state.error)
+const AuthGuard = ({
+  children,
+  redirectTo = '/login',
+  tokenKey = 'access_token',
+  refreshToken,
+}: AuthGuardProps) => {
+  const manager = useTokenManager()
+  const router = useRouter()
+  const isAuthChecked = useAuthStore((state) => state.isAuthChecked)
+  const isAuthenticated = useAuthStore((state) => state.isAuthenticated)
+  const error = useAuthStore((state) => state.error)
 
-//   useEffect(() => {
-//     const checkAuth = async () => {
-//       try {
-//         let token = manager.getSingleToken(tokenKey)
+  useEffect(() => {
+    const checkAuth = async () => {
+      try {
+        let token = manager.getSingleToken(tokenKey)
 
-//         if (!token || manager.isExpired(token)) {
-//           if (refreshToken) {
-//             const newToken = await refreshToken()
-//             if (newToken) {
-//               manager.setTokens({ [tokenKey]: newToken })
-//               token = newToken
-//             }
-//           }
-//         }
+        if (!token || manager.isExpired(token)) {
+          if (refreshToken) {
+            const newToken = await refreshToken()
+            if (newToken) {
+              manager.setTokens({ [tokenKey]: newToken })
+              token = newToken
+            }
+          }
+        }
 
-//         const isValid = token && !manager.isExpired(token)
-//         useAuthStore.getState().setAuth(Boolean(isValid))
+        const isValid = token && !manager.isExpired(token)
+        useAuthStore.getState().setAuth(Boolean(isValid))
 
-//         if (!isValid) {
-//           router.replace(redirectTo)
-//         }
-//       } catch (err: any) {
-//         useAuthStore.getState().setError(err instanceof Error ? err : new Error(String(err)))
-//         useAuthStore.getState().setAuth(false)
-//         router.replace(redirectTo)
-//       } finally {
-//         useAuthStore.getState().setAuthChecked(true)
-//       }
-//     }
+        if (!isValid) {
+          router.replace(redirectTo)
+        }
+      } catch (err: any) {
+        useAuthStore.getState().setError(err instanceof Error ? err : new Error(String(err)))
+        useAuthStore.getState().setAuth(false)
+        router.replace(redirectTo)
+      } finally {
+        useAuthStore.getState().setAuthChecked(true)
+      }
+    }
 
-//     checkAuth()
-//   }, [manager, router, redirectTo, tokenKey, refreshToken])
+    checkAuth()
+  }, [manager, router, redirectTo, tokenKey, refreshToken])
 
-//   if (!isAuthChecked) return <div>Loading...</div>
-//   if (error) return <div>Error: {error.message}</div>
-//   if (!isAuthenticated) return null
+  if (!isAuthChecked) return <div>Loading...</div>
+  if (error) return <div>Error: {error.message}</div>
+  if (!isAuthenticated) return null
 
-//   return <>{children}</>
-// }
+  return <>{children}</>
+}
 
-// export default AuthGuard
+export default AuthGuard

package/src/AuthProvider.tsx

@@ -7,7 +7,7 @@ import React, {
   useEffect,
   useState,
 } from 'react'
-import { configureTokenManager, useTokenManager } from 'react-token-manager'
+// import { configureTokenManager, useTokenManager } from 'react-token-manager'
 import { useAuthStore } from '../store/useGuardStore'
 
 export type AuthContextType<UserType> = {
@@ -30,15 +30,15 @@ export function createAuthContext<UserType>(options?: AuthContextOptions) {
   const AuthContext = createContext<AuthContextType<UserType> | null>(null)
 
   const AuthProvider = ({ children }: { children: ReactNode }) => {
-    const storageType = options?.storage || 'cookie'
+    // const storageType = options?.storage || 'cookie'
 
     // Configure token manager once on mount
-    useEffect(() => {
-      configureTokenManager({ storage: storageType })
-    }, [storageType])
+    // useEffect(() => {
+    //   configureTokenManager({ storage: storageType })
+    // }, [storageType])
 
     // ✅ Hooks must be called inside component
-    const manager = useTokenManager()
+    // const manager = useTokenManager()
 
     const [loading, setLoading] = useState(true)
 
@@ -47,32 +47,32 @@ export function createAuthContext<UserType>(options?: AuthContextOptions) {
     const user = rawUser as UserType | null
 
     // Restore saved user from token manager
-    useEffect(() => {
-      const savedUser = manager.getSingleToken('user')
-      if (savedUser) {
-        try {
-          const parsedUser = JSON.parse(savedUser)
-          useAuthStore.getState().setUser(parsedUser)
-          useAuthStore.getState().setError(null)
-        } catch {
-          useAuthStore.getState().resetAuth()
-          useAuthStore.getState().setError(
-            new Error('Failed to parse saved user')
-          )
-        }
-      }
-      setLoading(false)
-    }, [manager])
+    // useEffect(() => {
+    //   const savedUser = manager.getSingleToken('user')
+    //   if (savedUser) {
+    //     try {
+    //       const parsedUser = JSON.parse(savedUser)
+    //       useAuthStore.getState().setUser(parsedUser)
+    //       useAuthStore.getState().setError(null)
+    //     } catch {
+    //       useAuthStore.getState().resetAuth()
+    //       useAuthStore.getState().setError(
+    //         new Error('Failed to parse saved user')
+    //       )
+    //     }
+    //   }
+    //   setLoading(false)
+    // }, [manager])
 
     const setUser = (userData: UserType) => {
       useAuthStore.getState().setUser(userData as any)
       useAuthStore.getState().setError(null)
-      manager.setTokens({ user: JSON.stringify(userData) })
+      // manager.setTokens({ user: JSON.stringify(userData) })
     }
 
     const login = (tokens: Record<string, string>, userData: UserType) => {
       try {
-        manager.setTokens(tokens)
+        // manager.setTokens(tokens)
         setUser(userData)
       } catch (err) {
         useAuthStore.getState().setError(
@@ -83,7 +83,7 @@ export function createAuthContext<UserType>(options?: AuthContextOptions) {
 
     const logout = () => {
       try {
-        manager.clearTokens()
+        // manager.clearTokens()
         useAuthStore.getState().resetAuth()
       } catch (err) {
         useAuthStore.getState().setError(

package/src/RoleGuard.tsx

@@ -1,40 +1,40 @@
-// 'use client'
-
-// import React, { useEffect, useState } from 'react'
-// import { useRouter } from 'next/navigation'
-// import { auth } from './myAuth'
-
-// type RoleGuardProps = {
-//   children: React.ReactNode
-//   allowedRoles: string[]
-//   redirectTo?: string
-// }
-
-// const RoleGuard: React.FC<RoleGuardProps> = ({
-//   children,
-//   allowedRoles,
-//   redirectTo = '/unauthorized',
-// }) => {
-//   // ✅ Destructure useAuth INSIDE the component
-//   const { useAuth } = auth
-//   const { user, loading } = useAuth()
-
-//   const router = useRouter()
-//   const [isChecking, setIsChecking] = useState(true)
-
-//   useEffect(() => {
-//     if (!user) return
-
-//     const hasAccess = allowedRoles.includes(user?.role)
-//     if (!hasAccess) {
-//       router.replace(redirectTo)
-//     }
-//     setIsChecking(false)
-//   }, [user, allowedRoles, redirectTo, router])
-
-//   if (loading || !user || isChecking) return <div>Loading...</div>
-
-//   return <>{children}</>
-// }
-
-// export default RoleGuard
+'use client'
+
+import React, { useEffect, useState } from 'react'
+import { useRouter } from 'next/navigation'
+import { auth } from './myAuth'
+
+type RoleGuardProps = {
+  children: React.ReactNode
+  allowedRoles: string[]
+  redirectTo?: string
+}
+
+const RoleGuard: React.FC<RoleGuardProps> = ({
+  children,
+  allowedRoles,
+  redirectTo = '/unauthorized',
+}) => {
+  // ✅ Destructure useAuth INSIDE the component
+  const { useAuth } = auth
+  const { user, loading } = useAuth()
+
+  const router = useRouter()
+  const [isChecking, setIsChecking] = useState(true)
+
+  useEffect(() => {
+    if (!user) return
+
+    const hasAccess = allowedRoles.includes(user?.role)
+    if (!hasAccess) {
+      router.replace(redirectTo)
+    }
+    setIsChecking(false)
+  }, [user, allowedRoles, redirectTo, router])
+
+  if (loading || !user || isChecking) return <div>Loading...</div>
+
+  return <>{children}</>
+}
+
+export default RoleGuard

package/src/index.ts

@@ -5,12 +5,12 @@ export type User = {
 }
 
 // Export factory instead of fixed instance
-// export function createAppAuth(
-//   storage: 'localStorage' | 'sessionStorage' | 'cookie' = 'cookie'
-// ) {
-//   return createAuthContext<User>({ storage })
-// }
+export function createAppAuth(
+  storage: 'localStorage' | 'sessionStorage' | 'cookie' = 'cookie'
+) {
+  return createAuthContext<User>({ storage })
+}
 
 export { createAuthContext } from './AuthProvider'
-// export { default as AuthGuard } from './AuthGuard'
-// export { default as RoleGuard } from './RoleGuard'
+export { default as AuthGuard } from './AuthGuard'
+export { default as RoleGuard } from './RoleGuard'

package/src/myAuth.ts

@@ -1,4 +1,4 @@
-// // myAuth.ts
-// 'use client'
-// import { createAppAuth } from '.'
-// export const auth = createAppAuth() // { AuthProvider, useAuth }
+// myAuth.ts
+'use client'
+import { createAppAuth } from '.'
+export const auth = createAppAuth() // { AuthProvider, useAuth }