@agnostack/next-shopify 1.7.1-alpha.1 → 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.
@@ -1,5 +1,6 @@
1
1
  export * from "./auth";
2
2
  export * from "./callback";
3
3
  export * from "./graph";
4
+ export * from "./proxy";
4
5
  export * from "./rest";
5
6
  export * from "./uninstall";
@@ -0,0 +1 @@
1
+ export function handleProxy(): (req: any, res: any, _params: any) => Promise<any>;
@@ -0,0 +1,89 @@
1
+ "use strict";
2
+ var __rest = (this && this.__rest) || function (s, e) {
3
+ var t = {};
4
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
5
+ t[p] = s[p];
6
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
7
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
8
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
9
+ t[p[i]] = s[p[i]];
10
+ }
11
+ return t;
12
+ };
13
+ Object.defineProperty(exports, "__esModule", { value: true });
14
+ exports.handleProxy = void 0;
15
+ // NOTE: api routes do NOT work in `next export`
16
+ const shopify_api_1 = require("@shopify/shopify-api");
17
+ // import {
18
+ // isType,
19
+ // stringEmpty,
20
+ // ensureString,
21
+ // ensureObject,
22
+ // getVerifiedClients,
23
+ // querystringToObject,
24
+ // getAuthErrorResponse,
25
+ // ShopifyAuthenticationError,
26
+ // } from '../../utils'
27
+ const handleProxy = () => async (req, res, _params) => {
28
+ console.log(`>>> ~ _params`, _params);
29
+ const { query: _query, method: _method, body: _body } = req;
30
+ console.log(`>>> ~ req`, { _query, _method, _body });
31
+ // const { shop } = _query ?? {}
32
+ const _a = _params !== null && _params !== void 0 ? _params : {}, {
33
+ // method: methodParam,
34
+ // query: queryParam,
35
+ // body: bodyParam,
36
+ path } = _a, params = __rest(_a, ["path"]);
37
+ console.log(`>>> ~ path`, path);
38
+ // if (stringEmpty(shop) || stringEmpty(path)) {
39
+ // return {
40
+ // statusCode: 400,
41
+ // message: 'Invalid arguments',
42
+ // }
43
+ // }
44
+ let statusCode;
45
+ let response;
46
+ let message;
47
+ let headers = {};
48
+ try {
49
+ response = 'proxy success';
50
+ statusCode = 200;
51
+ }
52
+ catch (error) {
53
+ message = 'Error handling proxy call';
54
+ statusCode = 500;
55
+ switch (true) {
56
+ // case error instanceof ShopifyAuthenticationError: {
57
+ // console.error(`${message}. Authentication Error`, error)
58
+ // const errroResponse = getAuthErrorResponse({ error, shop, serverRuntimeConfig })
59
+ // statusCode = errroResponse.statusCode
60
+ // message = errroResponse.message
61
+ // headers = errroResponse.headers
62
+ // break
63
+ // }
64
+ case error instanceof shopify_api_1.BillingError: {
65
+ console.error(`${message}. Billing Error - ${error.message}`, error.errorData);
66
+ break;
67
+ }
68
+ default: {
69
+ console.error(message, error);
70
+ break;
71
+ }
72
+ }
73
+ }
74
+ Object.entries(headers).forEach(([key, value]) => {
75
+ res.setHeader(key, value);
76
+ });
77
+ if (!response) {
78
+ return res.status(statusCode).json({ message });
79
+ }
80
+ if ((params === null || params === void 0 ? void 0 : params.type) && ![shopify_api_1.DataType.GraphQL, shopify_api_1.DataType.JSON].includes(params.type)) {
81
+ return res.status(statusCode).send(response);
82
+ }
83
+ if (!(response === null || response === void 0 ? void 0 : response.body)) {
84
+ return res.status(statusCode).json({ message });
85
+ }
86
+ return res.status(statusCode).json(response.body);
87
+ };
88
+ exports.handleProxy = handleProxy;
89
+ //# sourceMappingURL=proxy.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/handlers/api/proxy.js"],"names":[],"mappings":"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"}
@@ -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
- const runtime_1 = require("@shopify/shopify-api/runtime");
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
- // NOTE these methods will intercept the response from shopify.webhooks.process
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,0DAGqC;AAErC,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,+EAA+E;QAC/E,kGAAkG;QAClG,gDAAsC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAA;QAC5D,wCAA8B,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE;YAC7D,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,oBAAY,CAAC,QAAQ,CAAC,CAAA;YACzD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,oBAAY,CAAC,WAAW,CAAC,CAAA;YAEvD,uIAAuI;YACvI,IAAI,IAAI,KAAK,0BAAkB,CAAC,eAAe,IAAI,UAAU,KAAK,GAAG,EAAE;gBACrE,IAAI;oBACF,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAA;oBAC3C,IAAI,qBAAa,CAAC,WAAW,CAAC,EAAE;wBAC9B,MAAM,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;qBACtD;iBACF;gBAAC,OAAO,KAAK,EAAE;oBACd,OAAO,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,CAAA;iBACpD;aACF;YAED,OAAO,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACxD,CAAC,CAAC,CAAA;QAEF,OAAO,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC9B,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;YAC3B,UAAU,EAAE,GAAG;YACf,WAAW,EAAE,GAAG;YAChB,IAAI,EAAE,0BAAkB,CAAC,eAAe;SACzC,CAAC,CAAA;KACH;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;AAnDY,QAAA,oBAAoB,wBAmDhC"}
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.1",
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.1.0",
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",