@sanvika/auth 2.5.8 → 2.6.0

package/dist/index.js

@@ -1,7 +1,14 @@
 "use client";
 
 // SanvikaAuthProvider.jsx
-import { createContext, useContext, useEffect, useState, useCallback } from "react";
+import {
+  createContext,
+  useContext,
+  useEffect,
+  useState,
+  useCallback,
+  useMemo
+} from "react";
 
 // constants.js
 var STORAGE_KEYS = {
@@ -14,29 +21,68 @@ var DEFAULT_AVATAR_SVG = `data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/200
 import { jsx } from "react/jsx-runtime";
 var S_AUTH_URL = "https://accounts.sanvikaproduction.com";
 var SanvikaAuthContext = createContext(null);
+function randomDeviceId() {
+  try {
+    if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
+      return crypto.randomUUID();
+    }
+  } catch {
+  }
+  return `device-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`;
+}
+function createDefaultWebPersistence() {
+  return {
+    getItem: async (key) => typeof localStorage !== "undefined" ? localStorage.getItem(key) : null,
+    setItem: async (key, value) => {
+      if (typeof localStorage !== "undefined") {
+        localStorage.setItem(key, value);
+      }
+    },
+    removeItem: async (key) => {
+      if (typeof localStorage !== "undefined") {
+        localStorage.removeItem(key);
+      }
+    }
+  };
+}
 function SanvikaAuthProvider({
   children,
   clientId,
   redirectUri,
-  dashboardPath
+  dashboardPath,
+  persistence: persistenceProp
 }) {
+  const persistence = useMemo(() => {
+    return persistenceProp || createDefaultWebPersistence();
+  }, [persistenceProp]);
   const [user, setUser] = useState(null);
   const [accessToken, setToken] = useState(null);
   const [loading, setLoading] = useState(true);
   useEffect(() => {
-    try {
-      const storedToken = localStorage.getItem(STORAGE_KEYS.ACCESS_TOKEN);
-      const storedUser = localStorage.getItem(STORAGE_KEYS.USER);
-      if (storedToken && storedUser) {
-        setToken(storedToken);
-        setUser(JSON.parse(storedUser));
+    let cancelled = false;
+    (async () => {
+      try {
+        const storedToken = await persistence.getItem(STORAGE_KEYS.ACCESS_TOKEN);
+        const storedUser = await persistence.getItem(STORAGE_KEYS.USER);
+        if (cancelled) {
+          return;
+        }
+        if (storedToken && storedUser) {
+          setToken(storedToken);
+          setUser(JSON.parse(storedUser));
+        }
+      } catch (e) {
+        console.error("[SanvikaAuth] Failed to load session:", e);
+      } finally {
+        if (!cancelled) {
+          setLoading(false);
+        }
       }
-    } catch (e) {
-      console.error("[SanvikaAuth] Failed to load from localStorage:", e);
-    } finally {
-      setLoading(false);
-    }
-  }, []);
+    })();
+    return () => {
+      cancelled = true;
+    };
+  }, [persistence]);
   const login = async ({ mobile, password, deviceId, deviceName }) => {
     const response = await fetch(`${S_AUTH_URL}/api/auth/login`, {
       method: "POST",
@@ -44,53 +90,61 @@ function SanvikaAuthProvider({
       body: JSON.stringify({
         mobile,
         password,
-        deviceId: deviceId || crypto.randomUUID(),
+        deviceId: deviceId || randomDeviceId(),
         deviceName: deviceName || "Browser"
       })
     });
     const data = await response.json();
-    if (!data.success) throw new Error(data.error);
-    localStorage.setItem(STORAGE_KEYS.ACCESS_TOKEN, data.accessToken);
-    localStorage.setItem(STORAGE_KEYS.USER, JSON.stringify(data.user));
+    if (!data.success) {
+      throw new Error(data.error || data.message || "Login failed");
+    }
+    await persistence.setItem(STORAGE_KEYS.ACCESS_TOKEN, data.accessToken);
+    await persistence.setItem(STORAGE_KEYS.USER, JSON.stringify(data.user));
     setToken(data.accessToken);
     setUser(data.user);
     return data;
   };
-  const setAuth = (token, userData) => {
-    localStorage.setItem(STORAGE_KEYS.ACCESS_TOKEN, token);
-    localStorage.setItem(STORAGE_KEYS.USER, JSON.stringify(userData));
-    setToken(token);
-    setUser(userData);
-  };
+  const setAuth = useCallback(
+    (token, userData) => {
+      setToken(token);
+      setUser(userData);
+      void persistence.setItem(STORAGE_KEYS.ACCESS_TOKEN, token).catch((e) => console.error("[SanvikaAuth] setAuth token persist:", e));
+      void persistence.setItem(STORAGE_KEYS.USER, JSON.stringify(userData)).catch((e) => console.error("[SanvikaAuth] setAuth user persist:", e));
+    },
+    [persistence]
+  );
   const logout = async () => {
     try {
       await fetch(`${S_AUTH_URL}/api/auth/logout`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
-          Authorization: `Bearer ${accessToken}`
+          ...accessToken ? { Authorization: `Bearer ${accessToken}` } : {}
         }
       });
     } catch (e) {
       console.error("[SanvikaAuth] Logout API error:", e);
     } finally {
-      localStorage.removeItem(STORAGE_KEYS.ACCESS_TOKEN);
-      localStorage.removeItem(STORAGE_KEYS.USER);
+      await persistence.removeItem(STORAGE_KEYS.ACCESS_TOKEN);
+      await persistence.removeItem(STORAGE_KEYS.USER);
       setToken(null);
       setUser(null);
     }
   };
-  const authFetch = useCallback(async (url, opts = {}) => {
-    const currentToken = typeof window !== "undefined" ? localStorage.getItem(STORAGE_KEYS.ACCESS_TOKEN) : null;
-    const headers = {
-      "Content-Type": "application/json",
-      ...currentToken && { Authorization: `Bearer ${currentToken}` },
-      ...opts.headers
-    };
-    const res = await fetch(url, { ...opts, headers });
-    const data = await res.json();
-    return { data, success: data.success };
-  }, []);
+  const authFetch = useCallback(
+    async (url, opts = {}) => {
+      const currentToken = await persistence.getItem(STORAGE_KEYS.ACCESS_TOKEN);
+      const headers = {
+        "Content-Type": "application/json",
+        ...currentToken && { Authorization: `Bearer ${currentToken}` },
+        ...opts.headers
+      };
+      const res = await fetch(url, { ...opts, headers });
+      const data = await res.json();
+      return { data, success: data.success };
+    },
+    [persistence]
+  );
   const value = {
     user,
     accessToken,
@@ -109,8 +163,7 @@ function SanvikaAuthProvider({
   return /* @__PURE__ */ jsx(SanvikaAuthContext.Provider, { value, children });
 }
 function useSanvikaAuth() {
-  const ctx = useContext(SanvikaAuthContext);
-  return ctx;
+  return useContext(SanvikaAuthContext);
 }
 
 // SanvikaAccountButton.jsx

package/dist/server.js

@@ -302,6 +302,17 @@ async function authenticateAdmin(request) {
       return _buildUnauthorized("Invalid or expired token.", "INVALID_TOKEN");
     }
     const uid = saPayload.sub;
+    const jwtRole = saPayload.role;
+    if (jwtRole === "superadmin" && uid) {
+      const adminData2 = {
+        uid,
+        adminId: null,
+        role: "superadmin",
+        mobile: saPayload.mobile || null
+      };
+      _adminCache.set(cacheKey, { adminData: adminData2, expires: Date.now() + _ADMIN_CACHE_TTL });
+      return { success: true, admin: adminData2 };
+    }
     const admin = await verifyAdminFromAuth(uid);
     if (!admin) {
       return _buildUnauthorized("Unauthorized or admin account not found.", "ADMIN_NOT_FOUND");
@@ -309,13 +320,14 @@ async function authenticateAdmin(request) {
     if (admin.isBlocked) {
       return _buildForbidden("Admin account is blocked.", "ADMIN_BLOCKED");
     }
-    if (!["admin", "superadmin", "moderator"].includes(admin.role)) {
+    const effectiveRole = admin.role || (jwtRole && ["admin", "superadmin", "moderator"].includes(jwtRole) ? jwtRole : null);
+    if (!effectiveRole || !["admin", "superadmin", "moderator"].includes(effectiveRole)) {
       return _buildForbidden("Invalid admin role.", "INVALID_ADMIN_ROLE");
     }
     const adminData = {
       uid: admin.uid,
       adminId: admin.adminId,
-      role: admin.role,
+      role: effectiveRole,
       mobile: admin.mobile
     };
     _adminCache.set(cacheKey, { adminData, expires: Date.now() + _ADMIN_CACHE_TTL });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanvika/auth",
-  "version": "2.5.8",
+  "version": "2.6.0",
   "description": "Sanvika Auth SDK — React components/hooks + server-side token verification and user proxy",
   "type": "module",
   "main": "dist/index.js",
@@ -23,6 +23,11 @@
     "next": ">=16.2.1",
     "react": ">=18"
   },
+  "peerDependenciesMeta": {
+    "next": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "tsup": "^8.5.1"
   },