From f2383fee99a53ea93ebbd3966e7172f63d7ef30a Mon Sep 17 00:00:00 2001 From: Alexander Cerutti Date: Thu, 20 Jun 2019 00:30:23 +0200 Subject: [PATCH] Improved schema --- src/schema.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/schema.ts b/src/schema.ts index 30ca83f..009ae07 100644 --- a/src/schema.ts +++ b/src/schema.ts @@ -46,25 +46,24 @@ export interface PassInstance { // ************************************ // const certificatesSchema = Joi.object().keys({ - wwdr: Joi.string().required(), - signerCert: Joi.string().required(), + wwdr: Joi.alternatives(Joi.binary(), Joi.string()).required(), + signerCert: Joi.alternatives(Joi.binary(), Joi.string()).required(), signerKey: Joi.alternatives().try( Joi.object().keys({ - keyFile: Joi.string().required(), + keyFile: Joi.alternatives(Joi.binary(), Joi.string()).required(), passphrase: Joi.string().required(), }), - Joi.string() + Joi.alternatives(Joi.binary(), Joi.string()) ).required() }).required(); const instance = Joi.object().keys({ - model: Joi.string().required(), - certificates: certificatesSchema, + model: Joi.alternatives(Joi.object(), Joi.string()).required(), + certificates: Joi.object(), overrides: Joi.object(), - shouldOverwrite: Joi.boolean() }); -interface OverridesSupportedOptions { +export interface OverridesSupportedOptions { serialNumber?: string; description?: string; userInfo?: Object | Array;