Schema: changed webServiceURL Regex and authenticationToken binding to this one

This commit is contained in:
Alexander Cerutti
2019-01-22 00:50:02 +01:00
parent 02a932ce7a
commit 14582ba9d0

View File

@@ -18,18 +18,16 @@ let instance = Joi.object().keys({
let supportedOptions = Joi.object().keys({ let supportedOptions = Joi.object().keys({
serialNumber: Joi.string(), serialNumber: Joi.string(),
userInfo: Joi.alternatives(Joi.object().unknown(), Joi.array()), 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.]+)?/), // parsing url as set of words and nums followed by dots, optional port and any possible path after
authenticationToken: Joi.string().token().min(16).when("webServiceURL", { webServiceURL: Joi.string().regex(/https?:\/\/(?:(?:[a-z0-9]+\.?)+(?::\d)?(?:\/[\S]+)*)*/),
is: Joi.exist(), authenticationToken: Joi.string().token().min(16),
then: Joi.required()
}),
sharingProhibited: Joi.boolean(), sharingProhibited: Joi.boolean(),
backgroundColor: Joi.string().min(10).max(16), backgroundColor: Joi.string().min(10).max(16),
foregroundColor: Joi.string().min(10).max(16), foregroundColor: Joi.string().min(10).max(16),
labelColor: Joi.string().min(10).max(16), labelColor: Joi.string().min(10).max(16),
groupingIdentifier: Joi.string(), groupingIdentifier: Joi.string(),
suppressStripShine: Joi.boolean() suppressStripShine: Joi.boolean()
}); }).with("webServiceURL", "authenticationToken");
let barcode = Joi.object().keys({ let barcode = Joi.object().keys({
altText: Joi.string(), altText: Joi.string(),