Fixed comments and links; Moved pass lower-level definition to index.js

This commit is contained in:
alexandercerutti
2018-10-10 11:42:21 +02:00
parent 188b35570c
commit d5ed22759f
2 changed files with 17 additions and 18 deletions

View File

@@ -1,8 +1,8 @@
const schema = require("./schema");
/**
* Pass fields area to be used as pass lower level keys
* @see https://apple.co/2wkUBd
* Class to represent lower-level keys pass fields
* @see https://apple.co/2wkUBdh
*/
class FieldsContainer {
@@ -17,7 +17,7 @@ class FieldsContainer {
*
* @method push
* @params {Object[]} fields - the fields to be checked and pushed
* @params {schema.constants.field} fields[].* - each key must be compliant with schema.constants.field structure
* @params {schema.field} fields[].* - each key must be compliant with schema.field structure
* @returns {Number} - the amount of pushed elements (for checks)
*/
@@ -68,7 +68,4 @@ class FieldsContainer {
}
}
module.exports = {
areas: ["primaryFields", "secondaryFields", "auxiliaryFields", "backFields", "headerFields"],
FieldsContainer
};
module.exports = FieldsContainer;

View File

@@ -9,8 +9,8 @@ const barcodeDebug = require("debug")("passkit:barcode");
const genericDebug = require("debug")("passkit:generic");
const schema = require("./schema");
const { areas: fieldsName, FieldsContainer } = require("./fields");
const errors = require("./messages");
const FieldsContainer = require("./fields");
const readdir = util.promisify(fs.readdir);
const readFile = util.promisify(fs.readFile);
@@ -24,7 +24,9 @@ class Pass {
this._props = {};
this.shouldOverwrite = !(this.options.hasOwnProperty("shouldOverwrite") && !this.options.shouldOverwrite);
fieldsName.forEach(a => this[a] = new FieldsContainer());
this._fields = ["primaryFields", "secondaryFields", "auxiliaryFields", "backFields", "headerFields"];
this._fields.forEach(a => this[a] = new FieldsContainer());
this._transitType = "";
}
@@ -227,7 +229,7 @@ class Pass {
}, this);
}
if (type === "beacons" || type === "locations") {
if (type === "beacons" || type === "locations") {
if (!(data instanceof Array)) {
data = [data];
}
@@ -553,7 +555,7 @@ class Pass {
}
}
fieldsName.forEach(area => {
this._fields.forEach(area => {
if (this[area].fields.length) {
if (this.shouldOverwrite) {
passFile[this.type][area] = this[area].fields;
@@ -652,7 +654,7 @@ class Pass {
function parsePEM(element, passphrase) {
if (element.includes("PRIVATE KEY") && passphrase) {
return forge.pki.decryptRsaPrivateKey(element, String(passphrase));
} else if (element.includes("CERTIFICATE")) {
} else if (element.includes("CERTIFICATE")) {
return forge.pki.certificateFromPem(element);
} else {
return null;