@jmruthers/pace-core 0.5.75 → 0.5.77

package/src/rbac/hooks/usePermissions.ts

@@ -47,7 +47,7 @@ import {
  * ```
  */
 export function usePermissions(userId: UUID, scope: Scope) {
-  const [permissions, setPermissions] = useState<PermissionMap>({});
+  const [permissions, setPermissions] = useState<PermissionMap>({} as PermissionMap);
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState<Error | null>(null);
   const isFetchingRef = useRef(false);
@@ -60,7 +60,7 @@ export function usePermissions(userId: UUID, scope: Scope) {
       }
 
       if (!userId) {
-        setPermissions({});
+        setPermissions({} as PermissionMap);
         setIsLoading(false);
         return;
       }
@@ -68,7 +68,7 @@ export function usePermissions(userId: UUID, scope: Scope) {
       // Don't fetch permissions if scope is invalid (e.g., organisationId is empty)
       // Return empty permissions and loading true for invalid scopes to prevent premature access denied
       if (!scope.organisationId || scope.organisationId.trim() === '') {
-        setPermissions({});
+        setPermissions({} as PermissionMap);
         setIsLoading(true);
         setError(null);
         return;
@@ -93,15 +93,24 @@ export function usePermissions(userId: UUID, scope: Scope) {
   }, [userId, scope.organisationId, scope.eventId, scope.appId]);
 
   const hasPermission = useCallback((permission: Permission): boolean => {
-    return !!permissions[permission];
+    if (permissions['*']) {
+      return true;
+    }
+    return permissions[permission] === true;
   }, [permissions]);
 
   const hasAnyPermission = useCallback((permissionList: Permission[]): boolean => {
-    return permissionList.some(p => !!permissions[p]);
+    if (permissions['*']) {
+      return true;
+    }
+    return permissionList.some(p => permissions[p] === true);
   }, [permissions]);
 
   const hasAllPermissions = useCallback((permissionList: Permission[]): boolean => {
-    return permissionList.every(p => !!permissions[p]);
+    if (permissions['*']) {
+      return true;
+    }
+    return permissionList.every(p => permissions[p] === true);
   }, [permissions]);
 
   const refetch = useCallback(async () => {
@@ -111,14 +120,14 @@ export function usePermissions(userId: UUID, scope: Scope) {
     }
 
     if (!userId) {
-      setPermissions({});
+      setPermissions({} as PermissionMap);
       setIsLoading(false);
       return;
     }
 
     // Don't fetch permissions if scope is invalid (e.g., organisationId is empty)
     if (!scope.organisationId || scope.organisationId.trim() === '') {
-      setPermissions({});
+      setPermissions({} as PermissionMap);
       setIsLoading(true);
       setError(null);
       return;
@@ -220,6 +229,7 @@ export function useCan(
         // Don't check permissions if scope is invalid (e.g., organisationId is empty)
         // Return can: false and loading: true for invalid scopes to prevent premature access denied
         if (!scope.organisationId || scope.organisationId.trim() === '') {
+          console.log('[useCan] Invalid scope - organisationId is empty:', { scope, permission, pageId });
           setCan(false);
           setIsLoading(true);
           return;
@@ -229,12 +239,24 @@ export function useCan(
           setIsLoading(true);
           setError(null);
           
+          console.log('[useCan] Checking permission:', { 
+            userId, 
+            organisationId: scope.organisationId, 
+            eventId: scope.eventId, 
+            appId: scope.appId,
+            permission, 
+            pageId 
+          });
+          
           const result = useCache 
             ? await isPermittedCached({ userId, scope, permission, pageId })
             : await isPermitted({ userId, scope, permission, pageId });
           
+          console.log('[useCan] Permission check result:', { permission, result, pageId });
+          
           setCan(result);
         } catch (err) {
+          console.error('[useCan] Permission check error:', { permission, error: err });
           setError(err instanceof Error ? err : new Error('Failed to check permission'));
           setCan(false);
         } finally {
@@ -646,13 +668,13 @@ export function useCachedPermissions(userId: UUID, scope: Scope): {
   invalidateCache: () => void;
   refetch: () => Promise<void>;
 } {
-  const [permissions, setPermissions] = useState<PermissionMap>({});
+  const [permissions, setPermissions] = useState<PermissionMap>({} as PermissionMap);
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState<Error | null>(null);
 
   const fetchCachedPermissions = useCallback(async () => {
     if (!userId) {
-      setPermissions({});
+      setPermissions({} as PermissionMap);
       setIsLoading(false);
       return;
     }