@unchainedshop/ticketing 4.0.0-rc.16 → 4.0.0-rc.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/fastify.js +2 -2
- package/lib/fastify.js.map +1 -1
- package/lib/magic-key.js +4 -4
- package/lib/magic-key.js.map +1 -1
- package/lib/mobile-tickets/apple-handler-express.d.ts.map +1 -1
- package/lib/mobile-tickets/apple-handler-express.js +48 -28
- package/lib/mobile-tickets/apple-handler-express.js.map +1 -1
- package/lib/mobile-tickets/apple-handler-fastify.d.ts.map +1 -1
- package/lib/mobile-tickets/apple-handler-fastify.js +55 -37
- package/lib/mobile-tickets/apple-handler-fastify.js.map +1 -1
- package/lib/mobile-tickets/apple-wallet.d.ts +1 -1
- package/lib/mobile-tickets/apple-wallet.d.ts.map +1 -1
- package/lib/mobile-tickets/apple-wallet.js +2 -2
- package/lib/mobile-tickets/apple-wallet.js.map +1 -1
- package/lib/mobile-tickets/apple-webservice.d.ts +7 -0
- package/lib/mobile-tickets/apple-webservice.d.ts.map +1 -0
- package/lib/mobile-tickets/apple-webservice.js +177 -0
- package/lib/mobile-tickets/apple-webservice.js.map +1 -0
- package/lib/mobile-tickets/google-handler-express.d.ts.map +1 -1
- package/lib/mobile-tickets/google-handler-express.js +4 -1
- package/lib/mobile-tickets/google-handler-express.js.map +1 -1
- package/lib/mobile-tickets/google-handler-fastify.d.ts.map +1 -1
- package/lib/mobile-tickets/google-handler-fastify.js +4 -1
- package/lib/mobile-tickets/google-handler-fastify.js.map +1 -1
- package/lib/mobile-tickets/google-webservice.d.ts +7 -0
- package/lib/mobile-tickets/google-webservice.d.ts.map +1 -0
- package/lib/mobile-tickets/google-webservice.js +52 -0
- package/lib/mobile-tickets/google-webservice.js.map +1 -0
- package/lib/module.d.ts +8 -8
- package/lib/module.d.ts.map +1 -1
- package/lib/module.js +2 -2
- package/lib/module.js.map +1 -1
- package/lib/pdf-tickets/print-webservice.d.ts +7 -0
- package/lib/pdf-tickets/print-webservice.d.ts.map +1 -0
- package/lib/pdf-tickets/print-webservice.js +31 -0
- package/lib/pdf-tickets/print-webservice.js.map +1 -0
- package/lib/template-registry.d.ts +2 -2
- package/lib/template-registry.d.ts.map +1 -1
- package/package.json +9 -9
- package/readme.md +1 -1
- package/src/fastify.ts +2 -2
- package/src/magic-key.ts +4 -4
- package/src/mobile-tickets/apple-handler-express.ts +56 -33
- package/src/mobile-tickets/apple-handler-fastify.ts +63 -42
- package/src/mobile-tickets/apple-wallet.ts +2 -2
- package/src/mobile-tickets/google-handler-express.ts +5 -1
- package/src/mobile-tickets/google-handler-fastify.ts +6 -1
- package/src/module.ts +3 -3
- package/src/template-registry.ts +2 -2
- package/tsconfig.json +2 -1
package/lib/fastify.js
CHANGED
|
@@ -10,12 +10,12 @@ export default (app) => {
|
|
|
10
10
|
});
|
|
11
11
|
app.route({
|
|
12
12
|
url: `${GOOGLE_WALLET_WEBSERVICE_PATH}/*`,
|
|
13
|
-
method: '
|
|
13
|
+
method: 'GET',
|
|
14
14
|
handler: googleWalletHandler,
|
|
15
15
|
});
|
|
16
16
|
app.route({
|
|
17
17
|
url: `${UNCHAINED_PDF_PRINT_HANDLER_PATH}/*`,
|
|
18
|
-
method: '
|
|
18
|
+
method: 'GET',
|
|
19
19
|
handler: printTicketsHandler,
|
|
20
20
|
});
|
|
21
21
|
};
|
package/lib/fastify.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fastify.js","sourceRoot":"","sources":["../src/fastify.ts"],"names":[],"mappings":"AACA,OAAO,kBAAkB,MAAM,2CAA2C,CAAC;AAC3E,OAAO,mBAAmB,MAAM,4CAA4C,CAAC;AAC7E,OAAO,mBAAmB,MAAM,wCAAwC,CAAC;AAEzE,eAAe,CAAC,GAAoB,EAAE,EAAE;IACtC,MAAM,EACJ,4BAA4B,GAAG,oBAAoB,EACnD,6BAA6B,GAAG,qBAAqB,EACrD,gCAAgC,GAAG,qBAAqB,GACzD,GAAG,OAAO,CAAC,GAAG,CAAC;IAEhB,GAAG,CAAC,KAAK,CAAC;QACR,GAAG,EAAE,GAAG,4BAA4B,GAAG;QACvC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC;QACjC,OAAO,EAAE,kBAAkB;KAC5B,CAAC,CAAC;IAEH,GAAG,CAAC,KAAK,CAAC;QACR,GAAG,EAAE,GAAG,6BAA6B,IAAI;QACzC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"fastify.js","sourceRoot":"","sources":["../src/fastify.ts"],"names":[],"mappings":"AACA,OAAO,kBAAkB,MAAM,2CAA2C,CAAC;AAC3E,OAAO,mBAAmB,MAAM,4CAA4C,CAAC;AAC7E,OAAO,mBAAmB,MAAM,wCAAwC,CAAC;AAEzE,eAAe,CAAC,GAAoB,EAAE,EAAE;IACtC,MAAM,EACJ,4BAA4B,GAAG,oBAAoB,EACnD,6BAA6B,GAAG,qBAAqB,EACrD,gCAAgC,GAAG,qBAAqB,GACzD,GAAG,OAAO,CAAC,GAAG,CAAC;IAEhB,GAAG,CAAC,KAAK,CAAC;QACR,GAAG,EAAE,GAAG,4BAA4B,GAAG;QACvC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC;QACjC,OAAO,EAAE,kBAAkB;KAC5B,CAAC,CAAC;IAEH,GAAG,CAAC,KAAK,CAAC;QACR,GAAG,EAAE,GAAG,6BAA6B,IAAI;QACzC,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,mBAAmB;KAC7B,CAAC,CAAC;IAEH,GAAG,CAAC,KAAK,CAAC;QACR,GAAG,EAAE,GAAG,gCAAgC,IAAI;QAC5C,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,mBAAmB;KAC7B,CAAC,CAAC;AACL,CAAC,CAAC"}
|
package/lib/magic-key.js
CHANGED
|
@@ -8,7 +8,7 @@ const isMagicKeyValidForOrder = async (obj, { orderId }, { modules, getHeader })
|
|
|
8
8
|
return magicKey === getHeader('x-magic-key');
|
|
9
9
|
};
|
|
10
10
|
const isMagicKeyValidForToken = async (root, params, { modules, getHeader }) => {
|
|
11
|
-
const tokenId = params?.tokenId || (root && '
|
|
11
|
+
const tokenId = params?.tokenId || (root && 'tokenSerialNumber' in root && root._id) || null;
|
|
12
12
|
const token = await modules.warehousing.findToken({ tokenId });
|
|
13
13
|
// always return true if tokenId leads to nothing to show potentially allowed actions
|
|
14
14
|
if (!token)
|
|
@@ -23,8 +23,8 @@ const isMagicKeyValidForToken = async (root, params, { modules, getHeader }) =>
|
|
|
23
23
|
return magicKey === getHeader('x-magic-key');
|
|
24
24
|
};
|
|
25
25
|
export default () => {
|
|
26
|
-
roles.allRoles
|
|
27
|
-
roles.allRoles
|
|
28
|
-
roles.allRoles
|
|
26
|
+
roles.allRoles?.ALL?.allow(roles.actions.viewOrder, isMagicKeyValidForOrder);
|
|
27
|
+
roles.allRoles?.ALL?.allow(roles.actions.viewToken, isMagicKeyValidForToken);
|
|
28
|
+
roles.allRoles?.ALL?.allow(roles.actions.updateToken, isMagicKeyValidForToken);
|
|
29
29
|
};
|
|
30
30
|
//# sourceMappingURL=magic-key.js.map
|
package/lib/magic-key.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"magic-key.js","sourceRoot":"","sources":["../src/magic-key.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAG3C,MAAM,uBAAuB,GAAG,KAAK,EACnC,GAAQ,EACR,EAAE,OAAO,EAAuB,EAChC,EAAE,OAAO,EAAE,SAAS,EAA0B,EAC9C,EAAE;IACF,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1D,qFAAqF;IACrF,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAExB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/D,OAAO,QAAQ,KAAK,SAAS,CAAC,aAAa,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,KAAK,EACnC,IAAS,EACT,MAAkC,EAClC,EAAE,OAAO,EAAE,SAAS,EAA0B,EAC9C,EAAE;IACF,MAAM,OAAO,GAAG,MAAM,EAAE,OAAO,IAAI,CAAC,IAAI,IAAI,
|
|
1
|
+
{"version":3,"file":"magic-key.js","sourceRoot":"","sources":["../src/magic-key.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAG3C,MAAM,uBAAuB,GAAG,KAAK,EACnC,GAAQ,EACR,EAAE,OAAO,EAAuB,EAChC,EAAE,OAAO,EAAE,SAAS,EAA0B,EAC9C,EAAE;IACF,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1D,qFAAqF;IACrF,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAExB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/D,OAAO,QAAQ,KAAK,SAAS,CAAC,aAAa,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,KAAK,EACnC,IAAS,EACT,MAAkC,EAClC,EAAE,OAAO,EAAE,SAAS,EAA0B,EAC9C,EAAE;IACF,MAAM,OAAO,GAAG,MAAM,EAAE,OAAO,IAAI,CAAC,IAAI,IAAI,mBAAmB,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC;IAE7F,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/D,qFAAqF;IACrF,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAExB,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAC9E,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IAEzB,6FAA6F;IAC7F,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAEhD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/D,OAAO,QAAQ,KAAK,SAAS,CAAC,aAAa,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,eAAe,GAAG,EAAE;IAClB,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC;IAC7E,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC;IAC7E,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;AACjF,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apple-handler-express.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/apple-handler-express.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAU3C,QAAA,MAAM,kBAAkB,GAAU,KAAK,OAAO,GAAG;IAAE,gBAAgB,EAAE,YAAY,CAAA;CAAE,EAAE,KAAK,QAAQ,
|
|
1
|
+
{"version":3,"file":"apple-handler-express.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/apple-handler-express.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAU3C,QAAA,MAAM,kBAAkB,GAAU,KAAK,OAAO,GAAG;IAAE,gBAAgB,EAAE,YAAY,CAAA;CAAE,EAAE,KAAK,QAAQ,kBA8NjG,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
|
|
@@ -26,7 +26,7 @@ const appleWalletHandler = async (req, res) => {
|
|
|
26
26
|
}
|
|
27
27
|
const { hash } = req.query;
|
|
28
28
|
const correctHash = await modules.warehousing.buildAccessKeyForToken(tokenId);
|
|
29
|
-
if (hash !== correctHash) {
|
|
29
|
+
if (!hash || hash !== correctHash) {
|
|
30
30
|
res.status(403).send('Token hash invalid for current owner');
|
|
31
31
|
return;
|
|
32
32
|
}
|
|
@@ -34,6 +34,15 @@ const appleWalletHandler = async (req, res) => {
|
|
|
34
34
|
const fileUploadAdapter = getFileAdapter();
|
|
35
35
|
const signedUrl = await fileUploadAdapter.createDownloadURL(passFile);
|
|
36
36
|
const url = signedUrl && (await modules.files.normalizeUrl(signedUrl, {}));
|
|
37
|
+
if (!url) {
|
|
38
|
+
res.status(500);
|
|
39
|
+
res.send({
|
|
40
|
+
success: false,
|
|
41
|
+
message: 'Could not create download URL',
|
|
42
|
+
name: 'URL_SIGNING_FAILED',
|
|
43
|
+
});
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
37
46
|
const response = await fetch(url);
|
|
38
47
|
const data = await response.arrayBuffer();
|
|
39
48
|
const uint8View = new Uint8Array(data);
|
|
@@ -57,7 +66,7 @@ const appleWalletHandler = async (req, res) => {
|
|
|
57
66
|
const { pushToken } = req.body;
|
|
58
67
|
const pass = await modules.passes.findAppleWalletPass(passTypeIdentifier, serialNumber);
|
|
59
68
|
if (pass) {
|
|
60
|
-
if (!isAuthenticationTokenCorrect(req, pass.meta
|
|
69
|
+
if (!isAuthenticationTokenCorrect(req, pass.meta?.rawData?._id || pass.meta?.rawData?.tokenId)) {
|
|
61
70
|
res.status(401).end();
|
|
62
71
|
return;
|
|
63
72
|
}
|
|
@@ -79,7 +88,7 @@ const appleWalletHandler = async (req, res) => {
|
|
|
79
88
|
const [deviceLibraryIdentifier, , passTypeIdentifier] = pathComponents;
|
|
80
89
|
const passesUpdatedSince = req.query?.passesUpdatedSince && new Date(req.query.passesUpdatedSince);
|
|
81
90
|
const passes = await modules.passes.findUpdatedAppleWalletPasses(passTypeIdentifier, deviceLibraryIdentifier, passesUpdatedSince);
|
|
82
|
-
const serialNumbers = passes.map((t) => t.meta
|
|
91
|
+
const serialNumbers = passes.map((t) => t.meta?.serialNumber).filter(Boolean);
|
|
83
92
|
if (serialNumbers?.length) {
|
|
84
93
|
res.status(200).send({ serialNumbers, lastUpdated });
|
|
85
94
|
return;
|
|
@@ -92,7 +101,7 @@ const appleWalletHandler = async (req, res) => {
|
|
|
92
101
|
const [deviceLibraryIdentifier, , passTypeIdentifier, serialNumber] = pathComponents;
|
|
93
102
|
const pass = await modules.passes.findAppleWalletPass(passTypeIdentifier, serialNumber);
|
|
94
103
|
if (pass) {
|
|
95
|
-
if (!isAuthenticationTokenCorrect(req, pass.meta
|
|
104
|
+
if (!isAuthenticationTokenCorrect(req, pass.meta?.rawData?._id || pass.meta?.rawData?.tokenId)) {
|
|
96
105
|
res.status(401).end();
|
|
97
106
|
return;
|
|
98
107
|
}
|
|
@@ -119,33 +128,44 @@ const appleWalletHandler = async (req, res) => {
|
|
|
119
128
|
// Get an updated Pass
|
|
120
129
|
const [passTypeIdentifier, serialNumber] = pathComponents;
|
|
121
130
|
const pass = await modules.passes.findAppleWalletPass(passTypeIdentifier, serialNumber);
|
|
122
|
-
if (pass) {
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
131
|
+
if (!pass) {
|
|
132
|
+
res.status(404).end();
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
if (!isAuthenticationTokenCorrect(req, pass.meta?.rawData?._id || pass.meta?.rawData?.tokenId)) {
|
|
136
|
+
res.status(401).end();
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
139
|
+
const { updated, created } = pass;
|
|
140
|
+
const lastModifiedDate = new Date(updated || created);
|
|
141
|
+
lastModifiedDate.setMilliseconds(0);
|
|
142
|
+
const ifModifiedSinceDate = new Date(req.header('if-modified-since'));
|
|
143
|
+
ifModifiedSinceDate.setMilliseconds(0);
|
|
144
|
+
if (ifModifiedSinceDate.getTime() >= lastModifiedDate.getTime()) {
|
|
145
|
+
res.status(304).end();
|
|
146
|
+
return;
|
|
147
|
+
}
|
|
148
|
+
const fileUploadAdapter = getFileAdapter();
|
|
149
|
+
const signedUrl = await fileUploadAdapter.createDownloadURL(pass);
|
|
150
|
+
const url = signedUrl && (await modules.files.normalizeUrl(signedUrl, {}));
|
|
151
|
+
if (!url) {
|
|
152
|
+
res.status(500);
|
|
153
|
+
res.send({
|
|
154
|
+
success: false,
|
|
155
|
+
message: 'Could not create download URL',
|
|
156
|
+
name: 'URL_SIGNING_FAILED',
|
|
145
157
|
});
|
|
146
|
-
res.send(uint8View);
|
|
147
158
|
return;
|
|
148
159
|
}
|
|
160
|
+
const result = await fetch(url);
|
|
161
|
+
const data = await result.arrayBuffer();
|
|
162
|
+
const uint8View = new Uint8Array(data);
|
|
163
|
+
res.writeHead(200, {
|
|
164
|
+
'Content-Type': 'application/vnd.apple.pkpass',
|
|
165
|
+
'Last-Modified': lastModifiedDate.toUTCString(),
|
|
166
|
+
});
|
|
167
|
+
res.send(uint8View);
|
|
168
|
+
return;
|
|
149
169
|
}
|
|
150
170
|
}
|
|
151
171
|
res.status(404).end();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apple-handler-express.js","sourceRoot":"","sources":["../../src/mobile-tickets/apple-handler-express.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGrD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,MAAM,MAAM,GAAG,YAAY,CAAC,mCAAmC,CAAC,CAAC;AAEjE,MAAM,4BAA4B,GAAG,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE;IAChE,MAAM,0BAA0B,GAAG,aAAa,mBAAmB,EAAE,CAAC;IACtE,OAAO,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,0BAA0B,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,KAAK,EAAE,GAAiD,EAAE,GAAa,EAAE,EAAE;IACpG,MAAM,eAAe,GAAG,GAAG,CAAC,gBAAgB,CAAC;IAC7C,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,CAAC;IACpC,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE1D,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACtC,IAAI,CAAC;YACH,MAAM,CAAC,EAAE,AAAD,EAAG,YAAY,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/C,MAAM,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAEhD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBACtB,OAAO;YACT,CAAC;YAED,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC;gBAChD,OAAO;aACR,CAAC,CAAC;YAEH,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBACxC,OAAO;YACT,CAAC;YAED,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;YAC3B,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;YAC9E,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"apple-handler-express.js","sourceRoot":"","sources":["../../src/mobile-tickets/apple-handler-express.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apple-handler-fastify.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/apple-handler-fastify.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAkB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AASlE,QAAA,MAAM,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"apple-handler-fastify.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/apple-handler-fastify.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAkB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AASlE,QAAA,MAAM,kBAAkB,EAAE,kBAwQzB,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
|
|
@@ -28,7 +28,7 @@ const appleWalletHandler = async (req, reply) => {
|
|
|
28
28
|
}
|
|
29
29
|
const { hash } = req.query;
|
|
30
30
|
const correctHash = await modules.warehousing.buildAccessKeyForToken(tokenId);
|
|
31
|
-
if (hash !== correctHash) {
|
|
31
|
+
if (!hash || hash !== correctHash) {
|
|
32
32
|
logger.error('Token hash invalid for current owner', { tokenId });
|
|
33
33
|
reply.status(403);
|
|
34
34
|
return reply.send({
|
|
@@ -41,6 +41,14 @@ const appleWalletHandler = async (req, reply) => {
|
|
|
41
41
|
const fileUploadAdapter = getFileAdapter();
|
|
42
42
|
const signedUrl = await fileUploadAdapter.createDownloadURL(passFile);
|
|
43
43
|
const url = signedUrl && (await modules.files.normalizeUrl(signedUrl, {}));
|
|
44
|
+
if (!url) {
|
|
45
|
+
reply.status(500);
|
|
46
|
+
return reply.send({
|
|
47
|
+
success: false,
|
|
48
|
+
message: 'Could not create download URL',
|
|
49
|
+
name: 'URL_SIGNING_FAILED',
|
|
50
|
+
});
|
|
51
|
+
}
|
|
44
52
|
const response = await fetch(url);
|
|
45
53
|
const data = await response.arrayBuffer();
|
|
46
54
|
const uint8View = new Uint8Array(data);
|
|
@@ -67,7 +75,7 @@ const appleWalletHandler = async (req, reply) => {
|
|
|
67
75
|
const { pushToken } = req.body;
|
|
68
76
|
const pass = await modules.passes.findAppleWalletPass(passTypeIdentifier, serialNumber);
|
|
69
77
|
if (pass) {
|
|
70
|
-
if (!isAuthenticationTokenCorrect(req, pass.meta
|
|
78
|
+
if (!isAuthenticationTokenCorrect(req, pass.meta?.rawData?._id || pass.meta?.rawData?.tokenId)) {
|
|
71
79
|
logger.error('Unauthorized', { passTypeIdentifier, serialNumber });
|
|
72
80
|
reply.status(401);
|
|
73
81
|
return reply.send();
|
|
@@ -95,7 +103,7 @@ const appleWalletHandler = async (req, reply) => {
|
|
|
95
103
|
const passesUpdatedSince = req.query?.passesUpdatedSince &&
|
|
96
104
|
new Date(req.query.passesUpdatedSince);
|
|
97
105
|
const passes = await modules.passes.findUpdatedAppleWalletPasses(passTypeIdentifier, deviceLibraryIdentifier, passesUpdatedSince);
|
|
98
|
-
const serialNumbers = passes.map((t) => t.meta
|
|
106
|
+
const serialNumbers = passes.map((t) => t.meta?.serialNumber).filter(Boolean);
|
|
99
107
|
if (serialNumbers?.length) {
|
|
100
108
|
reply.status(200);
|
|
101
109
|
return reply.send({
|
|
@@ -112,7 +120,7 @@ const appleWalletHandler = async (req, reply) => {
|
|
|
112
120
|
const [deviceLibraryIdentifier, , passTypeIdentifier, serialNumber] = pathComponents;
|
|
113
121
|
const pass = await modules.passes.findAppleWalletPass(passTypeIdentifier, serialNumber);
|
|
114
122
|
if (pass) {
|
|
115
|
-
if (!isAuthenticationTokenCorrect(req, pass.meta
|
|
123
|
+
if (!isAuthenticationTokenCorrect(req, pass.meta?.rawData?._id || pass.meta?.rawData?.tokenId)) {
|
|
116
124
|
logger.error('Unauthorized', { passTypeIdentifier, serialNumber });
|
|
117
125
|
reply.status(401);
|
|
118
126
|
return reply.send({
|
|
@@ -148,40 +156,50 @@ const appleWalletHandler = async (req, reply) => {
|
|
|
148
156
|
// Get an updated Pass
|
|
149
157
|
const [passTypeIdentifier, serialNumber] = pathComponents;
|
|
150
158
|
const pass = await modules.passes.findAppleWalletPass(passTypeIdentifier, serialNumber);
|
|
151
|
-
if (pass) {
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
lastModifiedDate.setMilliseconds(0);
|
|
164
|
-
const ifModifiedSinceDate = new Date(req.headers['if-modified-since']);
|
|
165
|
-
ifModifiedSinceDate.setMilliseconds(0);
|
|
166
|
-
if (ifModifiedSinceDate.getTime() >= lastModifiedDate.getTime()) {
|
|
167
|
-
reply.status(304);
|
|
168
|
-
return reply.send({
|
|
169
|
-
success: true,
|
|
170
|
-
message: 'Not modified',
|
|
171
|
-
name: 'NOT_MODIFIED',
|
|
172
|
-
});
|
|
173
|
-
}
|
|
174
|
-
const fileUploadAdapter = getFileAdapter();
|
|
175
|
-
const signedUrl = await fileUploadAdapter.createDownloadURL(pass);
|
|
176
|
-
const url = signedUrl && (await modules.files.normalizeUrl(signedUrl, {}));
|
|
177
|
-
const result = await fetch(url);
|
|
178
|
-
const data = await result.arrayBuffer();
|
|
179
|
-
const uint8View = new Uint8Array(data);
|
|
180
|
-
reply.status(200);
|
|
181
|
-
reply.header('content-type', 'application/vnd.apple.pkpass');
|
|
182
|
-
reply.header('last-modified', lastModifiedDate.toUTCString());
|
|
183
|
-
return reply.send(uint8View);
|
|
159
|
+
if (!pass) {
|
|
160
|
+
reply.status(404);
|
|
161
|
+
return reply.send();
|
|
162
|
+
}
|
|
163
|
+
if (!isAuthenticationTokenCorrect(req, pass.meta?.rawData?._id || pass.meta?.rawData?.tokenId)) {
|
|
164
|
+
logger.error('Unauthorized', { passTypeIdentifier, serialNumber });
|
|
165
|
+
reply.status(401);
|
|
166
|
+
return reply.send({
|
|
167
|
+
success: false,
|
|
168
|
+
message: 'Unauthorized',
|
|
169
|
+
name: 'UNAUTHORIZED',
|
|
170
|
+
});
|
|
184
171
|
}
|
|
172
|
+
const { updated, created } = pass;
|
|
173
|
+
const lastModifiedDate = new Date(updated || created);
|
|
174
|
+
lastModifiedDate.setMilliseconds(0);
|
|
175
|
+
const ifModifiedSinceDate = new Date(req.headers['if-modified-since']);
|
|
176
|
+
ifModifiedSinceDate.setMilliseconds(0);
|
|
177
|
+
if (ifModifiedSinceDate.getTime() >= lastModifiedDate.getTime()) {
|
|
178
|
+
reply.status(304);
|
|
179
|
+
return reply.send({
|
|
180
|
+
success: true,
|
|
181
|
+
message: 'Not modified',
|
|
182
|
+
name: 'NOT_MODIFIED',
|
|
183
|
+
});
|
|
184
|
+
}
|
|
185
|
+
const fileUploadAdapter = getFileAdapter();
|
|
186
|
+
const signedUrl = await fileUploadAdapter.createDownloadURL(pass);
|
|
187
|
+
const url = signedUrl && (await modules.files.normalizeUrl(signedUrl, {}));
|
|
188
|
+
if (!url) {
|
|
189
|
+
reply.status(500);
|
|
190
|
+
return reply.send({
|
|
191
|
+
success: false,
|
|
192
|
+
message: 'Could not create download URL',
|
|
193
|
+
name: 'URL_SIGNING_FAILED',
|
|
194
|
+
});
|
|
195
|
+
}
|
|
196
|
+
const result = await fetch(url);
|
|
197
|
+
const data = await result.arrayBuffer();
|
|
198
|
+
const uint8View = new Uint8Array(data);
|
|
199
|
+
reply.status(200);
|
|
200
|
+
reply.header('content-type', 'application/vnd.apple.pkpass');
|
|
201
|
+
reply.header('last-modified', lastModifiedDate.toUTCString());
|
|
202
|
+
return reply.send(uint8View);
|
|
185
203
|
}
|
|
186
204
|
}
|
|
187
205
|
reply.status(404);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apple-handler-fastify.js","sourceRoot":"","sources":["../../src/mobile-tickets/apple-handler-fastify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAG3D,MAAM,MAAM,GAAG,YAAY,CAAC,mCAAmC,CAAC,CAAC;AAEjE,MAAM,4BAA4B,GAAG,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE;IAChE,MAAM,0BAA0B,GAAG,aAAa,mBAAmB,EAAE,CAAC;IACtE,OAAO,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,0BAA0B,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAuB,KAAK,EAClD,GAEC,EACD,KAAK,EACL,EAAE;IACF,MAAM,eAAe,GAAG,GAAG,CAAC,gBAAgB,CAAC;IAC7C,MAAM,EAAE,OAAO,EAAE,GAAG,eAAe,CAAC;IAEpC,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC;IAErB,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtD,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,CAAC,EAAE,AAAD,EAAG,YAAY,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAEhD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAClB,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;YACtB,CAAC;YAED,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC;gBAChD,OAAO;aACR,CAAC,CAAC;YAEH,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;gBAC7C,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAClB,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;YACtB,CAAC;YAED,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,KAA+B,CAAC;YACrD,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;YAC9E,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"apple-handler-fastify.js","sourceRoot":"","sources":["../../src/mobile-tickets/apple-handler-fastify.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import apn from '@parse/node-apn';
|
|
2
2
|
import { Readable } from 'node:stream';
|
|
3
3
|
export declare const pushToApplePushNotificationService: (deviceTokens: any) => Promise<apn.Responses<apn.ResponseSent, apn.ResponseFailure>>;
|
|
4
|
-
export declare const buildPassBinary: (
|
|
4
|
+
export declare const buildPassBinary: (tokenSerialNumber: string, pass: {
|
|
5
5
|
serialNumber: string;
|
|
6
6
|
asBuffer: () => Promise<Buffer>;
|
|
7
7
|
}) => Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apple-wallet.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/apple-wallet.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,eAAO,MAAM,kCAAkC,GAAU,iBAAY,kEAUpE,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,
|
|
1
|
+
{"version":3,"file":"apple-wallet.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/apple-wallet.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,eAAO,MAAM,kCAAkC,GAAU,iBAAY,kEAUpE,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,mBAAmB,MAAM,EACzB,MAAM;IACJ,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CACjC;;;;;EAUF,CAAC"}
|
|
@@ -10,11 +10,11 @@ export const pushToApplePushNotificationService = async (deviceTokens) => {
|
|
|
10
10
|
const note = new apn.Notification({});
|
|
11
11
|
return apnProvider.send(note, deviceTokens);
|
|
12
12
|
};
|
|
13
|
-
export const buildPassBinary = async (
|
|
13
|
+
export const buildPassBinary = async (tokenSerialNumber, pass) => {
|
|
14
14
|
const passBuffer = await pass.asBuffer();
|
|
15
15
|
const rawFile = {
|
|
16
16
|
_id: pass.serialNumber,
|
|
17
|
-
filename: `${
|
|
17
|
+
filename: `${tokenSerialNumber}-${new Date().getTime()}.pkpass`,
|
|
18
18
|
createReadStream: () => Readable.from(passBuffer),
|
|
19
19
|
mimetype: 'application/vnd.apple.pkpass',
|
|
20
20
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apple-wallet.js","sourceRoot":"","sources":["../../src/mobile-tickets/apple-wallet.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EAAE,YAAY,EAAE,EAAE;IACvE,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC;QACnC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;QACvC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;QACtC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;QAC/C,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACtC,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;AAC9C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,
|
|
1
|
+
{"version":3,"file":"apple-wallet.js","sourceRoot":"","sources":["../../src/mobile-tickets/apple-wallet.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EAAE,YAAY,EAAE,EAAE;IACvE,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC;QACnC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;QACvC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;QACtC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;QAC/C,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACtC,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;AAC9C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,iBAAyB,EACzB,IAGC,EACD,EAAE;IACF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;IACzC,MAAM,OAAO,GAAG;QACd,GAAG,EAAE,IAAI,CAAC,YAAY;QACtB,QAAQ,EAAE,GAAG,iBAAiB,IAAI,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,SAAS;QAC/D,gBAAgB,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC;QACjD,QAAQ,EAAE,8BAA8B;KACzC,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { Request, Response } from 'express';
|
|
2
|
+
import { TicketingAPI } from '../types.js';
|
|
3
|
+
export declare const appleWalletHandler: (req: Request & {
|
|
4
|
+
unchainedContext: TicketingAPI;
|
|
5
|
+
}, res: Response) => Promise<void>;
|
|
6
|
+
export default function loadAppleWalletHandler(app: any): void;
|
|
7
|
+
//# sourceMappingURL=apple-webservice.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"apple-webservice.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/apple-webservice.ts"],"names":[],"mappings":"AAEA,OAAgB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAW3C,eAAO,MAAM,kBAAkB,QACxB,OAAO,GAAG;IAAE,gBAAgB,EAAE,YAAY,CAAA;CAAE,OAC5C,QAAQ,kBAyNd,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,GAAG,KAAA,QASjD"}
|
|
@@ -0,0 +1,177 @@
|
|
|
1
|
+
import { createLogger } from '@unchainedshop/logger';
|
|
2
|
+
import { useMiddlewareWithCurrentContext } from '@unchainedshop/api/express/index.js';
|
|
3
|
+
import express from 'express';
|
|
4
|
+
const logger = createLogger('unchained:apple-wallet-webservice');
|
|
5
|
+
const { APPLE_WALLET_WEBSERVICE_PATH = '/rest/apple-wallet' } = process.env;
|
|
6
|
+
const isAuthenticationTokenCorrect = (req, authenticationToken) => {
|
|
7
|
+
const expectedAuthorizationValue = `ApplePass ${authenticationToken}`;
|
|
8
|
+
return req.headers.authorization === expectedAuthorizationValue;
|
|
9
|
+
};
|
|
10
|
+
export const appleWalletHandler = async (req, res) => {
|
|
11
|
+
const resolvedContext = req.unchainedContext;
|
|
12
|
+
const { modules } = resolvedContext;
|
|
13
|
+
logger.info(`${req.path} (${JSON.stringify(req.query)})`);
|
|
14
|
+
if (req.path.startsWith('/download/')) {
|
|
15
|
+
try {
|
|
16
|
+
const [, , passFileName] = req.path.split('/');
|
|
17
|
+
const [tokenId] = passFileName.split('.pkpass');
|
|
18
|
+
if (!tokenId) {
|
|
19
|
+
res.writeHead(404);
|
|
20
|
+
res.end();
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
const token = await modules.warehousing.findToken({
|
|
24
|
+
tokenId,
|
|
25
|
+
});
|
|
26
|
+
if (!token) {
|
|
27
|
+
res.writeHead(404);
|
|
28
|
+
res.end('Token not found');
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
const { hash } = req.query;
|
|
32
|
+
const correctHash = await modules.warehousing.buildAccessKeyForToken(tokenId);
|
|
33
|
+
if (hash !== correctHash) {
|
|
34
|
+
res.writeHead(403);
|
|
35
|
+
res.end('Token hash invalid for current owner');
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
const passFile = await modules.passes.upsertAppleWalletPass(token, resolvedContext);
|
|
39
|
+
const url = await modules.files.getUrl(passFile, {});
|
|
40
|
+
const response = await fetch(url);
|
|
41
|
+
const data = await response.arrayBuffer();
|
|
42
|
+
const uint8View = new Uint8Array(data);
|
|
43
|
+
res.status(200);
|
|
44
|
+
res.setHeader('Content-Type', 'application/vnd.apple.pkpass');
|
|
45
|
+
res.setHeader('Content-Disposition', `attachment; filename=${tokenId}.pkpass`);
|
|
46
|
+
res.end(uint8View);
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
catch (e) {
|
|
50
|
+
console.error(e);
|
|
51
|
+
}
|
|
52
|
+
res.writeHead(500);
|
|
53
|
+
res.end();
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
const [, apiVersion, endpoint, ...pathComponents] = req.path.split("/"); /* eslint-disable-line */
|
|
57
|
+
if (endpoint === 'devices') {
|
|
58
|
+
if (req.method === 'POST') {
|
|
59
|
+
// Register Device
|
|
60
|
+
const [deviceLibraryIdentifier, , passTypeIdentifier, serialNumber] = pathComponents;
|
|
61
|
+
const { pushToken } = req.body;
|
|
62
|
+
const pass = await modules.passes.findAppleWalletPass(passTypeIdentifier, serialNumber);
|
|
63
|
+
if (pass) {
|
|
64
|
+
if (!isAuthenticationTokenCorrect(req, pass.meta.rawData._id || pass.meta.rawData.tokenId)) {
|
|
65
|
+
res.writeHead(401);
|
|
66
|
+
res.end();
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
const newRegistration = await modules.passes.registerDeviceForAppleWalletPass(passTypeIdentifier, serialNumber, {
|
|
70
|
+
deviceLibraryIdentifier,
|
|
71
|
+
pushToken,
|
|
72
|
+
});
|
|
73
|
+
if (!newRegistration) {
|
|
74
|
+
res.writeHead(200);
|
|
75
|
+
res.end();
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
res.writeHead(201);
|
|
79
|
+
res.end();
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
else if (req.method === 'GET') {
|
|
84
|
+
// Get the List of Updatable Passes
|
|
85
|
+
const lastUpdated = new Date();
|
|
86
|
+
const [deviceLibraryIdentifier, , passTypeIdentifier] = pathComponents;
|
|
87
|
+
const passesUpdatedSince = req.query?.passesUpdatedSince && new Date(req.query.passesUpdatedSince);
|
|
88
|
+
const passes = await modules.passes.findUpdatedAppleWalletPasses(passTypeIdentifier, deviceLibraryIdentifier, passesUpdatedSince);
|
|
89
|
+
const serialNumbers = passes.map((t) => t.meta.serialNumber);
|
|
90
|
+
if (serialNumbers?.length) {
|
|
91
|
+
res.writeHead(200, {
|
|
92
|
+
'Content-Type': 'application/json',
|
|
93
|
+
});
|
|
94
|
+
res.write(JSON.stringify({
|
|
95
|
+
serialNumbers,
|
|
96
|
+
lastUpdated,
|
|
97
|
+
}));
|
|
98
|
+
res.end();
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
res.writeHead(204);
|
|
102
|
+
res.end();
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
else if (req.method === 'DELETE') {
|
|
106
|
+
// Unregister Device
|
|
107
|
+
const [deviceLibraryIdentifier, , passTypeIdentifier, serialNumber] = pathComponents;
|
|
108
|
+
const pass = await modules.passes.findAppleWalletPass(passTypeIdentifier, serialNumber);
|
|
109
|
+
if (pass) {
|
|
110
|
+
if (!isAuthenticationTokenCorrect(req, pass.meta.rawData._id || pass.meta.rawData.tokenId)) {
|
|
111
|
+
res.writeHead(401);
|
|
112
|
+
res.end();
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
await modules.passes.unregisterDeviceForAppleWalletPass(passTypeIdentifier, serialNumber, deviceLibraryIdentifier);
|
|
116
|
+
// Unregistered
|
|
117
|
+
res.writeHead(200);
|
|
118
|
+
res.end();
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
else if (endpoint === 'log') {
|
|
124
|
+
// Log Mesage
|
|
125
|
+
const { logs } = req.body;
|
|
126
|
+
logs?.forEach((log) => {
|
|
127
|
+
if (typeof log === 'string') {
|
|
128
|
+
logger.info(log);
|
|
129
|
+
}
|
|
130
|
+
});
|
|
131
|
+
res.writeHead(200);
|
|
132
|
+
res.end();
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
else if (endpoint === 'passes') {
|
|
136
|
+
if (req.method === 'GET') {
|
|
137
|
+
// Get an updated Pass
|
|
138
|
+
const [passTypeIdentifier, serialNumber] = pathComponents;
|
|
139
|
+
const pass = await modules.passes.findAppleWalletPass(passTypeIdentifier, serialNumber);
|
|
140
|
+
if (pass) {
|
|
141
|
+
if (!isAuthenticationTokenCorrect(req, pass.meta.rawData._id || pass.meta.rawData.tokenId)) {
|
|
142
|
+
res.writeHead(401);
|
|
143
|
+
res.end();
|
|
144
|
+
return;
|
|
145
|
+
}
|
|
146
|
+
const { updated, created } = pass;
|
|
147
|
+
const lastModifiedDate = new Date(updated || created);
|
|
148
|
+
lastModifiedDate.setMilliseconds(0);
|
|
149
|
+
const ifModifiedSinceDate = new Date(req.header('if-modified-since'));
|
|
150
|
+
ifModifiedSinceDate.setMilliseconds(0);
|
|
151
|
+
if (ifModifiedSinceDate.getTime() >= lastModifiedDate.getTime()) {
|
|
152
|
+
res.writeHead(304);
|
|
153
|
+
res.end();
|
|
154
|
+
return;
|
|
155
|
+
}
|
|
156
|
+
const url = modules.files.getUrl(pass, {});
|
|
157
|
+
const result = await fetch(url);
|
|
158
|
+
const data = await result.arrayBuffer();
|
|
159
|
+
const uint8View = new Uint8Array(data);
|
|
160
|
+
res.writeHead(200, {
|
|
161
|
+
'Content-Type': 'application/vnd.apple.pkpass',
|
|
162
|
+
'Last-Modified': lastModifiedDate.toUTCString(),
|
|
163
|
+
});
|
|
164
|
+
res.end(uint8View);
|
|
165
|
+
return;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
res.writeHead(404);
|
|
170
|
+
res.end();
|
|
171
|
+
};
|
|
172
|
+
export default function loadAppleWalletHandler(app) {
|
|
173
|
+
useMiddlewareWithCurrentContext(app, APPLE_WALLET_WEBSERVICE_PATH, express.json({
|
|
174
|
+
type: 'application/json',
|
|
175
|
+
}), appleWalletHandler);
|
|
176
|
+
}
|
|
177
|
+
//# sourceMappingURL=apple-webservice.js.map
|