@svadmin/core 0.18.0 → 0.18.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@svadmin/core",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "author": "zuohuadong",
   "repository": {
     "type": "git",

package/src/adapters/casbin.ts

@@ -48,13 +48,20 @@ export function createCasbinAccessControl(
   options: CasbinAdapterOptions,
 ): AccessControlProvider {
   return {
-    can: async ({ resource, action }: CanParams): Promise<CanResult> => {
-      const user = options.getUser();
-      const allowed = await enforcer.enforce(user, resource, action);
-      return {
-        can: allowed,
-        reason: allowed ? undefined : `User "${user}" cannot "${action}" on "${resource}"`,
+    can: async (params: CanParams | CanParams[]): Promise<CanResult | CanResult[]> => {
+      const executeCheck = async ({ resource, action }: CanParams) => {
+        const user = options.getUser();
+        const allowed = await enforcer.enforce(user, resource, action);
+        return {
+          can: allowed,
+          reason: allowed ? undefined : `User "${user}" cannot "${action}" on "${resource}"`,
+        };
       };
+
+      if (Array.isArray(params)) {
+        return Promise.all(params.map(p => executeCheck(p)));
+      }
+      return executeCheck(params);
     },
     options: options.providerOptions,
   };

package/src/adapters/casl.ts

@@ -38,13 +38,22 @@ export function createCaslAccessControl(
   options?: AccessControlProvider['options'],
 ): AccessControlProvider {
   return {
-    can: async ({ resource, action, params }: CanParams): Promise<CanResult> => {
-      const field = params?.field as string | undefined;
-      const allowed = ability.can(action, resource, field);
-      return {
-        can: allowed,
-        reason: allowed ? undefined : `Cannot "${action}" on "${resource}"${field ? ` (field: ${field})` : ''}`,
+    can: async (params: CanParams | CanParams[]): Promise<CanResult | CanResult[]> => {
+      const executeCheck = async ({ resource, action, params: actionParams }: CanParams) => {
+        const field = actionParams?.field as string | undefined;
+        // CaslAbility's can only accepts string for subject based on its internal definition in this file
+        // To support object subjects when CanParams might pass them, cast it to any here to satisfy the local interface
+        const allowed = ability.can(action as string, resource as any, field);
+        return {
+          can: allowed,
+          reason: allowed ? undefined : `Cannot "${action}" on "${resource}"${field ? ` (field: ${field})` : ''}`,
+        };
       };
+
+      if (Array.isArray(params)) {
+        return Promise.all(params.map(p => executeCheck(p)));
+      }
+      return executeCheck(params);
     },
     options,
   };