@nocobase/plugin-users 1.4.0-alpha.20240828033319 → 1.4.0-alpha.20240902071446

package/dist/externalVersion.js

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

package/dist/server/server.js

@@ -197,7 +197,7 @@ class PluginUsersServer extends import_server.Plugin {
       }
     });
     const userDataSyncPlugin = this.app.pm.get("user-data-sync");
-    if (userDataSyncPlugin) {
+    if (userDataSyncPlugin && userDataSyncPlugin.enabled) {
       userDataSyncPlugin.resourceManager.registerResource(new import_user_data_sync_resource.UserDataSyncResource(this.db, this.app.logger));
     }
   }

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

@@ -7,11 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Model } from '@nocobase/database';
+import lodash from 'lodash';
 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>;
+    getFlteredSourceUser(sourceUser: FormatUser): lodash.Omit<FormatUser, string>;
     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

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -23,12 +25,21 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 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_lodash = __toESM(require("lodash"));
 var import_plugin_user_data_sync = require("@nocobase/plugin-user-data-sync");
 class UserDataSyncResource extends import_plugin_user_data_sync.UserDataResource {
   name = "users";
@@ -36,6 +47,24 @@ class UserDataSyncResource extends import_plugin_user_data_sync.UserDataResource
   get userRepo() {
     return this.db.getRepository("users");
   }
+  getFlteredSourceUser(sourceUser) {
+    const deleteProps = [
+      "id",
+      "uid",
+      "createdAt",
+      "updatedAt",
+      "appLang",
+      "resetToken",
+      "systemSettings",
+      "password",
+      "sort",
+      "createdById",
+      "updatedById",
+      "isDeleted",
+      "departments"
+    ];
+    return import_lodash.default.omit(sourceUser, deleteProps);
+  }
   async updateUser(user, sourceUser) {
     if (sourceUser.isDeleted) {
       const roles = await user.getRoles();
@@ -48,22 +77,13 @@ class UserDataSyncResource extends import_plugin_user_data_sync.UserDataResource
       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;
-    }
+    const filteredSourceUser = this.getFlteredSourceUser(sourceUser);
+    import_lodash.default.forOwn(filteredSourceUser, (value, key) => {
+      if (user[key] !== value) {
+        user[key] = value;
+        dataChanged = true;
+      }
+    });
     if (dataChanged) {
       await user.save();
     }
@@ -94,13 +114,9 @@ class UserDataSyncResource extends import_plugin_user_data_sync.UserDataResource
     if (user) {
       await this.updateUser(user, sourceUser);
     } else {
+      const filteredSourceUser = this.getFlteredSourceUser(sourceUser);
       user = await this.userRepo.create({
-        values: {
-          nickname: sourceUser.nickname,
-          phone: sourceUser.phone,
-          email: sourceUser.email,
-          username: sourceUser.username
-        }
+        values: filteredSourceUser
       });
     }
     return [{ resourcesPk: user.id, isDeleted: false }];

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.20240828033319",
+  "version": "1.4.0-alpha.20240902071446",
   "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": "5d94dbfbb478e9fd43179fdc3b3915b4104edd08",
+  "gitHead": "4d4e251f16b9909359938e66bc5d2cb84a3e9aa9",
   "keywords": [
     "Users & permissions"
   ]