@agnostack/next-shopify 1.3.2-alpha.2 → 1.3.2-alpha.20
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 +126 -0
- package/dist/apiHelpers.js +30 -10
- package/dist/apiHelpers.js.map +1 -1
- package/dist/protectRoute.js +18 -7
- package/dist/protectRoute.js.map +1 -1
- package/dist/utils/billing.js +24 -48
- package/dist/utils/billing.js.map +1 -1
- package/dist/utils/shopify.d.ts +1 -1
- package/dist/utils/shopify.js +4 -2
- package/dist/utils/shopify.js.map +1 -1
- package/dist/withShopify.js +28 -3
- package/dist/withShopify.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,129 @@
|
|
|
1
|
+
## [1.3.2-alpha.20](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.19...v1.3.2-alpha.20) (2022-11-18)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* debug ([69170ff](https://github.com/agnostack/next-shopify/commit/69170fffdcfe84044df6ce3f575dbfbaabe4f60a))
|
|
7
|
+
|
|
8
|
+
## [1.3.2-alpha.19](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.18...v1.3.2-alpha.19) (2022-11-18)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* debug ([4a886a4](https://github.com/agnostack/next-shopify/commit/4a886a4bb88c675a52e40aee121d4424666ab524))
|
|
14
|
+
|
|
15
|
+
## [1.3.2-alpha.18](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.17...v1.3.2-alpha.18) (2022-11-17)
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### Bug Fixes
|
|
19
|
+
|
|
20
|
+
* modify headers ([4848edf](https://github.com/agnostack/next-shopify/commit/4848edf4b275f1ab08aaec54f4a792d4c53d6e15))
|
|
21
|
+
|
|
22
|
+
## [1.3.2-alpha.17](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.16...v1.3.2-alpha.17) (2022-11-17)
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
### Bug Fixes
|
|
26
|
+
|
|
27
|
+
* debug ([069c0dd](https://github.com/agnostack/next-shopify/commit/069c0dd9526b801267ac0998e557240ddd423612))
|
|
28
|
+
|
|
29
|
+
## [1.3.2-alpha.16](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.15...v1.3.2-alpha.16) (2022-11-17)
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
### Bug Fixes
|
|
33
|
+
|
|
34
|
+
* modify header rules ([53983bb](https://github.com/agnostack/next-shopify/commit/53983bb7b888a55c96de6e0c3f6f9dd6930be98c))
|
|
35
|
+
|
|
36
|
+
## [1.3.2-alpha.15](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.14...v1.3.2-alpha.15) (2022-11-17)
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
### Bug Fixes
|
|
40
|
+
|
|
41
|
+
* debug ([61a69ba](https://github.com/agnostack/next-shopify/commit/61a69ba063f5bfe8673c9b4fbc29bdca4647ea09))
|
|
42
|
+
|
|
43
|
+
## [1.3.2-alpha.14](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.13...v1.3.2-alpha.14) (2022-11-17)
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
### Bug Fixes
|
|
47
|
+
|
|
48
|
+
* debug ([d4767a7](https://github.com/agnostack/next-shopify/commit/d4767a7e8757a8f755b41aadb525fa14423f9f02))
|
|
49
|
+
|
|
50
|
+
## [1.3.2-alpha.13](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.12...v1.3.2-alpha.13) (2022-11-17)
|
|
51
|
+
|
|
52
|
+
|
|
53
|
+
### Bug Fixes
|
|
54
|
+
|
|
55
|
+
* debug ([ae1bbf6](https://github.com/agnostack/next-shopify/commit/ae1bbf68b809e5574328e6e315d49d1033d8f15f))
|
|
56
|
+
|
|
57
|
+
## [1.3.2-alpha.12](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.11...v1.3.2-alpha.12) (2022-11-17)
|
|
58
|
+
|
|
59
|
+
|
|
60
|
+
### Bug Fixes
|
|
61
|
+
|
|
62
|
+
* use rest with version ([b2f6320](https://github.com/agnostack/next-shopify/commit/b2f6320ef51d69554d5ae6193b878d656528da0d))
|
|
63
|
+
|
|
64
|
+
## [1.3.2-alpha.11](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.10...v1.3.2-alpha.11) (2022-11-17)
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
### Bug Fixes
|
|
68
|
+
|
|
69
|
+
* make it stop ([394182e](https://github.com/agnostack/next-shopify/commit/394182e9f9ebbd4826ac7a173b3fff0b18046cba))
|
|
70
|
+
|
|
71
|
+
## [1.3.2-alpha.10](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.9...v1.3.2-alpha.10) (2022-11-17)
|
|
72
|
+
|
|
73
|
+
|
|
74
|
+
### Bug Fixes
|
|
75
|
+
|
|
76
|
+
* the never ending debugging process ([09eb418](https://github.com/agnostack/next-shopify/commit/09eb418be5c10f644eb2c485aa6339e1c8c687a3))
|
|
77
|
+
|
|
78
|
+
## [1.3.2-alpha.9](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.8...v1.3.2-alpha.9) (2022-11-17)
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
### Bug Fixes
|
|
82
|
+
|
|
83
|
+
* query ([b7795ce](https://github.com/agnostack/next-shopify/commit/b7795ce72f54cd7ba608d852bb236f0e2aeffbb1))
|
|
84
|
+
|
|
85
|
+
## [1.3.2-alpha.8](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.7...v1.3.2-alpha.8) (2022-11-17)
|
|
86
|
+
|
|
87
|
+
|
|
88
|
+
### Bug Fixes
|
|
89
|
+
|
|
90
|
+
* debug ([cd9b4e6](https://github.com/agnostack/next-shopify/commit/cd9b4e6985a1fc86ab953b2441e19ba4ac4b6c99))
|
|
91
|
+
|
|
92
|
+
## [1.3.2-alpha.7](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.6...v1.3.2-alpha.7) (2022-11-16)
|
|
93
|
+
|
|
94
|
+
|
|
95
|
+
### Bug Fixes
|
|
96
|
+
|
|
97
|
+
* update shopify version ([c5fece0](https://github.com/agnostack/next-shopify/commit/c5fece029cd870ce1a502343a707c6c42b7051c4))
|
|
98
|
+
|
|
99
|
+
## [1.3.2-alpha.6](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.5...v1.3.2-alpha.6) (2022-11-16)
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
### Bug Fixes
|
|
103
|
+
|
|
104
|
+
* debug ([34899ff](https://github.com/agnostack/next-shopify/commit/34899ff59cc2d9826de31508051cfe9c9a6269f5))
|
|
105
|
+
|
|
106
|
+
## [1.3.2-alpha.5](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.4...v1.3.2-alpha.5) (2022-11-16)
|
|
107
|
+
|
|
108
|
+
|
|
109
|
+
### Bug Fixes
|
|
110
|
+
|
|
111
|
+
* debug ([f8e415f](https://github.com/agnostack/next-shopify/commit/f8e415f1cd34743b5e26603065addb87d1a3fa54))
|
|
112
|
+
|
|
113
|
+
## [1.3.2-alpha.4](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.3...v1.3.2-alpha.4) (2022-11-16)
|
|
114
|
+
|
|
115
|
+
|
|
116
|
+
### Bug Fixes
|
|
117
|
+
|
|
118
|
+
* debugging ([1f6b379](https://github.com/agnostack/next-shopify/commit/1f6b379204bda2616b32d08efedb1a87f2855c75))
|
|
119
|
+
|
|
120
|
+
## [1.3.2-alpha.3](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.2...v1.3.2-alpha.3) (2022-11-16)
|
|
121
|
+
|
|
122
|
+
|
|
123
|
+
### Bug Fixes
|
|
124
|
+
|
|
125
|
+
* refactor hasActivePayment ([7bb350e](https://github.com/agnostack/next-shopify/commit/7bb350e50a9f84aa84907c4fa8c6cba1e8dd2544))
|
|
126
|
+
|
|
1
127
|
## [1.3.2-alpha.2](https://github.com/agnostack/next-shopify/compare/v1.3.2-alpha.1...v1.3.2-alpha.2) (2022-11-16)
|
|
2
128
|
|
|
3
129
|
|
package/dist/apiHelpers.js
CHANGED
|
@@ -15,9 +15,11 @@ exports.uninstallHelper = exports.callbackHelper = exports.authHelper = exports.
|
|
|
15
15
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
16
16
|
const utils_1 = require("./utils");
|
|
17
17
|
const authenticationErrorHelper = ({ error, shop, serverRuntimeConfig }) => {
|
|
18
|
+
console.log(`>>> ~~~~~~~~~~~ AUTH ERROR HELPER ~~~~~~~~~~~`);
|
|
18
19
|
const { message, data } = error;
|
|
19
20
|
const { API_URLS } = serverRuntimeConfig;
|
|
20
21
|
const reauthorizationUrl = (data === null || data === void 0 ? void 0 : data.redirectUrl) || `${API_URLS[utils_1.API_ROUTE_NAMES.AUTH]}?shop=${shop}`;
|
|
22
|
+
console.log(`>>> ~ authenticationErrorHelper ~ reauthorizationUrl`, reauthorizationUrl);
|
|
21
23
|
return {
|
|
22
24
|
statusCode: 403,
|
|
23
25
|
message,
|
|
@@ -45,7 +47,8 @@ const restHelper = async ({ req, res, params: _params, serverRuntimeConfig }) =>
|
|
|
45
47
|
}
|
|
46
48
|
try {
|
|
47
49
|
const session = await utils_1.getVerifiedSession({ req, res, shop, serverRuntimeConfig });
|
|
48
|
-
const
|
|
50
|
+
const shopify = utils_1.getInitializedShopify(serverRuntimeConfig, shop, '2021-04');
|
|
51
|
+
const client = new shopify.Clients.Rest(shop, session === null || session === void 0 ? void 0 : session.accessToken);
|
|
49
52
|
const response = await client[method](Object.assign({ path,
|
|
50
53
|
query,
|
|
51
54
|
body, type: shopify_api_1.DataType.JSON }, params));
|
|
@@ -98,8 +101,8 @@ const graphHelper = async ({ req, res, params: _params, serverRuntimeConfig }) =
|
|
|
98
101
|
try {
|
|
99
102
|
const session = await utils_1.getVerifiedSession({ req, res, shop, serverRuntimeConfig });
|
|
100
103
|
const client = new shopify_api_1.Shopify.Clients.Graphql(shop, session === null || session === void 0 ? void 0 : session.accessToken);
|
|
101
|
-
const
|
|
102
|
-
|
|
104
|
+
const payload = Object.assign(Object.assign({ data }, query && { query }), params);
|
|
105
|
+
const response = await client.query(payload);
|
|
103
106
|
return {
|
|
104
107
|
statusCode: 200,
|
|
105
108
|
response,
|
|
@@ -139,13 +142,17 @@ const graphHelper = async ({ req, res, params: _params, serverRuntimeConfig }) =
|
|
|
139
142
|
};
|
|
140
143
|
exports.graphHelper = graphHelper;
|
|
141
144
|
const authHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
145
|
+
console.log(`>>> ~~~~~~~~~~~ AAAUTH HELPER ~~~~~~~~~~~`);
|
|
146
|
+
console.log(`>>> ~ authHelper ~ req.query`, req.query);
|
|
142
147
|
try {
|
|
148
|
+
const authredurectUrl = utils_1.getRedirectUrl(serverRuntimeConfig, {
|
|
149
|
+
req,
|
|
150
|
+
res,
|
|
151
|
+
});
|
|
152
|
+
console.log(`>>> ~ authHelper ~ authredurectUrl`, authredurectUrl);
|
|
143
153
|
return {
|
|
144
154
|
statusCode: 302,
|
|
145
|
-
redirectUrl:
|
|
146
|
-
req,
|
|
147
|
-
res,
|
|
148
|
-
}),
|
|
155
|
+
redirectUrl: authredurectUrl,
|
|
149
156
|
};
|
|
150
157
|
}
|
|
151
158
|
catch (error) {
|
|
@@ -160,9 +167,10 @@ const authHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
160
167
|
exports.authHelper = authHelper;
|
|
161
168
|
const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
162
169
|
var _a;
|
|
170
|
+
console.log(`>>> ~~~~~~~~~~~ CALLBACK HELPER ~~~~~~~~~~~`);
|
|
163
171
|
const { PAGE_PATHS, APP_WEBHOOKS, PAYMENT_CONFIG } = serverRuntimeConfig;
|
|
164
|
-
console.log(`>>> > callbackHelper > PAYMENT_CONFIG`, PAYMENT_CONFIG);
|
|
165
172
|
const { shop, host } = req.query;
|
|
173
|
+
console.log(`>>> ~ callbackHelper ~ req.query`, req.query);
|
|
166
174
|
if (!shop || !host) {
|
|
167
175
|
return {
|
|
168
176
|
statusCode: 303,
|
|
@@ -173,15 +181,21 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
173
181
|
try {
|
|
174
182
|
const shopify = utils_1.getInitializedShopify(serverRuntimeConfig, shop);
|
|
175
183
|
const session = await shopify.Auth.validateAuthCallback(req, res, req.query);
|
|
184
|
+
console.log(`>>> ~ callbackHelper ~ session`, session);
|
|
176
185
|
await utils_1.registerWebhooks(serverRuntimeConfig, APP_WEBHOOKS, session);
|
|
177
186
|
// TODO: explore objectToQuerystring
|
|
178
|
-
|
|
187
|
+
const embeddedURL = shopify_api_1.Shopify.Utils.getEmbeddedAppUrl(req);
|
|
188
|
+
console.log(`>>> ~ callbackHelper ~ embeddedURL`, embeddedURL);
|
|
189
|
+
redirectUrl = `${embeddedURL}?${new URLSearchParams(req.query).toString()}`;
|
|
190
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl1`, redirectUrl);
|
|
191
|
+
console.log(`>>> ~ callbackHelper ~ PAYMENT_CONFIG`, PAYMENT_CONFIG);
|
|
179
192
|
if (PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) {
|
|
180
193
|
const billingManager = new utils_1.BillingManager(session, serverRuntimeConfig);
|
|
181
194
|
const confirmationUrl = await billingManager.ensureBilling();
|
|
182
|
-
console.log(`>>>
|
|
195
|
+
console.log(`>>> ~ callbackHelper ~ confirmationUrl`, confirmationUrl);
|
|
183
196
|
if (utils_1.stringNotEmpty(confirmationUrl)) {
|
|
184
197
|
redirectUrl = confirmationUrl;
|
|
198
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl2`, redirectUrl);
|
|
185
199
|
}
|
|
186
200
|
}
|
|
187
201
|
}
|
|
@@ -194,30 +208,36 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
194
208
|
req,
|
|
195
209
|
res,
|
|
196
210
|
});
|
|
211
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl3`, redirectUrl);
|
|
197
212
|
break;
|
|
198
213
|
}
|
|
199
214
|
case error instanceof shopify_api_1.Shopify.Errors.BillingError: {
|
|
200
215
|
console.error(`${errorMessage}. BillingError ${error.message}`, error.errorData);
|
|
201
216
|
redirectUrl = '/error?code=billing_error';
|
|
217
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl4`, redirectUrl);
|
|
202
218
|
break;
|
|
203
219
|
}
|
|
204
220
|
case error instanceof shopify_api_1.Shopify.Errors.GraphqlQueryError: {
|
|
205
221
|
const errorMessages = utils_1.ensureArray((_a = error.response) === null || _a === void 0 ? void 0 : _a.errors).map(({ message }) => utils_1.ensureString(message));
|
|
206
222
|
console.error(`${errorMessage}. GraphqlQueryError ${errorMessages.join('. ')}`);
|
|
207
223
|
redirectUrl = '/error?code=query_error';
|
|
224
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl5`, redirectUrl);
|
|
208
225
|
break;
|
|
209
226
|
}
|
|
210
227
|
case error instanceof shopify_api_1.Shopify.Errors.InvalidOAuthError: {
|
|
211
228
|
console.error(`${errorMessage}. InvalidOAuthError`, error);
|
|
212
229
|
redirectUrl = '/error?code=oauth_error';
|
|
230
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl6`, redirectUrl);
|
|
213
231
|
break;
|
|
214
232
|
}
|
|
215
233
|
default: {
|
|
216
234
|
console.error(errorMessage, error);
|
|
217
235
|
redirectUrl = '/error?code=callback_error';
|
|
236
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl7`, redirectUrl);
|
|
218
237
|
}
|
|
219
238
|
}
|
|
220
239
|
}
|
|
240
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl FINAL`, redirectUrl);
|
|
221
241
|
return {
|
|
222
242
|
statusCode: 302,
|
|
223
243
|
redirectUrl,
|
package/dist/apiHelpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiHelpers.js","sourceRoot":"","sources":["../src/apiHelpers.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAAwD;AAExD,mCAegB;AAEhB,MAAM,yBAAyB,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,mBAAmB,EAAE,EAAE,EAAE;IACzE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,mBAAmB,CAAA;IACxC,MAAM,kBAAkB,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,KAAI,GAAG,QAAQ,CAAC,uBAAe,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"apiHelpers.js","sourceRoot":"","sources":["../src/apiHelpers.js"],"names":[],"mappings":"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"}
|
package/dist/protectRoute.js
CHANGED
|
@@ -4,39 +4,50 @@ exports.protectRoute = void 0;
|
|
|
4
4
|
const utils_1 = require("./utils");
|
|
5
5
|
const protectRoute = (props) => async ({ req, res, query, locale } = {}, data) => {
|
|
6
6
|
var _a, _b, _c, _d, _e, _f;
|
|
7
|
+
console.log(`>>> ~~~~~~~~~~~ PROTECTROUTE ~~~~~~~~~~~`);
|
|
7
8
|
const { PAGE_PATHS } = props;
|
|
8
9
|
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;
|
|
10
|
+
console.log(`>>> ~ protectRoute ~ req.query`, req.query);
|
|
9
11
|
const embedded = (_c = query === null || query === void 0 ? void 0 : query.embedded) !== null && _c !== void 0 ? _c : (_d = req.query) === null || _d === void 0 ? void 0 : _d.embedded;
|
|
12
|
+
console.log(`>>> ~ protectRoute ~ embedded`, embedded);
|
|
10
13
|
if (!shop) {
|
|
14
|
+
const noshopurl = `${PAGE_PATHS[utils_1.PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=protectRoute`;
|
|
15
|
+
console.log(`>>> ~ protectRoute ~ noshopurl`, noshopurl);
|
|
11
16
|
return {
|
|
12
17
|
redirect: {
|
|
13
|
-
destination:
|
|
18
|
+
destination: noshopurl,
|
|
14
19
|
permanent: false,
|
|
15
20
|
},
|
|
16
21
|
};
|
|
17
22
|
}
|
|
18
23
|
const shopify = utils_1.getInitializedShopify(props, shop);
|
|
19
24
|
const shopSessions = await ((_f = (_e = shopify.Context.SESSION_STORAGE) === null || _e === void 0 ? void 0 : _e.findSessionsByShop) === null || _f === void 0 ? void 0 : _f.call(_e, shop));
|
|
25
|
+
console.log(`>>> ~ protectRoute ~ shopSessions length`, utils_1.ensureArray(shopSessions).length);
|
|
20
26
|
if (utils_1.arrayEmpty(shopSessions)) {
|
|
27
|
+
const emptySessionUrl = utils_1.getRedirectUrl(props, {
|
|
28
|
+
req,
|
|
29
|
+
res,
|
|
30
|
+
query,
|
|
31
|
+
});
|
|
32
|
+
console.log(`>>> ~ protectRoute ~ emptySessionUrl`, emptySessionUrl);
|
|
21
33
|
return {
|
|
22
34
|
redirect: {
|
|
23
|
-
destination:
|
|
24
|
-
req,
|
|
25
|
-
res,
|
|
26
|
-
query,
|
|
27
|
-
}),
|
|
35
|
+
destination: emptySessionUrl,
|
|
28
36
|
permanent: false,
|
|
29
37
|
},
|
|
30
38
|
};
|
|
31
39
|
}
|
|
32
40
|
if (embedded !== '1') {
|
|
41
|
+
const embeddedappUrl = shopify.Utils.getEmbeddedAppUrl(req);
|
|
42
|
+
console.log(`>>> ~ protectRoute ~ embeddedappUrl`, embeddedappUrl);
|
|
33
43
|
return {
|
|
34
44
|
redirect: {
|
|
35
|
-
destination:
|
|
45
|
+
destination: embeddedappUrl,
|
|
36
46
|
permanent: false,
|
|
37
47
|
},
|
|
38
48
|
};
|
|
39
49
|
}
|
|
50
|
+
console.log(`>>> ~ protectRoute ~ PROCEED`);
|
|
40
51
|
return {
|
|
41
52
|
props: Object.assign({ locale }, data),
|
|
42
53
|
};
|
package/dist/protectRoute.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protectRoute.js","sourceRoot":"","sources":["../src/protectRoute.js"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"protectRoute.js","sourceRoot":"","sources":["../src/protectRoute.js"],"names":[],"mappings":";;;AAAA,mCAMgB;AAET,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE;;IACtF,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAA;IACvD,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAA;IAC5B,MAAM,IAAI,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,mCAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,IAAI,CAAA;IAC3C,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;IACxD,MAAM,QAAQ,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,mCAAI,MAAA,GAAG,CAAC,KAAK,0CAAE,QAAQ,CAAA;IACvD,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,QAAQ,CAAC,CAAA;IAEtD,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,SAAS,GAAG,GAAG,UAAU,CAAC,wBAAgB,CAAC,KAAK,CAAC,0CAA0C,CAAA;QACjG,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,SAAS,CAAC,CAAA;QACxD,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,SAAS;gBACtB,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;KACF;IAED,MAAM,OAAO,GAAG,6BAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IAClD,MAAM,YAAY,GAAG,MAAM,CAAA,MAAA,MAAA,OAAO,CAAC,OAAO,CAAC,eAAe,0CAAE,kBAAkB,mDAAG,IAAI,CAAC,CAAA,CAAA;IACtF,OAAO,CAAC,GAAG,CAAC,0CAA0C,EAAE,mBAAW,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAA;IAEzF,IAAI,kBAAU,CAAC,YAAY,CAAC,EAAE;QAC5B,MAAM,eAAe,GAAG,sBAAc,CAAC,KAAK,EAAE;YAC5C,GAAG;YACH,GAAG;YACH,KAAK;SACN,CAAC,CAAA;QAEF,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,eAAe,CAAC,CAAA;QAEpE,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,eAAe;gBAC5B,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;KACF;IAED,IAAI,QAAQ,KAAK,GAAG,EAAE;QACpB,MAAM,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAA;QAC3D,OAAO,CAAC,GAAG,CAAC,qCAAqC,EAAE,cAAc,CAAC,CAAA;QAElE,OAAO;YACL,QAAQ,EAAE;gBACR,WAAW,EAAE,cAAc;gBAC3B,SAAS,EAAE,KAAK;aACjB;SACF,CAAA;KACF;IAED,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;IAE3C,OAAO;QACL,KAAK,kBACH,MAAM,IACH,IAAI,CACR;KACF,CAAA;AACH,CAAC,CAAA;AA5DY,QAAA,YAAY,gBA4DxB"}
|
package/dist/utils/billing.js
CHANGED
|
@@ -16,7 +16,7 @@ const RECURRING_PURCHASES_QUERY = `
|
|
|
16
16
|
query appSubscription {
|
|
17
17
|
currentAppInstallation {
|
|
18
18
|
activeSubscriptions {
|
|
19
|
-
|
|
19
|
+
name, test
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -27,7 +27,7 @@ const ONE_TIME_PURCHASES_QUERY = `
|
|
|
27
27
|
oneTimePurchases(first: 250, sortKey: CREATED_AT, after: $endCursor) {
|
|
28
28
|
edges {
|
|
29
29
|
node {
|
|
30
|
-
|
|
30
|
+
name, test, status
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
pageInfo {
|
|
@@ -98,8 +98,11 @@ class BillingManager {
|
|
|
98
98
|
}
|
|
99
99
|
async ensureBilling() {
|
|
100
100
|
var _a;
|
|
101
|
+
console.log(`>>> ~~~~~~~~~~~ ENSURE BILLING ~~~~~~~~~~~`);
|
|
101
102
|
try {
|
|
102
|
-
|
|
103
|
+
const hasActive = await this.hasActivePayment();
|
|
104
|
+
console.log(`>>> ~ hasActivePayment`, hasActive);
|
|
105
|
+
if (hasActive) {
|
|
103
106
|
return undefined;
|
|
104
107
|
}
|
|
105
108
|
return this.requestPayment();
|
|
@@ -116,36 +119,40 @@ class BillingManager {
|
|
|
116
119
|
}
|
|
117
120
|
async hasActiveRecurringPayment(client) {
|
|
118
121
|
var _a, _b, _c;
|
|
122
|
+
console.log(`>>> ~~~~~~~~~~~ CHECK RECURRING PAYMENT ~~~~~~~~~~~`);
|
|
119
123
|
const currentInstallations = await client.query({
|
|
120
124
|
data: RECURRING_PURCHASES_QUERY,
|
|
121
125
|
});
|
|
122
126
|
const subscriptions = (_c = (_b = (_a = currentInstallations === null || currentInstallations === void 0 ? void 0 : currentInstallations.body) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.currentAppInstallation) === null || _c === void 0 ? void 0 : _c.activeSubscriptions;
|
|
127
|
+
console.log(`>>> ~ hasActiveRecurringPayment ~ subscriptions length`, display_1.ensureArray(subscriptions).length);
|
|
123
128
|
const matchingSubscription = display_1.ensureArray(subscriptions).find((sub) => {
|
|
124
|
-
console.log(`>>> ~ sub`, sub);
|
|
125
129
|
const { name: chargeName, test: chargeTest } = sub;
|
|
126
130
|
return ((chargeName === this.paymentConfig.name)
|
|
127
|
-
&& (display_1.isTrue(chargeTest) ===
|
|
131
|
+
&& (display_1.isTrue(chargeTest) === this.paymentConfig.test));
|
|
128
132
|
});
|
|
133
|
+
console.log(`>>> ~ hasActiveRecurringPayment ~ matchingSubscription`, matchingSubscription);
|
|
129
134
|
return display_1.objectNotEmpty(matchingSubscription);
|
|
130
135
|
}
|
|
131
136
|
async hasActiveOneTimePayment(client, endCursor = null) {
|
|
132
137
|
var _a, _b, _c, _d, _e;
|
|
133
|
-
|
|
138
|
+
console.log(`>>> ~~~~~~~~~~~ CHECK ONE TIME PAYMENT ~~~~~~~~~~~`);
|
|
139
|
+
const payload = {
|
|
134
140
|
data: {
|
|
135
141
|
query: ONE_TIME_PURCHASES_QUERY,
|
|
136
142
|
variables: { endCursor },
|
|
137
143
|
},
|
|
138
|
-
}
|
|
144
|
+
};
|
|
145
|
+
const currentInstallations = await client.query(payload);
|
|
139
146
|
const purchases = (_c = (_b = (_a = currentInstallations === null || currentInstallations === void 0 ? void 0 : currentInstallations.body) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.currentAppInstallation) === null || _c === void 0 ? void 0 : _c.oneTimePurchases;
|
|
140
|
-
|
|
147
|
+
console.log(`>>> ~ hasActiveOneTimePayment ~ subscriptions length`, display_1.ensureArray(purchases).length);
|
|
148
|
+
const matchingPurchase = display_1.ensureArray(purchases === null || purchases === void 0 ? void 0 : purchases.edges).find((pur) => {
|
|
141
149
|
const { node } = pur;
|
|
142
|
-
console.log(`>>> ~ node`, node);
|
|
143
150
|
return (((node === null || node === void 0 ? void 0 : node.name) === this.paymentConfig.name)
|
|
144
151
|
&& ((node === null || node === void 0 ? void 0 : node.status) === 'ACTIVE')
|
|
145
|
-
&& (display_1.isTrue(node === null || node === void 0 ? void 0 : node.test) ===
|
|
152
|
+
&& (display_1.isTrue(node === null || node === void 0 ? void 0 : node.test) === this.paymentConfig.test));
|
|
146
153
|
});
|
|
147
|
-
console.log(`>>> ~
|
|
148
|
-
if (display_1.objectNotEmpty(
|
|
154
|
+
console.log(`>>> ~ hasActiveOneTimePayment ~ matchingPurchase`, matchingPurchase);
|
|
155
|
+
if (display_1.objectNotEmpty(matchingPurchase)) {
|
|
149
156
|
return true;
|
|
150
157
|
}
|
|
151
158
|
if ((_d = purchases === null || purchases === void 0 ? void 0 : purchases.pageInfo) === null || _d === void 0 ? void 0 : _d.hasNextPage) {
|
|
@@ -154,46 +161,15 @@ class BillingManager {
|
|
|
154
161
|
return false;
|
|
155
162
|
}
|
|
156
163
|
async hasActivePayment() {
|
|
164
|
+
console.log(`>>> ~~~~~~~~~~~ ENSURE BILLING ~~~~~~~~~~~`);
|
|
157
165
|
const client = new shopify_api_1.Shopify.Clients.Graphql(this.shop, this.accessToken);
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
: this.hasActiveOneTimePayment(client);
|
|
161
|
-
}
|
|
162
|
-
/*
|
|
163
|
-
// TODO ensure this logic works for recurring payments
|
|
164
|
-
async hasActivePayment () {
|
|
165
|
-
const client = new Shopify.Clients.Rest(this.shop, this.accessToken)
|
|
166
|
-
|
|
167
|
-
// TODO: move this to match scaffold (/ensure we check !test)
|
|
168
|
-
const { body: { application_charges } = {} } = ensureObject(await client.get({
|
|
169
|
-
path: 'application_charges',
|
|
170
|
-
type: DataType.JSON,
|
|
171
|
-
}))
|
|
172
|
-
|
|
173
|
-
console.log(`>>> > BillingManager > existingCharge > this.appId`, this.appId)
|
|
174
|
-
console.log(`>>> > BillingManager > hasActivePayment > ensureArray(application_charges).length`, ensureArray(application_charges).length)
|
|
175
|
-
|
|
176
|
-
const existingCharge = ensureArray(application_charges).reduce((_existingCharge, charge) => {
|
|
177
|
-
const { api_client_id, status: chargeStatus } = ensureObject(charge)
|
|
178
|
-
const isMatching = (stringNotEmpty(api_client_id) && (ensureString(api_client_id) === this.appId))
|
|
179
|
-
console.log(`>>> > BillingManager > existingCharge > ${api_client_id}`, chargeStatus)
|
|
180
|
-
|
|
181
|
-
if (_existingCharge.status === 'active') {
|
|
182
|
-
return _existingCharge
|
|
183
|
-
}
|
|
184
|
-
|
|
185
|
-
if (isMatching && ['active', 'pending'].includes(chargeStatus)) {
|
|
186
|
-
return charge
|
|
166
|
+
if (this.isRecurring) {
|
|
167
|
+
return this.hasActiveRecurringPayment(client);
|
|
187
168
|
}
|
|
188
|
-
|
|
189
|
-
return _existingCharge
|
|
190
|
-
}, {})
|
|
191
|
-
console.log(`>>> > BillingManager > hasActivePayment > existingCharge`, existingCharge)
|
|
192
|
-
|
|
193
|
-
return objectNotEmpty(existingCharge)
|
|
169
|
+
return this.hasActiveOneTimePayment(client);
|
|
194
170
|
}
|
|
195
|
-
*/
|
|
196
171
|
async requestPayment() {
|
|
172
|
+
console.log(`>>> ~~~~~~~~~~~ REQUEST PAYMENT ~~~~~~~~~~~`);
|
|
197
173
|
const client = new shopify_api_1.Shopify.Clients.Graphql(this.shop, this.accessToken);
|
|
198
174
|
// TODO: explore objectToQuerystring
|
|
199
175
|
const queryParams = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../src/utils/billing.js"],"names":[],"mappings":";;;AAAA,sDAA8C,CAAC,WAAW;AAE1D,uCAUkB;AAGL,QAAA,iBAAiB,GAAG;IAC/B,QAAQ,EAAE,UAAU;IACpB,aAAa,EAAE,eAAe;IAC9B,MAAM,EAAE,QAAQ;CACjB,CAAA;AAED,MAAM,mBAAmB,GAAG;IAC1B,yBAAiB,CAAC,aAAa;IAC/B,yBAAiB,CAAC,MAAM;CACzB,CAAA;AAED,MAAM,yBAAyB,GAAG;;;;;;;;CAQjC,CAAA;AAED,MAAM,wBAAwB,GAAG;;;;;;;;;;;;;;;CAehC,CAAA;AAED,MAAM,2BAA2B,GAAG;;;;;;;;;;;;;;;;;;;;CAoBnC,CAAA;AAED,MAAM,0BAA0B,GAAG;;;;;;;;;;;;;;;;;;;;CAoBlC,CAAA;AAED,MAAa,cAAc;IACzB,YAAY,OAAO,EAAE,mBAAmB;QACtC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,mBAAmB,CAAA;QAEpE,IACE,qBAAW,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC;YAC1B,qBAAW,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAC;YACjC,CAAC,MAAM,CAAC,MAAM,CAAC,yBAAiB,CAAC,CAAC,QAAQ,CAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,CAAC,EAChE;YACA,MAAM,IAAI,qBAAO,CAAC,MAAM,CAAC,YAAY,CAAC;gBACpC,OAAO,EAAE,+BAA+B;aACzC,CAAC,CAAA;SACH;QAED,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;QACxB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAA;QACtC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAA;QACnB,IAAI,CAAC,UAAU,GAAG,YAAY,CAAA;QAC9B,IAAI,CAAC,aAAa,GAAG,sBAAY,CAAC,cAAc,CAAC,CAAA;QACjD,IAAI,CAAC,WAAW,GAAG,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;IAC1E,CAAC;IAED,KAAK,CAAC,aAAa;;QACjB,IAAI;YACF,
|
|
1
|
+
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../src/utils/billing.js"],"names":[],"mappings":"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"}
|
package/dist/utils/shopify.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ export namespace API_ROUTE_NAMES {
|
|
|
8
8
|
const AUTH_CALLBACK: string;
|
|
9
9
|
const APP_UNINSTALLED: string;
|
|
10
10
|
}
|
|
11
|
-
export function getInitializedShopify(serverRuntimeConfig: any, _shop: any): {
|
|
11
|
+
export function getInitializedShopify(serverRuntimeConfig: any, _shop: any, version: any): {
|
|
12
12
|
Context: import("@shopify/shopify-api/dist/context").ContextInterface;
|
|
13
13
|
Auth: {
|
|
14
14
|
SESSION_COOKIE_NAME: string;
|
package/dist/utils/shopify.js
CHANGED
|
@@ -26,7 +26,7 @@ const TEST_GRAPHQL_QUERY = `
|
|
|
26
26
|
}
|
|
27
27
|
}`;
|
|
28
28
|
// TODO!!!!: explore moving into FirebaseSessionHandler.getInstance and/or another singleton here??
|
|
29
|
-
const getInitializedShopify = (serverRuntimeConfig, _shop) => {
|
|
29
|
+
const getInitializedShopify = (serverRuntimeConfig, _shop, version) => {
|
|
30
30
|
const { FB_CONFIG, FB_ROOT_COLLECTION, APP_ID, APP_CONFIG } = serverRuntimeConfig;
|
|
31
31
|
const shop = shopify_api_1.Shopify.Utils.sanitizeShop(_shop);
|
|
32
32
|
const sessionHandler = firebase_1.FirebaseSessionHandler.getInstance(FB_CONFIG, {
|
|
@@ -34,7 +34,9 @@ const getInitializedShopify = (serverRuntimeConfig, _shop) => {
|
|
|
34
34
|
app: APP_ID,
|
|
35
35
|
collection: FB_ROOT_COLLECTION,
|
|
36
36
|
});
|
|
37
|
-
shopify_api_1.Shopify.Context.initialize(Object.assign(Object.assign({}, APP_CONFIG),
|
|
37
|
+
shopify_api_1.Shopify.Context.initialize(Object.assign(Object.assign(Object.assign({}, APP_CONFIG), (display_1.stringNotEmpty(version)) && {
|
|
38
|
+
API_VERSION: version,
|
|
39
|
+
}), { SESSION_STORAGE: new shopify_api_1.Shopify.Session.CustomSessionStorage((session) => firebase_1.storeCallback(session, sessionHandler), (id) => firebase_1.loadCallback(id, sessionHandler), (id) => firebase_1.deleteSessionsCallback(id, sessionHandler), (ids) => firebase_1.deleteSessionsCallback(ids, sessionHandler), (__shop) => firebase_1.findSessionsByShop(shopify_api_1.Shopify.Utils.sanitizeShop(__shop), sessionHandler)) }));
|
|
38
40
|
return shopify_api_1.Shopify;
|
|
39
41
|
};
|
|
40
42
|
exports.getInitializedShopify = getInitializedShopify;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAC7B,sDAA8C;AAE9C,qCAAqD;AACrD,uCAMkB;AAClB,yCAMmB;AACnB,uCAA6D;AAEhD,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;AAEF,mGAAmG;AAC5F,MAAM,qBAAqB,GAAG,CAAC,mBAAmB,EAAE,KAAK,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":"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"}
|
package/dist/withShopify.js
CHANGED
|
@@ -13,6 +13,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.withShopify = void 0;
|
|
15
15
|
const constants_1 = require("next/constants");
|
|
16
|
+
const shopify_api_1 = require("@shopify/shopify-api");
|
|
16
17
|
const next_plugins_1 = require("@agnostack/next-plugins");
|
|
17
18
|
const utils_1 = require("./utils");
|
|
18
19
|
// TODO!!!!!!: add middleware export for headers???
|
|
@@ -24,7 +25,7 @@ const withShopify = async (nextPhase, _a) => {
|
|
|
24
25
|
defaultConfig } = _c, // NOTE: This is here in case we need anything from it
|
|
25
26
|
pluginConfig = __rest(_c, ["defaultConfig"]);
|
|
26
27
|
const basePath = utils_1.ensureString(_basePath);
|
|
27
|
-
const { data, interactive, paymentConfig, firebaseConfig, pageRoutes: { [utils_1.PAGE_ROUTE_NAMES.EXIT]: _pageRouteExit = '/exit', [utils_1.PAGE_ROUTE_NAMES.ERROR]: _pageRouteError = '/error', } = {}, apiRoutes: { [utils_1.API_ROUTE_NAMES.AUTH]: _apiRouteAuth = '/api/auth', [utils_1.API_ROUTE_NAMES.AUTH_CALLBACK]: _apiRouteAuthCallback = '/api/auth/callback', [utils_1.API_ROUTE_NAMES.APP_UNINSTALLED]: _apiRouteAppUninstalled = '/api/webhooks/app/uninstalled', } = {}, params: { APP_ID, URL: netlifyUrl, NEXT_PUBLIC_APP_BASE_URL, NEXT_PUBLIC_APP_ROUTE_PAGE_EXIT: _pageRouteParamExit, NEXT_PUBLIC_APP_ROUTE_PAGE_ERROR: _pageRouteParamError, NEXT_PUBLIC_APP_ROUTE_API_AUTH: _apiRouteParamAuth, NEXT_PUBLIC_APP_ROUTE_API_AUTH_CALLBACK: _apiRouteParamAuthCallback, NEXT_PUBLIC_APP_ROUTE_API_UNINSTALLED: _apiRouteParamAppUninstalled, NEXT_PUBLIC_SHOPIFY_API_KEY: SHOPIFY_API_PUBLIC_KEY, NEXT_PUBLIC_FB_ROOT_COLLECTION: FB_ROOT_COLLECTION, SHOPIFY_API_KEY, SHOPIFY_API_SCOPES, SHOPIFY_API_VERSION =
|
|
28
|
+
const { data, interactive, paymentConfig, firebaseConfig, pageRoutes: { [utils_1.PAGE_ROUTE_NAMES.EXIT]: _pageRouteExit = '/exit', [utils_1.PAGE_ROUTE_NAMES.ERROR]: _pageRouteError = '/error', } = {}, apiRoutes: { [utils_1.API_ROUTE_NAMES.AUTH]: _apiRouteAuth = '/api/auth', [utils_1.API_ROUTE_NAMES.AUTH_CALLBACK]: _apiRouteAuthCallback = '/api/auth/callback', [utils_1.API_ROUTE_NAMES.APP_UNINSTALLED]: _apiRouteAppUninstalled = '/api/webhooks/app/uninstalled', } = {}, params: { APP_ID, URL: netlifyUrl, NEXT_PUBLIC_APP_BASE_URL, NEXT_PUBLIC_APP_ROUTE_PAGE_EXIT: _pageRouteParamExit, NEXT_PUBLIC_APP_ROUTE_PAGE_ERROR: _pageRouteParamError, NEXT_PUBLIC_APP_ROUTE_API_AUTH: _apiRouteParamAuth, NEXT_PUBLIC_APP_ROUTE_API_AUTH_CALLBACK: _apiRouteParamAuthCallback, NEXT_PUBLIC_APP_ROUTE_API_UNINSTALLED: _apiRouteParamAppUninstalled, NEXT_PUBLIC_SHOPIFY_API_KEY: SHOPIFY_API_PUBLIC_KEY, NEXT_PUBLIC_FB_ROOT_COLLECTION: FB_ROOT_COLLECTION, SHOPIFY_API_KEY, SHOPIFY_API_SCOPES, SHOPIFY_API_VERSION = shopify_api_1.LATEST_API_VERSION, } = {}, } = pluginConfig !== null && pluginConfig !== void 0 ? pluginConfig : {};
|
|
28
29
|
const appBaseUrl = NEXT_PUBLIC_APP_BASE_URL || netlifyUrl;
|
|
29
30
|
const APP_BASE_URL = `${appBaseUrl}${basePath}`;
|
|
30
31
|
const appUrl = new URL(appBaseUrl);
|
|
@@ -92,8 +93,32 @@ const withShopify = async (nextPhase, _a) => {
|
|
|
92
93
|
// TODO handle cases where we have non-embedded apps
|
|
93
94
|
const headers = async () => ([
|
|
94
95
|
..._headers ? await _headers() : [],
|
|
96
|
+
// {
|
|
97
|
+
// source: '/(.*?)',
|
|
98
|
+
// headers: [
|
|
99
|
+
// {
|
|
100
|
+
// key: 'Content-Security-Policy',
|
|
101
|
+
// value: `frame-ancestors 'none';`,
|
|
102
|
+
// }
|
|
103
|
+
// ],
|
|
104
|
+
// },
|
|
105
|
+
// {
|
|
106
|
+
// source: '/(.*?)',
|
|
107
|
+
// has: [
|
|
108
|
+
// {
|
|
109
|
+
// type: 'query',
|
|
110
|
+
// key: 'shop',
|
|
111
|
+
// }
|
|
112
|
+
// ],
|
|
113
|
+
// headers: [
|
|
114
|
+
// {
|
|
115
|
+
// key: 'Content-Security-Policy',
|
|
116
|
+
// value: 'frame-ancestors self https://admin.shopify.com https://:shop;',
|
|
117
|
+
// }
|
|
118
|
+
// ],
|
|
119
|
+
// },
|
|
95
120
|
{
|
|
96
|
-
source: '/
|
|
121
|
+
source: '/exit*',
|
|
97
122
|
headers: [
|
|
98
123
|
{
|
|
99
124
|
key: 'Content-Security-Policy',
|
|
@@ -102,7 +127,7 @@ const withShopify = async (nextPhase, _a) => {
|
|
|
102
127
|
],
|
|
103
128
|
},
|
|
104
129
|
{
|
|
105
|
-
source: '/
|
|
130
|
+
source: '/exit*',
|
|
106
131
|
has: [
|
|
107
132
|
{
|
|
108
133
|
type: 'query',
|
package/dist/withShopify.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withShopify.js","sourceRoot":"","sources":["../src/withShopify.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,8CAA6C;
|
|
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.3.2-alpha.
|
|
3
|
+
"version": "1.3.2-alpha.20",
|
|
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",
|