@agnostack/next-shopify 1.2.0-alpha.7 → 1.2.0-alpha.9
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/apiHelpers.js +13 -1
- package/dist/apiHelpers.js.map +1 -1
- package/dist/utils/shopify.d.ts +1 -1
- package/dist/utils/shopify.js +14 -7
- package/dist/utils/shopify.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,18 @@
|
|
|
1
|
+
# [1.2.0-alpha.9](https://github.com/agnostack/next-shopify/compare/v1.2.0-alpha.8...v1.2.0-alpha.9) (2022-11-12)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* added logs and hmac check ([8249098](https://github.com/agnostack/next-shopify/commit/8249098079e8e79aff0455cf9ce254211b0e63eb))
|
|
7
|
+
* logging to ensure cookie working ([eefa459](https://github.com/agnostack/next-shopify/commit/eefa459f4f2e37237bb801897ed892d922a6fc1a))
|
|
8
|
+
|
|
9
|
+
# [1.2.0-alpha.8](https://github.com/agnostack/next-shopify/compare/v1.2.0-alpha.7...v1.2.0-alpha.8) (2022-11-12)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
### Bug Fixes
|
|
13
|
+
|
|
14
|
+
* more logs (and fixed paymentConfig name ([d3c7fc3](https://github.com/agnostack/next-shopify/commit/d3c7fc32d56aeb9099a6fc1c38d855d08992f029))
|
|
15
|
+
|
|
1
16
|
# [1.2.0-alpha.7](https://github.com/agnostack/next-shopify/compare/v1.2.0-alpha.6...v1.2.0-alpha.7) (2022-11-12)
|
|
2
17
|
|
|
3
18
|
|
package/dist/apiHelpers.js
CHANGED
|
@@ -10,8 +10,12 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
10
10
|
}
|
|
11
11
|
return t;
|
|
12
12
|
};
|
|
13
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
|
+
};
|
|
13
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
17
|
exports.uninstallHelper = exports.callbackHelper = exports.authHelper = exports.graphHelper = exports.restHelper = void 0;
|
|
18
|
+
const cookies_1 = __importDefault(require("cookies"));
|
|
15
19
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
16
20
|
const utils_1 = require("./utils");
|
|
17
21
|
const restHelper = async ({ req, res, params: _params, serverRuntimeConfig }) => {
|
|
@@ -166,7 +170,7 @@ const authHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
166
170
|
};
|
|
167
171
|
exports.authHelper = authHelper;
|
|
168
172
|
const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
169
|
-
const { PAGE_PATHS, APP_WEBHOOKS, PAYMENT_CONFIG } = serverRuntimeConfig;
|
|
173
|
+
const { PAGE_PATHS, APP_WEBHOOKS, PAYMENT_CONFIG, APP_CONFIG, APP_STATE_COOKIE_NAME } = serverRuntimeConfig;
|
|
170
174
|
const { shop, host } = req.query;
|
|
171
175
|
if (!shop || !host) {
|
|
172
176
|
return {
|
|
@@ -178,6 +182,14 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
178
182
|
console.warn(`>>> > callbackHelper > shopify`, shopify);
|
|
179
183
|
try {
|
|
180
184
|
console.warn(`>>> > callbackHelper > req.query`, req.query);
|
|
185
|
+
const cookies = new cookies_1.default(req, res, {
|
|
186
|
+
keys: [APP_CONFIG.API_SECRET_KEY],
|
|
187
|
+
secure: true,
|
|
188
|
+
});
|
|
189
|
+
const cookieMonster = cookies.get(APP_STATE_COOKIE_NAME, { signed: true });
|
|
190
|
+
console.warn(`>>> > callbackHelper > cookieMonster`, cookieMonster);
|
|
191
|
+
const isValidHmac = shopify.Utils.validateHmac(req.query);
|
|
192
|
+
console.log(`>>> > callbackHelper > isValidHmac: ${isValidHmac}`);
|
|
181
193
|
const session = await shopify.Auth.validateAuthCallback(req, res, req.query);
|
|
182
194
|
console.warn(`>>> > callbackHelper > session`, session);
|
|
183
195
|
await utils_1.registerWebhooks(serverRuntimeConfig, APP_WEBHOOKS, session);
|
package/dist/apiHelpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiHelpers.js","sourceRoot":"","sources":["../src/apiHelpers.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"apiHelpers.js","sourceRoot":"","sources":["../src/apiHelpers.js"],"names":[],"mappings":"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"}
|
package/dist/utils/shopify.d.ts
CHANGED
package/dist/utils/shopify.js
CHANGED
|
@@ -30,11 +30,12 @@ const generatePaymentConfig = (paymentConfig, data) => {
|
|
|
30
30
|
if (display_1.objectEmpty(paymentConfig) || display_1.stringEmpty(environment)) {
|
|
31
31
|
return undefined;
|
|
32
32
|
}
|
|
33
|
+
const notProduction = (environment !== 'production');
|
|
33
34
|
return {
|
|
34
|
-
required: environment !== 'development',
|
|
35
|
+
required: (environment !== 'development'),
|
|
35
36
|
test: debugMode || (environment !== 'production'),
|
|
36
37
|
type,
|
|
37
|
-
name
|
|
38
|
+
name: `${name}${notProduction ? ` - ${environment}` : ''}`,
|
|
38
39
|
price: {
|
|
39
40
|
amount: price,
|
|
40
41
|
currencyCode: currency,
|
|
@@ -80,22 +81,27 @@ const registerTopicWebhook = async (props, webhook, topic, { accessToken, shop }
|
|
|
80
81
|
const registerWebhooks = async (props, webhookRegistry, session) => (Promise.all(Object.entries(webhookRegistry).map(async ([topic, webhooks]) => (Promise.all(webhooks.map(async (webhook) => registerTopicWebhook(props, webhook, topic, session)))))));
|
|
81
82
|
exports.registerWebhooks = registerWebhooks;
|
|
82
83
|
// NOTE this is a custom implementation of the @shopify/shopify-api beginAuth method... see NOTE below
|
|
83
|
-
const beginAuth = (
|
|
84
|
-
|
|
85
|
-
console.warn(`>>> > beginAuth > props`, props);
|
|
84
|
+
const beginAuth = ({ APP_CONFIG, APP_CALLBACK_URI, APP_STATE_COOKIE_NAME, }, { req, res, shop: _shop, // HMMMMM?
|
|
85
|
+
isOnline = true, }) => {
|
|
86
86
|
const shop = shopify_api_1.Shopify.Utils.sanitizeShop(_shop);
|
|
87
|
+
console.warn(`>>> > beginAuth > shop`, shop);
|
|
87
88
|
const state = `${isOnline ? 'online' : 'offline'}_${display_1.getGUID()}`;
|
|
89
|
+
console.warn(`>>> > beginAuth > state`, state);
|
|
88
90
|
const cookies = new cookies_1.default(req, res, {
|
|
89
91
|
keys: [APP_CONFIG.API_SECRET_KEY],
|
|
90
92
|
secure: true,
|
|
91
93
|
});
|
|
94
|
+
console.warn(`>>> > beginAuth > cookies`, cookies);
|
|
92
95
|
// NOTE modified sameSite from 'lax' to 'none' is the major change from the @shopify/shopify-api version
|
|
93
96
|
cookies.set(APP_STATE_COOKIE_NAME, state, {
|
|
94
|
-
signed: true,
|
|
95
|
-
expires: new Date(Date.now() + 60000),
|
|
96
97
|
sameSite: 'none',
|
|
98
|
+
expires: new Date(Date.now() + 60000),
|
|
99
|
+
signed: true,
|
|
97
100
|
secure: true,
|
|
98
101
|
});
|
|
102
|
+
// TODO: remove ability to set APP_STATE_COOKIE_NAME!!
|
|
103
|
+
const cookieMonster = cookies.get(APP_STATE_COOKIE_NAME, { signed: true });
|
|
104
|
+
console.warn(`>>> > beginAuth > after cookie set`, cookieMonster);
|
|
99
105
|
// TODO: explore objectToQuerystring
|
|
100
106
|
const queryParams = new URLSearchParams({
|
|
101
107
|
client_id: APP_CONFIG.API_KEY,
|
|
@@ -104,6 +110,7 @@ const beginAuth = (props, { req, res, shop: _shop, isOnline = true, }) => {
|
|
|
104
110
|
state,
|
|
105
111
|
'grant_options[]': isOnline ? 'per-user' : '',
|
|
106
112
|
}).toString();
|
|
113
|
+
console.warn(`>>> > beginAuth > queryParams`, queryParams);
|
|
107
114
|
return `https://${shop}/admin/oauth/authorize?${queryParams}`;
|
|
108
115
|
};
|
|
109
116
|
const getRedirectUrl = (props, { req, res, query, shop: _shop, }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAC7B,sDAA8C;AAE9C,uCAKkB;AAClB,yCAMmB;AACnB,uCAA6C;AAEhC,QAAA,gBAAgB,GAAG;IAC9B,IAAI,EAAE,eAAe;IACrB,KAAK,EAAE,gBAAgB;CACxB,CAAA;AAEY,QAAA,eAAe,GAAG;IAC7B,IAAI,EAAE,cAAc;IACpB,aAAa,EAAE,sBAAsB;IACrC,eAAe,EAAE,wBAAwB;CAC1C,CAAA;AAED,MAAM,kBAAkB,GAAG;;;;;EAKzB,CAAA;AAEK,MAAM,qBAAqB,GAAG,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE;IAC3D,MAAM,EACJ,IAAI,EACJ,KAAK,EACL,QAAQ,GAAG,KAAK,EAChB,IAAI,GAAG,2BAAiB,CAAC,QAAQ,GAClC,GAAG,sBAAY,CAAC,aAAa,CAAC,CAAA;IAC/B,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,sBAAY,CAAC,IAAI,CAAC,CAAA;IAErD,IAAI,qBAAW,CAAC,aAAa,CAAC,IAAI,qBAAW,CAAC,WAAW,CAAC,EAAE;QAC1D,OAAO,SAAS,CAAA;KACjB;IAED,OAAO;QACL,QAAQ,EAAE,WAAW,KAAK,aAAa;
|
|
1
|
+
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/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": "1.2.0-alpha.
|
|
3
|
+
"version": "1.2.0-alpha.9",
|
|
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",
|