@nocobase/plugin-users 1.3.4-beta → 1.4.0-alpha.20240826214041

package/dist/externalVersion.js

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

package/dist/server/server.js

@@ -45,6 +45,7 @@ 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");
 class PluginUsersServer extends import_server.Plugin {
   async beforeLoad() {
     this.db.registerModels({
@@ -195,6 +196,10 @@ class PluginUsersServer extends import_server.Plugin {
         }
       }
     });
+    const userDataSyncPlugin = this.app.pm.get("user-data-sync");
+    if (userDataSyncPlugin) {
+      userDataSyncPlugin.resourceManager.registerResource(new import_user_data_sync_resource.UserDataSyncResource(this.db, this.app.logger));
+    }
   }
   getInstallingData(options = {}) {
     var _a;

package/dist/server/user-data-sync-resource.d.ts

@@ -0,0 +1,18 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { Model } from '@nocobase/database';
+import { FormatUser, OriginRecord, PrimaryKey, RecordResourceChanged, SyncAccept, UserDataResource } from '@nocobase/plugin-user-data-sync';
+export declare class UserDataSyncResource extends UserDataResource {
+    name: string;
+    accepts: SyncAccept[];
+    get userRepo(): import("@nocobase/database").Repository<any, any>;
+    updateUser(user: Model, sourceUser: FormatUser): Promise<void>;
+    update(record: OriginRecord, resourcePks: PrimaryKey[], matchKey: string): Promise<RecordResourceChanged[]>;
+    create(record: OriginRecord, matchKey: string): Promise<RecordResourceChanged[]>;
+}

package/dist/server/user-data-sync-resource.js

@@ -0,0 +1,112 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+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 user_data_sync_resource_exports = {};
+__export(user_data_sync_resource_exports, {
+  UserDataSyncResource: () => UserDataSyncResource
+});
+module.exports = __toCommonJS(user_data_sync_resource_exports);
+var import_plugin_user_data_sync = require("@nocobase/plugin-user-data-sync");
+class UserDataSyncResource extends import_plugin_user_data_sync.UserDataResource {
+  name = "users";
+  accepts = ["user"];
+  get userRepo() {
+    return this.db.getRepository("users");
+  }
+  async updateUser(user, sourceUser) {
+    if (sourceUser.isDeleted) {
+      const roles = await user.getRoles();
+      for (const role of roles) {
+        if (role.name === "root") {
+          return;
+        }
+      }
+      await user.destroy();
+      return;
+    }
+    let dataChanged = false;
+    if (sourceUser.username !== void 0 && user.username !== sourceUser.username) {
+      user.username = sourceUser.username;
+      dataChanged = true;
+    }
+    if (sourceUser.phone !== void 0 && user.phone !== sourceUser.phone) {
+      user.phone = sourceUser.phone;
+      dataChanged = true;
+    }
+    if (sourceUser.email !== void 0 && user.email !== sourceUser.email) {
+      user.email = sourceUser.email;
+      dataChanged = true;
+    }
+    if (sourceUser.nickname !== void 0 && user.nickname !== sourceUser.nickname) {
+      user.nickname = sourceUser.nickname;
+      dataChanged = true;
+    }
+    if (dataChanged) {
+      await user.save();
+    }
+  }
+  async update(record, resourcePks, matchKey) {
+    const { metaData: sourceUser } = record;
+    const resourcePk = resourcePks[0];
+    const user = await this.userRepo.findOne({
+      filterByTk: resourcePk
+    });
+    if (!user) {
+      const result = await this.create(record, matchKey);
+      return [...result, { resourcesPk: resourcePk, isDeleted: true }];
+    }
+    await this.updateUser(user, sourceUser);
+    return [];
+  }
+  async create(record, matchKey) {
+    const { metaData: sourceUser } = record;
+    const filter = {};
+    let user;
+    if (["phone", "email", "username"].includes(matchKey)) {
+      filter[matchKey] = sourceUser[matchKey];
+      user = await this.userRepo.findOne({
+        filter
+      });
+    }
+    if (user) {
+      await this.updateUser(user, sourceUser);
+    } else {
+      user = await this.userRepo.create({
+        values: {
+          nickname: sourceUser.nickname,
+          phone: sourceUser.phone,
+          email: sourceUser.email,
+          username: sourceUser.username
+        }
+      });
+    }
+    return [{ resourcesPk: user.id, isDeleted: false }];
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  UserDataSyncResource
+});

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.3.4-beta",
+  "version": "1.4.0-alpha.20240826214041",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/users",
@@ -19,12 +19,13 @@
     "@nocobase/database": "1.x",
     "@nocobase/plugin-acl": "1.x",
     "@nocobase/plugin-auth": "1.x",
+    "@nocobase/plugin-user-data-sync": "1.x",
     "@nocobase/resourcer": "1.x",
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "adf8605a79fa171bf8093e7784730a4db508e7f3",
+  "gitHead": "05146e0a96cda923d2c95a92b0fe1bc53390af7a",
   "keywords": [
     "Users & permissions"
   ]