From 95240a91f7861fa8a05c8229e831c3511ccce2cc Mon Sep 17 00:00:00 2001
From: Alexander Cerutti <cerutti.alexander@gmail.com>
Date: Sun, 26 May 2019 20:03:25 +0200
Subject: [PATCH] Splitted certificates schema from instance one

---
 src/schema.ts | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/schema.ts b/src/schema.ts
index 4cf160f..b338ab3 100644
--- a/src/schema.ts
+++ b/src/schema.ts
@@ -34,16 +34,21 @@ export interface PassInstance {
 	shouldOverwrite?: boolean;
 }
 
-const instance = Joi.object().keys({
-	model: Joi.string().required(),
-	certificates: Joi.object().keys({
-		wwdr: Joi.string().required(),
-		signerCert: Joi.string().required(),
-		signerKey: Joi.object().keys({
+const certificatesSchema = Joi.object().keys({
+	wwdr: Joi.string().required(),
+	signerCert: Joi.string().required(),
+	signerKey: Joi.alternatives().try(
+		Joi.object().keys({
 			keyFile: Joi.string().required(),
 			passphrase: Joi.string().required(),
-		}).required()
-	}).required(),
+		}),
+		Joi.string()
+	).required()
+}).required();
+
+const instance = Joi.object().keys({
+	model: Joi.string().required(),
+	certificates: certificatesSchema,
 	overrides: Joi.object(),
 	shouldOverwrite: Joi.boolean()
 });
@@ -385,6 +390,7 @@ type Schemas = {
 };
 const schemas: Schemas = {
 	instance,
+	certificatesSchema,
 	barcode,
 	field,
 	passDict,