@shopify/shopify-api 5.0.1 → 6.0.0-rc1

package/dist/webhooks/registry.js

@@ -1,25 +1,27 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gdprTopics = exports.buildQuery = exports.buildCheckQuery = exports.WebhooksRegistry = void 0;
+exports.isWebhookPath = exports.createProcess = exports.createRegisterAll = exports.createRegister = exports.getTopics = exports.getHandler = exports.addHandlers = exports.addHandler = exports.resetWebhookRegistry = exports.webhookRegistry = exports.buildQuery = exports.buildCheckQuery = void 0;
 var tslib_1 = require("tslib");
-var crypto_1 = require("crypto");
 var network_1 = require("@shopify/network");
+var http_1 = require("../runtime/http");
 var graphql_client_1 = require("../clients/graphql/graphql_client");
 var base_types_1 = require("../base-types");
-var utils_1 = tslib_1.__importDefault(require("../utils"));
-var context_1 = require("../context");
+var safe_compare_1 = require("../auth/oauth/safe-compare");
 var ShopifyErrors = tslib_1.__importStar(require("../error"));
-var types_1 = require("./types");
+var crypto_1 = require("../runtime/crypto");
+var types_1 = require("../runtime/crypto/types");
+var types_2 = require("./types");
 function isSuccess(result, deliveryMethod, webhookId) {
     var endpoint;
     switch (deliveryMethod) {
-        case types_1.DeliveryMethod.Http:
+        case types_2.DeliveryMethod.Http:
             endpoint = 'webhookSubscription';
             break;
-        case types_1.DeliveryMethod.EventBridge:
+        case types_2.DeliveryMethod.EventBridge:
             endpoint = 'eventBridgeWebhookSubscription';
             break;
-        case types_1.DeliveryMethod.PubSub:
+        case types_2.DeliveryMethod.PubSub:
             endpoint = 'pubSubWebhookSubscription';
             break;
         default:
@@ -33,13 +35,14 @@ function isSuccess(result, deliveryMethod, webhookId) {
 function validateDeliveryMethod(_deliveryMethod) {
     return true;
 }
-function buildCheckQuery(topic) {
+function buildCheckQuery(_a) {
+    var topic = _a.topic;
     return "{\n    webhookSubscriptions(first: 1, topics: ".concat(topic, ") {\n      edges {\n        node {\n          id\n          endpoint {\n            __typename\n            ... on WebhookHttpEndpoint {\n              callbackUrl\n            }\n            ... on WebhookEventBridgeEndpoint {\n              arn\n            }\n            ... on WebhookPubSubEndpoint {\n              pubSubProject\n              pubSubTopic\n            }\n          }\n        }\n      }\n    }\n  }");
 }
 exports.buildCheckQuery = buildCheckQuery;
-function buildQuery(topic, address, deliveryMethod, webhookId) {
-    var _a;
-    if (deliveryMethod === void 0) { deliveryMethod = types_1.DeliveryMethod.Http; }
+function buildQuery(_a) {
+    var _b;
+    var topic = _a.topic, address = _a.address, _c = _a.deliveryMethod, deliveryMethod = _c === void 0 ? types_2.DeliveryMethod.Http : _c, webhookId = _a.webhookId;
     validateDeliveryMethod(deliveryMethod);
     var identifier;
     if (webhookId) {
@@ -53,66 +56,73 @@ function buildQuery(topic, address, deliveryMethod, webhookId) {
     var pubSubProject;
     var pubSubTopic;
     switch (deliveryMethod) {
-        case types_1.DeliveryMethod.Http:
+        case types_2.DeliveryMethod.Http:
             mutationName = webhookId
                 ? 'webhookSubscriptionUpdate'
                 : 'webhookSubscriptionCreate';
             webhookSubscriptionArgs = "{callbackUrl: \"".concat(address, "\"}");
             break;
-        case types_1.DeliveryMethod.EventBridge:
+        case types_2.DeliveryMethod.EventBridge:
             mutationName = webhookId
                 ? 'eventBridgeWebhookSubscriptionUpdate'
                 : 'eventBridgeWebhookSubscriptionCreate';
             webhookSubscriptionArgs = "{arn: \"".concat(address, "\"}");
             break;
-        case types_1.DeliveryMethod.PubSub:
+        case types_2.DeliveryMethod.PubSub:
             mutationName = webhookId
                 ? 'pubSubWebhookSubscriptionUpdate'
                 : 'pubSubWebhookSubscriptionCreate';
-            _a = tslib_1.__read(address
+            _b = tslib_1.__read(address
                 .replace(/^pubsub:\/\//, '')
-                .split(':'), 2), pubSubProject = _a[0], pubSubTopic = _a[1];
+                .split(':'), 2), pubSubProject = _b[0], pubSubTopic = _b[1];
             webhookSubscriptionArgs = "{pubSubProject: \"".concat(pubSubProject, "\",\n                                  pubSubTopic: \"").concat(pubSubTopic, "\"}");
             break;
     }
     return "\n    mutation webhookSubscription {\n      ".concat(mutationName, "(").concat(identifier, ", webhookSubscription: ").concat(webhookSubscriptionArgs, ") {\n        userErrors {\n          field\n          message\n        }\n        webhookSubscription {\n          id\n        }\n      }\n    }\n  ");
 }
 exports.buildQuery = buildQuery;
-var gdprTopics = [
-    'CUSTOMERS_DATA_REQUEST',
-    'CUSTOMERS_REDACT',
-    'SHOP_REDACT',
-];
-exports.gdprTopics = gdprTopics;
-var WebhooksRegistry = {
-    webhookRegistry: {},
-    addHandler: function (topic, _a) {
-        var path = _a.path, webhookHandler = _a.webhookHandler;
-        WebhooksRegistry.webhookRegistry[topic] = { path: path, webhookHandler: webhookHandler };
-    },
-    addHandlers: function (handlers) {
-        for (var topic in handlers) {
-            if ({}.hasOwnProperty.call(handlers, topic)) {
-                WebhooksRegistry.addHandler(topic, handlers[topic]);
-            }
+exports.webhookRegistry = {};
+function resetWebhookRegistry() {
+    for (var key in exports.webhookRegistry) {
+        if ({}.hasOwnProperty.call(exports.webhookRegistry, key)) {
+            delete exports.webhookRegistry[key];
         }
-    },
-    getHandler: function (topic) {
-        var _a;
-        return (_a = WebhooksRegistry.webhookRegistry[topic]) !== null && _a !== void 0 ? _a : null;
-    },
-    getTopics: function () {
-        return Object.keys(WebhooksRegistry.webhookRegistry);
-    },
-    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;
+    }
+}
+exports.resetWebhookRegistry = resetWebhookRegistry;
+function addHandler(params) {
+    var topic = params.topic, rest = tslib_1.__rest(params, ["topic"]);
+    exports.webhookRegistry[topic] = rest;
+}
+exports.addHandler = addHandler;
+function addHandlers(handlers) {
+    Object.entries(handlers).forEach(function (_a) {
+        var _b = tslib_1.__read(_a, 2), topic = _b[0], registryEntry = _b[1];
+        addHandler(tslib_1.__assign({ topic: topic }, registryEntry));
+    });
+}
+exports.addHandlers = addHandlers;
+function getHandler(_a) {
+    var _b;
+    var topic = _a.topic;
+    return (_b = exports.webhookRegistry[topic]) !== null && _b !== void 0 ? _b : null;
+}
+exports.getHandler = getHandler;
+function getTopics() {
+    return Object.keys(exports.webhookRegistry);
+}
+exports.getTopics = getTopics;
+function createRegister(config) {
+    var GraphqlClient = (0, graphql_client_1.createGraphqlClientClass)({ config: config });
+    return function register(_a) {
+        var path = _a.path, topic = _a.topic, accessToken = _a.accessToken, shop = _a.shop, _b = _a.deliveryMethod, deliveryMethod = _b === void 0 ? types_2.DeliveryMethod.Http : _b;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             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:
                         registerReturn = {};
-                        if (gdprTopics.includes(topic)) {
+                        if (base_types_1.gdprTopics.includes(topic)) {
                             registerReturn[topic] = {
                                 success: false,
                                 result: {
@@ -126,18 +136,18 @@ var WebhooksRegistry = {
                             return [2 /*return*/, registerReturn];
                         }
                         validateDeliveryMethod(deliveryMethod);
-                        client = new graphql_client_1.GraphqlClient(shop, accessToken);
-                        address = deliveryMethod === types_1.DeliveryMethod.Http
-                            ? "".concat(context_1.Context.HOST_SCHEME, "://").concat(context_1.Context.HOST_NAME).concat(path)
+                        client = new GraphqlClient({ domain: shop, accessToken: accessToken });
+                        address = deliveryMethod === types_2.DeliveryMethod.Http
+                            ? "".concat(config.hostScheme, "://").concat(config.hostName).concat(path)
                             : path;
                         _c.label = 1;
                     case 1:
                         _c.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, client.query({
-                                data: buildCheckQuery(topic),
+                                data: buildCheckQuery({ topic: topic }),
                             })];
                     case 2:
-                        checkResult = (_c.sent());
+                        checkResult = _c.sent();
                         return [3 /*break*/, 4];
                     case 3:
                         error_1 = _c.sent();
@@ -162,7 +172,7 @@ var WebhooksRegistry = {
                         }
                         if (!mustRegister) return [3 /*break*/, 6];
                         return [4 /*yield*/, client.query({
-                                data: buildQuery(topic, address, deliveryMethod, webhookId),
+                                data: buildQuery({ topic: topic, address: address, deliveryMethod: deliveryMethod, webhookId: webhookId }),
                             })];
                     case 5:
                         result = _c.sent();
@@ -181,9 +191,13 @@ var WebhooksRegistry = {
                 }
             });
         });
-    },
-    registerAll: function (_a) {
-        var accessToken = _a.accessToken, shop = _a.shop, _b = _a.deliveryMethod, deliveryMethod = _b === void 0 ? types_1.DeliveryMethod.Http : _b;
+    };
+}
+exports.createRegister = createRegister;
+function createRegisterAll(config) {
+    var register = createRegister(config);
+    return function registerAll(_a) {
+        var accessToken = _a.accessToken, shop = _a.shop, _b = _a.deliveryMethod, deliveryMethod = _b === void 0 ? types_2.DeliveryMethod.Http : _b;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var registerReturn, topics, topics_1, topics_1_1, topic, handler, path, webhook, returnedRegister, e_1_1;
             var e_1, _c;
@@ -191,7 +205,7 @@ var WebhooksRegistry = {
                 switch (_d.label) {
                     case 0:
                         registerReturn = {};
-                        topics = WebhooksRegistry.getTopics();
+                        topics = getTopics();
                         _d.label = 1;
                     case 1:
                         _d.trys.push([1, 6, 7, 8]);
@@ -200,7 +214,7 @@ var WebhooksRegistry = {
                     case 2:
                         if (!!topics_1_1.done) return [3 /*break*/, 5];
                         topic = topics_1_1.value;
-                        handler = WebhooksRegistry.getHandler(topic);
+                        handler = getHandler({ topic: topic });
                         if (!handler) return [3 /*break*/, 4];
                         path = handler.path;
                         webhook = {
@@ -210,7 +224,7 @@ var WebhooksRegistry = {
                             shop: shop,
                             deliveryMethod: deliveryMethod,
                         };
-                        return [4 /*yield*/, WebhooksRegistry.register(webhook)];
+                        return [4 /*yield*/, register(webhook)];
                     case 3:
                         returnedRegister = _d.sent();
                         registerReturn = tslib_1.__assign(tslib_1.__assign({}, registerReturn), returnedRegister);
@@ -233,114 +247,128 @@ var WebhooksRegistry = {
                 }
             });
         });
-    },
-    process: function (request, response) {
+    };
+}
+exports.createRegisterAll = createRegisterAll;
+var statusTextLookup = (_a = {},
+    _a[network_1.StatusCode.Ok] = 'OK',
+    _a[network_1.StatusCode.BadRequest] = 'Bad Request',
+    _a[network_1.StatusCode.Unauthorized] = 'Unauthorized',
+    _a[network_1.StatusCode.NotFound] = 'Not Found',
+    _a[network_1.StatusCode.InternalServerError] = 'Internal Server Error',
+    _a);
+function checkWebhookRequest(rawBody, headers) {
+    var retVal = {
+        webhookOk: true,
+        errorMessage: '',
+        hmac: '',
+        topic: '',
+        domain: '',
+    };
+    if (rawBody.length) {
+        var hmac = (0, http_1.getHeader)(headers, base_types_1.ShopifyHeader.Hmac);
+        var topic = (0, http_1.getHeader)(headers, base_types_1.ShopifyHeader.Topic);
+        var domain = (0, http_1.getHeader)(headers, base_types_1.ShopifyHeader.Domain);
+        var missingHeaders = [];
+        if (!hmac) {
+            missingHeaders.push(base_types_1.ShopifyHeader.Hmac);
+        }
+        if (!topic) {
+            missingHeaders.push(base_types_1.ShopifyHeader.Topic);
+        }
+        if (!domain) {
+            missingHeaders.push(base_types_1.ShopifyHeader.Domain);
+        }
+        if (missingHeaders.length) {
+            retVal.webhookOk = false;
+            retVal.errorMessage = "Missing one or more of the required HTTP headers to process webhowebhookOks: [".concat(missingHeaders.join(', '), "]");
+        }
+        else {
+            retVal.hmac = hmac;
+            retVal.topic = topic;
+            retVal.domain = domain;
+        }
+    }
+    else {
+        retVal.webhookOk = false;
+        retVal.errorMessage = 'No body was received when processing webhook';
+    }
+    return retVal;
+}
+function createProcess(config) {
+    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 reqBody, promise;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                reqBody = '';
-                promise = new Promise(function (resolve, reject) {
-                    request.on('data', function (chunk) {
-                        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_2;
-                        return tslib_1.__generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    if (!reqBody.length) {
-                                        response.writeHead(network_1.StatusCode.BadRequest);
-                                        response.end();
-                                        return [2 /*return*/, reject(new ShopifyErrors.InvalidWebhookError('No body was received when processing webhook'))];
-                                    }
-                                    Object.entries(request.headers).map(function (_a) {
-                                        var _b = tslib_1.__read(_a, 2), header = _b[0], value = _b[1];
-                                        switch (header.toLowerCase()) {
-                                            case base_types_1.ShopifyHeader.Hmac.toLowerCase():
-                                                hmac = value;
-                                                break;
-                                            case base_types_1.ShopifyHeader.Topic.toLowerCase():
-                                                topic = value;
-                                                break;
-                                            case base_types_1.ShopifyHeader.Domain.toLowerCase():
-                                                domain = value;
-                                                break;
-                                        }
-                                    });
-                                    missingHeaders = [];
-                                    if (!hmac) {
-                                        missingHeaders.push(base_types_1.ShopifyHeader.Hmac);
-                                    }
-                                    if (!topic) {
-                                        missingHeaders.push(base_types_1.ShopifyHeader.Topic);
-                                    }
-                                    if (!domain) {
-                                        missingHeaders.push(base_types_1.ShopifyHeader.Domain);
-                                    }
-                                    if (missingHeaders.length) {
-                                        response.writeHead(network_1.StatusCode.BadRequest);
-                                        response.end();
-                                        return [2 /*return*/, reject(new ShopifyErrors.InvalidWebhookError("Missing one or more of the required HTTP headers to process webhooks: [".concat(missingHeaders.join(', '), "]")))];
-                                    }
-                                    headers = {};
-                                    generatedHash = (0, crypto_1.createHmac)('sha256', context_1.Context.API_SECRET_KEY)
-                                        .update(reqBody, 'utf8')
-                                        .digest('base64');
-                                    if (!utils_1.default.safeCompare(generatedHash, hmac)) return [3 /*break*/, 7];
-                                    graphqlTopic = topic
-                                        .toUpperCase()
-                                        .replace(/\//g, '_');
-                                    webhookEntry = WebhooksRegistry.getHandler(graphqlTopic);
-                                    if (!webhookEntry) return [3 /*break*/, 5];
-                                    _a.label = 1;
-                                case 1:
-                                    _a.trys.push([1, 3, , 4]);
-                                    return [4 /*yield*/, webhookEntry.webhookHandler(graphqlTopic, domain, reqBody)];
-                                case 2:
-                                    _a.sent();
-                                    statusCode = network_1.StatusCode.Ok;
-                                    return [3 /*break*/, 4];
-                                case 3:
-                                    error_2 = _a.sent();
-                                    statusCode = network_1.StatusCode.InternalServerError;
-                                    responseError = error_2;
-                                    return [3 /*break*/, 4];
-                                case 4: return [3 /*break*/, 6];
-                                case 5:
-                                    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.Unauthorized;
-                                    responseError = new ShopifyErrors.InvalidWebhookError("Could not validate request for topic ".concat(topic));
-                                    _a.label = 8;
-                                case 8:
-                                    response.writeHead(statusCode, headers);
-                                    response.end();
-                                    if (responseError) {
-                                        return [2 /*return*/, reject(responseError)];
-                                    }
-                                    else {
-                                        return [2 /*return*/, resolve()];
-                                    }
-                                    return [2 /*return*/];
+            var request, response, webhookCheck, webhookOk, hmac, topic, domain, errorMessage, generatedHash, graphqlTopic, webhookEntry, returnResponse;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, (0, http_1.abstractConvertRequest)(adapterArgs)];
+                    case 1:
+                        request = _b.sent();
+                        response = {
+                            statusCode: network_1.StatusCode.Ok,
+                            statusText: statusTextLookup[network_1.StatusCode.Ok],
+                            headers: {},
+                        };
+                        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];
+                        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 = topic.toUpperCase().replace(/\//g, '_');
+                            webhookEntry = getHandler({
+                                topic: graphqlTopic,
+                            });
+                            if (webhookEntry) {
+                                try {
+                                    webhookEntry.webhookHandler(graphqlTopic, domain, rawBody);
+                                    response.statusCode = network_1.StatusCode.Ok;
+                                }
+                                catch (error) {
+                                    response.statusCode = network_1.StatusCode.InternalServerError;
+                                    errorMessage = error.message;
+                                }
                             }
-                        });
-                    }); });
-                });
-                return [2 /*return*/, promise];
+                            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];
+                    case 3:
+                        response.statusCode = network_1.StatusCode.BadRequest;
+                        _b.label = 4;
+                    case 4:
+                        response.statusText = statusTextLookup[response.statusCode];
+                        return [4 /*yield*/, (0, http_1.abstractConvertResponse)(response, adapterArgs)];
+                    case 5:
+                        returnResponse = _b.sent();
+                        if (!(0, http_1.isOK)(response)) {
+                            throw new ShopifyErrors.InvalidWebhookError({
+                                message: errorMessage,
+                                response: returnResponse,
+                            });
+                        }
+                        return [2 /*return*/, Promise.resolve(returnResponse)];
+                }
             });
         });
-    },
-    isWebhookPath: function (path) {
-        for (var key in WebhooksRegistry.webhookRegistry) {
-            if (WebhooksRegistry.webhookRegistry[key].path === path) {
-                return true;
-            }
+    };
+}
+exports.createProcess = createProcess;
+function isWebhookPath(path) {
+    for (var key in exports.webhookRegistry) {
+        if (exports.webhookRegistry[key].path === path) {
+            return true;
         }
-        return false;
-    },
-};
-exports.WebhooksRegistry = WebhooksRegistry;
+    }
+    return false;
+}
+exports.isWebhookPath = isWebhookPath;

package/dist/webhooks/types.d.ts

@@ -1,17 +1,18 @@
+import type { shopifyWebhooks } from '.';
 export declare enum DeliveryMethod {
     Http = "http",
     EventBridge = "eventbridge",
     PubSub = "pubsub"
 }
 declare type WebhookHandlerFunction = (topic: string, shop_domain: string, body: string) => Promise<void>;
-export interface RegisterOptions {
+export interface RegisterParams {
     topic: string;
     path: string;
     shop: string;
     accessToken: string;
     deliveryMethod?: DeliveryMethod;
 }
-export interface ShortenedRegisterOptions {
+export interface ShortenedRegisterParams {
     shop: string;
     accessToken: string;
     deliveryMethod?: DeliveryMethod;
@@ -50,5 +51,24 @@ export interface WebhookCheckResponse<T = WebhookCheckResponseNode> {
         };
     };
 }
+export interface BuildCheckQueryParams {
+    topic: string;
+}
+export interface BuildQueryParams {
+    topic: string;
+    address: string;
+    deliveryMethod: DeliveryMethod;
+    webhookId?: string;
+}
+export interface AddHandlersProps {
+    [topic: string]: WebhookRegistryEntry;
+}
+export interface AddHandlerParams extends WebhookRegistryEntry {
+    topic: string;
+}
+export interface GetHandlerParams {
+    topic: string;
+}
+export declare type ShopifyWebhooks = ReturnType<typeof shopifyWebhooks>;
 export {};
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/webhooks/types.ts"],"names":[],"mappings":"AAAA,oBAAY,cAAc;IACxB,IAAI,SAAS;IACb,WAAW,gBAAgB;IAC3B,MAAM,WAAW;CAClB;AAED,aAAK,sBAAsB,GAAG,CAC5B,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,KACT,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,WAAW,eAAe;IAE9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,wBAAwB;IAEvC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,KAAK,EAAE,MAAM,GAAG;QACf,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,OAAO,CAAC;KACjB,CAAC;CACH;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,sBAAsB,CAAC;CACxC;AAED,UAAU,wBAAwB,CAChC,CAAC,GAAG;IACF,QAAQ,EACJ;QACE,UAAU,EAAE,qBAAqB,CAAC;QAClC,WAAW,EAAE,MAAM,CAAC;KACrB,GACD;QACE,UAAU,EAAE,4BAA4B,CAAC;QACzC,GAAG,EAAE,MAAM,CAAC;KACb,GACD;QACE,UAAU,EAAE,uBAAuB,CAAC;QACpC,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACP;IAED,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;KACZ,GAAG,CAAC,CAAC;CACP;AAED,MAAM,WAAW,oBAAoB,CAAC,CAAC,GAAG,wBAAwB;IAChE,IAAI,EAAE;QACJ,oBAAoB,EAAE;YACpB,KAAK,EAAE,CAAC,EAAE,CAAC;SACZ,CAAC;KACH,CAAC;CACH"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/webhooks/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,GAAG,CAAC;AAEvC,oBAAY,cAAc;IACxB,IAAI,SAAS;IACb,WAAW,gBAAgB;IAC3B,MAAM,WAAW;CAClB;AAED,aAAK,sBAAsB,GAAG,CAC5B,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,KACT,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,WAAW,cAAc;IAE7B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,uBAAuB;IAEtC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,KAAK,EAAE,MAAM,GAAG;QACf,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,OAAO,CAAC;KACjB,CAAC;CACH;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,sBAAsB,CAAC;CACxC;AAED,UAAU,wBAAwB,CAChC,CAAC,GAAG;IACF,QAAQ,EACJ;QACE,UAAU,EAAE,qBAAqB,CAAC;QAClC,WAAW,EAAE,MAAM,CAAC;KACrB,GACD;QACE,UAAU,EAAE,4BAA4B,CAAC;QACzC,GAAG,EAAE,MAAM,CAAC;KACb,GACD;QACE,UAAU,EAAE,uBAAuB,CAAC;QACpC,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACP;IAED,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;KACZ,GAAG,CAAC,CAAC;CACP;AAED,MAAM,WAAW,oBAAoB,CAAC,CAAC,GAAG,wBAAwB;IAChE,IAAI,EAAE;QACJ,oBAAoB,EAAE;YACpB,KAAK,EAAE,CAAC,EAAE,CAAC;SACZ,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,CAAC,KAAK,EAAE,MAAM,GAAG,oBAAoB,CAAC;CACvC;AAED,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;IAC5D,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,oBAAY,eAAe,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC"}

package/package.json

@@ -1,16 +1,42 @@
 {
   "name": "@shopify/shopify-api",
-  "version": "5.0.1",
+  "version": "6.0.0-rc1",
   "description": "Shopify API Library for Node - accelerate development with support for authentication, graphql proxy, webhooks",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./session-storage/*": {
+      "import": "./dist/session-storage/*.js",
+      "types": "./dist/session-storage/*.d.ts"
+    },
+    "./rest/admin/*": {
+      "import": "./dist/rest/admin/*/index.js",
+      "types": "./dist/rest/admin/*/index.d.ts"
+    },
+    "./adapters/node": {
+      "import": "./dist/adapters/node/index.js",
+      "types": "./dist/adapters/node/index.d.ts"
+    },
+    "./adapters/cf-worker": {
+      "import": "./dist/adapters/cf-worker/index.js",
+      "types": "./dist/adapters/cf-worker/index.d.ts"
+    }
+  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "prettier": "@shopify/prettier-config",
   "scripts": {
-    "test": "jest --testPathIgnorePatterns=src/rest-resources/__tests__ --testPathIgnorePatterns=src/auth/session/storage",
-    "test_sessionstorage": "jest src/auth/session/storage",
-    "test_rest_resources": "ls src/rest-resources/__tests__ | xargs -I \"{}\" sh -c 'yarn jest --no-coverage --testPathPattern=\\\"{}\\\" || exit 255'",
+    "test:all": "jest",
+    "test": "jest --selectProjects library",
+    "pretest:adapters": "yarn build",
+    "test:adapters": "jest --selectProjects adapters:mock adapters:node adapters:cf-worker",
+    "test:session_storage": "jest --selectProjects session_storage",
+    "test:rest_resources": "jest --selectProjects rest_resources",
+    "lint": "jest --selectProjects lint",
+    "test:dev": "jest --selectProjects library lint",
     "build": "tsc",
-    "lint": "eslint '**/*.{ts,tsx}' --max-warnings 0",
     "clean": "rimraf ./dist tsconfig.tsbuildinfo",
     "prepublishOnly": "yarn run build",
     "preversion": "yarn run test",
@@ -45,21 +71,21 @@
   },
   "dependencies": {
     "@shopify/network": "^1.5.1",
-    "@types/jsonwebtoken": "^8.5.0",
     "@types/node-fetch": "^2.5.7",
     "@types/supertest": "^2.0.10",
     "cookies": "^0.8.0",
-    "jsonwebtoken": "^8.5.1",
+    "jose": "^4.9.1",
     "mongodb": "^4.5.0",
     "mysql2": "^2.3.3",
     "node-fetch": "^2.6.1",
     "pg": "^8.7.3",
-    "redis": "^4.0.6",
+    "redis": "^4.1.0",
     "sqlite3": "^5.0.8",
     "tslib": "^2.0.3",
     "uuid": "^8.3.1"
   },
   "devDependencies": {
+    "@cloudflare/workers-types": "^3.14.1",
     "@shopify/eslint-plugin": "^41.1.0",
     "@shopify/prettier-config": "^1.1.2",
     "@types/cookies": "^0.7.5",
@@ -72,7 +98,10 @@
     "eslint-plugin-prettier": "^4.0.0",
     "express": "^4.17.1",
     "jest": "^27.4.3",
+    "jest-environment-miniflare": "^2.6.0",
     "jest-fetch-mock": "^3.0.3",
+    "jest-runner-eslint": "^1.0.1",
+    "miniflare": "^2.6.0",
     "prettier": "^2.5.1",
     "rimraf": "^3.0.2",
     "supertest": "^6.1.3",

package/dist/auth/oauth/index.d.ts

@@ -1,4 +0,0 @@
-import { ShopifyOAuth } from './oauth';
-export default ShopifyOAuth;
-export { ShopifyOAuth };
-//# sourceMappingURL=index.d.ts.map

package/dist/auth/oauth/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/auth/oauth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,SAAS,CAAC;AAErC,eAAe,YAAY,CAAC;AAC5B,OAAO,EAAC,YAAY,EAAC,CAAC"}

package/dist/auth/oauth/index.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ShopifyOAuth = void 0;
-var oauth_1 = require("./oauth");
-Object.defineProperty(exports, "ShopifyOAuth", { enumerable: true, get: function () { return oauth_1.ShopifyOAuth; } });
-exports.default = oauth_1.ShopifyOAuth;