@nocobase/acl 0.9.2-alpha.2 → 0.9.2-alpha.3

package/lib/acl.d.ts

@@ -65,7 +65,7 @@ export declare class ACL extends EventEmitter {
     use(fn: any, options?: ToposortOptions): void;
     allow(resourceName: string, actionNames: string[] | string, condition?: string | ConditionFunc): void;
     skip(resourceName: string, actionNames: string[] | string, condition?: string | ConditionFunc): void;
-    parseJsonTemplate(json: any, ctx: any): any;
+    parseJsonTemplate(json: any, ctx: any): Promise<any>;
     middleware(): (ctx: any, next: any) => Promise<void>;
     getActionParams(ctx: any): Promise<void>;
     addFixedParams(resource: string, action: string, merger: Merger): void;

package/lib/acl.js

@@ -18,13 +18,6 @@ function _events() {
   };
   return data;
 }
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
-  _jsonTemplates = function _jsonTemplates() {
-    return data;
-  };
-  return data;
-}
 function _koaCompose() {
   const data = _interopRequireDefault(require("koa-compose"));
   _koaCompose = function _koaCompose() {
@@ -130,7 +123,7 @@ class ACL extends _events().default {
         if (params && resourcerAction.mergeParams) {
           var _ctx$log3;
           const filteredParams = filterParams(ctx, resourceName, params);
-          const parsedParams = acl.parseJsonTemplate(filteredParams, ctx);
+          const parsedParams = yield acl.parseJsonTemplate(filteredParams, ctx);
           ctx.permission.parsedParams = parsedParams;
           ((_ctx$log3 = ctx.log) === null || _ctx$log3 === void 0 ? void 0 : _ctx$log3.info) && ctx.log.info('acl parsedParams', parsedParams);
           ctx.permission.rawParams = _lodash().default.cloneDeep(resourcerAction.params);
@@ -311,11 +304,35 @@ class ACL extends _events().default {
     }
   }
   parseJsonTemplate(json, ctx) {
-    return (0, _jsonTemplates().default)(json)({
-      ctx: {
-        state: JSON.parse(JSON.stringify(ctx.state))
+    return _asyncToGenerator(function* () {
+      if (json.filter) {
+        var _ctx$logger, _ctx$logger$info, _ctx$get, _ctx$logger2, _ctx$logger2$info;
+        (_ctx$logger = ctx.logger) === null || _ctx$logger === void 0 ? void 0 : (_ctx$logger$info = _ctx$logger.info) === null || _ctx$logger$info === void 0 ? void 0 : _ctx$logger$info.call(_ctx$logger, 'parseJsonTemplate.raw', JSON.parse(JSON.stringify(json.filter)));
+        const timezone = ctx === null || ctx === void 0 ? void 0 : (_ctx$get = ctx.get) === null || _ctx$get === void 0 ? void 0 : _ctx$get.call(ctx, 'x-timezone');
+        const state = JSON.parse(JSON.stringify(ctx.state));
+        const filter = yield (0, _utils().parseFilter)(json.filter, {
+          timezone,
+          now: new Date().toISOString(),
+          vars: {
+            ctx: {
+              state
+            },
+            $user: function () {
+              var _$user = _asyncToGenerator(function* () {
+                return state.currentUser;
+              });
+              function $user() {
+                return _$user.apply(this, arguments);
+              }
+              return $user;
+            }()
+          }
+        });
+        json.filter = filter;
+        (_ctx$logger2 = ctx.logger) === null || _ctx$logger2 === void 0 ? void 0 : (_ctx$logger2$info = _ctx$logger2.info) === null || _ctx$logger2$info === void 0 ? void 0 : _ctx$logger2$info.call(_ctx$logger2, 'parseJsonTemplate.parsed', filter);
       }
-    });
+      return json;
+    })();
   }
   middleware() {
     const acl = this;

package/lib/allow-manager.js

@@ -106,7 +106,7 @@ class AllowManager {
         const _ctx$action = ctx.action,
           resourceName = _ctx$action.resourceName,
           actionName = _ctx$action.actionName;
-        let skip = yield _this2.acl.allowManager.isAllowed(resourceName, actionName, ctx);
+        const skip = yield _this2.acl.allowManager.isAllowed(resourceName, actionName, ctx);
         if (skip) {
           ctx.permission = _objectSpread(_objectSpread({}, ctx.permission || {}), {}, {
             skip: true

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/acl",
-  "version": "0.9.2-alpha.2",
+  "version": "0.9.2-alpha.3",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/resourcer": "0.9.2-alpha.2",
-    "@nocobase/utils": "0.9.2-alpha.2",
+    "@nocobase/resourcer": "0.9.2-alpha.3",
+    "@nocobase/utils": "0.9.2-alpha.3",
     "json-templates": "^4.2.0",
     "minimatch": "^5.1.1"
   },
@@ -16,5 +16,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/acl"
   },
-  "gitHead": "1a0de6908b2b1854bdf434fcafa8909cb65bb8a3"
+  "gitHead": "b6b5f9372202d942c97d2d90a4197e060db05124"
 }