@agnostack/next-shopify 2.0.15-alpha.5 → 2.0.15-alpha.7
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
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## [2.0.15-alpha.7](https://github.com/agnostack/next-shopify/compare/v2.0.15-alpha.6...v2.0.15-alpha.7) (2024-10-17)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* debug ([a249c55](https://github.com/agnostack/next-shopify/commit/a249c557b2f692ba944e476bf4104d93a0443ca2))
|
|
7
|
+
|
|
8
|
+
## [2.0.15-alpha.6](https://github.com/agnostack/next-shopify/compare/v2.0.15-alpha.5...v2.0.15-alpha.6) (2024-10-17)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* debug ([99976ad](https://github.com/agnostack/next-shopify/commit/99976ad38ee7274ce6e42275603d9ee88abeccb6))
|
|
14
|
+
|
|
1
15
|
## [2.0.15-alpha.5](https://github.com/agnostack/next-shopify/compare/v2.0.15-alpha.4...v2.0.15-alpha.5) (2024-10-17)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -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;;;;;;;;;;;;;;GAyLN"}
|
|
@@ -44,50 +44,60 @@ const protectRoute = (serverRuntimeConfig, props) => {
|
|
|
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
|
-
|
|
48
|
-
if (isEmbedded
|
|
47
|
+
console.info(`>>> ~ idToken`, idToken);
|
|
48
|
+
if (isEmbedded) {
|
|
49
|
+
// Handle non-home page and/or routing from other pages
|
|
50
|
+
if ((0, shared_1.stringNotEmpty)(idToken)) {
|
|
51
|
+
throw new Error('go to bounce');
|
|
52
|
+
}
|
|
49
53
|
const { isValid, accessToken: { session: _offlineSession, } = {}, } = yield validateAccessToken({ idToken });
|
|
50
54
|
if (!isValid) {
|
|
51
55
|
// TODO handle invalid access token
|
|
52
56
|
console.warn('>>> Invalid Session (protectRoute > validateAccessToken)');
|
|
53
57
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
console.info('Ignoring error loading appData', _ignore);
|
|
73
|
-
}
|
|
74
|
-
// Register webhooks
|
|
75
|
-
const prepareWebhookHandlers = (0, utils_1.getPrepareWebhookHandlers)(serverRuntimeConfig);
|
|
76
|
-
const webhookHandlers = prepareWebhookHandlers({ appId });
|
|
77
|
-
shopify.webhooks.addHandlers(webhookHandlers);
|
|
78
|
-
// NOTE: webhooks cannot use an online session to make API calls to Shopify (but not all webooks may be doing that for all apps)
|
|
79
|
-
yield shopify.webhooks.register({ session: offlineSession });
|
|
80
|
-
if (PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) {
|
|
81
|
-
// NOTE: handleEnsureBilling handles calling encryptStoreSession for offline session when shouldCheckBilling
|
|
82
|
-
const callbackUrl = yield handleEnsureBilling(offlineSession);
|
|
83
|
-
if ((0, shared_1.stringNotEmpty)(callbackUrl)) {
|
|
84
|
-
return {
|
|
85
|
-
redirect: {
|
|
86
|
-
destination: `${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.EXIT]}?${new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: callbackUrl })).toString()}`,
|
|
87
|
-
permanent: false,
|
|
88
|
-
},
|
|
89
|
-
};
|
|
58
|
+
// NOTE offline session will only be available on initial install
|
|
59
|
+
if (_offlineSession) {
|
|
60
|
+
const offlineSession = _offlineSession.toObject();
|
|
61
|
+
yield storeSession(offlineSession);
|
|
62
|
+
// TODO validate we don't need/want online sessions to be stored
|
|
63
|
+
// const {
|
|
64
|
+
// isValid,
|
|
65
|
+
// accessToken: {
|
|
66
|
+
// session: _onlineSession,
|
|
67
|
+
// } = {},
|
|
68
|
+
// } = await validateAccessToken({ idToken, isOnline: true })
|
|
69
|
+
// const onlineSession = _onlineSession.toObject()
|
|
70
|
+
// await storeSession(onlineSession)
|
|
71
|
+
let appId;
|
|
72
|
+
try {
|
|
73
|
+
const { appInfo } = yield loadAppData();
|
|
74
|
+
appId = (0, shared_1.normalizeShopifyId)(appInfo === null || appInfo === void 0 ? void 0 : appInfo.id).id;
|
|
75
|
+
// eslint-disable-next-line no-empty
|
|
90
76
|
}
|
|
77
|
+
catch (_ignore) {
|
|
78
|
+
console.info('Ignoring error loading appData', _ignore);
|
|
79
|
+
}
|
|
80
|
+
// Register webhooks
|
|
81
|
+
const prepareWebhookHandlers = (0, utils_1.getPrepareWebhookHandlers)(serverRuntimeConfig);
|
|
82
|
+
const webhookHandlers = prepareWebhookHandlers({ appId });
|
|
83
|
+
shopify.webhooks.addHandlers(webhookHandlers);
|
|
84
|
+
// NOTE: webhooks cannot use an online session to make API calls to Shopify (but not all webooks may be doing that for all apps)
|
|
85
|
+
yield shopify.webhooks.register({ session: offlineSession });
|
|
86
|
+
if (PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) {
|
|
87
|
+
// NOTE: handleEnsureBilling handles calling encryptStoreSession for offline session when shouldCheckBilling
|
|
88
|
+
const callbackUrl = yield handleEnsureBilling(offlineSession);
|
|
89
|
+
if ((0, shared_1.stringNotEmpty)(callbackUrl)) {
|
|
90
|
+
return {
|
|
91
|
+
redirect: {
|
|
92
|
+
destination: `${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.EXIT]}?${new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: callbackUrl })).toString()}`,
|
|
93
|
+
permanent: false,
|
|
94
|
+
},
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
console.info(`>>> ~ NO _offlineSession`);
|
|
91
101
|
}
|
|
92
102
|
}
|
|
93
103
|
else {
|
|
@@ -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,OAAO,CAAC,IAAI,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;IAC/C,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,mBAAmB,CAAA;IACjF,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAA;IAE3C,OAAO,CAAO,EACZ,GAAG,EACH,GAAG,EACH,KAAK,EACL,MAAM,GACP,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE;;QACd,MAAM,IAAI,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,mCAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,IAAI,CAAA;QAE3C,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;YACrB,OAAO;gBACL,QAAQ,EAAE;oBACR,WAAW,EAAE,GAAG,UAAU,CAAC,yBAAgB,CAAC,KAAK,CAAC,0CAA0C;oBAC5F,SAAS,EAAE,KAAK;iBACjB;aACF,CAAA;SACF;QAED,6EAA6E;QAC7E,MAAM,mBAAmB,GAAG,IAAA,wBAAgB,EAAC,mBAAmB,CAAC,CAAA;QACjE,IAAI,mBAAmB,EAAE;YACvB,OAAO,CAAC,IAAI,CAAC,GAAG,eAAK,CAAC,YAAY,CAAC,cAAc,CAAC,OAAO,eAAK,CAAC,IAAI,CAAC,cAAc,CAAC,MACjF,sGACF,EAAE,CAAC,CAAA;YAEH,OAAO;gBACL,KAAK,EAAE,IAAA,oBAAW,gCAChB,MAAM,IACH,KAAK,GACL,IAAI,GACN,KAAK,EAAE,wBAAe,CAAC;aAC3B,CAAA;SACF;QAED,MAAM,EACJ,OAAO,EACP,WAAW,EACX,WAAW,EACX,YAAY,EACZ,cAAc,EACd,mBAAmB,EACnB,aAAa,EAAE,mBAAmB,GACnC,GAAG,MAAM,IAAA,yBAAiB,EAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;QAE1D,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE;YACnB,GAAG,CAAC,SAAS,CAAC,yBAAyB,EAAE,IAAA,yBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;SAClF;QAED,MAAM,OAAO,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,mCAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"protect.js","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.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.15-alpha.
|
|
3
|
+
"version": "2.0.15-alpha.7",
|
|
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",
|