@agnostack/next-shopify 1.8.1-beta.1 → 1.8.1-beta.3
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.
|
@@ -17,11 +17,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
exports.handleAppBilling = void 0;
|
|
18
18
|
const raw_body_1 = __importDefault(require("raw-body"));
|
|
19
19
|
const utils_1 = require("../../utils");
|
|
20
|
+
const INSTALLATION_BILLING_QUERY = `
|
|
21
|
+
{
|
|
22
|
+
currentAppInstallation {
|
|
23
|
+
oneTimePurchases(first: 25, reverse: true) {
|
|
24
|
+
nodes {
|
|
25
|
+
id
|
|
26
|
+
status
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
allSubscriptions(first:20, reverse: true) {
|
|
30
|
+
nodes {
|
|
31
|
+
id
|
|
32
|
+
status
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
`;
|
|
20
38
|
// NOTE: typically handling: "/api/webhooks/app/billing"
|
|
21
39
|
const handleAppBilling = (serverRuntimeConfig) => async (req, res) => {
|
|
22
|
-
var _a;
|
|
40
|
+
var _a, _b;
|
|
23
41
|
try {
|
|
24
|
-
const { 'x-shopify-shop-domain': shop } = (_a = req.headers) !== null && _a !== void 0 ? _a : {};
|
|
42
|
+
const { 'x-shopify-shop-domain': shop, 'x-shopify-topic': topic, } = (_a = req.headers) !== null && _a !== void 0 ? _a : {};
|
|
43
|
+
console.log(`>>> ~ req.headers`, req.headers);
|
|
25
44
|
if (utils_1.stringEmpty(shop)) {
|
|
26
45
|
return res.status(200).json({ handler: 'billing', error: 'Missing shop' });
|
|
27
46
|
}
|
|
@@ -29,13 +48,29 @@ const handleAppBilling = (serverRuntimeConfig) => async (req, res) => {
|
|
|
29
48
|
console.log(`>>> > handleAppBilling > req.body`, req.body);
|
|
30
49
|
// NOTE raw request body is required for Shopify webhook validation
|
|
31
50
|
const rawBody = await raw_body_1.default(req);
|
|
32
|
-
|
|
51
|
+
console.log(`>>> > handleAppBilling > rawBody:`, rawBody.toString());
|
|
52
|
+
const _c = await shopify.webhooks.validate({
|
|
33
53
|
rawBody: rawBody.toString(),
|
|
34
54
|
rawRequest: req,
|
|
35
55
|
rawResponse: res,
|
|
36
|
-
}), { valid } =
|
|
56
|
+
}), { valid } = _c, webhookCheck = __rest(_c, ["valid"]);
|
|
37
57
|
if (valid) {
|
|
38
58
|
try {
|
|
59
|
+
const { Graphql } = await utils_1.getVerifiedClients(serverRuntimeConfig, { req, res, shop });
|
|
60
|
+
const response = await Graphql.query({ data: INSTALLATION_BILLING_QUERY });
|
|
61
|
+
console.log(`>>> ~ response`, response);
|
|
62
|
+
const responseBody = (_b = response.body.data) !== null && _b !== void 0 ? _b : response.body;
|
|
63
|
+
const [_responseData] = Object.values(utils_1.ensureObject(responseBody));
|
|
64
|
+
const _d = utils_1.ensureObject(_responseData), { userErrors } = _d, responseData = __rest(_d, ["userErrors"]);
|
|
65
|
+
if (utils_1.arrayNotEmpty(userErrors)) {
|
|
66
|
+
const errorMessages = userErrors.map(({ message }) => utils_1.ensureString(message));
|
|
67
|
+
return res.status(200).json({
|
|
68
|
+
handler: 'billing',
|
|
69
|
+
message: `Error fetching App Installation. ${errorMessages.join('. ')}.`,
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
console.log(`>>> ~ responseData`, responseData);
|
|
73
|
+
console.log(`>>> ~ topic`, topic);
|
|
39
74
|
console.log(`>>> > handleAppBilling > TODO!!!!!: do something here`);
|
|
40
75
|
// TODO!!!!!: do something here!?!?!?
|
|
41
76
|
return res.status(200).json({ handler: 'billing', message: 'success' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../src/handlers/api/billing.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wDAAiC;AAEjC,
|
|
1
|
+
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../../src/handlers/api/billing.js"],"names":[],"mappings":"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"}
|
package/dist/utils/billing.d.ts
CHANGED
|
@@ -2,8 +2,7 @@ export function ensureBilling(paymentConfig: any, { shopify, session }: {
|
|
|
2
2
|
shopify: any;
|
|
3
3
|
session: any;
|
|
4
4
|
}): Promise<any>;
|
|
5
|
-
export function generatePaymentConfig({
|
|
6
|
-
appTitle: any;
|
|
5
|
+
export function generatePaymentConfig({ appName, debugMode, environment, paymentConfig, SHOPIFY_RUN_MODE, }: {
|
|
7
6
|
appName: any;
|
|
8
7
|
debugMode: any;
|
|
9
8
|
environment: any;
|
package/dist/utils/billing.js
CHANGED
|
@@ -36,16 +36,15 @@ const ensureBilling = async (paymentConfig, { shopify, session }) => {
|
|
|
36
36
|
};
|
|
37
37
|
exports.ensureBilling = ensureBilling;
|
|
38
38
|
// eslint-disable-next-line arrow-body-style
|
|
39
|
-
const generatePaymentConfig = ({
|
|
39
|
+
const generatePaymentConfig = ({ appName, debugMode, environment, paymentConfig, SHOPIFY_RUN_MODE, }) => {
|
|
40
40
|
if (display_1.objectEmpty(paymentConfig) || display_1.stringEmpty(environment)) {
|
|
41
41
|
return undefined;
|
|
42
42
|
}
|
|
43
|
-
const { price, name,
|
|
44
|
-
const appTitle =
|
|
43
|
+
const { price, name, currency = 'USD', type = constants_1.BILLING_INTERVALS.ONE_TIME, } = display_1.ensureObject(paymentConfig);
|
|
44
|
+
const appTitle = name || appName;
|
|
45
45
|
const isProduction = (environment === 'production');
|
|
46
46
|
const notProduction = !isProduction;
|
|
47
47
|
const billingName = `${appTitle}${notProduction ? ` - ${environment}` : ''} - ${display_1.unsnakecase(type)}`;
|
|
48
|
-
console.log(`>>> > generatePaymentConfig > billingName:`, billingName);
|
|
49
48
|
return {
|
|
50
49
|
required: (isProduction || (SHOPIFY_RUN_MODE === 'cli')),
|
|
51
50
|
// required: (isProduction || debugMode || (SHOPIFY_RUN_MODE === 'cli')), // HMMMM: what should we do here for staging??
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../src/utils/billing.js"],"names":[],"mappings":";;;AAAA,sDAAmD;AAEnD,uCAQkB;AAClB,2CAA+C;AAExC,MAAM,aAAa,GAAG,KAAK,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE;IACzE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,sBAAY,CAAC,OAAO,CAAC,CAAA;IACnD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,sBAAY,CAAC,aAAa,CAAC,CAAA;IAE1E,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,SAAS,CAAA;KACjB;IAED,MAAM,MAAM,GAAG,gBAAM,CAAC,IAAI,CAAC,CAAA;IAE3B,MAAM,eAAe,GAAG,CACtB,wBAAc,CAAC,IAAI,CAAC;QACpB,wBAAc,CAAC,WAAW,CAAC;QAC3B,wBAAc,CAAC,IAAI,CAAC;QACpB,wBAAc,CAAC,MAAM,CAAC;QACtB,MAAM,CAAC,MAAM,CAAC,6BAAiB,CAAC,CAAC,QAAQ,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAC5D,CAAA;IAED,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,0BAAY,CAAC;YACrB,OAAO,EAAE,+BAA+B;SACzC,CAAC,CAAA;KACH;IAED,IAAI;QACF,IAAI,gBAAM,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE;YAC3E,OAAO,SAAS,CAAA;SACjB;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;KAC1D;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAA;QAC9D,MAAM,IAAI,0BAAY,CAAC;YACrB,OAAO,EAAE,wCAAwC;SAClD,CAAC,CAAA;KACH;AACH,CAAC,CAAA;AApCY,QAAA,aAAa,iBAoCzB;AAED,4CAA4C;AACrC,MAAM,qBAAqB,GAAG,CAAC,EACpC,
|
|
1
|
+
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../src/utils/billing.js"],"names":[],"mappings":";;;AAAA,sDAAmD;AAEnD,uCAQkB;AAClB,2CAA+C;AAExC,MAAM,aAAa,GAAG,KAAK,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE;IACzE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,sBAAY,CAAC,OAAO,CAAC,CAAA;IACnD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,sBAAY,CAAC,aAAa,CAAC,CAAA;IAE1E,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,SAAS,CAAA;KACjB;IAED,MAAM,MAAM,GAAG,gBAAM,CAAC,IAAI,CAAC,CAAA;IAE3B,MAAM,eAAe,GAAG,CACtB,wBAAc,CAAC,IAAI,CAAC;QACpB,wBAAc,CAAC,WAAW,CAAC;QAC3B,wBAAc,CAAC,IAAI,CAAC;QACpB,wBAAc,CAAC,MAAM,CAAC;QACtB,MAAM,CAAC,MAAM,CAAC,6BAAiB,CAAC,CAAC,QAAQ,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAC5D,CAAA;IAED,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,0BAAY,CAAC;YACrB,OAAO,EAAE,+BAA+B;SACzC,CAAC,CAAA;KACH;IAED,IAAI;QACF,IAAI,gBAAM,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE;YAC3E,OAAO,SAAS,CAAA;SACjB;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;KAC1D;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAA;QAC9D,MAAM,IAAI,0BAAY,CAAC;YACrB,OAAO,EAAE,wCAAwC;SAClD,CAAC,CAAA;KACH;AACH,CAAC,CAAA;AApCY,QAAA,aAAa,iBAoCzB;AAED,4CAA4C;AACrC,MAAM,qBAAqB,GAAG,CAAC,EACpC,OAAO,EACP,SAAS,EACT,WAAW,EACX,aAAa,EACb,gBAAgB,GACjB,EAAE,EAAE;IAEH,IAAI,qBAAW,CAAC,aAAa,CAAC,IAAI,qBAAW,CAAC,WAAW,CAAC,EAAE;QAC1D,OAAO,SAAS,CAAA;KACjB;IAED,MAAM,EACJ,KAAK,EACL,IAAI,EACJ,QAAQ,GAAG,KAAK,EAChB,IAAI,GAAG,6BAAiB,CAAC,QAAQ,GAClC,GAAG,sBAAY,CAAC,aAAa,CAAC,CAAA;IAE/B,MAAM,QAAQ,GAAG,IAAI,IAAI,OAAO,CAAA;IAEhC,MAAM,YAAY,GAAG,CAAC,WAAW,KAAK,YAAY,CAAC,CAAA;IACnD,MAAM,aAAa,GAAG,CAAC,YAAY,CAAA;IACnC,MAAM,WAAW,GAAG,GAAG,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,qBAAW,CAAC,IAAI,CAAC,EAAE,CAAA;IAEnG,OAAO;QACL,QAAQ,EAAE,CAAC,YAAY,IAAI,CAAC,gBAAgB,KAAK,KAAK,CAAC,CAAC;QACxD,wHAAwH;QACxH,IAAI,EAAE,CAAC,aAAa,IAAI,SAAS,CAAC;QAClC,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE;YACN,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,KAAK;YACb,YAAY,EAAE,QAAQ;SACvB;KACF,CAAA;AACH,CAAC,CAAA;AApCY,QAAA,qBAAqB,yBAoCjC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agnostack/next-shopify",
|
|
3
|
-
"version": "1.8.1-beta.
|
|
3
|
+
"version": "1.8.1-beta.3",
|
|
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",
|