Added path resolution in examples

This commit is contained in:
Alexander Cerutti
2021-02-09 14:14:52 +01:00
parent a3719f8eef
commit 9de5b3a0c4
7 changed files with 82 additions and 31 deletions

View File

@@ -4,17 +4,24 @@ import {
createAbstractModel,
AbstractModel,
} from "passkit-generator";
import path from "path";
let abstractModel: AbstractModel;
(async () => {
abstractModel = await createAbstractModel({
model: `./models/exampleBooking.pass`,
model: path.resolve(__dirname, `../models/exampleBooking.pass`),
certificates: {
wwdr: "../certificates/WWDR.pem",
signerCert: "../certificates/signerCert.pem",
wwdr: path.resolve(__dirname, "../../certificates/WWDR.pem"),
signerCert: path.resolve(
__dirname,
"../../certificates/signerCert.pem",
),
signerKey: {
keyFile: "../certificates/signerKey.pem",
keyFile: path.resolve(
__dirname,
"../../certificates/signerKey.pem",
),
passphrase: "123456",
},
},

View File

@@ -9,6 +9,7 @@
import app from "./webserver";
import fetch from "node-fetch";
import { createPass } from "passkit-generator";
import path from "path";
app.all(async function manageRequest(request, response) {
let passName =
@@ -21,12 +22,18 @@ app.all(async function manageRequest(request, response) {
).then((res) => res.buffer());
const passConfig = {
model: `./models/${request.params.modelName}`,
model: path.resolve(__dirname, `../models/${request.params.modelName}`),
certificates: {
wwdr: "../certificates/WWDR.pem",
signerCert: "../certificates/signerCert.pem",
wwdr: path.resolve(__dirname, "../../certificates/WWDR.pem"),
signerCert: path.resolve(
__dirname,
"../../certificates/signerCert.pem",
),
signerKey: {
keyFile: "../certificates/signerKey.pem",
keyFile: path.resolve(
__dirname,
"../../certificates/signerKey.pem",
),
passphrase: "123456",
},
},

View File

@@ -10,6 +10,7 @@
import app from "./webserver";
import { createPass } from "passkit-generator";
import path from "path";
app.all(async function manageRequest(request, response) {
const passName =
@@ -19,12 +20,21 @@ app.all(async function manageRequest(request, response) {
try {
const pass = await createPass({
model: `./models/${request.params.modelName}`,
model: path.resolve(
__dirname,
`../models/${request.params.modelName}`,
),
certificates: {
wwdr: "../certificates/WWDR.pem",
signerCert: "../certificates/signerCert.pem",
wwdr: path.resolve(__dirname, "../../certificates/WWDR.pem"),
signerCert: path.resolve(
__dirname,
"../../certificates/signerCert.pem",
),
signerKey: {
keyFile: "../certificates/signerKey.pem",
keyFile: path.resolve(
__dirname,
"../../certificates/signerKey.pem",
),
passphrase: "123456",
},
},

View File

@@ -10,6 +10,7 @@
import app from "./webserver";
import { createPass } from "passkit-generator";
import path from "path";
app.all(async function manageRequest(request, response) {
if (!request.query.fn) {
@@ -26,12 +27,21 @@ app.all(async function manageRequest(request, response) {
try {
let pass = await createPass({
model: `./models/${request.params.modelName}`,
model: path.resolve(
__dirname,
`../models/${request.params.modelName}`,
),
certificates: {
wwdr: "../certificates/WWDR.pem",
signerCert: "../certificates/signerCert.pem",
wwdr: path.resolve(__dirname, "../../certificates/WWDR.pem"),
signerCert: path.resolve(
__dirname,
"../../certificates/signerCert.pem",
),
signerKey: {
keyFile: "../certificates/signerKey.pem",
keyFile: path.resolve(
__dirname,
"../../certificates/signerKey.pem",
),
passphrase: "123456",
},
},

View File

@@ -11,6 +11,7 @@
import app from "./webserver";
import { createPass } from "passkit-generator";
import path from "path";
app.all(async function manageRequest(request, response) {
let passName =
@@ -19,12 +20,18 @@ app.all(async function manageRequest(request, response) {
new Date().toISOString().split("T")[0].replace(/-/gi, "");
try {
let pass = await createPass({
model: `./models/exampleBooking`,
model: path.resolve(__dirname, "../models/exampleBooking"),
certificates: {
wwdr: "../certificates/WWDR.pem",
signerCert: "../certificates/signerCert.pem",
wwdr: path.resolve(__dirname, "../../certificates/WWDR.pem"),
signerCert: path.resolve(
__dirname,
"../../certificates/signerCert.pem",
),
signerKey: {
keyFile: "../certificates/signerKey.pem",
keyFile: path.resolve(
__dirname,
"../../certificates/signerKey.pem",
),
passphrase: "123456",
},
},

View File

@@ -6,6 +6,7 @@
import app from "./webserver";
import { createPass } from "passkit-generator";
import path from "path";
app.all(async function manageRequest(request, response) {
const passName =
@@ -15,12 +16,21 @@ app.all(async function manageRequest(request, response) {
try {
const pass = await createPass({
model: `./models/${request.params.modelName}`,
model: path.resolve(
__dirname,
`../models/${request.params.modelName}`,
),
certificates: {
wwdr: "../certificates/WWDR.pem",
signerCert: "../certificates/signerCert.pem",
wwdr: path.resolve(__dirname, "../../certificates/WWDR.pem"),
signerCert: path.resolve(
__dirname,
"../../certificates/signerCert.pem",
),
signerKey: {
keyFile: "../certificates/signerKey.pem",
keyFile: path.resolve(
__dirname,
"../../certificates/signerKey.pem",
),
passphrase: "123456",
},
},
@@ -57,7 +67,7 @@ app.all(async function manageRequest(request, response) {
// @ts-ignore - ignoring for logging purposes. Do not replicate
console.log(
"Added languages",
Object.keys(pass.l10nTranslations).join(", "),
Object.keys(pass["l10nTranslations"]).join(", "),
);
const stream = pass.generate();

View File

@@ -18,9 +18,9 @@
}
},
"@sideway/address": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.0.tgz",
"integrity": "sha512-wAH/JYRXeIFQRsxerIuLjgUu2Xszam+O5xKeatJ4oudShOOirfmsQ1D6LL54XOU2tizpCYku+s1wmU0SYdpoSA==",
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.1.tgz",
"integrity": "sha512-+I5aaQr3m0OAmMr7RQ3fR9zx55sejEYR2BFJaxL+zT3VM2611X0SHvPWIbAUBZVTn/YzYKbV8gJ2oT/QELknfQ==",
"requires": {
"@hapi/hoek": "^9.0.0"
}
@@ -306,9 +306,9 @@
"integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
},
"joi": {
"version": "17.3.0",
"resolved": "https://registry.npmjs.org/joi/-/joi-17.3.0.tgz",
"integrity": "sha512-Qh5gdU6niuYbUIUV5ejbsMiiFmBdw8Kcp8Buj2JntszCkCfxJ9Cz76OtHxOZMPXrt5810iDIXs+n1nNVoquHgg==",
"version": "17.4.0",
"resolved": "https://registry.npmjs.org/joi/-/joi-17.4.0.tgz",
"integrity": "sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg==",
"requires": {
"@hapi/hoek": "^9.0.0",
"@hapi/topo": "^5.0.0",