@azteam/express 1.2.343 → 1.2.344

package/lib/Server.js

@@ -94,10 +94,9 @@ var Server = /*#__PURE__*/function () {
           if (_fs["default"].statSync("".concat(apiDir, "/").concat(dirName)).isDirectory()) {
             var versionDirs = _fs["default"].readdirSync("".concat(apiDir, "/").concat(dirName));
             for (var j = 0; j < versionDirs.length; j += 1) {
-              var versionName = versionDirs[j];
-
-              // eslint-disable-next-line global-require,import/no-dynamic-require
-              var controller = require("".concat(apiDir, "/").concat(dirName, "/").concat(versionName, "/controller"))["default"];
+              var versionName = versionDirs[j],
+                // eslint-disable-next-line global-require,import/no-dynamic-require
+                controller = require("".concat(apiDir, "/").concat(dirName, "/").concat(versionName, "/controller"))["default"];
               this.addController(dirName, versionName, controller);
             }
           }
@@ -116,10 +115,10 @@ var Server = /*#__PURE__*/function () {
     value: function startAPI(port) {
       var _this4 = this;
       if (!_lodash["default"].isEmpty(this.controllers)) {
-        var WHITE_LIST = this.whiteList;
-        var COOKIE_OPTION = this.cookieOption;
-        var IS_ALLOW_EMPTY = this.isAllowEmptyOrigin;
-        var app = (0, _express["default"])();
+        var WHITE_LIST = this.whiteList,
+          COOKIE_OPTION = this.cookieOption,
+          IS_ALLOW_EMPTY = this.isAllowEmptyOrigin,
+          app = (0, _express["default"])();
         app.use((0, _helmet["default"])({
           frameguard: false
         }));
@@ -134,9 +133,9 @@ var Server = /*#__PURE__*/function () {
         app.set('trust proxy', 1);
         app.use((0, _cookieParser["default"])(process.env.SECRET_KEY));
         app.use((0, _cors["default"])(function (req, callback) {
-          var origin = req.header('Origin');
-          var authorization = req.header('Authorization');
-          var agent = req.header('User-Agent');
+          var origin = req.header('Origin'),
+            authorization = req.header('Authorization'),
+            agent = req.header('User-Agent');
           var error = null;
           if (!authorization && !agent.startsWith('toda')) {
             if (!origin) {
@@ -255,7 +254,7 @@ var Server = /*#__PURE__*/function () {
         app.use(function (req, res, next) {
           delete res.cache;
           var origin = req.get('Origin');
-          req.rootOrigin = origin ? _psl["default"].parse(origin).domain : null;
+          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,
             device: req.get('X-DEVICE') || req.get('User-Agent'),
@@ -269,14 +268,14 @@ var Server = /*#__PURE__*/function () {
         });
         var msg = [];
         _lodash["default"].map(this.controllers, function (data) {
-          var controller = data.controller;
-          var controllerName = data.name;
-          var controllerVersion = data.version;
-          var listPublicRouter = controller.publicRouter();
+          var controller = data.controller,
+            controllerName = data.name,
+            controllerVersion = data.version,
+            listPublicRouter = controller.publicRouter();
           _lodash["default"].map(listPublicRouter, function (method) {
             var name = method.name,
-              type = method.type;
-            var router = controller[name]();
+              type = method.type,
+              router = controller[name]();
             if (!router.disabled) {
               router.path = "/".concat(method.path, "/").concat(router.path);
               router.path = controller.pathName ? "/".concat(controller.pathName).concat(router.path) : router.path;
@@ -293,7 +292,6 @@ var Server = /*#__PURE__*/function () {
             }
           });
         });
-        console.table(msg);
         app.all('/', /*#__PURE__*/function () {
           var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(req, res) {
             return _regeneratorRuntime().wrap(function _callee2$(_context2) {

package/lib/middleware/recaptchaMiddleware.js

@@ -33,14 +33,15 @@ function _default(secretKey) {
               });
             case 5:
               data = _context.sent;
+              delete req.body.captcha;
               if (!data.success) {
-                _context.next = 8;
+                _context.next = 9;
                 break;
               }
               return _context.abrupt("return", next());
-            case 8:
-              throw new _error.ErrorException(_error.RECAPTCHA);
             case 9:
+              throw new _error.ErrorException(_error.RECAPTCHA);
+            case 10:
             case "end":
               return _context.stop();
           }

package/package.json

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

package/src/Server.js

@@ -76,10 +76,9 @@ class Server {
                     const versionDirs = fs.readdirSync(`${apiDir}/${dirName}`);
 
                     for (let j = 0; j < versionDirs.length; j += 1) {
-                        const versionName = versionDirs[j];
-
-                        // eslint-disable-next-line global-require,import/no-dynamic-require
-                        const controller = require(`${apiDir}/${dirName}/${versionName}/controller`).default;
+                        const versionName = versionDirs[j],
+                            // eslint-disable-next-line global-require,import/no-dynamic-require
+                            controller = require(`${apiDir}/${dirName}/${versionName}/controller`).default;
                         this.addController(dirName, versionName, controller);
                     }
                 }
@@ -95,11 +94,11 @@ class Server {
 
     startAPI(port) {
         if (!_.isEmpty(this.controllers)) {
-            const WHITE_LIST = this.whiteList;
-            const COOKIE_OPTION = this.cookieOption;
-            const IS_ALLOW_EMPTY = this.isAllowEmptyOrigin;
+            const WHITE_LIST = this.whiteList,
+                COOKIE_OPTION = this.cookieOption,
+                IS_ALLOW_EMPTY = this.isAllowEmptyOrigin,
+                app = express();
 
-            const app = express();
             app.use(
                 helmet({
                     frameguard: false,
@@ -116,9 +115,9 @@ class Server {
 
             app.use(
                 cors(function (req, callback) {
-                    const origin = req.header('Origin');
-                    const authorization = req.header('Authorization');
-                    const agent = req.header('User-Agent');
+                    const origin = req.header('Origin'),
+                        authorization = req.header('Authorization'),
+                        agent = req.header('User-Agent');
 
                     let error = null;
                     if (!authorization && !agent.startsWith('toda')) {
@@ -246,7 +245,7 @@ class Server {
                 delete res.cache;
 
                 const origin = req.get('Origin');
-                req.rootOrigin = origin ? psl.parse(origin).domain : null;
+                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,
@@ -264,16 +263,14 @@ class Server {
 
             const msg = [];
             _.map(this.controllers, (data) => {
-                const {controller} = data;
-                const controllerName = data.name;
-                const controllerVersion = data.version;
-
-                const listPublicRouter = controller.publicRouter();
+                const {controller} = data,
+                    controllerName = data.name,
+                    controllerVersion = data.version,
+                    listPublicRouter = controller.publicRouter();
 
                 _.map(listPublicRouter, (method) => {
-                    const {name, type} = method;
-
-                    const router = controller[name]();
+                    const {name, type} = method,
+                        router = controller[name]();
                     if (!router.disabled) {
                         router.path = `/${method.path}/${router.path}`;
                         router.path = controller.pathName ? `/${controller.pathName}${router.path}` : router.path;
@@ -292,8 +289,6 @@ class Server {
                 });
             });
 
-            console.table(msg);
-
             app.all('/', async function (req, res) {
                 return res.success('welcome');
             });

package/src/middleware/recaptchaMiddleware.js

@@ -7,17 +7,15 @@ export default function (secretKey) {
             throw new ErrorException(MISSING_PARAM, `field captcha is missing`);
         }
 
-        const client = new HttpClient();
-
-        const data = await client.post('https://www.google.com/recaptcha/api/siteverify', {
-            secret: secretKey,
-            response: req.body.captcha,
-        });
-
+        const client = new HttpClient(),
+            data = await client.post('https://www.google.com/recaptcha/api/siteverify', {
+                secret: secretKey,
+                response: req.body.captcha,
+            });
+        delete req.body.captcha;
         if (data.success) {
             return next();
         }
-
         throw new ErrorException(RECAPTCHA);
     };
 }