Merge pull request #94 from koajs/consistent-errors-100-percent-coverage

Consistent error messages, 100% coverage, misc tweaks

Author: sdd

.gitignore

@@ -3,3 +3,4 @@ node_modules/*
 npm-debug.log
 coverage
 .nyc_output
+.idea

lib/get-secret.js

@@ -1,7 +1,12 @@
 const { decode } = require('jsonwebtoken');
 
 module.exports = async (provider, token) => {
-  const { header } = decode(token, { complete: true });
 
-  return provider(header);
-}
+  const decoded = decode(token, { complete: true });
+
+  if (!decoded || !decoded.header) {
+    throw new Error('Invalid token');
+  }
+
+  return provider(decoded.header);
+};

lib/index.js

@@ -19,38 +19,37 @@ module.exports = (opts = {}) => {
         tokenResolvers.find(resolver => token = resolver(ctx, opts));
 
         if (!token && !passthrough) {
-            ctx.throw(401, 'No authentication token found\n');
+            ctx.throw(401, debug ? 'Token not found' : 'Authentication Error');
         }
 
-        let { state: { secret = opts.secret } = {} } = ctx;
-        if (!secret) {
-            ctx.throw(401, 'Invalid secret\n');
-        }
+        let { state: { secret = opts.secret } } = ctx;
 
         try {
             if(typeof secret === 'function') {
               secret = await getSecret(secret, token);
             }
 
+            if (!secret) {
+                ctx.throw(401, 'Secret not provided');
+            }
+
             const decodedToken = await verify(token, secret, opts);
 
             if (isRevoked) {
                 const tokenRevoked = await isRevoked(ctx, decodedToken, token);
                 if (tokenRevoked) {
-                    throw new Error('Revoked token');
+                    throw new Error('Token revoked');
                 }
             }
 
-            ctx.state = ctx.state || {};
             ctx.state[key] = decodedToken;
             if (tokenKey) {
                 ctx.state[tokenKey] = token;
             }
 
         } catch (e) {
             if (!passthrough) {
-                const debugString = debug ? ` - ${e.message}` : '';
-                const msg = `Invalid token${debugString}\n`;
+                const msg = debug ? e.message : 'Authentication Error';
                 ctx.throw(401, msg);
             }
         }

lib/resolvers/auth-header.js

@@ -23,6 +23,6 @@ module.exports = function resolveAuthorizationHeader(ctx, opts) {
         }
     }
     if (!opts.passthrough) {
-        ctx.throw(401, 'Bad Authorization header format. Format is "Authorization: Bearer <token>"\n');
+        ctx.throw(401, 'Bad Authorization header format. Format is "Authorization: Bearer <token>"');
     }
 };

lib/resolvers/cookie.js

@@ -9,4 +9,4 @@
  */
 module.exports = function resolveCookies(ctx, opts) {
     return opts.cookie && ctx.cookies.get(opts.cookie);
-}
+};

package.json

@@ -53,6 +53,6 @@
   },
   "scripts": {
     "test": "nyc npm run test-only",
-    "test-only": "mocha --reporter spec --bail test/test.js"
+    "test-only": "mocha --reporter spec test/test.js"
   }
 }