nextauthz 1.1.6 → 1.1.8

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "nextauthz",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "scripts": {
-    "build": "tsup src/index.ts --format esm,cjs --dts",
-    "dev": "tsup src/index.ts --watch"
+    "build": "tsup src/index.ts --format esm,cjs --dts --external react --external react-dom --external zustand --external next",
+    "dev": "tsup src/index.ts --watch --external react --external react-dom --external zustand --external next"
   },
   "keywords": [],
   "author": "",
@@ -15,12 +15,16 @@
   "devDependencies": {
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "tsup": "^8.5.1"
+  },
+  "peerDependencies": {
+    "react": "^18.2.0 || ^19.0.0",
+    "react-dom": "^18.2.0 || ^19.0.0",
+    "next": "^16.0.0",
+    "zustand": "^5.0.0"
   },
   "dependencies": {
-    "next": "^16.1.6",
-    "react-token-manager": "^1.0.7",
-    "tsup": "^8.5.1",
-    "zustand": "^5.0.11"
+    "react-token-manager": "^1.0.7"
   }
-} 
+}

package/src/AuthProvider.tsx

@@ -1,137 +1,111 @@
-// 'use client'
-
-// import React, {
-//   createContext,
-//   useContext,
-//   ReactNode,
-//   useEffect,
-//   useState,
-// } from 'react'
-// import { configureTokenManager, useTokenManager } from 'react-token-manager'
-// import { useAuthStore } from '../store/useGuardStore'
-
-// export type AuthContextType<UserType> = {
-//   user: UserType | null
-//   login: (tokens: Record<string, string>, user: UserType) => void
-//   logout: () => void
-//   setUser: (user: UserType) => void
-//   loading: boolean
-//   error: Error | null
-// }
-
-// export type AuthContextOptions = {
-//   storage?: 'localStorage' | 'sessionStorage' | 'cookie'
-// }
-
-// /**
-//  * Factory to create AuthProvider and typed useAuth hook
-//  */
-// export function createAuthContext<UserType>(options?: AuthContextOptions) {
-//   const AuthContext = createContext<AuthContextType<UserType> | null>(null)
-
-//   const AuthProvider = ({ children }: { children: ReactNode }) => {
-//     const storageType = options?.storage || 'cookie'
-
-//     // Configure token manager once on mount
-//     useEffect(() => {
-//       configureTokenManager({ storage: storageType })
-//     }, [storageType])
-
-//     // ✅ Hooks must be called inside component
-//     const manager = useTokenManager()
-
-//     const [loading, setLoading] = useState(true)
-
-//     const rawUser = useAuthStore((state) => state.user)
-//     const error = useAuthStore((state) => state.error)
-//     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])
-
-//     const setUser = (userData: UserType) => {
-//       useAuthStore.getState().setUser(userData as any)
-//       useAuthStore.getState().setError(null)
-//       manager.setTokens({ user: JSON.stringify(userData) })
-//     }
-
-//     const login = (tokens: Record<string, string>, userData: UserType) => {
-//       try {
-//         manager.setTokens(tokens)
-//         setUser(userData)
-//       } catch (err) {
-//         useAuthStore.getState().setError(
-//           err instanceof Error ? err : new Error(String(err))
-//         )
-//       }
-//     }
-
-//     const logout = () => {
-//       try {
-//         manager.clearTokens()
-//         useAuthStore.getState().resetAuth()
-//       } catch (err) {
-//         useAuthStore.getState().setError(
-//           err instanceof Error ? err : new Error(String(err))
-//         )
-//       }
-//     }
-
-//     return (
-//       <AuthContext.Provider
-//         value={{ user, login, logout, setUser, loading, error }}
-//       >
-//         {children}
-//       </AuthContext.Provider>
-//     )
-//   }
-
-//   const useAuth = (): AuthContextType<UserType> => {
-//     const ctx = useContext(AuthContext)
-//     if (!ctx) throw new Error('useAuth must be used inside AuthProvider')
-//     return ctx
-//   }
-
-//   return { AuthProvider, useAuth }
-// }
-
-// src/context/ThemeContext.js
 'use client'
-import { createContext, useState } from 'react';
-
-// 1️⃣ Create the context
-export const ThemeContext = createContext({
-  theme: 'light',          // default value
-  toggleTheme: () => {}    // default empty function
-});
-
-// 2️⃣ Create the provider component
-export const ThemeProvider = ({ children }: any) => {
-  const [theme, setTheme] = useState('light');
-
-  const toggleTheme = () => {
-    setTheme(prev => (prev === 'light' ? 'dark' : 'light'));
-  };
-
-  return (
-    <ThemeContext.Provider value={{ theme, toggleTheme }}>
-      {children}
-    </ThemeContext.Provider>
-  );
-};
 
+import React, {
+  createContext,
+  useContext,
+  ReactNode,
+  useEffect,
+  useState,
+} from 'react'
+import { configureTokenManager, useTokenManager } from 'react-token-manager'
+import { useAuthStore } from '../store/useGuardStore'
+
+export type AuthContextType<UserType> = {
+  user: UserType | null
+  login: (tokens: Record<string, string>, user: UserType) => void
+  logout: () => void
+  setUser: (user: UserType) => void
+  loading: boolean
+  error: Error | null
+}
+
+export type AuthContextOptions = {
+  storage?: 'localStorage' | 'sessionStorage' | 'cookie'
+}
+
+/**
+ * Factory to create AuthProvider and typed useAuth hook
+ */
+export function createAuthContext<UserType>(options?: AuthContextOptions) {
+  const AuthContext = createContext<AuthContextType<UserType> | null>(null)
+
+  const AuthProvider = ({ children }: { children: ReactNode }) => {
+    const storageType = options?.storage || 'cookie'
+
+    // Configure token manager once on mount
+    useEffect(() => {
+      configureTokenManager({ storage: storageType })
+    }, [storageType])
+
+    // ✅ Hooks must be called inside component
+    const manager = useTokenManager()
+
+    const [loading, setLoading] = useState(true)
+
+    const rawUser = useAuthStore((state) => state.user)
+    const error = useAuthStore((state) => state.error)
+    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])
+
+    const setUser = (userData: UserType) => {
+      useAuthStore.getState().setUser(userData as any)
+      useAuthStore.getState().setError(null)
+      manager.setTokens({ user: JSON.stringify(userData) })
+    }
+
+    const login = (tokens: Record<string, string>, userData: UserType) => {
+      try {
+        manager.setTokens(tokens)
+        setUser(userData)
+      } catch (err) {
+        useAuthStore.getState().setError(
+          err instanceof Error ? err : new Error(String(err))
+        )
+      }
+    }
+
+    const logout = () => {
+      try {
+        manager.clearTokens()
+        useAuthStore.getState().resetAuth()
+      } catch (err) {
+        useAuthStore.getState().setError(
+          err instanceof Error ? err : new Error(String(err))
+        )
+      }
+    }
+
+    return (
+      <AuthContext.Provider
+        value={{ user, login, logout, setUser, loading, error }}
+      >
+        {children}
+      </AuthContext.Provider>
+    )
+  }
+
+  const useAuth = (): AuthContextType<UserType> => {
+    const ctx = useContext(AuthContext)
+    if (!ctx) throw new Error('useAuth must be used inside AuthProvider')
+    return ctx
+  }
+
+  return { AuthProvider, useAuth }
+}

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

@@ -1,16 +1,16 @@
-import { ThemeProvider } from './AuthProvider'
+import { createAuthContext } from './AuthProvider'
 
 export type User = {
   [key: string]: any
 }
 
 // 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 { ThemeProvider } from './AuthProvider'
+export { createAuthContext } from './AuthProvider'
 export { default as AuthGuard } from './AuthGuard'
-// export { default as RoleGuard } from './RoleGuard'
+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 }