@nocobase/acl 0.20.0-alpha.5 → 0.20.0-alpha.6

package/lib/acl.js

@@ -211,7 +211,7 @@ const _ACL = class _ACL extends import_events.default {
           ctx: {
             state
           },
-          $user: async () => state.currentUser,
+          $user: getUser(ctx),
           $nRole: () => state.currentRole
         }
       });
@@ -315,6 +315,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/package.json

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