From b1daa2d2167b4b9e1be80fad8622c264706ddf02 Mon Sep 17 00:00:00 2001
From: alexandercerutti <cerutti.alexander@gmail.com>
Date: Mon, 23 Jul 2018 17:21:06 +0200
Subject: [PATCH] Converted certificates files names into paths; Removed dir
 property from the schema

---
 index.js  | 2 --
 schema.js | 2 --
 server.js | 7 +++----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/index.js b/index.js
index 8b96067..fab9d6e 100644
--- a/index.js
+++ b/index.js
@@ -446,13 +446,11 @@ class Pass {
 			}
 
 			this.model = path.resolve(options.model) + (!path.extname(options.model) ? ".pass" : "");
-			this.Certificates.dir = options.certificates.dir;
 
 			let certPaths = Object.keys(options.certificates)
 				.filter(v => v !== "dir")
 				.map((val) =>
 					path.resolve(
-						this.Certificates.dir,
 						typeof options.certificates[val] !== "object" ? options.certificates[val] : options.certificates[val]["keyFile"]
 					)
 				);
diff --git a/schema.js b/schema.js
index 792d1dd..19bc7b8 100644
--- a/schema.js
+++ b/schema.js
@@ -1,10 +1,8 @@
 const Joi = require("joi");
 
 let instance = Joi.object().keys({
-	// modelDir: Joi.string().required(),
 	model: Joi.string(),
 	certificates: Joi.object().keys({
-		dir: Joi.string().required(),
 		wwdr: Joi.string().required(),
 		signerCert: Joi.string().required(),
 		signerKey: Joi.object().keys({
diff --git a/server.js b/server.js
index 14fc55c..2a3484a 100644
--- a/server.js
+++ b/server.js
@@ -31,11 +31,10 @@ function manageRequest(request, response) {
 	let pass = new Passkit.Pass({
 		model: "./passModels/"+(request.params.modelName || request.query.modelName),
 		certificates: {
-			dir: "certificates/",
-			wwdr: "WWDR.pem",
-			signerCert: "passcertificate.pem",
+			wwdr: "./certificates/WWDR.pem",
+			signerCert: "./certificates/passcertificate.pem",
 			signerKey: {
-				keyFile: "passkey.pem",
+				keyFile: "./certificates/passkey.pem",
 				passphrase: "123456"
 			}
 		},