@nocobase/acl 0.20.0-alpha.9 → 0.21.0-alpha.10

package/lib/acl-available-strategy.d.ts

@@ -3,6 +3,9 @@ export interface AvailableStrategyOptions {
     displayName?: string;
     actions?: false | string | string[];
     allowConfigure?: boolean;
+    /**
+     * @internal
+     */
     resource?: '*';
 }
 export declare const predicate: {

package/lib/acl-role.d.ts

@@ -12,6 +12,9 @@ export interface RoleActionParams {
 export interface ResourceActionsOptions {
     [actionName: string]: RoleActionParams;
 }
+/**
+ * @internal
+ */
 export declare class ACLRole {
     acl: ACL;
     name: string;

package/lib/acl.d.ts

@@ -15,9 +15,15 @@ interface CanResult {
 }
 export interface DefineOptions {
     role: string;
+    /**
+     * @internal
+     */
     allowConfigure?: boolean;
     strategy?: string | AvailableStrategyOptions;
     actions?: ResourceActionsOptions;
+    /**
+     * @internal
+     */
     routes?: any;
     snippets?: string[];
 }
@@ -34,14 +40,33 @@ interface CanArgs {
     role: string;
     resource: string;
     action: string;
+    rawResourceName?: string;
     ctx?: any;
 }
 export declare class ACL extends EventEmitter {
+    /**
+     * @internal
+     */
     availableStrategy: Map<string, ACLAvailableStrategy>;
+    /**
+     * @internal
+     */
     allowManager: AllowManager;
+    /**
+     * @internal
+     */
     snippetManager: SnippetManager;
+    /**
+     * @internal
+     */
     roles: Map<string, ACLRole>;
+    /**
+     * @internal
+     */
     actionAlias: Map<string, string>;
+    /**
+     * @internal
+     */
     configResources: string[];
     protected availableActions: Map<string, ACLAvailableAction>;
     protected fixedParamsManager: FixedParamsManager;
@@ -50,8 +75,17 @@ export declare class ACL extends EventEmitter {
     define(options: DefineOptions): ACLRole;
     getRole(name: string): ACLRole;
     removeRole(name: string): boolean;
+    /**
+     * @internal
+     */
     registerConfigResources(names: string[]): void;
+    /**
+     * @internal
+     */
     registerConfigResource(name: string): void;
+    /**
+     * @internal
+     */
     isConfigResource(name: string): boolean;
     setAvailableAction(name: string, options?: AvailableActionOptions): void;
     getAvailableAction(name: string): ACLAvailableAction;
@@ -59,15 +93,30 @@ export declare class ACL extends EventEmitter {
     setAvailableStrategy(name: string, options: AvailableStrategyOptions): void;
     beforeGrantAction(listener?: Listener): void;
     can(options: CanArgs): CanResult | null;
+    /**
+     * @internal
+     */
     resolveActionAlias(action: string): string;
     use(fn: any, options?: ToposortOptions): void;
     allow(resourceName: string, actionNames: string[] | string, condition?: string | ConditionFunc): void;
+    /**
+     * @deprecated
+     */
     skip(resourceName: string, actionNames: string[] | string, condition?: string | ConditionFunc): void;
+    /**
+     * @internal
+     */
     parseJsonTemplate(json: any, ctx: any): Promise<any>;
     middleware(): (ctx: any, next: any) => Promise<void>;
+    /**
+     * @internal
+     */
     getActionParams(ctx: any): Promise<void>;
     addFixedParams(resource: string, action: string, merger: Merger): void;
     registerSnippet(snippet: SnippetOptions): void;
+    /**
+     * @internal
+     */
     filterParams(ctx: any, resourceName: any, params: any): any;
     protected addCoreMiddleware(): void;
     protected isAvailableAction(actionName: string): boolean;

package/lib/acl.js

@@ -42,11 +42,29 @@ var import_allow_manager = require("./allow-manager");
 var import_fixed_params_manager = __toESM(require("./fixed-params-manager"));
 var import_snippet_manager = __toESM(require("./snippet-manager"));
 const _ACL = class _ACL extends import_events.default {
+  /**
+   * @internal
+   */
   availableStrategy = /* @__PURE__ */ new Map();
+  /**
+   * @internal
+   */
   allowManager = new import_allow_manager.AllowManager(this);
+  /**
+   * @internal
+   */
   snippetManager = new import_snippet_manager.default();
+  /**
+   * @internal
+   */
   roles = /* @__PURE__ */ new Map();
+  /**
+   * @internal
+   */
   actionAlias = /* @__PURE__ */ new Map();
+  /**
+   * @internal
+   */
   configResources = [];
   availableActions = /* @__PURE__ */ new Map();
   fixedParamsManager = new import_fixed_params_manager.default();
@@ -95,12 +113,21 @@ const _ACL = class _ACL extends import_events.default {
   removeRole(name) {
     return this.roles.delete(name);
   }
+  /**
+   * @internal
+   */
   registerConfigResources(names) {
     names.forEach((name) => this.registerConfigResource(name));
   }
+  /**
+   * @internal
+   */
   registerConfigResource(name) {
     this.configResources.push(name);
   }
+  /**
+   * @internal
+   */
   isConfigResource(name) {
     return this.configResources.includes(name);
   }
@@ -127,13 +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 snippetAllowed = aclRole.snippetAllowed(`${resource}:${action}`);
-    const fixedParams = this.fixedParamsManager.getParams(resource, action);
+    const actionPath = `${rawResourceName ? rawResourceName : resource}:${action}`;
+    const snippetAllowed = aclRole.snippetAllowed(actionPath);
+    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);
@@ -175,6 +203,9 @@ const _ACL = class _ACL extends import_events.default {
     }
     return null;
   }
+  /**
+   * @internal
+   */
   resolveActionAlias(action) {
     return this.actionAlias.get(action) ? this.actionAlias.get(action) : action;
   }
@@ -187,6 +218,9 @@ const _ACL = class _ACL extends import_events.default {
   allow(resourceName, actionNames, condition) {
     return this.skip(resourceName, actionNames, condition);
   }
+  /**
+   * @deprecated
+   */
   skip(resourceName, actionNames, condition) {
     if (!Array.isArray(actionNames)) {
       actionNames = [actionNames];
@@ -195,6 +229,9 @@ const _ACL = class _ACL extends import_events.default {
       this.allowManager.allow(resourceName, actionName, condition);
     }
   }
+  /**
+   * @internal
+   */
   async parseJsonTemplate(json, ctx) {
     var _a, _b, _c, _d, _e;
     if (json.filter) {
@@ -221,20 +258,45 @@ 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 (0, import_koa_compose.default)(acl.middlewares.nodes)(ctx, next);
+      return await (0, import_koa_compose.default)(acl.middlewares.nodes)(ctx, next);
     }, "ACLMiddleware");
   }
+  /**
+   * @internal
+   */
   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) {
@@ -243,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 () => {
     });
@@ -254,6 +318,9 @@ const _ACL = class _ACL extends import_events.default {
   registerSnippet(snippet) {
     this.snippetManager.register(snippet);
   }
+  /**
+   * @internal
+   */
   filterParams(ctx, resourceName, params) {
     var _a;
     if ((_a = params == null ? void 0 : params.filter) == null ? void 0 : _a.createdById) {
@@ -270,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.20.0-alpha.9",
+  "version": "0.21.0-alpha.10",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/resourcer": "0.20.0-alpha.9",
-    "@nocobase/utils": "0.20.0-alpha.9",
+    "@nocobase/resourcer": "0.21.0-alpha.10",
+    "@nocobase/utils": "0.21.0-alpha.10",
     "minimatch": "^5.1.1"
   },
   "repository": {
@@ -15,5 +15,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/acl"
   },
-  "gitHead": "5473d9039cfdb649a8c8c625edefc9a3ac464be5"
+  "gitHead": "98adf5ec996a4f359c6ca1c4a6ac837c43b6e268"
 }