@agnostack/next-shopify 2.0.14-alpha.3 → 2.0.14-alpha.31
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.
- package/CHANGELOG.md +196 -0
- package/dist/lib/handlers/api/billing.js +2 -2
- package/dist/lib/handlers/api/billing.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/graph.d.ts.map +1 -1
- package/dist/lib/handlers/api/verifiable/graph.js +10 -11
- package/dist/lib/handlers/api/verifiable/graph.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/proxy.d.ts.map +1 -1
- package/dist/lib/handlers/api/verifiable/proxy.js +70 -40
- package/dist/lib/handlers/api/verifiable/proxy.js.map +1 -1
- package/dist/lib/handlers/api/verifiable/rest.js +1 -1
- package/dist/lib/handlers/api/verifiable/rest.js.map +1 -1
- package/dist/lib/handlers/ssr/protect.d.ts.map +1 -1
- package/dist/lib/handlers/ssr/protect.js +65 -30
- package/dist/lib/handlers/ssr/protect.js.map +1 -1
- package/dist/lib/utils/session.d.ts +13 -7
- package/dist/lib/utils/session.d.ts.map +1 -1
- package/dist/lib/utils/session.js +86 -41
- package/dist/lib/utils/session.js.map +1 -1
- package/dist/lib/utils/shopify.d.ts +1 -1
- package/dist/lib/utils/shopify.d.ts.map +1 -1
- package/dist/lib/utils/shopify.js +4 -2
- package/dist/lib/utils/shopify.js.map +1 -1
- package/dist/plugins/withShopify.d.ts.map +1 -1
- package/dist/plugins/withShopify.js +38 -34
- package/dist/plugins/withShopify.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,199 @@
|
|
|
1
|
+
## [2.0.14-alpha.31](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.30...v2.0.14-alpha.31) (2024-10-13)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* debug ([ed10894](https://github.com/agnostack/next-shopify/commit/ed1089488d7d220eaa1a359b77ecd558e697e1de))
|
|
7
|
+
|
|
8
|
+
## [2.0.14-alpha.30](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.29...v2.0.14-alpha.30) (2024-10-13)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* debug ([f2204a5](https://github.com/agnostack/next-shopify/commit/f2204a5386360a49735965f81ccef393525a23c6))
|
|
14
|
+
|
|
15
|
+
## [2.0.14-alpha.29](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.28...v2.0.14-alpha.29) (2024-10-13)
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### Bug Fixes
|
|
19
|
+
|
|
20
|
+
* debug ([9021240](https://github.com/agnostack/next-shopify/commit/90212409b0b63dc685b8e57cc51d7464828633ec))
|
|
21
|
+
|
|
22
|
+
## [2.0.14-alpha.28](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.27...v2.0.14-alpha.28) (2024-10-13)
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
### Bug Fixes
|
|
26
|
+
|
|
27
|
+
* debug ([5dcd289](https://github.com/agnostack/next-shopify/commit/5dcd2894cec8e11a5be1742bdd5ce34ca56e1b5a))
|
|
28
|
+
|
|
29
|
+
## [2.0.14-alpha.27](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.26...v2.0.14-alpha.27) (2024-10-12)
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
### Bug Fixes
|
|
33
|
+
|
|
34
|
+
* debug ([553a0b4](https://github.com/agnostack/next-shopify/commit/553a0b42b1764e49f3dd06e91dc54d6f1bc8199d))
|
|
35
|
+
|
|
36
|
+
## [2.0.14-alpha.26](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.25...v2.0.14-alpha.26) (2024-10-12)
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
### Bug Fixes
|
|
40
|
+
|
|
41
|
+
* debug ([817f201](https://github.com/agnostack/next-shopify/commit/817f20132df0470fa4a490b9d35889a6f3683179))
|
|
42
|
+
|
|
43
|
+
## [2.0.14-alpha.25](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.24...v2.0.14-alpha.25) (2024-10-12)
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
### Bug Fixes
|
|
47
|
+
|
|
48
|
+
* debug ([1596846](https://github.com/agnostack/next-shopify/commit/15968461ee2ad3e633bb7686ec74549830a7dea3))
|
|
49
|
+
|
|
50
|
+
## [2.0.14-alpha.24](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.23...v2.0.14-alpha.24) (2024-10-12)
|
|
51
|
+
|
|
52
|
+
|
|
53
|
+
### Bug Fixes
|
|
54
|
+
|
|
55
|
+
* debug ([d696653](https://github.com/agnostack/next-shopify/commit/d69665363217932ab7c4dbd3a94a888062fb6d84))
|
|
56
|
+
|
|
57
|
+
## [2.0.14-alpha.23](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.22...v2.0.14-alpha.23) (2024-10-12)
|
|
58
|
+
|
|
59
|
+
|
|
60
|
+
### Bug Fixes
|
|
61
|
+
|
|
62
|
+
* debug ([a7744f6](https://github.com/agnostack/next-shopify/commit/a7744f618d74254f0c369ab270136c7426dc6121))
|
|
63
|
+
|
|
64
|
+
## [2.0.14-alpha.22](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.21...v2.0.14-alpha.22) (2024-10-07)
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
### Bug Fixes
|
|
68
|
+
|
|
69
|
+
* debug ([6d68b97](https://github.com/agnostack/next-shopify/commit/6d68b97aaf8f0cb6b8734d59cba068f1c9086e58))
|
|
70
|
+
|
|
71
|
+
## [2.0.14-alpha.21](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.20...v2.0.14-alpha.21) (2024-10-07)
|
|
72
|
+
|
|
73
|
+
|
|
74
|
+
### Bug Fixes
|
|
75
|
+
|
|
76
|
+
* debug ([be7851b](https://github.com/agnostack/next-shopify/commit/be7851bc07004542294d70873bce2f25360fd03c))
|
|
77
|
+
|
|
78
|
+
## [2.0.14-alpha.20](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.19...v2.0.14-alpha.20) (2024-10-07)
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
### Bug Fixes
|
|
82
|
+
|
|
83
|
+
* debug ([62277f7](https://github.com/agnostack/next-shopify/commit/62277f7156b7f91e4f8e2b5b5f4604d2b5b45842))
|
|
84
|
+
|
|
85
|
+
## [2.0.14-alpha.19](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.18...v2.0.14-alpha.19) (2024-10-07)
|
|
86
|
+
|
|
87
|
+
|
|
88
|
+
### Bug Fixes
|
|
89
|
+
|
|
90
|
+
* cleanup ([8050ff6](https://github.com/agnostack/next-shopify/commit/8050ff6998d55a42a1fe870e8d71ddbbbfa2df91))
|
|
91
|
+
|
|
92
|
+
## [2.0.14-alpha.18](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.17...v2.0.14-alpha.18) (2024-10-07)
|
|
93
|
+
|
|
94
|
+
|
|
95
|
+
### Bug Fixes
|
|
96
|
+
|
|
97
|
+
* cleanup ([b9e3f95](https://github.com/agnostack/next-shopify/commit/b9e3f952d1e4a1592e171cb300036c22dbcc669f))
|
|
98
|
+
|
|
99
|
+
## [2.0.14-alpha.17](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.16...v2.0.14-alpha.17) (2024-10-06)
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
### Bug Fixes
|
|
103
|
+
|
|
104
|
+
* protect route mods ([e6802b9](https://github.com/agnostack/next-shopify/commit/e6802b94de9d2e16a125303f46cd3baaab6eeac8))
|
|
105
|
+
|
|
106
|
+
## [2.0.14-alpha.16](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.15...v2.0.14-alpha.16) (2024-10-06)
|
|
107
|
+
|
|
108
|
+
|
|
109
|
+
### Bug Fixes
|
|
110
|
+
|
|
111
|
+
* protect route mods ([202e65f](https://github.com/agnostack/next-shopify/commit/202e65ff6c9e929411be4140487a947c8eb265f3))
|
|
112
|
+
|
|
113
|
+
## [2.0.14-alpha.15](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.14...v2.0.14-alpha.15) (2024-10-06)
|
|
114
|
+
|
|
115
|
+
|
|
116
|
+
### Bug Fixes
|
|
117
|
+
|
|
118
|
+
* protect route mods ([22e7861](https://github.com/agnostack/next-shopify/commit/22e7861335ab5c5416f4245d17fa05ba886f4171))
|
|
119
|
+
|
|
120
|
+
## [2.0.14-alpha.14](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.13...v2.0.14-alpha.14) (2024-10-06)
|
|
121
|
+
|
|
122
|
+
|
|
123
|
+
### Bug Fixes
|
|
124
|
+
|
|
125
|
+
* protect route mods ([ffb040d](https://github.com/agnostack/next-shopify/commit/ffb040d21e661600e7eccc95f1c48a0fedf43aa0))
|
|
126
|
+
|
|
127
|
+
## [2.0.14-alpha.13](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.12...v2.0.14-alpha.13) (2024-10-06)
|
|
128
|
+
|
|
129
|
+
|
|
130
|
+
### Bug Fixes
|
|
131
|
+
|
|
132
|
+
* protect route mods ([51bb2e4](https://github.com/agnostack/next-shopify/commit/51bb2e46702da5b1dee8925fee3556b20d9d52cd))
|
|
133
|
+
|
|
134
|
+
## [2.0.14-alpha.12](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.11...v2.0.14-alpha.12) (2024-10-06)
|
|
135
|
+
|
|
136
|
+
|
|
137
|
+
### Bug Fixes
|
|
138
|
+
|
|
139
|
+
* protect route mods ([05714f2](https://github.com/agnostack/next-shopify/commit/05714f29d387ccc36e26fabff3c4f94fd27cb1f6))
|
|
140
|
+
|
|
141
|
+
## [2.0.14-alpha.11](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.10...v2.0.14-alpha.11) (2024-10-06)
|
|
142
|
+
|
|
143
|
+
|
|
144
|
+
### Bug Fixes
|
|
145
|
+
|
|
146
|
+
* protect route mods ([81e101f](https://github.com/agnostack/next-shopify/commit/81e101f792ee01917ec2137f7f4b28ba321264fa))
|
|
147
|
+
|
|
148
|
+
## [2.0.14-alpha.10](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.9...v2.0.14-alpha.10) (2024-10-06)
|
|
149
|
+
|
|
150
|
+
|
|
151
|
+
### Bug Fixes
|
|
152
|
+
|
|
153
|
+
* protect route mods ([f756a4b](https://github.com/agnostack/next-shopify/commit/f756a4b81c93e07a67fba96a0ca1160c2760b9e1))
|
|
154
|
+
|
|
155
|
+
## [2.0.14-alpha.9](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.8...v2.0.14-alpha.9) (2024-10-06)
|
|
156
|
+
|
|
157
|
+
|
|
158
|
+
### Bug Fixes
|
|
159
|
+
|
|
160
|
+
* protect route mods ([dadc019](https://github.com/agnostack/next-shopify/commit/dadc01900f7e449bf6dc11acc30415fd920ecd39))
|
|
161
|
+
|
|
162
|
+
## [2.0.14-alpha.8](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.7...v2.0.14-alpha.8) (2024-10-06)
|
|
163
|
+
|
|
164
|
+
|
|
165
|
+
### Bug Fixes
|
|
166
|
+
|
|
167
|
+
* protect route mods ([b01c4b3](https://github.com/agnostack/next-shopify/commit/b01c4b3327db6aee58fd1c49882aa493cdb4d823))
|
|
168
|
+
|
|
169
|
+
## [2.0.14-alpha.7](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.6...v2.0.14-alpha.7) (2024-10-06)
|
|
170
|
+
|
|
171
|
+
|
|
172
|
+
### Bug Fixes
|
|
173
|
+
|
|
174
|
+
* debug ([428e094](https://github.com/agnostack/next-shopify/commit/428e094aacd8222a1910bf4d795eddc04a90d066))
|
|
175
|
+
|
|
176
|
+
## [2.0.14-alpha.6](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.5...v2.0.14-alpha.6) (2024-10-06)
|
|
177
|
+
|
|
178
|
+
|
|
179
|
+
### Bug Fixes
|
|
180
|
+
|
|
181
|
+
* debug ([b1afdeb](https://github.com/agnostack/next-shopify/commit/b1afdeb821e8532fccfe18723461b04a9d4d79fc))
|
|
182
|
+
|
|
183
|
+
## [2.0.14-alpha.5](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.4...v2.0.14-alpha.5) (2024-10-06)
|
|
184
|
+
|
|
185
|
+
|
|
186
|
+
### Bug Fixes
|
|
187
|
+
|
|
188
|
+
* update shopify lib ([3b4f18a](https://github.com/agnostack/next-shopify/commit/3b4f18a05b8c36981a8de636ad472b955761f708))
|
|
189
|
+
|
|
190
|
+
## [2.0.14-alpha.4](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.3...v2.0.14-alpha.4) (2024-10-04)
|
|
191
|
+
|
|
192
|
+
|
|
193
|
+
### Bug Fixes
|
|
194
|
+
|
|
195
|
+
* debug ([6b8c320](https://github.com/agnostack/next-shopify/commit/6b8c320e1c0a0de99cfbdff5b000e42a93024e56))
|
|
196
|
+
|
|
1
197
|
## [2.0.14-alpha.3](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.2...v2.0.14-alpha.3) (2024-10-04)
|
|
2
198
|
|
|
3
199
|
|
|
@@ -50,7 +50,7 @@ const handleAppBilling = (serverRuntimeConfig) => (req, res) => __awaiter(void 0
|
|
|
50
50
|
let message = 'ignored';
|
|
51
51
|
const [eventType, { status } = {}] = Object.entries((0, shared_1.safeParse)(rawBody || '{}'))[0];
|
|
52
52
|
if ((eventType === shared_1.BILLING_EVENT_TYPES.SUBSCRIPTION) && TERMINAL_STATUSES.includes(status)) {
|
|
53
|
-
const { Rest } = (_b = yield getVerifiedClients()) !== null && _b !== void 0 ? _b : {};
|
|
53
|
+
const { Rest } = (_b = yield getVerifiedClients('handleAppBilling')) !== null && _b !== void 0 ? _b : {};
|
|
54
54
|
// NOTE: this deletes the app in the case of subscription apps in a "terminal" state to cover the info in ShopifyApi docs for billing:
|
|
55
55
|
// "Note: the merchant may refuse payment when prompted or cancel subscriptions later on, but the app will already be installed at that point. We recommend using billing webhooks to revoke access for merchants when they cancel / decline payment."
|
|
56
56
|
yield Rest.delete({
|
|
@@ -59,7 +59,7 @@ const handleAppBilling = (serverRuntimeConfig) => (req, res) => __awaiter(void 0
|
|
|
59
59
|
message = 'deleted';
|
|
60
60
|
}
|
|
61
61
|
if ((serverRuntimeConfig.SHOPIFY_RUN_MODE === 'review') && !TERMINAL_STATUSES.includes(status)) {
|
|
62
|
-
const { id: sessionId } = yield loadSession();
|
|
62
|
+
const { id: sessionId } = yield loadSession('handleAppBilling');
|
|
63
63
|
// NOTE: billingStatus is a custom field we add when we're in review mode to handle reauth billing correctly
|
|
64
64
|
yield updateSession(sessionId, { billingStatus: status });
|
|
65
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/billing.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkD;AAElD,uCAA+C;AAC/C,4CAIwB;AAExB,MAAM,iBAAiB,GAAG;IACxB,SAAS;IACT,UAAU;IACV,WAAW;CACZ,CAAA;AAED,wDAAwD;AACjD,MAAM,gBAAgB,GAAG,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;;IAC1E,IAAI;QACF,MAAM,EACJ,eAAe,EAAE,UAAU,EAC3B,uBAAuB,EAAE,iBAAiB,EAC1C,gBAAgB,EAAE,IAAI,GAAG,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,UAAU,GACzD,GAAG,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,CAAA;QAErB,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;YACrB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAA;SAC3E;QAED,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,kBAAkB,EAAE,GAAG,MAAM,IAAA,yBAAiB,EAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;QAE1H,wCAAwC;QACxC,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAa,EAAC,GAAG,CAAC,CAAA;QACxC,MAAM,KAA6B,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACjE,OAAO;YACP,UAAU,EAAE,GAAG;YACf,WAAW,EAAE,GAAG;SACjB,CAAC,EAJI,EAAE,KAAK,OAIX,EAJgB,YAAY,cAAxB,SAA0B,CAI9B,CAAA;QAEF,IAAI,KAAK,EAAE;YACT,IAAI;gBACF,IAAI,OAAO,GAAG,SAAS,CAAA;gBAEvB,MAAM,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,GAAI,MAAM,CAAC,OAAO,CAAC,IAAA,kBAAS,EAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBACnF,IAAI,CAAC,SAAS,KAAK,4BAAmB,CAAC,YAAY,CAAC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;oBAC1F,MAAM,EAAE,IAAI,EAAE,GAAG,MAAA,MAAM,kBAAkB,
|
|
1
|
+
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../../src/lib/handlers/api/billing.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/graph.js"],"names":[],"mappings":"AAkBO,
|
|
1
|
+
{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/graph.js"],"names":[],"mappings":"AAkBO,yGA6HN"}
|
|
@@ -28,7 +28,7 @@ const shared_1 = require("../../../../shared");
|
|
|
28
28
|
const handleGraph = (serverRuntimeConfig) => {
|
|
29
29
|
const _getVerificationHelpers = (0, verifyd_1.getVerificationHelpers)(serverRuntimeConfig);
|
|
30
30
|
return (req, res, params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
31
|
-
var _a, _b, _c;
|
|
31
|
+
var _a, _b, _c, _d;
|
|
32
32
|
let requestBody;
|
|
33
33
|
let processResponse;
|
|
34
34
|
try {
|
|
@@ -40,8 +40,8 @@ const handleGraph = (serverRuntimeConfig) => {
|
|
|
40
40
|
}
|
|
41
41
|
return res.status(403).json({ message: 'Verification error' });
|
|
42
42
|
}
|
|
43
|
-
const
|
|
44
|
-
const
|
|
43
|
+
const _e = (_a = req.query) !== null && _a !== void 0 ? _a : {}, { shop, apiVersion } = _e, _query = __rest(_e, ["shop", "apiVersion"]);
|
|
44
|
+
const _f = params !== null && params !== void 0 ? params : (0, shared_1.safeParse)(requestBody || '{}'), { isOnline, query: graphQuery, variables: graphVariables, transform = (_data) => _data } = _f, graphParams = __rest(_f, ["isOnline", "query", "variables", "transform"]);
|
|
45
45
|
let query = _query;
|
|
46
46
|
if ((0, shared_1.isType)(query, 'string')) {
|
|
47
47
|
query = (0, shared_1.querystringToObject)(query);
|
|
@@ -55,11 +55,8 @@ const handleGraph = (serverRuntimeConfig) => {
|
|
|
55
55
|
let message = 'Error handling query call';
|
|
56
56
|
try {
|
|
57
57
|
const { getVerifiedClients } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
58
|
-
const { Graphql } = yield getVerifiedClients({ req, res, shop, apiVersion, isOnline });
|
|
59
|
-
response = yield Graphql.
|
|
60
|
-
query: graphQuery,
|
|
61
|
-
variables: graphVariables,
|
|
62
|
-
} : graphQuery }, (0, shared_1.objectNotEmpty)(query) && { query }), graphParams));
|
|
58
|
+
const { Graphql } = yield getVerifiedClients(`handleGraph::${query}`, { req, res, shop, apiVersion, isOnline });
|
|
59
|
+
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));
|
|
63
60
|
statusCode = 200;
|
|
64
61
|
}
|
|
65
62
|
catch (error) {
|
|
@@ -104,12 +101,14 @@ const handleGraph = (serverRuntimeConfig) => {
|
|
|
104
101
|
Object.entries(headers).forEach(([key, value]) => {
|
|
105
102
|
res.setHeader(key, value);
|
|
106
103
|
});
|
|
107
|
-
|
|
104
|
+
// TODO confirm if we need body or data
|
|
105
|
+
if (!(response === null || response === void 0 ? void 0 : response.body) && !(response === null || response === void 0 ? void 0 : response.data)) {
|
|
108
106
|
return res.status(statusCode).json({ message });
|
|
109
107
|
}
|
|
110
|
-
|
|
108
|
+
// TODO confirm if we need body or data
|
|
109
|
+
const responseBody = (0, shared_1.ensureObject)((_d = (_c = response.data) !== null && _c !== void 0 ? _c : response.body.data) !== null && _d !== void 0 ? _d : response.body);
|
|
111
110
|
const [_responseData] = Object.values(responseBody);
|
|
112
|
-
const
|
|
111
|
+
const _g = (0, shared_1.ensureObject)(_responseData), { userErrors } = _g, responseData = __rest(_g, ["userErrors"]);
|
|
113
112
|
if ((0, shared_1.arrayNotEmpty)(userErrors)) {
|
|
114
113
|
const errorMessages = (0, shared_1.ensureArray)(userErrors).map(({ message }) => (0, shared_1.ensureString)(message));
|
|
115
114
|
return res.status(500).json({ message: `${message}. ${errorMessages.join('. ')}.` });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/graph.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAsE;AAEtE,gDAA8E;AAE9E,0CAAwE;AACxE,+CAW2B;AAEpB,MAAM,WAAW,GAAG,CAAC,mBAAmB,EAAE,EAAE;IACjD,MAAM,uBAAuB,GAAG,IAAA,gCAAsB,EAAC,mBAAmB,CAAC,CAAA;IAE3E,OAAO,CAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;;QAChC,IAAI,WAAW,CAAA;QACf,IAAI,eAAe,CAAA;QACnB,IAAI;YACF,CAAC,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,MAAM,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAA;SACxE;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,2BAAiB,EAAE;gBACtC,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,iBAAG,OAAO,EAAE,KAAK,CAAC,OAAO,IAAK,KAAK,CAAC,IAAI,EAAG,CAAA;aAC9E;YAED,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAA;SAC/D;QAED,MAAM,KAAkC,MAAA,GAAG,CAAC,KAAK,mCAAI,EAAE,EAAjD,EAAE,IAAI,EAAE,UAAU,OAA+B,EAA1B,MAAM,cAA7B,sBAA+B,CAAkB,CAAA;QACvD,MAAM,KAMF,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAA,kBAAS,EAAC,WAAW,IAAI,IAAI,CAAC,EANtC,EACJ,QAAQ,EACR,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,cAAc,EACzB,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,OAEc,EADvC,WAAW,cALV,+CAML,CAA2C,CAAA;QAE5C,IAAI,KAAK,GAAG,MAAM,CAAA;QAClB,IAAI,IAAA,eAAM,EAAC,KAAK,EAAE,QAAQ,CAAC,EAAE;YAC3B,KAAK,GAAG,IAAA,4BAAmB,EAAC,KAAK,CAAC,CAAA;SACnC;QAED,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,IAAI,IAAA,oBAAW,EAAC,UAAU,CAAC,EAAE;YAChD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAA;SAC9D;QAED,IAAI,UAAU,CAAA;QACd,IAAI,QAAQ,CAAA;QACZ,IAAI,OAAO,GAAG,EAAE,CAAA;QAChB,IAAI,OAAO,GAAG,2BAA2B,CAAA;QAEzC,IAAI;YACF,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,IAAA,yBAAiB,EAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;YACrF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,kBAAkB,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/graph.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/proxy.js"],"names":[],"mappings":"AAsCO,
|
|
1
|
+
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/proxy.js"],"names":[],"mappings":"AAsCO,sHAyPN"}
|
|
@@ -27,8 +27,8 @@ exports.handleProxy = void 0;
|
|
|
27
27
|
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
28
28
|
const nextjs_cors_1 = __importDefault(require("nextjs-cors"));
|
|
29
29
|
const http_proxy_1 = __importDefault(require("http-proxy"));
|
|
30
|
-
|
|
31
|
-
|
|
30
|
+
// import modifyJSONProxy from 'node-http-proxy-json'
|
|
31
|
+
// import { getVerificationHelpers, VerificationError } from '@agnostack/verifyd'
|
|
32
32
|
const utils_1 = require("../../../utils");
|
|
33
33
|
const shared_1 = require("../../../../shared");
|
|
34
34
|
const PROXY_TIMEOUT = 6000; // NOTE: 6 seconds
|
|
@@ -38,24 +38,33 @@ const verifyAppProxySignature = (signature, verifiable, hmacSecret) => {
|
|
|
38
38
|
};
|
|
39
39
|
const handleProxy = (serverRuntimeConfig, config) => {
|
|
40
40
|
const { generateReplacements } = config !== null && config !== void 0 ? config : {};
|
|
41
|
-
const {
|
|
41
|
+
const {
|
|
42
|
+
// API_BASE_PATH,
|
|
43
|
+
// API_URLS,
|
|
44
|
+
// API_PATHS,
|
|
45
|
+
APP_CONFIG, APP_BASE_URL, TARGET_SAFELIST, ORIGIN_SAFELIST, } = serverRuntimeConfig;
|
|
42
46
|
const _prepareHeaders = (0, utils_1.prepareHeaders)(serverRuntimeConfig);
|
|
43
|
-
const _getVerificationHelpers =
|
|
44
|
-
const _getVerifiedSessionData =
|
|
47
|
+
// const _getVerificationHelpers = getVerificationHelpers(serverRuntimeConfig)
|
|
48
|
+
// const _getVerifiedSessionData = getVerifiedSessionData(serverRuntimeConfig)
|
|
45
49
|
return (req, res, params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
46
50
|
var _a, _b, _c, _d;
|
|
47
51
|
const _e = (_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 } = _e, _headers = __rest(_e, ["origin", 'x-forwarded-for', 'x-forwarded-proto', 'x-forwarded-host', 'x-proxy-origin']);
|
|
48
|
-
const {
|
|
52
|
+
const {
|
|
53
|
+
// 'x-extension-session': sessionToken,
|
|
54
|
+
// 'x-extension-point': extensionPoint,
|
|
55
|
+
'x-shop-domain': shopDomainHeader, 'x-shopify-shop-domain': shopifyShopDomainHeader, 'x-shopify-shop': shopHeader = shopifyShopDomainHeader !== null && shopifyShopDomainHeader !== void 0 ? shopifyShopDomainHeader : shopDomainHeader, 'x-shopify-app-id': shopifyAppId, 'x-app-id': appId = shopifyAppId,
|
|
49
56
|
// 'x-shopify-app-installation-id': shopifyAppInstallationId,
|
|
50
57
|
// 'x-app-installation-id': appInstallationId = shopifyAppInstallationId, // TODO: pass along installationId??
|
|
51
58
|
// TODO: pass along providerSetId???
|
|
52
59
|
} = _headers;
|
|
60
|
+
console.info(`>>> ~ handleProxy111111`);
|
|
53
61
|
let targetPath;
|
|
54
62
|
try {
|
|
55
63
|
// NOTE: GET requests are not always sending along origin
|
|
56
64
|
if ((0, shared_1.stringEmpty)(origin)) {
|
|
57
65
|
req.headers = Object.assign(Object.assign({}, req.headers), { origin: proxyOrigin || forwardHost });
|
|
58
66
|
}
|
|
67
|
+
console.info(`>>> ~ handleProxy2 ${origin}`);
|
|
59
68
|
const _f = (_b = req.query) !== null && _b !== void 0 ? _b : {}, { signature, proxyEncoded } = _f, verifiable = __rest(_f, ["signature", "proxyEncoded"]);
|
|
60
69
|
const { shop: _shop, host, timestamp, path_prefix } = verifiable;
|
|
61
70
|
const shop = _shop || shopHeader;
|
|
@@ -73,6 +82,7 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
73
82
|
},
|
|
74
83
|
optionsSuccessStatus: 200, // some legacy browsers (IE11, various SmartTVs) choke on 204
|
|
75
84
|
});
|
|
85
|
+
console.info(`>>> ~ handleProxy3`);
|
|
76
86
|
const { target: targetParam } = params !== null && params !== void 0 ? params : {};
|
|
77
87
|
// eslint-disable-next-line max-len
|
|
78
88
|
const _targetUrl = ((0, shared_1.stringEmpty)(targetParam) || targetParam.startsWith('http')) ? targetParam : `${APP_BASE_URL}/${(0, shared_1.removeLeadingSlash)(targetParam)}`;
|
|
@@ -88,52 +98,62 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
88
98
|
host,
|
|
89
99
|
},
|
|
90
100
|
} }, TARGET_SAFELIST));
|
|
101
|
+
console.info(`>>> ~ handleProxy4`);
|
|
91
102
|
if ((0, shared_1.stringEmpty)(targetPath) || (safelistedTarget == undefined)) {
|
|
92
103
|
return res.status(407).json({ message: 'Unproxyable target' });
|
|
93
104
|
}
|
|
94
|
-
if (!shop || !host || !extensionPoint || !signature || !proxyEncoded
|
|
95
|
-
return res.status(400).json({ message: 'Invalid or missing headers'
|
|
105
|
+
if (!shop || !host) { // || !extensionPoint || !signature || !proxyEncoded
|
|
106
|
+
return res.status(400).json({ message: 'Invalid or missing headers' }); // , extensionPoint
|
|
96
107
|
}
|
|
97
108
|
const isShopifyOriginOrRelative = (0, shared_1.stringNotEmpty)((0, shared_1.ensureString)(path_prefix).startsWith('http')
|
|
98
109
|
? (0, shared_1.sanitizeShop)(new URL(path_prefix).hostname)
|
|
99
110
|
: path_prefix);
|
|
111
|
+
console.info(`>>> ~ handleProxy5`);
|
|
100
112
|
// TODO: once Shopify fixes CORS issue when origin is cdn.shopify.com, update this!
|
|
101
113
|
if (!verifyAppProxySignature(signature, verifiable, isShopifyOriginOrRelative ? APP_CONFIG.apiSecretKey : timestamp)) {
|
|
102
114
|
return res.status(403).json({ message: 'Invalid signature' });
|
|
103
115
|
}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
}
|
|
116
|
+
console.info(`>>> ~ handleProxy6`);
|
|
117
|
+
// const isTokenRequest = (
|
|
118
|
+
// targetParam?.startsWith(API_PATHS[API_ROUTE_NAMES.SESSION_TOKEN]) ||
|
|
119
|
+
// targetParam?.startsWith(API_URLS[API_ROUTE_NAMES.SESSION_TOKEN])
|
|
120
|
+
// )
|
|
121
|
+
// if (!isTokenRequest) {
|
|
122
|
+
// console.info(`>>> ~ handleProxy7`)
|
|
123
|
+
// const isVerifiedSession = await _getVerifiedSessionData(sessionToken, { shop, host })
|
|
124
|
+
// if (!isVerifiedSession) {
|
|
125
|
+
// return res.status(403).json({ message: 'Unverified signature' })
|
|
126
|
+
// }
|
|
127
|
+
// }
|
|
112
128
|
const { headers: targetHeaders, params: targetParams } = (0, shared_1.ensureObject)(safelistedTarget);
|
|
113
129
|
if ((0, shared_1.objectNotEmpty)(targetParams)) {
|
|
114
130
|
targetPath = (0, shared_1.appendQuery)(targetPath, new URLSearchParams(targetParams).toString());
|
|
115
131
|
}
|
|
116
|
-
let requestBody
|
|
117
|
-
let processResponse
|
|
118
|
-
try {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
}
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
}
|
|
132
|
+
// let requestBody
|
|
133
|
+
// let processResponse
|
|
134
|
+
// try {
|
|
135
|
+
// ({ requestBody, processResponse } = await _getVerificationHelpers(req, {
|
|
136
|
+
// uri: targetPath,
|
|
137
|
+
// disableRecryption: (targetParam?.startsWith(API_BASE_PATH) || targetParam?.startsWith(`${APP_BASE_URL}${API_BASE_PATH}`)),
|
|
138
|
+
// }))
|
|
139
|
+
// } catch (error) {
|
|
140
|
+
// console.info(`>>> ~ handleProxy8`)
|
|
141
|
+
// if (error instanceof VerificationError) {
|
|
142
|
+
// return res.status(error.code).json({ message: error.message })
|
|
143
|
+
// }
|
|
144
|
+
// return res.status(403).json({ message: 'Verification error' })
|
|
145
|
+
// }
|
|
146
|
+
const requestBody = req.body;
|
|
147
|
+
console.info(`>>> ~ handleProxy9`, requestBody);
|
|
130
148
|
const headers = yield _prepareHeaders({
|
|
131
149
|
generateReplacements,
|
|
132
150
|
shop,
|
|
133
151
|
appId,
|
|
134
152
|
headers: Object.assign(Object.assign({}, _headers), targetHeaders),
|
|
135
153
|
});
|
|
154
|
+
console.info(`>>> ~ handleProxy10`);
|
|
136
155
|
const proxy = http_proxy_1.default.createProxy();
|
|
156
|
+
console.info(`>>> ~ handleProxy11`);
|
|
137
157
|
return new Promise((resolve, reject) => {
|
|
138
158
|
req.url = targetPath;
|
|
139
159
|
if (headers) {
|
|
@@ -141,21 +161,31 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
141
161
|
}
|
|
142
162
|
proxy.on('proxyReq', (proxyReq, proxyReqRequest, proxyReqResponse, options) => {
|
|
143
163
|
if (requestBody) {
|
|
164
|
+
console.info(`>>> ~ handleProxy12`);
|
|
144
165
|
const bodyData = JSON.stringify(requestBody);
|
|
145
166
|
proxyReq.setHeader('Content-Length', Buffer.byteLength(bodyData));
|
|
146
167
|
proxyReq.write(bodyData);
|
|
147
168
|
}
|
|
148
169
|
});
|
|
149
170
|
proxy.on('proxyRes', function (proxyRes, proxyResRequest, proxyResResponse) {
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
171
|
+
console.info(`>>> ~ handleProxy13`);
|
|
172
|
+
return proxyResResponse;
|
|
173
|
+
// modifyJSONProxy(proxyResResponse, proxyRes, async function (proxyResBody) {
|
|
174
|
+
// console.info(`>>> ~ proxyResBody`, proxyResBody)
|
|
175
|
+
// console.info(`>>> ~ proxyResResponse`, proxyResResponse)
|
|
176
|
+
// console.info(`>>> ~ handleProxy144`)
|
|
177
|
+
// // NOTE: Shopify app proxy will string request cookies and response set-cookie headers
|
|
178
|
+
// // TODO: handle an undefined body
|
|
179
|
+
// try {
|
|
180
|
+
// // const rsp = await processResponse(proxyResBody)
|
|
181
|
+
// // console.info(`>>> ~ handleProxy15`, rsp)
|
|
182
|
+
// return proxyResBody || proxyResResponse
|
|
183
|
+
// } catch (err) {
|
|
184
|
+
// console.info(`>>> ~ handleProxy16`)
|
|
185
|
+
// console.error(`>>> ~ modifyJSONProxy err`, err)
|
|
186
|
+
// return undefined
|
|
187
|
+
// }
|
|
188
|
+
// })
|
|
159
189
|
});
|
|
160
190
|
proxy.once('error', (error) => {
|
|
161
191
|
console.error('Proxy error', error);
|
|
@@ -173,7 +203,7 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
173
203
|
}
|
|
174
204
|
catch (error) {
|
|
175
205
|
// eslint-disable-next-line max-len
|
|
176
|
-
console.error(
|
|
206
|
+
console.error(`Error handling proxy request: ${targetPath}`, (0, shared_1.cleanObject)(Object.assign({ type: error === null || error === void 0 ? void 0 : error.type, code: error === null || error === void 0 ? void 0 : error.code, name: error === null || error === void 0 ? void 0 : error.name, message: error === null || error === void 0 ? void 0 : error.message }, error === null || error === void 0 ? void 0 : error.data), false, shared_1.stringEmptyOnly));
|
|
177
207
|
if (error instanceof shared_1.ShopifySessionInvalidError) {
|
|
178
208
|
return res.status((_c = error === null || error === void 0 ? void 0 : error.code) !== null && _c !== void 0 ? _c : 407).json({ message: error.message, type: (_d = error === null || error === void 0 ? void 0 : error.type) !== null && _d !== void 0 ? _d : 'ShopifySessionInvalidError' });
|
|
179
209
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/proxy.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAsD;AACtD,8DAAkC;AAClC,4DAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/proxy.js"],"names":[],"mappings":"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"}
|
|
@@ -61,7 +61,7 @@ const handleRest = (serverRuntimeConfig) => {
|
|
|
61
61
|
const body = (0, shared_1.safeParse)(bodyParam !== null && bodyParam !== void 0 ? bodyParam : requestBody);
|
|
62
62
|
const method = (0, shared_1.ensureString)(methodParam !== null && methodParam !== void 0 ? methodParam : _method).toLowerCase();
|
|
63
63
|
const { getVerifiedClients } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
64
|
-
const { Rest } = yield getVerifiedClients({ req, res, shop, apiVersion, isOnline });
|
|
64
|
+
const { Rest } = yield getVerifiedClients(`handleRest::${path}`, { req, res, shop, apiVersion, isOnline });
|
|
65
65
|
response = yield Rest[method](Object.assign({ path,
|
|
66
66
|
query,
|
|
67
67
|
body, type: shopify_api_1.DataType.JSON }, params));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/rest.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA6D;AAE7D,gDAA8E;AAE9E,0CAAwE;AACxE,+CAQ2B;AAEpB,MAAM,UAAU,GAAG,CAAC,mBAAmB,EAAE,EAAE;IAChD,MAAM,uBAAuB,GAAG,IAAA,gCAAsB,EAAC,mBAAmB,CAAC,CAAA;IAE3E,OAAO,CAAO,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE;QACjC,IAAI,WAAW,CAAA;QACf,IAAI,eAAe,CAAA;QACnB,IAAI;YACF,CAAC,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,MAAM,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAA;SACxE;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,2BAAiB,EAAE;gBACtC,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,iBAAG,OAAO,EAAE,KAAK,CAAC,OAAO,IAAK,KAAK,CAAC,IAAI,EAAG,CAAA;aAC9E;YAED,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAA;SAC/D;QAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAA;QAC9C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;QAC7B,MAAM,KAQF,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,EARX,EACJ,IAAI,EACJ,QAAQ,EACR,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,OAEb,EADZ,MAAM,cAPL,4DAQL,CAAgB,CAAA;QAEjB,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;YAC1C,OAAO;gBACL,UAAU,EAAE,GAAG;gBACf,OAAO,EAAE,mBAAmB;aAC7B,CAAA;SACF;QAED,IAAI,UAAU,CAAA;QACd,IAAI,QAAQ,CAAA;QACZ,IAAI,OAAO,CAAA;QACX,IAAI,OAAO,GAAG,EAAE,CAAA;QAEhB,IAAI;YACF,IAAI,SAAS,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,MAAM,CAAA;YACpC,IAAI,IAAA,eAAM,EAAC,SAAS,EAAE,QAAQ,CAAC,EAAE;gBAC/B,SAAS,GAAG,IAAA,4BAAmB,EAAC,SAAS,CAAC,CAAA;aAC3C;YAED,MAAM,KAA2B,IAAA,qBAAY,EAAC,SAAS,CAAC,EAAlD,EAAE,UAAU,OAAsC,EAAjC,KAAK,cAAtB,cAAwB,CAA0B,CAAA;YACxD,MAAM,IAAI,GAAG,IAAA,kBAAS,EAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,WAAW,CAAC,CAAA;YAChD,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,OAAO,CAAC,CAAC,WAAW,EAAE,CAAA;YAEjE,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,IAAA,yBAAiB,EAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;YACrF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,kBAAkB,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/rest.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protect.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"protect.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"AAqBO;;;;;;;;;;;;;;GAsJN"}
|