@azteam/express 1.2.147 → 1.2.150

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.147",
+    "version": "1.2.150",
     "description": "",
     "main": "src/index.js",
     "repository": {
@@ -23,9 +23,13 @@
     },
     "homepage": "https://github.com/toda93/express#readme",
     "dependencies": {
-        "@azteam/crypto": "1.0.18",
-        "@azteam/error": "1.0.16",
-        "@azteam/http-client": "1.0.87",
+        "@azteam/crypto": "latest",
+        "@azteam/error": "latest",
+        "@azteam/http-client": "latest",
+        "@azteam/rabbitmq-async": "latest",
+        "@azteam/redis-async": "latest",
+        "@grpc/grpc-js": "1.6.7",
+        "@grpc/proto-loader": "0.6.12",
         "body-parser": "1.19.0",
         "cookie-parser": "1.4.4",
         "cors": "2.8.4",

package/src/Controller.js

@@ -20,9 +20,9 @@ class Controller {
                 const matches = methodName.match(/^(get|post|put|patch|delete)/);
                 if (matches) {
                     let path = '/';
-                    if (methodName.endsWith(/Public/)) {
+                    if (methodName.endsWith('Public')) {
                         path += 'public';
-                    } else if (methodName.endsWith(/Trash/)) {
+                    } else if (methodName.endsWith('Trash')) {
                         path += 'trash';
                     }
 

package/src/Server.js

@@ -40,6 +40,9 @@ function omitItem(item, guard, allows) {
 
 class Server {
     constructor(currentDir = '', options = {}) {
+        this.redis = null;
+        this.messageQueue = null;
+
         this.options = options;
 
         this.cookieOptions = {
@@ -57,8 +60,15 @@ class Server {
         this.debug = process.env.NODE_ENV === 'development';
 
         this.initController(currentDir);
+    }
 
 
+    setMessageQueue(messageQueue) {
+        this.messageQueue = messageQueue;
+    }
+
+    setRedis(redis) {
+        this.redis = redis;
     }
 
     setCookieOptions(cookieOptions) {
@@ -222,11 +232,15 @@ class Server {
 
                     }
 
-                    return res.json({
+                    const resData = {
                         success: true,
                         data: guardData,
                         options: req.resOptions
-                    });
+                    };
+
+
+
+                    return res.json(resData);
                 };
 
                 res.cleanCookie = function(data) {

package/src/middleware/authMiddleware.js

@@ -1,64 +1,12 @@
-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) {
+export default function(mTimeout = 5) {
     return async function(req, res, next) {
-
-        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();
-                });
+        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();
             }
+            res.setHeader('ETag', etag_hash);
         }
-
-
         return next();
-    };
-
+    }
 }

package/src/middleware/cacheMiddleware.js

@@ -0,0 +1,17 @@
+export default function(key) {
+    return async function(req, res, next) {
+    	
+    	const {redis} = req;
+
+        if (redis) {
+
+        	if(res.get(key)){
+
+        	}
+           
+        }
+       
+
+        return next();
+    }
+}

package/src/middleware/etagMiddleware.js

@@ -1,7 +1,5 @@
 import etag from 'etag';
 
-
-
 function floorToMinute(time, minutes) {
     const roundSecond = minutes * 60;
     time = time - (time % (Math.floor(time / roundSecond) * roundSecond));