Merge pull request #13 from hapijs/hapi8

hapi 8. Closes #12

Makefile

@@ -1,9 +1,9 @@
 test:
-	@node node_modules/lab/bin/lab
+	@node node_modules/lab/bin/lab -a code
 test-cov: 
-	@node node_modules/lab/bin/lab -t 100
+	@node node_modules/lab/bin/lab -a code -t 100
 test-cov-html:
-	@node node_modules/lab/bin/lab -r html -o coverage.html
+	@node node_modules/lab/bin/lab -a code -r html -o coverage.html
 
 .PHONY: test test-cov test-cov-html
 

lib/index.js

@@ -10,10 +10,10 @@ var Hawk = require('hawk');
 var internals = {};
 
 
-exports.register = function (plugin, options, next) {
+exports.register = function (server, options, next) {
 
-    plugin.auth.scheme('hawk', internals.hawk);
-    plugin.auth.scheme('bewit', internals.bewit);
+    server.auth.scheme('hawk', internals.hawk);
+    server.auth.scheme('bewit', internals.bewit);
     return next();
 };
 
@@ -54,25 +54,30 @@ internals.hawk = function (server, options) {
                     });
                 }
 
-                return reply(err, { credentials: credentials, artifacts: artifacts });
+                var result = { credentials: credentials, artifacts: artifacts };
+                if (err) {
+                    return reply(err, null, result);
+                }
+
+                return reply.continue(result);
             });
         },
-        payload: function (request, next) {
+        payload: function (request, reply) {
 
             if (!request.auth.artifacts.hash) {
-                return next(false);
+                return reply(Boom.unauthorized(null, 'Hawk'));      // Missing
             }
 
             var plugin = request.plugins['hapi-auth-hawk'];
             if (plugin &&
                 Hawk.server.authenticatePayloadHash(plugin.payloadHash, request.auth.artifacts)) {
 
-                return next();
+                return reply.continue();
             }
 
-            return next(Boom.unauthorized('Payload is invalid'));
+            return reply(Boom.unauthorized('Payload is invalid'));
         },
-        response: function (request, next) {
+        response: function (request, reply) {
 
             var response = request.response;
             var payloadHash = Hawk.crypto.initializePayloadHash(request.auth.credentials.algorithm, response.headers['content-type']);
@@ -91,7 +96,7 @@ internals.hawk = function (server, options) {
                 request.raw.res.addTrailers({ 'server-authorization': header });
             });
 
-            return next();
+            return reply.continue();
         }
     };
 
@@ -112,7 +117,12 @@ internals.bewit = function (server, options) {
 
             Hawk.server.authenticateBewit(request.raw.req, settings.getCredentialsFunc, settings.hawk, function (err, credentials, bewit) {
 
-                return reply(err, { credentials: credentials, artifacts: bewit });
+                var result = { credentials: credentials, artifacts: bewit };
+                if (err) {
+                    return reply(err, null, result);
+                }
+
+                return reply.continue(result);
             });
         }
     };

package.json

@@ -1,8 +1,7 @@
 {
   "name": "hapi-auth-hawk",
   "description": "Hawk authentication plugin",
-  "version": "1.1.1",
-  "author": "Eran Hammer <[email protected]> (http://hueniverse.com)",
+  "version": "2.0.0",
   "repository": "git://github.com/hapijs/hapi-auth-hawk",
   "main": "index",
   "keywords": [
@@ -13,19 +12,20 @@
     "bewit"
   ],
   "engines": {
-    "node": ">=0.10.30"
+    "node": ">=0.10.33"
   },
   "dependencies": {
     "boom": "2.x.x",
     "hoek": "2.x.x",
     "hawk": "2.x.x"
   },
   "peerDependencies": {
-    "hapi": ">=2.x.x"
+    "hapi": ">=8.x.x"
   },
   "devDependencies": {
-    "hapi": "6.x.x",
-    "lab": "3.x.x"
+    "code": "1.x.x",
+    "hapi": "8.x.x",
+    "lab": "5.x.x"
   },
   "scripts": {
     "test": "make test-cov"