@unchainedshop/roles 4.8.2 → 4.8.4

package/lib/utils/permissions.d.ts

@@ -1 +1 @@
-export declare const permissions: (userRoles: any, allRoles: any) => Promise<any[]>;
+export declare const permissions: (userRoles: any, allRoles: any) => Promise<string[]>;

package/lib/utils/permissions.js

@@ -1,22 +1,30 @@
 export const permissions = async (userRoles, allRoles) => {
-    const actions = userRoles?.flatMap((role) => {
-        const foundRole = Object.values(allRoles).find((r) => r.name === role);
+    const rolesByName = new Map();
+    for (const r of Object.values(allRoles)) {
+        if (r?.name)
+            rolesByName.set(r.name, r);
+    }
+    const result = [];
+    const seen = new Set();
+    for (const role of userRoles || []) {
+        const foundRole = rolesByName.get(role);
         if (!foundRole)
-            return [];
-        return Object.entries(foundRole.allowRules || {}).flatMap(([roleName, funcs]) => {
-            return funcs.map(async (f) => {
+            continue;
+        for (const [actionName, funcs] of Object.entries(foundRole.allowRules || {})) {
+            if (seen.has(actionName))
+                continue;
+            for (const f of funcs) {
                 try {
-                    const r = await f(null, null, null);
-                    if (r)
-                        return roleName;
-                    return null;
+                    if (await f(null, null, null)) {
+                        seen.add(actionName);
+                        result.push(actionName);
+                        break;
+                    }
                 }
                 catch {
-                    return null;
                 }
-            });
-        });
-    });
-    const resolvedActions = await Promise.all(actions);
-    return [...new Set(resolvedActions)].filter(Boolean).toSorted((a, b) => a.localeCompare(b));
+            }
+        }
+    }
+    return result.sort((a, b) => a.localeCompare(b));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/roles",
-  "version": "4.8.2",
+  "version": "4.8.4",
   "description": "Role-based access control system for the Unchained Engine",
   "main": "lib/roles-index.js",
   "types": "lib/roles-index.d.ts",