@azteam/express 1.2.461 → 1.2.464

package/lib/middleware/signMiddleware.js

@@ -12,24 +12,25 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 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(secret) {
   var mTimeout = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 5;
+  var isThrowError = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   return /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res, next) {
       var url;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!req.query.sign) {
-              _context.next = 4;
-              break;
+            req.validSign = false;
+            if (req.query.sign) {
+              url = "".concat(req.protocol, "://").concat(req.hostname).concat(req.originalUrl);
+              req.validSign = (0, _crypto.isValidSign)(url, secret, mTimeout);
             }
-            url = "".concat(req.protocol, "://").concat(req.hostname).concat(req.originalUrl);
-            if (!(0, _crypto.isValidSign)(url, secret, mTimeout)) {
+            if (!(isThrowError && !req.validSign)) {
               _context.next = 4;
               break;
             }
-            return _context.abrupt("return", next());
-          case 4:
             throw new _error.ErrorException(_error.SIGNATURE_FAILED);
+          case 4:
+            return _context.abrupt("return", next());
           case 5:
           case "end":
             return _context.stop();

package/package.json

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

package/src/middleware/signMiddleware.js

@@ -1,14 +1,16 @@
 import {isValidSign} from '@azteam/crypto';
 import {ErrorException, SIGNATURE_FAILED} from '@azteam/error';
 
-export default function (secret, mTimeout = 5) {
+export default function (secret, mTimeout = 5, isThrowError = true) {
     return async function (req, res, next) {
+        req.validSign = false;
         if (req.query.sign) {
             const url = `${req.protocol}://${req.hostname}${req.originalUrl}`;
-            if (isValidSign(url, secret, mTimeout)) {
-                return next();
-            }
+            req.validSign = isValidSign(url, secret, mTimeout);
         }
-        throw new ErrorException(SIGNATURE_FAILED);
+        if (isThrowError && !req.validSign) {
+            throw new ErrorException(SIGNATURE_FAILED);
+        }
+        return next();
     };
 }