Improved schema

This commit is contained in:
Alexander Cerutti
2019-06-20 00:30:23 +02:00
parent 894266de28
commit f2383fee99

View File

@@ -46,25 +46,24 @@ export interface PassInstance {
// ************************************ // // ************************************ //
const certificatesSchema = Joi.object().keys({ const certificatesSchema = Joi.object().keys({
wwdr: Joi.string().required(), wwdr: Joi.alternatives(Joi.binary(), Joi.string()).required(),
signerCert: Joi.string().required(), signerCert: Joi.alternatives(Joi.binary(), Joi.string()).required(),
signerKey: Joi.alternatives().try( signerKey: Joi.alternatives().try(
Joi.object().keys({ Joi.object().keys({
keyFile: Joi.string().required(), keyFile: Joi.alternatives(Joi.binary(), Joi.string()).required(),
passphrase: Joi.string().required(), passphrase: Joi.string().required(),
}), }),
Joi.string() Joi.alternatives(Joi.binary(), Joi.string())
).required() ).required()
}).required(); }).required();
const instance = Joi.object().keys({ const instance = Joi.object().keys({
model: Joi.string().required(), model: Joi.alternatives(Joi.object(), Joi.string()).required(),
certificates: certificatesSchema, certificates: Joi.object(),
overrides: Joi.object(), overrides: Joi.object(),
shouldOverwrite: Joi.boolean()
}); });
interface OverridesSupportedOptions { export interface OverridesSupportedOptions {
serialNumber?: string; serialNumber?: string;
description?: string; description?: string;
userInfo?: Object | Array<any>; userInfo?: Object | Array<any>;