@nocobase/plugin-acl 0.8.1-alpha.3 → 0.9.0-alpha.1

package/lib/actions/role-check.js

@@ -73,7 +73,9 @@ function _checkAction() {
         }
       });
       const role = ctx.app.acl.getRole(currentRole);
+      const availableActions = ctx.app.acl.getAvailableActions();
       ctx.body = _objectSpread(_objectSpread({}, role.toJSON()), {}, {
+        availableActions: [...availableActions.keys()],
         resources: [...role.resources.keys()],
         actionAlias: map2obj(ctx.app.acl.actionAlias),
         allowAll: currentRole === 'root',

package/lib/actions/role-collections.js

@@ -37,7 +37,8 @@ const roleCollectionsResource = {
               _ctx$action$params$pa2 = _ctx$action$params.pageSize,
               pageSize = _ctx$action$params$pa2 === void 0 ? 20 : _ctx$action$params$pa2;
         const db = ctx.db;
-        const collectionRepository = db.getRepository('collections'); // all collections
+        const collectionRepository = db.getRepository('collections');
+        const fieldRepository = db.getRepository('fields'); // all collections
 
         const _yield$collectionRepo = yield collectionRepository.findAndCount({
           filter: ctx.action.params.filter,
@@ -56,19 +57,45 @@ const roleCollectionsResource = {
 
         const roleResourcesNames = roleResources.map(roleResource => roleResource.get('name'));
         const roleResourceActionResourceNames = roleResources.filter(roleResources => roleResources.get('usingActionsConfig')).map(roleResources => roleResources.get('name'));
+        const items = collections.map((collection, i) => {
+          const exists = roleResourcesNames.includes(collection.get('name'));
+          const usingConfig = roleResourceActionResourceNames.includes(collection.get('name')) ? 'resourceAction' : 'strategy';
+          const c = db.getCollection(collection.get('name')); // const children = [...c.fields.values()]
+          //   .filter(
+          //     (f) => f.options.interface && ['hasOne', 'hasMany', 'belongsTo', 'belongsToMany'].includes(f.options.type),
+          //   )
+          //   .map((f, j) => {
+          //     const name = `${collection.get('name')}.${f.options.name}`;
+          //     const usingConfig: UsingConfigType = roleResourceActionResourceNames.includes(name)
+          //       ? 'resourceAction'
+          //       : 'strategy';
+          //     const exists = roleResourcesNames.includes(name);
+          //     return {
+          //       type: 'association',
+          //       __index: `${i}.children.${j}`,
+          //       name,
+          //       collectionName: f.options.target,
+          //       title: f.options?.uiSchema?.title,
+          //       roleName: role,
+          //       usingConfig,
+          //       exists,
+          //     };
+          //   });
+
+          return {
+            type: 'collection',
+            name: collection.get('name'),
+            collectionName: collection.get('name'),
+            title: collection.get('title'),
+            roleName: role,
+            usingConfig,
+            exists // children: children.length > 0 ? children : null,
+
+          };
+        });
         ctx.body = {
           count,
-          rows: collections.map(collection => {
-            const exists = roleResourcesNames.includes(collection.get('name'));
-            const usingConfig = roleResourceActionResourceNames.includes(collection.get('name')) ? 'resourceAction' : 'strategy';
-            return {
-              name: collection.get('name'),
-              title: collection.get('title'),
-              roleName: role,
-              usingConfig,
-              exists
-            };
-          }),
+          rows: items,
           page: Number(page),
           pageSize: Number(pageSize),
           totalPage: totalPage(count, pageSize)

package/lib/collections/roles.js

@@ -67,6 +67,10 @@ var _default = {
     target: 'rolesResources',
     sourceKey: 'name',
     targetKey: 'name'
+  }, {
+    type: 'set',
+    name: 'snippets',
+    defaultValue: ['!ui.*', '!pm', '!pm.*']
   }]
 };
 exports.default = _default;

package/lib/collections/rolesResourcesActions.js

@@ -22,7 +22,8 @@ var _default = {
   }, {
     type: 'belongsTo',
     name: 'scope',
-    target: 'rolesResourcesScopes'
+    target: 'rolesResourcesScopes',
+    onDelete: 'RESTRICT'
   }]
 };
 exports.default = _default;

package/lib/collections/users.js

@@ -24,6 +24,7 @@ var _default = (0, _database().extend)({
     target: 'roles',
     foreignKey: 'userId',
     otherKey: 'roleName',
+    onDelete: 'CASCADE',
     sourceKey: 'id',
     targetKey: 'name',
     through: 'rolesUsers',

package/lib/migrations/20221214072638-set-role-snippets.d.ts

@@ -0,0 +1,5 @@
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    up(): Promise<void>;
+    down(): Promise<void>;
+}

package/lib/migrations/20221214072638-set-role-snippets.js

@@ -0,0 +1,49 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+function _server() {
+  const data = require("@nocobase/server");
+
+  _server = function _server() {
+    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 _default extends _server().Migration {
+  up() {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      yield _this.app.db.getRepository('roles').update({
+        filter: {
+          $or: [{
+            allowConfigure: true
+          }, {
+            name: 'root'
+          }]
+        },
+        values: {
+          snippets: ['ui.*', 'pm', 'pm.*'],
+          allowConfigure: false
+        }
+      });
+    })();
+  }
+
+  down() {
+    return _asyncToGenerator(function* () {})();
+  }
+
+}
+
+exports.default = _default;

package/lib/model/RoleModel.js

@@ -36,6 +36,7 @@ class RoleModel extends _database().Model {
     role.setStrategy(_objectSpread(_objectSpread({}, this.get('strategy') || {}), {}, {
       allowConfigure: this.get('allowConfigure')
     }));
+    role.snippets = new Set(this.get('snippets'));
   }
 
 }

package/lib/model/RoleResourceActionModel.js

@@ -78,7 +78,7 @@ class RoleResourceActionModel extends _database().Model {
             continue;
           }
 
-          const fieldType = collectionField.get('interface');
+          const fieldType = collectionField.get('type');
           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');
 
@@ -86,12 +86,18 @@ class RoleResourceActionModel extends _database().Model {
             // grant association actions to role
             const associationActions = fieldActions.associationActions || [];
             associationActions.forEach(associationAction => {
-              const actionName = `${resourceName}.${fieldTarget}:${associationAction}`;
+              const actionName = `${resourceName}.${collectionField.get('name')}:${associationAction}`;
               role.grantAction(actionName);
             });
             const targetActions = fieldActions.targetActions || [];
             targetActions.forEach(targetAction => {
-              const targetActionPath = `${fieldTarget}:${targetAction}`; // set resource target action with current resourceName
+              const targetActionPath = `${fieldTarget}:${targetAction}`;
+              const existsAction = role.getActionParams(targetActionPath);
+
+              if (existsAction) {
+                return;
+              } // 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}`]);