@shopify/shopify-api 4.0.0 → 5.0.0

package/dist/utils/get-embedded-app-url.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="node" />
+import http from 'http';
+/**
+ * Helper method to get the host URL for the app.
+ *
+ * @param request Current HTTP request
+ */
+export default function getEmbeddedAppUrl(request: http.IncomingMessage): string;
+//# sourceMappingURL=get-embedded-app-url.d.ts.map

package/dist/utils/get-embedded-app-url.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-embedded-app-url.d.ts","sourceRoot":"","sources":["../../src/utils/get-embedded-app-url.ts"],"names":[],"mappings":";AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAOxB;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,OAAO,EAAE,IAAI,CAAC,eAAe,GAC5B,MAAM,CAyBR"}

package/dist/utils/get-embedded-app-url.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var ShopifyErrors = tslib_1.__importStar(require("../error"));
+var context_1 = require("../context");
+var shop_validator_1 = require("./shop-validator");
+/**
+ * Helper method to get the host URL for the app.
+ *
+ * @param request Current HTTP request
+ */
+function getEmbeddedAppUrl(request) {
+    if (!request) {
+        throw new ShopifyErrors.MissingRequiredArgument('getEmbeddedAppUrl requires a request object argument');
+    }
+    if (!request.url) {
+        throw new ShopifyErrors.InvalidRequestError('Request does not contain a URL');
+    }
+    var url = new URL(request.url, "https://".concat(request.headers.host));
+    var host = url.searchParams.get('host');
+    if (typeof host !== 'string' || !(0, shop_validator_1.sanitizeHost)(host)) {
+        throw new ShopifyErrors.InvalidRequestError('Request does not contain a host query parameter');
+    }
+    var decodedHost = Buffer.from(host, 'base64').toString();
+    return "https://".concat(decodedHost, "/apps/").concat(context_1.Context.API_KEY);
+}
+exports.default = getEmbeddedAppUrl;

package/dist/utils/index.d.ts

@@ -8,9 +8,10 @@ import graphqlProxy from './graphql_proxy';
 import safeCompare from './safe-compare';
 import storeSession from './store-session';
 import validateHmac from './hmac-validator';
-import validateShop from './shop-validator';
+import { sanitizeShop, sanitizeHost } from './shop-validator';
 import versionCompatible from './version-compatible';
 import withSession from './with-session';
+import getEmbeddedAppUrl from './get-embedded-app-url';
 declare const ShopifyUtils: {
     decodeSessionToken: typeof decodeSessionToken;
     deleteCurrentSession: typeof deleteCurrentSession;
@@ -22,9 +23,11 @@ declare const ShopifyUtils: {
     safeCompare: typeof safeCompare;
     storeSession: typeof storeSession;
     validateHmac: typeof validateHmac;
-    validateShop: typeof validateShop;
+    sanitizeShop: typeof sanitizeShop;
+    sanitizeHost: typeof sanitizeHost;
     versionCompatible: typeof versionCompatible;
     withSession: typeof withSession;
+    getEmbeddedAppUrl: typeof getEmbeddedAppUrl;
 };
 export default ShopifyUtils;
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,wBAAwB,CAAC;AACxD,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAC5D,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAC5D,OAAO,kBAAkB,MAAM,wBAAwB,CAAC;AACxD,OAAO,kBAAkB,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,YAAY,MAAM,kBAAkB,CAAC;AAC5C,OAAO,YAAY,MAAM,kBAAkB,CAAC;AAC5C,OAAO,iBAAiB,MAAM,sBAAsB,CAAC;AACrD,OAAO,WAAW,MAAM,gBAAgB,CAAC;AAEzC,QAAA,MAAM,YAAY;;;;;;;;;;;;;;CAcjB,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,wBAAwB,CAAC;AACxD,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAC5D,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAC5D,OAAO,kBAAkB,MAAM,wBAAwB,CAAC;AACxD,OAAO,kBAAkB,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,YAAY,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAC5D,OAAO,iBAAiB,MAAM,sBAAsB,CAAC;AACrD,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AAEvD,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;CAgBjB,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/utils/index.js

@@ -11,9 +11,10 @@ var graphql_proxy_1 = tslib_1.__importDefault(require("./graphql_proxy"));
 var safe_compare_1 = tslib_1.__importDefault(require("./safe-compare"));
 var store_session_1 = tslib_1.__importDefault(require("./store-session"));
 var hmac_validator_1 = tslib_1.__importDefault(require("./hmac-validator"));
-var shop_validator_1 = tslib_1.__importDefault(require("./shop-validator"));
+var shop_validator_1 = require("./shop-validator");
 var version_compatible_1 = tslib_1.__importDefault(require("./version-compatible"));
 var with_session_1 = tslib_1.__importDefault(require("./with-session"));
+var get_embedded_app_url_1 = tslib_1.__importDefault(require("./get-embedded-app-url"));
 var ShopifyUtils = {
     decodeSessionToken: decode_session_token_1.default,
     deleteCurrentSession: delete_current_session_1.default,
@@ -25,8 +26,10 @@ var ShopifyUtils = {
     safeCompare: safe_compare_1.default,
     storeSession: store_session_1.default,
     validateHmac: hmac_validator_1.default,
-    validateShop: shop_validator_1.default,
+    sanitizeShop: shop_validator_1.sanitizeShop,
+    sanitizeHost: shop_validator_1.sanitizeHost,
     versionCompatible: version_compatible_1.default,
     withSession: with_session_1.default,
+    getEmbeddedAppUrl: get_embedded_app_url_1.default,
 };
 exports.default = ShopifyUtils;

package/dist/utils/load-offline-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load-offline-session.d.ts","sourceRoot":"","sources":["../../src/utils/load-offline-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,yBAAyB,CAAC;AAIhD;;;;;;;GAOG;AACH,wBAA8B,kBAAkB,CAC9C,IAAI,EAAE,MAAM,EACZ,cAAc,UAAQ,GACrB,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAkB9B"}
+{"version":3,"file":"load-offline-session.d.ts","sourceRoot":"","sources":["../../src/utils/load-offline-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,yBAAyB,CAAC;AAMhD;;;;;;;GAOG;AACH,wBAA8B,kBAAkB,CAC9C,IAAI,EAAE,MAAM,EACZ,cAAc,UAAQ,GACrB,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAmB9B"}

package/dist/utils/load-offline-session.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var context_1 = require("../context");
 var oauth_1 = tslib_1.__importDefault(require("../auth/oauth"));
+var shop_validator_1 = require("./shop-validator");
 /**
  * Helper method for quickly loading offline sessions by shop url.
  * By default, returns undefined if there is no session, or the session found is expired.
@@ -14,12 +15,13 @@ var oauth_1 = tslib_1.__importDefault(require("../auth/oauth"));
 function loadOfflineSession(shop, includeExpired) {
     if (includeExpired === void 0) { includeExpired = false; }
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var sessionId, session, now;
+        var cleanShop, sessionId, session, now;
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     context_1.Context.throwIfUninitialized();
-                    sessionId = oauth_1.default.getOfflineSessionId(shop);
+                    cleanShop = (0, shop_validator_1.sanitizeShop)(shop, true);
+                    sessionId = oauth_1.default.getOfflineSessionId(cleanShop);
                     return [4 /*yield*/, context_1.Context.SESSION_STORAGE.loadSession(sessionId)];
                 case 1:
                     session = _a.sent();

package/dist/utils/setup-jest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-jest.d.ts","sourceRoot":"","sources":["../../src/utils/setup-jest.ts"],"names":[],"mappings":"AAsCA,OAAO,CAAC,MAAM,CAAC;IAEb,UAAU,IAAI,CAAC;QAEb,UAAU,QAAQ,CAAC,CAAC;YAClB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC;YAC7D,sBAAsB,IAAI,CAAC,CAAC;SAC7B;KAEF;CACF"}
+{"version":3,"file":"setup-jest.d.ts","sourceRoot":"","sources":["../../src/utils/setup-jest.ts"],"names":[],"mappings":"AAuCA,OAAO,CAAC,MAAM,CAAC;IAEb,UAAU,IAAI,CAAC;QAEb,UAAU,QAAQ,CAAC,CAAC;YAClB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC;YAC7D,sBAAsB,IAAI,CAAC,CAAC;SAC7B;KAEF;CACF"}

package/dist/utils/setup-jest.js

@@ -19,6 +19,7 @@ beforeEach(function () {
         IS_EMBEDDED_APP: false,
         IS_PRIVATE_APP: false,
         SESSION_STORAGE: new session_1.MemorySessionStorage(),
+        CUSTOM_SHOP_DOMAINS: undefined,
     });
     jest_fetch_mock_1.default.mockReset();
     currentCall = 0;

package/dist/utils/shop-validator.d.ts

@@ -1,7 +1,16 @@
 /**
- * Validates myshopify.com urls
+ * Validates and sanitizes shop domain urls. If Context.CUSTOM_SHOP_DOMAINS is set, shops ending in those domains are
+ * allowed. Accepts myshopify.com and myshopify.io by default.
  *
- * @param shop Shop url: {shop}.myshopify.com
+ * @param shop Shop url: {shop}.{domain}
+ * @param throwOnInvalid Whether to raise an exception if the shop is invalid
  */
-export default function validateShop(shop: string): boolean;
+export declare function sanitizeShop(shop: string, throwOnInvalid?: boolean): string | null;
+/**
+ * Validates and sanitizes Shopify host arguments.
+ *
+ * @param host Host address
+ * @param throwOnInvalid Whether to raise an exception if the host is invalid
+ */
+export declare function sanitizeHost(host: string, throwOnInvalid?: boolean): string | null;
 //# sourceMappingURL=shop-validator.d.ts.map

package/dist/utils/shop-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shop-validator.d.ts","sourceRoot":"","sources":["../../src/utils/shop-validator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAM1D"}
+{"version":3,"file":"shop-validator.d.ts","sourceRoot":"","sources":["../../src/utils/shop-validator.ts"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,cAAc,UAAQ,GACrB,MAAM,GAAG,IAAI,CAoBf;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,cAAc,UAAQ,GACrB,MAAM,GAAG,IAAI,CAUf"}

package/dist/utils/shop-validator.js

@@ -1,13 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.sanitizeHost = exports.sanitizeShop = void 0;
+var tslib_1 = require("tslib");
+var error_1 = require("../error");
+var context_1 = require("../context");
 /**
- * Validates myshopify.com urls
+ * Validates and sanitizes shop domain urls. If Context.CUSTOM_SHOP_DOMAINS is set, shops ending in those domains are
+ * allowed. Accepts myshopify.com and myshopify.io by default.
  *
- * @param shop Shop url: {shop}.myshopify.com
+ * @param shop Shop url: {shop}.{domain}
+ * @param throwOnInvalid Whether to raise an exception if the shop is invalid
  */
-function validateShop(shop) {
-    console.warn('Deprecation notice: validateShop will be removed in the next major release.');
-    var shopUrlRegex = /^[a-zA-Z0-9][a-zA-Z0-9-]*\.myshopify\.(com|io)[/]*$/;
-    return shopUrlRegex.test(shop);
+function sanitizeShop(shop, throwOnInvalid) {
+    if (throwOnInvalid === void 0) { throwOnInvalid = false; }
+    var domainsRegex = ['myshopify\\.com', 'myshopify\\.io'];
+    if (context_1.Context.CUSTOM_SHOP_DOMAINS) {
+        domainsRegex.push.apply(domainsRegex, tslib_1.__spreadArray([], tslib_1.__read(context_1.Context.CUSTOM_SHOP_DOMAINS.map(function (regex) {
+            return typeof regex === 'string' ? regex : regex.source;
+        })), false));
+    }
+    var shopUrlRegex = new RegExp("^[a-zA-Z0-9][a-zA-Z0-9-_]*\\.(".concat(domainsRegex.join('|'), ")[/]*$"));
+    var sanitizedShop = shopUrlRegex.test(shop) ? shop : null;
+    if (!sanitizedShop && throwOnInvalid) {
+        throw new error_1.InvalidShopError('Received invalid shop argument');
+    }
+    return sanitizedShop;
 }
-exports.default = validateShop;
+exports.sanitizeShop = sanitizeShop;
+/**
+ * Validates and sanitizes Shopify host arguments.
+ *
+ * @param host Host address
+ * @param throwOnInvalid Whether to raise an exception if the host is invalid
+ */
+function sanitizeHost(host, throwOnInvalid) {
+    if (throwOnInvalid === void 0) { throwOnInvalid = false; }
+    var base64regex = /^([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}=))?$/;
+    var sanitizedHost = base64regex.test(host) ? host : null;
+    if (!sanitizedHost && throwOnInvalid) {
+        throw new error_1.InvalidHostError('Received invalid host argument');
+    }
+    return sanitizedHost;
+}
+exports.sanitizeHost = sanitizeHost;

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const SHOPIFY_API_LIBRARY_VERSION = "4.0.0";
+export declare const SHOPIFY_API_LIBRARY_VERSION = "5.0.0";
 //# sourceMappingURL=version.d.ts.map

package/dist/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SHOPIFY_API_LIBRARY_VERSION = void 0;
-exports.SHOPIFY_API_LIBRARY_VERSION = '4.0.0';
+exports.SHOPIFY_API_LIBRARY_VERSION = '5.0.0';

package/dist/webhooks/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/webhooks/registry.ts"],"names":[],"mappings":";AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAUxB,OAAO,EACL,cAAc,EACd,eAAe,EACf,cAAc,EACd,oBAAoB,EAEpB,wBAAwB,EACzB,MAAM,SAAS,CAAC;AAEjB,UAAU,gBAAgB;IACxB,CAAC,KAAK,EAAE,MAAM,GAAG,oBAAoB,CAAC;CACvC;AAED,UAAU,iBAAiB;IACzB,eAAe,EAAE;QAAC,CAAC,KAAK,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAC,CAAC;IAEzD;;;;;OAKG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAE/D;;;;OAIG;IACH,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAE9C;;;;OAIG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,oBAAoB,GAAG,IAAI,CAAC;IAEvD;;OAEG;IACH,SAAS,IAAI,MAAM,EAAE,CAAC;IAEtB;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAE5D;;;;OAIG;IACH,WAAW,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAExE;;;;;OAKG;IACH,OAAO,CACL,OAAO,EAAE,IAAI,CAAC,eAAe,EAC7B,QAAQ,EAAE,IAAI,CAAC,cAAc,GAC5B,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB;;;;OAIG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;CACtC;AAiCD,iBAAS,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAuB9C;AAED,iBAAS,UAAU,CACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,GAAE,cAAoC,EACpD,SAAS,CAAC,EAAE,MAAM,GACjB,MAAM,CAmDR;AAED,QAAA,MAAM,UAAU,EAAE,MAAM,EAIvB,CAAC;AAEF,QAAA,MAAM,gBAAgB,EAAE,iBA0PvB,CAAC;AAEF,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,UAAU,EACV,UAAU,GACX,CAAC"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/webhooks/registry.ts"],"names":[],"mappings":";AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAUxB,OAAO,EACL,cAAc,EACd,eAAe,EACf,cAAc,EACd,oBAAoB,EAEpB,wBAAwB,EACzB,MAAM,SAAS,CAAC;AAEjB,UAAU,gBAAgB;IACxB,CAAC,KAAK,EAAE,MAAM,GAAG,oBAAoB,CAAC;CACvC;AAED,UAAU,iBAAiB;IACzB,eAAe,EAAE;QAAC,CAAC,KAAK,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAC,CAAC;IAEzD;;;;;OAKG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAE/D;;;;OAIG;IACH,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAE9C;;;;OAIG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,oBAAoB,GAAG,IAAI,CAAC;IAEvD;;OAEG;IACH,SAAS,IAAI,MAAM,EAAE,CAAC;IAEtB;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAE5D;;;;OAIG;IACH,WAAW,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAExE;;;;;OAKG;IACH,OAAO,CACL,OAAO,EAAE,IAAI,CAAC,eAAe,EAC7B,QAAQ,EAAE,IAAI,CAAC,cAAc,GAC5B,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB;;;;OAIG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;CACtC;AAiCD,iBAAS,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAuB9C;AAED,iBAAS,UAAU,CACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,GAAE,cAAoC,EACpD,SAAS,CAAC,EAAE,MAAM,GACjB,MAAM,CAmDR;AAED,QAAA,MAAM,UAAU,EAAE,MAAM,EAIvB,CAAC;AAEF,QAAA,MAAM,gBAAgB,EAAE,iBA4PvB,CAAC;AAEF,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,UAAU,EACV,UAAU,GACX,CAAC"}

package/dist/webhooks/registry.js

@@ -107,7 +107,7 @@ var WebhooksRegistry = {
     register: function (_a) {
         var path = _a.path, topic = _a.topic, accessToken = _a.accessToken, shop = _a.shop, _b = _a.deliveryMethod, deliveryMethod = _b === void 0 ? types_1.DeliveryMethod.Http : _b;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var registerReturn, client, address, checkResult, webhookId, mustRegister, node, endpointAddress, result;
+            var registerReturn, client, address, checkResult, error_1, result, webhookId, mustRegister, node, endpointAddress, result;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -130,19 +130,22 @@ var WebhooksRegistry = {
                         address = deliveryMethod === types_1.DeliveryMethod.Http
                             ? "".concat(context_1.Context.HOST_SCHEME, "://").concat(context_1.Context.HOST_NAME).concat(path)
                             : path;
+                        _c.label = 1;
+                    case 1:
+                        _c.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, client.query({
                                 data: buildCheckQuery(topic),
                             })];
-                    case 1:
+                    case 2:
                         checkResult = (_c.sent());
+                        return [3 /*break*/, 4];
+                    case 3:
+                        error_1 = _c.sent();
+                        result = error_1 instanceof ShopifyErrors.GraphqlQueryError ? error_1.response : {};
+                        registerReturn[topic] = { success: false, result: result };
+                        return [2 /*return*/, registerReturn];
+                    case 4:
                         mustRegister = true;
-                        if ('errors' in checkResult.body) {
-                            registerReturn[topic] = {
-                                success: false,
-                                result: checkResult.body,
-                            };
-                            return [2 /*return*/, registerReturn];
-                        }
                         if (checkResult.body.data.webhookSubscriptions.edges.length) {
                             node = checkResult.body.data.webhookSubscriptions.edges[0].node;
                             endpointAddress = '';
@@ -157,24 +160,24 @@ var WebhooksRegistry = {
                                 mustRegister = false;
                             }
                         }
-                        if (!mustRegister) return [3 /*break*/, 3];
+                        if (!mustRegister) return [3 /*break*/, 6];
                         return [4 /*yield*/, client.query({
                                 data: buildQuery(topic, address, deliveryMethod, webhookId),
                             })];
-                    case 2:
+                    case 5:
                         result = _c.sent();
                         registerReturn[topic] = {
                             success: isSuccess(result.body, deliveryMethod, webhookId),
                             result: result.body,
                         };
-                        return [3 /*break*/, 4];
-                    case 3:
+                        return [3 /*break*/, 7];
+                    case 6:
                         registerReturn[topic] = {
                             success: true,
                             result: {},
                         };
-                        _c.label = 4;
-                    case 4: return [2 /*return*/, registerReturn];
+                        _c.label = 7;
+                    case 7: return [2 /*return*/, registerReturn];
                 }
             });
         });
@@ -242,7 +245,7 @@ var WebhooksRegistry = {
                         reqBody += chunk;
                     });
                     request.on('end', function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                        var hmac, topic, domain, missingHeaders, statusCode, responseError, headers, generatedHash, graphqlTopic, webhookEntry, error_1;
+                        var hmac, topic, domain, missingHeaders, statusCode, responseError, headers, generatedHash, graphqlTopic, webhookEntry, error_2;
                         return tslib_1.__generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -299,18 +302,18 @@ var WebhooksRegistry = {
                                     statusCode = network_1.StatusCode.Ok;
                                     return [3 /*break*/, 4];
                                 case 3:
-                                    error_1 = _a.sent();
+                                    error_2 = _a.sent();
                                     statusCode = network_1.StatusCode.InternalServerError;
-                                    responseError = error_1;
+                                    responseError = error_2;
                                     return [3 /*break*/, 4];
                                 case 4: return [3 /*break*/, 6];
                                 case 5:
-                                    statusCode = network_1.StatusCode.Forbidden;
+                                    statusCode = network_1.StatusCode.NotFound;
                                     responseError = new ShopifyErrors.InvalidWebhookError("No webhook is registered for topic ".concat(topic));
                                     _a.label = 6;
                                 case 6: return [3 /*break*/, 8];
                                 case 7:
-                                    statusCode = network_1.StatusCode.Forbidden;
+                                    statusCode = network_1.StatusCode.Unauthorized;
                                     responseError = new ShopifyErrors.InvalidWebhookError("Could not validate request for topic ".concat(topic));
                                     _a.label = 8;
                                 case 8:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/shopify-api",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "description": "Shopify API Library for Node - accelerate development with support for authentication, graphql proxy, webhooks",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,12 +21,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Shopify/shopify-node-api.git"
+    "url": "git+https://github.com/Shopify/shopify-api-node.git"
   },
   "bugs": {
-    "url": "https://github.com/Shopify/shopify-node-api/issues"
+    "url": "https://github.com/Shopify/shopify-api-node/issues"
   },
-  "homepage": "https://github.com/Shopify/shopify-node-api",
+  "homepage": "https://github.com/Shopify/shopify-api-node",
   "author": "Shopify Inc.",
   "license": "MIT",
   "keywords": [

package/dist/__tests__/fake-resource-with-custom-prefix.d.ts

@@ -1,21 +0,0 @@
-import Base, { ResourcePath } from '../base-rest-resource';
-import { SessionInterface } from '../auth/session/types';
-import { ApiVersion } from '../base-types';
-interface FakeResourceWithCustomPrefixFindArgs {
-    session: SessionInterface;
-    id: string | number;
-}
-export default class FakeResourceWithCustomPrefix extends Base {
-    static API_VERSION: ApiVersion;
-    protected static NAME: string;
-    protected static PLURAL_NAME: string;
-    protected static CUSTOM_PREFIX: string;
-    protected static HAS_ONE: {};
-    protected static HAS_MANY: {};
-    protected static PATHS: ResourcePath[];
-    static find: ({ session, id, }: FakeResourceWithCustomPrefixFindArgs) => Promise<FakeResourceWithCustomPrefix | null>;
-    id?: number | string | null;
-    attribute?: string | null;
-}
-export {};
-//# sourceMappingURL=fake-resource-with-custom-prefix.d.ts.map

package/dist/__tests__/fake-resource-with-custom-prefix.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fake-resource-with-custom-prefix.d.ts","sourceRoot":"","sources":["../../src/__tests__/fake-resource-with-custom-prefix.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,UAAU,oCAAoC;IAC5C,OAAO,EAAE,gBAAgB,CAAC;IAC1B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,OAAO,4BAA6B,SAAQ,IAAI;IAC5D,OAAc,WAAW,aAAuB;IAChD,SAAS,CAAC,MAAM,CAAC,IAAI,SAAsC;IAC3D,SAAS,CAAC,MAAM,CAAC,WAAW,SAAwC;IACpE,SAAS,CAAC,MAAM,CAAC,aAAa,SAA0B;IAExD,SAAS,CAAC,MAAM,CAAC,OAAO,KAAM;IAC9B,SAAS,CAAC,MAAM,CAAC,QAAQ,KAAM;IAE/B,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,CAOpC;IAEF,OAAc,IAAI,qBAGf,oCAAoC,KAAG,QAAQ,4BAA4B,GAAG,IAAI,CAAC,CAMpF;IAEF,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B"}

package/dist/__tests__/fake-resource-with-custom-prefix.js

@@ -1,46 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var base_rest_resource_1 = tslib_1.__importDefault(require("../base-rest-resource"));
-var base_types_1 = require("../base-types");
-var FakeResourceWithCustomPrefix = /** @class */ (function (_super) {
-    tslib_1.__extends(FakeResourceWithCustomPrefix, _super);
-    function FakeResourceWithCustomPrefix() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    var _a;
-    _a = FakeResourceWithCustomPrefix;
-    FakeResourceWithCustomPrefix.API_VERSION = base_types_1.ApiVersion.Unstable;
-    FakeResourceWithCustomPrefix.NAME = 'fake_resource_with_custom_prefix';
-    FakeResourceWithCustomPrefix.PLURAL_NAME = 'fake_resource_with_custom_prefixes';
-    FakeResourceWithCustomPrefix.CUSTOM_PREFIX = '/admin/custom_prefix';
-    FakeResourceWithCustomPrefix.HAS_ONE = {};
-    FakeResourceWithCustomPrefix.HAS_MANY = {};
-    FakeResourceWithCustomPrefix.PATHS = [
-        {
-            http_method: 'get',
-            operation: 'get',
-            ids: ['id'],
-            path: 'fake_resource_with_custom_prefix/<id>.json',
-        },
-    ];
-    FakeResourceWithCustomPrefix.find = function (_b) {
-        var session = _b.session, id = _b.id;
-        return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-            var result;
-            return tslib_1.__generator(_a, function (_c) {
-                switch (_c.label) {
-                    case 0: return [4 /*yield*/, FakeResourceWithCustomPrefix.baseFind({
-                            session: session,
-                            urlIds: { id: id },
-                        })];
-                    case 1:
-                        result = _c.sent();
-                        return [2 /*return*/, result ? result[0] : null];
-                }
-            });
-        });
-    };
-    return FakeResourceWithCustomPrefix;
-}(base_rest_resource_1.default));
-exports.default = FakeResourceWithCustomPrefix;

package/dist/__tests__/fake-resource.d.ts

@@ -1,41 +0,0 @@
-import Base, { ParamSet, ResourcePath } from '../base-rest-resource';
-import { SessionInterface } from '../auth/session/types';
-import { ApiVersion } from '../base-types';
-interface FakeResourceFindArgs {
-    params?: ParamSet;
-    session: SessionInterface;
-    id: number;
-    other_resource_id?: number | null;
-}
-interface FakeResourceAllArgs {
-    params?: ParamSet;
-    session: SessionInterface;
-}
-interface FakeResourceCustomArgs {
-    session: SessionInterface;
-    id: number;
-    other_resource_id: number;
-}
-export default class FakeResource extends Base {
-    static API_VERSION: ApiVersion;
-    protected static NAME: string;
-    protected static PLURAL_NAME: string;
-    protected static READ_ONLY_ATTRIBUTES: string[];
-    protected static HAS_ONE: {
-        has_one_attribute: typeof FakeResource;
-    };
-    protected static HAS_MANY: {
-        has_many_attribute: typeof FakeResource;
-    };
-    protected static PATHS: ResourcePath[];
-    static find: ({ session, params, id, other_resource_id, ...otherArgs }: FakeResourceFindArgs) => Promise<FakeResource | null>;
-    static all: ({ session, params, }: FakeResourceAllArgs) => Promise<FakeResource[]>;
-    static custom: ({ session, id, other_resource_id, }: FakeResourceCustomArgs) => Promise<Body>;
-    id?: number | string | null;
-    attribute?: string | null;
-    has_one_attribute?: FakeResource | null;
-    has_many_attribute?: FakeResource[] | null;
-    other_resource_id?: number | null;
-}
-export {};
-//# sourceMappingURL=fake-resource.d.ts.map

package/dist/__tests__/fake-resource.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fake-resource.d.ts","sourceRoot":"","sources":["../../src/__tests__/fake-resource.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAC,QAAQ,EAAE,YAAY,EAAC,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,UAAU,oBAAoB;IAC5B,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAED,UAAU,mBAAmB;IAC3B,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,OAAO,EAAE,gBAAgB,CAAC;CAC3B;AAED,UAAU,sBAAsB;IAC9B,OAAO,EAAE,gBAAgB,CAAC;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,IAAI;IAC5C,OAAc,WAAW,aAAuB;IAChD,SAAS,CAAC,MAAM,CAAC,IAAI,SAAmB;IACxC,SAAS,CAAC,MAAM,CAAC,WAAW,SAAoB;IAEhD,SAAS,CAAC,MAAM,CAAC,oBAAoB,EAAE,MAAM,EAAE,CAA4B;IAE3E,SAAS,CAAC,MAAM,CAAC,OAAO;;MAEtB;IAEF,SAAS,CAAC,MAAM,CAAC,QAAQ;;MAEvB;IAEF,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,CAiDpC;IAEF,OAAc,IAAI,6DAMf,oBAAoB,KAAG,QAAQ,YAAY,GAAG,IAAI,CAAC,CAOpD;IAEF,OAAc,GAAG,yBAGd,mBAAmB,KAAG,QAAQ,YAAY,EAAE,CAAC,CAM9C;IAEF,OAAc,MAAM,wCAIjB,sBAAsB,KAAG,QAAQ,IAAI,CAAC,CASvC;IAEF,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,iBAAiB,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IACxC,kBAAkB,CAAC,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAC3C,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC"}

package/dist/__tests__/fake-resource.js

@@ -1,122 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var base_rest_resource_1 = tslib_1.__importDefault(require("../base-rest-resource"));
-var base_types_1 = require("../base-types");
-var FakeResource = /** @class */ (function (_super) {
-    tslib_1.__extends(FakeResource, _super);
-    function FakeResource() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    var _a;
-    _a = FakeResource;
-    FakeResource.API_VERSION = base_types_1.ApiVersion.Unstable;
-    FakeResource.NAME = 'fake_resource';
-    FakeResource.PLURAL_NAME = 'fake_resources';
-    FakeResource.READ_ONLY_ATTRIBUTES = ['unsaveable_attribute'];
-    FakeResource.HAS_ONE = {
-        has_one_attribute: FakeResource,
-    };
-    FakeResource.HAS_MANY = {
-        has_many_attribute: FakeResource,
-    };
-    FakeResource.PATHS = [
-        {
-            http_method: 'get',
-            operation: 'get',
-            ids: ['id'],
-            path: 'fake_resources/<id>.json',
-        },
-        {
-            http_method: 'get',
-            operation: 'get',
-            ids: [],
-            path: 'fake_resources.json',
-        },
-        {
-            http_method: 'post',
-            operation: 'post',
-            ids: [],
-            path: 'fake_resources.json',
-        },
-        {
-            http_method: 'put',
-            operation: 'put',
-            ids: ['id'],
-            path: 'fake_resources/<id>.json',
-        },
-        {
-            http_method: 'delete',
-            operation: 'delete',
-            ids: ['id'],
-            path: 'fake_resources/<id>.json',
-        },
-        {
-            http_method: 'get',
-            operation: 'get',
-            ids: ['id', 'other_resource_id'],
-            path: 'other_resources/<other_resource_id>/fake_resources/<id>.json',
-        },
-        {
-            http_method: 'get',
-            operation: 'custom',
-            ids: ['id', 'other_resource_id'],
-            path: 'other_resources/<other_resource_id>/fake_resources/<id>/custom.json',
-        },
-        {
-            http_method: 'delete',
-            operation: 'delete',
-            ids: ['id', 'other_resource_id'],
-            path: 'other_resources/<other_resource_id>/fake_resources/<id>.json',
-        },
-    ];
-    FakeResource.find = function (_b) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-        var result;
-        var session = _b.session, params = _b.params, id = _b.id, _c = _b.other_resource_id, other_resource_id = _c === void 0 ? null : _c, otherArgs = tslib_1.__rest(_b, ["session", "params", "id", "other_resource_id"]);
-        return tslib_1.__generator(_a, function (_d) {
-            switch (_d.label) {
-                case 0: return [4 /*yield*/, FakeResource.baseFind({
-                        session: session,
-                        urlIds: { id: id, other_resource_id: other_resource_id },
-                        params: tslib_1.__assign(tslib_1.__assign({}, params), otherArgs),
-                    })];
-                case 1:
-                    result = _d.sent();
-                    return [2 /*return*/, result ? result[0] : null];
-            }
-        });
-    }); };
-    FakeResource.all = function (_b) {
-        var session = _b.session, params = _b.params;
-        return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-            return tslib_1.__generator(_a, function (_c) {
-                return [2 /*return*/, FakeResource.baseFind({
-                        session: session,
-                        params: params,
-                        urlIds: {},
-                    })];
-            });
-        });
-    };
-    FakeResource.custom = function (_b) {
-        var session = _b.session, id = _b.id, other_resource_id = _b.other_resource_id;
-        return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-            var response;
-            return tslib_1.__generator(_a, function (_c) {
-                switch (_c.label) {
-                    case 0: return [4 /*yield*/, FakeResource.request({
-                            http_method: 'get',
-                            operation: 'custom',
-                            session: session,
-                            urlIds: { id: id, other_resource_id: other_resource_id },
-                        })];
-                    case 1:
-                        response = _c.sent();
-                        return [2 /*return*/, response.body];
-                }
-            });
-        });
-    };
-    return FakeResource;
-}(base_rest_resource_1.default));
-exports.default = FakeResource;

package/dist/auth/session/storage/__tests__/battery-of-tests.d.ts

@@ -1,3 +0,0 @@
-import { SessionStorage } from '../../session_storage';
-export declare function batteryOfTests(storageFactory: () => Promise<SessionStorage>): void;
-//# sourceMappingURL=battery-of-tests.d.ts.map

package/dist/auth/session/storage/__tests__/battery-of-tests.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"battery-of-tests.d.ts","sourceRoot":"","sources":["../../../../../src/auth/session/storage/__tests__/battery-of-tests.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAErD,wBAAgB,cAAc,CAAC,cAAc,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,QA+F3E"}