@agnostack/next-shopify 1.3.2-alpha.12 → 1.3.2-alpha.14
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 +14 -0
- package/dist/apiHelpers.js +25 -5
- 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 +12 -35
- package/dist/utils/billing.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## [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)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* debug ([d4767a7](https://github.com/agnostack/next-shopify/commit/d4767a7e8757a8f755b41aadb525fa14423f9f02))
|
|
7
|
+
|
|
8
|
+
## [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)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* debug ([ae1bbf6](https://github.com/agnostack/next-shopify/commit/ae1bbf68b809e5574328e6e315d49d1033d8f15f))
|
|
14
|
+
|
|
1
15
|
## [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)
|
|
2
16
|
|
|
3
17
|
|
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,
|
|
@@ -140,13 +142,16 @@ const graphHelper = async ({ req, res, params: _params, serverRuntimeConfig }) =
|
|
|
140
142
|
};
|
|
141
143
|
exports.graphHelper = graphHelper;
|
|
142
144
|
const authHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
145
|
+
console.log(`>>> ~~~~~~~~~~~ AUTH HELPER ~~~~~~~~~~~`);
|
|
143
146
|
try {
|
|
147
|
+
const authredurectUrl = utils_1.getRedirectUrl(serverRuntimeConfig, {
|
|
148
|
+
req,
|
|
149
|
+
res,
|
|
150
|
+
});
|
|
151
|
+
console.log(`>>> ~ authHelper ~ authredurectUrl`, authredurectUrl);
|
|
144
152
|
return {
|
|
145
153
|
statusCode: 302,
|
|
146
|
-
redirectUrl:
|
|
147
|
-
req,
|
|
148
|
-
res,
|
|
149
|
-
}),
|
|
154
|
+
redirectUrl: authredurectUrl,
|
|
150
155
|
};
|
|
151
156
|
}
|
|
152
157
|
catch (error) {
|
|
@@ -161,8 +166,10 @@ const authHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
161
166
|
exports.authHelper = authHelper;
|
|
162
167
|
const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
163
168
|
var _a;
|
|
169
|
+
console.log(`>>> ~~~~~~~~~~~ CALLBACK HELPER ~~~~~~~~~~~`);
|
|
164
170
|
const { PAGE_PATHS, APP_WEBHOOKS, PAYMENT_CONFIG } = serverRuntimeConfig;
|
|
165
171
|
const { shop, host } = req.query;
|
|
172
|
+
console.log(`>>> ~ callbackHelper ~ req.query`, req.query);
|
|
166
173
|
if (!shop || !host) {
|
|
167
174
|
return {
|
|
168
175
|
statusCode: 303,
|
|
@@ -173,14 +180,21 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
173
180
|
try {
|
|
174
181
|
const shopify = utils_1.getInitializedShopify(serverRuntimeConfig, shop);
|
|
175
182
|
const session = await shopify.Auth.validateAuthCallback(req, res, req.query);
|
|
183
|
+
console.log(`>>> ~ callbackHelper ~ session`, session);
|
|
176
184
|
await utils_1.registerWebhooks(serverRuntimeConfig, APP_WEBHOOKS, session);
|
|
177
185
|
// TODO: explore objectToQuerystring
|
|
178
|
-
|
|
186
|
+
const embeddedURL = shopify_api_1.Shopify.Utils.getEmbeddedAppUrl(req);
|
|
187
|
+
console.log(`>>> ~ callbackHelper ~ embeddedURL`, embeddedURL);
|
|
188
|
+
redirectUrl = `${embeddedURL}?${new URLSearchParams(req.query).toString()}`;
|
|
189
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl1`, redirectUrl);
|
|
190
|
+
console.log(`>>> ~ callbackHelper ~ PAYMENT_CONFIG`, PAYMENT_CONFIG);
|
|
179
191
|
if (PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) {
|
|
180
192
|
const billingManager = new utils_1.BillingManager(session, serverRuntimeConfig);
|
|
181
193
|
const confirmationUrl = await billingManager.ensureBilling();
|
|
194
|
+
console.log(`>>> ~ callbackHelper ~ confirmationUrl`, confirmationUrl);
|
|
182
195
|
if (utils_1.stringNotEmpty(confirmationUrl)) {
|
|
183
196
|
redirectUrl = confirmationUrl;
|
|
197
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl2`, redirectUrl);
|
|
184
198
|
}
|
|
185
199
|
}
|
|
186
200
|
}
|
|
@@ -193,30 +207,36 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
193
207
|
req,
|
|
194
208
|
res,
|
|
195
209
|
});
|
|
210
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl3`, redirectUrl);
|
|
196
211
|
break;
|
|
197
212
|
}
|
|
198
213
|
case error instanceof shopify_api_1.Shopify.Errors.BillingError: {
|
|
199
214
|
console.error(`${errorMessage}. BillingError ${error.message}`, error.errorData);
|
|
200
215
|
redirectUrl = '/error?code=billing_error';
|
|
216
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl4`, redirectUrl);
|
|
201
217
|
break;
|
|
202
218
|
}
|
|
203
219
|
case error instanceof shopify_api_1.Shopify.Errors.GraphqlQueryError: {
|
|
204
220
|
const errorMessages = utils_1.ensureArray((_a = error.response) === null || _a === void 0 ? void 0 : _a.errors).map(({ message }) => utils_1.ensureString(message));
|
|
205
221
|
console.error(`${errorMessage}. GraphqlQueryError ${errorMessages.join('. ')}`);
|
|
206
222
|
redirectUrl = '/error?code=query_error';
|
|
223
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl5`, redirectUrl);
|
|
207
224
|
break;
|
|
208
225
|
}
|
|
209
226
|
case error instanceof shopify_api_1.Shopify.Errors.InvalidOAuthError: {
|
|
210
227
|
console.error(`${errorMessage}. InvalidOAuthError`, error);
|
|
211
228
|
redirectUrl = '/error?code=oauth_error';
|
|
229
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl6`, redirectUrl);
|
|
212
230
|
break;
|
|
213
231
|
}
|
|
214
232
|
default: {
|
|
215
233
|
console.error(errorMessage, error);
|
|
216
234
|
redirectUrl = '/error?code=callback_error';
|
|
235
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl7`, redirectUrl);
|
|
217
236
|
}
|
|
218
237
|
}
|
|
219
238
|
}
|
|
239
|
+
console.log(`>>> ~ callbackHelper ~ redirectUrl FINAL`, redirectUrl);
|
|
220
240
|
return {
|
|
221
241
|
statusCode: 302,
|
|
222
242
|
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
|
@@ -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,19 +119,23 @@ 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
129
|
const { name: chargeName, test: chargeTest } = sub;
|
|
125
130
|
return ((chargeName === this.paymentConfig.name)
|
|
126
131
|
&& (display_1.isTrue(chargeTest) === this.paymentConfig.test));
|
|
127
132
|
});
|
|
133
|
+
console.log(`>>> ~ hasActiveRecurringPayment ~ matchingSubscription`, matchingSubscription);
|
|
128
134
|
return display_1.objectNotEmpty(matchingSubscription);
|
|
129
135
|
}
|
|
130
136
|
async hasActiveOneTimePayment(client, endCursor = null) {
|
|
131
137
|
var _a, _b, _c, _d, _e;
|
|
138
|
+
console.log(`>>> ~~~~~~~~~~~ CHECK ONE TIME PAYMENT ~~~~~~~~~~~`);
|
|
132
139
|
const payload = {
|
|
133
140
|
data: {
|
|
134
141
|
query: ONE_TIME_PURCHASES_QUERY,
|
|
@@ -137,12 +144,14 @@ class BillingManager {
|
|
|
137
144
|
};
|
|
138
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;
|
|
147
|
+
console.log(`>>> ~ hasActiveOneTimePayment ~ subscriptions length`, display_1.ensureArray(purchases).length);
|
|
140
148
|
const matchingPurchase = display_1.ensureArray(purchases === null || purchases === void 0 ? void 0 : purchases.edges).find((pur) => {
|
|
141
149
|
const { node } = pur;
|
|
142
150
|
return (((node === null || node === void 0 ? void 0 : node.name) === this.paymentConfig.name)
|
|
143
151
|
&& ((node === null || node === void 0 ? void 0 : node.status) === 'ACTIVE')
|
|
144
152
|
&& (display_1.isTrue(node === null || node === void 0 ? void 0 : node.test) === this.paymentConfig.test));
|
|
145
153
|
});
|
|
154
|
+
console.log(`>>> ~ hasActiveOneTimePayment ~ matchingPurchase`, matchingPurchase);
|
|
146
155
|
if (display_1.objectNotEmpty(matchingPurchase)) {
|
|
147
156
|
return true;
|
|
148
157
|
}
|
|
@@ -152,47 +161,15 @@ class BillingManager {
|
|
|
152
161
|
return false;
|
|
153
162
|
}
|
|
154
163
|
async hasActivePayment() {
|
|
164
|
+
console.log(`>>> ~~~~~~~~~~~ ENSURE BILLING ~~~~~~~~~~~`);
|
|
155
165
|
const client = new shopify_api_1.Shopify.Clients.Graphql(this.shop, this.accessToken);
|
|
156
166
|
if (this.isRecurring) {
|
|
157
167
|
return this.hasActiveRecurringPayment(client);
|
|
158
168
|
}
|
|
159
169
|
return this.hasActiveOneTimePayment(client);
|
|
160
170
|
}
|
|
161
|
-
/*
|
|
162
|
-
// TODO ensure this logic works for recurring payments
|
|
163
|
-
async hasActivePayment () {
|
|
164
|
-
const client = new Shopify.Clients.Rest(this.shop, this.accessToken)
|
|
165
|
-
|
|
166
|
-
// TODO: move this to match scaffold (/ensure we check !test)
|
|
167
|
-
const { body: { application_charges } = {} } = ensureObject(await client.get({
|
|
168
|
-
path: 'application_charges',
|
|
169
|
-
type: DataType.JSON,
|
|
170
|
-
}))
|
|
171
|
-
|
|
172
|
-
console.log(`>>> > BillingManager > existingCharge > this.appId`, this.appId)
|
|
173
|
-
console.log(`>>> > BillingManager > hasActivePayment > ensureArray(application_charges).length`, ensureArray(application_charges).length)
|
|
174
|
-
|
|
175
|
-
const existingCharge = ensureArray(application_charges).reduce((_existingCharge, charge) => {
|
|
176
|
-
const { api_client_id, status: chargeStatus } = ensureObject(charge)
|
|
177
|
-
const isMatching = (stringNotEmpty(api_client_id) && (ensureString(api_client_id) === this.appId))
|
|
178
|
-
console.log(`>>> > BillingManager > existingCharge > ${api_client_id}`, chargeStatus)
|
|
179
|
-
|
|
180
|
-
if (_existingCharge.status === 'active') {
|
|
181
|
-
return _existingCharge
|
|
182
|
-
}
|
|
183
|
-
|
|
184
|
-
if (isMatching && ['active', 'pending'].includes(chargeStatus)) {
|
|
185
|
-
return charge
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
return _existingCharge
|
|
189
|
-
}, {})
|
|
190
|
-
console.log(`>>> > BillingManager > hasActivePayment > existingCharge`, existingCharge)
|
|
191
|
-
|
|
192
|
-
return objectNotEmpty(existingCharge)
|
|
193
|
-
}
|
|
194
|
-
*/
|
|
195
171
|
async requestPayment() {
|
|
172
|
+
console.log(`>>> ~~~~~~~~~~~ REQUEST PAYMENT ~~~~~~~~~~~`);
|
|
196
173
|
const client = new shopify_api_1.Shopify.Clients.Graphql(this.shop, this.accessToken);
|
|
197
174
|
// TODO: explore objectToQuerystring
|
|
198
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/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.14",
|
|
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",
|