@nocobase/plugin-acl 1.9.0-beta.5 → 1.9.0-beta.7

package/dist/externalVersion.js

@@ -8,7 +8,7 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.9.0-beta.5",
+  "@nocobase/client": "1.9.0-beta.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.9.0-beta.5",
-  "@nocobase/actions": "1.9.0-beta.5",
-  "@nocobase/cache": "1.9.0-beta.5",
-  "@nocobase/database": "1.9.0-beta.5",
-  "@nocobase/server": "1.9.0-beta.5",
-  "@nocobase/test": "1.9.0-beta.5",
+  "@nocobase/utils": "1.9.0-beta.7",
+  "@nocobase/actions": "1.9.0-beta.7",
+  "@nocobase/cache": "1.9.0-beta.7",
+  "@nocobase/database": "1.9.0-beta.7",
+  "@nocobase/server": "1.9.0-beta.7",
+  "@nocobase/test": "1.9.0-beta.7",
   "@formily/core": "2.3.0",
   "@formily/antd-v5": "1.2.3",
   "antd-style": "3.7.1",
-  "@nocobase/acl": "1.9.0-beta.5"
+  "@nocobase/acl": "1.9.0-beta.7"
 };

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

@@ -39,13 +39,16 @@ __export(with_acl_meta_exports, {
   createWithACLMetaMiddleware: () => createWithACLMetaMiddleware
 });
 module.exports = __toCommonJS(with_acl_meta_exports);
-var import_lodash = __toESM(require("lodash"));
-var import_database = require("@nocobase/database");
 var import_acl = require("@nocobase/acl");
+var import_database = require("@nocobase/database");
+var import_lodash = __toESM(require("lodash"));
 function createWithACLMetaMiddleware() {
   return async (ctx, next) => {
     var _a, _b, _c, _d;
     await next();
+    if (process.env.DISABLE_ACL_META === "true" || process.env.DISABLE_ACL_META === "1") {
+      return;
+    }
     const dataSourceKey = ctx.get("x-data-source");
     const dataSource = ctx.app.dataSourceManager.dataSources.get(dataSourceKey);
     const db = dataSource ? dataSource.collectionManager.db : ctx.db;
@@ -164,6 +167,9 @@ function createWithACLMetaMiddleware() {
         ...params,
         context: actionCtx
       });
+      const include = (0, import_database.filterIncludes)(queryParams.where, queryParams.include || [], {
+        underscored: db.options.underscored
+      });
       const actionSql = ctx.db.sequelize.queryInterface.queryGenerator.selectQuery(
         Model.getTableName(),
         {
@@ -221,17 +227,18 @@ function createWithACLMetaMiddleware() {
         conditions.push({
           whereCase: "1=1",
           action,
-          include: queryParams.include
+          include: []
         });
       } else {
         const whereCase = actionSql.match(/WHERE (.*?);/)[1];
         conditions.push({
           whereCase,
           action,
-          include: queryParams.include
+          include
         });
       }
     }
+    const finalIncludes = (0, import_database.mergeIncludes)(conditions.map((condition) => condition.include || []).flat());
     const results = await collection.model.findAll({
       where: {
         [primaryKeyField]: ids
@@ -242,7 +249,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: finalIncludes,
       raw: true
     });
     const allowedActions = inspectActions.map((action) => {

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.9.0-beta.5",
+  "version": "1.9.0-beta.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": "9a61c60dd3db5af64244e82447309b0cb17aabb6"
+  "gitHead": "4a5055c973b51611d5db1604aaaf6c1b73b4733c"
 }