@azteam/express 1.2.186 → 1.2.189

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.186",
+    "version": "1.2.189",
     "main": "src/index.js",
     "engines": {
         "node": ">= 12.0.0",
@@ -10,7 +10,7 @@
     "license": "MIT",
     "dependencies": {
         "@azteam/crypto": "1.0.24",
-        "@azteam/error": "1.0.19",
+        "@azteam/error": "1.0.20",
         "@azteam/http-client": "1.0.93",
         "@grpc/grpc-js": "1.6.7",
         "@grpc/proto-loader": "0.6.12",

package/src/Server.js

@@ -10,7 +10,7 @@ import morgan from 'morgan';
 import cors from 'cors';
 import _ from 'lodash';
 import 'express-async-errors';
-import {errorCatch, ErrorException, NOT_FOUND, UNKNOWN} from '@azteam/error';
+import {CORS, errorCatch, ErrorException, NOT_FOUND, UNKNOWN} from '@azteam/error';
 
 const RES_TYPE = {
     ARRAY: 'ARRAY',
@@ -19,26 +19,32 @@ const RES_TYPE = {
 };
 
 function omitItem(item, guard, allows) {
-    if (_.isArray(guard)) {
-        guard = _.difference(guard, allows);
+    let guardFields = guard;
+    let itemFields = item;
+
+    if (_.isArray(guardFields)) {
+        guardFields = _.difference(guardFields, allows);
     }
 
-    if (item.toJSON) {
-        item = item.toJSON();
+    if (itemFields.toJSON) {
+        itemFields = item.toJSON();
     }
-    if (_.isObject(item)) {
-        if (guard === '*') {
-            return _.pick(item, allows);
+    if (_.isObject(itemFields)) {
+        if (guardFields === '*') {
+            return _.pick(itemFields, allows);
         }
-        return _.omit(item, guard);
+        return _.omit(itemFields, guardFields);
     }
-    return item;
+    return itemFields;
 }
 
 class Server {
     constructor(currentDir = '', options = {}) {
         this.redis = null;
-        this.options = options;
+        this.options = {
+            isAllowEmptyOrigin: true,
+            ...options,
+        };
 
         this.cookieOptions = {
             domain: null,
@@ -121,6 +127,7 @@ class Server {
         if (!_.isEmpty(this.controllers)) {
             const WHITE_LIST = this.whiteList;
             const COOKIE_OPTIONS = this.cookieOptions;
+            const {isAllowEmptyOrigin} = this.options;
 
             const app = express();
             app.use(
@@ -140,11 +147,17 @@ class Server {
             app.use(
                 cors({
                     credentials: true,
-                    origin: function (origin, callback) {
-                        if (!origin || !WHITE_LIST.length || WHITE_LIST.some((re) => origin.endsWith(re))) {
+                    origin(origin, callback) {
+                        if (!origin) {
+                            if (isAllowEmptyOrigin) {
+                                callback(null, true);
+                            } else {
+                                callback(new ErrorException(CORS, `${origin} Not allowed by CORS`));
+                            }
+                        } else if (!WHITE_LIST.length || WHITE_LIST.some((re) => origin.endsWith(re))) {
                             callback(null, true);
                         } else {
-                            callback(new Error(`${origin} Not allowed by CORS`));
+                            callback(new ErrorException(CORS, `${origin} Not allowed by CORS`));
                         }
                     },
                 })
@@ -184,22 +197,24 @@ class Server {
                         }
                     }
 
+                    let responseGuard = guard;
+                    const responseAllows = allows;
                     if (_.isArray(guard)) {
-                        guard = [...guard, '__v', '_id', 'deleted_at', 'updated_at', 'created_id', 'modified_id'];
+                        responseGuard = [...guard, '__v', '_id', 'deleted_at', 'updated_at', 'created_id', 'modified_id'];
                         if (resType === RES_TYPE.ARRAY || resType === RES_TYPE.DOCS) {
-                            guard = [...guard, 'metadata_disable', 'metadata_keywords', 'metadata_description', 'metadata_image_url'];
+                            responseGuard = [...guard, 'metadata_disable', 'metadata_keywords', 'metadata_description', 'metadata_image_url'];
                         }
                     }
                     if (resType === RES_TYPE.DOCS) {
                         guardData.docs = _.map(data.docs, (item) => {
-                            return omitItem(item, guard, allows);
+                            return omitItem(item, responseGuard, responseAllows);
                         });
                     } else if (resType === RES_TYPE.ARRAY) {
                         guardData = _.map(data, (item) => {
-                            return omitItem(item, guard, allows);
+                            return omitItem(item, responseGuard, responseAllows);
                         });
                     } else if (resType === RES_TYPE.OBJECT) {
-                        guardData = omitItem(data, guard, allows);
+                        guardData = omitItem(data, responseGuard, responseAllows);
                     }
                 }
 

package/src/SocketServer.js

@@ -56,6 +56,7 @@ class SocketServer {
                     const versionDirs = fs.readdirSync(`${apiDir}/${dirName}`);
 
                     for (const versionName of versionDirs) {
+                        // eslint-disable-next-line import/no-dynamic-require,global-require
                         const controller = require(`${apiDir}/${dirName}/${versionName}/controller`).default;
                         this.addController(dirName, versionName, controller);
                     }
@@ -83,7 +84,7 @@ class SocketServer {
                 },
                 cors: {
                     credentials: true,
-                    origin: function (origin, callback) {
+                    origin(origin, callback) {
                         if (!origin || !WHITE_LIST.length || WHITE_LIST.some((re) => origin.endsWith(re))) {
                             callback(null, true);
                         } else {
@@ -99,7 +100,7 @@ class SocketServer {
 
             const msg = [];
             _.map(this.controllers, (obj) => {
-                const controller = obj.controller;
+                const {controller} = obj;
 
                 _.map(controller, (item, key) => {
                     item.path = obj.version.startsWith('v') ? `/${obj.version}${item.path}` : item.path;
@@ -145,7 +146,7 @@ class SocketServer {
                     throw error;
                 }
 
-                let bind = typeof port === 'string' ? 'Pipe ' + port : 'Port ' + port;
+                let bind = typeof port === 'string' ? `Pipe ${port}` : `Port ${port}`;
 
                 switch (error.code) {
                     case 'EACCES':
@@ -164,10 +165,8 @@ class SocketServer {
             server.listen(port);
 
             return server;
-        } else {
-            throw Error('No controllers in use');
         }
-        return null;
+        throw Error('No controllers in use');
     }
 
     setAlertCallback(callback) {