marcogll/passkit-generator
1
0
Fork 0
mirror of https://github.com/marcogll/passkit-generator.git synced 2026-03-15 16:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed _validateType to validate also the schema;

Browse Source 
Edited schemas to comply with boardingPass requirements and the others pass types
This commit is contained in:
alexandercerutti
2018-07-25 17:05:23 +02:00
parent 1c68623596
commit ea8baec2b5
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
index.js
View File

@@ -208,8 +208,14 @@ class Pass {
_validateType(passBuffer) {
try {
let passFile = JSON.parse(passBuffer.toString("utf8"));
let index = this.passTypes.findIndex(passType => passFile.hasOwnProperty(passType));
return this.passTypes.some(passType => passFile.hasOwnProperty(passType));
if (index == -1) {
return false;
}
let type = this.passTypes[index];
return schema.isValid(passFile[type], schema.constants[(type === "boardingPass" ? "boarding" : "basic") + "Structure"]);
} catch (e) {
return false;
}

24
schema.js
View File

@@ -28,26 +28,36 @@ let field = Joi.object().keys({
textAlignment: Joi.string().regex(/(PKTextAlignmentLeft|PKTextAlignmentCenter|PKTextAlignmentRight|PKTextAlignmentNatural)/, "graphic-alignment"),
key: Joi.string().required(),
value: Joi.string().required()
})
});
let structure = Joi.object().keys({
let struct = {
auxiliaryFields: Joi.array().items(field),
backFields: Joi.array().items(field),
headerFields: Joi.array().items(field),
primaryFields: Joi.array().items(field),
secondaryFields: Joi.array().items(field),
transitType: Joi.string().regex(/(PKTransitTypeAir|PKTransitTypeBoat|PKTransitTypeBus|PKTransitTypeGeneric|PKTransitTypeTrain)/)
});
secondaryFields: Joi.array().items(field)
};
let basicStructure = Joi.object().keys(struct);
let boardingStructure = Joi.object().keys(Object.assign({
transitType: Joi.string().regex(/(PKTransitTypeAir|PKTransitTypeBoat|PKTransitTypeBus|PKTransitTypeGeneric|PKTransitTypeTrain)/).required()
}, struct));
module.exports = {
constants: {
instance,
barcode,
field,
structure
basicStructure,
boardingStructure
},
isValid: (opts, schemaName) => {
isValid: (opts, schemaName, debug = false) => {
let validation = Joi.validate(opts, schemaName);
if (debug) {
console.log(validation)
}
return !validation.error;
}
};