@azteam/express 1.2.125 → 1.2.128

package/package.json

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

package/src/AdminController.js

@@ -1,8 +1,8 @@
-import { NOT_EXISTS } from '@azteam/error';
+import {NOT_EXISTS} from '@azteam/error';
 
-import { REQUEST_TYPE, USER_LEVEL } from './constant';
-import { paginateMiddleware, roleMiddleware, validateMiddleware } from './middleware';
-import { rulesID } from './validate';
+import {REQUEST_TYPE, USER_LEVEL} from './constant';
+import {paginateMiddleware, roleMiddleware, validateMiddleware} from './middleware';
+import {rulesID} from './validate';
 import Controller from './Controller';
 
 
@@ -29,9 +29,9 @@ class AdminController extends Controller {
         });
     }
 
-    getPaginate() {
+    getPaginatePublic() {
         return {
-            path: '/public',
+            path: '/',
             method: [
                 roleMiddleware([this.options.roles.READ], USER_LEVEL.ADMIN),
                 paginateMiddleware(this.options.paginateOptions),
@@ -46,7 +46,7 @@ class AdminController extends Controller {
 
     getPaginateTrash() {
         return {
-            path: '/trash',
+            path: '/',
             method: [
                 roleMiddleware([this.options.roles.READ], USER_LEVEL.ADMIN),
                 paginateMiddleware(this.options.paginateOptions),
@@ -59,9 +59,9 @@ class AdminController extends Controller {
         };
     };
 
-    getOne() {
+    getOnePubic() {
         return {
-            path: '/public/:id',
+            path: '/:id',
             method: [
                 roleMiddleware([this.options.roles.READ], USER_LEVEL.ADMIN),
                 validateMiddleware(REQUEST_TYPE.PARAMS, rulesID),
@@ -77,7 +77,7 @@ class AdminController extends Controller {
 
     getOneTrash() {
         return {
-            path: '/trash/:id',
+            path: '/:id',
             method: [
                 roleMiddleware([this.options.roles.READ], USER_LEVEL.ADMIN),
                 validateMiddleware(REQUEST_TYPE.PARAMS, rulesID),
@@ -96,9 +96,9 @@ class AdminController extends Controller {
         return data;
     };
 
-    postCreate() {
+    postCreatePublic() {
         return {
-            path: '/public',
+            path: '/',
             method: [
                 roleMiddleware([this.options.roles.CREATE], USER_LEVEL.ADMIN),
                 validateMiddleware(REQUEST_TYPE.BODY, this.options.rulesCreate),
@@ -119,9 +119,9 @@ class AdminController extends Controller {
         return data;
     };
 
-    putModify() {
+    putModifyPublic() {
         return {
-            path: '/public/:id',
+            path: '/:id',
             method: [
                 roleMiddleware([this.options.roles.UPDATE], USER_LEVEL.ADMIN),
                 validateMiddleware(REQUEST_TYPE.PARAMS, rulesID),
@@ -141,9 +141,9 @@ class AdminController extends Controller {
         };
     };
 
-    delete() {
+    deletePublic() {
         return {
-            path: '/public/:id',
+            path: '/:id',
             method: [
                 roleMiddleware([this.options.roles.DELETE], USER_LEVEL.ADMIN),
                 validateMiddleware(REQUEST_TYPE.PARAMS, rulesID),
@@ -158,7 +158,7 @@ class AdminController extends Controller {
         };
     };
 
-    postRestore() {
+    postRestoreTrash() {
         return {
             path: '/trash/:id',
             method: [
@@ -175,9 +175,9 @@ class AdminController extends Controller {
         };
     };
 
-    deleteDestroy() {
+    deleteDestroyTrash() {
         return {
-            path: '/destroy/:id',
+            path: '/trash/:id',
             method: [
                 roleMiddleware([this.options.roles.DESTROY], USER_LEVEL.ADMIN),
                 validateMiddleware(REQUEST_TYPE.PARAMS, rulesID),

package/src/ApiServer.js

@@ -1,4 +1,5 @@
 import fs from 'fs';
+import path from 'path';
 import http from 'http';
 import express from 'express';
 import helmet from 'helmet';
@@ -11,16 +12,32 @@ import _ from 'lodash';
 import 'express-async-errors';
 import {errorCatch, ErrorException, NOT_FOUND, UNKNOWN} from '@azteam/error';
 
-function omitItem(item, guard) {
+
+const RES_TYPE = {
+    ARRAY: 'ARRAY',
+    OBJECT: 'OBJECT',
+    DOCS: 'DOCS'
+};
+
+function omitItem(item, guard, allows) {
+
+    if (_.isArray(guard)) {
+        guard = _.difference(guard, allows);
+    }
+
     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;
@@ -159,46 +176,54 @@ class ApiServer {
 
                 res.success = function(data = {}, guard = [], allows = []) {
                     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);
+                        let guardData = data;
+                        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
                     });
                 };
@@ -229,33 +254,31 @@ class ApiServer {
             });
 
             const msg = [];
-            _.map(this.controllers, (obj) => {
+            _.map(this.controllers, (data) => {
+                const controller = data.controller;
+                const controllerName = data.name;
+                const controllerVersion = data.version;
 
-                const {name, controller, version} = obj;
+                const listPublicRouter = controller.publicRouter();
 
-                const listPublicMethod = obj.controller.publicMethod();
+                _.map(listPublicRouter, (method) => {
+                    const {name, type} = method;
 
-                _.map(listPublicMethod, (methodName) => {
+                    const router = controller[name]();
 
-                    const matches = methodName.match(/get|post|put|patch|delete/);
-                    if (matches) {
-                        const type = matches[0];
-                        const item = controller[methodName]();
+                    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);
 
-                        item.path = controller.pathName ? `/${controller.pathName}${item.path}` : item.path;
-
-                        item.path = version.startsWith('v') ? `/${version}${item.path}` : item.path;
-
-                        msg.push({
-                            controller: name,
-                            version,
-                            type,
-                            method: methodName,
-                            path: item.path
-                        });
-
-                        app[type](item.path, ...item.method);
-                    }
+                    msg.push({
+                        controller: controllerName,
+                        version: controllerVersion,
+                        type,
+                        method: name,
+                        path: router.path
+                    });
+                    app[type](router.path, ...router.method);
                 });
             });
 

package/src/Controller.js

@@ -8,7 +8,7 @@ class Controller {
         };
     }
 
-    publicMethod() {
+    publicRouter() {
         let child = this;
         let result = [];
 
@@ -16,11 +16,23 @@ class Controller {
 
             const data = Object.getOwnPropertyNames(Object.getPrototypeOf(child));
 
-            result = [
-                ...result,
-                ...data.filter((methodName) => methodName.match(/^get|post|put|patch|delete/))
-            ]
+            data.map((methodName) => {
+                const matches = methodName.match(/get|post|put|patch|delete/);
+                if (matches) {
+                    let path = '/';
+                    if (methodName.match(/Public/)) {
+                        path += 'public';
+                    } else if (methodName.match(/Trash/)) {
+                        path += 'trash';
+                    }
 
+                    result.push({
+                        type: matches[0],
+                        name: methodName,
+                        path
+                    });
+                }
+            });
             child = child.__proto__;
         }
         return result;