@agnostack/next-shopify 1.14.0-beta.4 → 1.14.0-beta.41

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.
Files changed (76) hide show
  1. package/CHANGELOG.md +259 -0
  2. package/dist/lib/handlers/api/appInstallation.d.ts.map +1 -0
  3. package/dist/lib/handlers/api/appInstallation.js.map +1 -0
  4. package/dist/lib/handlers/api/billing.d.ts.map +1 -1
  5. package/dist/lib/handlers/api/billing.js +3 -5
  6. package/dist/lib/handlers/api/billing.js.map +1 -1
  7. package/dist/lib/handlers/api/graph.d.ts.map +1 -0
  8. package/dist/lib/handlers/api/{verifiable/graph.js → graph.js} +22 -12
  9. package/dist/lib/handlers/api/graph.js.map +1 -0
  10. package/dist/lib/handlers/api/index.d.ts +5 -1
  11. package/dist/lib/handlers/api/index.d.ts.map +1 -1
  12. package/dist/lib/handlers/api/index.js +5 -1
  13. package/dist/lib/handlers/api/index.js.map +1 -1
  14. package/dist/lib/handlers/api/proxy.d.ts.map +1 -0
  15. package/dist/lib/handlers/api/{verifiable/proxy.js → proxy.js} +27 -10
  16. package/dist/lib/handlers/api/proxy.js.map +1 -0
  17. package/dist/lib/handlers/api/rest.d.ts.map +1 -0
  18. package/dist/lib/handlers/api/{verifiable/rest.js → rest.js} +10 -7
  19. package/dist/lib/handlers/api/rest.js.map +1 -0
  20. package/dist/lib/handlers/api/token.d.ts.map +1 -0
  21. package/dist/lib/handlers/api/{verifiable/token.js → token.js} +10 -8
  22. package/dist/lib/handlers/api/token.js.map +1 -0
  23. package/dist/lib/handlers/api/uninstall.d.ts.map +1 -1
  24. package/dist/lib/handlers/api/uninstall.js +3 -4
  25. package/dist/lib/handlers/api/uninstall.js.map +1 -1
  26. package/dist/lib/handlers/api/verifiable/index.d.ts +0 -5
  27. package/dist/lib/handlers/api/verifiable/index.js +5 -8
  28. package/dist/lib/handlers/api/verifiable/index.js.map +1 -1
  29. package/dist/lib/handlers/api/webhook.d.ts.map +1 -1
  30. package/dist/lib/handlers/api/webhook.js +2 -4
  31. package/dist/lib/handlers/api/webhook.js.map +1 -1
  32. package/dist/lib/index.d.ts +1 -1
  33. package/dist/lib/index.d.ts.map +1 -1
  34. package/dist/lib/index.js +3 -2
  35. package/dist/lib/index.js.map +1 -1
  36. package/dist/lib/utils/index.d.ts +1 -0
  37. package/dist/lib/utils/index.js +1 -0
  38. package/dist/lib/utils/index.js.map +1 -1
  39. package/dist/lib/utils/request.d.ts +2 -0
  40. package/dist/lib/utils/request.d.ts.map +1 -0
  41. package/dist/lib/utils/request.js +19 -0
  42. package/dist/lib/utils/request.js.map +1 -0
  43. package/dist/lib/utils/token.d.ts +3 -1
  44. package/dist/lib/utils/token.d.ts.map +1 -1
  45. package/dist/lib/utils/token.js +31 -23
  46. package/dist/lib/utils/token.js.map +1 -1
  47. package/dist/lib/utils/verification.d.ts +1 -1
  48. package/dist/lib/utils/verification.d.ts.map +1 -1
  49. package/dist/lib/utils/verification.js +25 -17
  50. package/dist/lib/utils/verification.js.map +1 -1
  51. package/dist/lib/withShopify.d.ts.map +1 -1
  52. package/dist/lib/withShopify.js +5 -3
  53. package/dist/lib/withShopify.js.map +1 -1
  54. package/dist/react/hooks/useVerification.d.ts +6 -3
  55. package/dist/react/hooks/useVerification.d.ts.map +1 -1
  56. package/dist/react/hooks/useVerification.js +28 -12
  57. package/dist/react/hooks/useVerification.js.map +1 -1
  58. package/dist/shared/display.js +1 -1
  59. package/dist/shared/display.js.map +1 -1
  60. package/package.json +1 -1
  61. package/dist/lib/handlers/api/verifiable/appInstallation.d.ts.map +0 -1
  62. package/dist/lib/handlers/api/verifiable/appInstallation.js.map +0 -1
  63. package/dist/lib/handlers/api/verifiable/graph.d.ts.map +0 -1
  64. package/dist/lib/handlers/api/verifiable/graph.js.map +0 -1
  65. package/dist/lib/handlers/api/verifiable/proxy.d.ts.map +0 -1
  66. package/dist/lib/handlers/api/verifiable/proxy.js.map +0 -1
  67. package/dist/lib/handlers/api/verifiable/rest.d.ts.map +0 -1
  68. package/dist/lib/handlers/api/verifiable/rest.js.map +0 -1
  69. package/dist/lib/handlers/api/verifiable/token.d.ts.map +0 -1
  70. package/dist/lib/handlers/api/verifiable/token.js.map +0 -1
  71. /package/dist/lib/handlers/api/{verifiable/appInstallation.d.ts → appInstallation.d.ts} +0 -0
  72. /package/dist/lib/handlers/api/{verifiable/appInstallation.js → appInstallation.js} +0 -0
  73. /package/dist/lib/handlers/api/{verifiable/graph.d.ts → graph.d.ts} +0 -0
  74. /package/dist/lib/handlers/api/{verifiable/proxy.d.ts → proxy.d.ts} +0 -0
  75. /package/dist/lib/handlers/api/{verifiable/rest.d.ts → rest.d.ts} +0 -0
  76. /package/dist/lib/handlers/api/{verifiable/token.d.ts → token.d.ts} +0 -0
package/CHANGELOG.md CHANGED
@@ -1,3 +1,262 @@
1
+ # [1.14.0-beta.41](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.40...v1.14.0-beta.41) (2023-12-05)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * wip ([5d4d8f4](https://github.com/agnostack/next-shopify/commit/5d4d8f411fae34852841e09ae57fb58910351d8d))
7
+
8
+ # [1.14.0-beta.40](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.39...v1.14.0-beta.40) (2023-12-05)
9
+
10
+
11
+ ### Bug Fixes
12
+
13
+ * wip ([2d7cc64](https://github.com/agnostack/next-shopify/commit/2d7cc64330e48d1de42f2dfa358fa172564aeea2))
14
+
15
+ # [1.14.0-beta.39](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.38...v1.14.0-beta.39) (2023-12-05)
16
+
17
+
18
+ ### Bug Fixes
19
+
20
+ * wip ([74a60e5](https://github.com/agnostack/next-shopify/commit/74a60e507c91e15a37d7a2294b431bbbf48e751b))
21
+
22
+ # [1.14.0-beta.38](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.37...v1.14.0-beta.38) (2023-12-05)
23
+
24
+
25
+ ### Bug Fixes
26
+
27
+ * wip ([92bedc2](https://github.com/agnostack/next-shopify/commit/92bedc2c6c204bcfd69d9323af573788482d9976))
28
+
29
+ # [1.14.0-beta.37](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.36...v1.14.0-beta.37) (2023-12-05)
30
+
31
+
32
+ ### Bug Fixes
33
+
34
+ * wip ([a672c2c](https://github.com/agnostack/next-shopify/commit/a672c2c18390088648ad2ce99dc87d918edc4620))
35
+
36
+ # [1.14.0-beta.36](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.35...v1.14.0-beta.36) (2023-12-05)
37
+
38
+
39
+ ### Bug Fixes
40
+
41
+ * wip ([0542c81](https://github.com/agnostack/next-shopify/commit/0542c819cce56689986e833a21da9cb830a01790))
42
+
43
+ # [1.14.0-beta.35](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.34...v1.14.0-beta.35) (2023-12-05)
44
+
45
+
46
+ ### Bug Fixes
47
+
48
+ * wip ([76afe24](https://github.com/agnostack/next-shopify/commit/76afe244c05fd5700791231799a81cca118e15d1))
49
+
50
+ # [1.14.0-beta.34](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.33...v1.14.0-beta.34) (2023-12-05)
51
+
52
+
53
+ ### Bug Fixes
54
+
55
+ * wip ([d9d3156](https://github.com/agnostack/next-shopify/commit/d9d315644a414c9319f209dcbae811d87a441d3e))
56
+
57
+ # [1.14.0-beta.33](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.32...v1.14.0-beta.33) (2023-12-05)
58
+
59
+
60
+ ### Bug Fixes
61
+
62
+ * wip ([d207a40](https://github.com/agnostack/next-shopify/commit/d207a407ee2ff67798dc7ca0c99c9b1f696d04e4))
63
+
64
+ # [1.14.0-beta.32](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.31...v1.14.0-beta.32) (2023-12-05)
65
+
66
+
67
+ ### Bug Fixes
68
+
69
+ * wip ([76b39b2](https://github.com/agnostack/next-shopify/commit/76b39b220e0b530d471c5fbd8742abe7b2929312))
70
+
71
+ # [1.14.0-beta.31](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.30...v1.14.0-beta.31) (2023-12-05)
72
+
73
+
74
+ ### Bug Fixes
75
+
76
+ * wip ([91193c5](https://github.com/agnostack/next-shopify/commit/91193c50d4bea8657f83aaa05ed8ab557401a0c4))
77
+
78
+ # [1.14.0-beta.30](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.29...v1.14.0-beta.30) (2023-12-05)
79
+
80
+
81
+ ### Bug Fixes
82
+
83
+ * wip ([69874a8](https://github.com/agnostack/next-shopify/commit/69874a8d54cd6ba65c7fe5afb24c449a859fe996))
84
+
85
+ # [1.14.0-beta.29](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.28...v1.14.0-beta.29) (2023-12-05)
86
+
87
+
88
+ ### Bug Fixes
89
+
90
+ * wip ([722708f](https://github.com/agnostack/next-shopify/commit/722708f510f9124528e103de7a77c99061a429e4))
91
+
92
+ # [1.14.0-beta.28](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.27...v1.14.0-beta.28) (2023-12-05)
93
+
94
+
95
+ ### Bug Fixes
96
+
97
+ * wip ([73f2da5](https://github.com/agnostack/next-shopify/commit/73f2da59c18f4572ceb4d7f6f45192376c3d5ebf))
98
+
99
+ # [1.14.0-beta.27](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.26...v1.14.0-beta.27) (2023-12-05)
100
+
101
+
102
+ ### Bug Fixes
103
+
104
+ * wip ([68704b3](https://github.com/agnostack/next-shopify/commit/68704b372cc3dd31db00656f0ef9e4e7612b4811))
105
+
106
+ # [1.14.0-beta.26](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.25...v1.14.0-beta.26) (2023-12-05)
107
+
108
+
109
+ ### Bug Fixes
110
+
111
+ * wip ([951d798](https://github.com/agnostack/next-shopify/commit/951d7980bf06d92e649d2d9d97bc81b1398210fe))
112
+
113
+ # [1.14.0-beta.25](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.24...v1.14.0-beta.25) (2023-12-05)
114
+
115
+
116
+ ### Bug Fixes
117
+
118
+ * wip ([82a1f40](https://github.com/agnostack/next-shopify/commit/82a1f4072da77d85288f5c463bb7adb79ba1a131))
119
+
120
+ # [1.14.0-beta.24](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.23...v1.14.0-beta.24) (2023-12-05)
121
+
122
+
123
+ ### Bug Fixes
124
+
125
+ * wip ([2458099](https://github.com/agnostack/next-shopify/commit/24580997efeab454c5190053cb3ccc19de1c8005))
126
+
127
+ # [1.14.0-beta.23](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.22...v1.14.0-beta.23) (2023-12-05)
128
+
129
+
130
+ ### Bug Fixes
131
+
132
+ * wip ([a7f802e](https://github.com/agnostack/next-shopify/commit/a7f802e8865097a65ebd65dd1a6de14f5e200a6c))
133
+
134
+ # [1.14.0-beta.22](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.21...v1.14.0-beta.22) (2023-12-05)
135
+
136
+
137
+ ### Bug Fixes
138
+
139
+ * wip ([79651bb](https://github.com/agnostack/next-shopify/commit/79651bba427d53fb4d968abfafeb54a49936150f))
140
+
141
+ # [1.14.0-beta.21](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.20...v1.14.0-beta.21) (2023-12-05)
142
+
143
+
144
+ ### Bug Fixes
145
+
146
+ * wip ([ef83a5e](https://github.com/agnostack/next-shopify/commit/ef83a5ed06fc483dda64298e1d8fdd1148feb2a6))
147
+
148
+ # [1.14.0-beta.20](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.19...v1.14.0-beta.20) (2023-12-05)
149
+
150
+
151
+ ### Bug Fixes
152
+
153
+ * wip ([216f72e](https://github.com/agnostack/next-shopify/commit/216f72e32f9c511435ea4aafe77491b0514b0027))
154
+
155
+ # [1.14.0-beta.19](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.18...v1.14.0-beta.19) (2023-12-05)
156
+
157
+
158
+ ### Bug Fixes
159
+
160
+ * wip ([b698605](https://github.com/agnostack/next-shopify/commit/b69860585316ff94b2e78c0137d92c16e7bd152f))
161
+
162
+ # [1.14.0-beta.18](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.17...v1.14.0-beta.18) (2023-12-05)
163
+
164
+
165
+ ### Bug Fixes
166
+
167
+ * wip ([b391569](https://github.com/agnostack/next-shopify/commit/b3915692ff3fa8a072fb7fcfd2797ba261c3a7ee))
168
+
169
+ # [1.14.0-beta.17](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.16...v1.14.0-beta.17) (2023-12-05)
170
+
171
+
172
+ ### Bug Fixes
173
+
174
+ * wip ([a116ece](https://github.com/agnostack/next-shopify/commit/a116ece5a5e1ca710cdb573a4fd5499fdee26777))
175
+
176
+ # [1.14.0-beta.16](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.15...v1.14.0-beta.16) (2023-12-05)
177
+
178
+
179
+ ### Bug Fixes
180
+
181
+ * wip ([5c6ad79](https://github.com/agnostack/next-shopify/commit/5c6ad79e340d12dc53e70c0cd7f9ef7fdddf8aed))
182
+
183
+ # [1.14.0-beta.15](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.14...v1.14.0-beta.15) (2023-12-05)
184
+
185
+
186
+ ### Bug Fixes
187
+
188
+ * wip ([b936bb3](https://github.com/agnostack/next-shopify/commit/b936bb3131d45b451a8f359bc9bed7c64dcd714e))
189
+
190
+ # [1.14.0-beta.14](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.13...v1.14.0-beta.14) (2023-12-04)
191
+
192
+
193
+ ### Bug Fixes
194
+
195
+ * wip ([58a91e2](https://github.com/agnostack/next-shopify/commit/58a91e228d0bed2ca726cbff2296e3a3500b02a7))
196
+
197
+ # [1.14.0-beta.13](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.12...v1.14.0-beta.13) (2023-12-04)
198
+
199
+
200
+ ### Bug Fixes
201
+
202
+ * wip ([b87f159](https://github.com/agnostack/next-shopify/commit/b87f15987010b492ca9daf3209031a50f29e63f7))
203
+
204
+ # [1.14.0-beta.12](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.11...v1.14.0-beta.12) (2023-12-04)
205
+
206
+
207
+ ### Bug Fixes
208
+
209
+ * wip ([158d4ff](https://github.com/agnostack/next-shopify/commit/158d4ffc6e11d1394c8274039c7b8f0840894b9c))
210
+
211
+ # [1.14.0-beta.11](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.10...v1.14.0-beta.11) (2023-12-04)
212
+
213
+
214
+ ### Bug Fixes
215
+
216
+ * wip ([02e4858](https://github.com/agnostack/next-shopify/commit/02e485860157a650a9b6742c574382450387263c))
217
+
218
+ # [1.14.0-beta.10](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.9...v1.14.0-beta.10) (2023-12-04)
219
+
220
+
221
+ ### Bug Fixes
222
+
223
+ * wip ([6aead6b](https://github.com/agnostack/next-shopify/commit/6aead6bf360e71eb0277713b42463b871c8c9175))
224
+
225
+ # [1.14.0-beta.9](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.8...v1.14.0-beta.9) (2023-12-04)
226
+
227
+
228
+ ### Bug Fixes
229
+
230
+ * wip ([7f122f5](https://github.com/agnostack/next-shopify/commit/7f122f5ea42da4fb90c2f192f8db3ad7530270d4))
231
+
232
+ # [1.14.0-beta.8](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.7...v1.14.0-beta.8) (2023-12-04)
233
+
234
+
235
+ ### Bug Fixes
236
+
237
+ * wip ([6269ccc](https://github.com/agnostack/next-shopify/commit/6269ccc0ac80e47d75e8dd491af68b758e34d91a))
238
+
239
+ # [1.14.0-beta.7](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.6...v1.14.0-beta.7) (2023-12-04)
240
+
241
+
242
+ ### Bug Fixes
243
+
244
+ * wip ([88ff531](https://github.com/agnostack/next-shopify/commit/88ff531191e82c7f0735257f9cc98b2eea4b7092))
245
+
246
+ # [1.14.0-beta.6](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.5...v1.14.0-beta.6) (2023-12-04)
247
+
248
+
249
+ ### Bug Fixes
250
+
251
+ * wip ([bb5fa6a](https://github.com/agnostack/next-shopify/commit/bb5fa6a859ea8358fb4683c1f6d7d77f994f2d1e))
252
+
253
+ # [1.14.0-beta.5](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.4...v1.14.0-beta.5) (2023-12-04)
254
+
255
+
256
+ ### Bug Fixes
257
+
258
+ * wip ([40a4d13](https://github.com/agnostack/next-shopify/commit/40a4d13b1186042e2c1983a826f04a742448e745))
259
+
1
260
  # [1.14.0-beta.4](https://github.com/agnostack/next-shopify/compare/v1.14.0-beta.3...v1.14.0-beta.4) (2023-12-04)
2
261
 
3
262
 
@@ -0,0 +1 @@
1
+ {"version":3,"file":"appInstallation.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/appInstallation.js"],"names":[],"mappings":"AAIO,uHAcN"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"appInstallation.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/appInstallation.js"],"names":[],"mappings":";;;;AAAA,4CAAmE;AACnE,mCAAqC;AAErC,gGAAgG;AACzF,MAAM,yBAAyB,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;IAC3F,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IAE9B,IAAI,IAAA,oBAAW,EAAC,KAAK,CAAC,EAAE;QACtB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC,CAAA;KACnE;IAED,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,mBAAmB,CAAC,CAAA;IAErD,OAAO,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE;QAC5B,KAAK,EAAE,kBAAS,CAAC,YAAY;QAC7B,SAAS,EAAE,EAAE,SAAS,EAAE,GAAG,KAAK,aAAa,EAAE;QAC/C,SAAS,EAAE,kBAAS,CAAC,SAAS;KAC/B,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AAdY,QAAA,yBAAyB,6BAcrC"}
@@ -1 +1 @@
1
- {"version":3,"file":"billing.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/billing.js"],"names":[],"mappings":"AAeO,iGA2DN"}
1
+ {"version":3,"file":"billing.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/billing.js"],"names":[],"mappings":"AAcO,iGAyDN"}
@@ -2,7 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.handleAppBilling = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const raw_body_1 = tslib_1.__importDefault(require("raw-body"));
6
5
  const utils_1 = require("../../utils");
7
6
  const shared_1 = require("../../../shared");
8
7
  const TERMINAL_STATUSES = [
@@ -19,9 +18,8 @@ const handleAppBilling = (serverRuntimeConfig) => (req, res) => tslib_1.__awaite
19
18
  return res.status(200).json({ handler: 'billing', error: 'Missing shop' });
20
19
  }
21
20
  const { shopify, loadSession, updateSession, getVerifiedClients } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
22
- // NOTE raw request body is required for Shopify webhook validation
23
- const _rawBody = yield (0, raw_body_1.default)(req);
24
- const rawBody = _rawBody.toString();
21
+ // TODO: explore getVerifiedBody?
22
+ const rawBody = yield (0, utils_1.ensureRawBody)(req);
25
23
  const _b = yield shopify.webhooks.validate({
26
24
  rawBody,
27
25
  rawRequest: req,
@@ -30,7 +28,7 @@ const handleAppBilling = (serverRuntimeConfig) => (req, res) => tslib_1.__awaite
30
28
  if (valid) {
31
29
  try {
32
30
  let message = 'ignored';
33
- const [eventType, { status } = {}] = Object.entries(JSON.parse(rawBody))[0];
31
+ const [eventType, { status } = {}] = Object.entries((0, shared_1.safeParse)(rawBody || '{}'))[0];
34
32
  if ((eventType === shared_1.BILLING_EVENT_TYPES.SUBSCRIPTION) && TERMINAL_STATUSES.includes(status)) {
35
33
  const { Rest } = yield getVerifiedClients();
36
34
  // NOTE: this deletes the app in the case of subscription apps in a "terminal" state to cover the info in ShopifyApi docs for billing:
@@ -1 +1 @@
1
- {"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/billing.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/billing.js"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/graph.js"],"names":[],"mappings":"AAoBO,yGA6HN"}
@@ -9,13 +9,19 @@ const handleGraph = (serverRuntimeConfig) => {
9
9
  const _getVerifiedBody = (0, utils_1.getVerifiedBody)(serverRuntimeConfig);
10
10
  return (req, res, params) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
11
11
  var _a, _b, _c;
12
+ console.log(`>>> > handleGraph > req headers:`, req.headers);
13
+ console.log(`>>> > handleGraph > req body:`, req.body);
14
+ console.log(`>>> > handleGraph > params:`, params);
12
15
  const [requestBody, processResponse] = yield _getVerifiedBody(req, res);
16
+ console.log(`>>> > handleGraph > requestBody:`, requestBody);
17
+ console.log(`>>> > handleGraph > req.query:`, req.query);
13
18
  const _d = (_a = req.query) !== null && _a !== void 0 ? _a : {}, { shop, apiVersion } = _d, _query = tslib_1.__rest(_d, ["shop", "apiVersion"]);
14
- const _e = params !== null && params !== void 0 ? params : requestBody, { isOnline, query: graphQuery, variables: graphVariables, transform = (_data) => _data } = _e, graphParams = tslib_1.__rest(_e, ["isOnline", "query", "variables", "transform"]);
19
+ const _e = params !== null && params !== void 0 ? params : (0, shared_1.safeParse)(requestBody || '{}'), { isOnline, query: graphQuery, variables: graphVariables, transform = (_data) => _data } = _e, graphParams = tslib_1.__rest(_e, ["isOnline", "query", "variables", "transform"]);
15
20
  let query = _query;
16
21
  if ((0, shared_1.isType)(query, 'string')) {
17
22
  query = (0, shared_1.querystringToObject)(query);
18
23
  }
24
+ console.log(`>>> > handleGraph > shop/graphQuery:`, { shop, graphQuery });
19
25
  if ((0, shared_1.stringEmpty)(shop) || (0, shared_1.stringEmpty)(graphQuery)) {
20
26
  return res.status(400).json({ message: 'Invalid arguments' });
21
27
  }
@@ -29,8 +35,8 @@ const handleGraph = (serverRuntimeConfig) => {
29
35
  response = yield Graphql.query(Object.assign(Object.assign({ data: graphVariables ? {
30
36
  query: graphQuery,
31
37
  variables: graphVariables,
32
- } : graphQuery }, (0, shared_1.objectNotEmpty)(query) && { query }), graphParams))
33
- .then(processResponse);
38
+ } : graphQuery }, (0, shared_1.objectNotEmpty)(query) && { query }), graphParams));
39
+ console.log(`>>> > handleGraph > response:`, response);
34
40
  statusCode = 200;
35
41
  }
36
42
  catch (error) {
@@ -71,22 +77,26 @@ const handleGraph = (serverRuntimeConfig) => {
71
77
  }
72
78
  }
73
79
  }
74
- Object.entries(headers).forEach(([key, value]) => {
75
- res.setHeader(key, value);
76
- });
77
- if (!(response === null || response === void 0 ? void 0 : response.body)) {
78
- return res.status(statusCode).json({ message });
79
- }
80
80
  try {
81
- const responseBody = (_c = response.body.data) !== null && _c !== void 0 ? _c : response.body;
82
- const [_responseData] = Object.values((0, shared_1.ensureObject)(responseBody));
81
+ Object.entries(headers).forEach(([key, value]) => {
82
+ res.setHeader(key, value);
83
+ });
84
+ if (!(response === null || response === void 0 ? void 0 : response.body)) {
85
+ return res.status(statusCode).json({ message });
86
+ }
87
+ const responseBody = (0, shared_1.ensureObject)((_c = response.body.data) !== null && _c !== void 0 ? _c : response.body);
88
+ console.log(`>>> > handleGraph > responseBody:`, responseBody);
89
+ const [_responseData] = Object.values(responseBody);
83
90
  const _f = (0, shared_1.ensureObject)(_responseData), { userErrors } = _f, responseData = tslib_1.__rest(_f, ["userErrors"]);
84
91
  if ((0, shared_1.arrayNotEmpty)(userErrors)) {
85
92
  const errorMessages = (0, shared_1.ensureArray)(userErrors).map(({ message }) => (0, shared_1.ensureString)(message));
86
93
  return res.status(500).json({ message: `${message}. ${errorMessages.join('. ')}.` });
87
94
  }
95
+ console.log(`>>> > handleGraph > responseData:`, { responseData });
96
+ const transformedResponse = yield processResponse(transform(responseData, responseBody));
97
+ console.log(`>>> > handleGraph > transformedResponse:`, { transformedResponse });
88
98
  // NOTE: sending in both to transform in case someone needs the userErrors
89
- return res.status(statusCode).json(transform(responseData, responseBody));
99
+ return res.status(statusCode).json(transformedResponse);
90
100
  }
91
101
  catch (error) {
92
102
  console.error(`${message}. Transformation Error.`, error);
@@ -0,0 +1 @@
1
+ {"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/graph.js"],"names":[],"mappings":"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"}
@@ -1,8 +1,12 @@
1
+ export * from "./appInstallation";
1
2
  export * from "./auth";
2
3
  export * from "./billing";
3
4
  export * from "./callback";
5
+ export * from "./graph";
6
+ export * from "./proxy";
7
+ export * from "./rest";
8
+ export * from "./token";
4
9
  export * from "./uninstall";
5
- export * from "./verifiable";
6
10
  export * from "./webhook";
7
11
  export function getAPIConfig(config: any): {
8
12
  api: any;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/index.js"],"names":[],"mappings":";;;;;;AAQO;;EAKL"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/index.js"],"names":[],"mappings":";;;;;;;;;;AAYO;;EAKL"}
@@ -2,11 +2,15 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getAPIConfig = void 0;
4
4
  const tslib_1 = require("tslib");
5
+ tslib_1.__exportStar(require("./appInstallation"), exports);
5
6
  tslib_1.__exportStar(require("./auth"), exports);
6
7
  tslib_1.__exportStar(require("./billing"), exports);
7
8
  tslib_1.__exportStar(require("./callback"), exports);
9
+ tslib_1.__exportStar(require("./graph"), exports);
10
+ tslib_1.__exportStar(require("./proxy"), exports);
11
+ tslib_1.__exportStar(require("./rest"), exports);
12
+ tslib_1.__exportStar(require("./token"), exports);
8
13
  tslib_1.__exportStar(require("./uninstall"), exports);
9
- tslib_1.__exportStar(require("./verifiable"), exports);
10
14
  tslib_1.__exportStar(require("./webhook"), exports);
11
15
  // NOTE raw request body is required for Shopify webhook validation
12
16
  const getAPIConfig = (config) => ({
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/index.js"],"names":[],"mappings":";;;;AAAA,iDAAsB;AACtB,oDAAyB;AACzB,qDAA0B;AAC1B,sDAA2B;AAC3B,uDAA4B;AAC5B,oDAAyB;AAEzB,mEAAmE;AAC5D,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACvC,GAAG,kBACD,UAAU,EAAE,KAAK,IACd,MAAM,CACV;CACF,CAAC,CAAA;AALW,QAAA,YAAY,gBAKvB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/index.js"],"names":[],"mappings":";;;;AAAA,4DAAiC;AACjC,iDAAsB;AACtB,oDAAyB;AACzB,qDAA0B;AAC1B,kDAAuB;AACvB,kDAAuB;AACvB,iDAAsB;AACtB,kDAAuB;AACvB,sDAA2B;AAC3B,oDAAyB;AAEzB,mEAAmE;AAC5D,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACvC,GAAG,kBACD,UAAU,EAAE,KAAK,IACd,MAAM,CACV;CACF,CAAC,CAAA;AALW,QAAA,YAAY,gBAKvB"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/proxy.js"],"names":[],"mappings":"AAmCO,sHAyMN"}
@@ -15,8 +15,9 @@ const verifyAppProxySignature = (signature, verifiable, hmacSecret) => {
15
15
  };
16
16
  const handleProxy = (serverRuntimeConfig, config) => {
17
17
  const { generateReplacements } = config !== null && config !== void 0 ? config : {};
18
- const { API_PATHS, APP_CONFIG, APP_BASE_URL, TARGET_SAFELIST, ORIGIN_SAFELIST, } = serverRuntimeConfig;
18
+ const { API_BASE_PATH, API_PATHS, APP_CONFIG, APP_BASE_URL, TARGET_SAFELIST, ORIGIN_SAFELIST, } = serverRuntimeConfig;
19
19
  const _getVerifiedBody = (0, utils_1.getVerifiedBody)(serverRuntimeConfig);
20
+ const _getVerifiedSessionData = (0, utils_1.getVerifiedSessionData)(serverRuntimeConfig);
20
21
  return (req, res, params) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
21
22
  var _a, _b;
22
23
  const _c = (_a = req.headers) !== null && _a !== void 0 ? _a : {}, { origin, 'x-forwarded-for': _forwardFor, 'x-forwarded-proto': _forwardProto, 'x-forwarded-host': forwardHost, 'x-proxy-origin': proxyOrigin } = _c, _headers = tslib_1.__rest(_c, ["origin", 'x-forwarded-for', 'x-forwarded-proto', 'x-forwarded-host', 'x-proxy-origin']);
@@ -53,6 +54,7 @@ const handleProxy = (serverRuntimeConfig, config) => {
53
54
  const _targetUrl = ((0, shared_1.stringEmpty)(targetParam) || targetParam.startsWith('http')) ? targetParam : `${APP_BASE_URL}/${(0, shared_1.removeLeadingSlash)(targetParam)}`;
54
55
  const { origin: target, hostname, pathname, search } = (0, shared_1.stringNotEmpty)(_targetUrl) ? new URL(_targetUrl) : {};
55
56
  targetPath = [pathname, search].filter(shared_1.stringNotEmpty).join('');
57
+ console.log(`>>> > handleProxy > targetPath:`, targetPath);
56
58
  const safelistedTarget = (0, shared_1.matchHostname)(hostname, Object.assign({ [new URL(APP_BASE_URL).hostname]: {
57
59
  // HMMM: can we generate our own session token (or use the current one) so as to not have to tell handleGraph/Rest to behave as offline?
58
60
  // headers: {
@@ -76,15 +78,18 @@ const handleProxy = (serverRuntimeConfig, config) => {
76
78
  if (!verifyAppProxySignature(signature, verifiable, isShopifyOriginOrRelative ? APP_CONFIG.apiSecretKey : timestamp)) {
77
79
  return res.status(403).json({ message: 'Invalid signature' });
78
80
  }
81
+ // HMMM: what if this is not a request to our session token api??
82
+ const isTokenRequest = targetParam.startsWith(API_PATHS[shared_1.API_ROUTE_NAMES.SESSION_TOKEN]);
79
83
  // TODO: clean up targetParam.startsWith??
80
- if (!targetParam.startsWith(API_PATHS[shared_1.API_ROUTE_NAMES.SESSION_TOKEN])) {
81
- const _getVerifiedSessionData = (0, utils_1.getVerifiedSessionData)(serverRuntimeConfig);
82
- if (!_getVerifiedSessionData(sessionToken, { shop, host }).catch((_error) => {
84
+ if (!isTokenRequest) {
85
+ const isVerifiedSession = yield _getVerifiedSessionData(sessionToken, { shop, host }).catch((_error) => {
83
86
  if (_error instanceof shared_1.ShopifySessionInvalidError) {
84
- return res.status(403).json({ message: _error.message });
87
+ return res.status(412).json({ message: _error.message, type: 'ShopifySessionInvalidError' });
85
88
  }
86
89
  throw _error;
87
- })) {
90
+ });
91
+ console.log(`>>> > handleProxy > isVerifiedSession:`, { isVerifiedSession });
92
+ if (!isVerifiedSession) {
88
93
  return res.status(403).json({ message: 'Unverified signature' });
89
94
  }
90
95
  }
@@ -92,8 +97,11 @@ const handleProxy = (serverRuntimeConfig, config) => {
92
97
  if ((0, shared_1.objectNotEmpty)(targetParams)) {
93
98
  targetPath = (0, shared_1.appendQuery)(targetPath, new URLSearchParams(targetParams).toString());
94
99
  }
95
- const [requestBody, processResponse] = yield _getVerifiedBody(req, res, targetPath);
96
- console.log(`>>> > handleProxy > requestBody, processResponse:`, requestBody, processResponse);
100
+ const passthroughEncryption = ((targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(API_BASE_PATH)) || (targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(`${APP_BASE_URL}${API_BASE_PATH}`)));
101
+ // eslint-disable-next-line max-len
102
+ console.log(`>>> > handleProxy > passthroughEncryption: '${targetPath}'`, { targetParam, disableRecryption: passthroughEncryption, API_BASE_PATH, APP_BASE_URL });
103
+ const [requestBody, processResponse] = yield _getVerifiedBody(req, res, { uri: targetPath, disableRecryption: passthroughEncryption });
104
+ console.log(`>>> > handleProxy > requestBody: '${targetPath}'`, { requestBody, isTokenRequest });
97
105
  const _prepareHeaders = (0, utils_1.prepareHeaders)(serverRuntimeConfig);
98
106
  const headers = yield _prepareHeaders({
99
107
  generateReplacements,
@@ -101,6 +109,7 @@ const handleProxy = (serverRuntimeConfig, config) => {
101
109
  appId,
102
110
  headers: Object.assign(Object.assign({}, _headers), targetHeaders),
103
111
  });
112
+ console.log(`>>> > handleProxy > headers:`, headers);
104
113
  const proxy = http_proxy_1.default.createProxy();
105
114
  return new Promise((resolve, reject) => {
106
115
  req.url = targetPath;
@@ -108,15 +117,23 @@ const handleProxy = (serverRuntimeConfig, config) => {
108
117
  req.headers = headers;
109
118
  }
110
119
  proxy.on('proxyReq', (proxyReq, proxyReqRequest, proxyReqResponse, options) => {
111
- if ((0, shared_1.objectNotEmpty)(requestBody)) {
120
+ if (requestBody) {
121
+ console.log(`>>> > handleProxy > proxy.on > requestBody: '${targetPath}`, { requestBody });
112
122
  const bodyData = JSON.stringify(requestBody);
123
+ console.log(`>>> > handleProxy > proxy.on > bodyData1: '${targetPath}' BEFORE:`, { bodyData });
113
124
  proxyReq.setHeader('Content-Length', Buffer.byteLength(bodyData));
125
+ console.log(`>>> > handleProxy > proxy.on > bodyData2: '${targetPath} AFTER'`);
114
126
  proxyReq.write(bodyData);
115
127
  }
116
128
  });
117
129
  proxy.on('proxyRes', function (proxyRes, proxyResRequest, proxyResResponse) {
118
130
  (0, node_http_proxy_json_1.default)(proxyResResponse, proxyRes, function (proxyResBody) {
119
- return processResponse(proxyResBody);
131
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
132
+ console.log(`>>> > handleProxy > proxyRes > proxyResBody: '${targetPath}'`, { proxyResBody });
133
+ const foo = yield processResponse(proxyResBody);
134
+ console.log(`>>> > handleProxy > proxyRes > foo:`, foo);
135
+ return foo;
136
+ });
120
137
  });
121
138
  });
122
139
  proxy.once('error', (error) => {
@@ -0,0 +1 @@
1
+ {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/proxy.js"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"rest.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/rest.js"],"names":[],"mappings":"AAiBO,yGA4GN"}
@@ -28,14 +28,13 @@ const handleRest = (serverRuntimeConfig) => {
28
28
  queryData = (0, shared_1.querystringToObject)(queryData);
29
29
  }
30
30
  const _b = (0, shared_1.ensureObject)(queryData), { apiVersion } = _b, query = tslib_1.__rest(_b, ["apiVersion"]);
31
- const body = bodyParam !== null && bodyParam !== void 0 ? bodyParam : requestBody;
31
+ const body = (0, shared_1.safeParse)(bodyParam !== null && bodyParam !== void 0 ? bodyParam : requestBody);
32
32
  const method = (0, shared_1.ensureString)(methodParam !== null && methodParam !== void 0 ? methodParam : _method).toLowerCase();
33
33
  const { getVerifiedClients } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
34
34
  const { Rest } = yield getVerifiedClients({ req, res, shop, apiVersion, isOnline });
35
35
  response = yield Rest[method](Object.assign({ path,
36
36
  query,
37
- body, type: shopify_api_1.DataType.JSON }, params))
38
- .then(processResponse);
37
+ body, type: shopify_api_1.DataType.JSON }, params));
39
38
  statusCode = 200;
40
39
  }
41
40
  catch (error) {
@@ -69,16 +68,20 @@ const handleRest = (serverRuntimeConfig) => {
69
68
  res.setHeader(key, value);
70
69
  });
71
70
  if (!response) {
72
- return res.status(statusCode).json({ message });
71
+ const transformedResponse = yield processResponse({ message });
72
+ return res.status(statusCode).json(transformedResponse);
73
73
  }
74
74
  // HMMMMM???
75
75
  if ((params === null || params === void 0 ? void 0 : params.type) && ![shopify_api_1.DataType.GraphQL, shopify_api_1.DataType.JSON].includes(params.type)) {
76
- return res.status(statusCode).send(response);
76
+ const transformedResponse = yield processResponse(response);
77
+ return res.status(statusCode).send(transformedResponse);
77
78
  }
78
79
  if (!(response === null || response === void 0 ? void 0 : response.body)) {
79
- return res.status(statusCode).json({ message });
80
+ const transformedResponse = yield processResponse({ message });
81
+ return res.status(statusCode).json(transformedResponse);
80
82
  }
81
- return res.status(statusCode).json(transform(response.body));
83
+ const transformedResponse = yield processResponse(transform(response.body));
84
+ return res.status(statusCode).json(transformedResponse);
82
85
  });
83
86
  };
84
87
  exports.handleRest = handleRest;
@@ -0,0 +1 @@
1
+ {"version":3,"file":"rest.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/rest.js"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/api/token.js"],"names":[],"mappings":"AAcO;;yCA0GN"}