Upgrade dependencies to support hapi 19

README.md

@@ -1,7 +1,7 @@
 # hapi-openapi
 
-[![Build Status](https://travis-ci.org/krakenjs/hapi-openapi.svg?branch=master)](https://travis-ci.org/krakenjs/hapi-openapi)  
-[![NPM version](https://badge.fury.io/js/hapi-openapi.png)](http://badge.fury.io/js/hapi-openapi)  
+[![Build Status](https://travis-ci.org/krakenjs/hapi-openapi.svg?branch=master)](https://travis-ci.org/krakenjs/hapi-openapi)
+[![NPM version](https://badge.fury.io/js/hapi-openapi.png)](http://badge.fury.io/js/hapi-openapi)
 
 ### Note: this project was renamed from 'swaggerize-hapi' to 'hapi-openapi'.
 
@@ -49,7 +49,7 @@ You now have a working api and can use something like [SwaggerHub](https://swagg
 ### Manual Usage
 
 ```javascript
-const Hapi = require('hapi');
+const Hapi = require('@hapi/hapi');
 
 const server = new Hapi.Server();
 
@@ -194,7 +194,7 @@ This will construct a `handlers` object from the given `x-hapi-handler` files.
 
 ### X-Hapi-Options
 
-There is now support at the operations level for `x-hapi-options` which represent individual [Hapi Route Optijons](https://github.com/hapijs/hapi/blob/master/API.md#route-options). 
+There is now support at the operations level for `x-hapi-options` which represent individual [Hapi Route Optijons](https://github.com/hapijs/hapi/blob/master/API.md#route-options).
 
 This support is limited to configuration supported by the JSON file type.
 
@@ -321,7 +321,7 @@ and
 ```javascript
 //xauth-strategy.js
 
-const Boom = require('boom');
+const Boom = require('@hapi/boom');
 
 const register = function (server, { name, scheme, where, lookup }) {
     server.auth.strategy(name, /* the scheme to use this strategy with */ scheme, {

lib/index.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const Package = require('../package.json');
-const Joi = require('joi');
-const Hoek = require('hoek');
+const Joi = require('@hapi/joi');
+const Hoek = require('@hapi/hoek');
 const Caller = require('./caller');
 const Path = require('path');
 const Parser = require('swagger-parser');
@@ -164,7 +164,7 @@ const register = async function (server, options, next) {
         },
         vhost
     });
-    
+
     const routes = await Routes.create(server, { api: spec, basedir, cors, vhost, handlers, extensions, outputvalidation });
 
     for (const route of routes) {

lib/routes.js

@@ -2,7 +2,7 @@
 
 const ObjectFiles = require('merge-object-files');
 const Validators = require('./validators');
-const Hoek = require('hoek');
+const Hoek = require('@hapi/hoek');
 const Utils = require('./utils');
 const Path = require('path');
 const Props = require('dot-prop');
@@ -94,11 +94,6 @@ const create = async function (server, { api, basedir, cors, vhost, handlers, ex
                     const securitySchemes = Object.keys(secdef);
 
                     for (const securityDefinitionName of securitySchemes) {
-                        if (!server.auth._strategies[securityDefinitionName]) {
-                            server.log(['warn'], `${securityDefinitionName} strategy was not registered.`);
-                            continue;
-                        }
-
                         const securityDefinition = api.securityDefinitions[securityDefinitionName];
 
                         Hoek.assert(securityDefinition, 'Security scheme not defined.');

lib/validators.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const Enjoi = require('enjoi');
-const Joi = require('joi');
+const Joi = require('@hapi/joi');
 const Util = require('util');
 
 const types = {
@@ -140,7 +140,7 @@ const create = function (options = {}) {
 
         const formValidator = async function (value) {
             const result = await this.validate(value);
-            
+
             if (result.error) {
                 throw result.error;
             }
@@ -193,6 +193,12 @@ const create = function (options = {}) {
             }
         }
 
+        for (const [key, value] of Object.entries(validate)) {
+            if (typeof value === 'object' && !value.isJoi) {
+                validate[key] = Joi.object(value);
+            }
+        }
+
         return {
             validate,
             routeExt

package.json

@@ -15,21 +15,21 @@
     "node": ">=8"
   },
   "dependencies": {
+    "@hapi/hoek": "^9.0.4",
+    "@hapi/joi": "^14.5.0",
     "dot-prop": "^4.2.0",
-    "enjoi": "^4.0.0",
-    "hoek": "^5.0.3",
-    "joi": "^13.6.0",
+    "enjoi": "^6.0.1",
     "js-yaml": "^3.11.0",
     "merge-object-files": "^2.0.0",
-    "swagger-parser": "^4.1.0"
+    "swagger-parser": "^9.0.1"
   },
   "devDependencies": {
-    "boom": "^7.2.0",
+    "@hapi/boom": "^9.1.0",
+    "@hapi/hapi": "^19.1.1",
     "eslint": "^4.19.1",
     "eslint-config-hapi": "^11.1.0",
     "eslint-plugin-hapi": "^4.1.0",
-    "hapi": "^17.4.0",
-    "nyc": "^13.3.0",
+    "nyc": "^15.0.0",
     "tape": "^4.9.0"
   },
   "scripts": {

test/fixtures/lib/stub-auth-token-scheme.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Boom = require('boom');
+var Boom = require('@hapi/boom');
 
 const register = function (server, options) {
     server.auth.scheme('stub-auth-token', function (server, options) {

test/fixtures/lib/xauth-scheme.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Boom = require('boom');
+var Boom = require('@hapi/boom');
 
 const register = function (server, { name  }) {
     server.auth.scheme(name /*apiKey*/, (server, { validate }) => {

test/fixtures/lib/xauth-strategy.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Boom = require('boom');
+const Boom = require('@hapi/boom');
 
 const register = function (server, { name, scheme, where, lookup }) {
     server.auth.strategy(name, scheme, {

test/test-auth.js

@@ -3,7 +3,7 @@
 const Test = require('tape');
 const Path = require('path');
 const OpenAPI = require('../lib');
-const Hapi = require('hapi');
+const Hapi = require('@hapi/hapi');
 const StubAuthTokenScheme = require('./fixtures/lib/stub-auth-token-scheme');
 
 Test('authentication', function (t) {
@@ -80,6 +80,10 @@ Test('authentication', function (t) {
                 }
             });
 
+            server.auth.strategy('api_key2', 'stub-auth-token', {
+                validateFunc: () => ({ isValid: true })
+            });
+
             await server.register({
                 plugin: OpenAPI,
                 options: {
@@ -117,6 +121,10 @@ Test('authentication', function (t) {
                 }
             });
 
+            server.auth.strategy('api_key2', 'stub-auth-token', {
+                validateFunc: () => ({ isValid: true })
+            });
+
             await server.register({
                 plugin: OpenAPI,
                 options: {

test/test-forms.js

@@ -3,7 +3,7 @@
 const Test = require('tape');
 const Path = require('path');
 const OpenAPI = require('../lib');
-const Hapi = require('hapi');
+const Hapi = require('@hapi/hapi');
 
 
 Test('form data', function (t) {

test/test-hapi-openapi.js

@@ -3,7 +3,7 @@
 const Test = require('tape');
 const Path = require('path');
 const OpenAPI = require('../lib');
-const Hapi = require('hapi');
+const Hapi = require('@hapi/hapi');
 
 Test('test plugin', function (t) {
 

test/test-validators.js

@@ -88,7 +88,7 @@ Test('validator special types', function(t) {
 
     const v = validator.makeAll(api.paths['/test/{foo*}'].get.parameters);
 
-    const keys = Object.keys(v.validate.params);
+    const keys = Object.keys(v.validate.params.describe().children);
 
     if (keys.length === 1 && keys[0] === 'foo') {
       return t.pass(`${keys.join(', ')} are valid.`);

test/test_xoptions.js

@@ -3,7 +3,7 @@
 const Test = require('tape');
 const Path = require('path');
 const OpenAPI = require('../lib');
-const Hapi = require('hapi');
+const Hapi = require('@hapi/hapi');
 
 
 Test('x-hapi-options', function (t) {