Changed back _patch method to return a Promise

This commit is contained in:
alexandercerutti
2018-08-07 16:22:09 +02:00
parent bab73d7b62
commit 551dd8a8e0

View File

@@ -297,54 +297,55 @@ class Pass {
*/ */
_patch(options, passBuffer) { _patch(options, passBuffer) {
return new Promise((resolve, reject) => {
if (!options) { if (!options) {
return passBuffer; return resolve(passBuffer);
}
let passFile = JSON.parse(passBuffer.toString("utf8"));
// "barcodes" support got introduced in iOS 9 as array of barcode.
// "barcode" is still used in older iOS versions
if (passFile["barcode"]) {
let barcode = passFile["barcode"];
if (!(barcode instanceof Object) || !schema.isValid(barcode, schema.constants.barcode) || !options.barcode && barcode.message === "") {
console.log("\x1b[41m", `Barcode syntax of the chosen model (${path.parse(this.model).base}) is not correct or the override content was not provided got removed. Please refer to https://apple.co/2myAbst.`, "\x1b[0m");
delete passFile["barcode"];
} else {
// options.barcode may not be defined
passFile["barcode"].message = options.barcode || passFile["barcode"].message;
}
} else {
console.log("\x1b[33m", `Your pass model (${path.parse(this.model).base}) is not compatible with iOS versions lower than iOS 9. Please refer to https://apple.co/2O5K65k to make it backward-compatible.`, "\x1b[0m");
}
if (passFile["barcodes"] && passFile["barcodes"] instanceof Array) {
if (!passFile["barcodes"].length) {
console.log("\x1b[33m", `No barcodes support specified. The element got removed.`, "\x1b[0m");
delete passFile["barcodes"];
} }
passFile["barcodes"].forEach((b,i) => { let passFile = JSON.parse(passBuffer.toString("utf8"));
if (!schema.isValid(b, schema.constants.barcode) && !!options.barcode && b.message !== "") {
passFile["barcodes"].splice(i, 1); // "barcodes" support got introduced in iOS 9 as array of barcode.
console.log("\x1b[41m", `Barcode @ index ${i} of the chosen model (${path.parse(this.model).base}) is not well-formed or have syntax errors and got removed. Please refer to https://apple.co/2myAbst.`, "\x1b[0m"); // "barcode" is still used in older iOS versions
if (passFile["barcode"]) {
let barcode = passFile["barcode"];
if (!(barcode instanceof Object) || !schema.isValid(barcode, schema.constants.barcode) || !options.barcode && barcode.message === "") {
console.log("\x1b[41m", `Barcode syntax of the chosen model (${path.parse(this.model).base}) is not correct and got removed or the override content was not provided. Please refer to https://apple.co/2myAbst.`, "\x1b[0m");
delete passFile["barcode"];
} else { } else {
// options.barcode may not be defined // options.barcode may not be defined
b.message = options.barcode || b.message; passFile["barcode"].message = options.barcode || passFile["barcode"].message;
} }
}); } else {
} else { console.log("\x1b[33m", `Your pass model (${path.parse(this.model).base}) is not compatible with iOS versions lower than iOS 9. Please refer to https://apple.co/2O5K65k to make it backward-compatible.`, "\x1b[0m");
console.log("\x1b[33m", `Your pass model (${path.parse(this.model).base}) is not compatible with iOS versions greater than iOS 8. Refer to https://apple.co/2O5K65k to make it forward-compatible.`, "\x1b[0m"); }
}
delete options["barcode"]; if (passFile["barcodes"] && passFile["barcodes"] instanceof Array) {
if (!passFile["barcodes"].length) {
console.log("\x1b[33m", `No barcodes support specified. The element got removed.`, "\x1b[0m");
delete passFile["barcodes"];
}
Object.assign(passFile, options); passFile["barcodes"].forEach((b,i) => {
if (!schema.isValid(b, schema.constants.barcode) && !!options.barcode && b.message !== "") {
passFile["barcodes"].splice(i, 1);
console.log("\x1b[41m", `Barcode @ index ${i} of the chosen model (${path.parse(this.model).base}) is not well-formed or have syntax errors and got removed. Please refer to https://apple.co/2myAbst.`, "\x1b[0m");
} else {
// options.barcode may not be defined
b.message = options.barcode || b.message;
}
});
} else {
console.log("\x1b[33m", `Your pass model (${path.parse(this.model).base}) is not compatible with iOS versions greater than iOS 8. Refer to https://apple.co/2O5K65k to make it forward-compatible.`, "\x1b[0m");
}
return Buffer.from(JSON.stringify(passFile)); delete options["barcode"];
Object.assign(passFile, options);
return resolve(Buffer.from(JSON.stringify(passFile)));
});
} }
/** /**