@unchainedshop/ticketing 4.0.0-rc.8 → 4.0.0
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/express.js +1 -1
- package/lib/express.js.map +1 -1
- package/lib/fastify.js +3 -3
- 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.js +63 -64
- 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 +93 -42
- package/lib/mobile-tickets/apple-handler-fastify.js.map +1 -1
- package/lib/mobile-tickets/apple-wallet.d.ts +3 -3
- package/lib/mobile-tickets/apple-wallet.d.ts.map +1 -1
- package/lib/mobile-tickets/apple-wallet.js +3 -3
- 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 +13 -15
- 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 +21 -8
- 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 +6 -3
- package/lib/module.js.map +1 -1
- package/lib/pdf-tickets/print-handler-express.d.ts.map +1 -1
- package/lib/pdf-tickets/print-handler-express.js +4 -3
- package/lib/pdf-tickets/print-handler-express.js.map +1 -1
- package/lib/pdf-tickets/print-handler-fastify.d.ts.map +1 -1
- package/lib/pdf-tickets/print-handler-fastify.js +8 -2
- package/lib/pdf-tickets/print-handler-fastify.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 +11 -11
- package/readme.md +1 -1
- package/src/express.ts +1 -1
- package/src/fastify.ts +3 -3
- package/src/magic-key.ts +4 -4
- package/src/mobile-tickets/apple-handler-express.ts +71 -71
- package/src/mobile-tickets/apple-handler-fastify.ts +103 -51
- package/src/mobile-tickets/apple-wallet.ts +3 -3
- package/src/mobile-tickets/google-handler-express.ts +14 -15
- package/src/mobile-tickets/google-handler-fastify.ts +23 -11
- package/src/module.ts +7 -4
- package/src/pdf-tickets/print-handler-express.ts +6 -3
- package/src/pdf-tickets/print-handler-fastify.ts +9 -2
- package/src/template-registry.ts +2 -2
- package/tsconfig.json +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apple-wallet.js","sourceRoot":"","sources":["../../src/mobile-tickets/apple-wallet.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,
|
|
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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"apple-webservice.js","sourceRoot":"","sources":["../../src/mobile-tickets/apple-webservice.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-handler-express.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/google-handler-express.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI3C,eAAO,MAAM,mBAAmB,GAC9B,KAAK,OAAO,GAAG;IAAE,gBAAgB,EAAE,YAAY,CAAA;CAAE,EACjD,KAAK,QAAQ,
|
|
1
|
+
{"version":3,"file":"google-handler-express.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/google-handler-express.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI3C,eAAO,MAAM,mBAAmB,GAC9B,KAAK,OAAO,GAAG;IAAE,gBAAgB,EAAE,YAAY,CAAA;CAAE,EACjD,KAAK,QAAQ,kBA8Cd,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
|
|
@@ -4,42 +4,40 @@ export const googleWalletHandler = async (req, res) => {
|
|
|
4
4
|
const resolvedContext = req.unchainedContext;
|
|
5
5
|
const { modules } = resolvedContext;
|
|
6
6
|
logger.info(`${req.path} (${JSON.stringify(req.query)})`);
|
|
7
|
-
if (req.path.
|
|
7
|
+
if (req.path.includes('/download/')) {
|
|
8
8
|
try {
|
|
9
|
-
const
|
|
9
|
+
const { tokenId } = req.params;
|
|
10
|
+
const { hash } = req.query;
|
|
10
11
|
if (!tokenId) {
|
|
11
|
-
res.
|
|
12
|
-
res.end();
|
|
12
|
+
res.status(404).end();
|
|
13
13
|
return;
|
|
14
14
|
}
|
|
15
15
|
const token = await modules.warehousing.findToken({
|
|
16
16
|
tokenId,
|
|
17
17
|
});
|
|
18
18
|
if (!token) {
|
|
19
|
-
res.
|
|
20
|
-
res.end('Token not found');
|
|
19
|
+
res.status(404).send('Token not found');
|
|
21
20
|
return;
|
|
22
21
|
}
|
|
23
|
-
const { hash } = req.query;
|
|
24
22
|
const correctHash = await modules.warehousing.buildAccessKeyForToken(tokenId);
|
|
25
|
-
if (hash !== correctHash) {
|
|
26
|
-
res.
|
|
27
|
-
res.end('Token hash invalid for current owner');
|
|
23
|
+
if (!hash || hash !== correctHash) {
|
|
24
|
+
res.status(403).send('Token hash invalid for current owner');
|
|
28
25
|
return;
|
|
29
26
|
}
|
|
30
27
|
const pass = await modules.passes.upsertGoogleWalletPass(token, resolvedContext);
|
|
28
|
+
if (!pass) {
|
|
29
|
+
throw new Error('Could not create Google Wallet pass');
|
|
30
|
+
}
|
|
31
31
|
res.redirect(await pass.asURL());
|
|
32
32
|
return;
|
|
33
33
|
}
|
|
34
34
|
catch (e) {
|
|
35
|
-
|
|
35
|
+
logger.error(e);
|
|
36
36
|
}
|
|
37
|
-
res.
|
|
38
|
-
res.end();
|
|
37
|
+
res.status(500).end();
|
|
39
38
|
return;
|
|
40
39
|
}
|
|
41
|
-
res.
|
|
42
|
-
res.end();
|
|
40
|
+
res.status(404).end();
|
|
43
41
|
};
|
|
44
42
|
export default googleWalletHandler;
|
|
45
43
|
//# sourceMappingURL=google-handler-express.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-handler-express.js","sourceRoot":"","sources":["../../src/mobile-tickets/google-handler-express.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAIrD,MAAM,MAAM,GAAG,YAAY,CAAC,oCAAoC,CAAC,CAAC;AAElE,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,GAAiD,EACjD,GAAa,EACb,EAAE;IACF,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,
|
|
1
|
+
{"version":3,"file":"google-handler-express.js","sourceRoot":"","sources":["../../src/mobile-tickets/google-handler-express.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAIrD,MAAM,MAAM,GAAG,YAAY,CAAC,oCAAoC,CAAC,CAAC;AAElE,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,GAAiD,EACjD,GAAa,EACb,EAAE;IACF,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,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAA6B,CAAC;YACtD,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,KAA0B,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,WAAW,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;YAC9E,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;gBAClC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;gBAC7D,OAAO;YACT,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,sBAAsB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;YAEjF,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;YACzD,CAAC;YAED,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;YACjC,OAAO;QACT,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;AACxB,CAAC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-handler-fastify.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/google-handler-fastify.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAkB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAIlE,QAAA,MAAM,mBAAmB,EAAE,
|
|
1
|
+
{"version":3,"file":"google-handler-fastify.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/google-handler-fastify.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAkB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAIlE,QAAA,MAAM,mBAAmB,EAAE,kBA4D1B,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
|
|
@@ -5,9 +5,10 @@ const googleWalletHandler = async (req, reply) => {
|
|
|
5
5
|
const { modules } = resolvedContext;
|
|
6
6
|
const path = req.url;
|
|
7
7
|
logger.info(`${path} (${JSON.stringify(req.query)})`);
|
|
8
|
-
if (path.
|
|
8
|
+
if (path.includes('/download/')) {
|
|
9
9
|
try {
|
|
10
|
-
const
|
|
10
|
+
const { tokenId } = req.params;
|
|
11
|
+
const { hash } = req.query;
|
|
11
12
|
if (!tokenId) {
|
|
12
13
|
reply.status(404);
|
|
13
14
|
return reply.send();
|
|
@@ -16,23 +17,35 @@ const googleWalletHandler = async (req, reply) => {
|
|
|
16
17
|
tokenId,
|
|
17
18
|
});
|
|
18
19
|
if (!token) {
|
|
20
|
+
logger.error('Token not found', { tokenId });
|
|
19
21
|
reply.status(404);
|
|
20
22
|
return reply.send('Token not found');
|
|
21
23
|
}
|
|
22
|
-
const { hash } = req.query;
|
|
23
24
|
const correctHash = await modules.warehousing.buildAccessKeyForToken(tokenId);
|
|
24
|
-
if (hash !== correctHash) {
|
|
25
|
+
if (!hash || hash !== correctHash) {
|
|
26
|
+
logger.error('Token hash invalid for current owner', { tokenId });
|
|
25
27
|
reply.status(403);
|
|
26
|
-
return reply.send(
|
|
28
|
+
return reply.send({
|
|
29
|
+
success: false,
|
|
30
|
+
message: 'Token hash invalid for current owner',
|
|
31
|
+
name: 'HASH_MISMATCH',
|
|
32
|
+
});
|
|
27
33
|
}
|
|
28
34
|
const pass = await modules.passes.upsertGoogleWalletPass(token, resolvedContext);
|
|
35
|
+
if (!pass) {
|
|
36
|
+
throw new Error('Could not create Google Wallet pass');
|
|
37
|
+
}
|
|
29
38
|
return reply.redirect(await pass.asURL());
|
|
30
39
|
}
|
|
31
40
|
catch (e) {
|
|
32
|
-
|
|
41
|
+
logger.error(e);
|
|
42
|
+
reply.status(500);
|
|
43
|
+
return reply.send({
|
|
44
|
+
success: false,
|
|
45
|
+
message: 'Error generating pass',
|
|
46
|
+
name: 'PASS_GENERATION_ERROR',
|
|
47
|
+
});
|
|
33
48
|
}
|
|
34
|
-
reply.status(500);
|
|
35
|
-
return reply.send();
|
|
36
49
|
}
|
|
37
50
|
reply.status(404);
|
|
38
51
|
return reply.send();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-handler-fastify.js","sourceRoot":"","sources":["../../src/mobile-tickets/google-handler-fastify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAIrD,MAAM,MAAM,GAAG,YAAY,CAAC,oCAAoC,CAAC,CAAC;AAElE,MAAM,mBAAmB,GAAuB,KAAK,EACnD,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;
|
|
1
|
+
{"version":3,"file":"google-handler-fastify.js","sourceRoot":"","sources":["../../src/mobile-tickets/google-handler-fastify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAIrD,MAAM,MAAM,GAAG,YAAY,CAAC,oCAAoC,CAAC,CAAC;AAElE,MAAM,mBAAmB,GAAuB,KAAK,EACnD,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;IACtD,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAA6B,CAAC;YACtD,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,KAA0B,CAAC;YAChD,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,CAAC,iBAAiB,CAAC,CAAC;YACvC,CAAC;YACD,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;YAC9E,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;gBAClC,MAAM,CAAC,KAAK,CAAC,sCAAsC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;gBAClE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAClB,OAAO,KAAK,CAAC,IAAI,CAAC;oBAChB,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,sCAAsC;oBAC/C,IAAI,EAAE,eAAe;iBACtB,CAAC,CAAC;YACL,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,sBAAsB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;YAEjF,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;YACzD,CAAC;YAED,OAAO,KAAK,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAChB,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAClB,OAAO,KAAK,CAAC,IAAI,CAAC;gBAChB,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,uBAAuB;gBAChC,IAAI,EAAE,uBAAuB;aAC9B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAClB,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;AACtB,CAAC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { Request, Response } from 'express';
|
|
2
|
+
import { TicketingAPI } from '../types.js';
|
|
3
|
+
export declare const googleWalletHandler: (req: Request & {
|
|
4
|
+
unchainedContext: TicketingAPI;
|
|
5
|
+
}, res: Response) => Promise<void>;
|
|
6
|
+
export default function loadGoogleWalletHandler(app: any): void;
|
|
7
|
+
//# sourceMappingURL=google-webservice.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"google-webservice.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/google-webservice.ts"],"names":[],"mappings":"AAEA,OAAgB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAM3C,eAAO,MAAM,mBAAmB,QACzB,OAAO,GAAG;IAAE,gBAAgB,EAAE,YAAY,CAAA;CAAE,OAC5C,QAAQ,kBA+Cd,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,GAAG,KAAA,QASlD"}
|
|
@@ -0,0 +1,52 @@
|
|
|
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:google-wallet-webservice');
|
|
5
|
+
const { GOOGLE_WALLET_WEBSERVICE_PATH = '/rest/google-wallet' } = process.env;
|
|
6
|
+
export const googleWalletHandler = async (req, res) => {
|
|
7
|
+
const resolvedContext = req.unchainedContext;
|
|
8
|
+
const { modules } = resolvedContext;
|
|
9
|
+
logger.info(`${req.path} (${JSON.stringify(req.query)})`);
|
|
10
|
+
if (req.path.startsWith('/download/')) {
|
|
11
|
+
try {
|
|
12
|
+
const [, , tokenId] = req.path.split('/');
|
|
13
|
+
if (!tokenId) {
|
|
14
|
+
res.writeHead(404);
|
|
15
|
+
res.end();
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
const token = await modules.warehousing.findToken({
|
|
19
|
+
tokenId,
|
|
20
|
+
});
|
|
21
|
+
if (!token) {
|
|
22
|
+
res.writeHead(404);
|
|
23
|
+
res.end('Token not found');
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
const { hash } = req.query;
|
|
27
|
+
const correctHash = await modules.warehousing.buildAccessKeyForToken(tokenId);
|
|
28
|
+
if (hash !== correctHash) {
|
|
29
|
+
res.writeHead(403);
|
|
30
|
+
res.end('Token hash invalid for current owner');
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
const pass = await modules.passes.upsertGoogleWalletPass(token, resolvedContext);
|
|
34
|
+
res.redirect(await pass.asURL());
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
catch (e) {
|
|
38
|
+
console.error(e);
|
|
39
|
+
}
|
|
40
|
+
res.writeHead(500);
|
|
41
|
+
res.end();
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
res.writeHead(404);
|
|
45
|
+
res.end();
|
|
46
|
+
};
|
|
47
|
+
export default function loadGoogleWalletHandler(app) {
|
|
48
|
+
useMiddlewareWithCurrentContext(app, GOOGLE_WALLET_WEBSERVICE_PATH, express.json({
|
|
49
|
+
type: 'application/json',
|
|
50
|
+
}), googleWalletHandler);
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=google-webservice.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"google-webservice.js","sourceRoot":"","sources":["../../src/mobile-tickets/google-webservice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAC;AACtF,OAAO,OAA8B,MAAM,SAAS,CAAC;AAGrD,MAAM,MAAM,GAAG,YAAY,CAAC,oCAAoC,CAAC,CAAC;AAElE,MAAM,EAAE,6BAA6B,GAAG,qBAAqB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE9E,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,GAAiD,EACjD,GAAa,EACb,EAAE;IACF,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,OAAO,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAE1C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnB,GAAG,CAAC,GAAG,EAAE,CAAC;gBACV,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,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnB,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;gBAC3B,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;gBACzB,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnB,GAAG,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;gBAChD,OAAO;YACT,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,sBAAsB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;YAEjF,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;YACjC,OAAO;QACT,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;QACD,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACnB,GAAG,CAAC,GAAG,EAAE,CAAC;QACV,OAAO;IACT,CAAC;IACD,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACnB,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,GAAG;IACjD,+BAA+B,CAC7B,GAAG,EACH,6BAA6B,EAC7B,OAAO,CAAC,IAAI,CAAC;QACX,IAAI,EAAE,kBAAkB;KACzB,CAAC,EACF,mBAAmB,CACpB,CAAC;AACJ,CAAC"}
|
package/lib/module.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { File } from '@unchainedshop/core-files';
|
|
|
5
5
|
export declare const APPLE_WALLET_PASSES_FILE_DIRECTORY = "apple-wallet-passes";
|
|
6
6
|
declare const configurePasses: ({ db }: ModuleInput<Record<string, never>>) => Promise<{
|
|
7
7
|
upsertAppleWalletPass: (token: TokenSurrogate, unchainedAPI: UnchainedCore) => Promise<File>;
|
|
8
|
-
findAppleWalletPass: (passTypeIdentifier: any, serialNumber: any) => Promise<File>;
|
|
8
|
+
findAppleWalletPass: (passTypeIdentifier: any, serialNumber: any) => Promise<import("mongodb").WithId<File> | null>;
|
|
9
9
|
registerDeviceForAppleWalletPass: (passTypeIdentifier: any, serialNumber: any, { deviceLibraryIdentifier, pushToken }: {
|
|
10
10
|
deviceLibraryIdentifier: any;
|
|
11
11
|
pushToken: any;
|
|
@@ -14,13 +14,13 @@ declare const configurePasses: ({ db }: ModuleInput<Record<string, never>>) => P
|
|
|
14
14
|
findUpdatedAppleWalletPasses: (passTypeIdentifier: any, deviceLibraryIdentifier: any, passesUpdatedSince: any) => Promise<File[]>;
|
|
15
15
|
invalidateAppleWalletPasses: (unchainedAPI: UnchainedCore) => Promise<void>;
|
|
16
16
|
upsertGoogleWalletPass: (token: TokenSurrogate, unchainedAPI: UnchainedCore) => Promise<{
|
|
17
|
-
asURL
|
|
18
|
-
asBuffer
|
|
17
|
+
asURL: () => Promise<string>;
|
|
18
|
+
asBuffer: () => Promise<Buffer>;
|
|
19
19
|
serialNumber?: string;
|
|
20
20
|
passTypeIdentifier?: string;
|
|
21
21
|
}>;
|
|
22
22
|
buildMagicKey: (orderId: string) => Promise<string>;
|
|
23
|
-
cancelTicket: (tokenId: string) => Promise<import("mongodb").WithId<TokenSurrogate
|
|
23
|
+
cancelTicket: (tokenId: string) => Promise<import("mongodb").WithId<TokenSurrogate> | null>;
|
|
24
24
|
isTicketCancelled: (token: TokenSurrogate) => boolean;
|
|
25
25
|
getTicketsCreated: ({ productId, }: {
|
|
26
26
|
productId: string;
|
|
@@ -35,7 +35,7 @@ declare const _default: {
|
|
|
35
35
|
passes: {
|
|
36
36
|
configure: ({ db }: ModuleInput<Record<string, never>>) => Promise<{
|
|
37
37
|
upsertAppleWalletPass: (token: TokenSurrogate, unchainedAPI: UnchainedCore) => Promise<File>;
|
|
38
|
-
findAppleWalletPass: (passTypeIdentifier: any, serialNumber: any) => Promise<File>;
|
|
38
|
+
findAppleWalletPass: (passTypeIdentifier: any, serialNumber: any) => Promise<import("mongodb").WithId<File> | null>;
|
|
39
39
|
registerDeviceForAppleWalletPass: (passTypeIdentifier: any, serialNumber: any, { deviceLibraryIdentifier, pushToken }: {
|
|
40
40
|
deviceLibraryIdentifier: any;
|
|
41
41
|
pushToken: any;
|
|
@@ -44,13 +44,13 @@ declare const _default: {
|
|
|
44
44
|
findUpdatedAppleWalletPasses: (passTypeIdentifier: any, deviceLibraryIdentifier: any, passesUpdatedSince: any) => Promise<File[]>;
|
|
45
45
|
invalidateAppleWalletPasses: (unchainedAPI: UnchainedCore) => Promise<void>;
|
|
46
46
|
upsertGoogleWalletPass: (token: TokenSurrogate, unchainedAPI: UnchainedCore) => Promise<{
|
|
47
|
-
asURL
|
|
48
|
-
asBuffer
|
|
47
|
+
asURL: () => Promise<string>;
|
|
48
|
+
asBuffer: () => Promise<Buffer>;
|
|
49
49
|
serialNumber?: string;
|
|
50
50
|
passTypeIdentifier?: string;
|
|
51
51
|
}>;
|
|
52
52
|
buildMagicKey: (orderId: string) => Promise<string>;
|
|
53
|
-
cancelTicket: (tokenId: string) => Promise<import("mongodb").WithId<TokenSurrogate
|
|
53
|
+
cancelTicket: (tokenId: string) => Promise<import("mongodb").WithId<TokenSurrogate> | null>;
|
|
54
54
|
isTicketCancelled: (token: TokenSurrogate) => boolean;
|
|
55
55
|
getTicketsCreated: ({ productId, }: {
|
|
56
56
|
productId: string;
|
package/lib/module.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAKjD,eAAO,MAAM,kCAAkC,wBAAwB,CAAC;AAIxE,QAAA,MAAM,eAAe,GAAU,QAAQ,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;mCAmB3B,cAAc,gBAAgB,aAAa
|
|
1
|
+
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAKjD,eAAO,MAAM,kCAAkC,wBAAwB,CAAC;AAIxE,QAAA,MAAM,eAAe,GAAU,QAAQ,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;mCAmB3B,cAAc,gBAAgB,aAAa;;;;;;;sHAkHpF,OAAO,CAAC,IAAI,EAAE,CAAC;gDAkBuC,aAAa;oCAtFzB,cAAc,gBAAgB,aAAa;;;;;;6BA2GlD,MAAM;4BASP,MAAM;+BAUT,cAAc;wCAO3C;QACD,SAAS,EAAE,MAAM,CAAC;KACnB,sBACkB;QAAE,aAAa,CAAC,EAAE,OAAO,CAAA;KAAE,KAC7C,OAAO,CAAC,MAAM,CAAC;EAuBnB,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC;CACrD;;;4BArOsC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;2CAmB3B,cAAc,gBAAgB,aAAa;;;;;;;8HAkHpF,OAAO,CAAC,IAAI,EAAE,CAAC;wDAkBuC,aAAa;4CAtFzB,cAAc,gBAAgB,aAAa;;;;;;qCA2GlD,MAAM;oCASP,MAAM;uCAUT,cAAc;gDAO3C;gBACD,SAAS,EAAE,MAAM,CAAC;aACnB,sBACkB;gBAAE,aAAa,CAAC,EAAE,OAAO,CAAA;aAAE,KAC7C,OAAO,CAAC,MAAM,CAAC;;;;AA6BpB,wBAIE"}
|
package/lib/module.js
CHANGED
|
@@ -27,7 +27,7 @@ const configurePasses = async ({ db }) => {
|
|
|
27
27
|
const pass = await createAppleWalletPass(token, unchainedAPI);
|
|
28
28
|
const rawFile = Promise.resolve(
|
|
29
29
|
// wrap in promise to make stream upload work
|
|
30
|
-
await buildPassBinary(token.
|
|
30
|
+
await buildPassBinary(token.tokenSerialNumber, pass));
|
|
31
31
|
const previousFile = await MediaObjects.findOne({
|
|
32
32
|
path: APPLE_WALLET_PASSES_FILE_DIRECTORY,
|
|
33
33
|
'meta.passTypeIdentifier': pass.passTypeIdentifier,
|
|
@@ -132,7 +132,7 @@ const configurePasses = async ({ db }) => {
|
|
|
132
132
|
const allTokens = await TokenSurrogates.find({}).toArray();
|
|
133
133
|
for (const pass of allPasses) {
|
|
134
134
|
// Check if binary is already invalidated, if so, skip
|
|
135
|
-
const rawData = pass.meta
|
|
135
|
+
const rawData = pass.meta?.rawData;
|
|
136
136
|
if (rawData.invalidatedDate)
|
|
137
137
|
continue;
|
|
138
138
|
const redeemedToken = allTokens.find((t) => t._id === rawData._id && t.invalidatedDate);
|
|
@@ -146,7 +146,10 @@ const configurePasses = async ({ db }) => {
|
|
|
146
146
|
const buildMagicKey = async (orderId) => {
|
|
147
147
|
const msgUint8 = new TextEncoder().encode([orderId, process.env.UNCHAINED_SECRET].join(''));
|
|
148
148
|
const hashBuffer = await crypto.subtle.digest('SHA-256', msgUint8);
|
|
149
|
-
|
|
149
|
+
// Convert ArrayBuffer to hex string without using Buffer
|
|
150
|
+
return Array.from(new Uint8Array(hashBuffer))
|
|
151
|
+
.map((b) => b.toString(16).padStart(2, '0'))
|
|
152
|
+
.join('');
|
|
150
153
|
};
|
|
151
154
|
const cancelTicket = async (tokenId) => {
|
|
152
155
|
return TokenSurrogates.findOneAndUpdate({ _id: tokenId }, { $set: { 'meta.cancelled': true } }, {
|
package/lib/module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAe,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAK3E,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,kCAAkC,EAAE,MAAM,kCAAkC,CAAC;AAEvG,MAAM,CAAC,MAAM,kCAAkC,GAAG,qBAAqB,CAAC;AAExE,MAAM,MAAM,GAAG,YAAY,CAAC,mCAAmC,CAAC,CAAC;AAEjE,MAAM,eAAe,GAAG,KAAK,EAAE,EAAE,EAAE,EAAsC,EAAE,EAAE;IAC3E,MAAM,YAAY,GAAG,MAAM,sBAAsB,CAAC,EAAE,CAAC,CAAC;IACtD,MAAM,eAAe,GAAG,MAAM,wBAAwB,CAAC,EAAE,CAAC,CAAC;IAE3D,MAAM,cAAc,CAAC,eAAsB,EAAE;QAC3C,EAAE,KAAK,EAAE,EAAE,gBAAgB,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;KAC9D,CAAC,CAAC;IAEH,MAAM,cAAc,CAAC,YAAmB,EAAE;QACxC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,yBAAyB,EAAE,CAAC,EAAE,mBAAmB,EAAE,CAAC,EAAE,EAAE;QAC5E;YACE,KAAK,EAAE;gBACL,IAAI,EAAE,CAAC;gBACP,yBAAyB,EAAE,CAAC;gBAC5B,4CAA4C,EAAE,CAAC;aAChD;SACK;KACT,CAAC,CAAC;IAEH,MAAM,qBAAqB,GAAG,KAAK,EAAE,KAAqB,EAAE,YAA2B,EAAE,EAAE;QACzF,MAAM,qBAAqB,GAAG,WAAW,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QACtE,MAAM,IAAI,GAAG,MAAM,qBAAqB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO;QAC7B,6CAA6C;QAC7C,MAAM,eAAe,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"print-handler-express.d.ts","sourceRoot":"","sources":["../../src/pdf-tickets/print-handler-express.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"print-handler-express.d.ts","sourceRoot":"","sources":["../../src/pdf-tickets/print-handler-express.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAMjD,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG;IAAE,gBAAgB,EAAE,OAAO,CAAA;CAAE,EAAE,GAAG,EAAE,QAAQ,iBAqBpG;AAED,eAAe,mBAAmB,CAAC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { checkAction } from '@unchainedshop/api/lib/acl.js';
|
|
2
2
|
import { actions } from '@unchainedshop/api/lib/roles/index.js';
|
|
3
3
|
import { RendererTypes, getRenderer } from '../template-registry.js';
|
|
4
|
+
import { createLogger } from '@unchainedshop/logger';
|
|
5
|
+
const logger = createLogger('unchained:ticketing');
|
|
4
6
|
export async function printTicketsHandler(req, res) {
|
|
5
7
|
const { variant, orderId, otp } = req.query || {};
|
|
6
8
|
try {
|
|
@@ -15,9 +17,8 @@ export async function printTicketsHandler(req, res) {
|
|
|
15
17
|
pdfStream.pipe(res);
|
|
16
18
|
}
|
|
17
19
|
catch (error) {
|
|
18
|
-
|
|
19
|
-
res.status(403);
|
|
20
|
-
res.end();
|
|
20
|
+
logger.error(error);
|
|
21
|
+
res.status(403).end();
|
|
21
22
|
}
|
|
22
23
|
}
|
|
23
24
|
export default printTicketsHandler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"print-handler-express.js","sourceRoot":"","sources":["../../src/pdf-tickets/print-handler-express.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,uCAAuC,CAAC;AAEhE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGrE,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GAA4C,EAAE,GAAa;IACnG,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;IAElD,IAAI,CAAC;QACH,IACE,OAAO,OAAO,KAAK,QAAQ;YAC3B,OAAO,GAAG,KAAK,QAAQ;YACvB,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,CAAC;YAExC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAE7C,MAAM,WAAW,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QAE1F,MAAM,MAAM,GAAG,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,OAAiB,EAAE,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9F,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;QACjD,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,
|
|
1
|
+
{"version":3,"file":"print-handler-express.js","sourceRoot":"","sources":["../../src/pdf-tickets/print-handler-express.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,uCAAuC,CAAC;AAEhE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGrE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,MAAM,GAAG,YAAY,CAAC,qBAAqB,CAAC,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GAA4C,EAAE,GAAa;IACnG,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;IAElD,IAAI,CAAC;QACH,IACE,OAAO,OAAO,KAAK,QAAQ;YAC3B,OAAO,GAAG,KAAK,QAAQ;YACvB,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,CAAC;YAExC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAE7C,MAAM,WAAW,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QAE1F,MAAM,MAAM,GAAG,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,OAAiB,EAAE,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9F,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;QACjD,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACpB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACxB,CAAC;AACH,CAAC;AAED,eAAe,mBAAmB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"print-handler-fastify.d.ts","sourceRoot":"","sources":["../../src/pdf-tickets/print-handler-fastify.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAkB,kBAAkB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"print-handler-fastify.d.ts","sourceRoot":"","sources":["../../src/pdf-tickets/print-handler-fastify.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAkB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAKlE,QAAA,MAAM,mBAAmB,EAAE,kBA+B1B,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { checkAction } from '@unchainedshop/api/lib/acl.js';
|
|
2
2
|
import { actions } from '@unchainedshop/api/lib/roles/index.js';
|
|
3
3
|
import { RendererTypes, getRenderer } from '../template-registry.js';
|
|
4
|
+
import { createLogger } from '@unchainedshop/logger';
|
|
5
|
+
const logger = createLogger('unchained:ticketing:print-handler');
|
|
4
6
|
const printTicketsHandler = async (req, reply) => {
|
|
5
7
|
const { variant, orderId, otp } = req.query || {};
|
|
6
8
|
try {
|
|
@@ -15,9 +17,13 @@ const printTicketsHandler = async (req, reply) => {
|
|
|
15
17
|
return reply.send(pdfStream);
|
|
16
18
|
}
|
|
17
19
|
catch (error) {
|
|
18
|
-
|
|
20
|
+
logger.error(error);
|
|
19
21
|
reply.status(403);
|
|
20
|
-
return reply.send(
|
|
22
|
+
return reply.send({
|
|
23
|
+
success: false,
|
|
24
|
+
message: 'Error generating PDF',
|
|
25
|
+
name: 'PDF_GENERATION_ERROR',
|
|
26
|
+
});
|
|
21
27
|
}
|
|
22
28
|
};
|
|
23
29
|
export default printTicketsHandler;
|