@agnostack/next-shopify 1.2.1-alpha.3 → 1.2.1-alpha.4
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/utils/shopify.js +4 -4
- package/dist/withShopify.js +10 -6
- package/dist/withShopify.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [1.2.1-alpha.4](https://github.com/agnostack/next-shopify/compare/v1.2.1-alpha.3...v1.2.1-alpha.4) (2022-11-13)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* updated to add publicruntimeconf ([593e444](https://github.com/agnostack/next-shopify/commit/593e44406b8e39ab39ac51c44e8f4f568fd138a1))
|
|
7
|
+
|
|
1
8
|
## [1.2.1-alpha.3](https://github.com/agnostack/next-shopify/compare/v1.2.1-alpha.2...v1.2.1-alpha.3) (2022-11-13)
|
|
2
9
|
|
|
3
10
|
|
package/dist/utils/shopify.js
CHANGED
|
@@ -102,7 +102,7 @@ const registerTopicWebhook = async (serverRuntimeConfig, webhook, topic, { acces
|
|
|
102
102
|
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)))))));
|
|
103
103
|
exports.registerWebhooks = registerWebhooks;
|
|
104
104
|
// NOTE this is a custom implementation of the @shopify/shopify-api beginAuth method... see NOTE below
|
|
105
|
-
const beginAuth = ({ APP_CONFIG,
|
|
105
|
+
const beginAuth = ({ APP_CONFIG, APP_CALLBACK_URL, }, { req, res, shop: _shop, isOnline = true, }) => {
|
|
106
106
|
var _a;
|
|
107
107
|
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);
|
|
108
108
|
const state = `${isOnline ? 'online' : 'offline'}_${display_1.getGUID()}`;
|
|
@@ -120,7 +120,7 @@ const beginAuth = ({ APP_CONFIG, APP_CALLBACK_URI, }, { req, res, shop: _shop, i
|
|
|
120
120
|
const queryParams = new URLSearchParams({
|
|
121
121
|
client_id: APP_CONFIG.API_KEY,
|
|
122
122
|
scope: APP_CONFIG.SCOPES,
|
|
123
|
-
redirect_uri:
|
|
123
|
+
redirect_uri: APP_CALLBACK_URL,
|
|
124
124
|
state,
|
|
125
125
|
'grant_options[]': isOnline ? 'per-user' : '',
|
|
126
126
|
}).toString();
|
|
@@ -128,7 +128,7 @@ const beginAuth = ({ APP_CONFIG, APP_CALLBACK_URI, }, { req, res, shop: _shop, i
|
|
|
128
128
|
};
|
|
129
129
|
const getRedirectUrl = (props, { req, res, query: _query, }) => {
|
|
130
130
|
var _a;
|
|
131
|
-
const {
|
|
131
|
+
const { APP_CALLBACK_URL, PAGE_PATHS } = props;
|
|
132
132
|
const query = (_a = _query !== null && _query !== void 0 ? _query : req.query) !== null && _a !== void 0 ? _a : {};
|
|
133
133
|
const { embedded, host, shop: _shop } = query !== null && query !== void 0 ? query : {};
|
|
134
134
|
const shop = shopify_api_1.Shopify.Utils.sanitizeShop(_shop);
|
|
@@ -142,7 +142,7 @@ const getRedirectUrl = (props, { req, res, query: _query, }) => {
|
|
|
142
142
|
host,
|
|
143
143
|
}).toString();
|
|
144
144
|
// TODO: explore objectToQuerystring
|
|
145
|
-
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: `${
|
|
145
|
+
const queryParams = new URLSearchParams(Object.assign(Object.assign({}, query), { shop, redirectUri: `${APP_CALLBACK_URL}?${redirectUriParams}` })).toString();
|
|
146
146
|
return `${PAGE_PATHS[exports.PAGE_ROUTE_NAMES.EXIT]}?${queryParams}`;
|
|
147
147
|
}
|
|
148
148
|
// return Shopify.Auth.beginAuth( // see NOTE above beginAuth
|
package/dist/withShopify.js
CHANGED
|
@@ -18,7 +18,7 @@ const utils_1 = require("./utils");
|
|
|
18
18
|
// TODO!!!!!!: add middleware export for headers???
|
|
19
19
|
const withShopify = async (nextPhase, _a) => {
|
|
20
20
|
var { nextConfig } = _a, config = __rest(_a, ["nextConfig"]);
|
|
21
|
-
const _b = nextConfig !== null && nextConfig !== void 0 ? nextConfig : {}, { basePath: _basePath, headers: _headers, serverRuntimeConfig: _serverRuntimeConfig = {} } = _b, _nextConfig = __rest(_b, ["basePath", "headers", "serverRuntimeConfig"]);
|
|
21
|
+
const _b = nextConfig !== null && nextConfig !== void 0 ? nextConfig : {}, { basePath: _basePath, headers: _headers, publicRuntimeConfig: _publicRuntimeConfig = {}, serverRuntimeConfig: _serverRuntimeConfig = {} } = _b, _nextConfig = __rest(_b, ["basePath", "headers", "publicRuntimeConfig", "serverRuntimeConfig"]);
|
|
22
22
|
const _c = config !== null && config !== void 0 ? config : {}, {
|
|
23
23
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
24
24
|
defaultConfig } = _c, // NOTE: This is here in case we need anything from it
|
|
@@ -71,7 +71,7 @@ const withShopify = async (nextPhase, _a) => {
|
|
|
71
71
|
[utils_1.API_ROUTE_NAMES.APP_UNINSTALLED]: apiRouteAppUninstalled,
|
|
72
72
|
};
|
|
73
73
|
const API_PATHS = Object.entries(API_ROUTES).reduce((_apiPaths, [routeName, routePath]) => (Object.assign(Object.assign({}, _apiPaths), { [routeName]: `${basePath}${routePath}` })), {});
|
|
74
|
-
const
|
|
74
|
+
const APP_CALLBACK_URL = `${appBaseUrl}${API_PATHS[utils_1.API_ROUTE_NAMES.AUTH_CALLBACK]}`;
|
|
75
75
|
const APP_HOST_NAME = appUrl.hostname;
|
|
76
76
|
const APP_CONFIG = {
|
|
77
77
|
API_VERSION: SHOPIFY_API_VERSION,
|
|
@@ -121,17 +121,21 @@ const withShopify = async (nextPhase, _a) => {
|
|
|
121
121
|
}))
|
|
122
122
|
];
|
|
123
123
|
};
|
|
124
|
+
const publicRuntimeConfig = Object.assign(Object.assign({}, _publicRuntimeConfig), { APP_BASE_URL,
|
|
125
|
+
API_ROUTES,
|
|
126
|
+
API_PATHS });
|
|
124
127
|
const serverRuntimeConfig = Object.assign(Object.assign({}, _serverRuntimeConfig), { PAYMENT_CONFIG, FB_CONFIG: firebaseConfig, FB_ROOT_COLLECTION,
|
|
125
128
|
APP_CONFIG,
|
|
126
129
|
APP_WEBHOOKS,
|
|
127
130
|
PAGE_ROUTES,
|
|
128
131
|
PAGE_PATHS,
|
|
132
|
+
APP_ID,
|
|
129
133
|
APP_BASE_URL,
|
|
134
|
+
APP_CALLBACK_URL,
|
|
130
135
|
API_ROUTES,
|
|
131
|
-
API_PATHS
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
return Object.assign(Object.assign(Object.assign({}, _nextConfig), { basePath: _basePath, serverRuntimeConfig }), !isExportMode && {
|
|
136
|
+
API_PATHS });
|
|
137
|
+
return Object.assign(Object.assign(Object.assign({}, _nextConfig), { basePath: _basePath, publicRuntimeConfig,
|
|
138
|
+
serverRuntimeConfig }), !isExportMode && {
|
|
135
139
|
headers,
|
|
136
140
|
});
|
|
137
141
|
};
|
package/dist/withShopify.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withShopify.js","sourceRoot":"","sources":["../src/withShopify.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,8CAGuB;AAEvB,0DAAoD;AAEpD,mCAOgB;AAEhB,mDAAmD;AAE5C,MAAM,WAAW,GAAG,KAAK,EAAE,SAAS,EAAE,EAAyB,EAAE,EAAE;QAA7B,EAAE,UAAU,OAAa,EAAR,MAAM,cAAvB,cAAyB,CAAF;IAClE,MAAM,
|
|
1
|
+
{"version":3,"file":"withShopify.js","sourceRoot":"","sources":["../src/withShopify.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.1-alpha.
|
|
3
|
+
"version": "1.2.1-alpha.4",
|
|
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",
|