@sommpicks/sommpicks-shopify 24.12.9 → 24.12.11
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/dist/shopify/base/ErrorHelper.d.ts.map +1 -1
- package/dist/shopify/base/ErrorHelper.js +16 -11
- package/dist/shopify/base/ErrorHelper.js.map +1 -1
- package/dist/shopify/router/ShopifyRouter.d.ts.map +1 -1
- package/dist/shopify/router/ShopifyRouter.js +2 -1
- package/dist/shopify/router/ShopifyRouter.js.map +1 -1
- package/dist/test/shopify/ShopifyWebhookService.test.js +3 -2
- package/dist/test/shopify/ShopifyWebhookService.test.js.map +1 -1
- package/package.json +1 -1
- package/shopify/base/ErrorHelper.ts +16 -11
- package/test/shopify/ShopifyWebhookService.test.ts +4 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ErrorHelper.d.ts","sourceRoot":"","sources":["../../../shopify/base/ErrorHelper.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,WAAW;IAE5B,OAAc,oBAAoB,UAAW,GAAG,KAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"ErrorHelper.d.ts","sourceRoot":"","sources":["../../../shopify/base/ErrorHelper.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,WAAW;IAE5B,OAAc,oBAAoB,UAAW,GAAG,KAAG,GAAG,CAyBpD;CACL"}
|
|
@@ -5,24 +5,29 @@ class ErrorHelper {
|
|
|
5
5
|
exports.default = ErrorHelper;
|
|
6
6
|
ErrorHelper.getErrorFromResponse = (error) => {
|
|
7
7
|
let data = '';
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
const response = error && error.response ? error.response : null;
|
|
9
|
+
const responseData = response && response.data ? response.data : null;
|
|
10
|
+
if (responseData && responseData.errors) {
|
|
11
|
+
if (typeof responseData.errors === 'string') {
|
|
12
|
+
data = responseData.errors;
|
|
11
13
|
}
|
|
12
14
|
else {
|
|
13
|
-
for (const key in
|
|
14
|
-
data = `${data}, ${key}: ${
|
|
15
|
+
for (const key in responseData.errors) {
|
|
16
|
+
data = `${data}, ${key}: ${responseData.errors[key]};`;
|
|
15
17
|
}
|
|
16
18
|
}
|
|
17
19
|
}
|
|
18
|
-
else if (
|
|
19
|
-
|
|
20
|
+
else if (response && response.statusText) {
|
|
21
|
+
const status = response.status !== undefined ? response.status : 'unknown';
|
|
22
|
+
data = `${status} : ${response.statusText}`;
|
|
20
23
|
}
|
|
21
|
-
else if (
|
|
22
|
-
data =
|
|
24
|
+
else if (response) {
|
|
25
|
+
data = response;
|
|
23
26
|
}
|
|
24
|
-
else if (error && error.message) {
|
|
25
|
-
|
|
27
|
+
else if (error && (error.code || error.message)) {
|
|
28
|
+
const code = error.code ? `code=${error.code}` : '';
|
|
29
|
+
const message = error.message ? `message=${error.message}` : '';
|
|
30
|
+
data = [code, message].filter(Boolean).join(' ');
|
|
26
31
|
}
|
|
27
32
|
else {
|
|
28
33
|
data = error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ErrorHelper.js","sourceRoot":"","sources":["../../../shopify/base/ErrorHelper.ts"],"names":[],"mappings":";;AAAA,MAAqB,WAAW;;AAAhC,
|
|
1
|
+
{"version":3,"file":"ErrorHelper.js","sourceRoot":"","sources":["../../../shopify/base/ErrorHelper.ts"],"names":[],"mappings":";;AAAA,MAAqB,WAAW;;AAAhC,8BA4BC;AA1BiB,gCAAoB,GAAG,CAAC,KAAU,EAAO,EAAE;IACrD,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,MAAM,QAAQ,GAAG,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;IACjE,MAAM,YAAY,GAAG,QAAQ,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IACtE,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,EAAE;QACrC,IAAG,OAAO,YAAY,CAAC,MAAM,KAAK,QAAQ,EAAE;YACxC,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC;SAC9B;aAAM;YACH,KAAI,MAAM,GAAG,IAAI,YAAY,CAAC,MAAM,EAAE;gBAClC,IAAI,GAAG,GAAG,IAAI,KAAK,GAAG,KAAK,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;aAC1D;SACJ;KACJ;SAAM,IAAI,QAAQ,IAAI,QAAQ,CAAC,UAAU,EAAE;QACxC,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3E,IAAI,GAAG,GAAG,MAAM,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;KAC/C;SAAM,IAAI,QAAQ,EAAE;QACjB,IAAI,GAAG,QAAQ,CAAC;KACnB;SAAM,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;QAC/C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,IAAI,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACpD;SAAM;QACH,IAAI,GAAG,KAAK,CAAC;KAChB;IACD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC","sourcesContent":["export default class ErrorHelper {\n\n public static getErrorFromResponse = (error: any): any => {\n let data = '';\n const response = error && error.response ? error.response : null;\n const responseData = response && response.data ? response.data : null;\n if (responseData && responseData.errors) {\n if(typeof responseData.errors === 'string') {\n data = responseData.errors;\n } else {\n for(const key in responseData.errors) {\n data = `${data}, ${key}: ${responseData.errors[key]};`;\n }\n }\n } else if (response && response.statusText) {\n const status = response.status !== undefined ? response.status : 'unknown';\n data = `${status} : ${response.statusText}`;\n } else if (response) {\n data = response;\n } else if (error && (error.code || error.message)) {\n const code = error.code ? `code=${error.code}` : '';\n const message = error.message ? `message=${error.message}` : '';\n data = [code, message].filter(Boolean).join(' ');\n } else {\n data = error;\n }\n return data;\n };\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShopifyRouter.d.ts","sourceRoot":"","sources":["../../../shopify/router/ShopifyRouter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAInC,OAAO,EAAW,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAK9D,qBAAa,aAAa;IAIT,OAAO,CAAC,WAAW;IAAU,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,UAAU;IAAU,OAAO,CAAC,WAAW;IAAU,OAAO,CAAC,SAAS;IAA8C,OAAO,CAAC,QAAQ;IAF5M,OAAO,CAAC,aAAa,CAAgB;gBAEhB,WAAW,EAAE,MAAM,EAAU,QAAQ,EAAE,MAAM,EAAU,UAAU,EAAE,MAAM,EAAU,WAAW,EAAE,MAAM,EAAU,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,EAAU,QAAQ,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI;IAI7T,WAAW,IAAI,OAAO,CAAC,MAAM;IAuC7B,aAAa,QAAS,GAAG,OAAO,GAAG,UAmCxC;IAEK,YAAY,QAAS,GAAG,OAAO,GAAG,gDAkBvC;IAEF,OAAO,CAAC,UAAU;
|
|
1
|
+
{"version":3,"file":"ShopifyRouter.d.ts","sourceRoot":"","sources":["../../../shopify/router/ShopifyRouter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAInC,OAAO,EAAW,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAK9D,qBAAa,aAAa;IAIT,OAAO,CAAC,WAAW;IAAU,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,UAAU;IAAU,OAAO,CAAC,WAAW;IAAU,OAAO,CAAC,SAAS;IAA8C,OAAO,CAAC,QAAQ;IAF5M,OAAO,CAAC,aAAa,CAAgB;gBAEhB,WAAW,EAAE,MAAM,EAAU,QAAQ,EAAE,MAAM,EAAU,UAAU,EAAE,MAAM,EAAU,WAAW,EAAE,MAAM,EAAU,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,EAAU,QAAQ,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI;IAI7T,WAAW,IAAI,OAAO,CAAC,MAAM;IAuC7B,aAAa,QAAS,GAAG,OAAO,GAAG,UAmCxC;IAEK,YAAY,QAAS,GAAG,OAAO,GAAG,gDAkBvC;IAEF,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,WAAW;CAItB;AA8BD,eAAe,aAAa,CAAC"}
|
|
@@ -128,7 +128,8 @@ class ShopifyRouter {
|
|
|
128
128
|
installUrl(shop, scopes) {
|
|
129
129
|
// this URL is used to install the app. you can get it and run it on the browser, it should install the app
|
|
130
130
|
Logger_1.Logger.info(`installURL shop: ${shop}`);
|
|
131
|
-
|
|
131
|
+
// Explicitly request offline (permanent) access tokens
|
|
132
|
+
return `https://${shop}/admin/oauth/authorize?client_id=${this.shop_key}&scope=${scopes}&redirect_uri=${this.redirectUri()}&access_mode=offline`;
|
|
132
133
|
}
|
|
133
134
|
redirectUri() {
|
|
134
135
|
// the callback for when the merchant has approved the request
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShopifyRouter.js","sourceRoot":"","sources":["../../../shopify/router/ShopifyRouter.ts"],"names":[],"mappings":"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","sourcesContent":["import * as express from 'express';\nimport * as querystring from 'querystring';\nimport { CryptoService } from './services/CryptoService';\nimport { OauthService } from './services/OauthService';\nimport { Request, Response } from 'express-serve-static-core';\nimport { Logger } from '../../Logger';\n\nconst router = express.Router();\n\nexport class ShopifyRouter {\n\n private cryptoService: CryptoService;\n\n constructor( private shop_secret: string, private shop_key: string, private appBaseUrl: string, private endpointUri: string, private getScopes: (shop: string) => string | Promise<string>, private callback: (accessToken: string, shop: string, host: string, expresResponse: Response, secFetchDest: boolean, error: any) => void) {\n this.cryptoService = new CryptoService();\n }\n\n public buildRoutes(): express.Router {\n //initial call to /shopify\n router.get('/', async (req,res,next) => {\n Logger.info(`ShopifyRouter - request: ${req}`);\n try {\n if (process && process.env && process.env.SP_ROUTER_DEBUG === '1') {\n // eslint-disable-next-line no-console\n console.info('[sommpicks-shopify][ShopifyRouter][/shopify request]', {\n method: req.method,\n path: (req as any).path,\n query: (req as any).query,\n headers: { 'sec-fetch-dest': (req as any).headers?.['sec-fetch-dest'] }\n });\n }\n } catch { /* ignore debug logging errors */ }\n const scopes = await this.getScopes(req.query.shop as string);\n Logger.info(`ShopifyRouter - scopes: ${scopes}`);\n res.locals.scopes = scopes;\n next();\n }, this.installRoute);\n // endpoint when merchant accepts the installation\n router.get('/callback', this.callBackRoute);\n router.get('/auth/callback', this.callBackRoute);\n Logger.info('build routes was hit!');\n try {\n if (process && process.env && process.env.SP_ROUTER_DEBUG === '1') {\n const r: any = router as any;\n const routes = Array.isArray(r?.stack)\n ? r.stack\n .filter((l: any) => l && l.route)\n .map((l: any) => ({ path: l.route.path, methods: Object.keys(l.route.methods || {}) }))\n : [];\n // eslint-disable-next-line no-console\n console.info('[sommpicks-shopify][ShopifyRouter][routes]', routes);\n }\n } catch { /* ignore debug logging errors */ }\n return router;\n }\n\n public callBackRoute = (req: any, res: any) => {\n const expresRequest = req as Request;\n const expresResponse = res as Response;\n const shop = expresRequest.query.shop as string;\n const hmac = expresRequest.query.hmac as string;\n const code = expresRequest.query.code as string;\n const host = expresRequest.query.host as string;\n Logger.info('we are using the updated version');\n console.log('we are console logging the updated version');\n Logger.info(`ShopifyRouter - callBackRoute From shopify ${code}`);\n if (shop && hmac && code) {\n const map = Object.assign({}, expresRequest.query);\n delete map['signature'];\n delete map['hmac'];\n const secFetchDest = req.headers['sec-fetch-dest'];\n const sortedKeys = Object.keys(map).sort();\n const sortedMap: any = {};\n sortedKeys.forEach(key => sortedMap[key] = map[key]);\n const message = querystring.stringify(sortedMap);\n\n const hashEquals = this.cryptoService.checkHash(this.cryptoService.generateHash(message, this.shop_secret), hmac);\n if (!hashEquals) { expresResponse.status(401).send('HMAC validation failed'); return; }\n Logger.info(`getOathToken From shopify ${code}`);\n // we send the key and secret to get the access token back\n OauthService.getOathToken(shop, this.shop_key, this.shop_secret, code,\n (accessToken: string) => {\n this.callback(accessToken, shop, host, expresResponse, secFetchDest === 'iframe', null);\n },\n (errorStatus: string, error: string) => {\n Logger.error(`Error while getOathToken - status: ${errorStatus} and message: ${error}`);\n this.callback(null, shop, host, expresResponse, secFetchDest === 'iframe', { error: error, errorStatus: errorStatus });\n });\n } else {\n expresResponse.status(400).send('Required parameters missing');\n }\n };\n\n public installRoute = (req: any, res: any) => {\n const expresRequest = req as Request;\n const expresResponse = res as Response;\n const scopes = res.locals.scopes;\n const shop = expresRequest.query.shop as string;\n const host = expresRequest.query.host;\n Logger.info(`install route: request: ${expresRequest}, response: ${expresResponse}, scopes: ${scopes}, shop: ${shop}, host ${host}`);\n if (shop) {\n // when the shopify session expires we render a page on the embedded app that loads the auth URL to refresh the token\n if(!expresRequest.query.session) {\n expresResponse.render('session_expire', { redirectUrl: this.installUrl(shop, scopes) });\n } else {\n // we send the session exists the app is installed. we redirect to BillingRoutes with status=already_accepted\n expresResponse.redirect(`${this.appBaseUrl}/billing/created?host=${host}&shop=${shop}&status=already_accepted`);\n }\n } else {\n return expresResponse.status(400).send('Missing shop parameter.');\n }\n };\n\n private installUrl(shop: string, scopes: string): string {\n // this URL is used to install the app. you can get it and run it on the browser, it should install the app\n Logger.info(`installURL shop: ${shop}`);\n return `https://${shop}/admin/oauth/authorize?client_id=${this.shop_key}&scope=${scopes}&redirect_uri=${this.redirectUri()}`;\n }\n\n private redirectUri(): string {\n // the callback for when the merchant has approved the request\n return `${this.appBaseUrl}${this.endpointUri}/callback`;\n }\n}\n\n// Debug export and router shape when enabled via env\ntry {\n if (process && process.env && process.env.SP_ROUTER_DEBUG === '1') {\n const exportMeta = {\n classType: typeof ShopifyRouter,\n className: (ShopifyRouter as any)?.name,\n prototypeMethods: Object.getOwnPropertyNames((ShopifyRouter as any)?.prototype || {}).filter(m => m !== 'constructor')\n };\n // eslint-disable-next-line no-console\n console.info('[sommpicks-shopify][ShopifyRouter][export-meta]', exportMeta);\n\n const r: any = router as any;\n const routerMeta = {\n type: typeof router,\n isMiddleware: typeof router === 'function',\n keys: Object.keys(r || {}),\n stackLength: Array.isArray(r?.stack) ? r.stack.length : undefined,\n props: {\n caseSensitive: r?.caseSensitive,\n mergeParams: r?.mergeParams,\n strict: r?.strict\n }\n };\n // eslint-disable-next-line no-console\n console.info('[sommpicks-shopify][ShopifyRouter][express-router-meta]', routerMeta);\n }\n} catch { /* ignore debug logging errors */ }\n\nexport default ShopifyRouter;\n"]}
|
|
1
|
+
{"version":3,"file":"ShopifyRouter.js","sourceRoot":"","sources":["../../../shopify/router/ShopifyRouter.ts"],"names":[],"mappings":"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","sourcesContent":["import * as express from 'express';\nimport * as querystring from 'querystring';\nimport { CryptoService } from './services/CryptoService';\nimport { OauthService } from './services/OauthService';\nimport { Request, Response } from 'express-serve-static-core';\nimport { Logger } from '../../Logger';\n\nconst router = express.Router();\n\nexport class ShopifyRouter {\n\n private cryptoService: CryptoService;\n\n constructor( private shop_secret: string, private shop_key: string, private appBaseUrl: string, private endpointUri: string, private getScopes: (shop: string) => string | Promise<string>, private callback: (accessToken: string, shop: string, host: string, expresResponse: Response, secFetchDest: boolean, error: any) => void) {\n this.cryptoService = new CryptoService();\n }\n\n public buildRoutes(): express.Router {\n //initial call to /shopify\n router.get('/', async (req,res,next) => {\n Logger.info(`ShopifyRouter - request: ${req}`);\n try {\n if (process && process.env && process.env.SP_ROUTER_DEBUG === '1') {\n // eslint-disable-next-line no-console\n console.info('[sommpicks-shopify][ShopifyRouter][/shopify request]', {\n method: req.method,\n path: (req as any).path,\n query: (req as any).query,\n headers: { 'sec-fetch-dest': (req as any).headers?.['sec-fetch-dest'] }\n });\n }\n } catch { /* ignore debug logging errors */ }\n const scopes = await this.getScopes(req.query.shop as string);\n Logger.info(`ShopifyRouter - scopes: ${scopes}`);\n res.locals.scopes = scopes;\n next();\n }, this.installRoute);\n // endpoint when merchant accepts the installation\n router.get('/callback', this.callBackRoute);\n router.get('/auth/callback', this.callBackRoute);\n Logger.info('build routes was hit!');\n try {\n if (process && process.env && process.env.SP_ROUTER_DEBUG === '1') {\n const r: any = router as any;\n const routes = Array.isArray(r?.stack)\n ? r.stack\n .filter((l: any) => l && l.route)\n .map((l: any) => ({ path: l.route.path, methods: Object.keys(l.route.methods || {}) }))\n : [];\n // eslint-disable-next-line no-console\n console.info('[sommpicks-shopify][ShopifyRouter][routes]', routes);\n }\n } catch { /* ignore debug logging errors */ }\n return router;\n }\n\n public callBackRoute = (req: any, res: any) => {\n const expresRequest = req as Request;\n const expresResponse = res as Response;\n const shop = expresRequest.query.shop as string;\n const hmac = expresRequest.query.hmac as string;\n const code = expresRequest.query.code as string;\n const host = expresRequest.query.host as string;\n Logger.info('we are using the updated version');\n console.log('we are console logging the updated version');\n Logger.info(`ShopifyRouter - callBackRoute From shopify ${code}`);\n if (shop && hmac && code) {\n const map = Object.assign({}, expresRequest.query);\n delete map['signature'];\n delete map['hmac'];\n const secFetchDest = req.headers['sec-fetch-dest'];\n const sortedKeys = Object.keys(map).sort();\n const sortedMap: any = {};\n sortedKeys.forEach(key => sortedMap[key] = map[key]);\n const message = querystring.stringify(sortedMap);\n\n const hashEquals = this.cryptoService.checkHash(this.cryptoService.generateHash(message, this.shop_secret), hmac);\n if (!hashEquals) { expresResponse.status(401).send('HMAC validation failed'); return; }\n Logger.info(`getOathToken From shopify ${code}`);\n // we send the key and secret to get the access token back\n OauthService.getOathToken(shop, this.shop_key, this.shop_secret, code,\n (accessToken: string) => {\n this.callback(accessToken, shop, host, expresResponse, secFetchDest === 'iframe', null);\n },\n (errorStatus: string, error: string) => {\n Logger.error(`Error while getOathToken - status: ${errorStatus} and message: ${error}`);\n this.callback(null, shop, host, expresResponse, secFetchDest === 'iframe', { error: error, errorStatus: errorStatus });\n });\n } else {\n expresResponse.status(400).send('Required parameters missing');\n }\n };\n\n public installRoute = (req: any, res: any) => {\n const expresRequest = req as Request;\n const expresResponse = res as Response;\n const scopes = res.locals.scopes;\n const shop = expresRequest.query.shop as string;\n const host = expresRequest.query.host;\n Logger.info(`install route: request: ${expresRequest}, response: ${expresResponse}, scopes: ${scopes}, shop: ${shop}, host ${host}`);\n if (shop) {\n // when the shopify session expires we render a page on the embedded app that loads the auth URL to refresh the token\n if(!expresRequest.query.session) {\n expresResponse.render('session_expire', { redirectUrl: this.installUrl(shop, scopes) });\n } else {\n // we send the session exists the app is installed. we redirect to BillingRoutes with status=already_accepted\n expresResponse.redirect(`${this.appBaseUrl}/billing/created?host=${host}&shop=${shop}&status=already_accepted`);\n }\n } else {\n return expresResponse.status(400).send('Missing shop parameter.');\n }\n };\n\n private installUrl(shop: string, scopes: string): string {\n // this URL is used to install the app. you can get it and run it on the browser, it should install the app\n Logger.info(`installURL shop: ${shop}`);\n // Explicitly request offline (permanent) access tokens\n return `https://${shop}/admin/oauth/authorize?client_id=${this.shop_key}&scope=${scopes}&redirect_uri=${this.redirectUri()}&access_mode=offline`;\n }\n\n private redirectUri(): string {\n // the callback for when the merchant has approved the request\n return `${this.appBaseUrl}${this.endpointUri}/callback`;\n }\n}\n\n// Debug export and router shape when enabled via env\ntry {\n if (process && process.env && process.env.SP_ROUTER_DEBUG === '1') {\n const exportMeta = {\n classType: typeof ShopifyRouter,\n className: (ShopifyRouter as any)?.name,\n prototypeMethods: Object.getOwnPropertyNames((ShopifyRouter as any)?.prototype || {}).filter(m => m !== 'constructor')\n };\n // eslint-disable-next-line no-console\n console.info('[sommpicks-shopify][ShopifyRouter][export-meta]', exportMeta);\n\n const r: any = router as any;\n const routerMeta = {\n type: typeof router,\n isMiddleware: typeof router === 'function',\n keys: Object.keys(r || {}),\n stackLength: Array.isArray(r?.stack) ? r.stack.length : undefined,\n props: {\n caseSensitive: r?.caseSensitive,\n mergeParams: r?.mergeParams,\n strict: r?.strict\n }\n };\n // eslint-disable-next-line no-console\n console.info('[sommpicks-shopify][ShopifyRouter][express-router-meta]', routerMeta);\n }\n} catch { /* ignore debug logging errors */ }\n\nexport default ShopifyRouter;\n"]}
|
|
@@ -46,7 +46,7 @@ describe('create should,', () => {
|
|
|
46
46
|
};
|
|
47
47
|
const shopifyWebhookService = new ShopifyWebhookService_1.ShopifyWebhookService(mockAxiosInstance);
|
|
48
48
|
const createwebHookFunc = () => __awaiter(void 0, void 0, void 0, function* () { yield shopifyWebhookService.create({ address: 'some_url', format: 'json', topic: 'collections/create' }); });
|
|
49
|
-
expect(createwebHookFunc).rejects.toThrow(
|
|
49
|
+
expect(createwebHookFunc).rejects.toThrow(/API error/);
|
|
50
50
|
}));
|
|
51
51
|
});
|
|
52
52
|
describe('createStoreWebHooks should,', () => {
|
|
@@ -93,7 +93,8 @@ describe('createStoreWebHooks should,', () => {
|
|
|
93
93
|
}
|
|
94
94
|
expect(mockAxiosInstance.get).toHaveBeenCalledTimes(1);
|
|
95
95
|
expect(mockAxiosInstance.post).toHaveBeenCalledTimes(3);
|
|
96
|
-
expect(error).
|
|
96
|
+
expect(error).toContain('1 webhooks have not been created with errors');
|
|
97
|
+
expect(error).toContain('API error');
|
|
97
98
|
}));
|
|
98
99
|
});
|
|
99
100
|
//# sourceMappingURL=ShopifyWebhookService.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShopifyWebhookService.test.js","sourceRoot":"","sources":["../../../test/shopify/ShopifyWebhookService.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { Logger } from '../../Logger';\nimport { ShopifyUtils } from '../../shopify/ShopifyUtils';\nimport { ShopifyWebhookService } from '../../shopify/ShopifyWebhookService';\nimport InspiraShopifyError from '../../shopify/errors/InspiraShopifyError';\n\nbeforeEach(async() => {\n jest.clearAllMocks();\n Logger.info = console.log;\n Logger.error = console.error;\n});\n\ndescribe('deleteAll should,', () => {\n test('Delete all existing webhooks', async () => {\n const mockAxiosInstance = {\n get: jest.fn(() => {\n return new Promise<any>((resolve) => {\n resolve({\n data: {\n webhooks: [{ topic: 'orders/create', id: 1, address: 'some callaback url', format: 'json' },\n { topic: 'orders/delete', id: 2, address: 'some callaback url', format: 'json' }]\n }\n });\n });\n }),\n delete: jest.fn()\n };\n \n const shopifyWebhookService = new ShopifyWebhookService(mockAxiosInstance as any);\n await shopifyWebhookService.deleteAll();\n \n expect(mockAxiosInstance.get).toHaveBeenCalledWith('/webhooks.json');\n expect(mockAxiosInstance.delete).toHaveBeenCalledTimes(2);\n });\n});\n\ndescribe('create should,', () => {\n test('throw error when API fails', async () => {\n const mockAxiosInstance = {\n post: jest.fn().mockRejectedValue(new InspiraShopifyError({ message: 'API error'}))\n };\n\n const shopifyWebhookService = new ShopifyWebhookService(mockAxiosInstance as any);\n const createwebHookFunc = async () => { await shopifyWebhookService.create({ address: 'some_url', format: 'json', topic: 'collections/create' }); };\n expect(createwebHookFunc).rejects.toThrow('\\\\\"API error\\\\\"');\n\n });\n});\n\ndescribe('createStoreWebHooks should,', () => {\n test('create all webhooks when no webhooks are already in place', async () => {\n const mockAxiosInstance = {\n get: jest.fn().mockResolvedValue({ data: { webhooks: [] }}),\n post: jest.fn().mockResolvedValue({ data: { webhooks: { id: 121123 }}})\n };\n \n ShopifyUtils.getAxiosInstance = (): any => mockAxiosInstance;\n \n const shopifyWebhookService = new ShopifyWebhookService(mockAxiosInstance as any);\n await shopifyWebhookService.createStoreWebHooks('baseURL', ['collections/create', 'customers/delete', 'inventory_items/update']);\n\n expect(mockAxiosInstance.get).toHaveBeenCalledTimes(1);\n expect(mockAxiosInstance.post).toHaveBeenCalledTimes(3);\n expect(mockAxiosInstance.post).toHaveBeenCalledWith('/webhooks.json', { webhook: { address: 'baseURL/collections/create', format: 'json', topic: 'collections/create' } });\n expect(mockAxiosInstance.post).toHaveBeenCalledWith('/webhooks.json', { webhook: { address: 'baseURL/customers/delete', format: 'json', topic: 'customers/delete' } });\n expect(mockAxiosInstance.post).toHaveBeenCalledWith('/webhooks.json', { webhook: { address: 'baseURL/inventory_items/update', format: 'json', topic: 'inventory_items/update' } });\n });\n\n test('create only webhooks that are not already in place', async () => {\n const mockAxiosInstance = {\n get: jest.fn().mockResolvedValue({ data: { webhooks: [{ topic: 'customers/delete', id: 1, address: 'some callaback url', format: 'json' }] }}),\n post: jest.fn().mockResolvedValue({ data: { webhooks: { id: 121123 }}})\n };\n \n ShopifyUtils.getAxiosInstance = (): any => mockAxiosInstance;\n \n const shopifyWebhookService = new ShopifyWebhookService(mockAxiosInstance as any);\n await shopifyWebhookService.createStoreWebHooks('baseURL', ['collections/create', 'customers/delete', 'inventory_items/update']);\n\n expect(mockAxiosInstance.get).toHaveBeenCalledTimes(1);\n expect(mockAxiosInstance.post).toHaveBeenCalledTimes(2);\n expect(mockAxiosInstance.post).toHaveBeenCalledWith('/webhooks.json', { webhook: { address: 'baseURL/collections/create', format: 'json', topic: 'collections/create' } });\n expect(mockAxiosInstance.post).toHaveBeenCalledWith('/webhooks.json', { webhook: { address: 'baseURL/inventory_items/update', format: 'json', topic: 'inventory_items/update' } });\n });\n\n test('return error when a webhooks fail to be created', async () => {\n const mockAxiosInstance = {\n get: jest.fn().mockResolvedValue({ data: { webhooks: [] }}),\n post: jest.fn().mockRejectedValueOnce('API error').mockResolvedValue({ data: { webhooks: { id: 121123 }}})\n };\n \n ShopifyUtils.getAxiosInstance = (): any => mockAxiosInstance;\n \n const shopifyWebhookService = new ShopifyWebhookService(mockAxiosInstance as any);\n let error = '';\n try {\n await shopifyWebhookService.createStoreWebHooks('baseURL', ['collections/create', 'customers/delete', 'inventory_items/update']);\n } catch(e) {\n error = e.message;\n }\n\n expect(mockAxiosInstance.get).toHaveBeenCalledTimes(1);\n expect(mockAxiosInstance.post).toHaveBeenCalledTimes(3);\n expect(error).toBe('\"\\\\\"1 webhooks have not been created with errors \\\\\\\\\\\\\"API error\\\\\\\\\\\\\"\\\\\"\"');\n });\n});"]}
|
|
1
|
+
{"version":3,"file":"ShopifyWebhookService.test.js","sourceRoot":"","sources":["../../../test/shopify/ShopifyWebhookService.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { Logger } from '../../Logger';\nimport { ShopifyUtils } from '../../shopify/ShopifyUtils';\nimport { ShopifyWebhookService } from '../../shopify/ShopifyWebhookService';\nimport InspiraShopifyError from '../../shopify/errors/InspiraShopifyError';\n\nbeforeEach(async() => {\n jest.clearAllMocks();\n Logger.info = console.log;\n Logger.error = console.error;\n});\n\ndescribe('deleteAll should,', () => {\n test('Delete all existing webhooks', async () => {\n const mockAxiosInstance = {\n get: jest.fn(() => {\n return new Promise<any>((resolve) => {\n resolve({\n data: {\n webhooks: [{ topic: 'orders/create', id: 1, address: 'some callaback url', format: 'json' },\n { topic: 'orders/delete', id: 2, address: 'some callaback url', format: 'json' }]\n }\n });\n });\n }),\n delete: jest.fn()\n };\n \n const shopifyWebhookService = new ShopifyWebhookService(mockAxiosInstance as any);\n await shopifyWebhookService.deleteAll();\n \n expect(mockAxiosInstance.get).toHaveBeenCalledWith('/webhooks.json');\n expect(mockAxiosInstance.delete).toHaveBeenCalledTimes(2);\n });\n});\n\ndescribe('create should,', () => {\n test('throw error when API fails', async () => {\n const mockAxiosInstance = {\n post: jest.fn().mockRejectedValue(new InspiraShopifyError({ message: 'API error'}))\n };\n\n const shopifyWebhookService = new ShopifyWebhookService(mockAxiosInstance as any);\n const createwebHookFunc = async () => { await shopifyWebhookService.create({ address: 'some_url', format: 'json', topic: 'collections/create' }); };\n expect(createwebHookFunc).rejects.toThrow(/API error/);\n\n });\n});\n\ndescribe('createStoreWebHooks should,', () => {\n test('create all webhooks when no webhooks are already in place', async () => {\n const mockAxiosInstance = {\n get: jest.fn().mockResolvedValue({ data: { webhooks: [] }}),\n post: jest.fn().mockResolvedValue({ data: { webhooks: { id: 121123 }}})\n };\n \n ShopifyUtils.getAxiosInstance = (): any => mockAxiosInstance;\n \n const shopifyWebhookService = new ShopifyWebhookService(mockAxiosInstance as any);\n await shopifyWebhookService.createStoreWebHooks('baseURL', ['collections/create', 'customers/delete', 'inventory_items/update']);\n\n expect(mockAxiosInstance.get).toHaveBeenCalledTimes(1);\n expect(mockAxiosInstance.post).toHaveBeenCalledTimes(3);\n expect(mockAxiosInstance.post).toHaveBeenCalledWith('/webhooks.json', { webhook: { address: 'baseURL/collections/create', format: 'json', topic: 'collections/create' } });\n expect(mockAxiosInstance.post).toHaveBeenCalledWith('/webhooks.json', { webhook: { address: 'baseURL/customers/delete', format: 'json', topic: 'customers/delete' } });\n expect(mockAxiosInstance.post).toHaveBeenCalledWith('/webhooks.json', { webhook: { address: 'baseURL/inventory_items/update', format: 'json', topic: 'inventory_items/update' } });\n });\n\n test('create only webhooks that are not already in place', async () => {\n const mockAxiosInstance = {\n get: jest.fn().mockResolvedValue({ data: { webhooks: [{ topic: 'customers/delete', id: 1, address: 'some callaback url', format: 'json' }] }}),\n post: jest.fn().mockResolvedValue({ data: { webhooks: { id: 121123 }}})\n };\n \n ShopifyUtils.getAxiosInstance = (): any => mockAxiosInstance;\n \n const shopifyWebhookService = new ShopifyWebhookService(mockAxiosInstance as any);\n await shopifyWebhookService.createStoreWebHooks('baseURL', ['collections/create', 'customers/delete', 'inventory_items/update']);\n\n expect(mockAxiosInstance.get).toHaveBeenCalledTimes(1);\n expect(mockAxiosInstance.post).toHaveBeenCalledTimes(2);\n expect(mockAxiosInstance.post).toHaveBeenCalledWith('/webhooks.json', { webhook: { address: 'baseURL/collections/create', format: 'json', topic: 'collections/create' } });\n expect(mockAxiosInstance.post).toHaveBeenCalledWith('/webhooks.json', { webhook: { address: 'baseURL/inventory_items/update', format: 'json', topic: 'inventory_items/update' } });\n });\n\n test('return error when a webhooks fail to be created', async () => {\n const mockAxiosInstance = {\n get: jest.fn().mockResolvedValue({ data: { webhooks: [] }}),\n post: jest.fn().mockRejectedValueOnce('API error').mockResolvedValue({ data: { webhooks: { id: 121123 }}})\n };\n \n ShopifyUtils.getAxiosInstance = (): any => mockAxiosInstance;\n \n const shopifyWebhookService = new ShopifyWebhookService(mockAxiosInstance as any);\n let error = '';\n try {\n await shopifyWebhookService.createStoreWebHooks('baseURL', ['collections/create', 'customers/delete', 'inventory_items/update']);\n } catch(e) {\n error = e.message;\n }\n\n expect(mockAxiosInstance.get).toHaveBeenCalledTimes(1);\n expect(mockAxiosInstance.post).toHaveBeenCalledTimes(3);\n expect(error).toContain('1 webhooks have not been created with errors');\n expect(error).toContain('API error');\n });\n});\n"]}
|
package/package.json
CHANGED
|
@@ -2,20 +2,25 @@ export default class ErrorHelper {
|
|
|
2
2
|
|
|
3
3
|
public static getErrorFromResponse = (error: any): any => {
|
|
4
4
|
let data = '';
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
const response = error && error.response ? error.response : null;
|
|
6
|
+
const responseData = response && response.data ? response.data : null;
|
|
7
|
+
if (responseData && responseData.errors) {
|
|
8
|
+
if(typeof responseData.errors === 'string') {
|
|
9
|
+
data = responseData.errors;
|
|
8
10
|
} else {
|
|
9
|
-
for(const key in
|
|
10
|
-
data = `${data}, ${key}: ${
|
|
11
|
+
for(const key in responseData.errors) {
|
|
12
|
+
data = `${data}, ${key}: ${responseData.errors[key]};`;
|
|
11
13
|
}
|
|
12
14
|
}
|
|
13
|
-
} else if (
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
15
|
+
} else if (response && response.statusText) {
|
|
16
|
+
const status = response.status !== undefined ? response.status : 'unknown';
|
|
17
|
+
data = `${status} : ${response.statusText}`;
|
|
18
|
+
} else if (response) {
|
|
19
|
+
data = response;
|
|
20
|
+
} else if (error && (error.code || error.message)) {
|
|
21
|
+
const code = error.code ? `code=${error.code}` : '';
|
|
22
|
+
const message = error.message ? `message=${error.message}` : '';
|
|
23
|
+
data = [code, message].filter(Boolean).join(' ');
|
|
19
24
|
} else {
|
|
20
25
|
data = error;
|
|
21
26
|
}
|
|
@@ -41,7 +41,7 @@ describe('create should,', () => {
|
|
|
41
41
|
|
|
42
42
|
const shopifyWebhookService = new ShopifyWebhookService(mockAxiosInstance as any);
|
|
43
43
|
const createwebHookFunc = async () => { await shopifyWebhookService.create({ address: 'some_url', format: 'json', topic: 'collections/create' }); };
|
|
44
|
-
expect(createwebHookFunc).rejects.toThrow(
|
|
44
|
+
expect(createwebHookFunc).rejects.toThrow(/API error/);
|
|
45
45
|
|
|
46
46
|
});
|
|
47
47
|
});
|
|
@@ -100,6 +100,7 @@ describe('createStoreWebHooks should,', () => {
|
|
|
100
100
|
|
|
101
101
|
expect(mockAxiosInstance.get).toHaveBeenCalledTimes(1);
|
|
102
102
|
expect(mockAxiosInstance.post).toHaveBeenCalledTimes(3);
|
|
103
|
-
expect(error).
|
|
103
|
+
expect(error).toContain('1 webhooks have not been created with errors');
|
|
104
|
+
expect(error).toContain('API error');
|
|
104
105
|
});
|
|
105
|
-
});
|
|
106
|
+
});
|