@tachybase/acl 1.6.13-alpha.4 → 1.6.13-alpha.6

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

@@ -22,5 +22,6 @@ export declare class ACLAvailableStrategy {
     allowConfigure: boolean;
     constructor(acl: ACL, options: AvailableStrategyOptions);
     matchAction(actionName: string): any;
+    isWildcard(): boolean;
     allow(resourceName: string, actionName: string): any;
 }

package/lib/acl-available-strategy.js

@@ -71,6 +71,9 @@ const _ACLAvailableStrategy = class _ACLAvailableStrategy {
     }
     return false;
   }
+  isWildcard() {
+    return this.options.actions === "*";
+  }
   allow(resourceName, actionName) {
     return this.matchAction(this.acl.resolveActionAlias(actionName));
   }

package/lib/acl.d.ts

@@ -90,6 +90,7 @@ export declare class ACL extends EventEmitter {
     setAvailableAction(name: string, options?: AvailableActionOptions): void;
     getAvailableAction(name: string): ACLAvailableAction;
     getAvailableActions(): Map<string, ACLAvailableAction>;
+    protected canUseStrategyForResource(resource: string, action: string, strategy: ACLAvailableStrategy | null): boolean;
     setAvailableStrategy(name: string, options: AvailableStrategyOptions): void;
     beforeGrantAction(listener?: Listener): void;
     can(options: CanArgs): CanResult | null;

package/lib/acl.js

@@ -96,7 +96,7 @@ const _ACL = class _ACL extends import_node_events.default {
     this.addCoreMiddleware();
   }
   setStrategyResources(resources) {
-    this.strategyResources = new Set(resources);
+    this.strategyResources = resources === null ? null : new Set(resources);
   }
   getStrategyResources() {
     return this.strategyResources ? [...this.strategyResources] : null;
@@ -108,7 +108,8 @@ const _ACL = class _ACL extends import_node_events.default {
     this.strategyResources.add(resource);
   }
   removeStrategyResource(resource) {
-    this.strategyResources.delete(resource);
+    var _a;
+    (_a = this.strategyResources) == null ? void 0 : _a.delete(resource);
   }
   define(options) {
     const roleName = options.role;
@@ -163,6 +164,18 @@ const _ACL = class _ACL extends import_node_events.default {
   getAvailableActions() {
     return this.availableActions;
   }
+  canUseStrategyForResource(resource, action, strategy) {
+    var _a;
+    if (this.strategyResources === null || this.strategyResources.has(resource)) {
+      return true;
+    }
+    if (!strategy || strategy.isWildcard()) {
+      return false;
+    }
+    const availableAction = this.getAvailableAction(action);
+    const actionResource = (_a = availableAction == null ? void 0 : availableAction.options) == null ? void 0 : _a.resource;
+    return !!availableAction && (!actionResource || actionResource === "*" || actionResource === resource);
+  }
   setAvailableStrategy(name, options) {
     this.availableStrategy.set(name, new import_acl_available_strategy.ACLAvailableStrategy(this, options));
   }
@@ -207,8 +220,9 @@ const _ACL = class _ACL extends import_node_events.default {
       return null;
     }
     let roleStrategyParams;
-    if (this.strategyResources === null || this.strategyResources.has(resource)) {
-      roleStrategyParams = roleStrategy == null ? void 0 : roleStrategy.allow(resource, this.resolveActionAlias(action));
+    const resolvedAction = this.resolveActionAlias(action);
+    if (this.canUseStrategyForResource(resource, resolvedAction, roleStrategy)) {
+      roleStrategyParams = roleStrategy == null ? void 0 : roleStrategy.allow(resource, resolvedAction);
     }
     if (!roleStrategyParams && snippetAllowed) {
       roleStrategyParams = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/acl",
-  "version": "1.6.13-alpha.4",
+  "version": "1.6.13-alpha.6",
   "description": "",
   "homepage": "https://github.com/tegojs/tego#readme",
   "bugs": {
@@ -18,9 +18,9 @@
     "koa-compose": "^4.1.0",
     "lodash": "4.17.21",
     "minimatch": "^5.1.6",
-    "@tachybase/actions": "1.6.13-alpha.4",
-    "@tachybase/utils": "1.6.13-alpha.4",
-    "@tachybase/resourcer": "1.6.13-alpha.4"
+    "@tachybase/actions": "1.6.13-alpha.6",
+    "@tachybase/resourcer": "1.6.13-alpha.6",
+    "@tachybase/utils": "1.6.13-alpha.6"
   },
   "devDependencies": {
     "@types/lodash": "4.17.20",