@nocobase/plugin-acl 0.13.0-alpha.7 → 0.13.0-alpha.9

package/dist/server/server.js

@@ -491,7 +491,7 @@ class PluginACL extends import_server.Plugin {
     });
     this.app.acl.use(
       async (ctx, next) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const { actionName, resourceName, resourceOf } = ctx.action;
         if (resourceName.includes(".") && resourceOf) {
           if (!((_b = (_a = ctx == null ? void 0 : ctx.permission) == null ? void 0 : _a.can) == null ? void 0 : _b.params)) {
@@ -508,10 +508,11 @@ class PluginACL extends import_server.Plugin {
               ctx.permission.can = false;
             }
           } else {
-            const filter = await parseJsonTemplate(((_d = action == null ? void 0 : action.params) == null ? void 0 : _d.filter) || {}, ctx);
+            const filteredParams = this.app.acl.filterParams(ctx, collectionName, (action == null ? void 0 : action.params) || {});
+            const params = await parseJsonTemplate(filteredParams, ctx);
             const sourceInstance = await ctx.db.getRepository(collectionName).findOne({
               filterByTk: resourceOf,
-              filter
+              filter: params.filter || {}
             });
             if (!sourceInstance) {
               ctx.permission.can = false;

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "权限控制",
   "description": "A simple access control based on roles, resources and actions",
   "description.zh-CN": "基于角色、资源和操作的权限控制。",
-  "version": "0.13.0-alpha.7",
+  "version": "0.13.0-alpha.9",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -28,5 +28,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "5cd58b0b56718e525d4deca7e25e5e5172022212"
+  "gitHead": "ee5825377d8bec05f968a8365a0cdcd49878ada6"
 }