@tachybase/module-user 1.3.25 → 1.5.0

package/dist/server/migrations/20251027170000-add-user-status-fields.js

@@ -0,0 +1,232 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var add_user_status_fields_exports = {};
+__export(add_user_status_fields_exports, {
+  default: () => AddUserStatusFieldsMigration
+});
+module.exports = __toCommonJS(add_user_status_fields_exports);
+var import_server = require("@tego/server");
+class AddUserStatusFieldsMigration extends import_server.Migration {
+  constructor() {
+    super(...arguments);
+    this.appVersion = "<1.4.0";
+  }
+  async up() {
+    const Field = this.context.db.getRepository("fields");
+    const statusFieldExists = await Field.count({
+      filter: {
+        name: "status",
+        collectionName: "users"
+      }
+    });
+    if (!statusFieldExists) {
+      await Field.create({
+        values: {
+          name: "status",
+          collectionName: "users",
+          type: "string",
+          defaultValue: "active",
+          comment: "\u7528\u6237\u72B6\u6001\uFF1Aactive-\u6B63\u5E38, pending-\u5F85\u5BA1\u6838, locked-\u9501\u5B9A, disabled-\u505C\u7528",
+          uiSchema: {
+            type: "string",
+            title: '{{t("Status")}}',
+            "x-component": "Select",
+            "x-component-props": {
+              fieldNames: {
+                label: "title",
+                value: "key"
+              }
+            }
+          }
+        }
+      });
+    }
+    const statusExpireAtFieldExists = await Field.count({
+      filter: {
+        name: "statusExpireAt",
+        collectionName: "users"
+      }
+    });
+    if (!statusExpireAtFieldExists) {
+      await Field.create({
+        values: {
+          name: "statusExpireAt",
+          collectionName: "users",
+          type: "date",
+          comment: "\u72B6\u6001\u8FC7\u671F\u65F6\u95F4\uFF0Cnull\u8868\u793A\u6C38\u4E45",
+          uiSchema: {
+            type: "string",
+            title: '{{t("Status Expire At")}}',
+            "x-component": "DatePicker",
+            "x-component-props": {
+              showTime: true
+            }
+          }
+        }
+      });
+    }
+    const previousStatusFieldExists = await Field.count({
+      filter: {
+        name: "previousStatus",
+        collectionName: "users"
+      }
+    });
+    if (!previousStatusFieldExists) {
+      await Field.create({
+        values: {
+          name: "previousStatus",
+          collectionName: "users",
+          type: "string",
+          comment: "\u539F\u72B6\u6001\uFF0C\u7528\u4E8E\u72B6\u6001\u8FC7\u671F\u540E\u81EA\u52A8\u6062\u590D",
+          uiSchema: {
+            type: "string",
+            title: '{{t("Previous Status")}}',
+            "x-component": "Select",
+            "x-component-props": {
+              fieldNames: {
+                label: "title",
+                value: "key"
+              }
+            }
+          }
+        }
+      });
+    }
+    const statusReasonFieldExists = await Field.count({
+      filter: {
+        name: "statusReason",
+        collectionName: "users"
+      }
+    });
+    if (!statusReasonFieldExists) {
+      await Field.create({
+        values: {
+          name: "statusReason",
+          collectionName: "users",
+          type: "text",
+          comment: "\u72B6\u6001\u53D8\u66F4\u539F\u56E0\u8BF4\u660E",
+          uiSchema: {
+            type: "string",
+            title: '{{t("Status Reason")}}',
+            "x-component": "Input.TextArea"
+          }
+        }
+      });
+    }
+    const statusInfoFieldExists = await Field.count({
+      filter: {
+        name: "statusInfo",
+        collectionName: "users"
+      }
+    });
+    if (!statusInfoFieldExists) {
+      await Field.create({
+        values: {
+          name: "statusInfo",
+          collectionName: "users",
+          type: "belongsTo",
+          target: "userStatuses",
+          foreignKey: "status",
+          targetKey: "key",
+          uiSchema: {
+            type: "object",
+            title: '{{t("Status")}}',
+            "x-component": "AssociationField",
+            "x-component-props": {
+              fieldNames: {
+                label: "title",
+                value: "key"
+              }
+            }
+          }
+        }
+      });
+    }
+    const previousStatusInfoFieldExists = await Field.count({
+      filter: {
+        name: "previousStatusInfo",
+        collectionName: "users"
+      }
+    });
+    if (!previousStatusInfoFieldExists) {
+      await Field.create({
+        values: {
+          name: "previousStatusInfo",
+          collectionName: "users",
+          type: "belongsTo",
+          target: "userStatuses",
+          foreignKey: "previousStatus",
+          targetKey: "key",
+          uiSchema: {
+            type: "object",
+            title: '{{t("Previous Status")}}',
+            "x-component": "AssociationField",
+            "x-component-props": {
+              fieldNames: {
+                label: "title",
+                value: "key"
+              }
+            }
+          }
+        }
+      });
+    }
+    const statusHistoriesFieldExists = await Field.count({
+      filter: {
+        name: "statusHistories",
+        collectionName: "users"
+      }
+    });
+    if (!statusHistoriesFieldExists) {
+      await Field.create({
+        values: {
+          name: "statusHistories",
+          collectionName: "users",
+          type: "hasMany",
+          target: "userStatusHistories",
+          foreignKey: "userId",
+          uiSchema: {
+            type: "array",
+            title: '{{t("Status History")}}',
+            "x-component": "AssociationField"
+          }
+        }
+      });
+    }
+  }
+  async down() {
+    const Field = this.context.db.getRepository("fields");
+    const fieldsToRemove = [
+      "status",
+      "statusExpireAt",
+      "previousStatus",
+      "statusReason",
+      "statusInfo",
+      "previousStatusInfo",
+      "statusHistories"
+    ];
+    for (const fieldName of fieldsToRemove) {
+      await Field.destroy({
+        filter: {
+          name: fieldName,
+          collectionName: "users"
+        }
+      });
+    }
+  }
+}

package/dist/server/server.d.ts

@@ -9,4 +9,8 @@ export default class PluginUsersServer extends Plugin {
         rootUsername: any;
     };
     install(options: any): Promise<void>;
+    /**
+     * 初始化系统内置状态
+     */
+    initSystemStatuses(): Promise<void>;
 }

package/dist/server/server.js

@@ -139,6 +139,48 @@ class PluginUsersServer extends import_server.Plugin {
       name: `pm.${this.name}.*`,
       actions: ["users:listExcludeRole", "users:list"]
     });
+    this.app.acl.registerSnippet({
+      name: `pm.users.statuses`,
+      actions: ["userStatuses:*", "userStatusHistories:*"]
+    });
+    this.app.acl.addFixedParams("userStatuses", "destroy", () => {
+      return {
+        filter: {
+          "isSystemDefined.$ne": true
+        }
+      };
+    });
+    this.app.acl.addFixedParams("userStatuses", "update", () => {
+      return {
+        filter: {
+          "isSystemDefined.$ne": true
+        }
+      };
+    });
+    this.app.acl.addFixedParams("userStatusHistories", "destroy", () => {
+      return {
+        filter: {
+          id: -1
+          // 永远不匹配任何记录
+        }
+      };
+    });
+    this.app.acl.addFixedParams("userStatusHistories", "update", () => {
+      return {
+        filter: {
+          id: -1
+          // 永远不匹配任何记录
+        }
+      };
+    });
+    this.app.acl.addFixedParams("userStatusHistories", "create", () => {
+      return {
+        filter: {
+          id: -1
+          // 永远不匹配任何记录
+        }
+      };
+    });
   }
   async load() {
     await this.importCollections((0, import_node_path.resolve)(__dirname, "collections"));
@@ -152,6 +194,9 @@ class PluginUsersServer extends import_server.Plugin {
     if (!import_node_worker_threads.isMainThread) {
       return;
     }
+    this.app.on("afterLoad", async () => {
+      await this.initSystemStatuses();
+    });
     this.app.resourcer.use(
       async (ctx, next) => {
         await next();
@@ -220,4 +265,67 @@ class PluginUsersServer extends import_server.Plugin {
       await repo.db2cm("users");
     }
   }
+  /**
+   * 初始化系统内置状态
+   */
+  async initSystemStatuses() {
+    const systemStatuses = [
+      {
+        key: "active",
+        title: '{{t("Active")}}',
+        color: "green",
+        allowLogin: true,
+        loginErrorMessage: null,
+        isSystemDefined: true,
+        packageName: "@tachybase/module-user",
+        description: '{{t("Normal active user")}}',
+        sort: 1,
+        config: {}
+      },
+      {
+        key: "pending",
+        title: '{{t("Pending")}}',
+        color: "orange",
+        allowLogin: false,
+        loginErrorMessage: '{{t("Your account is under review, please wait for administrator approval")}}',
+        isSystemDefined: true,
+        packageName: "@tachybase/module-user",
+        description: '{{t("User waiting for approval")}}',
+        sort: 2,
+        config: {}
+      },
+      {
+        key: "disabled",
+        title: '{{t("Disabled")}}',
+        color: "gray",
+        allowLogin: false,
+        loginErrorMessage: '{{t("Your account has been disabled, please contact administrator if you have any questions")}}',
+        isSystemDefined: true,
+        packageName: "@tachybase/module-user",
+        description: '{{t("Manually disabled by administrator")}}',
+        sort: 3,
+        config: {}
+      }
+    ];
+    const statusRepo = this.db.getRepository("userStatuses");
+    if (!statusRepo) {
+      this.app.logger.warn("userStatuses repository not found");
+      return;
+    }
+    for (const status of systemStatuses) {
+      try {
+        const existing = await statusRepo.findOne({
+          filter: { key: status.key }
+        });
+        if (!existing) {
+          await statusRepo.create({
+            values: status
+          });
+          this.app.logger.info(`Created system status: ${status.key}`);
+        }
+      } catch (error) {
+        this.app.logger.error(`Failed to create system status ${status.key}:`, error);
+      }
+    }
+  }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/module-user",
   "displayName": "Users",
-  "version": "1.3.25",
+  "version": "1.5.0",
   "description": "Provides basic user model, as well as created by and updated by fields.",
   "keywords": [
     "Users & permissions"
@@ -17,10 +17,10 @@
     "@types/jsonwebtoken": "^8.5.9",
     "antd": "5.22.5",
     "jsonwebtoken": "^8.5.1",
-    "react-i18next": "15.2.0",
-    "@tachybase/client": "1.3.25",
-    "@tachybase/module-auth": "1.3.25",
-    "@tachybase/module-acl": "1.3.25"
+    "react-i18next": "16.2.1",
+    "@tachybase/client": "1.5.0",
+    "@tachybase/module-acl": "1.5.0",
+    "@tachybase/module-auth": "1.5.0"
   },
   "description.zh-CN": "提供了基础的用户模型，以及创建人和最后更新人字段。",
   "displayName.zh-CN": "用户",