remove the hard-coding of the word Token` from all boom (raiseError…

…) calls. fixes #180
dwyl · Aug 22, 2016 · 3a1fe06 · 3a1fe06
1 parent 00b92b3
commit 3a1fe06
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -47,12 +47,14 @@ internals.implementation = function (server, options) {
 
       var token = extract(request, options); // extract token from Header, Cookie or Query param
 
+      var tokenType = options.tokenType || 'Token'; // 
+
       if (!token) {
-        return reply(raiseError('unauthorized', null, 'Token'));
+        return reply(raiseError('unauthorized', null, tokenType));
       }
 
       if (!extract.isValid(token)) { // quick check for validity of token format
-        return reply(raiseError('unauthorized', 'Invalid token format', 'Token'));
+        return reply(raiseError('unauthorized', 'Invalid token format', tokenType));
       } // verification is done later, but we want to avoid decoding if malformed
       request.auth.token = token; // keep encoded JWT available in the request lifecycle
       // otherwise use the same key (String) to validate all JWTs
@@ -61,7 +63,7 @@ internals.implementation = function (server, options) {
         decoded = JWT.decode(token, { complete: options.complete || false });
       }
       catch(e) { // request should still FAIL if the token does not decode.
-        return reply(raiseError('unauthorized', 'Invalid token format', 'Token'));
+        return reply(raiseError('unauthorized', 'Invalid token format', tokenType));
       }
 
       if(options.key && typeof options.validateFunc === 'function') {
@@ -78,15 +80,15 @@ internals.implementation = function (server, options) {
           var verifyOptions = options.verifyOptions || {};
           JWT.verify(token, key, verifyOptions, function (err, decoded) {
             if (err) {
-              return reply(raiseError('unauthorized', 'Invalid token', 'Token'), null, { credentials: null });
+              return reply(raiseError('unauthorized', 'Invalid token', tokenType), null, { credentials: null });
             }
             else { // see: http://hapijs.com/tutorials/auth for validateFunc signature
               options.validateFunc(decoded, request, function (err, valid, credentials) { // bring your own checks
                 if (err) {
                   return reply(raiseError('wrap', err));
                 }
                 else if (!valid) {
-                  return reply(raiseError('unauthorized', 'Invalid credentials', 'Token'), null, { credentials: credentials || decoded });
+                  return reply(raiseError('unauthorized', 'Invalid credentials', tokenType), null, { credentials: credentials || decoded });
                 }
                 else {
                   return reply.continue({ credentials: credentials || decoded, artifacts: token });
@@ -102,7 +104,7 @@ internals.implementation = function (server, options) {
             return reply(raiseError('wrap', err));
           }
           else if (!valid) {
-            return reply(raiseError('unauthorized', 'Invalid credentials', 'Token'), null, { credentials: decoded });
+            return reply(raiseError('unauthorized', 'Invalid credentials', tokenType), null, { credentials: decoded });
           } else {
             return reply.continue({ credentials: credentials, artifacts: token });
           }