@nocobase/plugin-acl 1.7.10 → 1.7.12

package/dist/externalVersion.js

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

package/dist/server/middlewares/setCurrentRole.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -23,6 +25,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var setCurrentRole_exports = {};
 __export(setCurrentRole_exports, {
@@ -31,6 +41,7 @@ __export(setCurrentRole_exports, {
 module.exports = __toCommonJS(setCurrentRole_exports);
 var import_constants = require("../constants");
 var import_enum = require("../enum");
+var import_lodash = __toESM(require("lodash"));
 async function setCurrentRole(ctx, next) {
   var _a, _b, _c;
   let currentRole = ctx.get("X-Role");
@@ -93,9 +104,12 @@ async function setCurrentRole(ctx, next) {
     }
   }
   if (!role) {
-    const defaultRoleModel = await cache.wrap(
+    const defaultRoleModel = await cache.wrapWithCondition(
       `roles:${ctx.state.currentUser.id}:defaultRole`,
-      () => ctx.db.getRepository("rolesUsers").findOne({ where: { userId: ctx.state.currentUser.id, default: true } })
+      () => ctx.db.getRepository("rolesUsers").findOne({ where: { userId: ctx.state.currentUser.id, default: true } }),
+      {
+        isCacheable: (x) => !import_lodash.default.isEmpty(x)
+      }
     );
     role = (defaultRoleModel == null ? void 0 : defaultRoleModel.roleName) || ((_b = userRoles[0]) == null ? void 0 : _b.name);
   }

package/dist/server/model/RoleResourceActionModel.d.ts

@@ -13,5 +13,6 @@ export declare class RoleResourceActionModel extends Model {
         acl: ACL;
         role: ACLRole;
         resourceName: string;
+        transaction?: any;
     }): Promise<void>;
 }

package/dist/server/model/RoleResourceActionModel.js

@@ -32,14 +32,14 @@ module.exports = __toCommonJS(RoleResourceActionModel_exports);
 var import_database = require("@nocobase/database");
 class RoleResourceActionModel extends import_database.Model {
   async writeToACL(options) {
-    const { resourceName, role } = options;
+    const { resourceName, role, transaction: transaction2 } = options;
     const actionName = this.get("name");
     const fields = this.get("fields");
     const actionPath = `${resourceName}:${actionName}`;
     const actionParams = {
       fields
     };
-    const scope = await this.getScope();
+    const scope = await this.getScope({ transaction: transaction2 });
     if (scope) {
       actionParams["own"] = scope.get("key") === "own";
       actionParams["filter"] = scope.get("scope");

package/dist/server/model/RoleResourceModel.js

@@ -37,7 +37,7 @@ class RoleResourceModel extends import_database.Model {
     role.revokeResource(resourceName);
   }
   async writeToACL(options) {
-    const { acl } = options;
+    const { acl, transaction } = options;
     const resourceName = this.get("name");
     const roleName = this.get("roleName");
     const role = acl.getRole(roleName);
@@ -55,13 +55,14 @@ class RoleResourceModel extends import_database.Model {
     });
     role.resources.set(resourceName, resource);
     const actions = await this.getActions({
-      transaction: options.transaction
+      transaction
     });
     for (const action of actions) {
       await action.writeToACL({
         acl,
         role,
-        resourceName
+        resourceName,
+        transaction
       });
     }
   }

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.10",
+  "version": "1.7.12",
   "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": "762643285b5a1176aeea3b16b917ee7c1fcef23a"
+  "gitHead": "7d8cb01842f4f426af8acd9179b88e1f0a095015"
 }