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

Removed basicStructure and boardingStructure in schema for passDict with common fields and transitType

Browse Source
This commit is contained in:
alexandercerutti
2018-08-26 12:16:51 +02:00
parent 4ea50c5d95
commit a874171e2c
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
index.js
View File

@@ -423,7 +423,7 @@ class Pass {
let type = passTypes[index]; let type = passTypes[index];
this.type = type; this.type = type;
return schema.isValid(passFile[type], schema.constants[(type === "boardingPass" ? "boarding" : "basic") + "Structure"]); return schema.isValid(passFile[type], schema.constants.passDict);
} catch (e) { } catch (e) {
return false; return false;
} }

12
schema.js
View File

@@ -45,26 +45,22 @@ let locationsDict = Joi.object().keys({
relevantText: Joi.string() relevantText: Joi.string()
}); });
let struct = { let passDict = Joi.object().keys({
auxiliaryFields: Joi.array().items(field), auxiliaryFields: Joi.array().items(field),
backFields: Joi.array().items(field), backFields: Joi.array().items(field),
headerFields: Joi.array().items(field), headerFields: Joi.array().items(field),
primaryFields: Joi.array().items(field), primaryFields: Joi.array().items(field),
secondaryFields: Joi.array().items(field) secondaryFields: Joi.array().items(field)
}; });
let basicStructure = Joi.object().keys(struct); let transitType = Joi.string().regex(/(PKTransitTypeAir|PKTransitTypeBoat|PKTransitTypeBus|PKTransitTypeGeneric|PKTransitTypeTrain)/);
let boardingStructure = Joi.object().keys(Object.assign({
transitType: Joi.string().regex(/(PKTransitTypeAir|PKTransitTypeBoat|PKTransitTypeBus|PKTransitTypeGeneric|PKTransitTypeTrain)/).required()
}, struct));
module.exports = { module.exports = {
constants: { constants: {
instance, instance,
barcode, barcode,
field, field,
basicStructure, passDict,
boardingStructure,
beaconsDict, beaconsDict,
locationsDict, locationsDict,
transitType transitType