@nocobase/plugin-acl 1.9.0-beta.8 → 1.9.0

package/dist/externalVersion.js

@@ -8,7 +8,7 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.9.0-beta.8",
+  "@nocobase/client": "1.9.0",
   "antd": "5.24.2",
   "react": "18.2.0",
   "react-i18next": "11.18.6",
@@ -17,14 +17,14 @@ module.exports = {
   "@formily/react": "2.3.0",
   "@ant-design/icons": "5.6.1",
   "lodash": "4.17.21",
-  "@nocobase/utils": "1.9.0-beta.8",
-  "@nocobase/actions": "1.9.0-beta.8",
-  "@nocobase/cache": "1.9.0-beta.8",
-  "@nocobase/database": "1.9.0-beta.8",
-  "@nocobase/server": "1.9.0-beta.8",
-  "@nocobase/test": "1.9.0-beta.8",
+  "@nocobase/utils": "1.9.0",
+  "@nocobase/actions": "1.9.0",
+  "@nocobase/cache": "1.9.0",
+  "@nocobase/database": "1.9.0",
+  "@nocobase/server": "1.9.0",
+  "@nocobase/test": "1.9.0",
   "@formily/core": "2.3.0",
   "@formily/antd-v5": "1.2.3",
   "antd-style": "3.7.1",
-  "@nocobase/acl": "1.9.0-beta.8"
+  "@nocobase/acl": "1.9.0"
 };

package/dist/server/actions/user-setDefaultRole.js

@@ -29,6 +29,7 @@ __export(user_setDefaultRole_exports, {
   setDefaultRole: () => setDefaultRole
 });
 module.exports = __toCommonJS(user_setDefaultRole_exports);
+var import_constants = require("../constants");
 async function setDefaultRole(ctx, next) {
   const {
     values: { roleName }
@@ -72,7 +73,7 @@ async function setDefaultRole(ctx, next) {
     if (targetUserRole) {
       await repository.model.update({ default: true }, { where: { userId: currentUser.id, roleName }, transaction });
       model = targetUserRole.set("default", true);
-    } else {
+    } else if (roleName === import_constants.UNION_ROLE_KEY) {
       model = await repository.create({
         values: {
           userId: currentUser.id,
@@ -82,7 +83,9 @@ async function setDefaultRole(ctx, next) {
         transaction
       });
     }
-    db.emitAsync("rolesUsers.afterSave", model);
+    if (model) {
+      db.emitAsync("rolesUsers.afterSave", model);
+    }
   });
   ctx.body = "ok";
   await next();

package/dist/server/server.js

@@ -344,6 +344,7 @@ class PluginACLServer extends import_server.Plugin {
         return;
       }
       const User = this.db.getCollection("users");
+      const user = await User.repository.findOne();
       await User.repository.update({
         values: {
           roles: ["root", "admin", "member"]
@@ -353,7 +354,7 @@ class PluginACLServer extends import_server.Plugin {
       const RolesUsers = this.db.getCollection("rolesUsers");
       await RolesUsers.repository.update({
         filter: {
-          userId: 1,
+          userId: user.id,
           roleName: "root"
         },
         values: {

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "权限控制",
   "description": "Based on roles, resources, and actions, access control can precisely manage interface configuration permissions, data operation permissions, menu access permissions, and plugin permissions.",
   "description.zh-CN": "基于角色、资源和操作的权限控制，可以精确控制界面配置权限、数据操作权限、菜单访问权限、插件权限。",
-  "version": "1.9.0-beta.8",
+  "version": "1.9.0",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/acl",
@@ -33,5 +33,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "f3d4f3d1ba7adbf4d4c60e656c23da45565769c8"
+  "gitHead": "d92ce9096c2b3b5a8f205ecc0e1dedd64d7ee48b"
 }