Converted certificates files names into paths; Removed dir property from the schema

This commit is contained in:
alexandercerutti
2018-07-23 17:21:06 +02:00
parent ad55d3aeba
commit b1daa2d216
3 changed files with 3 additions and 8 deletions

View File

@@ -446,13 +446,11 @@ class Pass {
} }
this.model = path.resolve(options.model) + (!path.extname(options.model) ? ".pass" : ""); this.model = path.resolve(options.model) + (!path.extname(options.model) ? ".pass" : "");
this.Certificates.dir = options.certificates.dir;
let certPaths = Object.keys(options.certificates) let certPaths = Object.keys(options.certificates)
.filter(v => v !== "dir") .filter(v => v !== "dir")
.map((val) => .map((val) =>
path.resolve( path.resolve(
this.Certificates.dir,
typeof options.certificates[val] !== "object" ? options.certificates[val] : options.certificates[val]["keyFile"] typeof options.certificates[val] !== "object" ? options.certificates[val] : options.certificates[val]["keyFile"]
) )
); );

View File

@@ -1,10 +1,8 @@
const Joi = require("joi"); const Joi = require("joi");
let instance = Joi.object().keys({ let instance = Joi.object().keys({
// modelDir: Joi.string().required(),
model: Joi.string(), model: Joi.string(),
certificates: Joi.object().keys({ certificates: Joi.object().keys({
dir: Joi.string().required(),
wwdr: Joi.string().required(), wwdr: Joi.string().required(),
signerCert: Joi.string().required(), signerCert: Joi.string().required(),
signerKey: Joi.object().keys({ signerKey: Joi.object().keys({

View File

@@ -31,11 +31,10 @@ function manageRequest(request, response) {
let pass = new Passkit.Pass({ let pass = new Passkit.Pass({
model: "./passModels/"+(request.params.modelName || request.query.modelName), model: "./passModels/"+(request.params.modelName || request.query.modelName),
certificates: { certificates: {
dir: "certificates/", wwdr: "./certificates/WWDR.pem",
wwdr: "WWDR.pem", signerCert: "./certificates/passcertificate.pem",
signerCert: "passcertificate.pem",
signerKey: { signerKey: {
keyFile: "passkey.pem", keyFile: "./certificates/passkey.pem",
passphrase: "123456" passphrase: "123456"
} }
}, },