@agnostack/next-shopify 2.0.15-beta.8 → 2.1.0-alpha.1

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 (40) hide show
  1. package/CHANGELOG.md +18 -215
  2. package/dist/lib/handlers/api/verifiable/graph.d.ts.map +1 -1
  3. package/dist/lib/handlers/api/verifiable/graph.js +1 -0
  4. package/dist/lib/handlers/api/verifiable/graph.js.map +1 -1
  5. package/dist/lib/handlers/api/verifiable/index.d.ts +0 -1
  6. package/dist/lib/handlers/ssr/protect.d.ts +2 -1
  7. package/dist/lib/handlers/ssr/protect.d.ts.map +1 -1
  8. package/dist/lib/handlers/ssr/protect.js +60 -42
  9. package/dist/lib/handlers/ssr/protect.js.map +1 -1
  10. package/dist/lib/utils/session.d.ts +2 -0
  11. package/dist/lib/utils/session.d.ts.map +1 -1
  12. package/dist/lib/utils/session.js +21 -4
  13. package/dist/lib/utils/session.js.map +1 -1
  14. package/dist/lib/utils/shopify.d.ts.map +1 -1
  15. package/dist/lib/utils/shopify.js +7 -0
  16. package/dist/lib/utils/shopify.js.map +1 -1
  17. package/dist/plugins/withShopify.d.ts.map +1 -1
  18. package/dist/plugins/withShopify.js +10 -3
  19. package/dist/plugins/withShopify.js.map +1 -1
  20. package/dist/shared/constants.d.ts +1 -0
  21. package/dist/shared/constants.d.ts.map +1 -1
  22. package/dist/shared/constants.js +1 -0
  23. package/dist/shared/constants.js.map +1 -1
  24. package/dist/shared/graph.d.ts +13 -0
  25. package/dist/shared/graph.d.ts.map +1 -1
  26. package/dist/shared/graph.js +62 -0
  27. package/dist/shared/graph.js.map +1 -1
  28. package/dist/shared/index.d.ts +1 -0
  29. package/dist/shared/index.d.ts.map +1 -1
  30. package/dist/shared/index.js +1 -0
  31. package/dist/shared/index.js.map +1 -1
  32. package/dist/shared/theme.d.ts +4 -0
  33. package/dist/shared/theme.d.ts.map +1 -0
  34. package/dist/shared/theme.js +23 -0
  35. package/dist/shared/theme.js.map +1 -0
  36. package/package.json +1 -1
  37. package/dist/lib/handlers/api/verifiable/rest.d.ts +0 -2
  38. package/dist/lib/handlers/api/verifiable/rest.d.ts.map +0 -1
  39. package/dist/lib/handlers/api/verifiable/rest.js +0 -118
  40. package/dist/lib/handlers/api/verifiable/rest.js.map +0 -1
package/CHANGELOG.md CHANGED
@@ -1,105 +1,28 @@
1
- ## [2.0.15-beta.8](https://github.com/agnostack/next-shopify/compare/v2.0.15-beta.7...v2.0.15-beta.8) (2024-10-16)
1
+ # [2.1.0-alpha.1](https://github.com/agnostack/next-shopify/compare/v2.0.15-alpha.24...v2.1.0-alpha.1) (2024-10-18)
2
2
 
3
3
 
4
4
  ### Bug Fixes
5
5
 
6
- * testing PAYMENT.required ([5d5f410](https://github.com/agnostack/next-shopify/commit/5d5f410a28a8553b7cadb8fc1a2c2ddab462bb6b))
6
+ * added new theme graph queries ([a05cc18](https://github.com/agnostack/next-shopify/commit/a05cc18a05bd755f977efa3fceb4e96f61192d39))
7
+ * added new theme graph queries ([e1498ac](https://github.com/agnostack/next-shopify/commit/e1498acca72f34e9f7c01beb83165d80fed37b11))
8
+ * added new theme graph queries ([9c3dff1](https://github.com/agnostack/next-shopify/commit/9c3dff1e58418dbee8b67c28707b1987d7002706))
9
+ * added new theme graph queries ([afb8cbf](https://github.com/agnostack/next-shopify/commit/afb8cbff9bd1bfab15c9d1cf38572327d0f3aaf5))
10
+ * added new theme graph queries ([924e47f](https://github.com/agnostack/next-shopify/commit/924e47fcf6897739c2cdbe577a5c915f28317324))
11
+ * clean up/logs ([df6121c](https://github.com/agnostack/next-shopify/commit/df6121c9edb2994b8343bb9882b21f7fd12173f2))
12
+ * debug ([9b55687](https://github.com/agnostack/next-shopify/commit/9b556879cb1efaebd50d6896ac8afb9fe3773a72))
13
+ * merged in beta changes for removing rest ([35892b7](https://github.com/agnostack/next-shopify/commit/35892b72760e52dbef9f6e68823f9d05bee1b120))
14
+ * removed rest handler ([5d88d64](https://github.com/agnostack/next-shopify/commit/5d88d64053b37026604ac6f52028e0ab75c46f6a))
15
+ * restructured THEME_QUERY_TRANSFORM, added getAsset helpers ([a42c381](https://github.com/agnostack/next-shopify/commit/a42c3818cac481df9b1268bed89c658da59da35b))
16
+ * revert ([a02018a](https://github.com/agnostack/next-shopify/commit/a02018af8f9d7c7268fa49e69a2295cd06df26d2))
17
+ * updated helpers ([34ba8f6](https://github.com/agnostack/next-shopify/commit/34ba8f6a18115e8820d1b264d81cd99da07abb15))
18
+ * updated helpers ([0fa612e](https://github.com/agnostack/next-shopify/commit/0fa612e83f6035d5ac0812bc1b32ea7aa7a8c208))
19
+ * updated to remove rest calls ([d005c18](https://github.com/agnostack/next-shopify/commit/d005c18d9b475a5b7a7ac2bc9d80f14d95fbe041))
20
+ * updated typo, cleaned up logs ([afb50db](https://github.com/agnostack/next-shopify/commit/afb50dbc2c9d94707b4cee9aae7b4f17c5a0b3f5))
7
21
 
8
- ## [2.0.15-beta.7](https://github.com/agnostack/next-shopify/compare/v2.0.15-beta.6...v2.0.15-beta.7) (2024-10-16)
9
22
 
23
+ ### Features
10
24
 
11
- ### Bug Fixes
12
-
13
- * testing PAYMENT.required ([4845e1f](https://github.com/agnostack/next-shopify/commit/4845e1f70ca2a405c1530ecd2a7232d50ff4049c))
14
-
15
- ## [2.0.15-beta.6](https://github.com/agnostack/next-shopify/compare/v2.0.15-beta.5...v2.0.15-beta.6) (2024-10-16)
16
-
17
-
18
- ### Bug Fixes
19
-
20
- * testing PAYMENT.required ([8e69545](https://github.com/agnostack/next-shopify/commit/8e6954532589348093351af1fa40d1d135311a26))
21
-
22
- ## [2.0.15-beta.5](https://github.com/agnostack/next-shopify/compare/v2.0.15-beta.4...v2.0.15-beta.5) (2024-10-16)
23
-
24
-
25
- ### Bug Fixes
26
-
27
- * testing PAYMENT.required ([bd51812](https://github.com/agnostack/next-shopify/commit/bd518122ae9036271b4fd2aec2d616bb54a9c8f6))
28
-
29
- ## [2.0.15-beta.4](https://github.com/agnostack/next-shopify/compare/v2.0.15-beta.3...v2.0.15-beta.4) (2024-10-16)
30
-
31
-
32
- ### Bug Fixes
33
-
34
- * testing PAYMENT.required ([a23ed31](https://github.com/agnostack/next-shopify/commit/a23ed315270dc195e7f3cb5d16f0ef6bfccc606c))
35
-
36
- ## [2.0.15-beta.3](https://github.com/agnostack/next-shopify/compare/v2.0.15-beta.2...v2.0.15-beta.3) (2024-10-16)
37
-
38
-
39
- ### Bug Fixes
40
-
41
- * testing PAYMENT.required ([4eae2f7](https://github.com/agnostack/next-shopify/commit/4eae2f73bfc26667375bf6569b6592adc5a26ccb))
42
- * testing PAYMENT.required ([6a7d2a3](https://github.com/agnostack/next-shopify/commit/6a7d2a31eb04edbf28bea64d6f20d9cf56da11e2))
43
-
44
- ## [2.0.15-beta.2](https://github.com/agnostack/next-shopify/compare/v2.0.15-beta.1...v2.0.15-beta.2) (2024-10-16)
45
-
46
-
47
- ### Bug Fixes
48
-
49
- * added SHOPIFY_EMBEDDED_APP and SHOPIFY_EMBEDDED_LEGACY ([77a7122](https://github.com/agnostack/next-shopify/commit/77a712214277cafecf5ac6aff022a5811832aacc))
50
-
51
- ## [2.0.15-beta.1](https://github.com/agnostack/next-shopify/compare/v2.0.14...v2.0.15-beta.1) (2024-10-16)
52
-
53
-
54
- ### Bug Fixes
55
-
56
- * add isValid ([f39e558](https://github.com/agnostack/next-shopify/commit/f39e558c456365883a701e675df855a33beb9747))
57
- * added no-cache headers ([66ea2af](https://github.com/agnostack/next-shopify/commit/66ea2af691af8f51cee7bd9d7f2ea7e00814d1ce))
58
- * cleaned up order ([b957d8a](https://github.com/agnostack/next-shopify/commit/b957d8a54fdca0dadf74f49b776ae8cb00adb278))
59
- * cleanup ([6a7b7a0](https://github.com/agnostack/next-shopify/commit/6a7b7a0ca85fe0e716f2ac9b8e9fd2b2c0c1b36d))
60
- * cleanup ([c4d9145](https://github.com/agnostack/next-shopify/commit/c4d91459da5a25dc98e2163d1130700d7091de75))
61
- * cleanup ([8050ff6](https://github.com/agnostack/next-shopify/commit/8050ff6998d55a42a1fe870e8d71ddbbbfa2df91))
62
- * cleanup ([b9e3f95](https://github.com/agnostack/next-shopify/commit/b9e3f952d1e4a1592e171cb300036c22dbcc669f))
63
- * debug ([313aa30](https://github.com/agnostack/next-shopify/commit/313aa30042d000797752add4b9cdf7b13608207a))
64
- * debug ([349ebd1](https://github.com/agnostack/next-shopify/commit/349ebd199ce072a28286057b9d6de7f9b03e1a85))
65
- * debug ([5615c5c](https://github.com/agnostack/next-shopify/commit/5615c5cd53a06086ad09f7d7e7bbaf7fda14e496))
66
- * debug ([3d3d6b9](https://github.com/agnostack/next-shopify/commit/3d3d6b979eadfb49bed1a9ef7e248a77a69791d7))
67
- * debug ([928e967](https://github.com/agnostack/next-shopify/commit/928e9677c5f5a31803737e5984177769b67567a1))
68
- * debug ([cbb483c](https://github.com/agnostack/next-shopify/commit/cbb483c2a2f52d5233d7176e8a330ad6bb560b29))
69
- * debug ([4797d06](https://github.com/agnostack/next-shopify/commit/4797d06fe655bc02cee9ee25cd375bd8267a0315))
70
- * debug ([c7bdaf3](https://github.com/agnostack/next-shopify/commit/c7bdaf3f0ea2d4b840ec9268a87f28bc2dea4459))
71
- * debug ([93906c0](https://github.com/agnostack/next-shopify/commit/93906c0c1847023172a9f544cb8a707855bcb347))
72
- * debug ([4b78995](https://github.com/agnostack/next-shopify/commit/4b789953a44aa0b4dcf6e149835b0ea005503f60))
73
- * debug ([e5b7517](https://github.com/agnostack/next-shopify/commit/e5b7517159201319d979bd04d5da2fe5a1ad6a1a))
74
- * debug ([ed10894](https://github.com/agnostack/next-shopify/commit/ed1089488d7d220eaa1a359b77ecd558e697e1de))
75
- * debug ([f2204a5](https://github.com/agnostack/next-shopify/commit/f2204a5386360a49735965f81ccef393525a23c6))
76
- * debug ([9021240](https://github.com/agnostack/next-shopify/commit/90212409b0b63dc685b8e57cc51d7464828633ec))
77
- * debug ([5dcd289](https://github.com/agnostack/next-shopify/commit/5dcd2894cec8e11a5be1742bdd5ce34ca56e1b5a))
78
- * debug ([553a0b4](https://github.com/agnostack/next-shopify/commit/553a0b42b1764e49f3dd06e91dc54d6f1bc8199d))
79
- * debug ([817f201](https://github.com/agnostack/next-shopify/commit/817f20132df0470fa4a490b9d35889a6f3683179))
80
- * debug ([1596846](https://github.com/agnostack/next-shopify/commit/15968461ee2ad3e633bb7686ec74549830a7dea3))
81
- * debug ([d696653](https://github.com/agnostack/next-shopify/commit/d69665363217932ab7c4dbd3a94a888062fb6d84))
82
- * debug ([a7744f6](https://github.com/agnostack/next-shopify/commit/a7744f618d74254f0c369ab270136c7426dc6121))
83
- * debug ([6d68b97](https://github.com/agnostack/next-shopify/commit/6d68b97aaf8f0cb6b8734d59cba068f1c9086e58))
84
- * debug ([be7851b](https://github.com/agnostack/next-shopify/commit/be7851bc07004542294d70873bce2f25360fd03c))
85
- * debug ([62277f7](https://github.com/agnostack/next-shopify/commit/62277f7156b7f91e4f8e2b5b5f4604d2b5b45842))
86
- * debug ([428e094](https://github.com/agnostack/next-shopify/commit/428e094aacd8222a1910bf4d795eddc04a90d066))
87
- * debug ([b1afdeb](https://github.com/agnostack/next-shopify/commit/b1afdeb821e8532fccfe18723461b04a9d4d79fc))
88
- * debug ([6b8c320](https://github.com/agnostack/next-shopify/commit/6b8c320e1c0a0de99cfbdff5b000e42a93024e56))
89
- * debug ([4138883](https://github.com/agnostack/next-shopify/commit/41388834a8cd7a6eeffc604ff332b2a0bd2ac8b2))
90
- * debug ([bb5fc86](https://github.com/agnostack/next-shopify/commit/bb5fc867387d9c0756ad67500f8d03736482ef76))
91
- * debug ([7562c9f](https://github.com/agnostack/next-shopify/commit/7562c9f0b93fbe08d7e86c8881e145bd9d747006))
92
- * protect route mods ([e6802b9](https://github.com/agnostack/next-shopify/commit/e6802b94de9d2e16a125303f46cd3baaab6eeac8))
93
- * protect route mods ([202e65f](https://github.com/agnostack/next-shopify/commit/202e65ff6c9e929411be4140487a947c8eb265f3))
94
- * protect route mods ([22e7861](https://github.com/agnostack/next-shopify/commit/22e7861335ab5c5416f4245d17fa05ba886f4171))
95
- * protect route mods ([ffb040d](https://github.com/agnostack/next-shopify/commit/ffb040d21e661600e7eccc95f1c48a0fedf43aa0))
96
- * protect route mods ([51bb2e4](https://github.com/agnostack/next-shopify/commit/51bb2e46702da5b1dee8925fee3556b20d9d52cd))
97
- * protect route mods ([05714f2](https://github.com/agnostack/next-shopify/commit/05714f29d387ccc36e26fabff3c4f94fd27cb1f6))
98
- * protect route mods ([81e101f](https://github.com/agnostack/next-shopify/commit/81e101f792ee01917ec2137f7f4b28ba321264fa))
99
- * protect route mods ([f756a4b](https://github.com/agnostack/next-shopify/commit/f756a4b81c93e07a67fba96a0ca1160c2760b9e1))
100
- * protect route mods ([dadc019](https://github.com/agnostack/next-shopify/commit/dadc01900f7e449bf6dc11acc30415fd920ecd39))
101
- * protect route mods ([b01c4b3](https://github.com/agnostack/next-shopify/commit/b01c4b3327db6aee58fd1c49882aa493cdb4d823))
102
- * update shopify lib ([3b4f18a](https://github.com/agnostack/next-shopify/commit/3b4f18a05b8c36981a8de636ad472b955761f708))
25
+ * added role/isActive to theme request/trnasform ([c35479e](https://github.com/agnostack/next-shopify/commit/c35479e63a6b061f61b99691bfce6b424f344425))
103
26
 
104
27
  ## [2.0.14](https://github.com/agnostack/next-shopify/compare/v2.0.13...v2.0.14) (2024-10-16)
105
28
 
@@ -125,126 +48,6 @@
125
48
  * work in progress ([0d4040b](https://github.com/agnostack/next-shopify/commit/0d4040b58af3e12ee66d073400b0c420d9a758d0))
126
49
  * work in progress ([48748ed](https://github.com/agnostack/next-shopify/commit/48748edd6287ca94afb720aff05eb21541757a31))
127
50
 
128
- ## [2.0.14-beta.17](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.16...v2.0.14-beta.17) (2024-10-15)
129
-
130
-
131
- ### Bug Fixes
132
-
133
- * added DISABLE_RECRYPTION ([f2c06bf](https://github.com/agnostack/next-shopify/commit/f2c06bff8b5cd6c374f16b1ad1332de5439eb4bf))
134
-
135
- ## [2.0.14-beta.16](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.15...v2.0.14-beta.16) (2024-10-15)
136
-
137
-
138
- ### Bug Fixes
139
-
140
- * added DISABLE_RECRYPTION ([ab2c7f4](https://github.com/agnostack/next-shopify/commit/ab2c7f477880d3193cd9064c4645f40d1b3254b8))
141
-
142
- ## [2.0.14-beta.15](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.14...v2.0.14-beta.15) (2024-10-15)
143
-
144
-
145
- ### Bug Fixes
146
-
147
- * added DISABLE_RECRYPTION ([c2e6801](https://github.com/agnostack/next-shopify/commit/c2e68017b9f19a1f3fbfcff2001bdae5dfc879cd))
148
-
149
- ## [2.0.14-beta.14](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.13...v2.0.14-beta.14) (2024-10-15)
150
-
151
-
152
- ### Bug Fixes
153
-
154
- * added DISABLE_RECRYPTION ([f475460](https://github.com/agnostack/next-shopify/commit/f475460d8abd764b00a4c5e33717d12c8dacd23d))
155
-
156
- ## [2.0.14-beta.13](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.12...v2.0.14-beta.13) (2024-10-15)
157
-
158
-
159
- ### Bug Fixes
160
-
161
- * added DISABLE_RECRYPTION ([3a928f7](https://github.com/agnostack/next-shopify/commit/3a928f7dac885a192c3312b2da193cf93fa8db5c))
162
-
163
- ## [2.0.14-beta.12](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.11...v2.0.14-beta.12) (2024-10-15)
164
-
165
-
166
- ### Bug Fixes
167
-
168
- * added DISABLE_RECRYPTION ([e588d76](https://github.com/agnostack/next-shopify/commit/e588d7684a703ae94c02eb07fff638a25b52f8bc))
169
-
170
- ## [2.0.14-beta.11](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.10...v2.0.14-beta.11) (2024-10-15)
171
-
172
-
173
- ### Bug Fixes
174
-
175
- * added DISABLE_RECRYPTION ([e747cda](https://github.com/agnostack/next-shopify/commit/e747cdad3af3ddae03ebc6dd8b5c4268b7348e8b))
176
-
177
- ## [2.0.14-beta.10](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.9...v2.0.14-beta.10) (2024-10-15)
178
-
179
-
180
- ### Bug Fixes
181
-
182
- * added DISABLE_RECRYPTION ([31d8156](https://github.com/agnostack/next-shopify/commit/31d8156a2e495421a32e7eef257a6e8c5f548296))
183
-
184
- ## [2.0.14-beta.9](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.8...v2.0.14-beta.9) (2024-10-15)
185
-
186
-
187
- ### Bug Fixes
188
-
189
- * added DISABLE_RECRYPTION ([14cb154](https://github.com/agnostack/next-shopify/commit/14cb154d9032c6843550843eeb71eb86841946f0))
190
-
191
- ## [2.0.14-beta.8](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.7...v2.0.14-beta.8) (2024-10-15)
192
-
193
-
194
- ### Bug Fixes
195
-
196
- * added DISABLE_RECRYPTION ([b18f2e6](https://github.com/agnostack/next-shopify/commit/b18f2e64827820a0c42f0b278c4b88ce58c157a2))
197
-
198
- ## [2.0.14-beta.7](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.6...v2.0.14-beta.7) (2024-10-15)
199
-
200
-
201
- ### Bug Fixes
202
-
203
- * work in progress ([6ee5c0a](https://github.com/agnostack/next-shopify/commit/6ee5c0ad8e2ceb69c20883de921d53ffb660da99))
204
-
205
- ## [2.0.14-beta.6](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.5...v2.0.14-beta.6) (2024-10-15)
206
-
207
-
208
- ### Bug Fixes
209
-
210
- * work in progress ([1c74999](https://github.com/agnostack/next-shopify/commit/1c7499930e8aecd2907843cc726a3f0c941a47d0))
211
-
212
- ## [2.0.14-beta.5](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.4...v2.0.14-beta.5) (2024-10-15)
213
-
214
-
215
- ### Bug Fixes
216
-
217
- * work in progress ([23702d7](https://github.com/agnostack/next-shopify/commit/23702d72b2de3ff40552caa3ae65401f879af54c))
218
-
219
- ## [2.0.14-beta.4](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.3...v2.0.14-beta.4) (2024-10-15)
220
-
221
-
222
- ### Bug Fixes
223
-
224
- * work in progress ([ea44f8e](https://github.com/agnostack/next-shopify/commit/ea44f8eb1c4cd828c0cae935af9187b0a6e265b0))
225
-
226
- ## [2.0.14-beta.3](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.2...v2.0.14-beta.3) (2024-10-15)
227
-
228
-
229
- ### Bug Fixes
230
-
231
- * work in progress ([0d4040b](https://github.com/agnostack/next-shopify/commit/0d4040b58af3e12ee66d073400b0c420d9a758d0))
232
-
233
- ## [2.0.14-beta.2](https://github.com/agnostack/next-shopify/compare/v2.0.14-beta.1...v2.0.14-beta.2) (2024-10-15)
234
-
235
-
236
- ### Bug Fixes
237
-
238
- * work in progress ([48748ed](https://github.com/agnostack/next-shopify/commit/48748edd6287ca94afb720aff05eb21541757a31))
239
-
240
- ## [2.0.14-beta.1](https://github.com/agnostack/next-shopify/compare/v2.0.13...v2.0.14-beta.1) (2024-10-15)
241
-
242
-
243
- ### Bug Fixes
244
-
245
- * debugging ([58b02cf](https://github.com/agnostack/next-shopify/commit/58b02cf855deade57f42acb25ab894c9c1fccfc6))
246
- * updated isParseable ([83dcc6e](https://github.com/agnostack/next-shopify/commit/83dcc6ebfc5ab7b3e59de8b692c0d02976009433))
247
-
248
51
  ## [2.0.13](https://github.com/agnostack/next-shopify/compare/v2.0.12...v2.0.13) (2024-10-01)
249
52
 
250
53
 
package/dist/lib/handlers/api/verifiable/graph.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/graph.js"],"names":[],"mappings":"AAkBO,yGA6HN"}
1
+ {"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/graph.js"],"names":[],"mappings":"AAkBO,yGA8HN"}
package/dist/lib/handlers/api/verifiable/graph.js CHANGED
@@ -54,6 +54,7 @@ const handleGraph = (serverRuntimeConfig) => {
54
54
  let headers = {};
55
55
  let message = 'Error handling query call';
56
56
  try {
57
+ // HERE
57
58
  const { getVerifiedClients } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
58
59
  const { Graphql } = yield getVerifiedClients({ req, res, shop, apiVersion, isOnline });
59
60
  response = yield Graphql.request(graphQuery, Object.assign(Object.assign(Object.assign({}, (0, shared_1.objectNotEmpty)(graphVariables) && { variables: graphVariables }), (0, shared_1.objectNotEmpty)(query) && { query }), graphParams));
package/dist/lib/handlers/api/verifiable/graph.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/graph.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/graph.js"],"names":[],"mappings":"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"}
package/dist/lib/handlers/api/verifiable/index.d.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  export * from "./appInstallation";
2
2
  export * from "./graph";
3
3
  export * from "./proxy";
4
- export * from "./rest";
5
4
  export * from "./token";
6
5
  //# sourceMappingURL=index.d.ts.map
package/dist/lib/handlers/ssr/protect.d.ts CHANGED
@@ -1,6 +1,7 @@
1
- export function protectRoute(serverRuntimeConfig: any, props: any): ({ req, res, query, locale, }: {
1
+ export function protectRoute(serverRuntimeConfig: any, props: any): ({ req, res, resolvedUrl, query, locale, }: {
2
2
  req: any;
3
3
  res: any;
4
+ resolvedUrl: any;
4
5
  query: any;
5
6
  locale: any;
6
7
  } | undefined, data: any) => Promise<{
package/dist/lib/handlers/ssr/protect.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"protect.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"AAqBO;;;;;;;;;;;;;;GA4KN"}
1
+ {"version":3,"file":"protect.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"AAqBO;;;;;;;;;;;;;;;GAyMN"}
package/dist/lib/handlers/ssr/protect.js CHANGED
@@ -17,9 +17,11 @@ const chalk_1 = __importDefault(require("chalk"));
17
17
  const utils_1 = require("../../utils");
18
18
  const shared_1 = require("../../../shared");
19
19
  const protectRoute = (serverRuntimeConfig, props) => {
20
+ console.info(`>>> ~ protectRoute props`, props);
20
21
  const { PAGE_PATHS, API_PATHS, APP_CONFIG, PAYMENT_CONFIG } = serverRuntimeConfig;
22
+ console.info(`>>> ~ PAGE_PATHS`, PAGE_PATHS);
21
23
  const isEmbedded = APP_CONFIG.isEmbeddedApp;
22
- return ({ req, res, query, locale, } = {}, data) => __awaiter(void 0, void 0, void 0, function* () {
24
+ return ({ req, res, resolvedUrl, query, locale, } = {}, data) => __awaiter(void 0, void 0, void 0, function* () {
23
25
  var _a, _b, _c, _d;
24
26
  const shop = (_a = query === null || query === void 0 ? void 0 : query.shop) !== null && _a !== void 0 ? _a : (_b = req.query) === null || _b === void 0 ? void 0 : _b.shop;
25
27
  if ((0, shared_1.stringEmpty)(shop)) {
@@ -38,54 +40,69 @@ const protectRoute = (serverRuntimeConfig, props) => {
38
40
  props: (0, shared_1.cleanObject)(Object.assign(Object.assign({ locale }, props), data), false, shared_1.stringEmptyOnly),
39
41
  };
40
42
  }
41
- const { shopify, loadAppData, loadSession, storeSession, findSessionIds, validateAccessToken, ensureBilling: handleEnsureBilling, } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
43
+ const { shopify, loadAppData, loadSession, storeSession, findSessionIds, getInstalledAppUrl, validateAccessToken, ensureBilling: handleEnsureBilling, } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
42
44
  if (shopify === null || shopify === void 0 ? void 0 : shopify.config) {
43
45
  res.setHeader('Content-Security-Policy', (0, utils_1.getSecurityHeader)(shop, shopify.config));
44
46
  }
45
- const idToken = (_c = query === null || query === void 0 ? void 0 : query.id_token) !== null && _c !== void 0 ? _c : (_d = req.query) === null || _d === void 0 ? void 0 : _d.id_token;
46
- // NOTE idToken will be present on initial load
47
- if (isEmbedded && (0, shared_1.stringNotEmpty)(idToken)) {
47
+ if (isEmbedded) {
48
+ const idToken = (_c = query === null || query === void 0 ? void 0 : query.id_token) !== null && _c !== void 0 ? _c : (_d = req.query) === null || _d === void 0 ? void 0 : _d.id_token;
49
+ console.info(`>>> ~ idToken`, idToken);
48
50
  const { isValid, accessToken: { session: _offlineSession, } = {}, } = yield validateAccessToken({ idToken });
49
51
  if (!isValid) {
50
- // TODO handle invalid access token
51
- console.warn('>>> Invalid Session (protectRoute > validateAccessToken)');
52
- }
53
- const offlineSession = _offlineSession.toObject();
54
- yield storeSession(offlineSession);
55
- // TODO validate we don't need/want online sessions to be stored
56
- // const {
57
- // isValid,
58
- // accessToken: {
59
- // session: _onlineSession,
60
- // } = {},
61
- // } = await validateAccessToken({ idToken, isOnline: true })
62
- // const onlineSession = _onlineSession.toObject()
63
- // await storeSession(onlineSession)
64
- let appId;
65
- try {
66
- const { appInfo } = yield loadAppData();
67
- appId = (0, shared_1.normalizeShopifyId)(appInfo === null || appInfo === void 0 ? void 0 : appInfo.id).id;
68
- // eslint-disable-next-line no-empty
52
+ console.warn('>>> Invalid or missing Session (protectRoute > validateAccessToken)');
53
+ const redirectUri = `${getInstalledAppUrl()}${resolvedUrl}`;
54
+ console.info(`>>> ~ redirectUri`, redirectUri);
55
+ return {
56
+ redirect: {
57
+ destination: `${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.EXIT]}?${new URLSearchParams(Object.assign(Object.assign({}, query), { shop,
58
+ redirectUri })).toString()}`,
59
+ permanent: false,
60
+ },
61
+ };
69
62
  }
70
- catch (_ignore) {
71
- console.info('Ignoring error loading appData', _ignore);
63
+ if (!_offlineSession) {
64
+ throw new Error('Error validating session');
72
65
  }
73
- // Register webhooks
74
- const prepareWebhookHandlers = (0, utils_1.getPrepareWebhookHandlers)(serverRuntimeConfig);
75
- const webhookHandlers = prepareWebhookHandlers({ appId });
76
- shopify.webhooks.addHandlers(webhookHandlers);
77
- // NOTE: webhooks cannot use an online session to make API calls to Shopify (but not all webooks may be doing that for all apps)
78
- yield shopify.webhooks.register({ session: offlineSession });
79
- if (PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) {
80
- // NOTE: handleEnsureBilling handles calling encryptStoreSession for offline session when shouldCheckBilling
81
- const callbackUrl = yield handleEnsureBilling(offlineSession);
82
- if ((0, shared_1.stringNotEmpty)(callbackUrl)) {
83
- return {
84
- redirect: {
85
- destination: `${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.EXIT]}?${new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: callbackUrl })).toString()}`,
86
- permanent: false,
87
- },
88
- };
66
+ const existingSessionIds = yield findSessionIds(shop);
67
+ console.info(`>>> ~ existingSessionIds`, existingSessionIds);
68
+ if ((0, shared_1.arrayEmpty)(existingSessionIds)) {
69
+ const offlineSession = _offlineSession.toObject();
70
+ yield storeSession(offlineSession);
71
+ // TODO validate we don't need/want online sessions to be stored
72
+ // const {
73
+ // isValid,
74
+ // accessToken: {
75
+ // session: _onlineSession,
76
+ // } = {},
77
+ // } = await validateAccessToken({ idToken, isOnline: true })
78
+ // const onlineSession = _onlineSession.toObject()
79
+ // await storeSession(onlineSession)
80
+ let appId;
81
+ try {
82
+ const { appInfo } = yield loadAppData();
83
+ appId = (0, shared_1.normalizeShopifyId)(appInfo === null || appInfo === void 0 ? void 0 : appInfo.id).id;
84
+ // eslint-disable-next-line no-empty
85
+ }
86
+ catch (_ignore) {
87
+ console.info('Ignoring error loading appData', _ignore);
88
+ }
89
+ // Register webhooks
90
+ const prepareWebhookHandlers = (0, utils_1.getPrepareWebhookHandlers)(serverRuntimeConfig);
91
+ const webhookHandlers = prepareWebhookHandlers({ appId });
92
+ shopify.webhooks.addHandlers(webhookHandlers);
93
+ // NOTE: webhooks cannot use an online session to make API calls to Shopify (but not all webooks may be doing that for all apps)
94
+ yield shopify.webhooks.register({ session: offlineSession });
95
+ if (PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) {
96
+ // NOTE: handleEnsureBilling handles calling encryptStoreSession for offline session when shouldCheckBilling
97
+ const callbackUrl = yield handleEnsureBilling(offlineSession);
98
+ if ((0, shared_1.stringNotEmpty)(callbackUrl)) {
99
+ return {
100
+ redirect: {
101
+ destination: `${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.EXIT]}?${new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: callbackUrl })).toString()}`,
102
+ permanent: false,
103
+ },
104
+ };
105
+ }
89
106
  }
90
107
  }
91
108
  }
@@ -103,6 +120,7 @@ const protectRoute = (serverRuntimeConfig, props) => {
103
120
  }
104
121
  if (!isEmbedded) {
105
122
  try {
123
+ // HERE
106
124
  // NOTE: this does not work if called INSIDE of embedded
107
125
  yield loadSession({ req, res });
108
126
  const destination = yield shopify.auth.getEmbeddedAppUrl({
package/dist/lib/handlers/ssr/protect.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"protect.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"protect.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"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"}
package/dist/lib/utils/session.d.ts CHANGED
@@ -9,6 +9,7 @@ export function getShopifyHelpers(serverRuntimeConfig: any, config: any): Promis
9
9
  Rest: import("@shopify/shopify-api/dist/ts/lib/clients/admin/rest/client").RestClient;
10
10
  } | undefined>);
11
11
  getAppUrl: (() => undefined) | ((_appPath: any) => Promise<string | undefined>);
12
+ getInstalledAppUrl?: (() => string) | undefined;
12
13
  validateAccessToken: (() => undefined) | (({ idToken, isOnline }: {
13
14
  idToken: any;
14
15
  isOnline: any;
@@ -45,6 +46,7 @@ export function getShopifyHelpers(serverRuntimeConfig: any, config: any): Promis
45
46
  deleteSessions: (() => undefined) | ((sessionIds: any) => Promise<any[]>);
46
47
  findSessionIds: (() => never[]) | ((_shop: any) => Promise<any[]>);
47
48
  shopify: import("@shopify/shopify-api").Shopify<any, import("@shopify/shopify-api").ShopifyRestResources, import("@shopify/shopify-api/dist/ts/future/flags").FutureFlagOptions> | undefined;
49
+ getOtherAppUrl: () => undefined;
48
50
  }>;
49
51
  export function prepareHeaders(serverRuntimeConfig: any): ({ generateReplacements, appData, shop, appId, headers: _headers }?: {
50
52
  generateReplacements: any;
package/dist/lib/utils/session.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/session.js"],"names":[],"mappings":"AAmCO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2WN;AAoCM;;;;;;mBAoBN"}
1
+ {"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/session.js"],"names":[],"mappings":"AAoCO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkYN;AAoCM;;;;;;mBAoBN"}
package/dist/lib/utils/session.js CHANGED
@@ -33,7 +33,7 @@ const crypto_1 = require("./crypto");
33
33
  const getShopifyHelpers = (serverRuntimeConfig, config) => __awaiter(void 0, void 0, void 0, function* () {
34
34
  var _a, _b;
35
35
  const shopify = (0, shopify_1.getInitializedShopify)(serverRuntimeConfig);
36
- const { APP_ID, API_PATHS, FB_CONFIG, FB_ROOT_COLLECTION, SHOPIFY_RUN_MODE, SESSION_CONFIG, PAYMENT_CONFIG, APP_CONFIG, } = serverRuntimeConfig;
36
+ const { APP_ID, API_PATHS, FB_CONFIG, FB_ROOT_COLLECTION, SHOPIFY_APP_HANDLE, SHOPIFY_RUN_MODE, SESSION_CONFIG, PAYMENT_CONFIG, APP_CONFIG, } = serverRuntimeConfig;
37
37
  const { shop } = config !== null && config !== void 0 ? config : {};
38
38
  const isReviewMode = (0, shared_1.isTrue)((SHOPIFY_RUN_MODE === 'review') &&
39
39
  (PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) &&
@@ -57,6 +57,9 @@ const getShopifyHelpers = (serverRuntimeConfig, config) => __awaiter(void 0, voi
57
57
  })), {}));
58
58
  //#region internal shopifyHelper implementations
59
59
  const validateAccessToken = ({ idToken, isOnline }) => __awaiter(void 0, void 0, void 0, function* () {
60
+ if ((0, shared_1.stringEmpty)(idToken)) {
61
+ return { isValid: false };
62
+ }
60
63
  try {
61
64
  const decodedSessionToken = yield shopify.session.decodeSessionToken(idToken);
62
65
  const dest = new URL(decodedSessionToken === null || decodedSessionToken === void 0 ? void 0 : decodedSessionToken.dest);
@@ -82,13 +85,21 @@ const getShopifyHelpers = (serverRuntimeConfig, config) => __awaiter(void 0, voi
82
85
  const isOnline = _isOnline !== null && _isOnline !== void 0 ? _isOnline : ((req != undefined) && (res != undefined));
83
86
  let session;
84
87
  let accessToken;
88
+ let redirectUrl;
85
89
  if (isOnline) {
86
90
  const authHeader = req.headers.authorization;
87
- const idToken = (authHeader === null || authHeader === void 0 ? void 0 : authHeader.startsWith('Bearer '))
91
+ // NOTE token will come from auth header during initial install
92
+ const hasTokenHeader = authHeader === null || authHeader === void 0 ? void 0 : authHeader.startsWith('Bearer ');
93
+ // const hasTokenQuery = req?.query?.id_token
94
+ const idToken = (hasTokenHeader)
88
95
  ? authHeader.substring(7)
89
96
  : (_c = req === null || req === void 0 ? void 0 : req.query) === null || _c === void 0 ? void 0 : _c.id_token;
90
97
  if ((0, shared_1.stringEmpty)(idToken)) {
98
+ // if (hasTokenHeader) {
99
+ // redirectUrl = '/bounce'
100
+ // } else {
91
101
  throw new shared_1.ShopifySessionMissingError('Missing session token');
102
+ // }
92
103
  }
93
104
  const { isValid, accessToken: { session: _onlineSession, } = {}, } = yield validateAccessToken({ idToken, isOnline });
94
105
  if (!isValid) {
@@ -115,7 +126,8 @@ const getShopifyHelpers = (serverRuntimeConfig, config) => __awaiter(void 0, voi
115
126
  if ((0, shared_1.stringNotEmpty)(session === null || session === void 0 ? void 0 : session.shop) && (session.shop !== shop)) {
116
127
  throw new Error('Invalid shop');
117
128
  }
118
- return Object.assign(Object.assign({}, session), { accessToken, encrypted: !isOnline });
129
+ return Object.assign(Object.assign({}, session), { accessToken,
130
+ redirectUrl, encrypted: !isOnline });
119
131
  }
120
132
  catch (error) {
121
133
  if (error instanceof shared_1.ShopifySessionAuthenticationError) {
@@ -259,10 +271,15 @@ const getShopifyHelpers = (serverRuntimeConfig, config) => __awaiter(void 0, voi
259
271
  });
260
272
  return shared_1.TRANSFORM.APP_QUERY((_p = (_o = appInstallation === null || appInstallation === void 0 ? void 0 : appInstallation.body) === null || _o === void 0 ? void 0 : _o.data) === null || _p === void 0 ? void 0 : _p.currentAppInstallation);
261
273
  });
274
+ const getInstalledAppUrl = () => {
275
+ const { store_name } = (0, shared_1.getSanitizedShopData)(shop);
276
+ return `https://admin.shopify.com/store/${store_name}/apps/${SHOPIFY_APP_HANDLE}`;
277
+ };
262
278
  //#endregion internal shopifyHelper implementations
263
- return Object.assign({ shopify, getAppUrl: () => undefined, getVerifiedClients: () => undefined, loadAppData: () => undefined, loadData: () => ({}), loadSecureData: () => ({}), loadSession: () => ({}), storeSession: () => ({}), updateSession: () => ({}), deleteSessions: () => undefined, findSessionIds: () => ([]), ensureBilling: () => undefined, validateAccessToken: () => undefined }, shopify && {
279
+ return Object.assign({ shopify, getAppUrl: () => undefined, getOtherAppUrl: () => undefined, getVerifiedClients: () => undefined, loadAppData: () => undefined, loadData: () => ({}), loadSecureData: () => ({}), loadSession: () => ({}), storeSession: () => ({}), updateSession: () => ({}), deleteSessions: () => undefined, findSessionIds: () => ([]), ensureBilling: () => undefined, validateAccessToken: () => undefined }, shopify && {
264
280
  getVerifiedClients,
265
281
  getAppUrl: buildEmbeddedAppUrl,
282
+ getInstalledAppUrl,
266
283
  validateAccessToken,
267
284
  encryptData,
268
285
  decryptData,