@agnostack/next-shopify 1.6.0-alpha.4 → 1.6.0-alpha.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 (43) hide show
  1. package/CHANGELOG.md +262 -0
  2. package/dist/handlers/api.js +24 -32
  3. package/dist/handlers/api.js.map +1 -1
  4. package/dist/handlers/ssr.d.ts +10 -1
  5. package/dist/handlers/ssr.js +17 -15
  6. package/dist/handlers/ssr.js.map +1 -1
  7. package/dist/helpers/auth.d.ts +9 -1
  8. package/dist/helpers/auth.js +9 -16
  9. package/dist/helpers/auth.js.map +1 -1
  10. package/dist/helpers/callback.d.ts +4 -1
  11. package/dist/helpers/callback.js +27 -35
  12. package/dist/helpers/callback.js.map +1 -1
  13. package/dist/helpers/graph.js +2 -2
  14. package/dist/helpers/graph.js.map +1 -1
  15. package/dist/helpers/rest.js +3 -3
  16. package/dist/helpers/rest.js.map +1 -1
  17. package/dist/helpers/uninstall.d.ts +2 -1
  18. package/dist/helpers/uninstall.js +23 -7
  19. package/dist/helpers/uninstall.js.map +1 -1
  20. package/dist/utils/billing.d.ts +1 -0
  21. package/dist/utils/billing.js +47 -1
  22. package/dist/utils/billing.js.map +1 -1
  23. package/dist/utils/errors.d.ts +12 -0
  24. package/dist/utils/errors.js +16 -1
  25. package/dist/utils/errors.js.map +1 -1
  26. package/dist/utils/firebase.js +1 -0
  27. package/dist/utils/firebase.js.map +1 -1
  28. package/dist/utils/index.d.ts +2 -0
  29. package/dist/utils/index.js +2 -0
  30. package/dist/utils/index.js.map +1 -1
  31. package/dist/utils/session.d.ts +14 -0
  32. package/dist/utils/session.js +83 -0
  33. package/dist/utils/session.js.map +1 -0
  34. package/dist/utils/shopify-api-node/beginAuth.d.ts +2 -5
  35. package/dist/utils/shopify-api-node/beginAuth.js +17 -10
  36. package/dist/utils/shopify-api-node/beginAuth.js.map +1 -1
  37. package/dist/utils/shopify.d.ts +2 -38
  38. package/dist/utils/shopify.js +15 -171
  39. package/dist/utils/shopify.js.map +1 -1
  40. package/dist/utils/webhooks.d.ts +1 -0
  41. package/dist/utils/webhooks.js +50 -0
  42. package/dist/utils/webhooks.js.map +1 -0
  43. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,265 @@
1
+ # [1.6.0-alpha.41](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.40...v1.6.0-alpha.41) (2023-05-19)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * add logging ([327f694](https://github.com/agnostack/next-shopify/commit/327f6943b13813232d4a4c690b8b5a06a6357b77))
7
+
8
+ # [1.6.0-alpha.40](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.39...v1.6.0-alpha.40) (2023-05-19)
9
+
10
+
11
+ ### Bug Fixes
12
+
13
+ * add logging ([96d6ee0](https://github.com/agnostack/next-shopify/commit/96d6ee097b0fa5628c8f0e1eecef07741f1a30e1))
14
+ * add logging ([f64a3a0](https://github.com/agnostack/next-shopify/commit/f64a3a0914f121306c0dfb83a234635489a0950b))
15
+
16
+ # [1.6.0-alpha.39](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.38...v1.6.0-alpha.39) (2023-05-19)
17
+
18
+
19
+ ### Bug Fixes
20
+
21
+ * add logging ([cd5bade](https://github.com/agnostack/next-shopify/commit/cd5badec1bf62e8b717862e3360d36b0822645dd))
22
+
23
+ # [1.6.0-alpha.38](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.37...v1.6.0-alpha.38) (2023-05-19)
24
+
25
+
26
+ ### Bug Fixes
27
+
28
+ * add logging ([165e10d](https://github.com/agnostack/next-shopify/commit/165e10dc6bdb49a8d5d7e886e1fd2118a9348600))
29
+
30
+ # [1.6.0-alpha.37](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.36...v1.6.0-alpha.37) (2023-05-19)
31
+
32
+
33
+ ### Bug Fixes
34
+
35
+ * add logging ([90f2f93](https://github.com/agnostack/next-shopify/commit/90f2f9319a2d7e59e756ea556fa6dc9526fa8ac1))
36
+
37
+ # [1.6.0-alpha.36](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.35...v1.6.0-alpha.36) (2023-05-19)
38
+
39
+
40
+ ### Bug Fixes
41
+
42
+ * add logging ([7b3db91](https://github.com/agnostack/next-shopify/commit/7b3db91448e5c5de207cf6f4f501755b50d612ca))
43
+
44
+ # [1.6.0-alpha.35](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.34...v1.6.0-alpha.35) (2023-05-19)
45
+
46
+
47
+ ### Bug Fixes
48
+
49
+ * add logging ([e9fc407](https://github.com/agnostack/next-shopify/commit/e9fc40732b06eae38491475c2919b445bab74c7b))
50
+
51
+ # [1.6.0-alpha.34](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.33...v1.6.0-alpha.34) (2023-05-19)
52
+
53
+
54
+ ### Bug Fixes
55
+
56
+ * add logging ([6607c9b](https://github.com/agnostack/next-shopify/commit/6607c9b6a424a2cc66c0a906ff437da376f8ee09))
57
+
58
+ # [1.6.0-alpha.33](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.32...v1.6.0-alpha.33) (2023-05-19)
59
+
60
+
61
+ ### Bug Fixes
62
+
63
+ * add logging ([1423104](https://github.com/agnostack/next-shopify/commit/142310458b0c10a35ceed3f93d38180b8e3a1724))
64
+
65
+ # [1.6.0-alpha.32](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.31...v1.6.0-alpha.32) (2023-05-19)
66
+
67
+
68
+ ### Bug Fixes
69
+
70
+ * add logging ([f6660cc](https://github.com/agnostack/next-shopify/commit/f6660cc569a08fc9dc8fdabeb3b71c70d4d388d5))
71
+
72
+ # [1.6.0-alpha.31](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.30...v1.6.0-alpha.31) (2023-05-19)
73
+
74
+
75
+ ### Bug Fixes
76
+
77
+ * add logging ([78de0db](https://github.com/agnostack/next-shopify/commit/78de0db8e187438813eda6c08a70cf24ac4f8ed3))
78
+
79
+ # [1.6.0-alpha.30](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.29...v1.6.0-alpha.30) (2023-05-19)
80
+
81
+
82
+ ### Bug Fixes
83
+
84
+ * add logging ([6b0372a](https://github.com/agnostack/next-shopify/commit/6b0372a0280408c9db5280d57781a7c237759aeb))
85
+
86
+ # [1.6.0-alpha.29](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.28...v1.6.0-alpha.29) (2023-05-18)
87
+
88
+
89
+ ### Bug Fixes
90
+
91
+ * add logging ([308917a](https://github.com/agnostack/next-shopify/commit/308917a5f8dcd4518a379d0e008c6668b09555d9))
92
+
93
+ # [1.6.0-alpha.28](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.27...v1.6.0-alpha.28) (2023-05-18)
94
+
95
+
96
+ ### Bug Fixes
97
+
98
+ * add logging ([a29588d](https://github.com/agnostack/next-shopify/commit/a29588df55baed13aa76cfea155558bf7eb8f5d7))
99
+
100
+ # [1.6.0-alpha.27](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.26...v1.6.0-alpha.27) (2023-05-18)
101
+
102
+
103
+ ### Bug Fixes
104
+
105
+ * add logging ([030fb20](https://github.com/agnostack/next-shopify/commit/030fb20dd456d08235b504c5fd818a1ab55a1670))
106
+
107
+ # [1.6.0-alpha.26](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.25...v1.6.0-alpha.26) (2023-05-18)
108
+
109
+
110
+ ### Bug Fixes
111
+
112
+ * add logging ([68480c4](https://github.com/agnostack/next-shopify/commit/68480c41582219449918f2a8456e5d9fbdac6a82))
113
+
114
+ # [1.6.0-alpha.25](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.24...v1.6.0-alpha.25) (2023-05-18)
115
+
116
+
117
+ ### Bug Fixes
118
+
119
+ * add logging ([c52baf1](https://github.com/agnostack/next-shopify/commit/c52baf1fa3eab2e3a05bc5ed1e1272c3053e3fdb))
120
+ * add logging ([52be76a](https://github.com/agnostack/next-shopify/commit/52be76ad59f4f2f8e32cb18c1a9463f5908dc027))
121
+
122
+ # [1.6.0-alpha.24](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.23...v1.6.0-alpha.24) (2023-05-18)
123
+
124
+
125
+ ### Bug Fixes
126
+
127
+ * add logging ([bfe8015](https://github.com/agnostack/next-shopify/commit/bfe8015cecf5be46e2d226f54bf973c3ff08c9a7))
128
+
129
+ # [1.6.0-alpha.23](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.22...v1.6.0-alpha.23) (2023-05-18)
130
+
131
+
132
+ ### Bug Fixes
133
+
134
+ * add logging ([963f987](https://github.com/agnostack/next-shopify/commit/963f987c0ea2c3bb3c527b51b365be779fd8aa5e))
135
+
136
+ # [1.6.0-alpha.22](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.21...v1.6.0-alpha.22) (2023-05-18)
137
+
138
+
139
+ ### Bug Fixes
140
+
141
+ * add logging ([f5f8808](https://github.com/agnostack/next-shopify/commit/f5f8808069be00a2e6406f72ef34606ded0685be))
142
+
143
+ # [1.6.0-alpha.21](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.20...v1.6.0-alpha.21) (2023-05-18)
144
+
145
+
146
+ ### Bug Fixes
147
+
148
+ * add logging ([7b60454](https://github.com/agnostack/next-shopify/commit/7b604542595f2a3dd97b74d0b2a1f2d8721da04b))
149
+
150
+ # [1.6.0-alpha.20](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.19...v1.6.0-alpha.20) (2023-05-17)
151
+
152
+
153
+ ### Bug Fixes
154
+
155
+ * add logging ([f7f684d](https://github.com/agnostack/next-shopify/commit/f7f684d3a0f42cedb00cbadd3a2a2ac4a712b45b))
156
+
157
+ # [1.6.0-alpha.19](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.18...v1.6.0-alpha.19) (2023-05-17)
158
+
159
+
160
+ ### Bug Fixes
161
+
162
+ * add logging ([f0aff34](https://github.com/agnostack/next-shopify/commit/f0aff340e365d09caed8001ea912d93c91bba4cd))
163
+
164
+ # [1.6.0-alpha.18](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.17...v1.6.0-alpha.18) (2023-05-17)
165
+
166
+
167
+ ### Bug Fixes
168
+
169
+ * add logging ([430d57e](https://github.com/agnostack/next-shopify/commit/430d57e35fabcf37676e3271e02ef48821b9ee8a))
170
+
171
+ # [1.6.0-alpha.17](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.16...v1.6.0-alpha.17) (2023-05-17)
172
+
173
+
174
+ ### Bug Fixes
175
+
176
+ * add logging ([d73470f](https://github.com/agnostack/next-shopify/commit/d73470f995f12fb947bdfed550b64cac43f5ba93))
177
+
178
+ # [1.6.0-alpha.16](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.15...v1.6.0-alpha.16) (2023-05-17)
179
+
180
+
181
+ ### Bug Fixes
182
+
183
+ * add logging ([481a9cb](https://github.com/agnostack/next-shopify/commit/481a9cb814410290c62c74c01acfbe76564c05f2))
184
+
185
+ # [1.6.0-alpha.15](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.14...v1.6.0-alpha.15) (2023-05-17)
186
+
187
+
188
+ ### Bug Fixes
189
+
190
+ * add logging ([9ebb589](https://github.com/agnostack/next-shopify/commit/9ebb5893134bd5709cd229a1f1706c0268cbe4c2))
191
+
192
+ # [1.6.0-alpha.14](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.13...v1.6.0-alpha.14) (2023-05-17)
193
+
194
+
195
+ ### Bug Fixes
196
+
197
+ * add logging ([3cf8d24](https://github.com/agnostack/next-shopify/commit/3cf8d2493bbbd7d73ca668e0852699fb9f14d50e))
198
+
199
+ # [1.6.0-alpha.13](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.12...v1.6.0-alpha.13) (2023-05-17)
200
+
201
+
202
+ ### Bug Fixes
203
+
204
+ * add logging ([a33718e](https://github.com/agnostack/next-shopify/commit/a33718e6eca757ff340262c12242725941d3ad6b))
205
+
206
+ # [1.6.0-alpha.12](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.11...v1.6.0-alpha.12) (2023-05-17)
207
+
208
+
209
+ ### Bug Fixes
210
+
211
+ * add logging ([36d473a](https://github.com/agnostack/next-shopify/commit/36d473ae77e8ef255f4b610ebc01a354a107157e))
212
+
213
+ # [1.6.0-alpha.11](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.10...v1.6.0-alpha.11) (2023-05-17)
214
+
215
+
216
+ ### Bug Fixes
217
+
218
+ * add logging ([0a6848f](https://github.com/agnostack/next-shopify/commit/0a6848f1dd51cda45ba75e950bcdcb40387905dc))
219
+
220
+ # [1.6.0-alpha.10](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.9...v1.6.0-alpha.10) (2023-05-17)
221
+
222
+
223
+ ### Bug Fixes
224
+
225
+ * add logging ([831f4d9](https://github.com/agnostack/next-shopify/commit/831f4d9cc72b4b16bf829344bdfc7a60b5c0c1d9))
226
+
227
+ # [1.6.0-alpha.9](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.8...v1.6.0-alpha.9) (2023-05-17)
228
+
229
+
230
+ ### Bug Fixes
231
+
232
+ * add logging ([9d725f6](https://github.com/agnostack/next-shopify/commit/9d725f604de8e270ebc4aa539da0232936f3d40e))
233
+ * add logging ([95718c1](https://github.com/agnostack/next-shopify/commit/95718c17c2dfec8c548004b28e652bbd31085c9c))
234
+
235
+ # [1.6.0-alpha.8](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.7...v1.6.0-alpha.8) (2023-05-17)
236
+
237
+
238
+ ### Bug Fixes
239
+
240
+ * add logging ([37d6d95](https://github.com/agnostack/next-shopify/commit/37d6d95da5ff54eeef48a16de3d7664d7f57695f))
241
+
242
+ # [1.6.0-alpha.7](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.6...v1.6.0-alpha.7) (2023-05-16)
243
+
244
+
245
+ ### Bug Fixes
246
+
247
+ * add logging ([c44158b](https://github.com/agnostack/next-shopify/commit/c44158be1c9afd151e7b77fbf5eee3061eac8276))
248
+
249
+ # [1.6.0-alpha.6](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.5...v1.6.0-alpha.6) (2023-05-16)
250
+
251
+
252
+ ### Bug Fixes
253
+
254
+ * add logging ([1114232](https://github.com/agnostack/next-shopify/commit/1114232b163c674c38c1ff590a06a26692579dcc))
255
+
256
+ # [1.6.0-alpha.5](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.4...v1.6.0-alpha.5) (2023-05-16)
257
+
258
+
259
+ ### Bug Fixes
260
+
261
+ * add logging ([118103c](https://github.com/agnostack/next-shopify/commit/118103c5e2925729758286b0756b81e68c23de2e))
262
+
1
263
  # [1.6.0-alpha.4](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.3...v1.6.0-alpha.4) (2023-05-16)
2
264
 
3
265
 
@@ -54,48 +54,40 @@ const handleGraph = (serverRuntimeConfig) => async (req, res, params) => {
54
54
  };
55
55
  exports.handleGraph = handleGraph;
56
56
  // NOTE: typically handling: "/api/auth"
57
+ // export const handleAuth = (serverRuntimeConfig) => async (req, res) => {
58
+ // console.log('handleAuth')
59
+ // return authHelper({ req, res, serverRuntimeConfig })
60
+ // }
61
+ // TODO OLD/Remove
57
62
  const handleAuth = (serverRuntimeConfig) => async (req, res) => {
58
- console.log('handleAuth');
59
- return helpers_1.authHelper({ req, res, serverRuntimeConfig });
63
+ const { PAGE_PATHS } = serverRuntimeConfig;
64
+ const { message, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_auth_response`, } = await helpers_1.authHelper({ req, res, serverRuntimeConfig });
65
+ if (statusCode >= 300 && statusCode < 400) {
66
+ return res.redirect(statusCode, redirectUrl);
67
+ }
68
+ return res.status(statusCode).send(message);
60
69
  };
61
70
  exports.handleAuth = handleAuth;
62
- // TODO OLD/Remove
63
- // export const handleAuth = (serverRuntimeConfig) => async (req, res) => {
64
- // const { PAGE_PATHS } = serverRuntimeConfig
65
- // const {
66
- // message,
67
- // statusCode = 302,
68
- // redirectUrl = `${PAGE_PATHS[PAGE_ROUTE_NAMES.ERROR]}?invalid_auth_response`,
69
- // } = await authHelper({ req, res, serverRuntimeConfig })
70
- // if (statusCode >= 300 && statusCode < 400) {
71
- // return res.redirect(statusCode, redirectUrl)
72
- // }
73
- // return res.status(statusCode).send(message)
74
- // }
75
71
  // NOTE: typically handling: "/api/auth/callback"
72
+ // export const handleCallback = (serverRuntimeConfig) => async (req, res) => {
73
+ // console.log('handleCallback')
74
+ // return callbackHelper({ req, res, serverRuntimeConfig })
75
+ // }
76
+ // TODO OLD/Remove
76
77
  const handleCallback = (serverRuntimeConfig) => async (req, res) => {
77
- console.log('handleCallback');
78
- return helpers_1.callbackHelper({ req, res, serverRuntimeConfig });
78
+ const { PAGE_PATHS } = serverRuntimeConfig;
79
+ const { message, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_callback_response`, } = await helpers_1.callbackHelper({ req, res, serverRuntimeConfig });
80
+ if (statusCode >= 300 && statusCode < 400) {
81
+ return res.redirect(statusCode, redirectUrl);
82
+ }
83
+ return res.status(statusCode).send(message);
79
84
  };
80
85
  exports.handleCallback = handleCallback;
81
- // TODO OLD/Remove
82
- // export const handleCallback = (serverRuntimeConfig) => async (req, res) => {
83
- // const { PAGE_PATHS } = serverRuntimeConfig
84
- // const {
85
- // message,
86
- // statusCode = 302,
87
- // redirectUrl = `${PAGE_PATHS[PAGE_ROUTE_NAMES.ERROR]}?invalid_callback_response`,
88
- // } = await callbackHelper({ req, res, serverRuntimeConfig })
89
- // if (statusCode >= 300 && statusCode < 400) {
90
- // return res.redirect(statusCode, redirectUrl)
91
- // }
92
- // return res.status(statusCode).send(message)
93
- // }
94
86
  // NOTE: typically handling: "/api/webhooks/app/uninstalled"
95
87
  const handleAppUninstalled = (serverRuntimeConfig) => async (req, res) => {
96
- console.log('handleAppUninstalled');
88
+ console.log('handleAppUninstalled:', exports.handleAppUninstalled);
97
89
  const { PAGE_PATHS } = serverRuntimeConfig;
98
- const { message, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_uninstall_response`, } = await helpers_1.uninstallHelper({ req, serverRuntimeConfig });
90
+ const { message, statusCode = 302, redirectUrl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?invalid_uninstall_response`, } = await helpers_1.uninstallHelper({ req, res, serverRuntimeConfig });
99
91
  if (statusCode >= 300 && statusCode < 400) {
100
92
  return res.redirect(statusCode, redirectUrl);
101
93
  }
@@ -1 +1 @@
1
- {"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/handlers/api.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/handlers/api.js"],"names":[],"mappings":"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"}
@@ -10,4 +10,13 @@ export function protectRoute(props: any): ({ req, res, query, locale }: {
10
10
  res: any;
11
11
  query: any;
12
12
  locale: any;
13
- }, data: any) => Promise<any>;
13
+ }, data: any) => Promise<{
14
+ redirect: {
15
+ destination: string;
16
+ permanent: boolean;
17
+ };
18
+ props?: undefined;
19
+ } | {
20
+ props: any;
21
+ redirect?: undefined;
22
+ }>;
@@ -27,30 +27,32 @@ const protectRoute = (props) => async ({ req, res, query, locale } = {}, data) =
27
27
  },
28
28
  };
29
29
  }
30
- const shopify = utils_1.getInitializedShopify(props, shop);
30
+ const shopify = await utils_1.getInitializedShopify(props, shop);
31
31
  // TODO OLD/Remove
32
32
  // const shopSessions = await shopify.Context.SESSION_STORAGE?.findSessionsByShop?.(shop)
33
- const sessionStorage = utils_1.getSessionStorage(props, shop);
33
+ const sessionStorage = utils_1.getSessionStorage(shopify, props, shop);
34
34
  const existingSessions = await sessionStorage.find(shop);
35
35
  if (utils_1.arrayEmpty(existingSessions)) {
36
36
  // TODO validate this is correct
37
- return utils_1.getRedirectUrl(props, {
38
- req,
39
- res,
40
- query,
41
- });
42
- // TODO OLD/Remove
43
- // const emptySessionUrl = getRedirectUrl(props, {
37
+ // return getRedirectUrl(props, {
44
38
  // req,
45
39
  // res,
46
40
  // query,
41
+ // registerHandlers: true,
47
42
  // })
48
- // return {
49
- // redirect: {
50
- // destination: emptySessionUrl,
51
- // permanent: false,
52
- // },
53
- // }
43
+ // TODO OLD/Remove
44
+ const emptySessionUrl = await utils_1.getRedirectUrl(props, {
45
+ req,
46
+ res,
47
+ query,
48
+ registerHandlers: true,
49
+ });
50
+ return {
51
+ redirect: {
52
+ destination: emptySessionUrl,
53
+ permanent: false,
54
+ },
55
+ };
54
56
  }
55
57
  if (embedded !== '1') {
56
58
  const embeddedappUrl = await shopify.auth.getEmbeddedAppUrl({ rawRequest: req, rawResponse: res });
@@ -1 +1 @@
1
- {"version":3,"file":"ssr.js","sourceRoot":"","sources":["../../src/handlers/ssr.js"],"names":[],"mappings":";;;AAAA,oCAQiB;AAEjB,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAClC,sBAAc,CAAC,IAAI,CAAC;IAClB,CAAC,CAAC,0DAA0D,IAAI,GAAG;IACnE,CAAC,CAAC,yBAAyB,CAC9B,CAAA;AAEM,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE;IACnE,GAAG,CAAC,SAAS,CAAC,yBAAyB,EAAE,iBAAiB,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAC,CAAC,CAAA;IAExE,OAAO;QACL,KAAK,kBACH,MAAM,IACH,IAAI,CACR;KACF,CAAA;AACH,CAAC,CAAA;AATY,QAAA,SAAS,aASrB;AAEM,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE;;IACtF,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAA;IAC5B,MAAM,IAAI,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,mCAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,IAAI,CAAA;IAC3C,MAAM,QAAQ,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,mCAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,QAAQ,CAAA;IAEvD,GAAG,CAAC,SAAS,CAAC,yBAAyB,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAA;IAEjE,IAAI,mBAAW,CAAC,IAAI,CAAC,EAAE;QACrB,MAAM,SAAS,GAAG,GAAG,UAAU,CAAC,wBAAgB,CAAC,KAAK,CAAC,0CAA0C,CAAA;QACjG,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,SAAS;gBACtB,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;KACF;IAED,MAAM,OAAO,GAAG,6BAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IAClD,kBAAkB;IAClB,yFAAyF;IACzF,MAAM,cAAc,GAAG,yBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IACrD,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAExD,IAAI,kBAAU,CAAC,gBAAgB,CAAC,EAAE;QAChC,gCAAgC;QAChC,OAAO,sBAAc,CAAC,KAAK,EAAE;YAC3B,GAAG;YACH,GAAG;YACH,KAAK;SACN,CAAC,CAAA;QAEF,kBAAkB;QAClB,kDAAkD;QAClD,SAAS;QACT,SAAS;QACT,WAAW;QACX,KAAK;QAEL,WAAW;QACX,gBAAgB;QAChB,oCAAoC;QACpC,wBAAwB;QACxB,OAAO;QACP,IAAI;KACL;IAED,IAAI,QAAQ,KAAK,GAAG,EAAE;QACpB,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAA;QAClG,kBAAkB;QAClB,8DAA8D;QAE9D,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,cAAc;gBAC3B,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;KACF;IAED,OAAO;QACL,KAAK,kBACH,MAAM,IACH,IAAI,CACR;KACF,CAAA;AACH,CAAC,CAAA;AAjEY,QAAA,YAAY,gBAiExB"}
1
+ {"version":3,"file":"ssr.js","sourceRoot":"","sources":["../../src/handlers/ssr.js"],"names":[],"mappings":"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"}
@@ -3,4 +3,12 @@ declare function authHelper({ req, res, serverRuntimeConfig }: {
3
3
  req: any;
4
4
  res: any;
5
5
  serverRuntimeConfig: any;
6
- }): Promise<any>;
6
+ }): Promise<{
7
+ statusCode: number;
8
+ redirectUrl: string;
9
+ message?: undefined;
10
+ } | {
11
+ statusCode: number;
12
+ message: string;
13
+ redirectUrl?: undefined;
14
+ }>;
@@ -3,26 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const utils_1 = require("../utils");
4
4
  const authHelper = async ({ req, res, serverRuntimeConfig }) => {
5
5
  try {
6
- return utils_1.getRedirectUrl(serverRuntimeConfig, { req, res });
7
- // TODO OLD/Remove
8
- // const authredurectUrl = getRedirectUrl(serverRuntimeConfig, {
9
- // req,
10
- // res,
11
- // })
12
- // return {
13
- // statusCode: 302,
14
- // redirectUrl: authredurectUrl,
15
- // }
6
+ const redirectUrl = await utils_1.getRedirectUrl(serverRuntimeConfig, { req, res, registerHandlers: true });
7
+ return {
8
+ statusCode: 302,
9
+ redirectUrl,
10
+ };
16
11
  }
17
12
  catch (error) {
18
13
  const errorMessage = 'Error handling auth route';
19
14
  console.error(errorMessage, error);
20
- return res.status(500).send(errorMessage);
21
- // TODO OLD/Remove
22
- // return {
23
- // statusCode: 500,
24
- // message: errorMessage,
25
- // }
15
+ return {
16
+ statusCode: 500,
17
+ message: errorMessage,
18
+ };
26
19
  }
27
20
  };
28
21
  exports.default = authHelper;
@@ -1 +1 @@
1
- {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/helpers/auth.js"],"names":[],"mappings":";;AAAA,oCAAyC;AAEzC,MAAM,UAAU,GAAG,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,mBAAmB,EAAE,EAAE,EAAE;IAC7D,IAAI;QACF,OAAO,sBAAc,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;QAExD,kBAAkB;QAClB,gEAAgE;QAChE,SAAS;QACT,SAAS;QACT,KAAK;QAEL,WAAW;QACX,qBAAqB;QACrB,kCAAkC;QAClC,IAAI;KACL;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,YAAY,GAAG,2BAA2B,CAAA;QAChD,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;QAElC,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAEzC,kBAAkB;QAClB,WAAW;QACX,qBAAqB;QACrB,2BAA2B;QAC3B,IAAI;KACL;AACH,CAAC,CAAA;AAED,kBAAe,UAAU,CAAA"}
1
+ {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/helpers/auth.js"],"names":[],"mappings":";;AAAA,oCAAyC;AAEzC,MAAM,UAAU,GAAG,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,mBAAmB,EAAE,EAAE,EAAE;IAC7D,IAAI;QACF,MAAM,WAAW,GAAG,MAAM,sBAAc,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAA;QAEnG,OAAO;YACL,UAAU,EAAE,GAAG;YACf,WAAW;SACZ,CAAA;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,YAAY,GAAG,2BAA2B,CAAA;QAChD,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;QAElC,OAAO;YACL,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,YAAY;SACtB,CAAA;KACF;AACH,CAAC,CAAA;AAED,kBAAe,UAAU,CAAA"}
@@ -3,4 +3,7 @@ declare function callbackHelper({ req, res, serverRuntimeConfig }: {
3
3
  req: any;
4
4
  res: any;
5
5
  serverRuntimeConfig: any;
6
- }): Promise<any>;
6
+ }): Promise<{
7
+ statusCode: number;
8
+ redirectUrl: string;
9
+ }>;
@@ -4,56 +4,50 @@ const shopify_api_1 = require("@shopify/shopify-api");
4
4
  const utils_1 = require("../utils");
5
5
  const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
6
6
  var _a;
7
- const { PAGE_PATHS, APP_WEBHOOKS, PAYMENT_CONFIG } = serverRuntimeConfig;
7
+ const { PAGE_PATHS } = serverRuntimeConfig; // , PAYMENT_CONFIG APP_WEBHOOKS
8
8
  const { shop, host } = req.query;
9
9
  if (utils_1.stringEmpty(shop) || utils_1.stringEmpty(host)) {
10
10
  // HMMM: why is this a 303 (rather than a 302 or or anything)??
11
- return res.redirect(303, `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?code=${utils_1.ERROR_CODES.INVALID_CALLBACK}`);
12
- // TODO OLD/Remove
13
- // return {
14
- // statusCode: 303, // HMMM: why is this a 303 (rather than a 302 or or anything)??
15
- // redirectUrl: `${PAGE_PATHS[PAGE_ROUTE_NAMES.ERROR]}?code=${ERROR_CODES.INVALID_CALLBACK}`,
16
- // }
11
+ return {
12
+ statusCode: 303,
13
+ redirectUrl: `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?code=${utils_1.ERROR_CODES.INVALID_CALLBACK}`,
14
+ };
17
15
  }
18
16
  let redirectUrl;
19
17
  try {
20
- const shopify = utils_1.getInitializedShopify(serverRuntimeConfig, shop);
21
- const sessionStorage = utils_1.getSessionStorage(serverRuntimeConfig, shop);
18
+ const shopify = await utils_1.getInitializedShopify(serverRuntimeConfig, shop);
19
+ const sessionStorage = utils_1.getSessionStorage(shopify, serverRuntimeConfig, shop);
22
20
  const authPayload = { rawRequest: req, rawResponse: res };
23
- const { session } = await shopify.auth.callback(authPayload); // .Auth.validateAuthCallback(req, res, req.query)
21
+ const { session } = await shopify.auth.callback(authPayload);
24
22
  await sessionStorage.store(session.toObject());
25
- await utils_1.registerWebhooks(serverRuntimeConfig, APP_WEBHOOKS, session);
23
+ const bar = await shopify.webhooks.register({ session });
24
+ console.log('shopify.webhooks.register:', bar);
25
+ const bar2 = await shopify.webhooks.getHandlers('APP_UNINSTALLED');
26
+ console.log('shopify.webhooks.getHandlers:', bar2);
26
27
  // TODO: explore objectToQuerystring
27
28
  const embeddedURL = await shopify.auth.getEmbeddedAppUrl(authPayload);
28
29
  redirectUrl = `${embeddedURL}?${new URLSearchParams(req.query).toString()}`;
29
- if (PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) {
30
- const billingManager = new utils_1.BillingManager(shopify, session, serverRuntimeConfig);
31
- const confirmationUrl = await billingManager.ensureBilling();
32
- if (utils_1.stringNotEmpty(confirmationUrl)) {
33
- redirectUrl = confirmationUrl;
34
- }
35
- }
30
+ console.log('redirectUrl:', redirectUrl);
31
+ // TOD re-enable
32
+ // if (PAYMENT_CONFIG?.required) {
33
+ // const billingManager = new BillingManager(shopify, session, serverRuntimeConfig)
34
+ // const confirmationUrl = await billingManager.ensureBilling()
35
+ // if (stringNotEmpty(confirmationUrl)) {
36
+ // redirectUrl = confirmationUrl
37
+ // }
38
+ // }
36
39
  }
37
40
  catch (error) {
38
41
  const errorMessage = 'Error handling callback route';
39
42
  switch (true) {
40
- // TODO OLD/Remove
41
43
  // TODO implement a custom SessionNotFound error
42
- // case error instanceof CookieNotFound:
43
- // case error instanceof SessionNotFound: {
44
- // console.error(`${errorMessage}. Cookie/Session Error`, error)
45
- // redirectUrl = getRedirectUrl(serverRuntimeConfig, {
46
- // req,
47
- // res,
48
- // })
49
- // break
50
- // }
51
44
  case error instanceof shopify_api_1.CookieNotFound: {
52
45
  console.error(`${errorMessage}. Cookie Error`, error);
53
- return utils_1.getRedirectUrl(serverRuntimeConfig, {
46
+ redirectUrl = await utils_1.getRedirectUrl(serverRuntimeConfig, {
54
47
  req,
55
48
  res,
56
49
  });
50
+ break;
57
51
  }
58
52
  case error instanceof shopify_api_1.BillingError: {
59
53
  console.error(`${errorMessage}. Billing Error ${error.message}`, error.errorData);
@@ -77,12 +71,10 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
77
71
  }
78
72
  }
79
73
  }
80
- return res.redirect(302, redirectUrl);
81
- // TODO OLD/Remove
82
- // return {
83
- // statusCode: 302,
84
- // redirectUrl,
85
- // }
74
+ return {
75
+ statusCode: 302,
76
+ redirectUrl,
77
+ };
86
78
  };
87
79
  exports.default = callbackHelper;
88
80
  //# sourceMappingURL=callback.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"callback.js","sourceRoot":"","sources":["../../src/helpers/callback.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"callback.js","sourceRoot":"","sources":["../../src/helpers/callback.js"],"names":[],"mappings":"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"}
@@ -28,8 +28,8 @@ const graphHelper = async ({ req, res, params, serverRuntimeConfig }) => {
28
28
  };
29
29
  }
30
30
  try {
31
- const shopify = utils_1.getInitializedShopify(serverRuntimeConfig, shop);
32
- const session = await utils_1.getVerifiedSession({ req, res, shop, serverRuntimeConfig });
31
+ const shopify = await utils_1.getInitializedShopify(serverRuntimeConfig, shop);
32
+ const session = await utils_1.getVerifiedSession({ req, res, shop, shopify, serverRuntimeConfig });
33
33
  const client = new shopify.clients.Graphql({ session });
34
34
  const response = await client.query(Object.assign(Object.assign({ data: graphVariables ? {
35
35
  query: graphQuery,