@shopify/shopify-api 6.0.0-rc2 → 6.0.0-rc4

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const SHOPIFY_API_LIBRARY_VERSION = "6.0.0-rc2";
+export declare const SHOPIFY_API_LIBRARY_VERSION = "6.0.0-rc4";
 //# 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 = '6.0.0-rc2';
+exports.SHOPIFY_API_LIBRARY_VERSION = '6.0.0-rc4';

package/dist/webhooks/registry.js

@@ -295,7 +295,7 @@ function createProcess(config, httpWebhookRegistry) {
     return function process(_a) {
         var rawBody = _a.rawBody, adapterArgs = tslib_1.__rest(_a, ["rawBody"]);
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var request, response, webhookCheck, webhookOk, hmac, topic, domain, errorMessage, generatedHash, graphqlTopic, handler, returnResponse;
+            var request, response, webhookCheck, webhookOk, hmac, topic, domain, errorMessage, generatedHash, graphqlTopic, handler, error_2, returnResponse;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, (0, http_1.abstractConvertRequest)(adapterArgs)];
@@ -309,40 +309,45 @@ function createProcess(config, httpWebhookRegistry) {
                         webhookCheck = checkWebhookRequest(rawBody, request.headers);
                         webhookOk = webhookCheck.webhookOk, hmac = webhookCheck.hmac, topic = webhookCheck.topic, domain = webhookCheck.domain;
                         errorMessage = webhookCheck.errorMessage;
-                        if (!webhookOk) return [3 /*break*/, 3];
+                        if (!webhookOk) return [3 /*break*/, 11];
                         return [4 /*yield*/, (0, crypto_1.createSHA256HMAC)(config.apiSecretKey, rawBody, types_1.HashFormat.Base64)];
                     case 2:
                         generatedHash = _b.sent();
-                        if ((0, safe_compare_1.safeCompare)(generatedHash, hmac)) {
-                            graphqlTopic = topicForStorage(topic);
-                            handler = getHttpHandler(graphqlTopic);
-                            if (handler) {
-                                try {
-                                    handler(graphqlTopic, domain, rawBody);
-                                    response.statusCode = network_1.StatusCode.Ok;
-                                }
-                                catch (error) {
-                                    response.statusCode = network_1.StatusCode.InternalServerError;
-                                    errorMessage = error.message;
-                                }
-                            }
-                            else {
-                                response.statusCode = network_1.StatusCode.NotFound;
-                                errorMessage = "No webhook is registered for topic ".concat(topic);
-                            }
-                        }
-                        else {
-                            response.statusCode = network_1.StatusCode.Unauthorized;
-                            errorMessage = "Could not validate request for topic ".concat(topic);
-                        }
-                        return [3 /*break*/, 4];
+                        if (!(0, safe_compare_1.safeCompare)(generatedHash, hmac)) return [3 /*break*/, 9];
+                        graphqlTopic = topicForStorage(topic);
+                        handler = getHttpHandler(graphqlTopic);
+                        if (!handler) return [3 /*break*/, 7];
+                        _b.label = 3;
                     case 3:
-                        response.statusCode = network_1.StatusCode.BadRequest;
-                        _b.label = 4;
+                        _b.trys.push([3, 5, , 6]);
+                        return [4 /*yield*/, handler(graphqlTopic, domain, rawBody)];
                     case 4:
+                        _b.sent();
+                        response.statusCode = network_1.StatusCode.Ok;
+                        return [3 /*break*/, 6];
+                    case 5:
+                        error_2 = _b.sent();
+                        response.statusCode = network_1.StatusCode.InternalServerError;
+                        errorMessage = error_2.message;
+                        return [3 /*break*/, 6];
+                    case 6: return [3 /*break*/, 8];
+                    case 7:
+                        response.statusCode = network_1.StatusCode.NotFound;
+                        errorMessage = "No webhook is registered for topic ".concat(topic);
+                        _b.label = 8;
+                    case 8: return [3 /*break*/, 10];
+                    case 9:
+                        response.statusCode = network_1.StatusCode.Unauthorized;
+                        errorMessage = "Could not validate request for topic ".concat(topic);
+                        _b.label = 10;
+                    case 10: return [3 /*break*/, 12];
+                    case 11:
+                        response.statusCode = network_1.StatusCode.BadRequest;
+                        _b.label = 12;
+                    case 12:
                         response.statusText = statusTextLookup[response.statusCode];
                         return [4 /*yield*/, (0, http_1.abstractConvertResponse)(response, adapterArgs)];
-                    case 5:
+                    case 13:
                         returnResponse = _b.sent();
                         if (!(0, http_1.isOK)(response)) {
                             throw new ShopifyErrors.InvalidWebhookError({

package/package.json

@@ -1,30 +1,36 @@
 {
   "name": "@shopify/shopify-api",
-  "version": "6.0.0-rc2",
+  "version": "6.0.0-rc4",
   "description": "Shopify API Library for Node - accelerate development with support for authentication, graphql proxy, webhooks",
   "exports": {
     ".": {
       "import": "./dist/index.js",
+      "require": "./dist/index.js",
       "types": "./dist/index.d.ts"
     },
     "./session-storage/*": {
       "import": "./dist/session-storage/*.js",
+      "require": "./dist/session-storage/*.js",
       "types": "./dist/session-storage/*.d.ts"
     },
     "./rest/admin/*": {
       "import": "./dist/rest/admin/*/index.js",
+      "require": "./dist/rest/admin/*/index.js",
       "types": "./dist/rest/admin/*/index.d.ts"
     },
     "./runtime": {
       "import": "./dist/runtime/index.js",
+      "require": "./dist/runtime/index.js",
       "types": "./dist/runtime/index.d.ts"
     },
     "./adapters/node": {
       "import": "./dist/adapters/node/index.js",
+      "require": "./dist/adapters/node/index.js",
       "types": "./dist/adapters/node/index.d.ts"
     },
     "./adapters/cf-worker": {
       "import": "./dist/adapters/cf-worker/index.js",
+      "require": "./dist/adapters/cf-worker/index.js",
       "types": "./dist/adapters/cf-worker/index.d.ts"
     }
   },