@nocobase/plugin-acl 0.7.0-alpha.8 → 0.7.0-alpha.82

package/lib/collections/rolesResourcesScopes.js

@@ -1,24 +1,23 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    name: 'rolesResourcesScopes',
-    fields: [
-        {
-            type: 'uid',
-            name: 'key',
-        },
-        {
-            type: 'string',
-            name: 'name',
-        },
-        {
-            type: 'string',
-            name: 'resourceName',
-        },
-        {
-            type: 'json',
-            name: 'scope',
-        },
-    ],
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  name: 'rolesResourcesScopes',
+  fields: [{
+    type: 'uid',
+    name: 'key'
+  }, {
+    type: 'string',
+    name: 'name'
+  }, {
+    type: 'string',
+    name: 'resourceName'
+  }, {
+    type: 'json',
+    name: 'scope'
+  }]
 };
-//# sourceMappingURL=rolesResourcesScopes.js.map
+exports.default = _default;

package/lib/index.js

@@ -1,9 +1,15 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = void 0;
-var server_1 = require("./server");
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(server_1).default; } });
-//# sourceMappingURL=index.js.map
+
+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/model/RoleModel.js

@@ -1,19 +1,43 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.RoleModel = void 0;
-const database_1 = require("@nocobase/database");
-class RoleModel extends database_1.Model {
-    writeToAcl(options) {
-        const { acl } = options;
-        const roleName = this.get('name');
-        let role = acl.getRole(roleName);
-        if (!role) {
-            role = acl.define({
-                role: roleName,
-            });
-        }
-        role.setStrategy(Object.assign(Object.assign({}, (this.get('strategy') || {})), { allowConfigure: this.get('allowConfigure') }));
+
+function _database() {
+  const data = require("@nocobase/database");
+
+  _database = function _database() {
+    return data;
+  };
+
+  return data;
+}
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+class RoleModel extends _database().Model {
+  writeToAcl(options) {
+    const acl = options.acl;
+    const roleName = this.get('name');
+    let role = acl.getRole(roleName);
+
+    if (!role) {
+      role = acl.define({
+        role: roleName
+      });
     }
+
+    role.setStrategy(_objectSpread(_objectSpread({}, this.get('strategy') || {}), {}, {
+      allowConfigure: this.get('allowConfigure')
+    }));
+  }
+
 }
-exports.RoleModel = RoleModel;
-//# sourceMappingURL=RoleModel.js.map
+
+exports.RoleModel = RoleModel;

package/lib/model/RoleResourceActionModel.js

@@ -1,69 +1,106 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.RoleResourceActionModel = void 0;
-const database_1 = require("@nocobase/database");
-class RoleResourceActionModel extends database_1.Model {
-    writeToACL(options) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            // @ts-ignore
-            const db = this.constructor.database;
-            const { resourceName, role, acl, associationFieldsActions, grantHelper } = options;
-            const actionName = this.get('name');
-            const fields = this.get('fields');
-            const actionPath = `${resourceName}:${actionName}`;
-            const actionParams = {
-                fields,
-            };
-            // @ts-ignore
-            const scope = yield this.getScope();
-            if (scope) {
-                actionParams['own'] = scope.get('key') === 'own';
-                actionParams['filter'] = scope.get('scope');
-            }
-            role.grantAction(actionPath, actionParams);
-            const collection = db.getCollection(resourceName);
-            if (!collection) {
-                return;
-            }
-            const availableAction = acl.resolveActionAlias(actionName);
-            for (const field of fields) {
-                const collectionField = collection.getField(field);
-                const fieldType = collectionField.get('interface');
-                const fieldActions = (_a = associationFieldsActions === null || associationFieldsActions === void 0 ? void 0 : associationFieldsActions[fieldType]) === null || _a === void 0 ? void 0 : _a[availableAction];
-                const fieldTarget = collectionField.get('target');
-                if (fieldActions) {
-                    const associationActions = fieldActions.associationActions || [];
-                    associationActions.forEach((associationAction) => {
-                        const actionName = `${resourceName}.${fieldTarget}:${associationAction}`;
-                        role.grantAction(actionName);
-                    });
-                    const targetActions = fieldActions.targetActions || [];
-                    targetActions.forEach((targetAction) => {
-                        const targetActionPath = `${fieldTarget}:${targetAction}`;
-                        grantHelper.resourceTargetActionMap.set(resourceName, [
-                            ...(grantHelper.resourceTargetActionMap.get(resourceName) || []),
-                            targetActionPath,
-                        ]);
-                        grantHelper.targetActionResourceMap.set(targetActionPath, [
-                            ...(grantHelper.targetActionResourceMap.get(targetActionPath) || []),
-                            resourceName,
-                        ]);
-                        role.grantAction(targetActionPath);
-                    });
-                }
-            }
-        });
-    }
+
+function _database() {
+  const data = require("@nocobase/database");
+
+  _database = function _database() {
+    return data;
+  };
+
+  return data;
 }
-exports.RoleResourceActionModel = RoleResourceActionModel;
-//# sourceMappingURL=RoleResourceActionModel.js.map
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+
+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 RoleResourceActionModel extends _database().Model {
+  writeToACL(options) {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      // @ts-ignore
+      const db = _this.constructor.database;
+      const resourceName = options.resourceName,
+            role = options.role,
+            acl = options.acl,
+            associationFieldsActions = options.associationFieldsActions,
+            grantHelper = options.grantHelper;
+
+      const actionName = _this.get('name');
+
+      const fields = _this.get('fields');
+
+      const actionPath = `${resourceName}:${actionName}`;
+      const actionParams = {
+        fields
+      }; // @ts-ignore
+
+      const scope = yield _this.getScope();
+
+      if (scope) {
+        actionParams['own'] = scope.get('key') === 'own';
+        actionParams['filter'] = scope.get('scope');
+      }
+
+      role.grantAction(actionPath, actionParams);
+      const collection = db.getCollection(resourceName);
+
+      if (!collection) {
+        return;
+      }
+
+      const availableAction = acl.resolveActionAlias(actionName);
+
+      var _iterator = _createForOfIteratorHelper(fields),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var _associationFieldsAct;
+
+          const field = _step.value;
+          const collectionField = collection.getField(field);
+          const fieldType = collectionField.get('interface');
+          const fieldActions = associationFieldsActions === null || associationFieldsActions === void 0 ? void 0 : (_associationFieldsAct = associationFieldsActions[fieldType]) === null || _associationFieldsAct === void 0 ? void 0 : _associationFieldsAct[availableAction];
+          const fieldTarget = collectionField.get('target');
+
+          if (fieldActions) {
+            // grant association actions to role
+            const associationActions = fieldActions.associationActions || [];
+            associationActions.forEach(associationAction => {
+              const actionName = `${resourceName}.${fieldTarget}:${associationAction}`;
+              role.grantAction(actionName);
+            });
+            const targetActions = fieldActions.targetActions || [];
+            targetActions.forEach(targetAction => {
+              const targetActionPath = `${fieldTarget}:${targetAction}`; // set resource target action with current resourceName
+
+              grantHelper.resourceTargetActionMap.set(`${role.name}.${resourceName}`, [...(grantHelper.resourceTargetActionMap.get(resourceName) || []), targetActionPath]);
+              grantHelper.targetActionResourceMap.set(targetActionPath, [...(grantHelper.targetActionResourceMap.get(targetActionPath) || []), `${role.name}.${resourceName}`]);
+              role.grantAction(targetActionPath);
+            });
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    })();
+  }
+
+}
+
+exports.RoleResourceActionModel = RoleResourceActionModel;

package/lib/model/RoleResourceModel.js

@@ -1,59 +1,128 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.RoleResourceModel = void 0;
-const database_1 = require("@nocobase/database");
-class RoleResourceModel extends database_1.Model {
-    revoke(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { role, resourceName, grantHelper } = options;
-            role.revokeResource(resourceName);
-            const targetActions = grantHelper.resourceTargetActionMap.get(resourceName) || [];
-            for (const targetAction of targetActions) {
-                const targetActionResource = (grantHelper.targetActionResourceMap.get(targetAction) || []).filter((item) => resourceName !== item);
-                grantHelper.targetActionResourceMap.set(targetAction, targetActionResource);
-                if (targetActionResource.length == 0) {
-                    role.revokeAction(targetAction);
-                }
-            }
-            grantHelper.resourceTargetActionMap.set(resourceName, []);
-        });
-    }
-    writeToACL(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { acl, associationFieldsActions, grantHelper } = options;
-            const resourceName = this.get('name');
-            const roleName = this.get('roleName');
-            const role = acl.getRole(roleName);
-            // revoke resource of role
-            yield this.revoke({ role, resourceName, grantHelper });
-            // @ts-ignore
-            if (this.usingActionsConfig === false) {
-                return;
-            }
-            // @ts-ignore
-            const actions = yield this.getActions({
-                transaction: options.transaction,
-            });
-            for (const action of actions) {
-                yield action.writeToACL({
-                    acl,
-                    role,
-                    resourceName,
-                    associationFieldsActions,
-                    grantHelper: options.grantHelper,
-                });
-            }
-        });
-    }
+
+function _database() {
+  const data = require("@nocobase/database");
+
+  _database = function _database() {
+    return data;
+  };
+
+  return data;
 }
-exports.RoleResourceModel = RoleResourceModel;
-//# sourceMappingURL=RoleResourceModel.js.map
+
+function _acl() {
+  const data = require("@nocobase/acl");
+
+  _acl = function _acl() {
+    return data;
+  };
+
+  return data;
+}
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+
+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 RoleResourceModel extends _database().Model {
+  revoke(options) {
+    return _asyncToGenerator(function* () {
+      const role = options.role,
+            resourceName = options.resourceName,
+            grantHelper = options.grantHelper;
+      role.revokeResource(resourceName);
+      const targetActions = grantHelper.resourceTargetActionMap.get(`${role.name}.${resourceName}`) || [];
+
+      var _iterator = _createForOfIteratorHelper(targetActions),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          const targetAction = _step.value;
+          const targetActionResource = (grantHelper.targetActionResourceMap.get(targetAction) || []).filter(item => `${role.name}.${resourceName}` !== item);
+          grantHelper.targetActionResourceMap.set(targetAction, targetActionResource);
+
+          if (targetActionResource.length == 0) {
+            role.revokeAction(targetAction);
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+
+      grantHelper.resourceTargetActionMap.set(`${role.name}.${resourceName}`, []);
+    })();
+  }
+
+  writeToACL(options) {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      const acl = options.acl,
+            associationFieldsActions = options.associationFieldsActions,
+            grantHelper = options.grantHelper;
+
+      const resourceName = _this.get('name');
+
+      const roleName = _this.get('roleName');
+
+      const role = acl.getRole(roleName); // revoke resource of role
+
+      yield _this.revoke({
+        role,
+        resourceName,
+        grantHelper
+      }); // @ts-ignore
+
+      if (_this.usingActionsConfig === false) {
+        return;
+      }
+
+      const resource = new (_acl().ACLResource)({
+        role,
+        name: resourceName
+      });
+      role.resources.set(resourceName, resource); // @ts-ignore
+
+      const actions = yield _this.getActions({
+        transaction: options.transaction
+      });
+
+      var _iterator2 = _createForOfIteratorHelper(actions),
+          _step2;
+
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          const action = _step2.value;
+          yield action.writeToACL({
+            acl,
+            role,
+            resourceName,
+            associationFieldsActions,
+            grantHelper: options.grantHelper
+          });
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    })();
+  }
+
+}
+
+exports.RoleResourceModel = RoleResourceModel;