@nocobase/plugin-users 1.4.0-alpha.20240903083725 → 1.4.0-alpha.20240906133133

package/dist/externalVersion.js

@@ -10,17 +10,16 @@
 module.exports = {
   "react": "18.2.0",
   "antd": "5.12.8",
-  "@nocobase/client": "1.4.0-alpha.20240903083725",
+  "@nocobase/client": "1.4.0-alpha.20240906133133",
   "@formily/react": "2.3.0",
   "@formily/core": "2.3.0",
-  "@nocobase/plugin-acl": "1.4.0-alpha.20240903083725",
-  "@nocobase/utils": "1.4.0-alpha.20240903083725",
+  "@nocobase/plugin-acl": "1.4.0-alpha.20240906133133",
+  "@nocobase/utils": "1.4.0-alpha.20240906133133",
   "react-i18next": "11.18.6",
-  "@nocobase/database": "1.4.0-alpha.20240903083725",
-  "@nocobase/server": "1.4.0-alpha.20240903083725",
-  "@nocobase/cache": "1.4.0-alpha.20240903083725",
-  "@nocobase/plugin-user-data-sync": "1.4.0-alpha.20240903083725",
+  "@nocobase/database": "1.4.0-alpha.20240906133133",
+  "@nocobase/server": "1.4.0-alpha.20240906133133",
+  "@nocobase/plugin-user-data-sync": "1.4.0-alpha.20240906133133",
   "lodash": "4.17.21",
   "@formily/shared": "2.3.0",
-  "@nocobase/actions": "1.4.0-alpha.20240903083725"
+  "@nocobase/actions": "1.4.0-alpha.20240906133133"
 };

package/dist/server/collections/users.js

@@ -112,6 +112,10 @@ var users_default = (0, import_database.defineCollection)({
         "x-component": "Password"
       }
     },
+    {
+      name: "passwordChangeTz",
+      type: "bigInt"
+    },
     {
       type: "string",
       name: "appLang"

package/dist/server/server.js

@@ -42,7 +42,6 @@ module.exports = __toCommonJS(server_exports);
 var import_database = require("@nocobase/database");
 var import_server = require("@nocobase/server");
 var import_utils = require("@nocobase/utils");
-var import_path = require("path");
 var actions = __toESM(require("./actions/users"));
 var import_UserModel = require("./models/UserModel");
 var import_user_data_sync_resource = require("./user-data-sync-resource");
@@ -178,28 +177,25 @@ class PluginUsersServer extends import_server.Plugin {
     });
   }
   async load() {
-    await this.importCollections((0, import_path.resolve)(__dirname, "collections"));
-    this.db.addMigrations({
-      namespace: "users",
-      directory: (0, import_path.resolve)(__dirname, "migrations"),
-      context: {
-        plugin: this
-      }
-    });
-    this.app.resourcer.use(async (ctx, next) => {
+    this.app.resourceManager.use(async (ctx, next) => {
       await next();
       const { associatedName, resourceName, actionName, values } = ctx.action.params;
-      const cache = ctx.app.cache;
       if (associatedName === "roles" && resourceName === "users" && ["add", "remove", "set"].includes(actionName) && (values == null ? void 0 : values.length)) {
-        for (const userId of values) {
-          await cache.del(`roles:${userId}`);
-        }
+        await Promise.all(values.map((userId) => this.app.emitAsync("cache:del:roles", { userId })));
       }
     });
     const userDataSyncPlugin = this.app.pm.get("user-data-sync");
     if (userDataSyncPlugin && userDataSyncPlugin.enabled) {
       userDataSyncPlugin.resourceManager.registerResource(new import_user_data_sync_resource.UserDataSyncResource(this.db, this.app.logger));
     }
+    this.app.db.on("users.beforeUpdate", async (model) => {
+      if (!model._changed.has("password")) {
+        return;
+      }
+      model.set("passwordChangeTz", Date.now());
+      await this.app.emitAsync("cache:del:roles", { userId: model.get("id") });
+      await this.app.emitAsync("cache:del:auth", { userId: model.get("id") });
+    });
   }
   getInstallingData(options = {}) {
     var _a;

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "用户",
   "description": "Provides basic user model, as well as created by and updated by fields.",
   "description.zh-CN": "提供了基础的用户模型，以及创建人和最后更新人字段。",
-  "version": "1.4.0-alpha.20240903083725",
+  "version": "1.4.0-alpha.20240906133133",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/users",
@@ -25,7 +25,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "ed8aee01686cbd1241e0b1a3575b076ec4b9db78",
+  "gitHead": "e87488347b8376ba6877306986ecc0c1d2d41542",
   "keywords": [
     "Users & permissions"
   ]