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

package/client.d.ts

@@ -0,0 +1,3 @@
+export * from './src/client';
+export { default } from './src/client';
+

package/client.js

@@ -0,0 +1 @@
+module.exports = require('./lib/client/index.js');

package/lib/client/index.d.ts

@@ -0,0 +1,5 @@
+import { Plugin } from '@nocobase/client';
+declare class AclPlugin extends Plugin {
+    load(): Promise<void>;
+}
+export default AclPlugin;

package/lib/client/index.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
+    return data;
+  };
+  return data;
+}
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+class AclPlugin extends _client().Plugin {
+  load() {
+    return _asyncToGenerator(function* () {})();
+  }
+}
+var _default = AclPlugin;
+exports.default = _default;

package/lib/{actions → server/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/server/index.d.ts

@@ -0,0 +1 @@
+export { default } from './server';

package/lib/server/index.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function get() {
+    return _server.default;
+  }
+});
+var _server = _interopRequireDefault(require("./server"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/server/middlewares/setCurrentRole.d.ts

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

package/lib/{middlewares → server/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/lib/{server.js → server/server.js}

@@ -32,9 +32,9 @@ function _server() {
   };
   return data;
 }
-function _lodash() {
-  const data = _interopRequireDefault(require("lodash"));
-  _lodash = function _lodash() {
+function _utils() {
+  const data = require("@nocobase/utils");
+  _utils = function _utils() {
     return data;
   };
   return data;
@@ -54,7 +54,6 @@ var _setCurrentRole = require("./middlewares/setCurrentRole");
 var _RoleModel = require("./model/RoleModel");
 var _RoleResourceActionModel = require("./model/RoleResourceActionModel");
 var _RoleResourceModel = require("./model/RoleResourceModel");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
@@ -244,7 +243,7 @@ class PluginACL extends _server().Plugin {
             return field instanceof _database().RelationField;
           });
           ctx.params = _objectSpread(_objectSpread({}, ctx.params), {}, {
-            fields: _lodash().default.difference(fieldsParams, associationsFields),
+            fields: _utils().lodash.difference(fieldsParams, associationsFields),
             appends: associationsFields
           });
         }
@@ -660,7 +659,7 @@ class PluginACL extends _server().Plugin {
           // is association request
           if (resourceName.includes('.') && resourceOf) {
             var _ctx$permission2, _ctx$permission2$can, _availableAction$opti;
-            if (!(ctx === null || ctx === void 0 ? void 0 : (_ctx$permission2 = ctx.permission) === null || _ctx$permission2 === void 0 ? void 0 : (_ctx$permission2$can = _ctx$permission2.can) === null || _ctx$permission2$can === void 0 ? void 0 : _ctx$permission2$can.params)) {
+            if (!(ctx !== null && ctx !== void 0 && (_ctx$permission2 = ctx.permission) !== null && _ctx$permission2 !== void 0 && (_ctx$permission2$can = _ctx$permission2.can) !== null && _ctx$permission2$can !== void 0 && _ctx$permission2$can.params)) {
               return next();
             }
             // 关联数据去掉 filter
@@ -674,7 +673,7 @@ class PluginACL extends _server().Plugin {
               action: actionName
             });
             const availableAction = _this5.app.acl.getAvailableAction(actionName);
-            if (availableAction === null || availableAction === void 0 ? void 0 : (_availableAction$opti = availableAction.options) === null || _availableAction$opti === void 0 ? void 0 : _availableAction$opti.onNewRecord) {
+            if (availableAction !== null && availableAction !== void 0 && (_availableAction$opti = availableAction.options) !== null && _availableAction$opti !== void 0 && _availableAction$opti.onNewRecord) {
               if (action) {
                 ctx.permission.skip = true;
               } else {
@@ -744,10 +743,10 @@ class PluginACL extends _server().Plugin {
           }
           const Model = collection.model;
           const primaryKeyField = Model.primaryKeyField || Model.primaryKeyAttribute;
-          const dataPath = ((_ctx$body = ctx.body) === null || _ctx$body === void 0 ? void 0 : _ctx$body.rows) ? 'body.rows' : 'body';
-          let listData = _lodash().default.get(ctx, dataPath);
+          const dataPath = (_ctx$body = ctx.body) !== null && _ctx$body !== void 0 && _ctx$body.rows ? 'body.rows' : 'body';
+          let listData = _utils().lodash.get(ctx, dataPath);
           if (actionName == 'get') {
-            listData = _lodash().default.castArray(listData);
+            listData = _utils().lodash.castArray(listData);
           }
           const inspectActions = ['view', 'update', 'destroy'];
           const actionsParams = [];
@@ -810,7 +809,7 @@ class PluginACL extends _server().Plugin {
             if (!params) {
               continue;
             }
-            if (_lodash().default.isEmpty(params) || _lodash().default.isEmpty(params.filter)) {
+            if (_utils().lodash.isEmpty(params) || _utils().lodash.isEmpty(params.filter)) {
               allAllowed.push(action);
               continue;
             }
@@ -828,7 +827,7 @@ class PluginACL extends _server().Plugin {
                 };
                 // change camelCase to snake_case
                 const iterate = (rootObj, path = []) => {
-                  const obj = path.length == 0 ? rootObj : _lodash().default.get(rootObj, path);
+                  const obj = path.length == 0 ? rootObj : _utils().lodash.get(rootObj, path);
                   if (Array.isArray(obj)) {
                     for (let i = 0; i < obj.length; i++) {
                       if (obj[i] === null) {
@@ -850,13 +849,13 @@ class PluginACL extends _server().Plugin {
                     if (typeof key === 'string' && key !== (0, _database().snakeCase)(key)) {
                       const setKey = isAssociationKey(key) ? (() => {
                         const parts = key.split('.');
-                        parts[parts.length - 1] = _lodash().default.snakeCase(parts[parts.length - 1]);
+                        parts[parts.length - 1] = _utils().lodash.snakeCase(parts[parts.length - 1]);
                         const result = parts.join('.');
                         return result.endsWith('$') ? result : `${result}$`;
                       })() : (0, _database().snakeCase)(key);
-                      const setValue = _lodash().default.cloneDeep(obj[key]);
-                      _lodash().default.unset(rootObj, [...path, key]);
-                      _lodash().default.set(rootObj, [...path, setKey], setValue);
+                      const setValue = _utils().lodash.cloneDeep(obj[key]);
+                      _utils().lodash.unset(rootObj, [...path, key]);
+                      _utils().lodash.set(rootObj, [...path, setKey], setValue);
                     }
                   });
                 };

package/package.json

@@ -4,20 +4,37 @@
   "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.11.0-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"
+  "main": "./lib/server/index.js",
+  "files": [
+    "lib",
+    "src",
+    "README.md",
+    "README.zh-CN.md",
+    "CHANGELOG.md",
+    "server.js",
+    "server.d.ts",
+    "client.js",
+    "client.d.ts"
+  ],
+  "devDependencies": {
+    "@nocobase/acl": "0.11.0-alpha.1",
+    "@nocobase/actions": "0.11.0-alpha.1",
+    "@nocobase/client": "0.11.0-alpha.1",
+    "@nocobase/database": "0.11.0-alpha.1",
+    "@nocobase/server": "0.11.0-alpha.1",
+    "@nocobase/test": "0.11.0-alpha.1",
+    "@nocobase/utils": "0.11.0-alpha.1",
+    "@types/jsonwebtoken": "^8.5.8",
+    "jsonwebtoken": "^8.5.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "1be8fcdad42688064460761cea22830cf392c7c0"
+  "gitHead": "7581b6d3a3a54f09f06a9effb7e3e65328281b2b"
 }

package/server.d.ts

@@ -0,0 +1,3 @@
+export * from './src/server';
+export { default } from './src/server';
+

package/server.js

@@ -0,0 +1 @@
+module.exports = require('./lib/server/index.js');

package/src/client/index.ts

@@ -0,0 +1,8 @@
+import { Plugin } from '@nocobase/client';
+
+class AclPlugin extends Plugin {
+  async load() {
+  }
+}
+
+export default AclPlugin;

package/src/index.ts

@@ -0,0 +1 @@
+export { default } from './server';