@nocobase/plugin-acl 0.17.0-alpha.6 → 0.18.0-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/externalVersion.js +6 -6
  2. package/dist/locale/en-US.json +4 -0
  3. package/dist/locale/zh-CN.json +4 -0
  4. package/dist/server/middlewares/setCurrentRole.js +11 -1
  5. package/package.json +2 -2
package/dist/externalVersion.js CHANGED
@@ -1,10 +1,10 @@
1
1
  module.exports = {
2
- "@nocobase/client": "0.17.0-alpha.6",
3
- "@nocobase/acl": "0.17.0-alpha.6",
4
- "@nocobase/actions": "0.17.0-alpha.6",
5
- "@nocobase/database": "0.17.0-alpha.6",
6
- "@nocobase/server": "0.17.0-alpha.6",
2
+ "@nocobase/client": "0.18.0-alpha.1",
3
+ "@nocobase/acl": "0.18.0-alpha.1",
4
+ "@nocobase/actions": "0.18.0-alpha.1",
5
+ "@nocobase/database": "0.18.0-alpha.1",
6
+ "@nocobase/server": "0.18.0-alpha.1",
7
7
  "async-mutex": "0.3.2",
8
8
  "lodash": "4.17.21",
9
- "@nocobase/cache": "0.17.0-alpha.6"
9
+ "@nocobase/cache": "0.18.0-alpha.1"
10
10
  };
package/dist/locale/en-US.json ADDED
@@ -0,0 +1,4 @@
1
+ {
2
+ "The current user has no roles. Please try another account.": "The current user has no roles. Please try another account.",
3
+ "The user role does not exist. Please try signing in again": "The user role does not exist. Please try signing in again"
4
+ }
package/dist/locale/zh-CN.json ADDED
@@ -0,0 +1,4 @@
1
+ {
2
+ "The current user has no roles. Please try another account.": "当前用户没有角色，请使用其他账号。",
3
+ "The user role does not exist. Please try signing in again": "用户角色不存在，请尝试重新登录。"
4
+ }
package/dist/server/middlewares/setCurrentRole.js CHANGED
@@ -38,6 +38,13 @@ async function setCurrentRole(ctx, next) {
38
38
  raw: true
39
39
  })
40
40
  );
41
+ if (!roles.length) {
42
+ ctx.state.currentRole = void 0;
43
+ return ctx.throw(401, {
44
+ code: "USER_HAS_NO_ROLES_ERR",
45
+ message: ctx.t("The current user has no roles. Please try another account.", { ns: "acl" })
46
+ });
47
+ }
41
48
  ctx.state.currentUser.roles = roles;
42
49
  if (currentRole) {
43
50
  ctx.state.currentRole = (_a = roles.find((role) => role.name === currentRole)) == null ? void 0 : _a.name;
@@ -49,7 +56,10 @@ async function setCurrentRole(ctx, next) {
49
56
  ctx.state.currentRole = (_b = defaultRole || roles[0]) == null ? void 0 : _b.name;
50
57
  }
51
58
  if (!ctx.state.currentRole) {
52
- return ctx.throw(401, { code: "ROLE_NOT_FOUND_ERR", message: "The user role does not exist." });
59
+ return ctx.throw(401, {
60
+ code: "ROLE_NOT_FOUND_ERR",
61
+ message: ctx.t("The user role does not exist. Please try signing in again", { ns: "acl" })
62
+ });
53
63
  }
54
64
  await next();
55
65
  }
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "displayName.zh-CN": "权限控制",
5
5
  "description": "A simple access control based on roles, resources and actions",
6
6
  "description.zh-CN": "基于角色、资源和操作的权限控制。",
7
- "version": "0.17.0-alpha.6",
7
+ "version": "0.18.0-alpha.1",
8
8
  "license": "AGPL-3.0",
9
9
  "main": "./dist/server/index.js",
10
10
  "devDependencies": {
@@ -29,5 +29,5 @@
29
29
  "url": "git+https://github.com/nocobase/nocobase.git",
30
30
  "directory": "packages/plugins/acl"
31
31
  },
32
- "gitHead": "f92f8bcdf6d5baf07566381e9425ebca11e19626"
32
+ "gitHead": "0f5f1c0a37dc397a9dc4c8eec0c4ec20fd8107b0"
33
33
  }