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

package/lib/acl-available-strategy.js

@@ -63,11 +63,10 @@ const _ACLAvailableStrategy = class _ACLAvailableStrategy {
     }
   }
   matchAction(actionName) {
-    var _a;
     if (this.options.actions == "*") {
       return true;
     }
-    if ((_a = this.actionsAsObject) == null ? void 0 : _a.hasOwnProperty(actionName)) {
+    if (Object.prototype.hasOwnProperty.call(this.actionsAsObject || {}, actionName)) {
       const predicateName = this.actionsAsObject[actionName];
       if (predicateName) {
         return import_lodash.default.cloneDeep(predicate[predicateName]);

package/lib/acl.js

@@ -133,9 +133,6 @@ const _ACL = class _ACL extends import_events.default {
       return null;
     }
     const snippetAllowed = aclRole.snippetAllowed(`${resource}:${action}`);
-    if (snippetAllowed === false) {
-      return null;
-    }
     const fixedParams = this.fixedParamsManager.getParams(resource, action);
     const mergeParams = /* @__PURE__ */ __name((result) => {
       const params = result["params"] || {};
@@ -211,7 +208,7 @@ const _ACL = class _ACL extends import_events.default {
           ctx: {
             state
           },
-          $user: async () => state.currentUser,
+          $user: getUser(ctx),
           $nRole: () => state.currentRole
         }
       });
@@ -315,6 +312,28 @@ const _ACL = class _ACL extends import_events.default {
 };
 __name(_ACL, "ACL");
 let ACL = _ACL;
+function getUser(ctx) {
+  return async ({ fields }) => {
+    var _a, _b;
+    const userFields = fields.filter((f) => f && ctx.db.getFieldByPath("users." + f));
+    (_a = ctx.logger) == null ? void 0 : _a.info("filter-parse: ", { userFields });
+    if (!ctx.state.currentUser) {
+      return;
+    }
+    if (!userFields.length) {
+      return;
+    }
+    const user = await ctx.db.getRepository("users").findOne({
+      filterByTk: ctx.state.currentUser.id,
+      fields: userFields
+    });
+    (_b = ctx.logger) == null ? void 0 : _b.info("filter-parse: ", {
+      $user: user == null ? void 0 : user.toJSON()
+    });
+    return user;
+  };
+}
+__name(getUser, "getUser");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ACL

package/lib/snippet-manager.js

@@ -50,7 +50,7 @@ const _SnippetManager = class _SnippetManager {
     snippetName = negated ? snippetName.slice(1) : snippetName;
     const snippet = this.snippets.get(snippetName);
     if (!snippet) {
-      throw new Error(`Snippet ${snippetName} not found`);
+      return null;
     }
     const matched = snippet.actions.some((action) => (0, import_minimatch.default)(actionPath, action));
     if (matched) {

package/package.json

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