@shopify/shopify-api 5.1.0 → 6.0.0-rc2

package/dist/session-storage/redis.d.ts

@@ -0,0 +1,24 @@
+import { RedisClientOptions } from 'redis';
+import { SessionInterface } from '../session/types';
+import { SessionStorage } from '../session/session_storage';
+export interface RedisSessionStorageOptions extends RedisClientOptions {
+    sessionKeyPrefix: string;
+    onError?: (...args: any[]) => void;
+}
+export declare class RedisSessionStorage extends SessionStorage {
+    private dbUrl;
+    static withCredentials(host: string, db: number, username: string, password: string, opts: Partial<RedisSessionStorageOptions>): RedisSessionStorage;
+    readonly ready: Promise<void>;
+    private options;
+    private client;
+    constructor(dbUrl: URL, opts?: Partial<RedisSessionStorageOptions>);
+    storeSession(session: SessionInterface): Promise<boolean>;
+    loadSession(id: string): Promise<SessionInterface | undefined>;
+    deleteSession(id: string): Promise<boolean>;
+    deleteSessions(ids: string[]): Promise<boolean>;
+    findSessionsByShop(shop: string): Promise<SessionInterface[]>;
+    disconnect(): Promise<void>;
+    private fullKey;
+    private init;
+}
+//# sourceMappingURL=redis.d.ts.map

package/dist/session-storage/redis.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../src/session-storage/redis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,kBAAkB,EAAC,MAAM,OAAO,CAAC;AAEvD,OAAO,EAAC,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAK1D,MAAM,WAAW,0BAA2B,SAAQ,kBAAkB;IACpE,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CACpC;AAKD,qBAAa,mBAAoB,SAAQ,cAAc;IAuBnD,OAAO,CAAC,KAAK;IAtBf,MAAM,CAAC,eAAe,CACpB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,CAAC,0BAA0B,CAAC;IAY3C,SAAgB,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,MAAM,CAAc;gBAGlB,KAAK,EAAE,GAAG,EAClB,IAAI,GAAE,OAAO,CAAC,0BAA0B,CAAM;IAWnC,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAUzD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAW9D,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAM3C,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAM/C,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAiB7D,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC,OAAO,CAAC,OAAO;YAID,IAAI;CAUnB"}

package/dist/session-storage/redis.js

@@ -0,0 +1,177 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisSessionStorage = void 0;
+var tslib_1 = require("tslib");
+var redis_1 = require("redis");
+var session_storage_1 = require("../session/session_storage");
+var session_utils_1 = require("../session/session-utils");
+var shop_validator_1 = require("../utils/shop-validator");
+var defaultRedisSessionStorageOptions = {
+    sessionKeyPrefix: 'shopify_sessions',
+};
+var RedisSessionStorage = /** @class */ (function (_super) {
+    tslib_1.__extends(RedisSessionStorage, _super);
+    function RedisSessionStorage(dbUrl, opts) {
+        if (opts === void 0) { opts = {}; }
+        var _this = _super.call(this) || this;
+        _this.dbUrl = dbUrl;
+        if (typeof _this.dbUrl === 'string') {
+            _this.dbUrl = new URL(_this.dbUrl);
+        }
+        _this.options = tslib_1.__assign(tslib_1.__assign({}, defaultRedisSessionStorageOptions), opts);
+        _this.ready = _this.init();
+        return _this;
+    }
+    RedisSessionStorage.withCredentials = function (host, db, username, password, opts) {
+        return new RedisSessionStorage(new URL("redis://".concat(encodeURIComponent(username), ":").concat(encodeURIComponent(password), "@").concat(host, "/").concat(db)), opts);
+    };
+    RedisSessionStorage.prototype.storeSession = function (session) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.ready];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, this.client.set(this.fullKey(session.id), JSON.stringify((0, session_utils_1.sessionEntries)(session)))];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    RedisSessionStorage.prototype.loadSession = function (id) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var rawResult;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.ready];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, this.client.get(this.fullKey(id))];
+                    case 2:
+                        rawResult = _a.sent();
+                        if (!rawResult)
+                            return [2 /*return*/, undefined];
+                        rawResult = JSON.parse(rawResult);
+                        return [2 /*return*/, (0, session_utils_1.sessionFromEntries)(rawResult)];
+                }
+            });
+        });
+    };
+    RedisSessionStorage.prototype.deleteSession = function (id) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.ready];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, this.client.del(this.fullKey(id))];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    RedisSessionStorage.prototype.deleteSessions = function (ids) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.ready];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, this.client.del(ids.map(function (id) { return _this.fullKey(id); }))];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    RedisSessionStorage.prototype.findSessionsByShop = function (shop) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var cleanShop, keys, results, keys_1, keys_1_1, key, rawResult, session, e_1_1;
+            var e_1, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, this.ready];
+                    case 1:
+                        _b.sent();
+                        cleanShop = (0, shop_validator_1.createSanitizeShop)(this.config)(shop, true);
+                        return [4 /*yield*/, this.client.keys('*')];
+                    case 2:
+                        keys = _b.sent();
+                        results = [];
+                        _b.label = 3;
+                    case 3:
+                        _b.trys.push([3, 8, 9, 10]);
+                        keys_1 = tslib_1.__values(keys), keys_1_1 = keys_1.next();
+                        _b.label = 4;
+                    case 4:
+                        if (!!keys_1_1.done) return [3 /*break*/, 7];
+                        key = keys_1_1.value;
+                        return [4 /*yield*/, this.client.get(key)];
+                    case 5:
+                        rawResult = _b.sent();
+                        if (!rawResult)
+                            return [3 /*break*/, 6];
+                        session = (0, session_utils_1.sessionFromEntries)(JSON.parse(rawResult));
+                        if (session.shop === cleanShop)
+                            results.push(session);
+                        _b.label = 6;
+                    case 6:
+                        keys_1_1 = keys_1.next();
+                        return [3 /*break*/, 4];
+                    case 7: return [3 /*break*/, 10];
+                    case 8:
+                        e_1_1 = _b.sent();
+                        e_1 = { error: e_1_1 };
+                        return [3 /*break*/, 10];
+                    case 9:
+                        try {
+                            if (keys_1_1 && !keys_1_1.done && (_a = keys_1.return)) _a.call(keys_1);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                        return [7 /*endfinally*/];
+                    case 10: return [2 /*return*/, results];
+                }
+            });
+        });
+    };
+    RedisSessionStorage.prototype.disconnect = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.client.quit()];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    RedisSessionStorage.prototype.fullKey = function (name) {
+        return "".concat(this.options.sessionKeyPrefix, "_").concat(name);
+    };
+    RedisSessionStorage.prototype.init = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.client = (0, redis_1.createClient)(tslib_1.__assign(tslib_1.__assign({}, this.options), { url: this.dbUrl.toString() }));
+                        if (this.options.onError) {
+                            this.client.on('error', this.options.onError);
+                        }
+                        return [4 /*yield*/, this.client.connect()];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return RedisSessionStorage;
+}(session_storage_1.SessionStorage));
+exports.RedisSessionStorage = RedisSessionStorage;

package/dist/session-storage/sqlite.d.ts

@@ -0,0 +1,21 @@
+import { SessionInterface } from '../session/types';
+import { SessionStorage } from '../session/session_storage';
+export interface SQLiteSessionStorageOptions {
+    sessionTableName: string;
+}
+export declare class SQLiteSessionStorage extends SessionStorage {
+    private filename;
+    private options;
+    private db;
+    private ready;
+    constructor(filename: string, opts?: Partial<SQLiteSessionStorageOptions>);
+    storeSession(session: SessionInterface): Promise<boolean>;
+    loadSession(id: string): Promise<SessionInterface | undefined>;
+    deleteSession(id: string): Promise<boolean>;
+    deleteSessions(ids: string[]): Promise<boolean>;
+    findSessionsByShop(shop: string): Promise<SessionInterface[]>;
+    private hasSessionTable;
+    private init;
+    private query;
+}
+//# sourceMappingURL=sqlite.d.ts.map

package/dist/session-storage/sqlite.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../src/session-storage/sqlite.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAI1D,MAAM,WAAW,2BAA2B;IAC1C,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAKD,qBAAa,oBAAqB,SAAQ,cAAc;IAMpD,OAAO,CAAC,QAAQ;IALlB,OAAO,CAAC,OAAO,CAA8B;IAC7C,OAAO,CAAC,EAAE,CAAmB;IAC7B,OAAO,CAAC,KAAK,CAAgB;gBAGnB,QAAQ,EAAE,MAAM,EACxB,IAAI,GAAE,OAAO,CAAC,2BAA2B,CAAM;IASpC,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAkBzD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAa9D,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAU3C,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAU/C,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAiB5D,eAAe;YAWf,IAAI;IAmBlB,OAAO,CAAC,KAAK;CAWd"}

package/dist/session-storage/sqlite.js

@@ -0,0 +1,174 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLiteSessionStorage = void 0;
+var tslib_1 = require("tslib");
+var sqlite3_1 = tslib_1.__importDefault(require("sqlite3"));
+var session_storage_1 = require("../session/session_storage");
+var session_utils_1 = require("../session/session-utils");
+var shop_validator_1 = require("../utils/shop-validator");
+var defaultSQLiteSessionStorageOptions = {
+    sessionTableName: 'shopify_sessions',
+};
+var SQLiteSessionStorage = /** @class */ (function (_super) {
+    tslib_1.__extends(SQLiteSessionStorage, _super);
+    function SQLiteSessionStorage(filename, opts) {
+        if (opts === void 0) { opts = {}; }
+        var _this = _super.call(this) || this;
+        _this.filename = filename;
+        _this.options = tslib_1.__assign(tslib_1.__assign({}, defaultSQLiteSessionStorageOptions), opts);
+        _this.db = new sqlite3_1.default.Database(_this.filename);
+        _this.ready = _this.init();
+        return _this;
+    }
+    SQLiteSessionStorage.prototype.storeSession = function (session) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var entries, query;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.ready];
+                    case 1:
+                        _a.sent();
+                        entries = (0, session_utils_1.sessionEntries)(session);
+                        query = "\n      INSERT OR REPLACE INTO ".concat(this.options.sessionTableName, "\n      (").concat(entries.map(function (_a) {
+                            var _b = tslib_1.__read(_a, 1), key = _b[0];
+                            return key;
+                        }).join(', '), ")\n      VALUES (").concat(entries.map(function () { return '?'; }).join(', '), ");\n    ");
+                        return [4 /*yield*/, this.query(query, entries.map(function (_a) {
+                                var _b = tslib_1.__read(_a, 2), _key = _b[0], value = _b[1];
+                                return value;
+                            }))];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    SQLiteSessionStorage.prototype.loadSession = function (id) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var query, rows, rawResult;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.ready];
+                    case 1:
+                        _a.sent();
+                        query = "\n      SELECT * FROM ".concat(this.options.sessionTableName, "\n      WHERE id = ?;\n    ");
+                        return [4 /*yield*/, this.query(query, [id])];
+                    case 2:
+                        rows = _a.sent();
+                        if (!Array.isArray(rows) || (rows === null || rows === void 0 ? void 0 : rows.length) !== 1)
+                            return [2 /*return*/, undefined];
+                        rawResult = rows[0];
+                        return [2 /*return*/, (0, session_utils_1.sessionFromEntries)(Object.entries(rawResult))];
+                }
+            });
+        });
+    };
+    SQLiteSessionStorage.prototype.deleteSession = function (id) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var query;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.ready];
+                    case 1:
+                        _a.sent();
+                        query = "\n      DELETE FROM ".concat(this.options.sessionTableName, "\n      WHERE id = ?;\n    ");
+                        return [4 /*yield*/, this.query(query, [id])];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    SQLiteSessionStorage.prototype.deleteSessions = function (ids) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var query;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.ready];
+                    case 1:
+                        _a.sent();
+                        query = "\n      DELETE FROM ".concat(this.options.sessionTableName, "\n      WHERE id IN (").concat(ids.map(function () { return '?'; }).join(','), ");\n    ");
+                        return [4 /*yield*/, this.query(query, ids)];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    SQLiteSessionStorage.prototype.findSessionsByShop = function (shop) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var cleanShop, query, rows, results;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        cleanShop = (0, shop_validator_1.createSanitizeShop)(this.config)(shop, true);
+                        return [4 /*yield*/, this.ready];
+                    case 1:
+                        _a.sent();
+                        query = "\n      SELECT * FROM ".concat(this.options.sessionTableName, "\n      WHERE shop = ?;\n    ");
+                        return [4 /*yield*/, this.query(query, [cleanShop])];
+                    case 2:
+                        rows = _a.sent();
+                        if (!Array.isArray(rows) || (rows === null || rows === void 0 ? void 0 : rows.length) === 0)
+                            return [2 /*return*/, []];
+                        results = rows.map(function (row) {
+                            return (0, session_utils_1.sessionFromEntries)(Object.entries(row));
+                        });
+                        return [2 /*return*/, results];
+                }
+            });
+        });
+    };
+    SQLiteSessionStorage.prototype.hasSessionTable = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var query, rows;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        query = "\n    SELECT name FROM sqlite_schema\n    WHERE\n      type = 'table' AND\n      name = ?;\n    ";
+                        return [4 /*yield*/, this.query(query, [this.options.sessionTableName])];
+                    case 1:
+                        rows = _a.sent();
+                        return [2 /*return*/, rows.length === 1];
+                }
+            });
+        });
+    };
+    SQLiteSessionStorage.prototype.init = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var hasSessionTable, query;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.hasSessionTable()];
+                    case 1:
+                        hasSessionTable = _a.sent();
+                        if (!!hasSessionTable) return [3 /*break*/, 3];
+                        query = "\n        CREATE TABLE ".concat(this.options.sessionTableName, " (\n          id varchar(255) NOT NULL PRIMARY KEY,\n          shop varchar(255) NOT NULL,\n          state varchar(255) NOT NULL,\n          isOnline integer NOT NULL,\n          expires integer,\n          scope varchar(255),\n          accessToken varchar(255),\n          onlineAccessInfo varchar(255)\n        )\n      ");
+                        return [4 /*yield*/, this.query(query)];
+                    case 2:
+                        _a.sent();
+                        _a.label = 3;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    SQLiteSessionStorage.prototype.query = function (sql, params) {
+        var _this = this;
+        if (params === void 0) { params = []; }
+        return new Promise(function (resolve, reject) {
+            _this.db.all(sql, params, function (err, result) {
+                if (err) {
+                    reject(err);
+                    return;
+                }
+                resolve(result);
+            });
+        });
+    };
+    return SQLiteSessionStorage;
+}(session_storage_1.SessionStorage));
+exports.SQLiteSessionStorage = SQLiteSessionStorage;

package/dist/setup-jest.d.ts

@@ -0,0 +1,2 @@
+import './adapters/mock';
+//# sourceMappingURL=setup-jest.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"setup-jest.d.ts","sourceRoot":"","sources":["../src/setup-jest.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC"}

package/dist/setup-jest.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("./adapters/mock");
+var mock_test_requests_1 = require("./adapters/mock/mock_test_requests");
+var http_1 = require("./runtime/http");
+beforeEach(function () {
+    mock_test_requests_1.mockTestRequests.reset();
+});
+afterEach(function () {
+    var remainingResponses = mock_test_requests_1.mockTestRequests.getResponses();
+    if (remainingResponses.length) {
+        throw new Error("Test did not check all expected responses, responses: ".concat(JSON.stringify(remainingResponses, undefined, 2)));
+    }
+});
+expect.extend({
+    /**
+     * Checks if two dates in the form of numbers are within seconds of each other
+     *
+     * @param received First date
+     * @param compareDate Second date
+     * @param seconds The number of seconds the first and second date should be within
+     */
+    toBeWithinSecondsOf: function (received, compareDate, seconds) {
+        if (received &&
+            compareDate &&
+            Math.abs(received - compareDate) <= seconds * 1000) {
+            return {
+                message: function () {
+                    return "expected ".concat(received, " not to be within ").concat(seconds, " seconds of ").concat(compareDate);
+                },
+                pass: true,
+            };
+        }
+        else {
+            return {
+                message: function () {
+                    return "expected ".concat(received, " to be within ").concat(seconds, " seconds of ").concat(compareDate);
+                },
+                pass: false,
+            };
+        }
+    },
+    toMatchMadeHttpRequest: function (_a) {
+        var method = _a.method, domain = _a.domain, path = _a.path, _b = _a.query, query = _b === void 0 ? '' : _b, _c = _a.headers, headers = _c === void 0 ? {} : _c, _d = _a.data, data = _d === void 0 ? undefined : _d, _e = _a.attempts, attempts = _e === void 0 ? 1 : _e;
+        var searchHeaders = (0, http_1.canonicalizeHeaders)(headers);
+        var searchUrl = new URL("https://".concat(domain).concat(path).concat(query ? "?".concat(query) : ''));
+        // We compare the sorted query items, so we can expect arguments in a different order
+        var searchQueryItems = Array.from(searchUrl.searchParams.entries()).sort();
+        var cleanSearchUrl = searchUrl.toString().split('?')[0];
+        for (var i = 0; i < attempts; i++) {
+            var matchingRequest = mock_test_requests_1.mockTestRequests.getRequest();
+            if (!matchingRequest) {
+                throw new Error("No request was made, but expected ".concat(JSON.stringify({ method: method, domain: domain, path: path }, undefined, 2)));
+            }
+            var requestUrl = new URL(matchingRequest.url);
+            var requestQueryItems = Array.from(requestUrl.searchParams.entries()).sort();
+            var cleanRequestUrl = requestUrl.toString().split('?')[0];
+            expect(matchingRequest).not.toBeNull();
+            expect(matchingRequest.method).toEqual(method);
+            expect(matchingRequest.headers).toMatchObject(searchHeaders);
+            expect(cleanRequestUrl).toEqual(cleanSearchUrl);
+            expect(requestQueryItems).toEqual(searchQueryItems);
+            if (data) {
+                if (typeof data === 'string' ||
+                    data.constructor.name === 'StringContaining') {
+                    expect(matchingRequest.body).toEqual(data);
+                }
+                else {
+                    var requestBody = typeof matchingRequest.body === 'string'
+                        ? JSON.parse(matchingRequest.body)
+                        : matchingRequest.body;
+                    expect(requestBody).toMatchObject(data);
+                }
+            }
+            else {
+                expect(matchingRequest.body).toBeFalsy();
+            }
+        }
+        return {
+            message: function () { return "expected to have seen the right HTTP requests"; },
+            pass: true,
+        };
+    },
+});

package/dist/types.d.ts

@@ -1,7 +1,3 @@
 export * from './base-types';
-export * from './auth/types';
-export * from './billing/types';
-export * from './clients/types';
-export * from './utils/types';
-export * from './webhooks/types';
+export * from './session/types';
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC"}

package/dist/types.js

@@ -2,8 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./base-types"), exports);
-tslib_1.__exportStar(require("./auth/types"), exports);
-tslib_1.__exportStar(require("./billing/types"), exports);
-tslib_1.__exportStar(require("./clients/types"), exports);
-tslib_1.__exportStar(require("./utils/types"), exports);
-tslib_1.__exportStar(require("./webhooks/types"), exports);
+tslib_1.__exportStar(require("./session/types"), exports);

package/dist/utils/get-hmac-key.d.ts

@@ -0,0 +1,2 @@
+export declare function getHMACKey(key: string): Uint8Array;
+//# sourceMappingURL=get-hmac-key.d.ts.map

package/dist/utils/get-hmac-key.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-hmac-key.d.ts","sourceRoot":"","sources":["../../src/utils/get-hmac-key.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAOlD"}

package/dist/utils/get-hmac-key.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getHMACKey = void 0;
+function getHMACKey(key) {
+    var arrayBuffer = new Uint8Array(key.length);
+    for (var i = 0, keyLen = key.length; i < keyLen; i++) {
+        arrayBuffer[i] = key.charCodeAt(i);
+    }
+    return arrayBuffer;
+}
+exports.getHMACKey = getHMACKey;

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

@@ -1,10 +1,5 @@
+import { ConfigInterface } from '../base-types';
 import { AuthQuery } from '../auth/oauth/types';
-export declare function stringifyQuery(query: AuthQuery): string;
-export declare function generateLocalHmac({ code, timestamp, state, shop, host, }: AuthQuery): string;
-/**
- * Uses the received query to validate the contained hmac value against the rest of the query content.
- *
- * @param query HTTP Request Query, containing the information to be validated.
- */
-export default function validateHmac(query: AuthQuery): boolean;
+export declare function createGenerateLocalHmac(config: ConfigInterface): ({ code, timestamp, state, shop, host, }: AuthQuery) => Promise<string>;
+export declare function createValidateHmac(config: ConfigInterface): (query: AuthQuery) => Promise<boolean>;
 //# sourceMappingURL=hmac-validator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"hmac-validator.d.ts","sourceRoot":"","sources":["../../src/utils/hmac-validator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAM9C,wBAAgB,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAWvD;AAED,wBAAgB,iBAAiB,CAAC,EAChC,IAAI,EACJ,SAAS,EACT,KAAK,EACL,IAAI,EACJ,IAAI,GACL,EAAE,SAAS,GAAG,MAAM,CAYpB;AAED;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAU9D"}
+{"version":3,"file":"hmac-validator.d.ts","sourceRoot":"","sources":["../../src/utils/hmac-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAG9C,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAe9C,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,eAAe,6CAO1D,SAAS,KAAG,QAAQ,MAAM,CAAC,CAW/B;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,eAAe,WACnC,SAAS,KAAG,QAAQ,OAAO,CAAC,CAWlD"}

package/dist/utils/hmac-validator.js

@@ -1,42 +1,50 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateLocalHmac = exports.stringifyQuery = void 0;
+exports.createValidateHmac = exports.createGenerateLocalHmac = void 0;
 var tslib_1 = require("tslib");
-var crypto_1 = tslib_1.__importDefault(require("crypto"));
-var querystring_1 = tslib_1.__importDefault(require("querystring"));
+var crypto_1 = require("../runtime/crypto");
+var types_1 = require("../runtime/crypto/types");
 var ShopifyErrors = tslib_1.__importStar(require("../error"));
-var context_1 = require("../context");
-var safe_compare_1 = tslib_1.__importDefault(require("./safe-compare"));
+var safe_compare_1 = require("../auth/oauth/safe-compare");
+var processed_query_1 = tslib_1.__importDefault(require("./processed-query"));
 function stringifyQuery(query) {
-    var orderedObj = Object.keys(query)
+    var processedQuery = new processed_query_1.default();
+    Object.keys(query)
         .sort(function (val1, val2) { return val1.localeCompare(val2); })
-        .reduce(function (obj, key) {
-        var _a;
-        return (tslib_1.__assign(tslib_1.__assign({}, obj), (_a = {}, _a[key] = query[key], _a)));
-    }, {});
-    return querystring_1.default.stringify(orderedObj);
+        .forEach(function (key) { return processedQuery.put(key, query[key]); });
+    return processedQuery.stringify(true);
 }
-exports.stringifyQuery = stringifyQuery;
-function generateLocalHmac(_a) {
-    var code = _a.code, timestamp = _a.timestamp, state = _a.state, shop = _a.shop, host = _a.host;
-    var queryString = stringifyQuery(tslib_1.__assign({ code: code, timestamp: timestamp, state: state, shop: shop }, (host && { host: host })));
-    return crypto_1.default
-        .createHmac('sha256', context_1.Context.API_SECRET_KEY)
-        .update(queryString)
-        .digest('hex');
+function createGenerateLocalHmac(config) {
+    var _this = this;
+    return function (_a) {
+        var code = _a.code, timestamp = _a.timestamp, state = _a.state, shop = _a.shop, host = _a.host;
+        return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var queryString;
+            return tslib_1.__generator(this, function (_b) {
+                queryString = stringifyQuery(tslib_1.__assign({ code: code, timestamp: timestamp, state: state, shop: shop }, (host && { host: host })));
+                return [2 /*return*/, (0, crypto_1.createSHA256HMAC)(config.apiSecretKey, queryString, types_1.HashFormat.Hex)];
+            });
+        });
+    };
 }
-exports.generateLocalHmac = generateLocalHmac;
-/**
- * Uses the received query to validate the contained hmac value against the rest of the query content.
- *
- * @param query HTTP Request Query, containing the information to be validated.
- */
-function validateHmac(query) {
-    if (!query.hmac) {
-        throw new ShopifyErrors.InvalidHmacError('Query does not contain an HMAC value.');
-    }
-    var hmac = query.hmac;
-    var localHmac = generateLocalHmac(query);
-    return (0, safe_compare_1.default)(hmac, localHmac);
+exports.createGenerateLocalHmac = createGenerateLocalHmac;
+function createValidateHmac(config) {
+    var _this = this;
+    return function (query) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        var hmac, localHmac;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!query.hmac) {
+                        throw new ShopifyErrors.InvalidHmacError('Query does not contain an HMAC value.');
+                    }
+                    hmac = query.hmac;
+                    return [4 /*yield*/, createGenerateLocalHmac(config)(query)];
+                case 1:
+                    localHmac = _a.sent();
+                    return [2 /*return*/, (0, safe_compare_1.safeCompare)(hmac, localHmac)];
+            }
+        });
+    }); };
 }
-exports.default = validateHmac;
+exports.createValidateHmac = createValidateHmac;