@agnostack/next-shopify 2.0.14-alpha.32 → 2.0.14-alpha.34
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 +15 -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.js +1 -1
- 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 +3 -30
- 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 +13 -8
- package/dist/lib/handlers/ssr/protect.js.map +1 -1
- package/dist/lib/utils/session.d.ts +12 -6
- package/dist/lib/utils/session.d.ts.map +1 -1
- package/dist/lib/utils/session.js +51 -52
- package/dist/lib/utils/session.js.map +1 -1
- package/dist/lib/utils/shopify.d.ts +1 -2
- package/dist/lib/utils/shopify.d.ts.map +1 -1
- package/dist/lib/utils/shopify.js +3 -8
- package/dist/lib/utils/shopify.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,18 @@
|
|
|
1
|
+
## [2.0.14-alpha.34](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.33...v2.0.14-alpha.34) (2024-10-15)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* cleanup ([c4d9145](https://github.com/agnostack/next-shopify/commit/c4d91459da5a25dc98e2163d1130700d7091de75))
|
|
7
|
+
|
|
8
|
+
## [2.0.14-alpha.33](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.32...v2.0.14-alpha.33) (2024-10-15)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* add isValid ([f39e558](https://github.com/agnostack/next-shopify/commit/f39e558c456365883a701e675df855a33beb9747))
|
|
14
|
+
* debug ([4b78995](https://github.com/agnostack/next-shopify/commit/4b789953a44aa0b4dcf6e149835b0ea005503f60))
|
|
15
|
+
|
|
1
16
|
## [2.0.14-alpha.32](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.31...v2.0.14-alpha.32) (2024-10-14)
|
|
2
17
|
|
|
3
18
|
|
|
@@ -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(
|
|
53
|
+
const { Rest } = (_b = yield getVerifiedClients()) !== 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();
|
|
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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"}
|
|
@@ -55,7 +55,7 @@ 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(
|
|
58
|
+
const { Graphql } = yield getVerifiedClients({ req, res, shop, apiVersion, isOnline });
|
|
59
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));
|
|
60
60
|
statusCode = 200;
|
|
61
61
|
}
|
|
@@ -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,
|
|
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,sHAoNN"}
|
|
@@ -38,9 +38,7 @@ 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 {
|
|
42
|
-
// API_BASE_PATH,
|
|
43
|
-
API_URLS, API_PATHS, APP_CONFIG, APP_BASE_URL, TARGET_SAFELIST, ORIGIN_SAFELIST, } = serverRuntimeConfig;
|
|
41
|
+
const { API_BASE_PATH, API_URLS, API_PATHS, APP_CONFIG, APP_BASE_URL, TARGET_SAFELIST, ORIGIN_SAFELIST, } = serverRuntimeConfig;
|
|
44
42
|
const _prepareHeaders = (0, utils_1.prepareHeaders)(serverRuntimeConfig);
|
|
45
43
|
const _getVerificationHelpers = (0, verifyd_1.getVerificationHelpers)(serverRuntimeConfig);
|
|
46
44
|
const _getVerifiedSessionData = (0, utils_1.getVerifiedSessionData)(serverRuntimeConfig);
|
|
@@ -52,14 +50,12 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
52
50
|
// 'x-app-installation-id': appInstallationId = shopifyAppInstallationId, // TODO: pass along installationId??
|
|
53
51
|
// TODO: pass along providerSetId???
|
|
54
52
|
} = _headers;
|
|
55
|
-
console.info(`>>> ~ handleProxy111111`);
|
|
56
53
|
let targetPath;
|
|
57
54
|
try {
|
|
58
55
|
// NOTE: GET requests are not always sending along origin
|
|
59
56
|
if ((0, shared_1.stringEmpty)(origin)) {
|
|
60
57
|
req.headers = Object.assign(Object.assign({}, req.headers), { origin: proxyOrigin || forwardHost });
|
|
61
58
|
}
|
|
62
|
-
console.info(`>>> ~ handleProxy2 ${origin}`);
|
|
63
59
|
const _f = (_b = req.query) !== null && _b !== void 0 ? _b : {}, { signature, proxyEncoded } = _f, verifiable = __rest(_f, ["signature", "proxyEncoded"]);
|
|
64
60
|
const { shop: _shop, host, timestamp, path_prefix } = verifiable;
|
|
65
61
|
const shop = _shop || shopHeader;
|
|
@@ -77,7 +73,6 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
77
73
|
},
|
|
78
74
|
optionsSuccessStatus: 200, // some legacy browsers (IE11, various SmartTVs) choke on 204
|
|
79
75
|
});
|
|
80
|
-
console.info(`>>> ~ handleProxy3`);
|
|
81
76
|
const { target: targetParam } = params !== null && params !== void 0 ? params : {};
|
|
82
77
|
// eslint-disable-next-line max-len
|
|
83
78
|
const _targetUrl = ((0, shared_1.stringEmpty)(targetParam) || targetParam.startsWith('http')) ? targetParam : `${APP_BASE_URL}/${(0, shared_1.removeLeadingSlash)(targetParam)}`;
|
|
@@ -93,7 +88,6 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
93
88
|
host,
|
|
94
89
|
},
|
|
95
90
|
} }, TARGET_SAFELIST));
|
|
96
|
-
console.info(`>>> ~ handleProxy4`);
|
|
97
91
|
if ((0, shared_1.stringEmpty)(targetPath) || (safelistedTarget == undefined)) {
|
|
98
92
|
return res.status(407).json({ message: 'Unproxyable target' });
|
|
99
93
|
}
|
|
@@ -103,16 +97,13 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
103
97
|
const isShopifyOriginOrRelative = (0, shared_1.stringNotEmpty)((0, shared_1.ensureString)(path_prefix).startsWith('http')
|
|
104
98
|
? (0, shared_1.sanitizeShop)(new URL(path_prefix).hostname)
|
|
105
99
|
: path_prefix);
|
|
106
|
-
console.info(`>>> ~ handleProxy5`);
|
|
107
100
|
// TODO: once Shopify fixes CORS issue when origin is cdn.shopify.com, update this!
|
|
108
101
|
if (!verifyAppProxySignature(signature, verifiable, isShopifyOriginOrRelative ? APP_CONFIG.apiSecretKey : timestamp)) {
|
|
109
102
|
return res.status(403).json({ message: 'Invalid signature' });
|
|
110
103
|
}
|
|
111
|
-
console.info(`>>> ~ handleProxy6`);
|
|
112
104
|
const isTokenRequest = ((targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(API_PATHS[shared_1.API_ROUTE_NAMES.SESSION_TOKEN])) ||
|
|
113
105
|
(targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(API_URLS[shared_1.API_ROUTE_NAMES.SESSION_TOKEN])));
|
|
114
106
|
if (!isTokenRequest) {
|
|
115
|
-
console.info(`>>> ~ handleProxy7`);
|
|
116
107
|
const isVerifiedSession = yield _getVerifiedSessionData(sessionToken, { shop, host });
|
|
117
108
|
if (!isVerifiedSession) {
|
|
118
109
|
return res.status(403).json({ message: 'Unverified signature' });
|
|
@@ -127,26 +118,22 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
127
118
|
try {
|
|
128
119
|
({ requestBody, processResponse } = yield _getVerificationHelpers(req, {
|
|
129
120
|
uri: targetPath,
|
|
130
|
-
disableRecryption:
|
|
121
|
+
disableRecryption: ((targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(API_BASE_PATH)) || (targetParam === null || targetParam === void 0 ? void 0 : targetParam.startsWith(`${APP_BASE_URL}${API_BASE_PATH}`))),
|
|
131
122
|
}));
|
|
132
123
|
}
|
|
133
124
|
catch (error) {
|
|
134
|
-
console.info(`>>> ~ handleProxy8`);
|
|
135
125
|
if (error instanceof verifyd_1.VerificationError) {
|
|
136
126
|
return res.status(error.code).json({ message: error.message });
|
|
137
127
|
}
|
|
138
128
|
return res.status(403).json({ message: 'Verification error' });
|
|
139
129
|
}
|
|
140
|
-
console.info(`>>> ~ handleProxy9`, requestBody);
|
|
141
130
|
const headers = yield _prepareHeaders({
|
|
142
131
|
generateReplacements,
|
|
143
132
|
shop,
|
|
144
133
|
appId,
|
|
145
134
|
headers: Object.assign(Object.assign({}, _headers), targetHeaders),
|
|
146
135
|
});
|
|
147
|
-
console.info(`>>> ~ handleProxy10`);
|
|
148
136
|
const proxy = http_proxy_1.default.createProxy();
|
|
149
|
-
console.info(`>>> ~ handleProxy11`);
|
|
150
137
|
return new Promise((resolve, reject) => {
|
|
151
138
|
req.url = targetPath;
|
|
152
139
|
if (headers) {
|
|
@@ -154,7 +141,6 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
154
141
|
}
|
|
155
142
|
proxy.on('proxyReq', (proxyReq, proxyReqRequest, proxyReqResponse, options) => {
|
|
156
143
|
if (requestBody) {
|
|
157
|
-
console.info(`>>> ~ handleProxy12`);
|
|
158
144
|
const bodyData = JSON.stringify(requestBody);
|
|
159
145
|
proxyReq.setHeader('Content-Length', Buffer.byteLength(bodyData));
|
|
160
146
|
proxyReq.write(bodyData);
|
|
@@ -163,21 +149,8 @@ const handleProxy = (serverRuntimeConfig, config) => {
|
|
|
163
149
|
proxy.on('proxyRes', function (proxyRes, proxyResRequest, proxyResResponse) {
|
|
164
150
|
(0, node_http_proxy_json_1.default)(proxyResResponse, proxyRes, function (proxyResBody) {
|
|
165
151
|
return __awaiter(this, void 0, void 0, function* () {
|
|
166
|
-
console.info(`>>> ~ proxyResBody`, proxyResBody);
|
|
167
|
-
console.info(`>>> ~ proxyResResponse`, proxyResResponse);
|
|
168
|
-
console.info(`>>> ~ handleProxy144`);
|
|
169
152
|
// NOTE: Shopify app proxy will string request cookies and response set-cookie headers
|
|
170
|
-
|
|
171
|
-
try {
|
|
172
|
-
const rsp = yield processResponse(proxyResBody);
|
|
173
|
-
console.info(`>>> ~ handleProxy15`, rsp);
|
|
174
|
-
return rsp;
|
|
175
|
-
}
|
|
176
|
-
catch (err) {
|
|
177
|
-
console.info(`>>> ~ handleProxy16`);
|
|
178
|
-
console.error(`>>> ~ modifyJSONProxy err`, err);
|
|
179
|
-
return undefined;
|
|
180
|
-
}
|
|
153
|
+
return processResponse(proxyResBody);
|
|
181
154
|
});
|
|
182
155
|
});
|
|
183
156
|
});
|
|
@@ -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,gFAAkD;AAElD,gDAA8E;AAE9E,0CAKuB;AACvB,+CAe2B;AAE3B,MAAM,aAAa,GAAG,IAAI,CAAA,CAAC,kBAAkB;AAE7C,MAAM,uBAAuB,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE;IACpE,MAAM,IAAI,GAAG,IAAA,oBAAY,EAAC,IAAA,6BAAoB,EAAC,UAAU,CAAC,EAAE,UAAU,CAAC,CAAA;IAEvE,OAAO,IAAA,qBAAa,EAAC,SAAS,EAAE,IAAI,CAAC,CAAA;AACvC,CAAC,CAAA;AAEM,MAAM,WAAW,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE;IACzD,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IAC7C,MAAM
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../../src/lib/handlers/api/verifiable/proxy.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAsD;AACtD,8DAAkC;AAClC,4DAAkC;AAClC,gFAAkD;AAElD,gDAA8E;AAE9E,0CAKuB;AACvB,+CAe2B;AAE3B,MAAM,aAAa,GAAG,IAAI,CAAA,CAAC,kBAAkB;AAE7C,MAAM,uBAAuB,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE;IACpE,MAAM,IAAI,GAAG,IAAA,oBAAY,EAAC,IAAA,6BAAoB,EAAC,UAAU,CAAC,EAAE,UAAU,CAAC,CAAA;IAEvE,OAAO,IAAA,qBAAa,EAAC,SAAS,EAAE,IAAI,CAAC,CAAA;AACvC,CAAC,CAAA;AAEM,MAAM,WAAW,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE;IACzD,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IAC7C,MAAM,EACJ,aAAa,EACb,QAAQ,EACR,SAAS,EACT,UAAU,EACV,YAAY,EACZ,eAAe,EACf,eAAe,GAChB,GAAG,mBAAmB,CAAA;IACvB,MAAM,eAAe,GAAG,IAAA,sBAAc,EAAC,mBAAmB,CAAC,CAAA;IAC3D,MAAM,uBAAuB,GAAG,IAAA,gCAAsB,EAAC,mBAAmB,CAAC,CAAA;IAC3E,MAAM,uBAAuB,GAAG,IAAA,8BAAsB,EAAC,mBAAmB,CAAC,CAAA;IAE3E,OAAO,CAAO,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;;QAChC,MAAM,KAOF,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,EAPf,EACJ,MAAM,EACN,iBAAiB,EAAE,WAAW,EAC9B,mBAAmB,EAAE,aAAa,EAClC,kBAAkB,EAAE,WAAW,EAC/B,gBAAgB,EAAE,WAAW,OAEV,EADhB,QAAQ,cANP,wFAOL,CAAoB,CAAA;QAErB,MAAM,EACJ,qBAAqB,EAAE,YAAY,EACnC,mBAAmB,EAAE,cAAc,EACnC,eAAe,EAAE,gBAAgB,EACjC,uBAAuB,EAAE,uBAAuB,EAChD,gBAAgB,EAAE,UAAU,GAAG,uBAAuB,aAAvB,uBAAuB,cAAvB,uBAAuB,GAAI,gBAAgB,EAC1E,kBAAkB,EAAE,YAAY,EAChC,UAAU,EAAE,KAAK,GAAG,YAAY;QAChC,6DAA6D;QAC7D,8GAA8G;QAC9G,oCAAoC;UACrC,GAAG,QAAQ,CAAA;QAEZ,IAAI,UAAU,CAAA;QACd,IAAI;YAEF,yDAAyD;YACzD,IAAI,IAAA,oBAAW,EAAC,MAAM,CAAC,EAAE;gBACvB,GAAG,CAAC,OAAO,mCACN,GAAG,CAAC,OAAO,KACd,MAAM,EAAE,WAAW,IAAI,WAAW,GACnC,CAAA;aACF;YAED,MAAM,KAA6C,MAAA,GAAG,CAAC,KAAK,mCAAI,EAAE,EAA5D,EAAE,SAAS,EAAE,YAAY,OAAmC,EAA9B,UAAU,cAAxC,6BAA0C,CAAkB,CAAA;YAClE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,UAAU,CAAA;YAChE,MAAM,IAAI,GAAG,KAAK,IAAI,UAAU,CAAA;YAEhC,MAAM,IAAA,qBAAQ,EAAC,GAAG,EAAE,GAAG,EAAE;gBACvB,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC;gBAC3C,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;oBAC3B,MAAM,YAAY,GAAG,IAAA,sBAAa,EAAC,MAAM,EAAE;wBACzC,GAAG,eAAe;wBAClB,iBAAiB,CAAC,sDAAsD;qBACzE,CAAC,CAAA;oBAEF,IAAI,YAAY,EAAE;wBAChB,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;qBAC5B;oBAED,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAA;gBACnD,CAAC;gBACD,oBAAoB,EAAE,GAAG,EAAE,6DAA6D;aACzF,CAAC,CAAA;YAEF,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;YAC5C,mCAAmC;YACnC,MAAM,UAAU,GAAG,CAAC,IAAA,oBAAW,EAAC,WAAW,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,YAAY,IAAI,IAAA,2BAAkB,EAAC,WAAW,CAAC,EAAE,CAAA;YACpJ,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAA,uBAAc,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YAC5G,UAAU,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,uBAAc,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAE/D,MAAM,gBAAgB,GAAG,IAAA,sBAAa,EAAC,QAAQ,kBAC7C,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,EAAE;oBAChC,wIAAwI;oBACxI,aAAa;oBACb,uDAAuD;oBACvD,KAAK;oBACL,MAAM,EAAE;wBACN,IAAI;wBACJ,IAAI;qBACL;iBACF,IACE,eAAe,EAClB,CAAA;YAEF,IAAI,IAAA,oBAAW,EAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,IAAI,SAAS,CAAC,EAAE;gBAC9D,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAA;aAC/D;YAED,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,cAAc,IAAI,CAAC,SAAS,IAAI,CAAC,YAAY,EAAE;gBACpE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC,CAAA,CAAC,mBAAmB;aAC3F;YAED,MAAM,yBAAyB,GAAG,IAAA,uBAAc,EAC9C,IAAA,qBAAY,EAAC,WAAW,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC;gBAC1C,CAAC,CAAC,IAAA,qBAAY,EAAC,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC;gBAC7C,CAAC,CAAC,WAAW,CAChB,CAAA;YAED,mFAAmF;YACnF,IACE,CAAC,uBAAuB,CACtB,SAAS,EACT,UAAU,EACV,yBAAyB,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAChE,EACD;gBACA,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAA;aAC9D;YAED,MAAM,cAAc,GAAG,CACrB,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAC,SAAS,CAAC,wBAAe,CAAC,aAAa,CAAC,CAAC;iBACjE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAC,QAAQ,CAAC,wBAAe,CAAC,aAAa,CAAC,CAAC,CAAA,CACjE,CAAA;YAED,IAAI,CAAC,cAAc,EAAE;gBACnB,MAAM,iBAAiB,GAAG,MAAM,uBAAuB,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;gBAErF,IAAI,CAAC,iBAAiB,EAAE;oBACtB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC,CAAA;iBACjE;aACF;YAED,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,qBAAY,EAAC,gBAAgB,CAAC,CAAA;YACvF,IAAI,IAAA,uBAAc,EAAC,YAAY,CAAC,EAAE;gBAChC,UAAU,GAAG,IAAA,oBAAW,EAAC,UAAU,EAAE,IAAI,eAAe,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;aACnF;YAED,IAAI,WAAW,CAAA;YACf,IAAI,eAAe,CAAA;YACnB,IAAI;gBACF,CAAC,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,MAAM,uBAAuB,CAAC,GAAG,EAAE;oBACrE,GAAG,EAAE,UAAU;oBACf,iBAAiB,EAAE,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAC,aAAa,CAAC,MAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAC,GAAG,YAAY,GAAG,aAAa,EAAE,CAAC,CAAA,CAAC;iBAC1H,CAAC,CAAC,CAAA;aACJ;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,KAAK,YAAY,2BAAiB,EAAE;oBACtC,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;iBAC/D;gBAED,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAA;aAC/D;YAED,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC;gBACpC,oBAAoB;gBACpB,IAAI;gBACJ,KAAK;gBACL,OAAO,kCACF,QAAQ,GACR,aAAa,CACjB;aACF,CAAC,CAAA;YAEF,MAAM,KAAK,GAAG,oBAAS,CAAC,WAAW,EAAE,CAAA;YAErC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,GAAG,CAAC,GAAG,GAAG,UAAU,CAAA;gBAEpB,IAAI,OAAO,EAAE;oBACX,GAAG,CAAC,OAAO,GAAG,OAAO,CAAA;iBACtB;gBAED,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,eAAe,EAAE,gBAAgB,EAAE,OAAO,EAAE,EAAE;oBAC5E,IAAI,WAAW,EAAE;wBACf,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;wBAC5C,QAAQ,CAAC,SAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAA;wBACjE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;qBACzB;gBACH,CAAC,CAAC,CAAA;gBAEF,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,QAAQ,EAAE,eAAe,EAAE,gBAAgB;oBACxE,IAAA,8BAAe,EAAC,gBAAgB,EAAE,QAAQ,EAAE,UAAgB,YAAY;;4BACtE,sFAAsF;4BACtF,OAAO,eAAe,CAAC,YAAY,CAAC,CAAA;wBACtC,CAAC;qBAAA,CAAC,CAAA;gBACJ,CAAC,CAAC,CAAA;gBAEF,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;oBAC5B,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;oBACnC,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;gBACtB,CAAC,CAAC,CAAA;gBAEF,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE;oBAClB,MAAM;oBACN,OAAO,EAAE,aAAa;oBACtB,YAAY,EAAE,aAAa;oBAC3B,eAAe,EAAE,KAAK;oBACtB,YAAY,EAAE,IAAI;oBAClB,MAAM,EAAE,IAAI;iBACb,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;SACH;QAAC,OAAO,KAAK,EAAE;YACd,mCAAmC;YACnC,OAAO,CAAC,KAAK,CAAC,iCAAiC,UAAU,EAAE,EAAE,IAAA,oBAAW,kBACtE,IAAI,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EACjB,IAAI,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EACjB,IAAI,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EACjB,OAAO,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,IACpB,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,GACb,KAAK,EAAE,wBAAe,CAAC,CAAC,CAAA;YAC3B,IAAI,KAAK,YAAY,mCAA0B,EAAE;gBAC/C,OAAO,GAAG,CAAC,MAAM,CAAC,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,mCAAI,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,mCAAI,4BAA4B,EAAE,CAAC,CAAA;aAC1H;YAED,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,KAAI,8BAA8B,EAAE,UAAU,EAAE,CAAC,CAAA;SACvG;IACH,CAAC,CAAA,CAAA;AACH,CAAC,CAAA;AApNY,QAAA,WAAW,eAoNvB"}
|
|
@@ -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(
|
|
64
|
+
const { Rest } = yield getVerifiedClients({ 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,
|
|
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":"AAqBO;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"protect.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"AAqBO;;;;;;;;;;;;;;GA0JN"}
|
|
@@ -20,7 +20,6 @@ const protectRoute = (serverRuntimeConfig, props) => {
|
|
|
20
20
|
const { PAGE_PATHS, API_PATHS, APP_CONFIG } = serverRuntimeConfig;
|
|
21
21
|
const isEmbedded = APP_CONFIG.isEmbeddedApp;
|
|
22
22
|
const prepareWebhookHandlers = (0, utils_1.getPrepareWebhookHandlers)(serverRuntimeConfig);
|
|
23
|
-
const shouldBypassProtect = (0, utils_1.allowLocalBypass)(serverRuntimeConfig);
|
|
24
23
|
return ({ req, res, query, locale, } = {}, data) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
24
|
var _a, _b, _c, _d;
|
|
26
25
|
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;
|
|
@@ -33,25 +32,31 @@ const protectRoute = (serverRuntimeConfig, props) => {
|
|
|
33
32
|
};
|
|
34
33
|
}
|
|
35
34
|
// NOTE: this should handle running in next to test non-shopify functionality
|
|
35
|
+
const shouldBypassProtect = (0, utils_1.allowLocalBypass)(serverRuntimeConfig);
|
|
36
36
|
if (shouldBypassProtect) {
|
|
37
37
|
console.info(`${chalk_1.default.yellowBright('next-shopify')} - [${chalk_1.default.bold('protectRoute')}]: ${`Bypassing local protect - should ONLY happen when running in next to test non-shopify functionality!`}`);
|
|
38
38
|
return {
|
|
39
39
|
props: (0, shared_1.cleanObject)(Object.assign(Object.assign({ locale }, props), data), false, shared_1.stringEmptyOnly),
|
|
40
40
|
};
|
|
41
41
|
}
|
|
42
|
-
const { shopify, loadAppData, loadSession, storeSession, findSessionIds,
|
|
42
|
+
const { shopify, loadAppData, loadSession, storeSession, findSessionIds, validateAccessToken, } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
|
|
43
43
|
if (shopify === null || shopify === void 0 ? void 0 : shopify.config) {
|
|
44
44
|
res.setHeader('Content-Security-Policy', (0, utils_1.getSecurityHeader)(shop, shopify.config));
|
|
45
45
|
}
|
|
46
46
|
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;
|
|
47
|
-
// NOTE initial load
|
|
47
|
+
// NOTE idToken will be present on initial load
|
|
48
48
|
if (isEmbedded && (0, shared_1.stringNotEmpty)(idToken)) {
|
|
49
|
-
const { session: _offlineSession } = yield
|
|
49
|
+
const { isValid, session: _offlineSession } = yield validateAccessToken({ idToken });
|
|
50
|
+
if (!isValid) {
|
|
51
|
+
// TODO handle invalid access token
|
|
52
|
+
console.warn('>>> Invalid Session (protectRoute > validateAccessToken)');
|
|
53
|
+
}
|
|
50
54
|
const offlineSession = _offlineSession.toObject();
|
|
51
|
-
// TODO validate we don't need/want online sessions to be stored
|
|
52
|
-
// const { session: onlineSession } = await handleTokenExchange({ idToken, isOnline: true })
|
|
53
|
-
// console.info(`>>> ~ onlineSession`, onlineSession)
|
|
54
55
|
yield storeSession(offlineSession);
|
|
56
|
+
// TODO validate we don't need/want online sessions to be stored
|
|
57
|
+
// const { session: _onlineSession } = await validateAccessToken({ idToken, isOnline: true })
|
|
58
|
+
// const onlineSession = _onlineSession.toObject()
|
|
59
|
+
// await storeSession(onlineSession)
|
|
55
60
|
let appId;
|
|
56
61
|
try {
|
|
57
62
|
const { appInfo } = yield loadAppData();
|
|
@@ -90,7 +95,7 @@ const protectRoute = (serverRuntimeConfig, props) => {
|
|
|
90
95
|
if (!isEmbedded) {
|
|
91
96
|
try {
|
|
92
97
|
// NOTE: this does not work if called INSIDE of embedded
|
|
93
|
-
yield loadSession(
|
|
98
|
+
yield loadSession({ req, res });
|
|
94
99
|
const destination = yield shopify.auth.getEmbeddedAppUrl({
|
|
95
100
|
rawRequest: req,
|
|
96
101
|
rawResponse: res,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protect.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,uCAKoB;AACpB,4CAWwB;AAEjB,MAAM,YAAY,GAAG,CAAC,mBAAmB,EAAE,KAAK,EAAE,EAAE;IACzD,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,mBAAmB,CAAA;IACjE,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAA;IAE3C,MAAM,sBAAsB,GAAG,IAAA,iCAAyB,EAAC,mBAAmB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"protect.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export function getShopifyHelpers(serverRuntimeConfig: any, config: any): Promise<{
|
|
2
|
-
getVerifiedClients: (() => undefined) | ((
|
|
2
|
+
getVerifiedClients: (() => undefined) | (({ req, res, apiVersion, isOnline: _isOnline }?: {
|
|
3
3
|
req: any;
|
|
4
4
|
res: any;
|
|
5
5
|
apiVersion: any;
|
|
@@ -9,11 +9,17 @@ 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
|
-
|
|
12
|
+
validateAccessToken: (() => undefined) | (({ idToken, isOnline }: {
|
|
13
13
|
idToken: any;
|
|
14
14
|
isOnline: any;
|
|
15
15
|
}) => Promise<{
|
|
16
|
-
|
|
16
|
+
isValid: boolean;
|
|
17
|
+
accessToken?: undefined;
|
|
18
|
+
} | {
|
|
19
|
+
accessToken: {
|
|
20
|
+
session: import("@shopify/shopify-api").Session;
|
|
21
|
+
};
|
|
22
|
+
isValid: boolean;
|
|
17
23
|
}>);
|
|
18
24
|
encryptData?: ((value: any) => any) | undefined;
|
|
19
25
|
decryptData?: ((encrypted: any, { publicKey, sharedSecret }?: {
|
|
@@ -27,9 +33,9 @@ export function getShopifyHelpers(serverRuntimeConfig: any, config: any): Promis
|
|
|
27
33
|
appInfo: any;
|
|
28
34
|
appInstallation: any;
|
|
29
35
|
}>);
|
|
30
|
-
loadData: (
|
|
31
|
-
loadSecureData: (
|
|
32
|
-
loadSession: (() => {}) | ((
|
|
36
|
+
loadData: () => {};
|
|
37
|
+
loadSecureData: () => {};
|
|
38
|
+
loadSession: (() => {}) | ((params: any) => Promise<any>);
|
|
33
39
|
storeSession: (() => {}) | ((session: any) => Promise<any>);
|
|
34
40
|
ensureBilling: (() => undefined) | ((session: any, reAuth: any) => Promise<any>);
|
|
35
41
|
updateSession: (() => {}) | ((sessionId: any, data: any) => Promise<any>);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/session.js"],"names":[],"mappings":"AAmCO
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/session.js"],"names":[],"mappings":"AAmCO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyWN;AAoCM;;;;;;mBAoBN"}
|
|
@@ -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, } = serverRuntimeConfig;
|
|
36
|
+
const { APP_ID, API_PATHS, FB_CONFIG, FB_ROOT_COLLECTION, 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) &&
|
|
@@ -56,24 +56,34 @@ const getShopifyHelpers = (serverRuntimeConfig, config) => __awaiter(void 0, voi
|
|
|
56
56
|
[key]: encryptData(value),
|
|
57
57
|
})), {}));
|
|
58
58
|
//#region internal shopifyHelper implementations
|
|
59
|
-
|
|
60
|
-
|
|
59
|
+
const validateAccessToken = ({ idToken, isOnline }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
60
|
+
try {
|
|
61
|
+
const decodedSessionToken = yield shopify.session.decodeSessionToken(idToken);
|
|
62
|
+
const dest = new URL(decodedSessionToken === null || decodedSessionToken === void 0 ? void 0 : decodedSessionToken.dest);
|
|
63
|
+
const decodedShop = dest === null || dest === void 0 ? void 0 : dest.hostname;
|
|
64
|
+
if (decodedShop !== shop) {
|
|
65
|
+
throw new Error('Invalid session shop');
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
catch (error) {
|
|
69
|
+
console.error('Error decoding session token', error);
|
|
70
|
+
return {
|
|
71
|
+
isValid: false,
|
|
72
|
+
};
|
|
73
|
+
}
|
|
61
74
|
const requestedTokenType = isOnline ? 'OnlineAccessToken' : 'OfflineAccessToken';
|
|
62
|
-
|
|
75
|
+
const accessToken = yield shopify.auth.tokenExchange({
|
|
63
76
|
sessionToken: idToken,
|
|
64
77
|
shop,
|
|
65
78
|
requestedTokenType: shopify_api_1.RequestedTokenType[requestedTokenType],
|
|
66
79
|
});
|
|
80
|
+
return {
|
|
81
|
+
accessToken,
|
|
82
|
+
isValid: true,
|
|
83
|
+
};
|
|
67
84
|
});
|
|
68
|
-
const verifySession = (
|
|
85
|
+
const verifySession = ({ req, res, isOnline: _isOnline } = {}) => __awaiter(void 0, void 0, void 0, function* () {
|
|
69
86
|
var _c, _d;
|
|
70
|
-
// console.info(`>>> ~ [${id}] >>>>>>>>>>>>`)
|
|
71
|
-
// console.info('>>> ~ ', {
|
|
72
|
-
// _isOnline,
|
|
73
|
-
// hasRec: (req != undefined),
|
|
74
|
-
// hasRes: (res != undefined),
|
|
75
|
-
// })
|
|
76
|
-
// console.info(`>>> ~ >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>`)
|
|
77
87
|
try {
|
|
78
88
|
const isOnline = _isOnline !== null && _isOnline !== void 0 ? _isOnline : ((req != undefined) && (res != undefined));
|
|
79
89
|
let session;
|
|
@@ -86,8 +96,12 @@ const getShopifyHelpers = (serverRuntimeConfig, config) => __awaiter(void 0, voi
|
|
|
86
96
|
if ((0, shared_1.stringEmpty)(idToken)) {
|
|
87
97
|
throw new shared_1.ShopifySessionMissingError('Missing session token');
|
|
88
98
|
}
|
|
89
|
-
|
|
90
|
-
|
|
99
|
+
const { isValid, session: _onlineSession } = yield validateAccessToken({ idToken, isOnline });
|
|
100
|
+
console.warn('>>> Invalid Session (verifySession > validateAccessToken)');
|
|
101
|
+
if (!isValid) {
|
|
102
|
+
// TODO handle an invalid/expired session token exchange
|
|
103
|
+
// throw new ShopifySessionAuthenticationError('Inactive session', { sessionId })
|
|
104
|
+
}
|
|
91
105
|
const _e = (0, shared_1.ensureObject)(_onlineSession), { accessToken: onlineAccessToken } = _e, onlineSession = __rest(_e, ["accessToken"]);
|
|
92
106
|
if ((0, shared_1.stringEmpty)(onlineAccessToken)) {
|
|
93
107
|
throw new shared_1.ShopifySessionMissingError('Missing online session');
|
|
@@ -107,21 +121,6 @@ const getShopifyHelpers = (serverRuntimeConfig, config) => __awaiter(void 0, voi
|
|
|
107
121
|
if ((0, shared_1.stringNotEmpty)(session === null || session === void 0 ? void 0 : session.shop) && (session.shop !== shop)) {
|
|
108
122
|
throw new Error('Invalid shop');
|
|
109
123
|
}
|
|
110
|
-
// TODO refactor... expired sessions should return a 400 above
|
|
111
|
-
// NOTE only online sessions have expirations
|
|
112
|
-
// const sessionExpired = (
|
|
113
|
-
// isOnline && (
|
|
114
|
-
// !session?.expires ||
|
|
115
|
-
// (ensureDateTime(session.expires) < getCurrentDateTime())
|
|
116
|
-
// )
|
|
117
|
-
// )
|
|
118
|
-
// const sessionActive = (!sessionExpired && arraysMatch(
|
|
119
|
-
// splitCommas(shopify.config?.scopes?.toString()),
|
|
120
|
-
// splitCommas(session?.scope)
|
|
121
|
-
// ))
|
|
122
|
-
// if (!sessionActive) {
|
|
123
|
-
// throw new ShopifySessionAuthenticationError('Inactive session', { sessionId })
|
|
124
|
-
// }
|
|
125
124
|
return Object.assign(Object.assign({}, session), { accessToken, encrypted: !isOnline });
|
|
126
125
|
}
|
|
127
126
|
catch (error) {
|
|
@@ -131,20 +130,20 @@ const getShopifyHelpers = (serverRuntimeConfig, config) => __awaiter(void 0, voi
|
|
|
131
130
|
throw new shared_1.ShopifyAuthenticationError(error === null || error === void 0 ? void 0 : error.message);
|
|
132
131
|
}
|
|
133
132
|
});
|
|
134
|
-
const decryptVerifySession = (
|
|
135
|
-
const _g = yield verifySession(
|
|
133
|
+
const decryptVerifySession = (params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
134
|
+
const _g = yield verifySession(params), {
|
|
136
135
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
137
136
|
data,
|
|
138
137
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
139
138
|
secure, encrypted, accessToken } = _g, session = __rest(_g, ["data", "secure", "encrypted", "accessToken"]);
|
|
140
139
|
return Object.assign(Object.assign({}, session), { accessToken: encrypted ? cryptoHandler.decrypt(accessToken) : accessToken });
|
|
141
140
|
});
|
|
142
|
-
const decryptVerifyData = (
|
|
143
|
-
const { id, data, secure } = yield verifySession(
|
|
141
|
+
const decryptVerifyData = (includeSecure) => __awaiter(void 0, void 0, void 0, function* () {
|
|
142
|
+
const { id, data, secure } = yield verifySession();
|
|
144
143
|
return Object.assign(Object.assign({ id }, data), (includeSecure && secure) && cryptoHandler.decrypt(secure));
|
|
145
144
|
});
|
|
146
|
-
const decryptVerifySecureData = (
|
|
147
|
-
return (decryptVerifyData(
|
|
145
|
+
const decryptVerifySecureData = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
146
|
+
return (decryptVerifyData(true));
|
|
148
147
|
});
|
|
149
148
|
const ensureEncryptedSession = (session) => {
|
|
150
149
|
const { accessToken, secure } = session;
|
|
@@ -174,7 +173,7 @@ const getShopifyHelpers = (serverRuntimeConfig, config) => __awaiter(void 0, voi
|
|
|
174
173
|
if ((0, shared_1.stringNotEmpty)(session === null || session === void 0 ? void 0 : session.billingStatus)) {
|
|
175
174
|
return session;
|
|
176
175
|
}
|
|
177
|
-
return yield decryptVerifySession(
|
|
176
|
+
return yield decryptVerifySession().catch((_error) => {
|
|
178
177
|
// NOTE: first time install, this is expected
|
|
179
178
|
if ((_error instanceof shared_1.ShopifySessionMissingError)) {
|
|
180
179
|
return !(session === null || session === void 0 ? void 0 : session.isOnline) ? session : undefined;
|
|
@@ -201,23 +200,23 @@ const getShopifyHelpers = (serverRuntimeConfig, config) => __awaiter(void 0, voi
|
|
|
201
200
|
}
|
|
202
201
|
return (0, billing_1.ensureBilling)(PAYMENT_CONFIG, { session, shopify, forceBilling });
|
|
203
202
|
});
|
|
204
|
-
const getVerifiedClients = (
|
|
203
|
+
const getVerifiedClients = ({ req, res, apiVersion, isOnline: _isOnline } = {}) => __awaiter(void 0, void 0, void 0, function* () {
|
|
205
204
|
if ((0, shared_1.stringEmpty)(shop)) {
|
|
206
205
|
return undefined;
|
|
207
206
|
}
|
|
208
207
|
try {
|
|
209
|
-
const session = yield decryptVerifySession(
|
|
210
|
-
const isOnline = _isOnline !== null && _isOnline !== void 0 ? _isOnline : ((req != undefined) && (res != undefined));
|
|
208
|
+
const session = yield decryptVerifySession({ req, res, isOnline: _isOnline });
|
|
211
209
|
const Graphql = new shopify.clients.Graphql(Object.assign({ session }, apiVersion && { apiVersion }));
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
// if
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
210
|
+
const isOnline = _isOnline !== null && _isOnline !== void 0 ? _isOnline : ((req != undefined) && (res != undefined));
|
|
211
|
+
const shouldEnsureOfflineAuth = (isOnline && (0, shared_1.isTrue)(APP_CONFIG.isEmbeddedApp));
|
|
212
|
+
// TODO confirm if we still need this check
|
|
213
|
+
if (shouldEnsureOfflineAuth) {
|
|
214
|
+
const offlineSession = yield _getLatestOfflineSession(session);
|
|
215
|
+
if ((0, shared_1.objectEmpty)(offlineSession)) {
|
|
216
|
+
throw new shared_1.ShopifySessionAuthenticationError('Missing required offline session');
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
// TODO confirm if we still need this check (we are doing this now in protect)
|
|
221
220
|
if (isOnline && (0, shared_1.isTrue)(PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required)) {
|
|
222
221
|
const confirmationUrl = yield handleEnsureBilling(session);
|
|
223
222
|
if ((0, shared_1.stringNotEmpty)(confirmationUrl)) {
|
|
@@ -247,7 +246,7 @@ const getShopifyHelpers = (serverRuntimeConfig, config) => __awaiter(void 0, voi
|
|
|
247
246
|
var _j, _k, _l, _m, _o, _p;
|
|
248
247
|
// TODO!!!!!: ensure this is all cached
|
|
249
248
|
let { id: appId } = (0, shared_1.normalizeShopifyId)(_appId);
|
|
250
|
-
const { Graphql } = (_j = yield getVerifiedClients(
|
|
249
|
+
const { Graphql } = (_j = yield getVerifiedClients()) !== null && _j !== void 0 ? _j : {};
|
|
251
250
|
if ((0, shared_1.stringEmpty)(appId)) {
|
|
252
251
|
const appResponse = yield Graphql.query({
|
|
253
252
|
data: {
|
|
@@ -267,14 +266,14 @@ const getShopifyHelpers = (serverRuntimeConfig, config) => __awaiter(void 0, voi
|
|
|
267
266
|
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);
|
|
268
267
|
});
|
|
269
268
|
//#endregion internal shopifyHelper implementations
|
|
270
|
-
return Object.assign({ shopify, getAppUrl: () => undefined, getVerifiedClients: () => undefined, loadAppData: () => undefined, loadData: () => ({}), loadSecureData: () => ({}), loadSession: () => ({}), storeSession: () => ({}), updateSession: () => ({}), deleteSessions: () => undefined, findSessionIds: () => ([]), ensureBilling: () => undefined,
|
|
269
|
+
return Object.assign({ shopify, getAppUrl: () => undefined, getVerifiedClients: () => undefined, loadAppData: () => undefined, loadData: () => ({}), loadSecureData: () => ({}), loadSession: () => ({}), storeSession: () => ({}), updateSession: () => ({}), deleteSessions: () => undefined, findSessionIds: () => ([]), ensureBilling: () => undefined, validateAccessToken: () => undefined }, shopify && {
|
|
271
270
|
getVerifiedClients,
|
|
272
271
|
getAppUrl: buildEmbeddedAppUrl,
|
|
273
|
-
|
|
272
|
+
validateAccessToken,
|
|
274
273
|
encryptData,
|
|
275
274
|
decryptData,
|
|
276
275
|
loadAppData,
|
|
277
|
-
loadData: (
|
|
276
|
+
loadData: () => decryptVerifyData(),
|
|
278
277
|
loadSecureData: decryptVerifySecureData,
|
|
279
278
|
loadSession: decryptVerifySession,
|
|
280
279
|
storeSession: encryptStoreSession,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/lib/utils/session.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/lib/utils/session.js"],"names":[],"mappings":"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"}
|
|
@@ -11,9 +11,8 @@ export function getCallback(data: any, { reAuth, isOnline }: {
|
|
|
11
11
|
reAuth: any;
|
|
12
12
|
isOnline: any;
|
|
13
13
|
}): any;
|
|
14
|
-
export function getAuthErrorResponse(serverRuntimeConfig: any, { error
|
|
14
|
+
export function getAuthErrorResponse(serverRuntimeConfig: any, { error }: {
|
|
15
15
|
error: any;
|
|
16
|
-
shop: any;
|
|
17
16
|
}): {
|
|
18
17
|
statusCode: number;
|
|
19
18
|
message: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/shopify.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"shopify.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/shopify.js"],"names":[],"mappings":"AAmBO;;WAIN;AAGM;;;YAQN;AAEM,qPAYN;AAEM,yFAwEN;AAEM;;;QAYN;AAEM;;;;;;;;;EAeN;AAED,uEAMC"}
|
|
@@ -99,16 +99,11 @@ const getCallback = (data, { reAuth, isOnline }) => {
|
|
|
99
99
|
: authCallbacks.offline || authCallbacks.online;
|
|
100
100
|
};
|
|
101
101
|
exports.getCallback = getCallback;
|
|
102
|
-
const getAuthErrorResponse = (serverRuntimeConfig, { error
|
|
102
|
+
const getAuthErrorResponse = (serverRuntimeConfig, { error }) => {
|
|
103
103
|
const { message, data } = error;
|
|
104
|
-
const { PAGE_PATHS } = serverRuntimeConfig;
|
|
105
|
-
const queryParams = new URLSearchParams({
|
|
106
|
-
shop,
|
|
107
|
-
reAuth: (error instanceof shared_1.ShopifySessionAuthenticationError),
|
|
108
|
-
}).toString();
|
|
104
|
+
const { PAGE_PATHS } = serverRuntimeConfig;
|
|
109
105
|
// TODO determine appropriate url in case of an error
|
|
110
|
-
const reauthorizationUrl = (data === null || data === void 0 ? void 0 : data.redirectUrl) || `${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.ERROR]}
|
|
111
|
-
// const reauthorizationUrl = data?.redirectUrl || `${API_URLS[API_ROUTE_NAMES.AUTH_ONLINE]}?${queryParams}` // HMMMMM: do we not need host here??
|
|
106
|
+
const reauthorizationUrl = (data === null || data === void 0 ? void 0 : data.redirectUrl) || `${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.ERROR]}`;
|
|
112
107
|
return {
|
|
113
108
|
statusCode: 403,
|
|
114
109
|
message,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../../src/lib/utils/shopify.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,8CAA2C;AAC3C,sDAAiE;AAEjE,
|
|
1
|
+
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../../src/lib/utils/shopify.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agnostack/next-shopify",
|
|
3
|
-
"version": "2.0.14-alpha.
|
|
3
|
+
"version": "2.0.14-alpha.34",
|
|
4
4
|
"author": "agnoStack Dev <developers@agnostack.com> (https://agnostack.com)",
|
|
5
5
|
"owner": "agnoStack",
|
|
6
6
|
"description": "Please contact agnoStack via info@agnostack.com for any questions",
|