@nocobase/plugin-acl 0.10.0-alpha.5 → 0.10.1-alpha.1

package/lib/actions/role-check.js

@@ -42,9 +42,6 @@ function checkAction(_x2, _x3) {
 function _checkAction() {
   _checkAction = _asyncToGenerator(function* (ctx, next) {
     const currentRole = ctx.state.currentRole;
-    if (!currentRole) {
-      throw new Error('User role not found');
-    }
     const roleInstance = yield ctx.db.getRepository('roles').findOne({
       filter: {
         name: currentRole

package/lib/middlewares/setCurrentRole.d.ts

@@ -1 +1,2 @@
-export declare function setCurrentRole(ctx: any, next: any): Promise<any>;
+import { Context } from '@nocobase/actions';
+export declare function setCurrentRole(ctx: Context, next: any): Promise<any>;

package/lib/middlewares/setCurrentRole.js

@@ -11,7 +11,7 @@ function setCurrentRole(_x, _x2) {
 }
 function _setCurrentRole() {
   _setCurrentRole = _asyncToGenerator(function* (ctx, next) {
-    let currentRole = ctx.get('X-Role');
+    const currentRole = ctx.get('X-Role');
     if (currentRole === 'anonymous') {
       ctx.state.currentRole = currentRole;
       return next();
@@ -22,21 +22,22 @@ function _setCurrentRole() {
     const repository = ctx.db.getRepository('users.roles', ctx.state.currentUser.id);
     const roles = yield repository.find();
     ctx.state.currentUser.setDataValue('roles', roles);
-    if (roles.length == 1) {
-      currentRole = roles[0].name;
-    } else if (roles.length > 1) {
-      const role = roles.find(item => item.name === currentRole);
-      if (!role) {
-        var _ref;
-        const defaultRole = roles.find(item => {
-          var _item$rolesUsers;
-          return item === null || item === void 0 ? void 0 : (_item$rolesUsers = item.rolesUsers) === null || _item$rolesUsers === void 0 ? void 0 : _item$rolesUsers.default;
-        });
-        currentRole = (_ref = defaultRole || roles[0]) === null || _ref === void 0 ? void 0 : _ref.name;
-      }
-    }
+    // 1. If the X-Role is set, use the specified role
     if (currentRole) {
-      ctx.state.currentRole = currentRole;
+      var _roles$find;
+      ctx.state.currentRole = (_roles$find = roles.find(role => role.name === currentRole)) === null || _roles$find === void 0 ? void 0 : _roles$find.name;
+    }
+    // 2. If the X-Role is not set, use the default role
+    else {
+      var _ref;
+      const defaultRole = roles.find(item => {
+        var _item$rolesUsers;
+        return item === null || item === void 0 ? void 0 : (_item$rolesUsers = item.rolesUsers) === null || _item$rolesUsers === void 0 ? void 0 : _item$rolesUsers.default;
+      });
+      ctx.state.currentRole = (_ref = defaultRole || roles[0]) === null || _ref === void 0 ? void 0 : _ref.name;
+    }
+    if (!ctx.state.currentRole) {
+      return ctx.throw(401, 'User role not found');
     }
     yield next();
   });

package/package.json

@@ -4,20 +4,20 @@
   "displayName.zh-CN": "权限控制",
   "description": "A simple access control based on roles, resources and actions",
   "description.zh-CN": "基于角色、资源和操作的权限控制。",
-  "version": "0.10.0-alpha.5",
+  "version": "0.10.1-alpha.1",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/acl": "0.10.0-alpha.5",
-    "@nocobase/database": "0.10.0-alpha.5",
-    "@nocobase/plugin-users": "0.10.0-alpha.5",
-    "@nocobase/server": "0.10.0-alpha.5"
+    "@nocobase/acl": "0.10.1-alpha.1",
+    "@nocobase/database": "0.10.1-alpha.1",
+    "@nocobase/plugin-users": "0.10.1-alpha.1",
+    "@nocobase/server": "0.10.1-alpha.1"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "1be8fcdad42688064460761cea22830cf392c7c0"
+  "gitHead": "8f415f5e0ee2e72d681f9ab16af5911b52c374a9"
 }