@agnostack/next-shopify 1.1.1-alpha.17 → 1.1.1-alpha.19
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 +4 -4
- package/dist/apiHelpers.js.map +1 -1
- package/dist/utils/billing.d.ts +2 -2
- package/dist/utils/billing.js +20 -11
- package/dist/utils/billing.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## [1.1.1-alpha.19](https://github.com/agnostack/next-shopify/compare/v1.1.1-alpha.18...v1.1.1-alpha.19) (2022-11-10)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* modify rest payload ([eabae19](https://github.com/agnostack/next-shopify/commit/eabae194ad5f9864b84872ee65f0213134123d87))
|
|
7
|
+
|
|
8
|
+
## [1.1.1-alpha.18](https://github.com/agnostack/next-shopify/compare/v1.1.1-alpha.17...v1.1.1-alpha.18) (2022-11-10)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* optimization ([12636d0](https://github.com/agnostack/next-shopify/commit/12636d0e3e007c80ec2e6c10ebcf368ea7fd408f))
|
|
14
|
+
|
|
1
15
|
## [1.1.1-alpha.17](https://github.com/agnostack/next-shopify/compare/v1.1.1-alpha.16...v1.1.1-alpha.17) (2022-11-10)
|
|
2
16
|
|
|
3
17
|
|
package/dist/apiHelpers.js
CHANGED
|
@@ -178,10 +178,11 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
178
178
|
try {
|
|
179
179
|
const session = await shopify.Auth.validateAuthCallback(req, res, req.query);
|
|
180
180
|
await utils_1.registerWebhooks(serverRuntimeConfig, APP_WEBHOOKS, session);
|
|
181
|
-
|
|
181
|
+
// TODO: explore objectToQuerystring
|
|
182
|
+
let redirectUrl = `${shopify.Utils.getEmbeddedAppUrl(req)}?${new URLSearchParams(req.query).toString()}`;
|
|
182
183
|
// TODO check for billing redirect
|
|
183
184
|
console.log(`>>> ~ PAYMENT_CONFIG`, PAYMENT_CONFIG);
|
|
184
|
-
if (
|
|
185
|
+
if (PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) {
|
|
185
186
|
const billingManager = new utils_1.BillingManager(shopify, {
|
|
186
187
|
session,
|
|
187
188
|
payment: PAYMENT_CONFIG,
|
|
@@ -195,8 +196,7 @@ const callbackHelper = async ({ req, res, serverRuntimeConfig }) => {
|
|
|
195
196
|
}
|
|
196
197
|
return {
|
|
197
198
|
statusCode: 302,
|
|
198
|
-
|
|
199
|
-
redirectUrl: `${redirectUrl}?${new URLSearchParams(req.query).toString()}`,
|
|
199
|
+
redirectUrl,
|
|
200
200
|
};
|
|
201
201
|
}
|
|
202
202
|
catch (error) {
|
package/dist/apiHelpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiHelpers.js","sourceRoot":"","sources":["../src/apiHelpers.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAA+C;AAE/C,
|
|
1
|
+
{"version":3,"file":"apiHelpers.js","sourceRoot":"","sources":["../src/apiHelpers.js"],"names":[],"mappings":"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"}
|
package/dist/utils/billing.d.ts
CHANGED
|
@@ -19,11 +19,11 @@ export class BillingManager {
|
|
|
19
19
|
shopify: any;
|
|
20
20
|
shop: any;
|
|
21
21
|
accessToken: any;
|
|
22
|
+
appName: any;
|
|
23
|
+
price: any;
|
|
22
24
|
testMode: any;
|
|
23
25
|
billingType: any;
|
|
24
26
|
isRecurring: boolean;
|
|
25
|
-
appName: any;
|
|
26
|
-
price: any;
|
|
27
27
|
ensureBilling(): Promise<{
|
|
28
28
|
hasPayment: boolean;
|
|
29
29
|
confirmationUrl: any;
|
package/dist/utils/billing.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BillingManager = exports.ShopifyBillingError = exports.BILLING_INTERVALS = void 0;
|
|
4
|
+
const shopify_api_1 = require("@shopify/shopify-api");
|
|
4
5
|
const display_1 = require("./display");
|
|
5
6
|
exports.BILLING_INTERVALS = {
|
|
6
7
|
ONE_TIME: 'ONE_TIME',
|
|
@@ -53,6 +54,7 @@ const ONE_TIME_PURCHASE_MUTATION = `
|
|
|
53
54
|
}
|
|
54
55
|
}
|
|
55
56
|
`;
|
|
57
|
+
// TODO match existing patterns for custom error types
|
|
56
58
|
function ShopifyBillingError(message, errorData) {
|
|
57
59
|
this.name = 'ShopifyBillingError';
|
|
58
60
|
this.stack = new Error().stack;
|
|
@@ -63,19 +65,19 @@ exports.ShopifyBillingError = ShopifyBillingError;
|
|
|
63
65
|
ShopifyBillingError.prototype = new Error();
|
|
64
66
|
class BillingManager {
|
|
65
67
|
constructor(shopify, { session, payment }) {
|
|
66
|
-
if (display_1.
|
|
67
|
-
|| display_1.
|
|
68
|
+
if (display_1.stringEmpty(session === null || session === void 0 ? void 0 : session.shop)
|
|
69
|
+
|| display_1.stringEmpty(session === null || session === void 0 ? void 0 : session.accessToken)
|
|
68
70
|
|| !Object.values(exports.BILLING_INTERVALS).includes(payment === null || payment === void 0 ? void 0 : payment.type)) {
|
|
69
|
-
throw new ShopifyBillingError('Invalid billing
|
|
71
|
+
throw new ShopifyBillingError('Invalid billing configuration');
|
|
70
72
|
}
|
|
71
73
|
this.shopify = shopify;
|
|
72
74
|
this.shop = session.shop;
|
|
73
75
|
this.accessToken = session.accessToken;
|
|
76
|
+
this.appName = payment === null || payment === void 0 ? void 0 : payment.name;
|
|
77
|
+
this.price = payment === null || payment === void 0 ? void 0 : payment.price;
|
|
74
78
|
this.testMode = (payment === null || payment === void 0 ? void 0 : payment.test) || false;
|
|
75
79
|
this.billingType = payment.type;
|
|
76
80
|
this.isRecurring = RECURRING_INTERVALS.includes(payment.type);
|
|
77
|
-
this.appName = payment === null || payment === void 0 ? void 0 : payment.name;
|
|
78
|
-
this.price = payment === null || payment === void 0 ? void 0 : payment.price;
|
|
79
81
|
}
|
|
80
82
|
async ensureBilling() {
|
|
81
83
|
let hasPayment;
|
|
@@ -92,7 +94,10 @@ class BillingManager {
|
|
|
92
94
|
// TODO ensure this logic works for recurring payments
|
|
93
95
|
async hasActivePayment() {
|
|
94
96
|
const client = new this.shopify.Clients.Rest(this.shop, this.accessToken);
|
|
95
|
-
const { application_charges } = display_1.ensureObject(await client.get(
|
|
97
|
+
const { application_charges } = display_1.ensureObject(await client.get({
|
|
98
|
+
path: 'application_charges',
|
|
99
|
+
type: shopify_api_1.DataType.JSON,
|
|
100
|
+
}));
|
|
96
101
|
const existingCharge = display_1.ensureArray(application_charges).reduce((_existingCharge, charge) => {
|
|
97
102
|
const { api_client_id, status: chargeStatus } = display_1.ensureObject(charge);
|
|
98
103
|
const isMatching = (display_1.stringNotEmpty(api_client_id) && (display_1.ensureString(api_client_id) === this.apiClientId));
|
|
@@ -107,28 +112,31 @@ class BillingManager {
|
|
|
107
112
|
return display_1.objectNotEmpty(existingCharge);
|
|
108
113
|
}
|
|
109
114
|
async requestPayment() {
|
|
115
|
+
var _a, _b, _c, _d;
|
|
110
116
|
const client = new this.shopify.Clients.Graphql(this.shop, this.accessToken);
|
|
111
117
|
// TODO explore using objectToQueryString
|
|
112
118
|
const queryParams = [
|
|
113
119
|
`shop=${this.shop}`,
|
|
114
120
|
`host=${Buffer.from(`${this.shop}/admin`).toString('base64')}`
|
|
115
121
|
];
|
|
122
|
+
// NOTE do we need to use shopify.Context values anywhere else
|
|
116
123
|
const returnUrl = `https://${this.shopify.Context.HOST_NAME}?${queryParams.join('&')}`;
|
|
117
124
|
let data;
|
|
118
125
|
if (this.isRecurring) {
|
|
119
126
|
const mutationResponse = await this.requestRecurringPayment(client, returnUrl);
|
|
120
|
-
data = mutationResponse.body.data.appSubscriptionCreate;
|
|
127
|
+
data = (_b = (_a = mutationResponse === null || mutationResponse === void 0 ? void 0 : mutationResponse.body) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.appSubscriptionCreate;
|
|
121
128
|
}
|
|
122
129
|
else {
|
|
123
130
|
const mutationResponse = await this.requestSinglePayment(client, returnUrl);
|
|
124
|
-
data = mutationResponse.body.data.appPurchaseOneTimeCreate;
|
|
131
|
+
data = (_d = (_c = mutationResponse === null || mutationResponse === void 0 ? void 0 : mutationResponse.body) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.appPurchaseOneTimeCreate;
|
|
125
132
|
}
|
|
126
|
-
if (data.userErrors
|
|
133
|
+
if (display_1.arrayNotEmpty(data === null || data === void 0 ? void 0 : data.userErrors)) {
|
|
127
134
|
throw new ShopifyBillingError('Error while billing the store');
|
|
128
135
|
}
|
|
129
136
|
return data === null || data === void 0 ? void 0 : data.confirmationUrl;
|
|
130
137
|
}
|
|
131
138
|
async requestSinglePayment(client, returnUrl) {
|
|
139
|
+
var _a, _b;
|
|
132
140
|
const mutationResponse = await client.query({
|
|
133
141
|
data: {
|
|
134
142
|
query: ONE_TIME_PURCHASE_MUTATION,
|
|
@@ -140,12 +148,13 @@ class BillingManager {
|
|
|
140
148
|
},
|
|
141
149
|
},
|
|
142
150
|
});
|
|
143
|
-
if (mutationResponse.body.errors && mutationResponse.body.errors
|
|
151
|
+
if (((_a = mutationResponse === null || mutationResponse === void 0 ? void 0 : mutationResponse.body) === null || _a === void 0 ? void 0 : _a.errors) && display_1.arrayNotEmpty((_b = mutationResponse === null || mutationResponse === void 0 ? void 0 : mutationResponse.body) === null || _b === void 0 ? void 0 : _b.errors)) {
|
|
144
152
|
throw new ShopifyBillingError('Error while billing the store', mutationResponse.body.errors);
|
|
145
153
|
}
|
|
146
154
|
return mutationResponse;
|
|
147
155
|
}
|
|
148
156
|
async requestRecurringPayment(client, returnUrl) {
|
|
157
|
+
var _a, _b;
|
|
149
158
|
const mutationResponse = await client.query({
|
|
150
159
|
data: {
|
|
151
160
|
query: RECURRING_PURCHASE_MUTATION,
|
|
@@ -166,7 +175,7 @@ class BillingManager {
|
|
|
166
175
|
},
|
|
167
176
|
},
|
|
168
177
|
});
|
|
169
|
-
if (mutationResponse.body.errors && mutationResponse.body.errors
|
|
178
|
+
if (((_a = mutationResponse === null || mutationResponse === void 0 ? void 0 : mutationResponse.body) === null || _a === void 0 ? void 0 : _a.errors) && display_1.arrayNotEmpty((_b = mutationResponse === null || mutationResponse === void 0 ? void 0 : mutationResponse.body) === null || _b === void 0 ? void 0 : _b.errors)) {
|
|
170
179
|
throw new ShopifyBillingError('Error while billing the store', mutationResponse.body.errors);
|
|
171
180
|
}
|
|
172
181
|
return mutationResponse;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../src/utils/billing.js"],"names":[],"mappings":";;;AAAA,
|
|
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.1.1-alpha.
|
|
3
|
+
"version": "1.1.1-alpha.19",
|
|
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",
|