@azteam/express 1.2.126 → 1.2.129

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.126",
+    "version": "1.2.129",
     "description": "",
     "main": "src/index.js",
     "repository": {

package/src/ApiServer.js

@@ -10,18 +10,34 @@ 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 { errorCatch, ErrorException, NOT_FOUND, UNKNOWN } from '@azteam/error';
+
+
+const RES_TYPE = {
+    ARRAY: 'ARRAY',
+    OBJECT: 'OBJECT',
+    DOCS: 'DOCS'
+};
+
+function omitItem(item, guard, allows) {
+
+    if (_.isArray(guard)) {
+        guard = _.difference(guard, allows);
+    }
 
-function omitItem(item, guard) {
     if (item.toJSON) {
         item = item.toJSON();
     }
     if (_.isObject(item)) {
+        if (guard === '*') {
+            return _.pick(item, allows);
+        }
         return _.omit(item, guard);
     }
     return item;
 }
 
+
 class ApiServer {
     constructor(currentDir = '', options = {}) {
         this.options = options;
@@ -114,8 +130,8 @@ class ApiServer {
             }));
 
             app.use(methodOverride());
-            app.use(bodyParser.urlencoded({limit: '5mb', extended: true}));
-            app.use(bodyParser.json({limit: '5mb'}));
+            app.use(bodyParser.urlencoded({ limit: '5mb', extended: true }));
+            app.use(bodyParser.json({ limit: '5mb' }));
 
             app.set('trust proxy', 1);
 
@@ -159,47 +175,54 @@ class ApiServer {
                 };
 
                 res.success = function(data = {}, guard = [], allows = []) {
+                    let guardData = data;
                     if (data) {
-                        guard = [
-                            ...guard,
-                            '__v',
-                            '_id',
-                            'deleted_at',
-                            'updated_at',
-                            'created_id',
-                            'modified_id'
-                        ];
-
-                        if (_.isArray(data) || data.docs) {
+                        let resType = RES_TYPE.ARRAY;
+                        if (_.isObject(data)) {
+                            resType = RES_TYPE.OBJECT;
+                            if (data.docs) {
+                                resType = RES_TYPE.DOCS;
+                            }
+                        }
+
+                        if (_.isArray(guard)) {
                             guard = [
                                 ...guard,
-                                'metadata_disable',
-                                'metadata_keywords',
-                                'metadata_description',
-                                'metadata_image_url'
+                                '__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'
+                                ];
+                            }
                         }
-
-                        guard = _.difference(guard, allows);
-
-                        if (_.isArray(data)) {
-                            data = _.map(data, item => {
-                                return omitItem(item, guard);
+                        if (resType === RES_TYPE.DOCS) {
+                            guardData.docs = _.map(data.docs, item => {
+                                return omitItem(item, guard, allows);
                             });
-                        } else if (_.isObject(data)) {
-                            if (data.docs) {
-                                data.docs = _.map(data.docs, item => {
-                                    return omitItem(item, guard);
-                                });
-                            } else {
-                                data = omitItem(data, guard);
-                            }
+                        } else if (resType === RES_TYPE.ARRAY) {
+                            guardData = _.map(data, item => {
+                                return omitItem(item, guard, allows);
+                            });
+                        } else if (resType === RES_TYPE.OBJECT) {
+                            guardData = omitItem(data, guard, allows);
                         }
+
+
                     }
 
                     return res.json({
                         success: true,
-                        data,
+                        data: guardData,
                         options: req.resOptions
                     });
                 };
@@ -238,22 +261,22 @@ class ApiServer {
                 const listPublicRouter = controller.publicRouter();
 
                 _.map(listPublicRouter, (method) => {
-                    const {name, type} = method;
+                    const { name, type } = method;
 
                     const router = controller[name]();
 
                     router.path = `/${method.path}/${router.path}`;
                     router.path = controller.pathName ? `/${controller.pathName}${router.path}` : router.path;
                     router.path = controllerVersion.startsWith('v') ? `/${controllerVersion}${router.path}` : router.path;
+                    router.path = path.normalize(router.path);
 
                     msg.push({
                         controller: controllerName,
                         version: controllerVersion,
                         type,
                         method: name,
-                        path: path.resolve(router.path)
+                        path: router.path
                     });
-
                     app[type](router.path, ...router.method);
                 });
             });
@@ -279,7 +302,7 @@ class ApiServer {
                     this.callbackError(error);
                 }
 
-                return res.status(error.status).json({success: false, errors: error.errors});
+                return res.status(error.status).json({ success: false, errors: error.errors });
             });
 
             const server = http.Server(app);
@@ -335,4 +358,4 @@ class ApiServer {
     }
 }
 
-export default ApiServer;
+export default ApiServer;