@nocobase/plugin-acl 0.9.0-alpha.2 → 0.9.1-alpha.2

package/README.md

@@ -0,0 +1,11 @@
+# acl
+
+English | [中文](./README.zh-CN.md)
+
+基于角色的权限控制插件。
+
+## 安装激活
+
+内置插件无需手动安装激活。
+
+## 使用方法

package/README.zh-CN.md

@@ -0,0 +1,11 @@
+# acl
+
+[English](./README.md) | 中文
+
+基于角色的权限控制插件。
+
+## 安装激活
+
+内置插件无需手动安装激活。
+
+## 使用方法

package/lib/collections/roles-users.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _default = {
   name: 'rolesUsers',
+  duplicator: 'optional',
+  namespace: 'acl',
   fields: [{
     type: 'boolean',
     name: 'default'

package/lib/collections/roles.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
+  namespace: 'acl',
+  duplicator: 'required',
   name: 'roles',
   title: '{{t("Roles")}}',
   autoGenId: false,

package/lib/collections/rolesResources.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
+  namespace: 'acl',
+  duplicator: 'required',
   name: 'rolesResources',
   model: 'RoleResourceModel',
   indexes: [{

package/lib/collections/rolesResourcesActions.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
+  namespace: 'acl',
+  duplicator: 'required',
   name: 'rolesResourcesActions',
   model: 'RoleResourceActionModel',
   fields: [{

package/lib/collections/rolesResourcesScopes.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
+  namespace: 'acl',
+  duplicator: 'required',
   name: 'rolesResourcesScopes',
   fields: [{
     type: 'uid',

package/lib/server.js

@@ -901,17 +901,17 @@ class PluginACL extends _server().Plugin {
             return;
           }
 
-          const collection = ctx.db.getCollection(resourceName);
-
-          if (!collection) {
+          if (ctx.status !== 200) {
             return;
           }
 
-          if (ctx.status !== 200) {
+          if (!['list', 'get'].includes(actionName)) {
             return;
           }
 
-          if (!['list', 'get'].includes(actionName)) {
+          const collection = ctx.db.getCollection(resourceName);
+
+          if (!collection) {
             return;
           }
 
@@ -978,7 +978,7 @@ class PluginACL extends _server().Plugin {
               throw e;
             }
 
-            actionsParams.push([action, ((_actionCtx$permission = actionCtx.permission) === null || _actionCtx$permission === void 0 ? void 0 : _actionCtx$permission.can) === null && !actionCtx.permission.skip ? null : ((_actionCtx$permission2 = actionCtx.permission) === null || _actionCtx$permission2 === void 0 ? void 0 : _actionCtx$permission2.parsedParams) || {}]);
+            actionsParams.push([action, ((_actionCtx$permission = actionCtx.permission) === null || _actionCtx$permission === void 0 ? void 0 : _actionCtx$permission.can) === null && !actionCtx.permission.skip ? null : ((_actionCtx$permission2 = actionCtx.permission) === null || _actionCtx$permission2 === void 0 ? void 0 : _actionCtx$permission2.parsedParams) || {}, actionCtx]);
           }
 
           const ids = listData.map(item => item[primaryKeyField]);
@@ -986,9 +986,10 @@ class PluginACL extends _server().Plugin {
           const allAllowed = [];
 
           for (var _i3 = 0, _actionsParams = actionsParams; _i3 < _actionsParams.length; _i3++) {
-            const _actionsParams$_i = _slicedToArray(_actionsParams[_i3], 2),
+            const _actionsParams$_i = _slicedToArray(_actionsParams[_i3], 3),
                   action = _actionsParams$_i[0],
-                  params = _actionsParams$_i[1];
+                  params = _actionsParams$_i[1],
+                  actionCtx = _actionsParams$_i[2];
 
             if (!params) {
               continue;
@@ -999,13 +1000,56 @@ class PluginACL extends _server().Plugin {
               continue;
             }
 
-            const queryParams = collection.repository.buildQueryOptions(params);
+            const queryParams = collection.repository.buildQueryOptions(_objectSpread(_objectSpread({}, params), {}, {
+              context: actionCtx
+            }));
             const actionSql = ctx.db.sequelize.queryInterface.queryGenerator.selectQuery(Model.getTableName(), {
-              // ...queryParams,
-              where: queryParams.where,
-              attributes: [primaryKeyField],
-              includeIgnoreAttributes: false // include: queryParams.include,
+              where: (() => {
+                const filterObj = queryParams.where;
+
+                if (!_this4.db.options.underscored) {
+                  return filterObj;
+                }
 
+                const iterate = (rootObj, path = []) => {
+                  const obj = path.length == 0 ? rootObj : _lodash().default.get(rootObj, path);
+
+                  if (Array.isArray(obj)) {
+                    for (let i = 0; i < obj.length; i++) {
+                      if (obj[i] === null) {
+                        continue;
+                      }
+
+                      if (typeof obj[i] === 'object') {
+                        iterate(rootObj, [...path, i]);
+                      }
+                    }
+
+                    return;
+                  }
+
+                  Reflect.ownKeys(obj).forEach(key => {
+                    if (Array.isArray(obj) && key == 'length') {
+                      return;
+                    }
+
+                    if (typeof obj[key] === 'object' && obj[key] !== null || typeof obj[key] === 'symbol') {
+                      iterate(rootObj, [...path, key]);
+                    }
+
+                    if (typeof key === 'string' && key !== (0, _database().snakeCase)(key)) {
+                      _lodash().default.set(rootObj, [...path, (0, _database().snakeCase)(key)], _lodash().default.cloneDeep(obj[key]));
+
+                      _lodash().default.unset(rootObj, [...path, key]);
+                    }
+                  });
+                };
+
+                iterate(filterObj);
+                return filterObj;
+              })(),
+              attributes: [primaryKeyField],
+              includeIgnoreAttributes: false
             }, Model);
             const whereCase = actionSql.match(/WHERE (.*?);/)[1];
             conditions.push({
@@ -1088,6 +1132,12 @@ class PluginACL extends _server().Plugin {
 
     return _asyncToGenerator(function* () {
       yield _this6.importCollections((0, _path().resolve)(__dirname, 'collections'));
+
+      _this6.db.extendCollection({
+        name: 'rolesUischemas',
+        namespace: 'acl',
+        duplicator: 'required'
+      });
     })();
   }
 

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@nocobase/plugin-acl",
-  "version": "0.9.0-alpha.2",
+  "version": "0.9.1-alpha.2",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/acl": "0.9.0-alpha.2",
-    "@nocobase/database": "0.9.0-alpha.2",
-    "@nocobase/plugin-users": "0.9.0-alpha.2",
-    "@nocobase/server": "0.9.0-alpha.2"
+    "@nocobase/acl": "0.9.1-alpha.2",
+    "@nocobase/database": "0.9.1-alpha.2",
+    "@nocobase/plugin-users": "0.9.1-alpha.2",
+    "@nocobase/server": "0.9.1-alpha.2"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "b8f76ad38e60e677c5bb4aab0a4cdb28d98a0f49"
+  "gitHead": "d588a68eca4feed4642a4cb317301011266fe5c9"
 }