@nocobase/plugin-departments 2.0.0-alpha.48 → 2.0.0-alpha.49

package/dist/server/plugin.js

@@ -35,7 +35,6 @@ var import_departments = require("./actions/departments");
 var import_users = require("./actions/users");
 var import_users2 = require("./collections/users");
 var import_middlewares = require("./middlewares");
-var import_set_departments_roles = require("./middlewares/set-departments-roles");
 var import_department = require("./models/department");
 var import_department_data_sync_resource = require("./department-data-sync-resource");
 class PluginDepartmentsServer extends import_server.Plugin {
@@ -52,6 +51,7 @@ class PluginDepartmentsServer extends import_server.Plugin {
     });
   }
   async load() {
+    this.registerErrorHandler();
     this.app.resourceManager.registerActionHandlers({
       "users:listExcludeDept": import_users.listExcludeDept,
       "users:setMainDepartment": import_users.setMainDepartment,
@@ -73,13 +73,13 @@ class PluginDepartmentsServer extends import_server.Plugin {
         "departments.members:*"
       ]
     });
-    this.app.resourceManager.use(import_set_departments_roles.setDepartmentsInfo, {
+    this.app.resourceManager.use(import_middlewares.setDepartmentsInfo, {
       tag: "setDepartmentsInfo",
       before: "setCurrentRole",
       after: "auth"
     });
     this.app.dataSourceManager.afterAddDataSource((dataSource) => {
-      dataSource.resourceManager.use(import_set_departments_roles.setDepartmentsInfo, {
+      dataSource.resourceManager.use(import_middlewares.setDepartmentsInfo, {
         tag: "setDepartmentsInfo",
         before: "setCurrentRole",
         after: "auth"
@@ -98,6 +98,38 @@ class PluginDepartmentsServer extends import_server.Plugin {
       const cache = this.app.cache;
       await cache.del(`departments:${model.get("userId")}`);
     });
+    this.app.db.on("users.beforeSave", async (model, options) => {
+      var _a;
+      const mainDepartmentId = model.get("mainDepartmentId");
+      if (!mainDepartmentId) {
+        return;
+      }
+      const userId = model.get("id");
+      const transaction = options == null ? void 0 : options.transaction;
+      if (userId) {
+        const userDepartment = await this.app.db.getRepository("departmentsUsers").findOne({
+          filter: {
+            userId,
+            departmentId: mainDepartmentId
+          },
+          transaction
+        });
+        if (userDepartment) {
+          return;
+        }
+      }
+      const submittedDepartments = (_a = options == null ? void 0 : options.values) == null ? void 0 : _a.departments;
+      if (Array.isArray(submittedDepartments)) {
+        const included = submittedDepartments.some((d) => {
+          const id = typeof d === "object" ? d && (d.id ?? d) : d;
+          return `${id}` === `${mainDepartmentId}`;
+        });
+        if (included) {
+          return;
+        }
+      }
+      throw new Error(`Invalid main department, it must be one of the user's departments`);
+    });
     this.app.on("beforeSignOut", ({ userId }) => {
       this.app.cache.del(`departments:${userId}`);
     });
@@ -146,6 +178,20 @@ class PluginDepartmentsServer extends import_server.Plugin {
   }
   async remove() {
   }
+  registerErrorHandler() {
+    const errorHandlerPlugin = this.app.pm.get("error-handler");
+    errorHandlerPlugin.errorHandler.register(
+      (err) => {
+        return err.message === "Invalid main department, it must be one of the user's departments";
+      },
+      (err, ctx) => {
+        return ctx.throw(
+          400,
+          ctx.i18n.t("Invalid main department, it must be one of the user's departments", { ns: "departments" })
+        );
+      }
+    );
+  }
 }
 var plugin_default = PluginDepartmentsServer;
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -6,7 +6,7 @@
   "description": "Organize users by departments, set hierarchical relationships, link roles to control permissions, and use departments as variables in workflows and expressions.",
   "description.ru-RU": "Организация пользователей по подразделениям, установление иерархических связей, привязка ролей для управления правами и использование подразделений в качестве переменных в рабочих процессах и выражениях.",
   "description.zh-CN": "以部门来组织用户，设定上下级关系，绑定角色控制权限，并支持作为变量用于工作流和表达式。",
-  "version": "2.0.0-alpha.48",
+  "version": "2.0.0-alpha.49",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/actions": "2.x",
@@ -18,5 +18,5 @@
   "keywords": [
     "Users & permissions"
   ],
-  "gitHead": "456be3a6e92f984fe283590c80d3ea9423695ba6"
+  "gitHead": "99f71bc8961da62a761630b3eae11092a4372e3e"
 }