@azteam/express 1.2.150 → 1.2.151

package/package.json

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

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 {errorCatch, ErrorException, NOT_FOUND, UNKNOWN} from '@azteam/error';
 
 
 const RES_TYPE = {
@@ -65,10 +65,12 @@ class Server {
 
     setMessageQueue(messageQueue) {
         this.messageQueue = messageQueue;
+        return this;
     }
 
     setRedis(redis) {
         this.redis = redis;
+        return this;
     }
 
     setCookieOptions(cookieOptions) {
@@ -128,6 +130,7 @@ class Server {
 
 
     startAPI(port) {
+
         if (!_.isEmpty(this.controllers)) {
 
             const WHITE_LIST = this.whiteList;
@@ -140,8 +143,8 @@ class Server {
             }));
 
             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);
 
@@ -171,96 +174,108 @@ class Server {
             });
             app.get('/favicon.ico', (req, res) => res.status(204).json({}));
 
-            app.use(async function(req, res, next) {
-                req.trackDevice = {
-                    ip: req.ip,
-                    device: req.get('X-DEVICE') || req.get('User-Agent'),
-                    device_id: req.get('X-DEVICE-ID') || 'web',
-                    os: req.get('X-OS') || 'web'
-                };
 
+            const {redis} = this;
 
-                res.error = function(code, errors = []) {
-                    throw new ErrorException(code, errors);
-                };
+            if (redis) {
+                app.request.redis = redis;
+                app.response.redis = redis;
+            }
+
+
+            app.response.error = function(code, errors = []) {
+                throw new ErrorException(code, errors);
+            };
 
-                res.success = function(data = {}, guard = [], allows = []) {
-                    let guardData = data;
-                    if (data) {
-                        let resType = null;
-                        if (_.isArray(data)) {
-                            resType = RES_TYPE.ARRAY;
-                        } else if (_.isObject(data)) {
-                            resType = RES_TYPE.OBJECT;
-                            if (data.docs) {
-                                resType = RES_TYPE.DOCS;
-                            }
+            app.response.success = function(data = {}, guard = [], allows = []) {
+
+                let guardData = data;
+                if (data) {
+                    let resType = null;
+                    if (_.isArray(data)) {
+                        resType = RES_TYPE.ARRAY;
+                    } else if (_.isObject(data)) {
+                        resType = RES_TYPE.OBJECT;
+                        if (data.docs) {
+                            resType = RES_TYPE.DOCS;
                         }
+                    }
 
-                        if (_.isArray(guard)) {
+                    if (_.isArray(guard)) {
+                        guard = [
+                            ...guard,
+                            '__v',
+                            '_id',
+                            'deleted_at',
+                            'updated_at',
+                            'created_id',
+                            'modified_id'
+                        ];
+                        if (resType === RES_TYPE.ARRAY || resType === RES_TYPE.DOCS) {
                             guard = [
                                 ...guard,
-                                '__v',
-                                '_id',
-                                'deleted_at',
-                                'updated_at',
-                                'created_id',
-                                'modified_id'
+                                'metadata_disable',
+                                'metadata_keywords',
+                                'metadata_description',
+                                'metadata_image_url'
                             ];
-                            if (resType === RES_TYPE.ARRAY || resType === RES_TYPE.DOCS) {
-                                guard = [
-                                    ...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);
-                            });
-                        } 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);
-                        }
-
-
                     }
+                    if (resType === RES_TYPE.DOCS) {
+                        guardData.docs = _.map(data.docs, item => {
+                            return omitItem(item, guard, allows);
+                        });
+                    } 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);
+                    }
+                }
 
-                    const resData = {
-                        success: true,
-                        data: guardData,
-                        options: req.resOptions
-                    };
-
+                const resData = {
+                    success: true,
+                    data: guardData,
+                    options: this.resOptions
+                };
 
+                if (this.redis && this.cache) {
+                    this.redis.set(this.cache.key, resData, this.ttl);
+                }
 
-                    return res.json(resData);
-                };
+                return this.json(resData);
+            };
 
-                res.cleanCookie = function(data) {
-                    _.map(data, (name) => {
-                        res.clearCookie(name, {
-                            domain: COOKIE_OPTIONS.domain
-                        });
+            app.response.cleanCookie = function(data) {
+                _.map(data, (name) => {
+                    this.clearCookie(name, {
+                        domain: COOKIE_OPTIONS.domain
                     });
-                };
-
-                res.addCookie = function(data) {
-                    _.map(data, (value, key) => {
-                        const maxAge = 86400000 * 365; // 1 year
-                        res.cookie(key, value, {
-                            ...COOKIE_OPTIONS,
-                            maxAge,
-                            expires: new Date(Date.now() + maxAge)
-                        });
+                });
+            };
+
+            app.response.addCookie = function(data) {
+                _.map(data, (value, key) => {
+                    const maxAge = 86400000 * 365; // 1 year
+                    this.cookie(key, value, {
+                        ...COOKIE_OPTIONS,
+                        maxAge,
+                        expires: new Date(Date.now() + maxAge)
                     });
+                });
+            };
+
+            app.use(async function(req, res, next) {
+                delete res.cache;
+
+                req.trackDevice = {
+                    ip: req.ip,
+                    device: req.get('X-DEVICE') || req.get('User-Agent'),
+                    device_id: req.get('X-DEVICE-ID') || 'web',
+                    os: req.get('X-OS') || 'web'
                 };
+
                 next();
             });
 
@@ -277,7 +292,7 @@ class Server {
                 const listPublicRouter = controller.publicRouter();
 
                 _.map(listPublicRouter, (method) => {
-                    const { name, type } = method;
+                    const {name, type} = method;
 
                     const router = controller[name]();
 
@@ -318,7 +333,7 @@ class Server {
                     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);
@@ -383,4 +398,4 @@ class Server {
     }
 }
 
-export default Server;
+export default Server;

package/src/middleware/authMiddleware.js

@@ -1,12 +1,64 @@
-export default function(mTimeout = 5) {
+import { ErrorException } from '@azteam/error';
+import jwt from 'jsonwebtoken';
+
+function systemLogin(userData = null) {
+    let user = {};
+    if (userData) {
+        try {
+            user = JSON.parse(userData);
+        } catch (e) {}
+    }
+    return user;
+}
+
+export default function(cbRefreshToken, cbLoginAPI) {
     return async function(req, res, next) {
-        if (req.method === 'GET') {
-            const etag_hash = etag(req.url + floorToMinute(Math.floor(Date.now() / 1000), mTimeout));
-            if (req.headers['if-none-match'] === etag_hash) {
-                return res.status(304).send();
+
+        const { headers, signedCookies } = req;
+
+        if (headers['x-app-secret'] === process.env.SECRET_KEY) {
+            req.user = systemLogin(headers['x-app-user']);
+        } else {
+            let token = signedCookies.access_token;
+
+            if (headers.authorization && signedCookies.api_key != headers.authorization) {
+                token = headers.authorization;
+            }
+
+            if (token) {
+                token = token.replace('Bearer ', '');
+                return jwt.verify(token, process.env.SECRET_KEY, async (error, jwtData) => {
+                    if (error) {
+                        try {
+                            let data = null;
+                            if (error.name === 'TokenExpiredError') {
+                                if (signedCookies.refresh_token) {
+                                    data = await cbRefreshToken(signedCookies.refresh_token);
+                                } else if (signedCookies.api_key) {
+                                    data = await cbLoginAPI(signedCookies.api_key);
+                                }
+                            } else if (error.name === 'JsonWebTokenError') {
+                                data = await cbLoginAPI(token);
+                            }
+                            if (data) {
+                                jwtData = jwt.decode(data.access_token);
+                                res.addCookie({
+                                    'access_token': data.access_token
+                                });
+                                res.set('Auth-Token', data.access_token);
+                            }
+                        } catch (e) {}
+                    }
+                    if (jwtData) {
+                        req.user = jwtData;
+                    }
+                    return next();
+                });
             }
-            res.setHeader('ETag', etag_hash);
         }
+
+
         return next();
-    }
+    };
+
 }

package/src/middleware/cacheMiddleware.js

@@ -1,17 +1,17 @@
-export default function(key) {
+export default function(key, ttl = 5) {
     return async function(req, res, next) {
-    	
-    	const {redis} = req;
-
+        const {redis} = req;
         if (redis) {
-
-        	if(res.get(key)){
-
-        	}
-           
+            const cacheData = await redis.get(key);
+            if (cacheData) {
+                return res.json(cacheData);
+            } else {
+                res.cache = {
+                    key,
+                    ttl
+                };
+            }
         }
-       
-
         return next();
-    }
-}
+    };
+}

package/src/middleware/index.js

@@ -5,4 +5,5 @@ export {default as roleMiddleware} from './roleMiddleware';
 export {default as paginateMiddleware} from './paginateMiddleware';
 export {default as validateMiddleware} from './validateMiddleware';
 export {default as limitRequestMiddleware} from './limitRequestMiddleware';
+export {default as cacheMiddleware} from './cacheMiddleware';
 

package/src/middleware/paginateMiddleware.js

@@ -36,7 +36,7 @@ export default function(options = {}) {
     return async function(req, res, next) {
         req.query = omitData(req.query);
 
-        req.resOptions = options;
+        res.resOptions = options;
         req.paginate = {
             limit: options.limit
         };
@@ -71,14 +71,14 @@ export default function(options = {}) {
                     req.query[newKey] = {
                         ...req.query[newKey],
                         $gte: value
-                    }
+                    };
                 } else if (key.endsWith('_end')) {
                     const newKey = key.replace('_end', '');
 
                     req.query[newKey] = {
                         ...req.query[newKey],
                         $lt: value
-                    }
+                    };
                 }
 
 
@@ -102,5 +102,5 @@ export default function(options = {}) {
         }
 
         return next();
-    }
-}
+    };
+}