@azteam/express 1.2.378 → 1.2.380

package/lib/Server.js

@@ -52,7 +52,6 @@ var Server = /*#__PURE__*/function () {
     _classCallCheck(this, Server);
     this.options = _objectSpread({
       redis: null,
-      isAllowEmptyOrigin: true,
       whiteList: null,
       cookieOption: {},
       debug: process.env.NODE_ENV === 'development',
@@ -60,7 +59,6 @@ var Server = /*#__PURE__*/function () {
     }, options);
     this.systemUser = this.options.systemUser;
     this.redis = this.options.redis;
-    this.isAllowEmptyOrigin = this.options.isAllowEmptyOrigin;
     this.whiteList = this.options.whiteList;
     this.debug = this.options.debug;
     this.cookieOption = _objectSpread({
@@ -115,7 +113,6 @@ var Server = /*#__PURE__*/function () {
       if (!_lodash["default"].isEmpty(this.controllers)) {
         var WHITE_LIST = this.whiteList,
           COOKIE_OPTION = this.cookieOption,
-          IS_ALLOW_EMPTY = this.isAllowEmptyOrigin,
           SYSTEM_USER = this.systemUser,
           app = (0, _express["default"])();
         app.use((0, _helmet["default"])({
@@ -137,11 +134,7 @@ var Server = /*#__PURE__*/function () {
             agent = req.header('User-Agent');
           var error = null;
           if (!authorization && !agent.startsWith(SYSTEM_USER)) {
-            if (!origin) {
-              if (!IS_ALLOW_EMPTY) {
-                error = new _error.ErrorException(_error.CORS, "Not allowed by CORS");
-              }
-            } else if (WHITE_LIST && !WHITE_LIST.some(function (re) {
+            if (origin && WHITE_LIST && !WHITE_LIST.some(function (re) {
               return origin.endsWith(re);
             })) {
               error = new _error.ErrorException(_error.CORS, "".concat(origin, " Not allowed by CORS"));

package/lib/SocketServer.js

@@ -124,26 +124,26 @@ var SocketServer = /*#__PURE__*/function () {
     value: function startPort(port) {
       var _this = this;
       if (!_lodash["default"].isEmpty(this.controllers)) {
-        var WHITE_LIST = this.whiteList;
-        var server = _http["default"].Server((0, _express["default"])());
-        var io = (0, _socket["default"])(server, {
-          wsEngine: 'eiows',
-          perMessageDeflate: {
-            threshold: 32768
-          },
-          cors: {
-            credentials: true,
-            origin: function origin(_origin, callback) {
-              if (!_origin || !WHITE_LIST.length || WHITE_LIST.some(function (re) {
-                return _origin.endsWith(re);
-              })) {
-                callback(null, true);
-              } else {
-                callback(new Error("".concat(_origin, " Not allowed by CORS")));
+        var WHITE_LIST = this.whiteList,
+          server = _http["default"].Server((0, _express["default"])()),
+          io = (0, _socket["default"])(server, {
+            wsEngine: 'eiows',
+            perMessageDeflate: {
+              threshold: 32768
+            },
+            cors: {
+              credentials: true,
+              origin: function origin(_origin, callback) {
+                if (!_origin || !WHITE_LIST.length || WHITE_LIST.some(function (re) {
+                  return _origin.endsWith(re);
+                })) {
+                  callback(null, true);
+                } else {
+                  callback(new Error("".concat(_origin, " Not allowed by CORS")));
+                }
               }
             }
-          }
-        });
+          });
         if (this.options.redisConfig) {
           io.adapter((0, _redisAdapter.createAdapter)(this.options.redisConfig));
         }
@@ -152,8 +152,8 @@ var SocketServer = /*#__PURE__*/function () {
           var controller = obj.controller;
           _lodash["default"].map(controller, function (item, key) {
             item.path = obj.version.startsWith('v') ? "/".concat(obj.version).concat(item.path) : item.path;
-            var nsp = io.of(item.path);
-            var middlewares = [].concat(_toConsumableArray(_this.middlewares), _toConsumableArray(item.middlewares || []));
+            var nsp = io.of(item.path),
+              middlewares = [].concat(_toConsumableArray(_this.middlewares), _toConsumableArray(item.middlewares || []));
             nsp.use(wrap(_bodyParser["default"].urlencoded({
               limit: '5mb',
               extended: true

package/package.json

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

package/src/Server.js

@@ -25,7 +25,6 @@ class Server {
     constructor(serviceDirs, options = {}, errorCallback = null) {
         this.options = {
             redis: null,
-            isAllowEmptyOrigin: true,
             whiteList: null,
             cookieOption: {},
             debug: process.env.NODE_ENV === 'development',
@@ -36,7 +35,6 @@ class Server {
         this.systemUser = this.options.systemUser;
 
         this.redis = this.options.redis;
-        this.isAllowEmptyOrigin = this.options.isAllowEmptyOrigin;
         this.whiteList = this.options.whiteList;
         this.debug = this.options.debug;
 
@@ -94,7 +92,6 @@ class Server {
         if (!_.isEmpty(this.controllers)) {
             const WHITE_LIST = this.whiteList,
                 COOKIE_OPTION = this.cookieOption,
-                IS_ALLOW_EMPTY = this.isAllowEmptyOrigin,
                 SYSTEM_USER = this.systemUser,
                 app = express();
 
@@ -120,11 +117,7 @@ class Server {
 
                     let error = null;
                     if (!authorization && !agent.startsWith(SYSTEM_USER)) {
-                        if (!origin) {
-                            if (!IS_ALLOW_EMPTY) {
-                                error = new ErrorException(CORS, `Not allowed by CORS`);
-                            }
-                        } else if (WHITE_LIST && !WHITE_LIST.some((re) => origin.endsWith(re))) {
+                        if (origin && WHITE_LIST && !WHITE_LIST.some((re) => origin.endsWith(re))) {
                             error = new ErrorException(CORS, `${origin} Not allowed by CORS`);
                         }
                     }

package/src/SocketServer.js

@@ -73,26 +73,24 @@ class SocketServer {
 
     startPort(port) {
         if (!_.isEmpty(this.controllers)) {
-            const WHITE_LIST = this.whiteList;
-
-            const server = http.Server(express());
-
-            const io = socketIO(server, {
-                wsEngine: 'eiows',
-                perMessageDeflate: {
-                    threshold: 32768,
-                },
-                cors: {
-                    credentials: true,
-                    origin(origin, callback) {
-                        if (!origin || !WHITE_LIST.length || WHITE_LIST.some((re) => origin.endsWith(re))) {
-                            callback(null, true);
-                        } else {
-                            callback(new Error(`${origin} Not allowed by CORS`));
-                        }
+            const WHITE_LIST = this.whiteList,
+                server = http.Server(express()),
+                io = socketIO(server, {
+                    wsEngine: 'eiows',
+                    perMessageDeflate: {
+                        threshold: 32768,
                     },
-                },
-            });
+                    cors: {
+                        credentials: true,
+                        origin(origin, callback) {
+                            if (!origin || !WHITE_LIST.length || WHITE_LIST.some((re) => origin.endsWith(re))) {
+                                callback(null, true);
+                            } else {
+                                callback(new Error(`${origin} Not allowed by CORS`));
+                            }
+                        },
+                    },
+                });
 
             if (this.options.redisConfig) {
                 io.adapter(createAdapter(this.options.redisConfig));
@@ -105,9 +103,8 @@ class SocketServer {
                 _.map(controller, (item, key) => {
                     item.path = obj.version.startsWith('v') ? `/${obj.version}${item.path}` : item.path;
 
-                    const nsp = io.of(item.path);
-
-                    const middlewares = [...this.middlewares, ...(item.middlewares || [])];
+                    const nsp = io.of(item.path),
+                        middlewares = [...this.middlewares, ...(item.middlewares || [])];
 
                     nsp.use(wrap(bodyParser.urlencoded({limit: '5mb', extended: true})));
                     nsp.use(wrap(bodyParser.json({limit: '5mb'})));