ensure that credentials argument is not required in verifyFunc() call…

…back as documented. default to `decoded` when not supplied. fixes #187
dwyl · Aug 22, 2016 · fdcbb76 · fdcbb76
1 parent 48024e1
commit fdcbb76
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -48,7 +48,7 @@ internals.implementation = function (server, options) {
 
       var token = extract(request, options); // extract token from Header, Cookie or Query param
 
-      var tokenType = options.tokenType || 'Token'; // 
+      var tokenType = options.tokenType || 'Token'; //
 
       if (!token) {
         return reply(raiseError('unauthorized', null, tokenType));
@@ -107,7 +107,7 @@ internals.implementation = function (server, options) {
           else if (!valid) {
             return reply(raiseError('unauthorized', 'Invalid credentials', tokenType), null, { credentials: decoded });
           } else {
-            return reply.continue({ credentials: credentials, artifacts: token });
+            return reply.continue({ credentials: credentials || decoded, artifacts: token });
           }
         });
       }

diff --git a/test/verify_func_server.js b/test/verify_func_server.js
@@ -23,7 +23,7 @@ var customVerifyFunc = function (decoded, request, callback) {
     return callback(new Error('customVerify fails!'));
   }
   else if (decoded.some_property) {
-    return callback(null, true, decoded);
+    return callback(null, true);
   }
   else {
     return callback(null, false, decoded);