From d08bcedf41ffb28c005b5a4ea69da7d325237e68 Mon Sep 17 00:00:00 2001 From: Julian Hundeloh Date: Fri, 3 May 2019 20:02:02 +0200 Subject: [PATCH 1/2] fix: update dependencies --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c2515dd..419eee3 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ }, "homepage": "https://github.com/dwyl/hapi-auth-jwt2", "dependencies": { - "boom": "^7.1.1", + "@hapi/boom": "^7.4.2", "cookie": "^0.3.1", "jsonwebtoken": "^8.1.0" }, @@ -55,7 +55,7 @@ "aguid": "^2.0.0", "eslint": "^5.9.0", "eslint-plugin-prettier": "^3.0.0", - "hapi": "^18.0.0", + "@hapi/hapi": "^18.0.0", "nyc": "^13.1.0", "pre-commit": "^1.2.2", "prettier": "^1.15.2", From e7c75f45aba67faf81246f317962953f5a371166 Mon Sep 17 00:00:00 2001 From: jaulz Date: Fri, 3 May 2019 20:07:39 +0200 Subject: [PATCH 2/2] fix: adapt requires --- README.md | 2 +- example/server.js | 2 +- example/simple_server.js | 2 +- lib/index.js | 2 +- test/basic_server.js | 2 +- test/complete_token.test.js | 2 +- test/custom_parameters_server.js | 2 +- test/dynamic_header_key.test.js | 2 +- test/dynamic_key_server.js | 4 ++-- test/error_func_server.js | 2 +- test/multiple_key_server.js | 4 ++-- test/options_payload_validation.js | 4 ++-- test/scheme-payload-server.js | 4 ++-- test/scheme-payload.test.js | 2 +- test/scheme-response-server.js | 2 +- test/scopes_server.js | 2 +- test/try_and_optional_auth_mode.test.js | 2 +- test/validate_func.test.js | 2 +- test/verify_func_server.js | 2 +- 19 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 1ce49c0..44388d8 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ This basic usage example should help you get started: ```javascript -const Hapi = require('hapi'); +const Hapi = require('@hapi/hapi'); const people = { // our "users database" 1: { diff --git a/example/server.js b/example/server.js index 0f8dd3b..d5ac876 100644 --- a/example/server.js +++ b/example/server.js @@ -1,4 +1,4 @@ -const Hapi = require('hapi'); +const Hapi = require('@hapi/hapi'); const hapiAuthJWT = require('../lib/'); const JWT = require('jsonwebtoken'); // used to sign our content const port = process.env.PORT || 8000; // allow port to be set diff --git a/example/simple_server.js b/example/simple_server.js index 0667daa..5a8fbf1 100644 --- a/example/simple_server.js +++ b/example/simple_server.js @@ -1,4 +1,4 @@ -const Hapi = require('hapi'); +const Hapi = require('@hapi/hapi'); const people = { // our "users database" 1: { diff --git a/lib/index.js b/lib/index.js index 08e7499..b289a0d 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1,6 +1,6 @@ 'use strict'; -const Boom = require('boom'); // error handling https://github.com/hapijs/boom +const Boom = require('@hapi/boom'); // error handling https://github.com/hapijs/boom const assert = require('assert'); // use assert to check if options are set const JWT = require('jsonwebtoken'); // https://github.com/docdis/learn-json-web-tokens const extract = require('./extract'); // extract token from Auth Header, URL or Coookie diff --git a/test/basic_server.js b/test/basic_server.js index ab7e9a2..fd9a81f 100644 --- a/test/basic_server.js +++ b/test/basic_server.js @@ -1,4 +1,4 @@ -const Hapi = require('hapi'); +const Hapi = require('@hapi/hapi'); const secret = 'NeverShareYourSecret'; // for debug options see: http://hapijs.com/tutorials/logging diff --git a/test/complete_token.test.js b/test/complete_token.test.js index 1668a50..c9b2fd2 100644 --- a/test/complete_token.test.js +++ b/test/complete_token.test.js @@ -1,5 +1,5 @@ const test = require('tape'); -const Hapi = require('hapi'); +const Hapi = require('@hapi/hapi'); const JWT = require('jsonwebtoken'); const secret = 'NeverShareYourSecret'; diff --git a/test/custom_parameters_server.js b/test/custom_parameters_server.js index 18e7a4a..64d229d 100644 --- a/test/custom_parameters_server.js +++ b/test/custom_parameters_server.js @@ -1,4 +1,4 @@ -const Hapi = require('hapi'); +const Hapi = require('@hapi/hapi'); const secret = 'NeverShareYourSecret'; // for debug options see: http://hapijs.com/tutorials/logging diff --git a/test/dynamic_header_key.test.js b/test/dynamic_header_key.test.js index 3a36e0e..4d06a79 100644 --- a/test/dynamic_header_key.test.js +++ b/test/dynamic_header_key.test.js @@ -1,5 +1,5 @@ const test = require('tape'); -const Hapi = require('hapi'); +const Hapi = require('@hapi/hapi'); const JWT = require('jsonwebtoken'); const secret = 'NeverShareYourSecret'; diff --git a/test/dynamic_key_server.js b/test/dynamic_key_server.js index bb3d67d..d1d7be9 100644 --- a/test/dynamic_key_server.js +++ b/test/dynamic_key_server.js @@ -1,5 +1,5 @@ -const Hapi = require('hapi'); -const Boom = require('boom'); +const Hapi = require('@hapi/hapi'); +const Boom = require('@hapi/boom'); // for debug options see: http://hapijs.com/tutorials/logging const server = new Hapi.Server({ debug: false }); diff --git a/test/error_func_server.js b/test/error_func_server.js index 1023fb0..2a1317d 100644 --- a/test/error_func_server.js +++ b/test/error_func_server.js @@ -1,4 +1,4 @@ -const Hapi = require('hapi'); +const Hapi = require('@hapi/hapi'); const secret = 'NeverShareYourSecret'; // for debug options see: http://hapijs.com/tutorials/logging diff --git a/test/multiple_key_server.js b/test/multiple_key_server.js index 7f33cc6..539aacb 100644 --- a/test/multiple_key_server.js +++ b/test/multiple_key_server.js @@ -1,5 +1,5 @@ -const Hapi = require('hapi'); -const Boom = require('boom'); +const Hapi = require('@hapi/hapi'); +const Boom = require('@hapi/boom'); // for debug options see: http://hapijs.com/tutorials/logging const server = new Hapi.Server({ debug: false }); diff --git a/test/options_payload_validation.js b/test/options_payload_validation.js index 5f9ff94..59bc547 100644 --- a/test/options_payload_validation.js +++ b/test/options_payload_validation.js @@ -1,6 +1,6 @@ var test = require('tape'); -var Hapi = require('hapi'); -var Boom = require('boom'); +var Hapi = require('@hapi/hapi'); +var Boom = require('@hapi/boom'); var JWT = require('jsonwebtoken'); var secret = 'NeverShareYourSecret'; diff --git a/test/scheme-payload-server.js b/test/scheme-payload-server.js index b195192..696ec4b 100644 --- a/test/scheme-payload-server.js +++ b/test/scheme-payload-server.js @@ -1,6 +1,6 @@ -const Hapi = require('hapi'); +const Hapi = require('@hapi/hapi'); const secret = 'NeverShareYourSecret'; -const Boom = require('boom'); +const Boom = require('@hapi/boom'); // for debug options see: http://hapijs.com/tutorials/logging const server = new Hapi.Server({ debug: false }); diff --git a/test/scheme-payload.test.js b/test/scheme-payload.test.js index 3d1388a..9d4d69a 100644 --- a/test/scheme-payload.test.js +++ b/test/scheme-payload.test.js @@ -1,7 +1,7 @@ const test = require('tape'); const JWT = require('jsonwebtoken'); const secret = 'NeverShareYourSecret'; -const Boom = require('boom'); +const Boom = require('@hapi/boom'); const server = require('./scheme-payload-server'); diff --git a/test/scheme-response-server.js b/test/scheme-response-server.js index 34aa541..e37f147 100644 --- a/test/scheme-response-server.js +++ b/test/scheme-response-server.js @@ -1,4 +1,4 @@ -const Hapi = require('hapi'); +const Hapi = require('@hapi/hapi'); const secret = 'NeverShareYourSecret'; // for debug options see: http://hapijs.com/tutorials/logging diff --git a/test/scopes_server.js b/test/scopes_server.js index 3f73c01..85a4698 100644 --- a/test/scopes_server.js +++ b/test/scopes_server.js @@ -1,4 +1,4 @@ -const Hapi = require('hapi'); +const Hapi = require('@hapi/hapi'); const secret = 'NeverShareYourSecret'; // for debug options see: http://hapijs.com/tutorials/logging diff --git a/test/try_and_optional_auth_mode.test.js b/test/try_and_optional_auth_mode.test.js index bf5fa31..fdd8f0b 100644 --- a/test/try_and_optional_auth_mode.test.js +++ b/test/try_and_optional_auth_mode.test.js @@ -1,5 +1,5 @@ const test = require('tape'); -const Hapi = require('hapi'); +const Hapi = require('@hapi/hapi'); const JWT = require('jsonwebtoken'); const secret = 'NeverShareYourSecret'; diff --git a/test/validate_func.test.js b/test/validate_func.test.js index e5bc3fc..be10fd2 100644 --- a/test/validate_func.test.js +++ b/test/validate_func.test.js @@ -1,5 +1,5 @@ const test = require('tape'); -const Hapi = require('hapi'); +const Hapi = require('@hapi/hapi'); const JWT = require('jsonwebtoken'); const secret = 'NeverShareYourSecret'; diff --git a/test/verify_func_server.js b/test/verify_func_server.js index d3187ab..4fa8080 100644 --- a/test/verify_func_server.js +++ b/test/verify_func_server.js @@ -1,4 +1,4 @@ -const Hapi = require('hapi'); +const Hapi = require('@hapi/hapi'); const secret = 'NeverShareYourSecret'; // for debug options see: http://hapijs.com/tutorials/logging