@agnostack/next-shopify 1.7.1-alpha.2 → 1.7.1-alpha.3
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.
|
@@ -5,7 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.handleAppUninstalled = exports.rawBodyConfig = void 0;
|
|
7
7
|
const raw_body_1 = __importDefault(require("raw-body"));
|
|
8
|
-
|
|
8
|
+
// import {
|
|
9
|
+
// setAbstractConvertResponseFunc,
|
|
10
|
+
// setAbstractConvertIncomingResponseFunc,
|
|
11
|
+
// } from '@shopify/shopify-api/runtime'
|
|
9
12
|
const utils_1 = require("../../utils");
|
|
10
13
|
// NOTE raw request body is required for Shopify webhook validation
|
|
11
14
|
exports.rawBodyConfig = {
|
|
@@ -27,32 +30,48 @@ const handleAppUninstalled = (serverRuntimeConfig) => async (req, res) => {
|
|
|
27
30
|
return res.status(400).send('Invalid shop');
|
|
28
31
|
}
|
|
29
32
|
const { shopify, findSession, deleteSessions } = await utils_1.getShopifyHelpers(serverRuntimeConfig, { shop });
|
|
30
|
-
|
|
31
|
-
// NOTE setAbstractConvertIncomingResponseFunc is required if using setAbstractConvertResponseFunc
|
|
32
|
-
runtime_1.setAbstractConvertIncomingResponseFunc(async (args) => args);
|
|
33
|
-
runtime_1.setAbstractConvertResponseFunc(async (response, adapterArgs) => {
|
|
34
|
-
const { statusCode, statusText } = utils_1.ensureObject(response);
|
|
35
|
-
const { type, rawResponse } = utils_1.ensureObject(adapterArgs);
|
|
36
|
-
// NOTE additional check (before removing sessions) to ensure this is the uninstall response scenario (although this nay not be needed)
|
|
37
|
-
if (type === utils_1.API_WEBHOOK_TOPICS.APP_UNINSTALLED && statusCode === 200) {
|
|
38
|
-
try {
|
|
39
|
-
const sessionsIds = await findSession(shop);
|
|
40
|
-
if (utils_1.arrayNotEmpty(sessionsIds)) {
|
|
41
|
-
await deleteSessions(sessionsIds.map(({ id }) => id));
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
catch (error) {
|
|
45
|
-
return rawResponse.status(500).send(error === null || error === void 0 ? void 0 : error.message);
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
return rawResponse.status(statusCode).send(statusText);
|
|
49
|
-
});
|
|
50
|
-
return shopify.webhooks.process({
|
|
33
|
+
const { valid } = await shopify.webhooks.validate({
|
|
51
34
|
rawBody: rawBody.toString(),
|
|
52
35
|
rawRequest: req,
|
|
53
36
|
rawResponse: res,
|
|
54
|
-
type: utils_1.API_WEBHOOK_TOPICS.APP_UNINSTALLED,
|
|
55
37
|
});
|
|
38
|
+
if (valid) {
|
|
39
|
+
try {
|
|
40
|
+
const sessionsIds = await findSession(shop);
|
|
41
|
+
if (utils_1.arrayNotEmpty(sessionsIds)) {
|
|
42
|
+
await deleteSessions(sessionsIds.map(({ id }) => id));
|
|
43
|
+
}
|
|
44
|
+
return res.status(200).send('success');
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
return res.status(500).send(error === null || error === void 0 ? void 0 : error.message);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
// // NOTE these methods will intercept the response from shopify.webhooks.process
|
|
51
|
+
// // NOTE setAbstractConvertIncomingResponseFunc is required if using setAbstractConvertResponseFunc
|
|
52
|
+
// setAbstractConvertIncomingResponseFunc(async (args) => args)
|
|
53
|
+
// setAbstractConvertResponseFunc(async (response, adapterArgs) => {
|
|
54
|
+
// const { statusCode, statusText } = ensureObject(response)
|
|
55
|
+
// const { type, rawResponse } = ensureObject(adapterArgs)
|
|
56
|
+
// // NOTE additional check (before removing sessions) to ensure this is the uninstall response scenario (although this nay not be needed)
|
|
57
|
+
// if (type === API_WEBHOOK_TOPICS.APP_UNINSTALLED && statusCode === 200) {
|
|
58
|
+
// try {
|
|
59
|
+
// const sessionsIds = await findSession(shop)
|
|
60
|
+
// if (arrayNotEmpty(sessionsIds)) {
|
|
61
|
+
// await deleteSessions(sessionsIds.map(({ id }) => id))
|
|
62
|
+
// }
|
|
63
|
+
// } catch (error) {
|
|
64
|
+
// return rawResponse.status(500).send(error?.message)
|
|
65
|
+
// }
|
|
66
|
+
// }
|
|
67
|
+
// return rawResponse.status(statusCode).send(statusText)
|
|
68
|
+
// })
|
|
69
|
+
// return shopify.webhooks.process({
|
|
70
|
+
// rawBody: rawBody.toString(),
|
|
71
|
+
// rawRequest: req,
|
|
72
|
+
// rawResponse: res,
|
|
73
|
+
// type: API_WEBHOOK_TOPICS.APP_UNINSTALLED,
|
|
74
|
+
// })
|
|
56
75
|
}
|
|
57
76
|
catch (error) {
|
|
58
77
|
console.error('Error handling uninstall', error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../src/handlers/api/uninstall.js"],"names":[],"mappings":";;;;;;AAAA,wDAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../src/handlers/api/uninstall.js"],"names":[],"mappings":";;;;;;AAAA,wDAAiC;AACjC,WAAW;AACX,oCAAoC;AACpC,4CAA4C;AAC5C,wCAAwC;AAExC,uCAMoB;AAEpB,mEAAmE;AACtD,QAAA,aAAa,GAAG;IAC3B,GAAG,EAAE;QACH,UAAU,EAAE,KAAK;KAClB;CACF,CAAA;AAED,4DAA4D;AACrD,MAAM,oBAAoB,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC9E,mEAAmE;IACnE,MAAM,OAAO,GAAG,MAAM,kBAAU,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACpD,OAAO,CAAC,KAAK,CAAC,6CAA6C,EAAE,KAAK,CAAC,CAAA;QAEnE,2EAA2E;QAC3E,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;IAC3D,CAAC,CAAC,CAAA;IAEF,IAAI;QACF,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAA;QAEjD,IAAI,mBAAW,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;SAC5C;QAED,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,MAAM,yBAAiB,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;QAEvG,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAChD,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;YAC3B,UAAU,EAAE,GAAG;YACf,WAAW,EAAE,GAAG;SACjB,CAAC,CAAA;QAEF,IAAI,KAAK,EAAE;YACT,IAAI;gBACF,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAA;gBAC3C,IAAI,qBAAa,CAAC,WAAW,CAAC,EAAE;oBAC9B,MAAM,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;iBACtD;gBACD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;aACvC;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAA;aAC5C;SACF;QAED,kFAAkF;QAClF,qGAAqG;QACrG,+DAA+D;QAC/D,oEAAoE;QACpE,8DAA8D;QAC9D,4DAA4D;QAE5D,4IAA4I;QAC5I,6EAA6E;QAC7E,YAAY;QACZ,oDAAoD;QACpD,0CAA0C;QAC1C,gEAAgE;QAChE,UAAU;QACV,wBAAwB;QACxB,4DAA4D;QAC5D,QAAQ;QACR,MAAM;QAEN,2DAA2D;QAC3D,KAAK;QAEL,oCAAoC;QACpC,iCAAiC;QACjC,qBAAqB;QACrB,sBAAsB;QACtB,8CAA8C;QAC9C,KAAK;KACN;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;QAChD,sFAAsF;QACtF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;KACxD;AACH,CAAC,CAAA;AArEY,QAAA,oBAAoB,wBAqEhC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agnostack/next-shopify",
|
|
3
|
-
"version": "1.7.1-alpha.
|
|
3
|
+
"version": "1.7.1-alpha.3",
|
|
4
4
|
"author": "agnoStack Dev <developers@agnostack.com> (https://agnostack.com)",
|
|
5
5
|
"owner": "agnoStack",
|
|
6
6
|
"description": "Please contact agnoStack via info@agnostack.com for any questions",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
50
|
"@agnostack/next-plugins": "latest",
|
|
51
|
-
"@shopify/shopify-api": "7.
|
|
51
|
+
"@shopify/shopify-api": "7.2.0",
|
|
52
52
|
"browser-monads": "1.0.0",
|
|
53
53
|
"cookies": "0.8.0",
|
|
54
54
|
"luxon": "3.2.1",
|