@tachybase/module-acl 1.6.21 → 1.6.22

package/dist/externalVersion.js

@@ -1,14 +1,14 @@
 module.exports = {
   "react": "18.3.1",
-  "@tachybase/client": "1.6.21",
-  "@tachybase/schema": "1.6.11",
+  "@tachybase/client": "1.6.22",
+  "@tachybase/schema": "1.6.13",
   "antd": "5.22.5",
   "@ant-design/icons": "6.1.0",
   "react-i18next": "16.2.1",
-  "@tego/client": "1.6.11",
-  "@tego/server": "1.6.11",
+  "@tego/client": "1.6.13",
+  "@tego/server": "1.6.13",
   "async-mutex": "0.5.0",
   "lodash": "4.17.21",
-  "@tachybase/test": "1.6.11",
+  "@tachybase/test": "1.6.13",
   "ahooks": "3.9.0"
 };

package/dist/server/middlewares/setCurrentRole.js

@@ -33,12 +33,32 @@ async function setCurrentRole(ctx, next) {
   const attachRoles = ctx.state.attachRoles || [];
   const cache = ctx.cache;
   const repository = ctx.db.getRepository("users.roles", ctx.state.currentUser.id);
-  const roles = await cache.wrap(
-    `roles:${ctx.state.currentUser.id}`,
-    () => repository.find({
+  const roles = await cache.wrap(`roles:${ctx.state.currentUser.id}`, async () => {
+    const userRoles2 = await repository.find({
       raw: true
-    })
-  );
+    });
+    const rolesUsers = await ctx.db.getRepository("rolesUsers").find({
+      filter: {
+        userId: ctx.state.currentUser.id
+      },
+      raw: true
+    });
+    const rolesUsersMap = new Map(
+      rolesUsers.map((roleUser) => {
+        var _a2;
+        const item = ((_a2 = roleUser == null ? void 0 : roleUser.toJSON) == null ? void 0 : _a2.call(roleUser)) || roleUser;
+        return [item.roleName, item];
+      })
+    );
+    return userRoles2.map((role) => {
+      var _a2;
+      const item = ((_a2 = role == null ? void 0 : role.toJSON) == null ? void 0 : _a2.call(role)) || role;
+      return {
+        ...item,
+        rolesUsers: rolesUsersMap.get(item.name)
+      };
+    });
+  });
   if (!roles.length && !attachRoles.length) {
     ctx.state.currentRole = void 0;
     return ctx.throw(401, {

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

@@ -32,9 +32,21 @@ __export(with_acl_meta_exports, {
 module.exports = __toCommonJS(with_acl_meta_exports);
 var import_server = require("@tego/server");
 var import_lodash = __toESM(require("lodash"));
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function createAssociationMatcher(association) {
+  const parts = association.split(".").filter(Boolean);
+  if (!parts.length) {
+    return () => false;
+  }
+  const quotedAssociation = parts.map((part) => `"?${escapeRegExp(part)}"?`).join(String.raw`\s*(?:\.|->)\s*"?`);
+  const associationPattern = new RegExp(`(^|[^A-Za-z0-9_])${quotedAssociation}(?=\\s*(?:\\.|->)|[^A-Za-z0-9_]|$)`);
+  return (whereCase) => associationPattern.test(whereCase);
+}
 function createWithACLMetaMiddleware() {
   return async (ctx, next) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     await next();
     const dataSourceKey = ctx.get("x-data-source");
     const dataSource = ctx.tego.dataSourceManager.dataSources.get(dataSourceKey);
@@ -81,7 +93,12 @@ function createWithACLMetaMiddleware() {
           params: {},
           resourceName: ctx.action.resourceName,
           resourceOf: ctx.action.resourceOf,
-          mergeParams() {
+          mergeParams(params) {
+            this.params = import_lodash.default.mergeWith({}, this.params, params, (value, srcValue) => {
+              if (Array.isArray(value) && Array.isArray(srcValue)) {
+                return srcValue;
+              }
+            });
           }
         },
         state: {
@@ -141,7 +158,7 @@ function createWithACLMetaMiddleware() {
         ...params,
         context: actionCtx
       });
-      const actionSql = ctx.db.sequelize.queryInterface.queryGenerator.selectQuery(
+      const actionSql = db.sequelize.queryInterface.queryGenerator.selectQuery(
         Model.getTableName(),
         {
           where: (() => {
@@ -193,7 +210,10 @@ function createWithACLMetaMiddleware() {
         },
         Model
       );
-      const whereCase = actionSql.match(/WHERE (.*?);/)[1];
+      const whereCase = (_e = (_d = actionSql.match(/\bWHERE\s+([\s\S]*)$/i)) == null ? void 0 : _d[1]) == null ? void 0 : _e.replace(/;\s*$/, "");
+      if (!whereCase) {
+        continue;
+      }
       conditions.push({
         whereCase,
         action,
@@ -203,18 +223,21 @@ function createWithACLMetaMiddleware() {
     let include = conditions.map((condition) => condition.include).flat();
     const whereCases = conditions.map((condition) => condition.whereCase);
     include = include.filter((inc) => {
-      return conditions.some((condition) => {
-        return whereCases.some((whereCase) => whereCase.includes(inc.association));
-      });
+      if (!(inc == null ? void 0 : inc.association)) {
+        return false;
+      }
+      const matchesAssociation = createAssociationMatcher(inc.association);
+      return whereCases.some((whereCase) => matchesAssociation(whereCase));
     });
     const results = await collection.model.findAll({
       where: {
         [primaryKeyField]: ids
       },
+      raw: true,
       attributes: [
         primaryKeyField,
         ...conditions.map((condition) => {
-          return [ctx.db.sequelize.literal(`CASE WHEN ${condition.whereCase} THEN 1 ELSE 0 END`), condition.action];
+          return [db.sequelize.literal(`CASE WHEN ${condition.whereCase} THEN 1 ELSE 0 END`), condition.action];
         })
       ],
       include
@@ -223,7 +246,10 @@ function createWithACLMetaMiddleware() {
       if (allAllowed.includes(action)) {
         return [action, ids];
       }
-      return [action, results.filter((item) => Boolean(item.get(action))).map((item) => item.get(primaryKeyField))];
+      return [
+        action,
+        Array.from(new Set(results.filter((item) => Boolean(item[action])).map((item) => item[primaryKeyField])))
+      ];
     }).reduce((acc, [action, ids2]) => {
       acc[action] = ids2;
       return acc;

package/dist/server/server.js

@@ -211,7 +211,8 @@ class PluginACL extends import_server.Plugin {
       await this.app.db.getRepository("dataSourcesRoles").updateOrCreate({
         values: {
           roleName: model.get("name"),
-          dataSourceKey: "main"
+          dataSourceKey: "main",
+          strategy: model.get("strategy")
         },
         filterKeys: ["roleName", "dataSourceKey"],
         transaction
@@ -248,14 +249,26 @@ class PluginACL extends import_server.Plugin {
       await this.writeResourceToACL(resource, transaction);
     });
     this.app.db.on("collections.afterDestroy", async (model, options) => {
+      var _a;
       const { transaction } = options;
+      const resourceName = model.get("name");
       await this.app.db.getRepository("dataSourcesRolesResources").destroy({
         filter: {
-          name: model.get("name"),
+          name: resourceName,
           dataSourceKey: "main"
         },
         transaction
       });
+      const aclRoles = (_a = this.acl) == null ? void 0 : _a.roles;
+      if (!aclRoles || typeof aclRoles.values !== "function") {
+        return;
+      }
+      for (const role of aclRoles.values()) {
+        if (!role || typeof role.revokeResource !== "function") {
+          continue;
+        }
+        role.revokeResource(resourceName);
+      }
     });
     this.app.db.on("fields.afterCreate", async (model, options) => {
       const { transaction } = options;
@@ -330,7 +343,7 @@ class PluginACL extends import_server.Plugin {
       });
     }
     this.app.on("afterInstallPlugin", async (plugin) => {
-      if (plugin.getName() !== "user") {
+      if (!["user", "users"].includes(plugin.getName())) {
         return;
       }
       const User = this.db.getCollection("users");
@@ -355,7 +368,7 @@ class PluginACL extends import_server.Plugin {
       });
     });
     this.app.on("beforeInstallPlugin", async (plugin) => {
-      if (plugin.getName() !== "user") {
+      if (!["user", "users"].includes(plugin.getName())) {
         return;
       }
       const roles = this.app.db.getRepository("roles");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/module-acl",
   "displayName": "Access control",
-  "version": "1.6.21",
+  "version": "1.6.22",
   "description": "Based on roles, resources, and actions, access control can precisely manage interface configuration permissions, data operation permissions, menu access permissions, and plugin permissions.",
   "keywords": [
     "Users & permissions"
@@ -20,10 +20,10 @@
   "dependencies": {},
   "devDependencies": {
     "@ant-design/icons": "^6.1.0",
-    "@tachybase/schema": "1.6.11",
-    "@tachybase/test": "1.6.11",
-    "@tego/client": "1.6.11",
-    "@tego/server": "1.6.11",
+    "@tachybase/schema": "1.6.13",
+    "@tachybase/test": "1.6.13",
+    "@tego/client": "1.6.13",
+    "@tego/server": "1.6.13",
     "@types/jsonwebtoken": "^8.5.9",
     "ahooks": "^3.9.0",
     "antd": "5.22.5",
@@ -33,7 +33,7 @@
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-i18next": "16.2.1",
-    "@tachybase/client": "1.6.21"
+    "@tachybase/client": "1.6.22"
   },
   "description.zh-CN": "基于角色、资源和操作的权限控制，可以精确控制界面配置权限、数据操作权限、菜单访问权限、插件权限。",
   "displayName.zh-CN": "权限控制",