beech-api 3.5.12 → 3.7.0

package/packages/cli/core/auth/Credentials.js

@@ -7,50 +7,91 @@ module.exports = {
       // error check
       if (err) {
         console.log(err, info);
-        return next(err);
+        return res.status(401).json({
+          code: 401,
+          error: "UNAUTHORIZED",
+          message: {
+            name: "WrongTokenError",
+            message: "token error."
+          },
+          /* dev: { err, info } */ // for dev info
+        });
       }
       // anything token check
       if (!user) {
-        if (info.name == 'TokenExpiredError') {
-          return res.status(401).json({
-            code: 401,
-            status: 'error',
-            error: 'TOKEN_EXPIRED',
-            message: info
-          });
-        }
-        if (info.name == 'Error') {
-          return res.status(401).json({
-            code: 401,
-            status: 'error',
-            error: 'NO_AUTH_TOKEN',
-            message: {
-              name: 'NoTokenError',
-              message: 'No auth token'
-            }
-          });
-        }
-        if (info.name == 'SyntaxError') {
-          return res.status(401).json({
-            code: 401,
-            status: 'error',
-            error: 'PAYLOAD_SYNTAX_ERROR',
-            message: {
-              name: 'SyntaxError',
-              message: 'Unexpected token < in JSON at position 0'
-            }
-          });
+        if(info) {
+          if (info.name == 'TokenExpiredError') {
+            return res.status(401).json({
+              code: 401,
+              status: 'TOKEN_EXPIRED',
+              message: info
+            });
+          }
+          if (info.name == 'Error') {
+            return res.status(401).json({
+              code: 401,
+              status: 'NO_AUTH_TOKEN',
+              message: {
+                name: 'NoTokenError',
+                message: 'No auth token'
+              }
+            });
+          }
+          if (info.name == 'SyntaxError') {
+            return res.status(401).json({
+              code: 401,
+              status: 'PAYLOAD_SYNTAX_ERROR',
+              message: {
+                name: 'SyntaxError',
+                message: 'Unexpected token < in JSON at position 0'
+              }
+            });
+          }
         }
         return res.status(401).json({
           code: 401,
-          status: 'error',
-          error: 'UNAUTHORIZED_USER',
+          status: 'UNAUTHORIZED_USER',
           message: info
         });
       }
-      // Forward user information to the next middleware
-      req.user = user;
-      next();
+      // Check application key allow
+      const p1 = new Promise((resolve) => {
+        if (_passport_config_.app_key_allow) {
+          if (req.headers.app_key) {
+            if (_config_.main_config.app_key == req.headers.app_key) {
+              resolve(true);
+            } else {
+              res.status(401).json({
+                code: 401,
+                status: "BAD_REQUEST",
+                message: "Unauthorized with wrong key."
+              });
+            }
+          } else {
+            res.status(422).json({
+              code: 422,
+              status: "BAD_ENTIRY",
+              message: "Unprocessable Entity."
+            });
+          }
+        } else {
+          resolve(true);
+        }
+      });
+      Promise.all([p1]).then((passed) => {
+        if(passed) {
+          // Forward user information to the next middleware
+          req.user = user;
+          next();
+        } else {
+          // When wrong all case above.
+          res.status(401).json({
+            code: 401,
+            status: "ERR_UNAUTHORIZED_ENTIRY",
+            message: "Unauthorized with wrong key."
+          });
+        }
+      });
     })(req, res, next);
   }
 }