From 0cdeccf426c5c7ad9632be7082b5975c7d23f8a4 Mon Sep 17 00:00:00 2001 From: Ben Drucker Date: Sat, 29 Nov 2014 20:23:24 -0500 Subject: [PATCH] Update for Hapi 8 --- package.json | 8 ++++---- src/index.js | 8 ++++---- test/index.js | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index a7a8e9c..7f3ec3b 100644 --- a/package.json +++ b/package.json @@ -27,11 +27,11 @@ }, "homepage": "https://github.com/bendrucker/hapi-require-https", "devDependencies": { - "code": "~1.2.0", - "hapi": "~7.1.1", - "lab": "~5.0.1" + "code": "^1.2.0", + "hapi": "^8.0.0-rc5", + "lab": "^5.0.1" }, "peerDependencies": { - "hapi": "6 || 7" + "hapi": "^8.0.0-rc5" } } diff --git a/src/index.js b/src/index.js index ccecf81..df8a116 100644 --- a/src/index.js +++ b/src/index.js @@ -1,13 +1,13 @@ 'use strict'; -exports.register = function (plugin, options, next) { - plugin.ext('onRequest', function (request, next) { +exports.register = function (server, options, next) { + server.ext('onRequest', function (request, reply) { if (request.headers['x-forwarded-proto'] === 'http') { - return next('Redirecting to https') + return reply('Redirecting to https') .redirect('https://' + request.headers.host + request.url.path) .code(301); } - next(); + reply.continue(); }); next(); }; diff --git a/test/index.js b/test/index.js index ebc53a3..e247155 100644 --- a/test/index.js +++ b/test/index.js @@ -14,7 +14,8 @@ var hapi = require('hapi'); describe('hapi-require-https', function () { var server = new hapi.Server(); - server.pack.register(require('../'), function (err) { + server.connection(); + server.register(require('../'), function (err) { if (err) throw err; }); server.route({