@nocobase/plugin-users 0.7.1-alpha.6 → 0.7.2-alpha.2

package/lib/middlewares/parseToken.js

@@ -6,6 +6,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.parseToken = parseToken;
 exports.setCurrentRole = setCurrentRole;
 
+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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+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(_e2) { throw _e2; }, 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(_e3) { didErr = true; err = _e3; }, 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); }); }; }
@@ -79,11 +93,32 @@ function _findUserByToken() {
       const _yield$plugin$jwtServ = yield plugin.jwtService.decode(token),
             userId = _yield$plugin$jwtServ.userId;
 
+      const collection = ctx.db.getCollection('users');
+      const appends = ['roles'];
+
+      var _iterator = _createForOfIteratorHelper(collection.fields),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          const _step$value = _slicedToArray(_step.value, 2),
+                field = _step$value[1];
+
+          if (field.type === 'belongsTo') {
+            appends.push(field.name);
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+
       return yield ctx.db.getRepository('users').findOne({
+        appends,
         filter: {
           id: userId
-        },
-        appends: ['roles']
+        }
       });
     } catch (error) {
       return null;

package/lib/server.js

@@ -25,6 +25,16 @@ function _server() {
   return data;
 }
 
+function _jsonTemplates() {
+  const data = _interopRequireDefault(require("json-templates"));
+
+  _jsonTemplates = function _jsonTemplates() {
+    return data;
+  };
+
+  return data;
+}
+
 function _path() {
   const data = require("path");
 
@@ -51,6 +61,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+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."); }
@@ -97,6 +109,17 @@ class UsersPlugin extends _server().Plugin {
           return {
             [_database().Op.eq]: (ctx === null || ctx === void 0 ? void 0 : (_ctx$app = ctx.app) === null || _ctx$app === void 0 ? void 0 : (_ctx$app$ctx = _ctx$app.ctx) === null || _ctx$app$ctx === void 0 ? void 0 : (_ctx$app$ctx$state = _ctx$app$ctx.state) === null || _ctx$app$ctx$state === void 0 ? void 0 : (_ctx$app$ctx$state$cu = _ctx$app$ctx$state.currentUser) === null || _ctx$app$ctx$state$cu === void 0 ? void 0 : _ctx$app$ctx$state$cu.id) || -1
           };
+        },
+
+        $isVar(val, ctx) {
+          var _ctx$app2, _ctx$app2$ctx;
+
+          const obj = (0, _jsonTemplates().default)({
+            val: `{{${val}}}`
+          })(JSON.parse(JSON.stringify(ctx === null || ctx === void 0 ? void 0 : (_ctx$app2 = ctx.app) === null || _ctx$app2 === void 0 ? void 0 : (_ctx$app2$ctx = _ctx$app2.ctx) === null || _ctx$app2$ctx === void 0 ? void 0 : _ctx$app2$ctx.state)));
+          return {
+            [_database().Op.eq]: obj.val
+          };
         }
 
       });
@@ -148,8 +171,7 @@ class UsersPlugin extends _server().Plugin {
             dataIndex: 'state.currentUser.id',
             createOnly: true,
             visible: true,
-            onDelete: 'SET NULL',
-            onUpdate: 'CASCADE'
+            index: true
           });
           collection.setField('createdBy', {
             type: 'belongsTo',
@@ -165,8 +187,7 @@ class UsersPlugin extends _server().Plugin {
             dataType: 'integer',
             dataIndex: 'state.currentUser.id',
             visible: true,
-            onDelete: 'SET NULL',
-            onUpdate: 'CASCADE'
+            index: true
           });
           collection.setField('updatedBy', {
             type: 'belongsTo',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-users",
-  "version": "0.7.1-alpha.6",
+  "version": "0.7.2-alpha.2",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -13,8 +13,9 @@
     "jsonwebtoken": "^8.5.1"
   },
   "devDependencies": {
-    "@nocobase/test": "0.7.1-alpha.6",
-    "@types/jsonwebtoken": "^8.5.8"
+    "@nocobase/test": "0.7.2-alpha.2",
+    "@types/jsonwebtoken": "^8.5.8",
+    "json-templates": "^4.2.0"
   },
-  "gitHead": "b6f96c97020d278ae597bf05553442d7516b2216"
+  "gitHead": "a0cc50154cc292248ef107c95a24bcc0c7a586fa"
 }