Cleanup. Closes #386

.gitignore

@@ -1,18 +1,9 @@
-.idea
-*.iml
-npm-debug.log
-dump.rdb
-node_modules
-results.tap
-results.xml
-config.json
-.DS_Store
-*/.DS_Store
-*/*/.DS_Store
-._*
-*/._*
-*/*/._*
+**/node_modules
+**/package-lock.json
+
 coverage.*
-.settings
-package-lock.json
 
+**/.DS_Store
+**/._*
+
+**/*.pem

.travis.yml

@@ -1,8 +1,9 @@
 language: node_js
 
 node_js:
-    - "8"
-    - "9"
-    - "node"
+  - "8"
+  - "10"
+  - "11"
+  - "node"
 
 sudo: false

LICENSE

@@ -23,7 +23,3 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-                                  *   *   *
-
-The complete list of contributors can be found at: https://github.com/hapijs/bell/graphs/contributors

examples/arcgisonline.js

@@ -1,13 +1,9 @@
 'use strict';
 
-// Load modules
-
 const Bell = require('../');
 const Hapi = require('hapi');
 
 
-// Declare internals
-
 const internals = {};
 
 

examples/discord.js

@@ -1,13 +1,9 @@
 'use strict';
 
-// Load modules
-
 const Bell = require('../');
 const Hapi = require('hapi');
 
 
-// Declare internals
-
 const internals = {};
 
 

examples/facebook.js

@@ -1,13 +1,9 @@
 'use strict';
 
-// Load modules
-
 const Bell = require('../');
 const Hapi = require('hapi');
 
 
-// Declare internals
-
 const internals = {};
 
 

examples/github.js

@@ -1,13 +1,9 @@
 'use strict';
 
-// Load modules
-
 const Hapi = require('hapi');
 const Bell = require('../');
 
 
-// Declare internals
-
 const internals = {};
 
 
@@ -35,6 +31,7 @@ internals.start = async function () {
                 if (!request.auth.isAuthenticated) {
                     return `Authentication failed due to: ${request.auth.error.message}`;
                 }
+
                 return '<pre>' + JSON.stringify(request.auth.credentials, null, 4) + '</pre>';
             }
         }

examples/google.js

@@ -1,13 +1,9 @@
 'use strict';
 
-// Load modules
-
 const Bell = require('../');
 const Hapi = require('hapi');
 
 
-// Declare internals
-
 const internals = {};
 
 

examples/linkedin.js

@@ -1,13 +1,9 @@
 'use strict';
 
-// Load modules
-
 const Bell = require('../');
 const Hapi = require('hapi');
 
 
-// Declare internals
-
 const internals = {};
 
 

examples/meetup.js

@@ -1,13 +1,9 @@
 'use strict';
 
-// Load modules
-
 const Bell = require('../');
 const Hapi = require('hapi');
 
 
-// Declare internals
-
 const internals = {};
 
 

examples/nest.js

@@ -1,13 +1,9 @@
 'use strict';
 
-// Load modules
-
 const Bell = require('../');
 const Hapi = require('hapi');
 
 
-// Declare internals
-
 const internals = {};
 
 

examples/office365.js

@@ -1,13 +1,9 @@
 'use strict';
 
-// Load modules
-
 const Bell = require('../');
 const Hapi = require('hapi');
 
 
-// Declare internals
-
 const internals = {};
 
 

examples/okta.js

@@ -1,14 +1,10 @@
 'use strict';
 
-// Load modules
-
 const Bell = require('../');
 const Boom = require('boom');
 const Hapi = require('hapi');
 
 
-// Declare internals
-
 const internals = {};
 
 

examples/slack.js

@@ -1,13 +1,9 @@
 'use strict';
 
-// Load modules
-
 const Bell = require('../');
 const Hapi = require('hapi');
 
 
-// Declare internals
-
 const internals = {};
 
 

examples/twitch.js

@@ -1,13 +1,9 @@
 'use strict';
 
-// Load modules
-
 const Hapi = require('hapi');
 const Bell = require('../');
 
 
-// Declare internals
-
 const internals = {};
 
 

examples/twitter.js

@@ -1,13 +1,9 @@
 'use strict';
 
-// Load modules
-
 const Hapi = require('hapi');
 const Bell = require('../');
 
 
-// Declare internals
-
 const internals = {};
 
 

lib/index.js

@@ -1,16 +1,12 @@
 'use strict';
 
-// Load modules
-
 const Hoek = require('hoek');
 const Joi = require('joi');
 
 const OAuth = require('./oauth');
 const Providers = require('./providers');
 
 
-// Declare internals
-
 const internals = {
     simulate: false,
     flexBoolean: Joi.boolean().truthy('true', 'yes', 1, '1').falsy('false', 'no', 0, '0')
@@ -20,6 +16,7 @@ const internals = {
 // Utilities
 
 exports.providers = Providers;
+
 exports.oauth = OAuth;
 
 

lib/oauth.js

@@ -1,7 +1,5 @@
 'use strict';
 
-// Load modules
-
 const Querystring = require('querystring');
 const Url = require('url');
 
@@ -13,8 +11,6 @@ const Hoek = require('hoek');
 const Wreck = require('wreck');
 
 
-// Declare internals
-
 const internals = {
     nonceLength: 22
 };
@@ -554,7 +550,9 @@ internals.Client.prototype.signature = function (method, baseUri, params, oauth,
     if (oauth.oauth_signature_method === 'RSA-SHA1') { // RSA-SHA1 (3.4.3)
         return Crypto.createSign('sha1').update(baseString).sign(this.settings.clientSecret, 'base64');
     }
+
     // HMAC-SHA1 (3.4.2)
+
     const key = tokenSecret ? (this.settings.clientSecret + internals.encode(tokenSecret)) : this.settings.clientSecret;
     return Crypto.createHmac('sha1', key).update(baseString).digest('base64');
 };
@@ -620,6 +618,7 @@ internals.location = function (request, protocol, location) {
     if (typeof location === 'function') {
         return location(request) || internals.location(request, protocol);
     }
+
     if (location) {
         return location + request.path;
     }

package.json

@@ -37,25 +37,19 @@
     "wordpress",
     "yahoo"
   ],
-  "engines": {
-    "node": ">=8.9.0"
-  },
   "dependencies": {
     "boom": "7.x.x",
     "bounce": "1.x.x",
     "cryptiles": "4.x.x",
-    "hoek": "5.x.x",
-    "joi": "13.x.x",
+    "hoek": "6.x.x",
+    "joi": "14.x.x",
     "wreck": "14.x.x"
   },
-  "peerDependencies": {
-    "hapi": ">=17.0.0"
-  },
   "devDependencies": {
     "code": "5.x.x",
     "hapi": "17.x.x",
     "hawk": "7.x.x",
-    "lab": "15.x.x",
+    "lab": "17.x.x",
     "teamwork": "3.x.x"
   },
   "scripts": {

test/index.js

@@ -1,7 +1,5 @@
 'use strict';
 
-// Load modules
-
 const Bell = require('../');
 const Boom = require('boom');
 const Code = require('code');
@@ -12,13 +10,9 @@ const Lab = require('lab');
 const Mock = require('./mock');
 
 
-// Declare internals
-
 const internals = {};
 
 
-// Test shortcuts
-
 const { describe, it } = exports.lab = Lab.script();
 const expect = Code.expect;
 

test/mock.js

@@ -1,7 +1,5 @@
 'use strict';
 
-// Load modules
-
 const Querystring = require('querystring');
 
 const Boom = require('boom');
@@ -12,19 +10,16 @@ const Teamwork = require('teamwork');
 const Wreck = require('wreck');
 
 
-// Declare internals
-
 const internals = {
     wreck: null
 };
 
 
-// Test shortcuts
-
 const expect = Code.expect;
 
 
 exports.CLIENT_ID_TESTER = internals.CLIENT_ID_TESTER = 'clientIdTester';
+
 exports.CLIENT_SECRET_TESTER = internals.CLIENT_SECRET_TESTER = 'clientSecretTester';
 
 
@@ -259,7 +254,7 @@ exports.override = function (uri, payload) {
 
     const override = function (method) {
 
-        return async function (dest) {
+        return async function (dest, ...args) {
 
             if (dest.indexOf(uri) === 0) {
                 if (typeof payload === 'function') {
@@ -280,7 +275,7 @@ exports.override = function (uri, payload) {
                 return { res: { statusCode: 200 }, payload: typeof payload === 'string' ? payload : JSON.stringify(payload) };
             }
 
-            return internals.wreck[method].apply(null, arguments);
+            return internals.wreck[method](dest, ...args);
         };
     };