From 770c28d23eaa5928f58b7147c2384e579948c109 Mon Sep 17 00:00:00 2001 From: Lloyd Benson Date: Mon, 3 Aug 2020 10:56:52 -0500 Subject: [PATCH] upgrade to use the latest lab and joi to validate --- lib/index.js | 26 +++++++++++++------------- package.json | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/index.js b/lib/index.js index 567fb30..b17a29f 100755 --- a/lib/index.js +++ b/lib/index.js @@ -5,7 +5,7 @@ const Stream = require('stream'); const Boom = require('@hapi/boom'); const Cryptiles = require('@hapi/cryptiles'); const Hoek = require('@hapi/hoek'); -const Joi = require('@hapi/joi'); +const Validate = require('@hapi/validate'); const internals = { @@ -13,17 +13,17 @@ const internals = { }; -internals.schema = Joi.object().keys({ - key: Joi.string().optional(), - size: Joi.number().optional(), - autoGenerate: Joi.boolean().optional(), - addToViewContext: Joi.boolean().optional(), - cookieOptions: Joi.object().keys(null), - headerName: Joi.string().optional(), - restful: Joi.boolean().optional(), - skip: Joi.func().optional(), - enforce: Joi.boolean().optional(), - logUnauthorized: Joi.boolean().optional() +internals.schema = Validate.object().keys({ + key: Validate.string().optional(), + size: Validate.number().optional(), + autoGenerate: Validate.boolean().optional(), + addToViewContext: Validate.boolean().optional(), + cookieOptions: Validate.object().keys(null), + headerName: Validate.string().optional(), + restful: Validate.boolean().optional(), + skip: Validate.func().optional(), + enforce: Validate.boolean().optional(), + logUnauthorized: Validate.boolean().optional() }); @@ -51,7 +51,7 @@ exports.plugin = { register: function (server, options) { - Joi.assert(options, internals.schema); + Validate.assert(options, internals.schema); const settings = Hoek.applyToDefaults(internals.defaults, options); diff --git a/package.json b/package.json index 9f68245..0543058 100755 --- a/package.json +++ b/package.json @@ -18,12 +18,12 @@ "@hapi/boom": "9.x.x", "@hapi/cryptiles": "5.x.x", "@hapi/hoek": "9.x.x", - "@hapi/joi": "17.x.x" + "@hapi/validate": "1.x.x" }, "devDependencies": { "@hapi/code": "8.x.x", "@hapi/hapi": "19.x.x", - "@hapi/lab": "22.x.x", + "@hapi/lab": "23.x.x", "@hapi/vision": "6.x.x", "handlebars": "4.x.x" },