Merge pull request #134 from gaonkar18y/error-codes-fixes

for306 Set correct error code
apigee · Aug 30, 2019 · b659222 · b659222
2 parents 6d9da19 + b5cc811
commit b659222
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/extauth/index.js b/extauth/index.js
@@ -110,7 +110,7 @@ module.exports.init = function(config, logger, stats) {
                     delete(req.headers['authorization']);
                     delete(req.headers['x-api-key']);
                     if (sendErr) {
-                        return sendError(req, res, next, logger, stats, 'access_denied', 'missing_authorization');
+                        return sendError(req, res, next, logger, stats, 'missing_authorization', 'missing_authorization');
                     }
                 } else {
                     var jwtdecode = JWS.parse(jwtpayload[1]);
@@ -133,15 +133,15 @@ module.exports.init = function(config, logger, stats) {
                                 delete(req.headers['authorization']);
                                 delete(req.headers['x-api-key']);
                                 if (sendErr) {
-                                    return sendError(req, res, next, logger, stats, 'access_denied','invalid_token');
+                                    return sendError(req, res, next, logger, stats, 'invalid_token','invalid_token');
                                 }                                
                             }
                         } else if (!kid && keyType === 'jwk') {
                             debug("ERROR - JWT Missing kid in header");
                             delete(req.headers['authorization']);
                             delete(req.headers['x-api-key']);
                             if (sendErr) {
-                                return sendError(req, res, next, logger, stats, 'access_denied','invalid_token');
+                                return sendError(req, res, next, logger, stats, 'invalid_token','invalid_token');
                             }
                         } else {
                             var jwk = getJWK(kid);
@@ -150,7 +150,7 @@ module.exports.init = function(config, logger, stats) {
                                 delete(req.headers['authorization']);
                                 delete(req.headers['x-api-key']);
                                 if (sendErr) {
-                                    return sendError(req, res, next, logger, stats, 'access_denied','invalid_authorization');
+                                    return sendError(req, res, next, logger, stats, 'invalid_authorization','invalid_authorization');
                                 }                                
                             } else {
                                 debug("Found JWK");
@@ -181,7 +181,7 @@ module.exports.init = function(config, logger, stats) {
                         delete(req.headers['authorization']);
                         delete(req.headers['x-api-key']);
                         if (sendErr) {
-                            return sendError(req, res, next, logger, stats,'access_denied', 'missing_authorization');
+                            return sendError(req, res, next, logger, stats,'missing_authorization', 'missing_authorization');
                         }
                     }
                 }
@@ -190,7 +190,7 @@ module.exports.init = function(config, logger, stats) {
                 delete(req.headers['authorization']);
                 delete(req.headers['x-api-key']);
                 if (sendErr) {
-                    return sendError(req, res, next, logger, stats,'access_denied', 'invalid_authorization');
+                    return sendError(req, res, next, logger, stats,'invalid_authorization', 'invalid_authorization');
                 }
             }
             next();

diff --git a/oauthv2/index.js b/oauthv2/index.js
@@ -95,7 +95,7 @@ module.exports.init = function(config, logger, stats) {
                 return next();
             } else {
                 debug('invalid token');
-                return sendError(req, res, next, logger, stats, 'access_denied', 'invalid_token');
+                return sendError(req, res, next, logger, stats, 'invalid_token', 'invalid_token');
             }
 		}
 
@@ -130,7 +130,7 @@ module.exports.init = function(config, logger, stats) {
                         return next();
                     } else {
                         debug('invalid token');
-                        return sendError(req, res, next, logger, stats,'access_denied', 'invalid_token');
+                        return sendError(req, res, next, logger, stats,'invalid_token', 'invalid_token');
                     }
                 } else {
                     if (tokenvalue === null || tokenvalue === undefined) {
@@ -164,7 +164,7 @@ module.exports.init = function(config, logger, stats) {
                     return next();
                 } else {
                     debug('invalid token');
-                    return sendError(req, res, next, logger, stats, 'access_denied', 'invalid_token');
+                    return sendError(req, res, next, logger, stats, 'invalid_token', 'invalid_token');
                 }
             } else {
                 authorize(req, res, next, logger, stats, decodedToken.payloadObj);