@nocobase/acl 0.21.0-alpha.7 → 0.21.0-alpha.9

package/lib/acl.d.ts

@@ -40,6 +40,7 @@ interface CanArgs {
     role: string;
     resource: string;
     action: string;
+    rawResourceName?: string;
     ctx?: any;
 }
 export declare class ACL extends EventEmitter {

package/lib/acl.js

@@ -154,14 +154,14 @@ const _ACL = class _ACL extends import_events.default {
     this.addListener("beforeGrantAction", listener);
   }
   can(options) {
-    const { role, resource, action } = options;
+    const { role, resource, action, rawResourceName } = options;
     const aclRole = this.roles.get(role);
     if (!aclRole) {
       return null;
     }
-    const actionPath = `${resource}:${action}`;
+    const actionPath = `${rawResourceName ? rawResourceName : resource}:${action}`;
     const snippetAllowed = aclRole.snippetAllowed(actionPath);
-    const fixedParams = this.fixedParamsManager.getParams(resource, action);
+    const fixedParams = this.fixedParamsManager.getParams(rawResourceName ? rawResourceName : resource, action);
     const mergeParams = /* @__PURE__ */ __name((result) => {
       const params = result["params"] || {};
       const mergedParams = (0, import_utils.assign)(params, fixedParams);
@@ -258,13 +258,25 @@ const _ACL = class _ACL extends import_events.default {
     const acl = this;
     return /* @__PURE__ */ __name(async function ACLMiddleware(ctx, next) {
       const roleName = ctx.state.currentRole || "anonymous";
-      const { resourceName, actionName } = ctx.action;
+      const { resourceName: rawResourceName, actionName } = ctx.action;
+      let resourceName = rawResourceName;
+      if (rawResourceName.includes(".")) {
+        resourceName = rawResourceName.split(".").pop();
+      }
+      if (ctx.getCurrentRepository) {
+        const currentRepository = ctx.getCurrentRepository();
+        if (currentRepository && currentRepository.targetCollection) {
+          resourceName = ctx.getCurrentRepository().targetCollection.name;
+        }
+      }
       ctx.can = (options) => {
         const canResult = acl.can({ role: roleName, ...options });
         return canResult;
       };
       ctx.permission = {
-        can: ctx.can({ resource: resourceName, action: actionName })
+        can: ctx.can({ resource: resourceName, action: actionName, rawResourceName }),
+        resourceName,
+        actionName
       };
       return await (0, import_koa_compose.default)(acl.middlewares.nodes)(ctx, next);
     }, "ACLMiddleware");
@@ -274,7 +286,17 @@ const _ACL = class _ACL extends import_events.default {
    */
   async getActionParams(ctx) {
     const roleName = ctx.state.currentRole || "anonymous";
-    const { resourceName, actionName } = ctx.action;
+    const { resourceName: rawResourceName, actionName } = ctx.action;
+    let resourceName = rawResourceName;
+    if (rawResourceName.includes(".")) {
+      resourceName = rawResourceName.split(".").pop();
+    }
+    if (ctx.getCurrentRepository) {
+      const currentRepository = ctx.getCurrentRepository();
+      if (currentRepository && currentRepository.targetCollection) {
+        resourceName = ctx.getCurrentRepository().targetCollection.name;
+      }
+    }
     ctx.can = (options) => {
       const can = this.can({ role: roleName, ...options });
       if (!can) {
@@ -283,7 +305,9 @@ const _ACL = class _ACL extends import_events.default {
       return import_lodash.default.cloneDeep(can);
     };
     ctx.permission = {
-      can: ctx.can({ resource: resourceName, action: actionName })
+      can: ctx.can({ resource: resourceName, action: actionName, rawResourceName }),
+      resourceName,
+      actionName
     };
     await (0, import_koa_compose.default)(this.middlewares.nodes)(ctx, async () => {
     });
@@ -313,7 +337,7 @@ const _ACL = class _ACL extends import_events.default {
       async (ctx, next) => {
         var _a, _b, _c, _d;
         const resourcerAction = ctx.action;
-        const { resourceName, actionName } = ctx.action;
+        const { resourceName, actionName } = ctx.permission;
         const permission = ctx.permission;
         ((_a = ctx.log) == null ? void 0 : _a.info) && ctx.log.info("ctx permission", permission);
         if ((!permission.can || typeof permission.can !== "object") && !permission.skip) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/acl",
-  "version": "0.21.0-alpha.7",
+  "version": "0.21.0-alpha.9",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/resourcer": "0.21.0-alpha.7",
-    "@nocobase/utils": "0.21.0-alpha.7",
+    "@nocobase/resourcer": "0.21.0-alpha.9",
+    "@nocobase/utils": "0.21.0-alpha.9",
     "minimatch": "^5.1.1"
   },
   "repository": {
@@ -15,5 +15,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/acl"
   },
-  "gitHead": "b1be3993f8aa81173d01bc390aa8e4c5adcc0e2d"
+  "gitHead": "a6fe6c4ee532c04e5a50ec777bf76436ca624cbd"
 }