Merge pull request #43 from hapijs/hapi8

Hapi8
hapijs · Nov 28, 2014 · a96afcc · a96afcc
2 parents 54d256e + 7926d01
commit a96afcc
Show file tree

Hide file tree

Showing 7 changed files with 171 additions and 117 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -1,7 +1,7 @@
 // Load modules
 
-var Hoek = require('hoek');
 var Boom = require('boom');
+var Hoek = require('hoek');
 var Joi = require('joi');
 var OAuth = require('./oauth');
 var Providers = require('./providers');
@@ -12,9 +12,9 @@ var Providers = require('./providers');
 var internals = {};
 
 
-exports.register = function (plugin, options, next) {
+exports.register = function (server, options, next) {
 
-    plugin.auth.scheme('bell', internals.implementation);
+    server.auth.scheme('bell', internals.implementation);
     next();
 };
 
@@ -82,7 +82,7 @@ internals.implementation = function (server, options) {
         isHttpOnly: settings.isHttpOnly !== false,              // Defaults to true
         ttl: settings.ttl,
         domain: settings.domain,
-        failAction: 'log',
+        ignoreErrors: true,
         clearInvalid: true
     };
 

diff --git a/lib/oauth.js b/lib/oauth.js
@@ -1,11 +1,11 @@
 // Load modules
 
 var Querystring = require('querystring');
-var Crypto = require('crypto');
 var Url = require('url');
-var Hoek = require('hoek');
 var Boom = require('boom');
 var Cryptiles = require('cryptiles');
+var Crypto = require('crypto');
+var Hoek = require('hoek');
 var Wreck = require('wreck');
 
 
@@ -38,7 +38,7 @@ exports.v1 = function (settings) {
 
             // Obtain temporary OAuth credentials
 
-            var oauth_callback = request.server.location(request.path, request);
+            var oauth_callback = internals.location(request);
             return client.temporary(oauth_callback, function (err, payload) {
 
                 if (err) {
@@ -93,7 +93,7 @@ exports.v1 = function (settings) {
             };
 
             if (!settings.provider.profile) {
-                return reply(null, { credentials: credentials });
+                return reply.continue({ credentials: credentials });
             }
 
             // Obtain user profile
@@ -116,7 +116,7 @@ exports.v1 = function (settings) {
 
             settings.provider.profile.call(settings, credentials, payload, get, function () {
 
-                return reply(null, { credentials: credentials });
+                return reply.continue({ credentials: credentials });
             });
         });
     };
@@ -142,7 +142,7 @@ exports.v2 = function (settings) {
             var query = Hoek.clone(settings.providerParams) || {};
             query.client_id = settings.clientId;
             query.response_type = 'code';
-            query.redirect_uri = request.server.location(request.path, request);
+            query.redirect_uri = internals.location(request);
             query.state = nonce;
 
             var scope = settings.scope || settings.provider.scope;
@@ -177,7 +177,7 @@ exports.v2 = function (settings) {
             client_secret: settings.clientSecret,
             grant_type: 'authorization_code',
             code: request.query.code,
-            redirect_uri: request.server.location(request.path, request)
+            redirect_uri: internals.location(request)
         };
 
         var requestOptions = {
@@ -215,7 +215,7 @@ exports.v2 = function (settings) {
             };
 
             if (!settings.provider.profile) {
-                return reply(null, { credentials: credentials });
+                return reply.continue({ credentials: credentials });
             }
 
             // Obtain user profile
@@ -256,7 +256,7 @@ exports.v2 = function (settings) {
 
             settings.provider.profile.call(settings, credentials, payload, get, function () {
 
-                return reply(null, { credentials: credentials });
+                return reply.continue({ credentials: credentials });
             });
         });
     };
@@ -482,3 +482,11 @@ internals.parse = function (payload) {
 
     return Querystring.parse(payload);
 };
+
+
+internals.location = function (request) {
+
+    var info = request.connection.info;
+    var host = request.info.host || (info.host + ':' + info.port);
+    return info.protocol + '://' + host + request.path;
+};
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bell",
   "description": "Third-party login plugin for hapi",
-  "version": "1.3.1",
+  "version": "2.0.0-rc1",
   "repository": "git://github.com/hapijs/bell",
   "main": "index",
   "keywords": [
@@ -22,7 +22,7 @@
     "vk"
   ],
   "engines": {
-    "node": ">=0.10.30"
+    "node": ">=0.10.33"
   },
   "dependencies": {
     "boom": "2.x.x",
@@ -32,10 +32,10 @@
     "wreck": "5.x.x"
   },
   "peerDependencies": {
-    "hapi": ">=6.x.x"
+    "hapi": ">=8.x.x"
   },
   "devDependencies": {
-    "hapi": "6.x.x",
+    "hapi": "8.x.x",
     "hawk": "2.x.x",
     "lab": "5.x.x",
     "code": "1.x.x"

diff --git a/test/index.js b/test/index.js
@@ -1,10 +1,10 @@
 // Load modules
 
+var Bell = require('../');
 var Code = require('code');
-var Lab = require('lab');
 var Hapi = require('hapi');
 var Hoek = require('hoek');
-var Bell = require('../');
+var Lab = require('lab');
 var Mock = require('./mock');
 
 
@@ -28,8 +28,9 @@ describe('Bell', function () {
         var mock = new Mock.V1();
         mock.start(function (provider) {
 
-            var server = new Hapi.Server('localhost');
-            server.pack.register(Bell, function (err) {
+            var server = new Hapi.Server();
+            server.connection({ host: 'localhost', port: 80 });
+            server.register(Bell, function (err) {
 
                 expect(err).to.not.exist();
 
@@ -79,8 +80,9 @@ describe('Bell', function () {
         var mock = new Mock.V2();
         mock.start(function (provider) {
 
-            var server = new Hapi.Server('localhost');
-            server.pack.register(Bell, function (err) {
+            var server = new Hapi.Server();
+            server.connection({ host: 'localhost', port: 80 });
+            server.register(Bell, function (err) {
 
                 expect(err).to.not.exist();
 
@@ -129,8 +131,9 @@ describe('Bell', function () {
         var mock = new Mock.V1();
         mock.start(function (provider) {
 
-            var server = new Hapi.Server('localhost');
-            server.pack.register(Bell, function (err) {
+            var server = new Hapi.Server();
+            server.connection({ host: 'localhost', port: 80 });
+            server.register(Bell, function (err) {
 
                 expect(err).to.not.exist();
 
@@ -169,8 +172,9 @@ describe('Bell', function () {
         var mock = new Mock.V1();
         mock.start(function (provider) {
 
-            var server = new Hapi.Server('localhost');
-            server.pack.register(Bell, function (err) {
+            var server = new Hapi.Server();
+            server.connection({ host: 'localhost', port: 80 });
+            server.register(Bell, function (err) {
 
                 expect(err).to.not.exist();
 

diff --git a/test/mock.js b/test/mock.js
@@ -1,13 +1,13 @@
 // Load modules
 
 var Querystring = require('querystring');
+var Boom = require('boom');
 var Code = require('code');
-var Hawk = require('hawk');
-var Lab = require('lab');
 var Hapi = require('hapi');
+var Hawk = require('hawk');
 var Hoek = require('hoek');
+var Lab = require('lab');
 var Wreck = require('wreck');
-var Boom = require('boom');
 
 
 // Declare internals
@@ -27,7 +27,8 @@ exports.V1 = internals.V1 = function (fail) {
 
     this.tokens = {};
 
-    this.server = new Hapi.Server(0, 'localhost');
+    this.server = new Hapi.Server();
+    this.server.connection({ host: 'localhost' });
     this.server.route([
         {
             method: 'POST',
@@ -143,7 +144,8 @@ exports.V2 = internals.V2 = function () {
 
     this.codes = {};
 
-    this.server = new Hapi.Server(0, 'localhost');
+    this.server = new Hapi.Server();
+    this.server.connection({ host: 'localhost' });
     this.server.route([
         {
             method: 'GET',