@unchainedshop/ticketing 2.13.0 → 3.0.0-alpha2
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/magic-key.d.ts.map +1 -1
- package/lib/magic-key.js +4 -5
- package/lib/magic-key.js.map +1 -1
- package/lib/mobile-tickets/apple-webservice.d.ts.map +1 -1
- package/lib/mobile-tickets/apple-webservice.js +1 -2
- package/lib/mobile-tickets/apple-webservice.js.map +1 -1
- package/lib/mobile-tickets/google-webservice.d.ts.map +1 -1
- package/lib/mobile-tickets/google-webservice.js +1 -2
- package/lib/mobile-tickets/google-webservice.js.map +1 -1
- package/lib/pdf-tickets/print-webservice.d.ts.map +1 -1
- package/lib/pdf-tickets/print-webservice.js +1 -2
- package/lib/pdf-tickets/print-webservice.js.map +1 -1
- package/package.json +14 -9
- package/readme.md +0 -2
- package/src/magic-key.ts +4 -6
- package/src/mobile-tickets/apple-webservice.ts +1 -3
- package/src/mobile-tickets/google-webservice.ts +1 -3
- package/src/pdf-tickets/print-webservice.ts +1 -3
package/lib/magic-key.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"magic-key.d.ts","sourceRoot":"","sources":["../src/magic-key.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"magic-key.d.ts","sourceRoot":"","sources":["../src/magic-key.ts"],"names":[],"mappings":";AAoCA,wBAIE"}
|
package/lib/magic-key.js
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import { roles } from '@unchainedshop/api';
|
|
2
|
-
const isMagicKeyValidForOrder = async (obj, { orderId }, { modules,
|
|
2
|
+
const isMagicKeyValidForOrder = async (obj, { orderId }, { modules, getHeader }) => {
|
|
3
3
|
const order = await modules.orders.findOrder({ orderId });
|
|
4
4
|
// always return true if orderId leads to nothing to show potentially allowed actions
|
|
5
5
|
if (!order)
|
|
6
6
|
return true;
|
|
7
7
|
const magicKey = await modules.passes.buildMagicKey(order._id);
|
|
8
|
-
return magicKey ===
|
|
8
|
+
return magicKey === getHeader('x-magic-key');
|
|
9
9
|
};
|
|
10
|
-
const isMagicKeyValidForToken = async (obj, { tokenId },
|
|
11
|
-
const { modules, req } = context;
|
|
10
|
+
const isMagicKeyValidForToken = async (obj, { tokenId }, { modules, getHeader }) => {
|
|
12
11
|
const token = await modules.warehousing.findToken({ tokenId });
|
|
13
12
|
// always return true if tokenId leads to nothing to show potentially allowed actions
|
|
14
13
|
if (!token)
|
|
@@ -20,7 +19,7 @@ const isMagicKeyValidForToken = async (obj, { tokenId }, context) => {
|
|
|
20
19
|
if (order.userId !== token.userId)
|
|
21
20
|
return false;
|
|
22
21
|
const magicKey = await modules.passes.buildMagicKey(order._id);
|
|
23
|
-
return magicKey ===
|
|
22
|
+
return magicKey === getHeader('x-magic-key');
|
|
24
23
|
};
|
|
25
24
|
export default () => {
|
|
26
25
|
roles.allRoles.ALL.allow(roles.actions.viewOrder, isMagicKeyValidForOrder);
|
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,
|
|
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,GAAQ,EACR,EAAE,OAAO,EAAuB,EAChC,EAAE,OAAO,EAAE,SAAS,EAA0B,EAC9C,EAAE;IACF,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,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC;IAC3E,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC;IAC3E,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;AAC/E,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apple-webservice.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/apple-webservice.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"apple-webservice.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/apple-webservice.ts"],"names":[],"mappings":"AACA,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,QAQjD"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { createLogger } from '@unchainedshop/logger';
|
|
2
|
-
import { useMiddlewareWithCurrentContext } from '@unchainedshop/api/express/index.js';
|
|
3
2
|
import express from 'express';
|
|
4
3
|
const logger = createLogger('unchained:apple-wallet-webservice');
|
|
5
4
|
const { APPLE_WALLET_WEBSERVICE_PATH = '/rest/apple-wallet' } = process.env;
|
|
@@ -170,7 +169,7 @@ export const appleWalletHandler = async (req, res) => {
|
|
|
170
169
|
res.end();
|
|
171
170
|
};
|
|
172
171
|
export default function loadAppleWalletHandler(app) {
|
|
173
|
-
|
|
172
|
+
app.use(APPLE_WALLET_WEBSERVICE_PATH, express.json({
|
|
174
173
|
type: 'application/json',
|
|
175
174
|
}), appleWalletHandler);
|
|
176
175
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apple-webservice.js","sourceRoot":"","sources":["../../src/mobile-tickets/apple-webservice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,
|
|
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-webservice.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/google-webservice.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"google-webservice.d.ts","sourceRoot":"","sources":["../../src/mobile-tickets/google-webservice.ts"],"names":[],"mappings":"AACA,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,QAQlD"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { createLogger } from '@unchainedshop/logger';
|
|
2
|
-
import { useMiddlewareWithCurrentContext } from '@unchainedshop/api/express/index.js';
|
|
3
2
|
import express from 'express';
|
|
4
3
|
const logger = createLogger('unchained:google-wallet-webservice');
|
|
5
4
|
const { GOOGLE_WALLET_WEBSERVICE_PATH = '/rest/google-wallet' } = process.env;
|
|
@@ -45,7 +44,7 @@ export const googleWalletHandler = async (req, res) => {
|
|
|
45
44
|
res.end();
|
|
46
45
|
};
|
|
47
46
|
export default function loadGoogleWalletHandler(app) {
|
|
48
|
-
|
|
47
|
+
app.use(GOOGLE_WALLET_WEBSERVICE_PATH, express.json({
|
|
49
48
|
type: 'application/json',
|
|
50
49
|
}), googleWalletHandler);
|
|
51
50
|
}
|
|
@@ -1 +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,
|
|
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,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,GAAG,CAAC,GAAG,CACL,6BAA6B,EAC7B,OAAO,CAAC,IAAI,CAAC;QACX,IAAI,EAAE,kBAAkB;KACzB,CAAC,EACF,mBAAmB,CACpB,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"print-webservice.d.ts","sourceRoot":"","sources":["../../src/pdf-tickets/print-webservice.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"print-webservice.d.ts","sourceRoot":"","sources":["../../src/pdf-tickets/print-webservice.ts"],"names":[],"mappings":"AAEA,OAAgB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAKtD,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG;IAAE,gBAAgB,EAAE,OAAO,CAAA;CAAE,EAAE,GAAG,EAAE,QAAQ,iBAsBpG;AAED,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,GAAG,KAAA,QAQjD"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { useMiddlewareWithCurrentContext } from '@unchainedshop/api/express/index.js';
|
|
2
1
|
import { checkAction } from '@unchainedshop/api/acl.js';
|
|
3
2
|
import { actions } from '@unchainedshop/api/roles/index.js';
|
|
4
3
|
import express from 'express';
|
|
@@ -24,7 +23,7 @@ export async function printTicketsHandler(req, res) {
|
|
|
24
23
|
}
|
|
25
24
|
}
|
|
26
25
|
export default function connectPrintWebservice(app) {
|
|
27
|
-
|
|
26
|
+
app.use(UNCHAINED_PDF_PRINT_HANDLER_PATH, express.json({
|
|
28
27
|
type: 'application/json',
|
|
29
28
|
}), printTicketsHandler);
|
|
30
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"print-webservice.js","sourceRoot":"","sources":["../../src/pdf-tickets/print-webservice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE
|
|
1
|
+
{"version":3,"file":"print-webservice.js","sourceRoot":"","sources":["../../src/pdf-tickets/print-webservice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAC5D,OAAO,OAA8B,MAAM,SAAS,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAErE,MAAM,EAAE,gCAAgC,GAAG,qBAAqB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjF,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,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,GAAG;IAChD,GAAG,CAAC,GAAG,CACL,gCAAgC,EAChC,OAAO,CAAC,IAAI,CAAC;QACX,IAAI,EAAE,kBAAkB;KACzB,CAAC,EACF,mBAAmB,CACpB,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/ticketing",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0-alpha2",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"types": "lib/index.d.ts",
|
|
6
6
|
"exports": {
|
|
@@ -41,13 +41,12 @@
|
|
|
41
41
|
},
|
|
42
42
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@unchainedshop/api": "^
|
|
45
|
-
"@unchainedshop/core-files": "^
|
|
46
|
-
"@unchainedshop/core-
|
|
47
|
-
"@unchainedshop/
|
|
48
|
-
"@unchainedshop/
|
|
49
|
-
"@unchainedshop/
|
|
50
|
-
"@unchainedshop/mongodb": "^2.13.0"
|
|
44
|
+
"@unchainedshop/api": "^3.0.0-alpha2",
|
|
45
|
+
"@unchainedshop/core-files": "^3.0.0-alpha2",
|
|
46
|
+
"@unchainedshop/core-worker": "^3.0.0-alpha2",
|
|
47
|
+
"@unchainedshop/events": "^3.0.0-alpha2",
|
|
48
|
+
"@unchainedshop/logger": "^3.0.0-alpha2",
|
|
49
|
+
"@unchainedshop/mongodb": "^3.0.0-alpha2"
|
|
51
50
|
},
|
|
52
51
|
"peerDependencies": {
|
|
53
52
|
"@hyperlink/node-apn": "^5.1.4",
|
|
@@ -55,6 +54,12 @@
|
|
|
55
54
|
},
|
|
56
55
|
"devDependencies": {
|
|
57
56
|
"@types/node": "^20.14.12",
|
|
58
|
-
"@unchainedshop/
|
|
57
|
+
"@unchainedshop/api": "^3.0.0-alpha2",
|
|
58
|
+
"@unchainedshop/core-files": "^3.0.0-alpha2",
|
|
59
|
+
"@unchainedshop/core-worker": "^3.0.0-alpha2",
|
|
60
|
+
"@unchainedshop/events": "^3.0.0-alpha2",
|
|
61
|
+
"@unchainedshop/logger": "^3.0.0-alpha2",
|
|
62
|
+
"@unchainedshop/mongodb": "^3.0.0-alpha2",
|
|
63
|
+
"@unchainedshop/types": "^3.0.0-alpha2"
|
|
59
64
|
}
|
|
60
65
|
}
|
package/readme.md
CHANGED
package/src/magic-key.ts
CHANGED
|
@@ -5,23 +5,21 @@ import { TicketingAPI } from './types.js';
|
|
|
5
5
|
const isMagicKeyValidForOrder = async (
|
|
6
6
|
obj: any,
|
|
7
7
|
{ orderId }: { orderId: string },
|
|
8
|
-
{ modules,
|
|
8
|
+
{ modules, getHeader }: Context & TicketingAPI,
|
|
9
9
|
) => {
|
|
10
10
|
const order = await modules.orders.findOrder({ orderId });
|
|
11
11
|
// always return true if orderId leads to nothing to show potentially allowed actions
|
|
12
12
|
if (!order) return true;
|
|
13
13
|
|
|
14
14
|
const magicKey = await modules.passes.buildMagicKey(order._id);
|
|
15
|
-
return magicKey ===
|
|
15
|
+
return magicKey === getHeader('x-magic-key');
|
|
16
16
|
};
|
|
17
17
|
|
|
18
18
|
const isMagicKeyValidForToken = async (
|
|
19
19
|
obj: any,
|
|
20
20
|
{ tokenId }: { tokenId: string },
|
|
21
|
-
|
|
21
|
+
{ modules, getHeader }: Context & TicketingAPI,
|
|
22
22
|
) => {
|
|
23
|
-
const { modules, req } = context;
|
|
24
|
-
|
|
25
23
|
const token = await modules.warehousing.findToken({ tokenId });
|
|
26
24
|
// always return true if tokenId leads to nothing to show potentially allowed actions
|
|
27
25
|
if (!token) return true;
|
|
@@ -33,7 +31,7 @@ const isMagicKeyValidForToken = async (
|
|
|
33
31
|
if (order.userId !== token.userId) return false;
|
|
34
32
|
|
|
35
33
|
const magicKey = await modules.passes.buildMagicKey(order._id);
|
|
36
|
-
return magicKey ===
|
|
34
|
+
return magicKey === getHeader('x-magic-key');
|
|
37
35
|
};
|
|
38
36
|
|
|
39
37
|
export default () => {
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { createLogger } from '@unchainedshop/logger';
|
|
2
|
-
import { useMiddlewareWithCurrentContext } from '@unchainedshop/api/express/index.js';
|
|
3
2
|
import express, { Request, Response } from 'express';
|
|
4
3
|
import { TicketingAPI } from '../types.js';
|
|
5
4
|
|
|
@@ -234,8 +233,7 @@ export const appleWalletHandler = async (
|
|
|
234
233
|
};
|
|
235
234
|
|
|
236
235
|
export default function loadAppleWalletHandler(app) {
|
|
237
|
-
|
|
238
|
-
app,
|
|
236
|
+
app.use(
|
|
239
237
|
APPLE_WALLET_WEBSERVICE_PATH,
|
|
240
238
|
express.json({
|
|
241
239
|
type: 'application/json',
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { createLogger } from '@unchainedshop/logger';
|
|
2
|
-
import { useMiddlewareWithCurrentContext } from '@unchainedshop/api/express/index.js';
|
|
3
2
|
import express, { Request, Response } from 'express';
|
|
4
3
|
import { TicketingAPI } from '../types.js';
|
|
5
4
|
|
|
@@ -59,8 +58,7 @@ export const googleWalletHandler = async (
|
|
|
59
58
|
};
|
|
60
59
|
|
|
61
60
|
export default function loadGoogleWalletHandler(app) {
|
|
62
|
-
|
|
63
|
-
app,
|
|
61
|
+
app.use(
|
|
64
62
|
GOOGLE_WALLET_WEBSERVICE_PATH,
|
|
65
63
|
express.json({
|
|
66
64
|
type: 'application/json',
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { useMiddlewareWithCurrentContext } from '@unchainedshop/api/express/index.js';
|
|
2
1
|
import { checkAction } from '@unchainedshop/api/acl.js';
|
|
3
2
|
import { actions } from '@unchainedshop/api/roles/index.js';
|
|
4
3
|
import express, { Request, Response } from 'express';
|
|
@@ -32,8 +31,7 @@ export async function printTicketsHandler(req: Request & { unchainedContext: Con
|
|
|
32
31
|
}
|
|
33
32
|
|
|
34
33
|
export default function connectPrintWebservice(app) {
|
|
35
|
-
|
|
36
|
-
app,
|
|
34
|
+
app.use(
|
|
37
35
|
UNCHAINED_PDF_PRINT_HANDLER_PATH,
|
|
38
36
|
express.json({
|
|
39
37
|
type: 'application/json',
|