From 04c379f9dd5445b809a8850b0892a26eada82e8a Mon Sep 17 00:00:00 2001 From: alexandercerutti Date: Tue, 28 Aug 2018 15:06:10 +0200 Subject: [PATCH] Changed way to set authenticationToken as required when webServiceURL is provided --- schema.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/schema.js b/schema.js index 7eb05c5..0808d1f 100644 --- a/schema.js +++ b/schema.js @@ -19,10 +19,9 @@ let supportedOptions = Joi.object().keys({ serialNumber: Joi.string(), userInfo: Joi.alternatives(Joi.object().unknown(), Joi.array()), webServiceURL: Joi.string().regex(/^https?:\/\/(?:[a-z0-9]+\.[a-z0-9]+\.[a-z]+(?:\.[a-z]+)?|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\/?(?:[a-z\/_%0-9A-Z.]+)?/), - authenticationToken: Joi.when("webServiceURL", { + authenticationToken: Joi.string().token().min(16).when("webServiceURL", { is: Joi.exist(), - then: Joi.string().token().min(16).required(), - otherwise: Joi.string().token().min(16) + then: Joi.required() }), backgroundColor: Joi.string().min(10).max(16), foregroundColor: Joi.string().min(10).max(16),