@agnostack/next-shopify 1.6.0-alpha.34 → 1.6.0-alpha.35
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/handlers/ssr.d.ts +1 -1
- package/dist/helpers/graph.d.ts +1 -1
- package/dist/utils/billing.d.ts +1 -0
- package/dist/utils/billing.js +47 -1
- package/dist/utils/billing.js.map +1 -1
- package/dist/utils/errors.d.ts +12 -0
- package/dist/utils/errors.js +16 -1
- package/dist/utils/errors.js.map +1 -1
- package/dist/utils/shopify.d.ts +1 -28
- package/dist/utils/shopify.js +14 -178
- package/dist/utils/shopify.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
# [1.6.0-alpha.35](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.34...v1.6.0-alpha.35) (2023-05-19)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* add logging ([e9fc407](https://github.com/agnostack/next-shopify/commit/e9fc40732b06eae38491475c2919b445bab74c7b))
|
|
7
|
+
|
|
1
8
|
# [1.6.0-alpha.34](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.33...v1.6.0-alpha.34) (2023-05-19)
|
|
2
9
|
|
|
3
10
|
|
package/dist/handlers/ssr.d.ts
CHANGED
package/dist/helpers/graph.d.ts
CHANGED
package/dist/utils/billing.d.ts
CHANGED
package/dist/utils/billing.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.BillingManager = void 0;
|
|
3
|
+
exports.generatePaymentConfig = exports.BillingManager = void 0;
|
|
4
4
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
5
5
|
const display_1 = require("./display");
|
|
6
6
|
const constants_1 = require("./constants");
|
|
@@ -160,4 +160,50 @@ class BillingManager {
|
|
|
160
160
|
}
|
|
161
161
|
}
|
|
162
162
|
exports.BillingManager = BillingManager;
|
|
163
|
+
// TODO renable
|
|
164
|
+
// eslint-disable-next-line arrow-body-style
|
|
165
|
+
const generatePaymentConfig = () => {
|
|
166
|
+
return {};
|
|
167
|
+
/*
|
|
168
|
+
const {
|
|
169
|
+
name,
|
|
170
|
+
price,
|
|
171
|
+
currency = 'USD',
|
|
172
|
+
type = BILLING_INTERVALS.ONE_TIME,
|
|
173
|
+
} = ensureObject(paymentConfig)
|
|
174
|
+
const { debugMode, environment } = ensureObject(data)
|
|
175
|
+
|
|
176
|
+
if (objectEmpty(paymentConfig) || stringEmpty(environment)) {
|
|
177
|
+
return undefined
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
const notProduction = (environment !== 'production')
|
|
181
|
+
|
|
182
|
+
// TODO ensure this logic is correct
|
|
183
|
+
let test = environment !== 'production'
|
|
184
|
+
if (debugMode) {
|
|
185
|
+
test = true
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
const _paymentConfig = {
|
|
189
|
+
type,
|
|
190
|
+
required: (environment !== 'development'),
|
|
191
|
+
test,
|
|
192
|
+
name: `${name}${notProduction ? ` - ${environment}` : ''} - ${unsnakecase(type)}`,
|
|
193
|
+
price: {
|
|
194
|
+
amount: price,
|
|
195
|
+
currencyCode: currency,
|
|
196
|
+
},
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
console.log(`>>> ~ _paymentConfig`, {
|
|
200
|
+
_paymentConfig,
|
|
201
|
+
debugMode,
|
|
202
|
+
debugEnv: process.env.DEBUG,
|
|
203
|
+
})
|
|
204
|
+
|
|
205
|
+
return _paymentConfig
|
|
206
|
+
*/
|
|
207
|
+
};
|
|
208
|
+
exports.generatePaymentConfig = generatePaymentConfig;
|
|
163
209
|
//# sourceMappingURL=billing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../src/utils/billing.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../../src/utils/billing.js"],"names":[],"mappings":"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"}
|
package/dist/utils/errors.d.ts
CHANGED
|
@@ -10,3 +10,15 @@ export namespace ERROR_CODES {
|
|
|
10
10
|
const MISSING_SHOP: string;
|
|
11
11
|
const INVALID_CALLBACK: string;
|
|
12
12
|
}
|
|
13
|
+
export function getAuthErrorResponse({ error, shop, serverRuntimeConfig }: {
|
|
14
|
+
error: any;
|
|
15
|
+
shop: any;
|
|
16
|
+
serverRuntimeConfig: any;
|
|
17
|
+
}): {
|
|
18
|
+
statusCode: number;
|
|
19
|
+
message: any;
|
|
20
|
+
headers: {
|
|
21
|
+
'X-Shopify-API-Request-Failure-Reauthorize': string;
|
|
22
|
+
'X-Shopify-API-Request-Failure-Reauthorize-Url': any;
|
|
23
|
+
};
|
|
24
|
+
};
|
package/dist/utils/errors.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ERROR_CODES = exports.ShopifyAuthenticationError = void 0;
|
|
3
|
+
exports.getAuthErrorResponse = exports.ERROR_CODES = exports.ShopifyAuthenticationError = void 0;
|
|
4
|
+
const constants_1 = require("./constants");
|
|
4
5
|
class ShopifyAuthenticationError extends Error {
|
|
5
6
|
constructor(message, data) {
|
|
6
7
|
super(message);
|
|
@@ -18,4 +19,18 @@ exports.ERROR_CODES = {
|
|
|
18
19
|
MISSING_SHOP: 'no_shop_provided',
|
|
19
20
|
INVALID_CALLBACK: 'invalid_callback',
|
|
20
21
|
};
|
|
22
|
+
const getAuthErrorResponse = ({ error, shop, serverRuntimeConfig }) => {
|
|
23
|
+
const { message, data } = error;
|
|
24
|
+
const { API_URLS } = serverRuntimeConfig;
|
|
25
|
+
const reauthorizationUrl = (data === null || data === void 0 ? void 0 : data.redirectUrl) || `${API_URLS[constants_1.API_ROUTE_NAMES.AUTH]}?shop=${shop}`;
|
|
26
|
+
return {
|
|
27
|
+
statusCode: 403,
|
|
28
|
+
message,
|
|
29
|
+
headers: {
|
|
30
|
+
'X-Shopify-API-Request-Failure-Reauthorize': '1',
|
|
31
|
+
'X-Shopify-API-Request-Failure-Reauthorize-Url': reauthorizationUrl,
|
|
32
|
+
},
|
|
33
|
+
};
|
|
34
|
+
};
|
|
35
|
+
exports.getAuthErrorResponse = getAuthErrorResponse;
|
|
21
36
|
//# sourceMappingURL=errors.js.map
|
package/dist/utils/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/utils/errors.js"],"names":[],"mappings":";;;AAAA,MAAa,0BAA2B,SAAQ,KAAK;IACnD,YAAY,OAAO,EAAE,IAAI;QACvB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,IAAI,GAAG,4BAA4B,CAAA;QACxC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,0BAA0B,CAAC,SAAS,CAAC,CAAA;IACnE,CAAC;CACF;AAPD,gEAOC;AAEY,QAAA,WAAW,GAAG;IACzB,QAAQ,EAAE,gBAAgB;IAC1B,KAAK,EAAE,aAAa;IACpB,OAAO,EAAE,eAAe;IACxB,KAAK,EAAE,aAAa;IACpB,YAAY,EAAE,kBAAkB;IAChC,gBAAgB,EAAE,kBAAkB;CACrC,CAAA"}
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/utils/errors.js"],"names":[],"mappings":";;;AAAA,2CAA6C;AAE7C,MAAa,0BAA2B,SAAQ,KAAK;IACnD,YAAY,OAAO,EAAE,IAAI;QACvB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,IAAI,GAAG,4BAA4B,CAAA;QACxC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,0BAA0B,CAAC,SAAS,CAAC,CAAA;IACnE,CAAC;CACF;AAPD,gEAOC;AAEY,QAAA,WAAW,GAAG;IACzB,QAAQ,EAAE,gBAAgB;IAC1B,KAAK,EAAE,aAAa;IACpB,OAAO,EAAE,eAAe;IACxB,KAAK,EAAE,aAAa;IACpB,YAAY,EAAE,kBAAkB;IAChC,gBAAgB,EAAE,kBAAkB;CACrC,CAAA;AAEM,MAAM,oBAAoB,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,mBAAmB,EAAE,EAAE,EAAE;IAC3E,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,2BAAe,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAA;IAEhG,OAAO;QACL,UAAU,EAAE,GAAG;QACf,OAAO;QACP,OAAO,EAAE;YACP,2CAA2C,EAAE,GAAG;YAChD,+CAA+C,EAAE,kBAAkB;SACpE;KACF,CAAA;AACH,CAAC,CAAA;AAbY,QAAA,oBAAoB,wBAahC"}
|
package/dist/utils/shopify.d.ts
CHANGED
|
@@ -1,33 +1,6 @@
|
|
|
1
|
-
export function getInitializedShopify(serverRuntimeConfig: any, _shop: any, version: any): import("@shopify/shopify-api").Shopify<import("@shopify/shopify-api").ShopifyRestResources
|
|
2
|
-
export function getSessionStorage(serverRuntimeConfig: any, _shop: any): {
|
|
3
|
-
store: (session: any) => Promise<boolean>;
|
|
4
|
-
load: (id: any) => Promise<any>;
|
|
5
|
-
delete: (id: any) => Promise<void>;
|
|
6
|
-
deleteMany: (ids: any) => Promise<void>;
|
|
7
|
-
find: (__shop: any) => Promise<any[]>;
|
|
8
|
-
};
|
|
9
|
-
export function generatePaymentConfig(): {};
|
|
10
|
-
export function getVerifiedSession({ req, res, shop, serverRuntimeConfig }: {
|
|
11
|
-
req: any;
|
|
12
|
-
res: any;
|
|
13
|
-
shop: any;
|
|
14
|
-
serverRuntimeConfig: any;
|
|
15
|
-
}): Promise<any>;
|
|
16
|
-
export function addWebhookHandlers(serverRuntimeConfig: any, shopify: any): Promise<void>;
|
|
1
|
+
export function getInitializedShopify(serverRuntimeConfig: any, _shop: any, version: any): Promise<import("@shopify/shopify-api").Shopify<import("@shopify/shopify-api").ShopifyRestResources>>;
|
|
17
2
|
export function getRedirectUrl(props: any, { req, res, query: _query, }: {
|
|
18
3
|
req: any;
|
|
19
4
|
res: any;
|
|
20
5
|
query: any;
|
|
21
6
|
}): Promise<string>;
|
|
22
|
-
export function getAuthErrorResponse({ error, shop, serverRuntimeConfig }: {
|
|
23
|
-
error: any;
|
|
24
|
-
shop: any;
|
|
25
|
-
serverRuntimeConfig: any;
|
|
26
|
-
}): {
|
|
27
|
-
statusCode: number;
|
|
28
|
-
message: any;
|
|
29
|
-
headers: {
|
|
30
|
-
'X-Shopify-API-Request-Failure-Reauthorize': string;
|
|
31
|
-
'X-Shopify-API-Request-Failure-Reauthorize-Url': any;
|
|
32
|
-
};
|
|
33
|
-
};
|
package/dist/utils/shopify.js
CHANGED
|
@@ -1,182 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getRedirectUrl = exports.getInitializedShopify = void 0;
|
|
4
4
|
require("@shopify/shopify-api/adapters/node");
|
|
5
5
|
const shopify_api_1 = require("@shopify/shopify-api");
|
|
6
6
|
// // TODO validate if we still need a custom/local beginAuth
|
|
7
7
|
const shopify_api_node_1 = require("./shopify-api-node");
|
|
8
|
-
const
|
|
9
|
-
const errors_1 = require("./errors");
|
|
8
|
+
const webhooks_1 = require("./webhooks");
|
|
10
9
|
const display_1 = require("./display");
|
|
11
|
-
const firebase_1 = require("./firebase");
|
|
12
10
|
const constants_1 = require("./constants");
|
|
13
|
-
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
// scopesUnchanged &&
|
|
21
|
-
// (!session.expires || session.expires >= new Date())
|
|
22
|
-
// ) {
|
|
23
|
-
// return true
|
|
24
|
-
// }
|
|
25
|
-
// return false
|
|
11
|
+
const getInitializedShopify = async (serverRuntimeConfig, _shop, version) => {
|
|
12
|
+
const shopify = shopify_api_1.shopifyApi(Object.assign(Object.assign({}, serverRuntimeConfig === null || serverRuntimeConfig === void 0 ? void 0 : serverRuntimeConfig.APP_CONFIG), (display_1.stringNotEmpty(version)) && {
|
|
13
|
+
apiVersion: version,
|
|
14
|
+
}));
|
|
15
|
+
console.log('await addWebhookHandlers');
|
|
16
|
+
await webhooks_1.addWebhookHandlers(serverRuntimeConfig, shopify);
|
|
17
|
+
return shopify;
|
|
26
18
|
};
|
|
27
|
-
const getInitializedShopify = (serverRuntimeConfig, _shop, version) => (shopify_api_1.shopifyApi(Object.assign(Object.assign({}, serverRuntimeConfig === null || serverRuntimeConfig === void 0 ? void 0 : serverRuntimeConfig.APP_CONFIG), (display_1.stringNotEmpty(version)) && {
|
|
28
|
-
apiVersion: version,
|
|
29
|
-
})));
|
|
30
19
|
exports.getInitializedShopify = getInitializedShopify;
|
|
31
|
-
const
|
|
32
|
-
const { FB_CONFIG, FB_ROOT_COLLECTION, APP_ID } = serverRuntimeConfig;
|
|
33
|
-
const shopify = exports.getInitializedShopify(serverRuntimeConfig);
|
|
34
|
-
const data = { app: APP_ID, shop: shopify.utils.sanitizeShop(_shop) };
|
|
35
|
-
const sessionHandler = firebase_1.FirebaseSessionHandler.getInstance(FB_CONFIG, FB_ROOT_COLLECTION);
|
|
36
|
-
return {
|
|
37
|
-
store: async (session) => firebase_1.storeCallback(session, data, sessionHandler),
|
|
38
|
-
load: async (id) => firebase_1.loadCallback(id, data, sessionHandler),
|
|
39
|
-
delete: async (id) => firebase_1.deleteSessionsCallback(id, data, sessionHandler),
|
|
40
|
-
deleteMany: async (ids) => firebase_1.deleteSessionsCallback(ids, data, sessionHandler),
|
|
41
|
-
find: async (__shop) => firebase_1.findSessionsByShop(shopify.utils.sanitizeShop(__shop), data, sessionHandler),
|
|
42
|
-
};
|
|
43
|
-
};
|
|
44
|
-
exports.getSessionStorage = getSessionStorage;
|
|
45
|
-
// TODO renable
|
|
46
|
-
// eslint-disable-next-line arrow-body-style
|
|
47
|
-
const generatePaymentConfig = () => {
|
|
48
|
-
return {};
|
|
49
|
-
/*
|
|
50
|
-
const {
|
|
51
|
-
name,
|
|
52
|
-
price,
|
|
53
|
-
currency = 'USD',
|
|
54
|
-
type = BILLING_INTERVALS.ONE_TIME,
|
|
55
|
-
} = ensureObject(paymentConfig)
|
|
56
|
-
const { debugMode, environment } = ensureObject(data)
|
|
57
|
-
|
|
58
|
-
if (objectEmpty(paymentConfig) || stringEmpty(environment)) {
|
|
59
|
-
return undefined
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
const notProduction = (environment !== 'production')
|
|
63
|
-
|
|
64
|
-
// TODO ensure this logic is correct
|
|
65
|
-
let test = environment !== 'production'
|
|
66
|
-
if (debugMode) {
|
|
67
|
-
test = true
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
const _paymentConfig = {
|
|
71
|
-
type,
|
|
72
|
-
required: (environment !== 'development'),
|
|
73
|
-
test,
|
|
74
|
-
name: `${name}${notProduction ? ` - ${environment}` : ''} - ${unsnakecase(type)}`,
|
|
75
|
-
price: {
|
|
76
|
-
amount: price,
|
|
77
|
-
currencyCode: currency,
|
|
78
|
-
},
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
console.log(`>>> ~ _paymentConfig`, {
|
|
82
|
-
_paymentConfig,
|
|
83
|
-
debugMode,
|
|
84
|
-
debugEnv: process.env.DEBUG,
|
|
85
|
-
})
|
|
86
|
-
|
|
87
|
-
return _paymentConfig
|
|
88
|
-
*/
|
|
89
|
-
};
|
|
90
|
-
exports.generatePaymentConfig = generatePaymentConfig;
|
|
91
|
-
const getVerifiedSession = async ({ req, res, shop, serverRuntimeConfig }) => {
|
|
92
|
-
try {
|
|
93
|
-
const shopify = exports.getInitializedShopify(serverRuntimeConfig, shop);
|
|
94
|
-
const sessionStorage = exports.getSessionStorage(serverRuntimeConfig, shop);
|
|
95
|
-
if (sessionStorage) {
|
|
96
|
-
console.log('have sessionStorage');
|
|
97
|
-
}
|
|
98
|
-
else {
|
|
99
|
-
console.log('have NO sessionStorage');
|
|
100
|
-
}
|
|
101
|
-
const { PAYMENT_CONFIG } = serverRuntimeConfig !== null && serverRuntimeConfig !== void 0 ? serverRuntimeConfig : {};
|
|
102
|
-
const sessionId = await shopify.session.getCurrentId({
|
|
103
|
-
isOnline: true,
|
|
104
|
-
rawRequest: req,
|
|
105
|
-
rawResponse: res,
|
|
106
|
-
});
|
|
107
|
-
const session = await sessionStorage.load(sessionId);
|
|
108
|
-
if (!isSessionActive(session, shopify.config)) {
|
|
109
|
-
throw new errors_1.ShopifyAuthenticationError('Inactive session');
|
|
110
|
-
}
|
|
111
|
-
if (shop && (session === null || session === void 0 ? void 0 : session.shop) !== shop) {
|
|
112
|
-
throw new errors_1.ShopifyAuthenticationError('Invalid shop');
|
|
113
|
-
}
|
|
114
|
-
if (PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) {
|
|
115
|
-
const billingManager = new billing_1.BillingManager(shopify, session, serverRuntimeConfig);
|
|
116
|
-
const confirmationUrl = await billingManager.ensureBilling();
|
|
117
|
-
console.log('confirmationUrl:', confirmationUrl);
|
|
118
|
-
if (display_1.stringNotEmpty(confirmationUrl)) {
|
|
119
|
-
throw new errors_1.ShopifyAuthenticationError('Invalid payment status', { redirectUrl: confirmationUrl });
|
|
120
|
-
}
|
|
121
|
-
}
|
|
122
|
-
else {
|
|
123
|
-
// NOTE making a test call to ensure a valid session for free apps
|
|
124
|
-
const client = new shopify.clients.Graphql({ session });
|
|
125
|
-
await client.query({ data: constants_1.SHOP_QUERY });
|
|
126
|
-
}
|
|
127
|
-
return session;
|
|
128
|
-
}
|
|
129
|
-
catch (error) {
|
|
130
|
-
if (error instanceof shopify_api_1.HttpResponseError &&
|
|
131
|
-
error.response.code === 401) {
|
|
132
|
-
throw new errors_1.ShopifyAuthenticationError('Not authenticated');
|
|
133
|
-
}
|
|
134
|
-
throw error;
|
|
135
|
-
}
|
|
136
|
-
};
|
|
137
|
-
exports.getVerifiedSession = getVerifiedSession;
|
|
138
|
-
const handleWebhook = async (topic, shop, webhookRequestBody) => {
|
|
139
|
-
const sessionStorage = exports.getSessionStorage(JSON.parse(webhookRequestBody), shop);
|
|
140
|
-
console.log('sessionStorage:', sessionStorage);
|
|
141
|
-
switch (topic) {
|
|
142
|
-
// TODO pull from constants
|
|
143
|
-
case 'APP_UNINSTALLED': {
|
|
144
|
-
const sessionsIds = await sessionStorage.find(shop);
|
|
145
|
-
if (sessionsIds.length) {
|
|
146
|
-
return sessionStorage.deleteMany(sessionsIds);
|
|
147
|
-
}
|
|
148
|
-
break;
|
|
149
|
-
}
|
|
150
|
-
default: {
|
|
151
|
-
return;
|
|
152
|
-
}
|
|
153
|
-
}
|
|
154
|
-
};
|
|
155
|
-
const addWebhookHandlers = async (serverRuntimeConfig, shopify) => {
|
|
156
|
-
const { APP_WEBHOOKS } = serverRuntimeConfig;
|
|
157
|
-
const handlers = Object.entries(APP_WEBHOOKS).reduce((__payload, [topic, webhooks]) => (Object.assign(Object.assign({}, __payload), { [topic]: webhooks.map((webhook) => ({
|
|
158
|
-
deliveryMethod: shopify_api_1.DeliveryMethod.Http,
|
|
159
|
-
callbackUrl: '/api/webhooks/app/uninstalled',
|
|
160
|
-
callback: handleWebhook,
|
|
161
|
-
})) })), {});
|
|
162
|
-
console.log('handlers:', handlers);
|
|
163
|
-
await shopify.webhooks.addHandlers(handlers);
|
|
164
|
-
const bar = await shopify.webhooks.getHandlers('APP_UNINSTALLED');
|
|
165
|
-
console.log('shopify.webhooks.getHandlers1:', bar);
|
|
166
|
-
};
|
|
167
|
-
exports.addWebhookHandlers = addWebhookHandlers;
|
|
168
|
-
const getRedirectUrl = async (props, { req, res, query: _query,
|
|
169
|
-
// registerHandlers = false,
|
|
170
|
-
}) => {
|
|
20
|
+
const getRedirectUrl = async (props, { req, res, query: _query, }) => {
|
|
171
21
|
var _a;
|
|
172
22
|
const { API_URLS, PAGE_PATHS } = props;
|
|
173
23
|
const query = (_a = _query !== null && _query !== void 0 ? _query : req.query) !== null && _a !== void 0 ? _a : {};
|
|
174
24
|
const { embedded, host, shop: _shop } = query !== null && query !== void 0 ? query : {};
|
|
175
25
|
const shopify = exports.getInitializedShopify(props, _shop);
|
|
176
|
-
// if (registerHandlers) {
|
|
177
|
-
console.log('await addWebhookHandlers')
|
|
178
|
-
await
|
|
179
|
-
// }
|
|
26
|
+
// // if (registerHandlers) {
|
|
27
|
+
// console.log('await addWebhookHandlers')
|
|
28
|
+
// await addWebhookHandlers(props, shopify)
|
|
29
|
+
// // }
|
|
180
30
|
const shop = shopify.utils.sanitizeShop(_shop);
|
|
181
31
|
if (display_1.stringEmpty(shop)) {
|
|
182
32
|
return `${PAGE_PATHS[constants_1.PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=getRedirectUrl`;
|
|
@@ -196,18 +46,4 @@ const getRedirectUrl = async (props, { req, res, query: _query,
|
|
|
196
46
|
return shopify_api_node_1.beginAuth(props, { req, res, shop });
|
|
197
47
|
};
|
|
198
48
|
exports.getRedirectUrl = getRedirectUrl;
|
|
199
|
-
const getAuthErrorResponse = ({ error, shop, serverRuntimeConfig }) => {
|
|
200
|
-
const { message, data } = error;
|
|
201
|
-
const { API_URLS } = serverRuntimeConfig;
|
|
202
|
-
const reauthorizationUrl = (data === null || data === void 0 ? void 0 : data.redirectUrl) || `${API_URLS[constants_1.API_ROUTE_NAMES.AUTH]}?shop=${shop}`;
|
|
203
|
-
return {
|
|
204
|
-
statusCode: 403,
|
|
205
|
-
message,
|
|
206
|
-
headers: {
|
|
207
|
-
'X-Shopify-API-Request-Failure-Reauthorize': '1',
|
|
208
|
-
'X-Shopify-API-Request-Failure-Reauthorize-Url': reauthorizationUrl,
|
|
209
|
-
},
|
|
210
|
-
};
|
|
211
|
-
};
|
|
212
|
-
exports.getAuthErrorResponse = getAuthErrorResponse;
|
|
213
49
|
//# sourceMappingURL=shopify.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":";;;AAAA,8CAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../src/utils/shopify.js"],"names":[],"mappings":";;;AAAA,8CAA2C;AAC3C,sDAAiD;AAEjD,6DAA6D;AAC7D,yDAA8C;AAC9C,yCAA+C;AAC/C,uCAAuD;AACvD,2CAA+D;AAExD,MAAM,qBAAqB,GAAG,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;IACjF,MAAM,OAAO,GAAG,wBAAU,iCACrB,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,UAAU,GAC/B,CAAC,wBAAc,CAAC,OAAO,CAAC,CAAC,IAAI;QAC9B,UAAU,EAAE,OAAO;KACpB,EACD,CAAA;IAEF,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;IACvC,MAAM,6BAAkB,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAA;IAEtD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAZY,QAAA,qBAAqB,yBAYjC;AAEM,MAAM,cAAc,GAAG,KAAK,EAAE,KAAK,EAAE,EAC1C,GAAG,EACH,GAAG,EACH,KAAK,EAAE,MAAM,GACd,EAAE,EAAE;;IACH,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,KAAK,CAAA;IACtC,MAAM,KAAK,GAAG,MAAA,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,GAAG,CAAC,KAAK,mCAAI,EAAE,CAAA;IACvC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAA;IAEnD,MAAM,OAAO,GAAG,6BAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IAEnD,6BAA6B;IAC7B,0CAA0C;IAC1C,2CAA2C;IAC3C,OAAO;IAEP,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;IAE9C,IAAI,qBAAW,CAAC,IAAI,CAAC,EAAE;QACrB,OAAO,GAAG,UAAU,CAAC,4BAAgB,CAAC,KAAK,CAAC,4CAA4C,CAAA;KACzF;IAED,IAAI,QAAQ,KAAK,GAAG,EAAE;QACpB,oCAAoC;QACpC,MAAM,iBAAiB,GAAG,IAAI,eAAe,CAAC;YAC5C,IAAI;YACJ,IAAI;SACL,CAAC,CAAC,QAAQ,EAAE,CAAA;QAEb,oCAAoC;QACpC,MAAM,WAAW,GAAG,IAAI,eAAe,iCAClC,KAAK,KACR,IAAI,EACJ,WAAW,EAAE,GAAG,QAAQ,CAAC,2BAAe,CAAC,aAAa,CAAC,IAAI,iBAAiB,EAAE,IAC9E,CAAC,QAAQ,EAAE,CAAA;QAEb,oDAAoD;QACpD,OAAO,GAAG,UAAU,CAAC,4BAAgB,CAAC,IAAI,CAAC,IAAI,WAAW,EAAE,CAAA;KAC7D;IAED,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;IACxB,OAAO,4BAAS,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;AAC7C,CAAC,CAAA;AA1CY,QAAA,cAAc,kBA0C1B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agnostack/next-shopify",
|
|
3
|
-
"version": "1.6.0-alpha.
|
|
3
|
+
"version": "1.6.0-alpha.35",
|
|
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",
|