@azteam/express 1.2.359 → 1.2.361

package/lib/Server.js

@@ -250,7 +250,7 @@ var Server = /*#__PURE__*/function () {
           var origin = req.get('Origin');
           req.rootOrigin = origin ? _psl["default"].parse(origin.replace(/(?:[\0-\t\x0B\f\x0E-\u2027\u202A-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*\/\//, '')).domain : null;
           req.trackDevice = {
-            ip: req.headers['x-forwarded-for'] || req.headers['x-real-ip'] || req.ip,
+            ip: req.headers['x-real-ip'] || req.ip,
             device: req.get('X-DEVICE') || req.get('User-Agent'),
             device_id: req.get('X-DEVICE-ID') || 'web',
             os: req.get('X-OS') || 'web'

package/lib/controller/AdminController.js

@@ -302,7 +302,10 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       IMPORT: null,
       EXPORT: null
     }, options.roles);
-    _this.secretKey = options.secretKey || process.env.SECRET_KEY;
+    _this.roleMiddlewareOptions = {
+      secretKey: options.secretKey || process.env.SECRET_KEY,
+      systemURL: options.systemURL || process.env.systemURL
+    };
     _this.paginateOptions = options.paginateOptions || {
       autocompleteField: null,
       allowSearchFields: [],
@@ -325,7 +328,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.READ,
         path: '/',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ], this.secretKey), (0, _middleware.paginateMiddleware)(this.paginateOptions), this.methodGetPaginate]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ], this.roleMiddlewareOptions), (0, _middleware.paginateMiddleware)(this.paginateOptions), this.methodGetPaginate]
       };
     }
   }, {
@@ -334,7 +337,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.READ,
         path: '/',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ], this.secretKey), (0, _middleware.paginateMiddleware)(this.paginateOptions), this.methodGetPaginateTrash]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ], this.roleMiddlewareOptions), (0, _middleware.paginateMiddleware)(this.paginateOptions), this.methodGetPaginateTrash]
       };
     }
   }, {
@@ -343,7 +346,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.READ,
         path: '/:id([a-zA-Z0-9]+)',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ], this.secretKey), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodGetOne]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ], this.roleMiddlewareOptions), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodGetOne]
       };
     }
   }, {
@@ -352,7 +355,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.READ,
         path: '/:id([a-zA-Z0-9]+)',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ], this.secretKey), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodGetOneTrash]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.READ], this.roleMiddlewareOptions), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodGetOneTrash]
       };
     }
   }, {
@@ -404,7 +407,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.CREATE,
         path: '/',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.CREATE], this.secretKey), /*#__PURE__*/function () {
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.CREATE], this.roleMiddlewareOptions), /*#__PURE__*/function () {
           var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(req, res) {
             var data, item;
             return _regeneratorRuntime().wrap(function _callee12$(_context12) {
@@ -486,7 +489,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.UPDATE,
         path: '/:id([a-zA-Z0-9]+)',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE], this.secretKey), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE], this.roleMiddlewareOptions), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
           var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(req, res) {
             var item, data;
             return _regeneratorRuntime().wrap(function _callee15$(_context15) {
@@ -533,7 +536,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.UPDATE,
         path: '/available/:id([a-zA-Z0-9]+)',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE], this.secretKey), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE], this.roleMiddlewareOptions), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
           var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(req, res) {
             var item;
             return _regeneratorRuntime().wrap(function _callee16$(_context16) {
@@ -578,7 +581,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.UPDATE,
         path: '/unavailable/:id([a-zA-Z0-9]+)',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE], this.secretKey), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE], this.roleMiddlewareOptions), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
           var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(req, res) {
             var item;
             return _regeneratorRuntime().wrap(function _callee17$(_context17) {
@@ -623,7 +626,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.UPDATE,
         path: '/waiting/:id([a-zA-Z0-9]+)',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE], this.secretKey), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.UPDATE], this.roleMiddlewareOptions), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), /*#__PURE__*/function () {
           var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(req, res) {
             var item;
             return _regeneratorRuntime().wrap(function _callee18$(_context18) {
@@ -688,7 +691,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.DELETE,
         path: '/:id([a-zA-Z0-9]+)',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.DELETE], this.secretKey), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodDelete]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.DELETE], this.roleMiddlewareOptions), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodDelete]
       };
     }
   }, {
@@ -697,7 +700,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.RESTORE,
         path: '/:id([a-zA-Z0-9]+)',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.RESTORE], this.secretKey), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodPostRestoreTrash]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.RESTORE], this.roleMiddlewareOptions), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodPostRestoreTrash]
       };
     }
   }, {
@@ -727,7 +730,7 @@ var AdminController = /*#__PURE__*/function (_Controller) {
       return {
         disabled: !this.roles.DESTROY,
         path: '/:id([a-zA-Z0-9]+)',
-        method: [(0, _middleware.adminRoleMiddleware)([this.roles.DESTROY], this.secretKey), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodDeleteDestroyTrash]
+        method: [(0, _middleware.adminRoleMiddleware)([this.roles.DESTROY], this.roleMiddlewareOptions), (0, _middleware.validateMiddleware)(_constant.REQUEST_TYPE.PARAMS, _validator.rulesId), this.methodDeleteDestroyTrash]
       };
     }
   }]);

package/lib/middleware/adminRoleMiddleware.js

@@ -9,6 +9,6 @@ var _roleMiddleware = _interopRequireDefault(require("./roleMiddleware"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _default() {
   var roles = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-  var secretKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : process.env.SECRET_KEY;
-  return (0, _roleMiddleware["default"])(roles, _constant.USER_LEVEL.ADMIN, secretKey);
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return (0, _roleMiddleware["default"])(roles, _constant.USER_LEVEL.ADMIN, options);
 }

package/lib/middleware/index.js

@@ -9,12 +9,6 @@ Object.defineProperty(exports, "adminRoleMiddleware", {
     return _adminRoleMiddleware["default"];
   }
 });
-Object.defineProperty(exports, "apiLoginMiddleware", {
-  enumerable: true,
-  get: function get() {
-    return _apiLoginMiddleware["default"];
-  }
-});
 Object.defineProperty(exports, "cacheMiddleware", {
   enumerable: true,
   get: function get() {
@@ -77,7 +71,6 @@ Object.defineProperty(exports, "verifyGoogleAppMiddleware", {
 });
 var _signMiddleware = _interopRequireDefault(require("./signMiddleware"));
 var _etagMiddleware = _interopRequireDefault(require("./etagMiddleware"));
-var _apiLoginMiddleware = _interopRequireDefault(require("./apiLoginMiddleware"));
 var _roleMiddleware = _interopRequireDefault(require("./roleMiddleware"));
 var _adminRoleMiddleware = _interopRequireDefault(require("./adminRoleMiddleware"));
 var _systemRoleMiddleware = _interopRequireDefault(require("./systemRoleMiddleware"));

package/lib/middleware/roleMiddleware.js

@@ -5,13 +5,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = _default;
-var _error = require("@azteam/error");
 var _jsonwebtoken = _interopRequireDefault(require("jsonwebtoken"));
 var _constant = require("@azteam/constant");
+var _httpClient = _interopRequireDefault(require("@azteam/http-client"));
+var _error = require("@azteam/error");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 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); }); }; }
+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; }
 function systemLogin() {
   var userData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var user = {};
@@ -25,21 +29,25 @@ function systemLogin() {
 function _default() {
   var roles = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var minLevel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _constant.USER_LEVEL.USER;
-  var secretKey = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : process.env.SECRET_KEY;
+  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  options = _objectSpread({
+    secretKey: process.env.SECRET_KEY,
+    systemURL: process.env.SYSTEM_URL
+  }, options);
   return /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res, next) {
-      var headers, token;
+      var headers, _options, secretKey, systemURL, token, apiURL, splitToken, client, response;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              headers = req.headers;
+              headers = req.headers, _options = options, secretKey = _options.secretKey, systemURL = _options.systemURL;
               if (!(headers['x-app-secret'] === secretKey)) {
                 _context.next = 5;
                 break;
               }
               req.user = systemLogin(headers['x-app-user']);
-              _context.next = 19;
+              _context.next = 33;
               break;
             case 5:
               token = null;
@@ -47,7 +55,7 @@ function _default() {
                 token = headers.authorization;
               }
               if (!token) {
-                _context.next = 19;
+                _context.next = 33;
                 break;
               }
               if (!token.startsWith('Bearer ')) {
@@ -70,23 +78,53 @@ function _default() {
             case 18:
               throw new _error.ErrorException(_error.TOKEN_FAILED, _context.t0);
             case 19:
+              if (!token.startsWith('apikey ')) {
+                _context.next = 33;
+                break;
+              }
+              token = token.replace('apikey ', '');
+              apiURL = "".concat(systemURL, "/auth/login_api/").concat(token);
+              splitToken = token.split(':');
+              if (splitToken.length === 2) {
+                apiURL = "https://".concat(req.hostname, "/auth/login_api/").concat(splitToken[1]);
+              }
+              client = new _httpClient["default"]({
+                timeout: 20000,
+                headers: {
+                  'User-Agent': 'toda-api'
+                }
+              });
+              _context.next = 27;
+              return client.get(apiURL);
+            case 27:
+              response = _context.sent;
+              if (!response.success) {
+                _context.next = 32;
+                break;
+              }
+              req.user = response.data;
+              _context.next = 33;
+              break;
+            case 32:
+              throw new _error.ErrorException(_error.TOKEN_FAILED);
+            case 33:
               if (req.user) {
-                _context.next = 21;
+                _context.next = 35;
                 break;
               }
               throw new _error.ErrorException(_error.UNAUTHORIZED);
-            case 21:
+            case 35:
               req.user.level = req.user.level || _constant.USER_LEVEL.USER;
               if (!(!roles || req.user.level === 100 || req.user.level >= minLevel && req.user.roles.some(function (r) {
                 return roles.includes(r);
               }))) {
-                _context.next = 24;
+                _context.next = 38;
                 break;
               }
               return _context.abrupt("return", next());
-            case 24:
+            case 38:
               throw new _error.ErrorException(_error.PERMISSION);
-            case 25:
+            case 39:
             case "end":
               return _context.stop();
           }

package/lib/middleware/systemRoleMiddleware.js

@@ -8,6 +8,6 @@ var _constant = require("@azteam/constant");
 var _roleMiddleware = _interopRequireDefault(require("./roleMiddleware"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _default() {
-  var secretKey = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : process.env.SECRET_KEY;
-  return (0, _roleMiddleware["default"])(null, _constant.USER_LEVEL.SYSTEM, secretKey);
+  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return (0, _roleMiddleware["default"])(null, _constant.USER_LEVEL.SYSTEM, options);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.359",
+    "version": "1.2.361",
     "license": "MIT",
     "author": "toda <sp.azsolution.net@gmail.com>",
     "main": "./lib/index.js",

package/src/Server.js

@@ -244,7 +244,7 @@ class Server {
                 req.rootOrigin = origin ? psl.parse(origin.replace(/.*\/\//u, '')).domain : null;
 
                 req.trackDevice = {
-                    ip: req.headers['x-forwarded-for'] || req.headers['x-real-ip'] || req.ip,
+                    ip: req.headers['x-real-ip'] || req.ip,
                     device: req.get('X-DEVICE') || req.get('User-Agent'),
                     device_id: req.get('X-DEVICE-ID') || 'web',
                     os: req.get('X-OS') || 'web',

package/src/controller/AdminController.js

@@ -39,7 +39,11 @@ class AdminController extends Controller {
             ...options.roles,
         };
 
-        this.secretKey = options.secretKey || process.env.SECRET_KEY;
+        this.roleMiddlewareOptions = {
+            secretKey: options.secretKey || process.env.SECRET_KEY,
+            systemURL: options.systemURL || process.env.systemURL,
+        };
+
         this.paginateOptions = options.paginateOptions || {
             autocompleteField: null,
             allowSearchFields: [],
@@ -78,7 +82,11 @@ class AdminController extends Controller {
         return {
             disabled: !this.roles.READ,
             path: '/',
-            method: [adminRoleMiddleware([this.roles.READ], this.secretKey), paginateMiddleware(this.paginateOptions), this.methodGetPaginate],
+            method: [
+                adminRoleMiddleware([this.roles.READ], this.roleMiddlewareOptions),
+                paginateMiddleware(this.paginateOptions),
+                this.methodGetPaginate,
+            ],
         };
     }
 
@@ -91,7 +99,11 @@ class AdminController extends Controller {
         return {
             disabled: !this.roles.READ,
             path: '/',
-            method: [adminRoleMiddleware([this.roles.READ], this.secretKey), paginateMiddleware(this.paginateOptions), this.methodGetPaginateTrash],
+            method: [
+                adminRoleMiddleware([this.roles.READ], this.roleMiddlewareOptions),
+                paginateMiddleware(this.paginateOptions),
+                this.methodGetPaginateTrash,
+            ],
         };
     }
 
@@ -105,7 +117,11 @@ class AdminController extends Controller {
         return {
             disabled: !this.roles.READ,
             path: '/:id([a-zA-Z0-9]+)',
-            method: [adminRoleMiddleware([this.roles.READ], this.secretKey), validateMiddleware(REQUEST_TYPE.PARAMS, rulesId), this.methodGetOne],
+            method: [
+                adminRoleMiddleware([this.roles.READ], this.roleMiddlewareOptions),
+                validateMiddleware(REQUEST_TYPE.PARAMS, rulesId),
+                this.methodGetOne,
+            ],
         };
     }
 
@@ -120,7 +136,7 @@ class AdminController extends Controller {
             disabled: !this.roles.READ,
             path: '/:id([a-zA-Z0-9]+)',
             method: [
-                adminRoleMiddleware([this.roles.READ], this.secretKey),
+                adminRoleMiddleware([this.roles.READ], this.roleMiddlewareOptions),
                 validateMiddleware(REQUEST_TYPE.PARAMS, rulesId),
                 this.methodGetOneTrash,
             ],
@@ -144,7 +160,7 @@ class AdminController extends Controller {
             disabled: !this.roles.CREATE,
             path: '/',
             method: [
-                adminRoleMiddleware([this.roles.CREATE], this.secretKey),
+                adminRoleMiddleware([this.roles.CREATE], this.roleMiddlewareOptions),
                 async (req, res) => {
                     const data = await this.beforeCreate(req.body);
 
@@ -175,7 +191,7 @@ class AdminController extends Controller {
             disabled: !this.roles.UPDATE,
             path: '/:id([a-zA-Z0-9]+)',
             method: [
-                adminRoleMiddleware([this.roles.UPDATE], this.secretKey),
+                adminRoleMiddleware([this.roles.UPDATE], this.roleMiddlewareOptions),
                 validateMiddleware(REQUEST_TYPE.PARAMS, rulesId),
                 async (req, res) => {
                     let item = await this.repository.findOneById(req.params.id);
@@ -198,7 +214,7 @@ class AdminController extends Controller {
             disabled: !this.roles.UPDATE,
             path: '/available/:id([a-zA-Z0-9]+)',
             method: [
-                adminRoleMiddleware([this.roles.UPDATE], this.secretKey),
+                adminRoleMiddleware([this.roles.UPDATE], this.roleMiddlewareOptions),
                 validateMiddleware(REQUEST_TYPE.PARAMS, rulesId),
                 async (req, res) => {
                     let item = await this.repository.findOneById(req.params.id);
@@ -219,7 +235,7 @@ class AdminController extends Controller {
             disabled: !this.roles.UPDATE,
             path: '/unavailable/:id([a-zA-Z0-9]+)',
             method: [
-                adminRoleMiddleware([this.roles.UPDATE], this.secretKey),
+                adminRoleMiddleware([this.roles.UPDATE], this.roleMiddlewareOptions),
                 validateMiddleware(REQUEST_TYPE.PARAMS, rulesId),
                 async (req, res) => {
                     let item = await this.repository.findOneById(req.params.id);
@@ -240,7 +256,7 @@ class AdminController extends Controller {
             disabled: !this.roles.UPDATE,
             path: '/waiting/:id([a-zA-Z0-9]+)',
             method: [
-                adminRoleMiddleware([this.roles.UPDATE], this.secretKey),
+                adminRoleMiddleware([this.roles.UPDATE], this.roleMiddlewareOptions),
                 validateMiddleware(REQUEST_TYPE.PARAMS, rulesId),
                 async (req, res) => {
                     let item = await this.repository.findOneById(req.params.id);
@@ -275,7 +291,11 @@ class AdminController extends Controller {
         return {
             disabled: !this.roles.DELETE,
             path: '/:id([a-zA-Z0-9]+)',
-            method: [adminRoleMiddleware([this.roles.DELETE], this.secretKey), validateMiddleware(REQUEST_TYPE.PARAMS, rulesId), this.methodDelete],
+            method: [
+                adminRoleMiddleware([this.roles.DELETE], this.roleMiddlewareOptions),
+                validateMiddleware(REQUEST_TYPE.PARAMS, rulesId),
+                this.methodDelete,
+            ],
         };
     }
 
@@ -293,7 +313,7 @@ class AdminController extends Controller {
             disabled: !this.roles.RESTORE,
             path: '/:id([a-zA-Z0-9]+)',
             method: [
-                adminRoleMiddleware([this.roles.RESTORE], this.secretKey),
+                adminRoleMiddleware([this.roles.RESTORE], this.roleMiddlewareOptions),
                 validateMiddleware(REQUEST_TYPE.PARAMS, rulesId),
                 this.methodPostRestoreTrash,
             ],
@@ -329,7 +349,7 @@ class AdminController extends Controller {
             disabled: !this.roles.DESTROY,
             path: '/:id([a-zA-Z0-9]+)',
             method: [
-                adminRoleMiddleware([this.roles.DESTROY], this.secretKey),
+                adminRoleMiddleware([this.roles.DESTROY], this.roleMiddlewareOptions),
                 validateMiddleware(REQUEST_TYPE.PARAMS, rulesId),
                 this.methodDeleteDestroyTrash,
             ],

package/src/middleware/adminRoleMiddleware.js

@@ -2,6 +2,6 @@ import {USER_LEVEL} from '@azteam/constant';
 
 import roleMiddleware from './roleMiddleware';
 
-export default function (roles = null, secretKey = process.env.SECRET_KEY) {
-    return roleMiddleware(roles, USER_LEVEL.ADMIN, secretKey);
+export default function (roles = null, options = {}) {
+    return roleMiddleware(roles, USER_LEVEL.ADMIN, options);
 }

package/src/middleware/index.js

@@ -1,6 +1,5 @@
 export {default as signMiddleware} from './signMiddleware';
 export {default as etagMiddleware} from './etagMiddleware';
-export {default as apiLoginMiddleware} from './apiLoginMiddleware';
 export {default as roleMiddleware} from './roleMiddleware';
 export {default as adminRoleMiddleware} from './adminRoleMiddleware';
 export {default as systemRoleMiddleware} from './systemRoleMiddleware';

package/src/middleware/roleMiddleware.js

@@ -1,6 +1,7 @@
-import {ErrorException, PERMISSION, UNAUTHORIZED, TOKEN_EXPIRED, TOKEN_FAILED} from '@azteam/error';
 import jwt from 'jsonwebtoken';
 import {USER_LEVEL} from '@azteam/constant';
+import HttpClient from '@azteam/http-client';
+import {ErrorException, PERMISSION, UNAUTHORIZED, TOKEN_EXPIRED, TOKEN_FAILED} from '@azteam/error';
 
 function systemLogin(userData = null) {
     let user = {};
@@ -12,9 +13,16 @@ function systemLogin(userData = null) {
     return user;
 }
 
-export default function (roles = null, minLevel = USER_LEVEL.USER, secretKey = process.env.SECRET_KEY) {
+export default function (roles = null, minLevel = USER_LEVEL.USER, options = {}) {
+    options = {
+        secretKey: process.env.SECRET_KEY,
+        systemURL: process.env.SYSTEM_URL,
+        ...options,
+    };
+
     return async function (req, res, next) {
-        const {headers} = req;
+        const {headers} = req,
+            {secretKey, systemURL} = options;
 
         if (headers['x-app-secret'] === secretKey) {
             req.user = systemLogin(headers['x-app-user']);
@@ -38,6 +46,29 @@ export default function (roles = null, minLevel = USER_LEVEL.USER, secretKey = p
                         throw new ErrorException(TOKEN_FAILED, err);
                     }
                 }
+
+                if (token.startsWith('apikey ')) {
+                    token = token.replace('apikey ', '');
+                    let apiURL = `${systemURL}/auth/login_api/${token}`;
+
+                    const splitToken = token.split(':');
+                    if (splitToken.length === 2) {
+                        apiURL = `https://${req.hostname}/auth/login_api/${splitToken[1]}`;
+                    }
+
+                    const client = new HttpClient({
+                            timeout: 20000,
+                            headers: {
+                                'User-Agent': 'toda-api',
+                            },
+                        }),
+                        response = await client.get(apiURL);
+                    if (response.success) {
+                        req.user = response.data;
+                    } else {
+                        throw new ErrorException(TOKEN_FAILED);
+                    }
+                }
             }
         }
 

package/src/middleware/systemRoleMiddleware.js

@@ -2,6 +2,6 @@ import {USER_LEVEL} from '@azteam/constant';
 
 import roleMiddleware from './roleMiddleware';
 
-export default function (secretKey = process.env.SECRET_KEY) {
-    return roleMiddleware(null, USER_LEVEL.SYSTEM, secretKey);
+export default function (options = {}) {
+    return roleMiddleware(null, USER_LEVEL.SYSTEM, options);
 }

package/lib/middleware/apiLoginMiddleware.js

@@ -1,82 +0,0 @@
-"use strict";
-
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = _default;
-var _httpClient = _interopRequireDefault(require("@azteam/http-client"));
-var _error = require("@azteam/error");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
-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); }); }; }
-function _default() {
-  var systemURL = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : process.env.SYSTEM_URL;
-  return /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res, next) {
-      var headers, token, apiURL, splitToken, client, response;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (req.user) {
-                _context.next = 21;
-                break;
-              }
-              headers = req.headers;
-              if (!headers.authorization) {
-                _context.next = 21;
-                break;
-              }
-              token = headers.authorization;
-              if (!token.startsWith('apikey ')) {
-                _context.next = 20;
-                break;
-              }
-              token = token.replace('apikey ', '');
-              apiURL = "".concat(systemURL, "/auth/login_api/").concat(token);
-              splitToken = token.split(':');
-              if (splitToken.length === 2) {
-                apiURL = "https://".concat(req.hostname, "/auth/login_api/").concat(splitToken[1]);
-              }
-              client = new _httpClient["default"]({
-                timeout: 20000,
-                headers: {
-                  'User-Agent': 'toda-api'
-                }
-              });
-              _context.next = 12;
-              return client.get(apiURL);
-            case 12:
-              response = _context.sent;
-              if (!response.success) {
-                _context.next = 17;
-                break;
-              }
-              req.user = response.data;
-              _context.next = 18;
-              break;
-            case 17:
-              throw new _error.ErrorException(_error.TOKEN_FAILED, [{
-                url: apiURL
-              }]);
-            case 18:
-              _context.next = 21;
-              break;
-            case 20:
-              throw new _error.ErrorException(_error.UNAUTHORIZED);
-            case 21:
-              return _context.abrupt("return", next());
-            case 22:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee);
-    }));
-    return function (_x, _x2, _x3) {
-      return _ref.apply(this, arguments);
-    };
-  }();
-}

package/src/middleware/apiLoginMiddleware.js

@@ -1,43 +0,0 @@
-import HttpClient from '@azteam/http-client';
-import {ErrorException, TOKEN_FAILED, UNAUTHORIZED} from '@azteam/error';
-
-export default function (systemURL = process.env.SYSTEM_URL) {
-    return async function (req, res, next) {
-        if (!req.user) {
-            const {headers} = req;
-            if (headers.authorization) {
-                let token = headers.authorization;
-
-                if (token.startsWith('apikey ')) {
-                    token = token.replace('apikey ', '');
-                    let apiURL = `${systemURL}/auth/login_api/${token}`;
-
-                    const splitToken = token.split(':');
-                    if (splitToken.length === 2) {
-                        apiURL = `https://${req.hostname}/auth/login_api/${splitToken[1]}`;
-                    }
-
-                    const client = new HttpClient({
-                            timeout: 20000,
-                            headers: {
-                                'User-Agent': 'toda-api',
-                            },
-                        }),
-                        response = await client.get(apiURL);
-                    if (response.success) {
-                        req.user = response.data;
-                    } else {
-                        throw new ErrorException(TOKEN_FAILED, [
-                            {
-                                url: apiURL,
-                            },
-                        ]);
-                    }
-                } else {
-                    throw new ErrorException(UNAUTHORIZED);
-                }
-            }
-        }
-        return next();
-    };
-}