@dyrected/admin 2.5.46 → 2.5.47

package/dist/index.mjs

@@ -75,7 +75,8 @@ function DyrectedProvider({ children, apiKey: initialApiKey, baseUrl: initialBas
 	const [apiKey, setApiKey] = useState(() => initialApiKey || (typeof window !== "undefined" ? localStorage.getItem("dyrected_key") : null) || void 0);
 	const [siteId, setSiteId] = useState(() => initialSiteId || (typeof window !== "undefined" ? localStorage.getItem("dyrected_site_id") : null) || void 0);
 	const [schemas, setSchemas] = useState(null);
-	const [user, setUser] = useState(null);
+	const initialTokenUser = useMemo(() => initialToken ? decodeTokenPayload(initialToken) : null, [initialToken]);
+	const [user, setUser] = useState(() => initialTokenUser);
 	const [authCollectionSlug, setAuthCollectionSlug] = useState(() => (typeof window !== "undefined" ? localStorage.getItem("dyrected_admin_auth_collection") : null) || null);
 	const client = useMemo(() => {
 		if (!baseUrl) return null;
@@ -106,6 +107,7 @@ function DyrectedProvider({ children, apiKey: initialApiKey, baseUrl: initialBas
 			cancelled = true;
 		};
 	}, [client]);
+	const activeUser = initialTokenUser ?? user;
 	useEffect(() => {
 		if (initialToken && client) client.setToken(initialToken);
 	}, [initialToken, client]);
@@ -143,18 +145,18 @@ function DyrectedProvider({ children, apiKey: initialApiKey, baseUrl: initialBas
 		schemas
 	]);
 	useEffect(() => {
-		if (initialToken || !client || !schemas || user) return;
+		if (initialToken || !client || !schemas || activeUser) return;
 		const token = localStorage.getItem("dyrected_token");
 		const resolvedCollectionSlug = authCollectionSlug || getAdminCollectionSlug(schemas);
 		if (!token || !resolvedCollectionSlug) return;
 		client.setToken(token);
 		client.collection(resolvedCollectionSlug).me().then((nextUser) => setUser(nextUser), () => setUser(null));
 	}, [
+		activeUser,
 		authCollectionSlug,
 		client,
 		initialToken,
-		schemas,
-		user
+		schemas
 	]);
 	const logout = useCallback(() => {
 		localStorage.removeItem("dyrected_url");
@@ -183,13 +185,37 @@ function DyrectedProvider({ children, apiKey: initialApiKey, baseUrl: initialBas
 			logout,
 			isAuthenticated: !!baseUrl && !!apiKey,
 			schemas,
-			user,
+			user: activeUser,
 			initialToken,
 			components
 		},
 		children
 	});
 }
+function decodeTokenPayload(token) {
+	const payload = token.split(".")[1];
+	if (!payload) return null;
+	try {
+		const normalized = payload.replace(/-/g, "+").replace(/_/g, "/");
+		const padded = normalized.padEnd(Math.ceil(normalized.length / 4) * 4, "=");
+		const json = decodeURIComponent(atob(padded).split("").map((char) => `%${char.charCodeAt(0).toString(16).padStart(2, "0")}`).join(""));
+		const parsed = JSON.parse(json);
+		if (!parsed || typeof parsed !== "object") return null;
+		const user = parsed;
+		const roles = Array.isArray(user.roles) ? user.roles.filter((role) => typeof role === "string").map(normalizeCloudRole) : [];
+		const role = typeof user.role === "string" ? normalizeCloudRole(user.role) : void 0;
+		return {
+			...user,
+			...role ? { role } : {},
+			roles: roles.length > 0 ? roles : role ? [role] : roles
+		};
+	} catch {
+		return null;
+	}
+}
+function normalizeCloudRole(role) {
+	return role === "owner" ? "admin" : role;
+}
 //#endregion
 //#region src/providers/query-provider.tsx
 function QueryProvider({ children }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyrected/admin",
-  "version": "2.5.46",
+  "version": "2.5.47",
   "type": "module",
   "files": [
     "dist"
@@ -64,8 +64,8 @@
     "tailwind-merge": "^3.5.0",
     "tailwindcss-animate": "^1.0.7",
     "zod": "^3.25.76",
-    "@dyrected/core": "^2.5.46",
-    "@dyrected/sdk": "^2.5.46"
+    "@dyrected/core": "^2.5.47",
+    "@dyrected/sdk": "^2.5.47"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.0.0",