@rspress-theme-anatole/theme-default 0.7.26 → 0.7.28

package/dist/bundle.js

@@ -339,72 +339,70 @@ function normalizeRoleList(value) {
     const list = Array.isArray(value) ? value : String(value).split(',');
     return list.map((role) => String(role).trim().toLowerCase()).filter(Boolean);
 }
-// Cache for user roles fetched from userContext endpoint
-let _cachedUserRoles = null;
-let _userRolesFetchPromise = null;
+// Cache for user context fetched from userContext endpoint
+let _cachedUserContext = null;
+let _userContextFetchPromise = null;
 
-function getUserRoles() {
-    // Return cached roles if available
-    if (_cachedUserRoles !== null) return _cachedUserRoles;
-    return [];
+function getUserContext() {
+    // Return cached user context if available
+    if (_cachedUserContext !== null) return _cachedUserContext;
+    return { isAuthenticated: false, userId: null };
 }
 
-async function fetchUserRoles(userContextUrl) {
-    if (!userContextUrl) return [];
-    if (_cachedUserRoles !== null) return _cachedUserRoles;
-    if (_userRolesFetchPromise) return _userRolesFetchPromise;
+async function fetchUserContext(userContextUrl) {
+    if (!userContextUrl) return { isAuthenticated: false, userId: null };
+    if (_cachedUserContext !== null) return _cachedUserContext;
+    if (_userContextFetchPromise) return _userContextFetchPromise;
     
-    _userRolesFetchPromise = (async () => {
+    _userContextFetchPromise = (async () => {
         try {
             const response = await fetch(userContextUrl, { credentials: 'include' });
             if (!response.ok) {
                 console.warn('Failed to fetch user context:', response.status);
-                _cachedUserRoles = [];
-                return [];
+                _cachedUserContext = { isAuthenticated: false, userId: null };
+                return _cachedUserContext;
             }
             const data = await response.json();
-            const authMethods = ["anonymous", "internal-ad", "aos-sso", "azure-b2c"];
-            const userauthMethod = data?.authMethod || "";
-            const roles = userauthMethod === "anonymous"
-                            ? ["anonymous"]
-                            : authMethods.filter(m => m !== "anonymous");
-            _cachedUserRoles = normalizeRoleList(roles);
+            _cachedUserContext = {
+                isAuthenticated: data?.isAuthenticated || false,
+                userId: data?.userId || null
+            };
             // Dispatch event to trigger sidebar re-render
             if (typeof window !== 'undefined') {
-                window.dispatchEvent(new Event('UserRolesReady'));
+                window.dispatchEvent(new Event('UserContextReady'));
             }
-            return _cachedUserRoles;
+            return _cachedUserContext;
         } catch (e) {
             console.warn('Error fetching user context:', e);
-            _cachedUserRoles = [];
-            return [];
+            _cachedUserContext = { isAuthenticated: false, userId: null };
+            return _cachedUserContext;
         } finally {
-            _userRolesFetchPromise = null;
+            _userContextFetchPromise = null;
         }
     })();
     
-    return _userRolesFetchPromise;
+    return _userContextFetchPromise;
 }
-function isItemLocked(item, userRoles) {
+function isItemLocked(item, userContext) {
     const requiredRoles = normalizeRoleList(item?.roles);
     // No roles required = public content (not locked)
     if (!requiredRoles.length) return false;
-    // Has roles required but user has matching role = unlocked
-    if (userRoles.length && requiredRoles.some((role) => userRoles.includes(role))) return false;
-    // Has roles required but user doesn't have matching role = locked
+    // User is authenticated with valid userId = unlocked (regardless of roles)
+    if (userContext?.isAuthenticated && userContext?.userId) return false;
+    // Has roles required but user is not authenticated = locked
     return true;
 }
-function markLockedSidebarItems(items, userRoles) {
+function markLockedSidebarItems(items, userContext) {
     if (!Array.isArray(items)) return items;
     return items.map((item) => {
         if (!item) return null;
         let nextItem = item;
-        const locked = isItemLocked(item, userRoles);
+        const locked = isItemLocked(item, userContext);
         if (locked) {
             nextItem = { ...nextItem, locked: true };
         }
         if ('items' in item && Array.isArray(item.items)) {
-            const markedItems = markLockedSidebarItems(item.items, userRoles);
+            const markedItems = markLockedSidebarItems(item.items, userContext);
             nextItem = { ...nextItem, items: markedItems };
         }
         return nextItem;
@@ -417,11 +415,11 @@ function useSidebarData() {
     const pathname = decodeURIComponent(rawPathname);
     const [roleVersion, setRoleVersion] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)(0);
     
-    // Fetch user roles from userContext endpoint
+    // Fetch user context from userContext endpoint
     (0, __WEBPACK_EXTERNAL_MODULE_react__.useEffect)(() => {
         const userContextUrl = siteData?.auth?.endpoints?.userContext;
         if (userContextUrl) {
-            fetchUserRoles(userContextUrl);
+            fetchUserContext(userContextUrl);
         }
     }, [siteData?.auth?.endpoints?.userContext]);
     
@@ -429,15 +427,15 @@ function useSidebarData() {
         if ('undefined' == typeof window) return;
         const handler = () => setRoleVersion((v) => v + 1);
         window.addEventListener('MetaRolesReady', handler);
-        window.addEventListener('UserRolesReady', handler);
+        window.addEventListener('UserContextReady', handler);
         return () => {
             window.removeEventListener('MetaRolesReady', handler);
-            window.removeEventListener('UserRolesReady', handler);
+            window.removeEventListener('UserContextReady', handler);
         };
     }, []);
     const sidebarData = (0, __WEBPACK_EXTERNAL_MODULE_react__.useMemo)(() => {
         const data = getSidebarDataGroup(sidebar, pathname);
-        const userRoles = getUserRoles();
+        const userContext = getUserContext();
         let dataWithRoles = data;
         try {
             const roleMap = 'undefined' != typeof window ? window.__META_ROLE_MAP__ : null;
@@ -470,7 +468,7 @@ function useSidebarData() {
             }
         } catch (e) {
         }
-        return markLockedSidebarItems(dataWithRoles, userRoles);
+        return markLockedSidebarItems(dataWithRoles, userContext);
     }, [
         sidebar,
         pathname,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rspress-theme-anatole/theme-default",
   "author": "Anatole Tong",
-  "version": "0.7.26",
+  "version": "0.7.28",
   "license": "MIT",
   "sideEffects": [
     "*.css",
@@ -21,8 +21,8 @@
   "types": "./dist/bundle.d.ts",
   "dependencies": {
     "@mdx-js/react": "2.3.0",
-    "@rspress-theme-anatole/rspress-plugin-mermaid": "0.7.26",
-    "@rspress-theme-anatole/shared": "0.7.26",
+    "@rspress-theme-anatole/rspress-plugin-mermaid": "0.7.28",
+    "@rspress-theme-anatole/shared": "0.7.28",
     "@rspress/runtime": "1.43.8",
     "body-scroll-lock": "4.0.0-beta.0",
     "copy-to-clipboard": "^3.3.3",