@agnostack/next-shopify 1.3.2-alpha.34 → 1.3.2-alpha.35
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 +7 -0
- package/dist/helpers/callback.js +12 -13
- package/dist/helpers/callback.js.map +1 -1
- package/dist/utils/constants.d.ts +1 -0
- package/dist/utils/constants.js +2 -1
- package/dist/utils/constants.js.map +1 -1
- package/dist/utils/shopify-api-node/beginAuth.d.ts +9 -0
- package/dist/utils/shopify-api-node/beginAuth.js +37 -0
- package/dist/utils/shopify-api-node/beginAuth.js.map +1 -0
- package/dist/utils/shopify-api-node/index.d.ts +1 -0
- package/dist/utils/shopify-api-node/index.js +15 -0
- package/dist/utils/shopify-api-node/index.js.map +1 -0
- package/dist/utils/shopify.js +3 -55
- package/dist/utils/shopify.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [1.3.2-alpha.35](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.34...v1.3.2-alpha.35) (2022-11-19)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* modify clear cookie approach ([c0a0dc5](https://github.com/agnostack/next-shopify/commit/c0a0dc5ef3e5c08bc8a663f937c232825ee8df0f))
|
|
7
|
+
|
|
1
8
|
## [1.3.2-alpha.34](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.33...v1.3.2-alpha.34) (2022-11-19)
|
|
2
9
|
|
|
3
10
|
|
package/dist/helpers/callback.js
CHANGED
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.callbackHelper = void 0;
|
|
4
7
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
5
|
-
|
|
8
|
+
const cookies_1 = __importDefault(require("cookies"));
|
|
6
9
|
const utils_1 = require("../utils");
|
|
7
10
|
const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
8
11
|
var _a;
|
|
9
|
-
const { PAGE_PATHS, APP_WEBHOOKS, PAYMENT_CONFIG } = serverRuntimeConfig;
|
|
10
|
-
const { shop, host } = req.query;
|
|
12
|
+
const { PAGE_PATHS, APP_WEBHOOKS, APP_CONFIG, PAYMENT_CONFIG } = serverRuntimeConfig;
|
|
13
|
+
const { shop, host } = req.query;
|
|
11
14
|
if (!shop || !host) {
|
|
12
15
|
return {
|
|
13
16
|
statusCode: 303,
|
|
@@ -18,6 +21,12 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
18
21
|
try {
|
|
19
22
|
const shopify = utils_1.getInitializedShopify(serverRuntimeConfig, shop);
|
|
20
23
|
const session = await shopify.Auth.validateAuthCallback(req, res, req.query);
|
|
24
|
+
// TODO manually unsign cookie since we are overriding beginAuth
|
|
25
|
+
const cookies = new cookies_1.default(req, res, {
|
|
26
|
+
keys: [APP_CONFIG.API_SECRET_KEY],
|
|
27
|
+
secure: true,
|
|
28
|
+
});
|
|
29
|
+
cookies.set(shopify_api_1.Shopify.Auth.STATE_COOKIE_NAME);
|
|
21
30
|
await utils_1.registerWebhooks(serverRuntimeConfig, APP_WEBHOOKS, session);
|
|
22
31
|
// TODO: explore objectToQuerystring
|
|
23
32
|
const embeddedURL = shopify_api_1.Shopify.Utils.getEmbeddedAppUrl(req);
|
|
@@ -29,16 +38,6 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
29
38
|
redirectUrl = confirmationUrl;
|
|
30
39
|
}
|
|
31
40
|
}
|
|
32
|
-
// const cookies = new Cookies(req, res, {
|
|
33
|
-
// keys: [APP_CONFIG.API_SECRET_KEY],
|
|
34
|
-
// secure: true,
|
|
35
|
-
// })
|
|
36
|
-
// cookies.set(Shopify.Auth.STATE_COOKIE_NAME, state, {
|
|
37
|
-
// sameSite: 'none', // NOTE modified sameSite from 'lax' to 'none' is the major change from the @shopify/shopify-api version
|
|
38
|
-
// expires: new Date(Date.now()),
|
|
39
|
-
// signed: true,
|
|
40
|
-
// secure: true,
|
|
41
|
-
// })
|
|
42
41
|
}
|
|
43
42
|
catch (error) {
|
|
44
43
|
const errorMessage = 'Error handling callback route';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../src/helpers/callback.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../src/helpers/callback.js"],"names":[],"mappings":"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"}
|
package/dist/utils/constants.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ONE_TIME_PURCHASE_MUTATION = exports.RECURRING_PURCHASE_MUTATION = exports.ONE_TIME_PURCHASES_QUERY = exports.RECURRING_PURCHASES_QUERY = exports.SHOP_QUERY = exports.RECURRING_INTERVALS = exports.BILLING_INTERVALS = exports.API_ROUTE_NAMES = exports.PAGE_ROUTE_NAMES = exports.COLLECTION_ROOT = void 0;
|
|
3
|
+
exports.ONE_TIME_PURCHASE_MUTATION = exports.RECURRING_PURCHASE_MUTATION = exports.ONE_TIME_PURCHASES_QUERY = exports.RECURRING_PURCHASES_QUERY = exports.SHOP_QUERY = exports.RECURRING_INTERVALS = exports.BILLING_INTERVALS = exports.API_ROUTE_NAMES = exports.PAGE_ROUTE_NAMES = exports.STATE_COOKIE_NAME_PREFIX = exports.COLLECTION_ROOT = void 0;
|
|
4
4
|
exports.COLLECTION_ROOT = 'oauth-data';
|
|
5
|
+
exports.STATE_COOKIE_NAME_PREFIX = 'shopify_app_state';
|
|
5
6
|
exports.PAGE_ROUTE_NAMES = {
|
|
6
7
|
EXIT: 'pageRouteExit',
|
|
7
8
|
ERROR: 'pageRouteError',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.js"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,YAAY,CAAA;AAE9B,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;AAEY,QAAA,iBAAiB,GAAG;IAC/B,QAAQ,EAAE,UAAU;IACpB,aAAa,EAAE,eAAe;IAC9B,MAAM,EAAE,QAAQ;CACjB,CAAA;AAEY,QAAA,mBAAmB,GAAG;IACjC,yBAAiB,CAAC,aAAa;IAC/B,yBAAiB,CAAC,MAAM;CACzB,CAAA;AAEY,QAAA,UAAU,GAAG;;;;;;CAMzB,CAAA;AAEY,QAAA,yBAAyB,GAAG;;;;;;;;CAQxC,CAAA;AAEY,QAAA,wBAAwB,GAAG;;;;;;;;;;;;;;;CAevC,CAAA;AAEY,QAAA,2BAA2B,GAAG;;;;;;;;;;;;;;;;;;;;CAoB1C,CAAA;AAEY,QAAA,0BAA0B,GAAG;;;;;;;;;;;;;;;;;;;;CAoBzC,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.js"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,YAAY,CAAA;AAE9B,QAAA,wBAAwB,GAAG,mBAAmB,CAAA;AAE9C,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;AAEY,QAAA,iBAAiB,GAAG;IAC/B,QAAQ,EAAE,UAAU;IACpB,aAAa,EAAE,eAAe;IAC9B,MAAM,EAAE,QAAQ;CACjB,CAAA;AAEY,QAAA,mBAAmB,GAAG;IACjC,yBAAiB,CAAC,aAAa;IAC/B,yBAAiB,CAAC,MAAM;CACzB,CAAA;AAEY,QAAA,UAAU,GAAG;;;;;;CAMzB,CAAA;AAEY,QAAA,yBAAyB,GAAG;;;;;;;;CAQxC,CAAA;AAEY,QAAA,wBAAwB,GAAG;;;;;;;;;;;;;;;CAevC,CAAA;AAEY,QAAA,2BAA2B,GAAG;;;;;;;;;;;;;;;;;;;;CAoB1C,CAAA;AAEY,QAAA,0BAA0B,GAAG;;;;;;;;;;;;;;;;;;;;CAoBzC,CAAA"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.beginAuth = void 0;
|
|
7
|
+
const cookies_1 = __importDefault(require("cookies"));
|
|
8
|
+
const shopify_api_1 = require("@shopify/shopify-api");
|
|
9
|
+
const display_1 = require("../display");
|
|
10
|
+
const constants_1 = require("../constants");
|
|
11
|
+
// NOTE this is a custom implementation of the @shopify/shopify-api beginAuth method... see NOTE below
|
|
12
|
+
const beginAuth = ({ APP_CONFIG, API_URLS, }, { req, res, shop: _shop, isOnline = true, }) => {
|
|
13
|
+
var _a;
|
|
14
|
+
const shop = _shop !== null && _shop !== void 0 ? _shop : shopify_api_1.Shopify.Utils.sanitizeShop((_a = req.query) === null || _a === void 0 ? void 0 : _a.shop);
|
|
15
|
+
const state = `${isOnline ? 'online' : 'offline'}_${display_1.getGUID()}`;
|
|
16
|
+
const cookies = new cookies_1.default(req, res, {
|
|
17
|
+
keys: [APP_CONFIG.API_SECRET_KEY],
|
|
18
|
+
secure: true,
|
|
19
|
+
});
|
|
20
|
+
cookies.set(shopify_api_1.Shopify.Auth.STATE_COOKIE_NAME, state, {
|
|
21
|
+
sameSite: 'lax',
|
|
22
|
+
expires: new Date(Date.now() + 60000),
|
|
23
|
+
signed: true,
|
|
24
|
+
secure: true,
|
|
25
|
+
});
|
|
26
|
+
// TODO: explore objectToQuerystring
|
|
27
|
+
const queryParams = new URLSearchParams({
|
|
28
|
+
client_id: APP_CONFIG.API_KEY,
|
|
29
|
+
scope: APP_CONFIG.SCOPES,
|
|
30
|
+
redirect_uri: API_URLS[constants_1.API_ROUTE_NAMES.AUTH_CALLBACK],
|
|
31
|
+
state,
|
|
32
|
+
'grant_options[]': isOnline ? 'per-user' : '',
|
|
33
|
+
}).toString();
|
|
34
|
+
return `https://${shop}/admin/oauth/authorize?${queryParams}`;
|
|
35
|
+
};
|
|
36
|
+
exports.beginAuth = beginAuth;
|
|
37
|
+
//# sourceMappingURL=beginAuth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"beginAuth.js","sourceRoot":"","sources":["../../../src/utils/shopify-api-node/beginAuth.js"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAC7B,sDAA8C;AAE9C,wCAAoC;AACpC,4CAA8C;AAE9C,sGAAsG;AAC/F,MAAM,SAAS,GAAG,CACvB,EACE,UAAU,EACV,QAAQ,GACT,EACD,EACE,GAAG,EACH,GAAG,EACH,IAAI,EAAE,KAAK,EACX,QAAQ,GAAG,IAAI,GAChB,EACD,EAAE;;IACF,MAAM,IAAI,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,qBAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAA,GAAG,CAAC,KAAK,0CAAE,IAAI,CAAC,CAAA;IACjE,MAAM,KAAK,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,IAAI,iBAAO,EAAE,EAAE,CAAA;IAC/D,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,GAAG,EAAE,GAAG,EAAE;QACpC,IAAI,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC;QACjC,MAAM,EAAE,IAAI;KACb,CAAC,CAAA;IAEF,OAAO,CAAC,GAAG,CAAC,qBAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,EAAE;QACjD,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;QACrC,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,IAAI;KACb,CAAC,CAAA;IAEF,oCAAoC;IACpC,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC;QACtC,SAAS,EAAE,UAAU,CAAC,OAAO;QAC7B,KAAK,EAAE,UAAU,CAAC,MAAM;QACxB,YAAY,EAAE,QAAQ,CAAC,2BAAe,CAAC,aAAa,CAAC;QACrD,KAAK;QACL,iBAAiB,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;KAC9C,CAAC,CAAC,QAAQ,EAAE,CAAA;IAEb,OAAO,WAAW,IAAI,0BAA0B,WAAW,EAAE,CAAA;AAC/D,CAAC,CAAA;AApCY,QAAA,SAAS,aAoCrB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from "./beginAuth";
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
|
+
};
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
// NOTE these are overrides of '@shopify/shopify-api'
|
|
14
|
+
__exportStar(require("./beginAuth"), exports);
|
|
15
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/shopify-api-node/index.js"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAqD;AACrD,8CAA2B"}
|
package/dist/utils/shopify.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.getRedirectUrl = exports.registerWebhooks = exports.getVerifiedSession = exports.generatePaymentConfig = exports.getInitializedShopify = void 0;
|
|
7
|
-
const cookies_1 = __importDefault(require("cookies"));
|
|
8
4
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
5
|
+
const shopify_api_node_1 = require("./shopify-api-node");
|
|
9
6
|
const billing_1 = require("./billing");
|
|
10
7
|
const errors_1 = require("./errors");
|
|
11
8
|
const display_1 = require("./display");
|
|
@@ -90,54 +87,15 @@ const registerTopicWebhook = async (serverRuntimeConfig, webhook, topic, { acces
|
|
|
90
87
|
};
|
|
91
88
|
const registerWebhooks = async (serverRuntimeConfig, webhookRegistry, session) => (Promise.all(Object.entries(webhookRegistry).map(async ([topic, webhooks]) => (Promise.all(webhooks.map(async (webhook) => registerTopicWebhook(serverRuntimeConfig, webhook, topic, session)))))));
|
|
92
89
|
exports.registerWebhooks = registerWebhooks;
|
|
93
|
-
// NOTE this is a custom implementation of the @shopify/shopify-api beginAuth method... see NOTE below
|
|
94
|
-
const beginAuth = ({ APP_CONFIG, API_URLS, }, { req, res, shop: _shop, isOnline = true, }) => {
|
|
95
|
-
var _a;
|
|
96
|
-
const shop = _shop !== null && _shop !== void 0 ? _shop : shopify_api_1.Shopify.Utils.sanitizeShop((_a = req.query) === null || _a === void 0 ? void 0 : _a.shop);
|
|
97
|
-
const state = `${isOnline ? 'online' : 'offline'}_${display_1.getGUID()}`;
|
|
98
|
-
const cookies = new cookies_1.default(req, res, {
|
|
99
|
-
keys: [APP_CONFIG.API_SECRET_KEY],
|
|
100
|
-
secure: true,
|
|
101
|
-
});
|
|
102
|
-
cookies.set(shopify_api_1.Shopify.Auth.STATE_COOKIE_NAME, state, {
|
|
103
|
-
sameSite: 'lax',
|
|
104
|
-
expires: new Date(Date.now() + 60000),
|
|
105
|
-
signed: true,
|
|
106
|
-
secure: true,
|
|
107
|
-
});
|
|
108
|
-
// TODO: explore objectToQuerystring
|
|
109
|
-
const queryParams = new URLSearchParams({
|
|
110
|
-
client_id: APP_CONFIG.API_KEY,
|
|
111
|
-
scope: APP_CONFIG.SCOPES,
|
|
112
|
-
redirect_uri: API_URLS[constants_1.API_ROUTE_NAMES.AUTH_CALLBACK],
|
|
113
|
-
state,
|
|
114
|
-
'grant_options[]': isOnline ? 'per-user' : '',
|
|
115
|
-
}).toString();
|
|
116
|
-
return `https://${shop}/admin/oauth/authorize?${queryParams}`;
|
|
117
|
-
};
|
|
118
90
|
const getRedirectUrl = (props, { req, res, query: _query, }) => {
|
|
119
91
|
var _a;
|
|
120
|
-
const { API_URLS, PAGE_PATHS } = props;
|
|
92
|
+
const { API_URLS, PAGE_PATHS } = props;
|
|
121
93
|
const query = (_a = _query !== null && _query !== void 0 ? _query : req.query) !== null && _a !== void 0 ? _a : {};
|
|
122
94
|
const { embedded, host, shop: _shop } = query !== null && query !== void 0 ? query : {};
|
|
123
|
-
// NOTE
|
|
124
|
-
// const isOnline = true
|
|
125
95
|
const shop = shopify_api_1.Shopify.Utils.sanitizeShop(_shop);
|
|
126
96
|
if (!shop) {
|
|
127
97
|
return `${PAGE_PATHS[constants_1.PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=getRedirectUrl`;
|
|
128
98
|
}
|
|
129
|
-
// const shop = _shop ?? Shopify.Utils.sanitizeShop(req.query?.shop)
|
|
130
|
-
// const state = `${isOnline ? 'online' : 'offline'}_${getGUID()}`
|
|
131
|
-
// const cookies = new Cookies(req, res, {
|
|
132
|
-
// keys: [APP_CONFIG.API_SECRET_KEY],
|
|
133
|
-
// secure: true,
|
|
134
|
-
// })
|
|
135
|
-
// cookies.set(Shopify.Auth.STATE_COOKIE_NAME, state, {
|
|
136
|
-
// sameSite: 'none', // NOTE modified sameSite from 'lax' to 'none' is the major change from the @shopify/shopify-api version
|
|
137
|
-
// expires: new Date(Date.now() + 60000),
|
|
138
|
-
// signed: true,
|
|
139
|
-
// secure: true,
|
|
140
|
-
// })
|
|
141
99
|
let queryParams;
|
|
142
100
|
if (embedded === '1') {
|
|
143
101
|
// TODO: explore objectToQuerystring
|
|
@@ -149,17 +107,7 @@ const getRedirectUrl = (props, { req, res, query: _query, }) => {
|
|
|
149
107
|
queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: `${API_URLS[constants_1.API_ROUTE_NAMES.AUTH_CALLBACK]}?${redirectUriParams}` })).toString();
|
|
150
108
|
return `${PAGE_PATHS[constants_1.PAGE_ROUTE_NAMES.EXIT]}?${queryParams}`;
|
|
151
109
|
}
|
|
152
|
-
|
|
153
|
-
return beginAuth(props, { req, res, shop });
|
|
154
|
-
// TODO: explore objectToQuerystring
|
|
155
|
-
// queryParams = new URLSearchParams({
|
|
156
|
-
// client_id: APP_CONFIG.API_KEY,
|
|
157
|
-
// scope: APP_CONFIG.SCOPES,
|
|
158
|
-
// redirect_uri: API_URLS[API_ROUTE_NAMES.AUTH_CALLBACK],
|
|
159
|
-
// state,
|
|
160
|
-
// 'grant_options[]': isOnline ? 'per-user' : '',
|
|
161
|
-
// }).toString()
|
|
162
|
-
// return `https://${shop}/admin/oauth/authorize?${queryParams}`
|
|
110
|
+
return shopify_api_node_1.beginAuth(props, { req, res, shop });
|
|
163
111
|
};
|
|
164
112
|
exports.getRedirectUrl = getRedirectUrl;
|
|
165
113
|
//# sourceMappingURL=shopify.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":"
|
|
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.3.2-alpha.
|
|
3
|
+
"version": "1.3.2-alpha.35",
|
|
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",
|