refactor: convert connection options to constructor options

hapijs · Nov 10, 2017 · 2824293 · 2824293
1 parent a6832e7
commit 2824293
Show file tree

Hide file tree

Showing 56 changed files with 138 additions and 282 deletions.
diff --git a/API.md b/API.md
@@ -14,9 +14,7 @@ combine **bell** with the [**hapi-auth-cookie**](https://github.com/hapijs/hapi-
 
 ```javascript
 var Hapi = require('hapi');
-var server = new Hapi.Server();
-
-server.connection({ port: 8000 });
+var server = new Hapi.Server({ port: 8000 });
 
 // Register bell with the server
 server.register(require('bell'), function (err) {

diff --git a/README.md b/README.md
@@ -26,9 +26,7 @@ Twitter:
 
 ```javascript
 var Hapi = require('hapi');
-var server = new Hapi.Server();
-
-server.connection({ port: 8000 });
+var server = new Hapi.Server({ port: 8000 });
 
 // Register bell with the server
 server.register(require('bell'), function (err) {

diff --git a/examples/arcgisonline.js b/examples/arcgisonline.js
@@ -7,8 +7,7 @@ const Hoek = require('hoek');
 const Bell = require('../');
 
 
-const server = new Hapi.Server();
-server.connection({ port: 8000 });
+const server = new Hapi.Server({ port: 8000 });
 
 server.register(Bell, (err) => {
 

diff --git a/examples/discord.js b/examples/discord.js
@@ -7,8 +7,7 @@ const Hoek = require('hoek');
 const Bell = require('../');
 
 
-const server = new Hapi.Server();
-server.connection({ port: 8000 });
+const server = new Hapi.Server({ port: 8000 });
 
 server.register(Bell, (err) => {
 

diff --git a/examples/facebook.js b/examples/facebook.js
@@ -7,8 +7,7 @@ const Hoek = require('hoek');
 const Bell = require('../');
 
 
-const server = new Hapi.Server();
-server.connection({ host: 'localhost', port: 3456 });
+const server = new Hapi.Server({ host: 'localhost', port: 3456 });
 
 server.register(Bell, (err) => {
 

diff --git a/examples/google.js b/examples/google.js
@@ -7,8 +7,7 @@ const Hoek = require('hoek');
 const Bell = require('../');
 
 
-const server = new Hapi.Server();
-server.connection({ host: 'localhost', port: 4567 });
+const server = new Hapi.Server({ host: 'localhost', port: 4567 });
 
 server.register(Bell, (err) => {
 

diff --git a/examples/linkedin.js b/examples/linkedin.js
@@ -7,8 +7,7 @@ const Hoek = require('hoek');
 const Bell = require('../');
 
 
-const server = new Hapi.Server();
-server.connection({ port: 8000 });
+const server = new Hapi.Server({ port: 8000 });
 
 server.register(Bell, (err) => {
 

diff --git a/examples/meetup.js b/examples/meetup.js
@@ -7,8 +7,7 @@ const Hoek = require('hoek');
 const Bell = require('../');
 
 
-const server = new Hapi.Server();
-server.connection({ port: 8000 });
+const server = new Hapi.Server({ port: 8000 });
 
 server.register(Bell, (err) => {
 

diff --git a/examples/nest.js b/examples/nest.js
@@ -7,8 +7,7 @@ const Hoek = require('hoek');
 const Bell = require('../');
 
 
-const server = new Hapi.Server();
-server.connection({ port: 8000 });
+const server = new Hapi.Server({ port: 8000 });
 
 server.register(Bell, (err) => {
 

diff --git a/examples/office365.js b/examples/office365.js
@@ -7,8 +7,7 @@ const Hoek = require('hoek');
 const Bell = require('../');
 
 
-const server = new Hapi.Server();
-server.connection({ host: 'localhost', port: 4567 });
+const server = new Hapi.Server({ host: 'localhost', port: 4567 });
 
 server.register(Bell, (err) => {
 

diff --git a/examples/okta.js b/examples/okta.js
@@ -6,8 +6,7 @@ const Hapi = require('hapi');
 const Hoek = require('hoek');
 const Boom = require('boom');
 
-const server = new Hapi.Server();
-server.connection({ port: 8000 });
+const server = new Hapi.Server({ port: 8000 });
 
 server.register([require('hapi-auth-cookie'), require('../')], (err) => {
 

diff --git a/examples/slack.js b/examples/slack.js
@@ -7,8 +7,7 @@ const Hoek = require('hoek');
 const Bell = require('../');
 
 
-const server = new Hapi.Server();
-server.connection({ port: 8000 });
+const server = new Hapi.Server({ port: 8000 });
 
 server.register(Bell, (err) => {
 

diff --git a/examples/twitch.js b/examples/twitch.js
@@ -7,10 +7,7 @@ const Hoek = require('hoek');
 const Bell = require('../');
 
 
-const server = new Hapi.Server();
-server.connection({
-    port: 8000
-});
+const server = new Hapi.Server({ port: 8000 });
 
 server.register(Bell, (err) => {
 

diff --git a/examples/twitter.js b/examples/twitter.js
@@ -7,8 +7,7 @@ const Hoek = require('hoek');
 const Bell = require('../');
 
 
-const server = new Hapi.Server();
-server.connection({ port: 8000 });
+const server = new Hapi.Server({ port: 8000 });
 
 server.register(Bell, (err) => {
 

diff --git a/lib/oauth.js b/lib/oauth.js
@@ -206,7 +206,7 @@ exports.v2 = function (settings) {
 
         reply.unstate(cookie);
 
-        const requestState = request.query.state || '';
+        const requestState = request.query.state || '';
         if (state.nonce !== requestState.substr(0, Math.min(requestState.length, internals.nonceLength))) {
             return reply(Boom.internal('Incorrect ' + name + ' state parameter'));
         }

diff --git a/test/index.js b/test/index.js
@@ -30,8 +30,7 @@ describe('Bell', () => {
         const mock = new Mock.V1();
         mock.start((provider) => {
 
-            const server = new Hapi.Server();
-            server.connection({ host: 'localhost', port: 80 });
+            const server = new Hapi.Server({ host: 'localhost', port: 80 });
             server.register(Bell, (err) => {
 
                 expect(err).to.not.exist();
@@ -72,8 +71,7 @@ describe('Bell', () => {
         const mock = new Mock.V1();
         mock.start((provider) => {
 
-            const server = new Hapi.Server();
-            server.connection({ host: 'localhost', port: 80 });
+            const server = new Hapi.Server({ host: 'localhost', port: 80 });
             server.register(Bell, (err) => {
 
                 expect(err).to.not.exist();
@@ -124,8 +122,7 @@ describe('Bell', () => {
         const mock = new Mock.V1({ signatureMethod: 'RSA-SHA1' });
         mock.start((provider) => {
 
-            const server = new Hapi.Server();
-            server.connection({ host: 'localhost', port: 80 });
+            const server = new Hapi.Server({ host: 'localhost', port: 80 });
             server.register(Bell, (err) => {
 
                 expect(err).to.not.exist();
@@ -176,8 +173,7 @@ describe('Bell', () => {
         const mock = new Mock.V2();
         mock.start((provider) => {
 
-            const server = new Hapi.Server();
-            server.connection({ host: 'localhost', port: 80 });
+            const server = new Hapi.Server({ host: 'localhost', port: 80 });
             server.register(Bell, (err) => {
 
                 expect(err).to.not.exist();
@@ -227,8 +223,7 @@ describe('Bell', () => {
         const mock = new Mock.V2({ useParamsAuth: false });
         mock.start((provider) => {
 
-            const server = new Hapi.Server();
-            server.connection({ host: 'localhost', port: 80 });
+            const server = new Hapi.Server({ host: 'localhost', port: 80 });
             server.register(Bell, (err) => {
 
                 expect(err).to.not.exist();
@@ -278,8 +273,7 @@ describe('Bell', () => {
         const mock = new Mock.V1();
         mock.start((provider) => {
 
-            const server = new Hapi.Server();
-            server.connection({ host: 'localhost', port: 80 });
+            const server = new Hapi.Server({ host: 'localhost', port: 80 });
             server.register(Bell, (err) => {
 
                 expect(err).to.not.exist();
@@ -319,8 +313,7 @@ describe('Bell', () => {
         const mock = new Mock.V1();
         mock.start((provider) => {
 
-            const server = new Hapi.Server();
-            server.connection({ host: 'localhost', port: 80 });
+            const server = new Hapi.Server({ host: 'localhost', port: 80 });
             server.register(Bell, (err) => {
 
                 expect(err).to.not.exist();
@@ -388,8 +381,7 @@ describe('Bell', () => {
 
     it('exposes OAuth via plugin', (done) => {
 
-        const server = new Hapi.Server();
-        server.connection({ host: 'localhost', port: 80 });
+        const server = new Hapi.Server({ host: 'localhost', port: 80 });
         server.register(Bell, (err) => {
 
             expect(err).to.not.exist();
@@ -403,8 +395,7 @@ describe('Bell', () => {
         const mock = new Mock.V1();
         mock.start((provider) => {
 
-            const server = new Hapi.Server();
-            server.connection({ host: 'localhost', port: 80 });
+            const server = new Hapi.Server({ host: 'localhost', port: 80 });
             server.register(Bell, (err) => {
 
                 expect(err).to.not.exist();
@@ -446,7 +437,6 @@ describe('Bell', () => {
             });
 
             const server = new Hapi.Server();
-            server.connection();
             server.register(Bell, (err) => {
 
                 expect(err).to.not.exist();
@@ -497,7 +487,6 @@ describe('Bell', () => {
             });
 
             const server = new Hapi.Server();
-            server.connection();
             server.register(Bell, (err) => {
 
                 expect(err).to.not.exist();
@@ -549,7 +538,6 @@ describe('Bell', () => {
             });
 
             const server = new Hapi.Server();
-            server.connection();
             server.register(Bell, (err) => {
 
                 expect(err).to.not.exist();

diff --git a/test/mock.js b/test/mock.js
@@ -30,8 +30,7 @@ exports.V1 = internals.V1 = function (options) {
 
     this.tokens = {};
 
-    this.server = new Hapi.Server();
-    this.server.connection({ host: 'localhost' });
+    this.server = new Hapi.Server({ host: 'localhost' });
     this.server.route([
         {
             method: 'POST',
@@ -163,8 +162,7 @@ exports.V2 = internals.V2 = function (options) {
     this.codes = {};
 
     this.useParamsAuth = (options.useParamsAuth === false ? false : true);
-    this.server = new Hapi.Server();
-    this.server.connection({ host: 'localhost' });
+    this.server = new Hapi.Server({ host: 'localhost' });
     this.server.route([
         {
             method: 'GET',