@nocobase/plugin-acl 2.1.0-beta.47 → 2.1.0-beta.48

package/dist/externalVersion.js

@@ -8,7 +8,7 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-beta.47",
+  "@nocobase/client": "2.1.0-beta.48",
   "antd": "5.24.2",
   "react": "18.2.0",
   "react-i18next": "11.18.6",
@@ -17,15 +17,15 @@ module.exports = {
   "@formily/react": "2.3.7",
   "@ant-design/icons": "5.6.1",
   "lodash": "4.18.1",
-  "@nocobase/utils": "2.1.0-beta.47",
-  "@nocobase/flow-engine": "2.1.0-beta.47",
-  "@nocobase/client-v2": "2.1.0-beta.47",
-  "@nocobase/actions": "2.1.0-beta.47",
-  "@nocobase/cache": "2.1.0-beta.47",
-  "@nocobase/database": "2.1.0-beta.47",
-  "@nocobase/server": "2.1.0-beta.47",
-  "@nocobase/acl": "2.1.0-beta.47",
-  "@nocobase/test": "2.1.0-beta.47",
+  "@nocobase/utils": "2.1.0-beta.48",
+  "@nocobase/flow-engine": "2.1.0-beta.48",
+  "@nocobase/client-v2": "2.1.0-beta.48",
+  "@nocobase/actions": "2.1.0-beta.48",
+  "@nocobase/cache": "2.1.0-beta.48",
+  "@nocobase/database": "2.1.0-beta.48",
+  "@nocobase/server": "2.1.0-beta.48",
+  "@nocobase/acl": "2.1.0-beta.48",
+  "@nocobase/test": "2.1.0-beta.48",
   "@formily/core": "2.3.7",
   "@formily/antd-v5": "1.2.3",
   "antd-style": "3.7.1",

package/dist/server/index.d.ts

@@ -8,6 +8,8 @@
  */
 export * from './middlewares/setCurrentRole';
 export * from './middlewares/with-acl-meta';
+export * from './middlewares/check-association-operate';
+export * from './middlewares/check-change-with-association';
 export * from './query/apply-query-permission';
 export { RoleResourceActionModel } from './model/RoleResourceActionModel';
 export { RoleResourceModel } from './model/RoleResourceModel';

package/dist/server/index.js

@@ -44,6 +44,8 @@ __export(server_exports, {
 module.exports = __toCommonJS(server_exports);
 __reExport(server_exports, require("./middlewares/setCurrentRole"), module.exports);
 __reExport(server_exports, require("./middlewares/with-acl-meta"), module.exports);
+__reExport(server_exports, require("./middlewares/check-association-operate"), module.exports);
+__reExport(server_exports, require("./middlewares/check-change-with-association"), module.exports);
 __reExport(server_exports, require("./query/apply-query-permission"), module.exports);
 var import_RoleResourceActionModel = require("./model/RoleResourceActionModel");
 var import_RoleResourceModel = require("./model/RoleResourceModel");
@@ -56,6 +58,8 @@ var import_server = __toESM(require("./server"));
   RoleResourceModel,
   ...require("./middlewares/setCurrentRole"),
   ...require("./middlewares/with-acl-meta"),
+  ...require("./middlewares/check-association-operate"),
+  ...require("./middlewares/check-change-with-association"),
   ...require("./query/apply-query-permission"),
   ...require("./constants"),
   ...require("./enum")

package/dist/server/middlewares/check-association-operate.js

@@ -31,16 +31,19 @@ __export(check_association_operate_exports, {
 module.exports = __toCommonJS(check_association_operate_exports);
 var import_acl = require("@nocobase/acl");
 async function checkAssociationOperate(ctx, next) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const { actionName, resourceName, sourceId } = ctx.action;
   if (!(resourceName.includes(".") && ["add", "set", "remove", "toggle"].includes(actionName))) {
     return next();
   }
+  if ((_a = ctx.permission) == null ? void 0 : _a.skip) {
+    return next();
+  }
   const acl = ctx.acl;
   const roles = ctx.state.currentRoles;
   for (const role of roles) {
     const aclRole = acl.getRole(role);
-    if (aclRole.snippetAllowed(`${resourceName}:${actionName}`)) {
+    if (aclRole == null ? void 0 : aclRole.snippetAllowed(`${resourceName}:${actionName}`)) {
       return next();
     }
   }
@@ -54,20 +57,20 @@ async function checkAssociationOperate(ctx, next) {
     ctx.throw(403, "No permissions");
   }
   const params = result.params || ctx.acl.fixedParamsManager.getParams(resourceName, actionName);
-  if (params.whitelist && !((_a = params.whitelist) == null ? void 0 : _a.includes(association))) {
+  if (params.whitelist && !((_b = params.whitelist) == null ? void 0 : _b.includes(association))) {
     ctx.throw(403, "No permissions");
   }
   if (params.filter) {
     try {
-      const timezone = ((_c = (_b = ctx.request) == null ? void 0 : _b.get) == null ? void 0 : _c.call(_b, "x-timezone")) ?? ((_e = (_d = ctx.request) == null ? void 0 : _d.header) == null ? void 0 : _e["x-timezone"]) ?? ((_g = (_f = ctx.req) == null ? void 0 : _f.headers) == null ? void 0 : _g["x-timezone"]);
-      const collection = (_i = (_h = ctx.database) == null ? void 0 : _h.getCollection) == null ? void 0 : _i.call(_h, resource);
+      const timezone = ((_d = (_c = ctx.request) == null ? void 0 : _c.get) == null ? void 0 : _d.call(_c, "x-timezone")) ?? ((_f = (_e = ctx.request) == null ? void 0 : _e.header) == null ? void 0 : _f["x-timezone"]) ?? ((_h = (_g = ctx.req) == null ? void 0 : _g.headers) == null ? void 0 : _h["x-timezone"]);
+      const collection = (_j = (_i = ctx.database) == null ? void 0 : _i.getCollection) == null ? void 0 : _j.call(_i, resource);
       (0, import_acl.checkFilterParams)(collection, params.filter);
       const parsedFilter = await (0, import_acl.parseJsonTemplate)(params.filter, {
         state: ctx.state,
         timezone,
         userProvider: (0, import_acl.createUserProvider)({
           db: ctx.db,
-          currentUser: (_j = ctx.state) == null ? void 0 : _j.currentUser
+          currentUser: (_k = ctx.state) == null ? void 0 : _k.currentUser
         })
       });
       const repo = ctx.database.getRepository(resource);

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

@@ -52,7 +52,7 @@ function createWithACLMetaMiddleware() {
     const dataSourceKey = ctx.get("x-data-source");
     const dataSource = ctx.app.dataSourceManager.dataSources.get(dataSourceKey);
     const db = dataSource ? dataSource.collectionManager.db : ctx.db;
-    if (!db) {
+    if (!db || db.isDBInstance === false) {
       return;
     }
     const acl = dataSource ? dataSource.acl : ctx.app.acl;

package/package.json

@@ -6,7 +6,7 @@
   "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.ru-RU": "На основе ролей, ресурсов и действий система контроля доступа может точно управлять разрешениями на изменение интерфейса, работу с данными, доступ к меню и разрешениями для подключаемых модулей.",
   "description.zh-CN": "基于角色、资源和操作的权限控制，可以精确控制界面配置权限、数据操作权限、菜单访问权限、插件权限。",
-  "version": "2.1.0-beta.47",
+  "version": "2.1.0-beta.48",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/acl",
@@ -46,5 +46,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "bf8fc3790e3494c901b4d22861c5471a0d27c464"
+  "gitHead": "f8c27a286db015c5e433b48241f14c0412e50530"
 }