@nocobase/plugin-acl 0.17.0-alpha.4 → 0.17.0-alpha.6

package/dist/externalVersion.js

@@ -1,9 +1,10 @@
 module.exports = {
-  "@nocobase/client": "0.17.0-alpha.4",
-  "@nocobase/acl": "0.17.0-alpha.4",
-  "@nocobase/actions": "0.17.0-alpha.4",
-  "@nocobase/database": "0.17.0-alpha.4",
-  "@nocobase/server": "0.17.0-alpha.4",
+  "@nocobase/client": "0.17.0-alpha.6",
+  "@nocobase/acl": "0.17.0-alpha.6",
+  "@nocobase/actions": "0.17.0-alpha.6",
+  "@nocobase/database": "0.17.0-alpha.6",
+  "@nocobase/server": "0.17.0-alpha.6",
   "async-mutex": "0.3.2",
-  "lodash": "4.17.21"
+  "lodash": "4.17.21",
+  "@nocobase/cache": "0.17.0-alpha.6"
 };

package/dist/server/actions/user-setDefaultRole.js

@@ -38,7 +38,7 @@ async function setDefaultRole(ctx, next) {
   await db.sequelize.transaction(async (transaction) => {
     await repository.update({
       filter: {
-        userId: currentUser.get("id")
+        userId: currentUser.id
       },
       values: {
         default: false
@@ -47,7 +47,7 @@ async function setDefaultRole(ctx, next) {
     });
     await repository.update({
       filter: {
-        userId: currentUser.get("id"),
+        userId: currentUser.id,
         roleName
       },
       values: {

package/dist/server/middlewares/setCurrentRole.js

@@ -30,9 +30,15 @@ async function setCurrentRole(ctx, next) {
   if (!ctx.state.currentUser) {
     return next();
   }
+  const cache = ctx.cache;
   const repository = ctx.db.getRepository("users.roles", ctx.state.currentUser.id);
-  const roles = await repository.find();
-  ctx.state.currentUser.setDataValue("roles", roles);
+  const roles = await cache.wrap(
+    `roles:${ctx.state.currentUser.id}`,
+    () => repository.find({
+      raw: true
+    })
+  );
+  ctx.state.currentUser.roles = roles;
   if (currentRole) {
     ctx.state.currentRole = (_a = roles.find((role) => role.name === currentRole)) == null ? void 0 : _a.name;
   } else {

package/dist/server/server.js

@@ -307,6 +307,14 @@ class PluginACL extends import_server.Plugin {
         }
       });
     });
+    this.app.db.on("rolesUsers.afterSave", async (model) => {
+      const cache = this.app.cache;
+      await cache.del(`roles:${model.get("userId")}`);
+    });
+    this.app.db.on("rolesUsers.afterDestroy", async (model) => {
+      const cache = this.app.cache;
+      await cache.del(`roles:${model.get("userId")}`);
+    });
     const writeRolesToACL = async (app, options) => {
       const exists = await this.app.db.collectionExistsInDb("roles");
       if (exists) {
@@ -387,6 +395,9 @@ class PluginACL extends import_server.Plugin {
         ]
       });
     });
+    this.app.on("beforeSignOut", ({ userId }) => {
+      this.app.cache.del(`roles:${userId}`);
+    });
     this.app.resourcer.use(import_setCurrentRole.setCurrentRole, { tag: "setCurrentRole", before: "acl", after: "auth" });
     this.app.acl.allow("users", "setDefaultRole", "loggedIn");
     this.app.acl.allow("roles", "check", "loggedIn");

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "权限控制",
   "description": "A simple access control based on roles, resources and actions",
   "description.zh-CN": "基于角色、资源和操作的权限控制。",
-  "version": "0.17.0-alpha.4",
+  "version": "0.17.0-alpha.6",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -17,6 +17,7 @@
   "peerDependencies": {
     "@nocobase/acl": "0.x",
     "@nocobase/actions": "0.x",
+    "@nocobase/cache": "0.x",
     "@nocobase/client": "0.x",
     "@nocobase/database": "0.x",
     "@nocobase/server": "0.x",
@@ -28,5 +29,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "663b03a3799a70ba1a2bc6a0d686e679331a50ad"
+  "gitHead": "f92f8bcdf6d5baf07566381e9425ebca11e19626"
 }