@nocobase/plugin-acl 1.7.5 → 1.7.7

package/dist/externalVersion.js

@@ -8,7 +8,7 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.7.5",
+  "@nocobase/client": "1.7.7",
   "antd": "5.24.2",
   "react": "18.2.0",
   "react-i18next": "11.18.6",
@@ -17,14 +17,14 @@ module.exports = {
   "@formily/react": "2.3.0",
   "@ant-design/icons": "5.6.1",
   "lodash": "4.17.21",
-  "@nocobase/utils": "1.7.5",
-  "@nocobase/actions": "1.7.5",
-  "@nocobase/cache": "1.7.5",
-  "@nocobase/database": "1.7.5",
-  "@nocobase/server": "1.7.5",
-  "@nocobase/test": "1.7.5",
+  "@nocobase/utils": "1.7.7",
+  "@nocobase/actions": "1.7.7",
+  "@nocobase/cache": "1.7.7",
+  "@nocobase/database": "1.7.7",
+  "@nocobase/server": "1.7.7",
+  "@nocobase/test": "1.7.7",
   "@formily/core": "2.3.0",
   "@formily/antd-v5": "1.2.3",
   "antd-style": "3.7.1",
-  "@nocobase/acl": "1.7.5"
+  "@nocobase/acl": "1.7.7"
 };

package/dist/server/middlewares/with-acl-meta.js

@@ -44,7 +44,7 @@ var import_database = require("@nocobase/database");
 var import_acl = require("@nocobase/acl");
 function createWithACLMetaMiddleware() {
   return async (ctx, next) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     await next();
     const dataSourceKey = ctx.get("x-data-source");
     const dataSource = ctx.app.dataSourceManager.dataSources.get(dataSourceKey);
@@ -64,11 +64,11 @@ function createWithACLMetaMiddleware() {
     if (!collection) {
       return;
     }
-    const Model = collection.model;
+    const Model2 = collection.model;
     if (collection.isMultiFilterTargetKey()) {
       return;
     }
-    const primaryKeyField = Model.primaryKeyField || Model.primaryKeyAttribute;
+    const primaryKeyField = Model2.primaryKeyField || Model2.primaryKeyAttribute;
     let listData;
     if ((_a = ctx.body) == null ? void 0 : _a.data) {
       listData = ctx.data;
@@ -164,8 +164,15 @@ function createWithACLMetaMiddleware() {
         ...params,
         context: actionCtx
       });
+      if (((_f = (_e = ctx.action) == null ? void 0 : _e.params) == null ? void 0 : _f.appends) || (queryParams == null ? void 0 : queryParams.appends)) {
+        const queryParamsWithAppends = (queryParams == null ? void 0 : queryParams.appends) || [];
+        const ctxActionParamsWithAppends = ((_h = (_g = ctx.action) == null ? void 0 : _g.params) == null ? void 0 : _h.appends) || [];
+        const appends = queryParamsWithAppends.filter((x) => ctxActionParamsWithAppends.includes(x));
+        queryParams.include = appends;
+        queryParams.appends = appends;
+      }
       const actionSql = ctx.db.sequelize.queryInterface.queryGenerator.selectQuery(
-        Model.getTableName(),
+        Model2.getTableName(),
         {
           where: (() => {
             const filterObj = queryParams.where;
@@ -214,7 +221,7 @@ function createWithACLMetaMiddleware() {
           attributes: [primaryKeyField],
           includeIgnoreAttributes: false
         },
-        Model
+        Model2
       );
       const whereCaseMatch = actionSql.match(/WHERE (.*?);/);
       if (!whereCaseMatch) {
@@ -232,6 +239,7 @@ function createWithACLMetaMiddleware() {
         });
       }
     }
+    const includes = conditions.map((c) => c.include).flat().map((x) => processIncludes(collection.model, x || []));
     const results = await collection.model.findAll({
       where: {
         [primaryKeyField]: ids
@@ -242,7 +250,7 @@ function createWithACLMetaMiddleware() {
           return [ctx.db.sequelize.literal(`CASE WHEN ${condition.whereCase} THEN 1 ELSE 0 END`), condition.action];
         })
       ],
-      include: conditions.map((condition) => condition.include).flat(),
+      include: includes,
       raw: true
     });
     const allowedActions = inspectActions.map((action) => {
@@ -267,6 +275,19 @@ function createWithACLMetaMiddleware() {
     }
   };
 }
+function processIncludes(model, include) {
+  const association = model.associations[include];
+  if (association == null ? void 0 : association["generateInclude"]) {
+    const newInclude = {
+      association: include,
+      attributes: [],
+      // out put empty fields by default
+      ...association["generateInclude"]()
+    };
+    return newInclude;
+  }
+  return include;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createWithACLMetaMiddleware

package/dist/server/server.js

@@ -554,6 +554,7 @@ class PluginACLServer extends import_server.Plugin {
           await withACLMeta(ctx, next);
         } catch (error) {
           ctx.logger.error(error);
+          throw error;
         }
       },
       { after: "dataSource", group: "with-acl-meta" }

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "权限控制",
   "description": "Based on roles, resources, and actions, access control can precisely manage interface configuration permissions, data operation permissions, menu access permissions, and plugin permissions.",
   "description.zh-CN": "基于角色、资源和操作的权限控制，可以精确控制界面配置权限、数据操作权限、菜单访问权限、插件权限。",
-  "version": "1.7.5",
+  "version": "1.7.7",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/acl",
@@ -33,5 +33,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "d67cf22b79077f5b4c1dc3f86068850923119364"
+  "gitHead": "41c87dbed474b3d4007f4e4cf3bb0969d609d942"
 }