@shopify/shopify-api 3.1.0 → 3.1.2

package/CHANGELOG.md

@@ -5,7 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## [3.1.1] - 2022-06-07
+
+### Added
+- Store user id and expiration date of online tokens
+
+### Fixes
+- Properly parse a non-json HTTP response [#257](https://github.com/Shopify/shopify-node-api/issues/257)
+- Don’t create a SQLite DB file if the SQLite storage is not used.
+
 
 ## [3.1.0] - 2022-05-16
 

package/dist/auth/session/session-utils.d.ts

@@ -4,4 +4,5 @@ import type { SessionInterface } from './types';
  */
 export declare function sessionFromEntries(entries: [string, string | number][]): SessionInterface;
 export declare function sessionEntries(session: SessionInterface): [string, string | number][];
+export declare function sessionEqual(sessionA: SessionInterface | undefined, sessionB: SessionInterface | undefined): boolean;
 //# sourceMappingURL=session-utils.d.ts.map

package/dist/auth/session/session-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-utils.d.ts","sourceRoot":"","sources":["../../../src/auth/session/session-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAE9C;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,GACnC,gBAAgB,CAsBlB;AAUD,wBAAgB,cAAc,CAC5B,OAAO,EAAE,gBAAgB,GACxB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,CAE7B"}
+{"version":3,"file":"session-utils.d.ts","sourceRoot":"","sources":["../../../src/auth/session/session-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAE9C;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,GACnC,gBAAgB,CAgDlB;AAYD,wBAAgB,cAAc,CAC5B,OAAO,EAAE,gBAAgB,GACxB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,CAmB7B;AAED,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,gBAAgB,GAAG,SAAS,EACtC,QAAQ,EAAE,gBAAgB,GAAG,SAAS,GACrC,OAAO,CAMT"}

package/dist/auth/session/session-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sessionEntries = exports.sessionFromEntries = void 0;
+exports.sessionEqual = exports.sessionEntries = exports.sessionFromEntries = void 0;
 var tslib_1 = require("tslib");
 /**
  * Like Object.fromEntries(), but normalizes the keys and filters out null values.
@@ -11,6 +11,7 @@ function sessionFromEntries(entries) {
         var _b = tslib_1.__read(_a, 2), _key = _b[0], value = _b[1];
         return value !== null;
     })
+        // Sanitize keys
         .map(function (_a) {
         var _b = tslib_1.__read(_a, 2), key = _b[0], value = _b[1];
         switch (key.toLowerCase()) {
@@ -18,18 +19,42 @@ function sessionFromEntries(entries) {
                 return ['isOnline', value];
             case 'accesstoken':
                 return ['accessToken', value];
+            case 'onlineaccessinfo':
+                return ['onlineAccessInfo', value];
             default:
                 return [key.toLowerCase(), value];
         }
+    })
+        // Sanitize values
+        .map(function (_a) {
+        var _b = tslib_1.__read(_a, 2), key = _b[0], value = _b[1];
+        switch (key) {
+            case 'isOnline':
+                if (typeof value === 'string') {
+                    return [key, value.toString().toLowerCase() === 'true'];
+                }
+                else if (typeof value === 'number') {
+                    return [key, Boolean(value)];
+                }
+                return [key, value];
+            case 'scope':
+                return [key, value.toString()];
+            case 'expires':
+                return [key, value ? new Date(Number(value) * 1000) : undefined];
+            case 'onlineAccessInfo':
+                return [
+                    key,
+                    {
+                        // eslint-disable-next-line  @typescript-eslint/naming-convention
+                        associated_user: {
+                            id: Number(value),
+                        },
+                    },
+                ];
+            default:
+                return [key, value];
+        }
     }));
-    if (typeof obj.isOnline === 'string') {
-        obj.isOnline = obj.isOnline.toString().toLowerCase() === 'true';
-    }
-    else if (typeof obj.isOnline === 'number') {
-        obj.isOnline = Boolean(obj.isOnline);
-    }
-    if (obj.scope)
-        obj.scope = obj.scope.toString();
     return obj;
 }
 exports.sessionFromEntries = sessionFromEntries;
@@ -40,11 +65,40 @@ var includedKeys = [
     'isOnline',
     'scope',
     'accessToken',
+    'expires',
+    'onlineAccessInfo',
 ];
 function sessionEntries(session) {
-    return Object.entries(session).filter(function (_a) {
+    return (Object.entries(session)
+        .filter(function (_a) {
         var _b = tslib_1.__read(_a, 1), key = _b[0];
         return includedKeys.includes(key);
-    });
+    })
+        // Prepare values for db storage
+        .map(function (_a) {
+        var _b;
+        var _c = tslib_1.__read(_a, 2), key = _c[0], value = _c[1];
+        switch (key) {
+            case 'expires':
+                return [
+                    key,
+                    value ? Math.floor(value.getTime() / 1000) : undefined,
+                ];
+            case 'onlineAccessInfo':
+                return [key, (_b = value === null || value === void 0 ? void 0 : value.associated_user) === null || _b === void 0 ? void 0 : _b.id];
+            default:
+                return [key, value];
+        }
+    }));
 }
 exports.sessionEntries = sessionEntries;
+function sessionEqual(sessionA, sessionB) {
+    if (!sessionA)
+        return false;
+    if (!sessionB)
+        return false;
+    var copyA = sessionFromEntries(sessionEntries(sessionA));
+    var copyB = sessionFromEntries(sessionEntries(sessionB));
+    return JSON.stringify(copyA) === JSON.stringify(copyB);
+}
+exports.sessionEqual = sessionEqual;

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

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

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

@@ -3,59 +3,161 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.batteryOfTests = void 0;
 var tslib_1 = require("tslib");
 var session_1 = require("../../session");
+var session_utils_1 = require("../../session-utils");
 function batteryOfTests(storageFactory) {
     var _this = this;
-    it('can store and delete offline sessions', function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-        var storage, sessionId, session;
-        return tslib_1.__generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, storageFactory()];
-                case 1:
-                    storage = _a.sent();
+    it('can store and delete all kinds of sessions', function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        var sessionFactories, sessionId, storage, sessionFactories_1, sessionFactories_1_1, factory, session, _a, _b, _c, _d, e_1_1;
+        var e_1, _e;
+        var _this = this;
+        return tslib_1.__generator(this, function (_f) {
+            switch (_f.label) {
+                case 0:
+                    sessionFactories = [
+                        function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            var session;
+                            return tslib_1.__generator(this, function (_a) {
+                                session = new session_1.Session(sessionId, 'shop', 'state', false);
+                                return [2 /*return*/, session];
+                            });
+                        }); },
+                        function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            var session, expiryDate;
+                            return tslib_1.__generator(this, function (_a) {
+                                session = new session_1.Session(sessionId, 'shop', 'state', false);
+                                expiryDate = new Date();
+                                expiryDate.setMinutes(expiryDate.getMinutes() + 60);
+                                session.expires = expiryDate;
+                                return [2 /*return*/, session];
+                            });
+                        }); },
+                        function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            var session;
+                            return tslib_1.__generator(this, function (_a) {
+                                session = new session_1.Session(sessionId, 'shop', 'state', false);
+                                session.expires = null;
+                                return [2 /*return*/, session];
+                            });
+                        }); },
+                        function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            var session;
+                            return tslib_1.__generator(this, function (_a) {
+                                session = new session_1.Session(sessionId, 'shop', 'state', false);
+                                session.expires = undefined;
+                                return [2 /*return*/, session];
+                            });
+                        }); },
+                        function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            var session;
+                            return tslib_1.__generator(this, function (_a) {
+                                session = new session_1.Session(sessionId, 'shop', 'state', false);
+                                // eslint-disable-next-line  @typescript-eslint/naming-convention
+                                session.onlineAccessInfo = { associated_user: {} };
+                                session.onlineAccessInfo.associated_user.id = 123;
+                                return [2 /*return*/, session];
+                            });
+                        }); },
+                    ];
                     sessionId = 'test_session';
-                    session = new session_1.Session(sessionId, 'shop', 'state', false);
-                    return [4 /*yield*/, expect(storage.storeSession(session)).resolves.toBe(true)];
+                    return [4 /*yield*/, storageFactory()];
+                case 1:
+                    storage = _f.sent();
+                    _f.label = 2;
                 case 2:
-                    _a.sent();
-                    return [4 /*yield*/, expect(storage.loadSession(sessionId)).resolves.toEqual(session)];
+                    _f.trys.push([2, 14, 15, 16]);
+                    sessionFactories_1 = tslib_1.__values(sessionFactories), sessionFactories_1_1 = sessionFactories_1.next();
+                    _f.label = 3;
                 case 3:
-                    _a.sent();
-                    return [4 /*yield*/, expect(storage.storeSession(session)).resolves.toBe(true)];
+                    if (!!sessionFactories_1_1.done) return [3 /*break*/, 13];
+                    factory = sessionFactories_1_1.value;
+                    return [4 /*yield*/, factory()];
                 case 4:
-                    _a.sent();
-                    return [4 /*yield*/, expect(storage.loadSession(sessionId)).resolves.toEqual(session)];
+                    session = _f.sent();
+                    return [4 /*yield*/, expect(storage.storeSession(session)).resolves.toBe(true)];
                 case 5:
-                    _a.sent();
-                    return [4 /*yield*/, expect(storage.deleteSession(sessionId)).resolves.toBe(true)];
+                    _f.sent();
+                    _a = expect;
+                    _b = session_utils_1.sessionEqual;
+                    return [4 /*yield*/, storage.loadSession(sessionId)];
                 case 6:
-                    _a.sent();
-                    return [4 /*yield*/, expect(storage.loadSession(sessionId)).resolves.toBeUndefined()];
+                    _a.apply(void 0, [_b.apply(void 0, [_f.sent(), session])]).toBe(true);
+                    return [4 /*yield*/, expect(storage.storeSession(session)).resolves.toBe(true)];
                 case 7:
-                    _a.sent();
+                    _f.sent();
+                    _c = expect;
+                    _d = session_utils_1.sessionEqual;
+                    return [4 /*yield*/, storage.loadSession(sessionId)];
+                case 8:
+                    _c.apply(void 0, [_d.apply(void 0, [_f.sent(), session])]).toBe(true);
+                    return [4 /*yield*/, expect(storage.deleteSession(sessionId)).resolves.toBe(true)];
+                case 9:
+                    _f.sent();
+                    return [4 /*yield*/, expect(storage.loadSession(sessionId)).resolves.toBeUndefined()];
+                case 10:
+                    _f.sent();
                     // Deleting a non-existing session should work
                     return [4 /*yield*/, expect(storage.deleteSession(sessionId)).resolves.toBe(true)];
-                case 8:
+                case 11:
                     // Deleting a non-existing session should work
-                    _a.sent();
+                    _f.sent();
+                    _f.label = 12;
+                case 12:
+                    sessionFactories_1_1 = sessionFactories_1.next();
+                    return [3 /*break*/, 3];
+                case 13: return [3 /*break*/, 16];
+                case 14:
+                    e_1_1 = _f.sent();
+                    e_1 = { error: e_1_1 };
+                    return [3 /*break*/, 16];
+                case 15:
+                    try {
+                        if (sessionFactories_1_1 && !sessionFactories_1_1.done && (_e = sessionFactories_1.return)) _e.call(sessionFactories_1);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                    return [7 /*endfinally*/];
+                case 16: return [2 /*return*/];
+            }
+        });
+    }); });
+    it('can store sessions with unexpected fields', function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        var storage, sessionId, session, _a, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0: return [4 /*yield*/, storageFactory()];
+                case 1:
+                    storage = _c.sent();
+                    sessionId = 'test_session';
+                    session = new session_1.Session(sessionId, 'shop', 'state', true);
+                    session.someField = 'lol';
+                    return [4 /*yield*/, expect(storage.storeSession(session)).resolves.toBe(true)];
+                case 2:
+                    _c.sent();
+                    _a = expect;
+                    _b = session_utils_1.sessionEqual;
+                    return [4 /*yield*/, storage.loadSession(sessionId)];
+                case 3:
+                    _a.apply(void 0, [_b.apply(void 0, [_c.sent(), session])]).toBe(true);
                     return [2 /*return*/];
             }
         });
     }); });
     it('can store and delete sessions with online tokens', function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-        var storage, sessionId, session;
-        return tslib_1.__generator(this, function (_a) {
-            switch (_a.label) {
+        var storage, sessionId, session, _a, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
                 case 0: return [4 /*yield*/, storageFactory()];
                 case 1:
-                    storage = _a.sent();
+                    storage = _c.sent();
                     sessionId = 'test_session';
                     session = new session_1.Session(sessionId, 'shop', 'state', true);
                     return [4 /*yield*/, expect(storage.storeSession(session)).resolves.toBe(true)];
                 case 2:
-                    _a.sent();
-                    return [4 /*yield*/, expect(storage.loadSession(sessionId)).resolves.toEqual(session)];
+                    _c.sent();
+                    _a = expect;
+                    _b = session_utils_1.sessionEqual;
+                    return [4 /*yield*/, storage.loadSession(sessionId)];
                 case 3:
-                    _a.sent();
+                    _a.apply(void 0, [_b.apply(void 0, [_c.sent(), session])]).toBe(true);
                     return [2 /*return*/];
             }
         });

package/dist/auth/session/storage/mysql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mysql.d.ts","sourceRoot":"","sources":["../../../../src/auth/session/storage/mysql.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAGlD,MAAM,WAAW,0BAA0B;IACzC,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAKD,qBAAa,mBAAoB,YAAW,cAAc;IAuBtD,OAAO,CAAC,KAAK;IAtBf,MAAM,CAAC,eAAe,CACpB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,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,UAAU,CAAmB;gBAG3B,KAAK,EAAE,GAAG,EAClB,IAAI,GAAE,OAAO,CAAC,0BAA0B,CAAM;IASnC,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBzD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAY9D,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAU3C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAI1B,IAAI;YAKJ,eAAe;YAQf,WAAW;IAiBzB,OAAO,CAAC,KAAK;CAGd"}
+{"version":3,"file":"mysql.d.ts","sourceRoot":"","sources":["../../../../src/auth/session/storage/mysql.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAGlD,MAAM,WAAW,0BAA0B;IACzC,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAKD,qBAAa,mBAAoB,YAAW,cAAc;IAuBtD,OAAO,CAAC,KAAK;IAtBf,MAAM,CAAC,eAAe,CACpB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,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,UAAU,CAAmB;gBAG3B,KAAK,EAAE,GAAG,EAClB,IAAI,GAAE,OAAO,CAAC,0BAA0B,CAAM;IASnC,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBzD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAY9D,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAU3C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAI1B,IAAI;YAKJ,eAAe;YAQf,WAAW;IAmBzB,OAAO,CAAC,KAAK;CAGd"}

package/dist/auth/session/storage/mysql.js

@@ -135,7 +135,7 @@ var MySQLSessionStorage = /** @class */ (function () {
                     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 tinyint NOT NULL,\n          scope varchar(255),\n          accessToken varchar(255)\n        )\n      ");
+                        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 tinyint NOT NULL,\n          scope varchar(255),\n          expires integer,\n          onlineAccessInfo varchar(255),\n          accessToken varchar(255)\n        )\n      ");
                         return [4 /*yield*/, this.query(query)];
                     case 2:
                         _a.sent();

package/dist/auth/session/storage/postgresql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postgresql.d.ts","sourceRoot":"","sources":["../../../../src/auth/session/storage/postgresql.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAGlD,MAAM,WAAW,+BAA+B;IAC9C,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd;AAOD,qBAAa,wBAAyB,YAAW,cAAc;IAuB3D,OAAO,CAAC,KAAK;IAtBf,MAAM,CAAC,eAAe,CACpB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,CAAC,+BAA+B,CAAC;IAYhD,SAAgB,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,MAAM,CAAY;gBAGhB,KAAK,EAAE,GAAG,EAClB,IAAI,GAAE,OAAO,CAAC,+BAA+B,CAAM;IASxC,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBzD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAY9D,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUjD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAIpB,IAAI;YAMJ,aAAa;YAIb,eAAe;YAQf,WAAW;YAiBX,KAAK;CAIpB"}
+{"version":3,"file":"postgresql.d.ts","sourceRoot":"","sources":["../../../../src/auth/session/storage/postgresql.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAGlD,MAAM,WAAW,+BAA+B;IAC9C,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd;AAOD,qBAAa,wBAAyB,YAAW,cAAc;IAuB3D,OAAO,CAAC,KAAK;IAtBf,MAAM,CAAC,eAAe,CACpB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,CAAC,+BAA+B,CAAC;IAYhD,SAAgB,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,MAAM,CAAY;gBAGhB,KAAK,EAAE,GAAG,EAClB,IAAI,GAAE,OAAO,CAAC,+BAA+B,CAAM;IASxC,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBzD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAY9D,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUjD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAIpB,IAAI;YAMJ,aAAa;YAIb,eAAe;YAQf,WAAW;YAmBX,KAAK;CAIpB"}

package/dist/auth/session/storage/postgresql.js

@@ -143,7 +143,7 @@ var PostgreSQLSessionStorage = /** @class */ (function () {
                     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 boolean NOT NULL,\n          scope varchar(255),\n          accessToken varchar(255)\n        )\n      ");
+                        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 boolean NOT NULL,\n          scope varchar(255),\n          expires integer,\n          onlineAccessInfo varchar(255),\n          accessToken varchar(255)\n        )\n      ");
                         return [4 /*yield*/, this.query(query)];
                     case 2:
                         _a.sent();

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

@@ -1 +1 @@
-{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../../../src/auth/session/storage/sqlite.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAGlD,MAAM,WAAW,2BAA2B;IAC1C,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAKD,qBAAa,oBAAqB,YAAW,cAAc;IAMvD,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;IAOpC,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;YAU1C,eAAe;YAWf,IAAI;IAiBlB,OAAO,CAAC,KAAK;CAWd"}
+{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../../../src/auth/session/storage/sqlite.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAGlD,MAAM,WAAW,2BAA2B;IAC1C,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAKD,qBAAa,oBAAqB,YAAW,cAAc;IAMvD,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;IAOpC,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;YAU1C,eAAe;YAWf,IAAI;IAmBlB,OAAO,CAAC,KAAK;CAWd"}

package/dist/auth/session/storage/sqlite.js

@@ -24,7 +24,10 @@ var SQLiteSessionStorage = /** @class */ (function () {
                     case 1:
                         _a.sent();
                         entries = (0, session_utils_1.sessionEntries)(session);
-                        query = "\n      INSERT OR REPLACE INTO ".concat(this.options.sessionTableName, "\n      (").concat(Object.keys(session).join(', '), ")\n      VALUES (").concat(entries.map(function () { return '?'; }).join(', '), ");\n    ");
+                        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;
@@ -97,7 +100,7 @@ var SQLiteSessionStorage = /** @class */ (function () {
                     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 tinyint NOT NULL,\n          scope varchar(255),\n          accessToken varchar(255)\n        )\n      ");
+                        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();

package/dist/clients/http_client/http_client.d.ts

@@ -1,5 +1,5 @@
 import { DeleteRequestParams, GetRequestParams, PostRequestParams, PutRequestParams, RequestParams, RequestReturn } from './types';
-declare class HttpClient {
+export declare class HttpClient {
     private domain;
     static readonly RETRY_WAIT_TIME = 1000;
     static readonly DEPRECATION_ALERT_DELAY = 300000;
@@ -25,5 +25,4 @@ declare class HttpClient {
     protected getRequestPath(path: string): string;
     private doRequest;
 }
-export { HttpClient };
 //# sourceMappingURL=http_client.d.ts.map

package/dist/clients/http_client/http_client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http_client.d.ts","sourceRoot":"","sources":["../../../src/clients/http_client/http_client.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,aAAa,EACd,MAAM,SAAS,CAAC;AAEjB,cAAM,UAAU;IAOK,OAAO,CAAC,MAAM;IALjC,MAAM,CAAC,QAAQ,CAAC,eAAe,QAAQ;IAEvC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,UAAU;IACjD,OAAO,CAAC,mBAAmB,CAA+B;gBAE/B,MAAM,EAAE,MAAM;IAIzC;;OAEG;IACU,GAAG,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAIlE;;OAEG;IACU,IAAI,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC;IAIpE;;OAEG;IACU,GAAG,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAIlE;;OAEG;IACU,MAAM,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,aAAa,CAAC;cAIxD,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IA0GtE,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;YAIhC,SAAS;CA8GxB;AAED,OAAO,EAAC,UAAU,EAAC,CAAC"}
+{"version":3,"file":"http_client.d.ts","sourceRoot":"","sources":["../../../src/clients/http_client/http_client.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,aAAa,EACd,MAAM,SAAS,CAAC;AAEjB,qBAAa,UAAU;IAOF,OAAO,CAAC,MAAM;IALjC,MAAM,CAAC,QAAQ,CAAC,eAAe,QAAQ;IAEvC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,UAAU;IACjD,OAAO,CAAC,mBAAmB,CAA+B;gBAE/B,MAAM,EAAE,MAAM;IAIzC;;OAEG;IACU,GAAG,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAIlE;;OAEG;IACU,IAAI,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC;IAIpE;;OAEG;IACU,GAAG,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAIlE;;OAEG;IACU,MAAM,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,aAAa,CAAC;cAIxD,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IA0GtE,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;YAIhC,SAAS;CA6GxB"}

package/dist/clients/http_client/http_client.js

@@ -162,105 +162,106 @@ var HttpClient = /** @class */ (function () {
     };
     HttpClient.prototype.doRequest = function (url, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
+            var response, body, deprecation, depHash, stack, log, errorMessages, errorMessage, headers, code, statusText, retryAfter, error_2;
             return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, (0, node_fetch_1.default)(url, options)
-                        .then(function (response) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                        var body, deprecation, depHash, stack, log, errorMessages, errorMessage, headers, code, statusText, retryAfter;
-                        return tslib_1.__generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, response.json()];
-                                case 1:
-                                    body = _a.sent();
-                                    if (response.ok) {
-                                        if (response.headers &&
-                                            response.headers.has('X-Shopify-API-Deprecated-Reason')) {
-                                            deprecation = {
-                                                message: response.headers.get('X-Shopify-API-Deprecated-Reason'),
-                                                path: url,
-                                            };
-                                            depHash = crypto_1.default
-                                                .createHash('md5')
-                                                .update(JSON.stringify(deprecation))
-                                                .digest('hex');
-                                            if (!Object.keys(this.LOGGED_DEPRECATIONS).includes(depHash) ||
-                                                Date.now() - this.LOGGED_DEPRECATIONS[depHash] >=
-                                                    HttpClient.DEPRECATION_ALERT_DELAY) {
-                                                this.LOGGED_DEPRECATIONS[depHash] = Date.now();
-                                                if (context_1.Context.LOG_FILE) {
-                                                    stack = new Error().stack;
-                                                    log = "API Deprecation Notice ".concat(new Date().toLocaleString(), " : ").concat(JSON.stringify(deprecation), "\n    Stack Trace: ").concat(stack, "\n");
-                                                    fs_1.default.writeFileSync(context_1.Context.LOG_FILE, log, {
-                                                        flag: 'a',
-                                                        encoding: 'utf-8',
-                                                    });
-                                                }
-                                                else {
-                                                    console.warn('API Deprecation Notice:', deprecation);
-                                                }
-                                            }
-                                        }
-                                        return [2 /*return*/, {
-                                                body: body,
-                                                headers: response.headers,
-                                            }];
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        return [4 /*yield*/, (0, node_fetch_1.default)(url, options)];
+                    case 1:
+                        response = _a.sent();
+                        return [4 /*yield*/, response.json().catch(function () { return ({}); })];
+                    case 2:
+                        body = _a.sent();
+                        if (response.ok) {
+                            if (response.headers &&
+                                response.headers.has('X-Shopify-API-Deprecated-Reason')) {
+                                deprecation = {
+                                    message: response.headers.get('X-Shopify-API-Deprecated-Reason'),
+                                    path: url,
+                                };
+                                depHash = crypto_1.default
+                                    .createHash('md5')
+                                    .update(JSON.stringify(deprecation))
+                                    .digest('hex');
+                                if (!Object.keys(this.LOGGED_DEPRECATIONS).includes(depHash) ||
+                                    Date.now() - this.LOGGED_DEPRECATIONS[depHash] >=
+                                        HttpClient.DEPRECATION_ALERT_DELAY) {
+                                    this.LOGGED_DEPRECATIONS[depHash] = Date.now();
+                                    if (context_1.Context.LOG_FILE) {
+                                        stack = new Error().stack;
+                                        log = "API Deprecation Notice ".concat(new Date().toLocaleString(), " : ").concat(JSON.stringify(deprecation), "\n    Stack Trace: ").concat(stack, "\n");
+                                        fs_1.default.writeFileSync(context_1.Context.LOG_FILE, log, {
+                                            flag: 'a',
+                                            encoding: 'utf-8',
+                                        });
                                     }
                                     else {
-                                        errorMessages = [];
-                                        if (body.errors) {
-                                            errorMessages.push(JSON.stringify(body.errors, null, 2));
-                                        }
-                                        if (response.headers && response.headers.get('x-request-id')) {
-                                            errorMessages.push("If you report this error, please include this id: ".concat(response.headers.get('x-request-id')));
-                                        }
-                                        errorMessage = errorMessages.length
-                                            ? ":\n".concat(errorMessages.join('\n'))
-                                            : '';
-                                        headers = response.headers.raw();
-                                        code = response.status;
-                                        statusText = response.statusText;
-                                        switch (true) {
-                                            case response.status === network_1.StatusCode.TooManyRequests: {
-                                                retryAfter = response.headers.get('Retry-After');
-                                                throw new ShopifyErrors.HttpThrottlingError({
-                                                    message: "Shopify is throttling requests".concat(errorMessage),
-                                                    code: code,
-                                                    statusText: statusText,
-                                                    body: body,
-                                                    headers: headers,
-                                                    retryAfter: retryAfter ? parseFloat(retryAfter) : undefined,
-                                                });
-                                            }
-                                            case response.status >= network_1.StatusCode.InternalServerError:
-                                                throw new ShopifyErrors.HttpInternalError({
-                                                    message: "Shopify internal error".concat(errorMessage),
-                                                    code: code,
-                                                    statusText: statusText,
-                                                    body: body,
-                                                    headers: headers,
-                                                });
-                                            default:
-                                                throw new ShopifyErrors.HttpResponseError({
-                                                    message: "Received an error response (".concat(response.status, " ").concat(response.statusText, ") from Shopify").concat(errorMessage),
-                                                    code: code,
-                                                    statusText: statusText,
-                                                    body: body,
-                                                    headers: headers,
-                                                });
-                                        }
+                                        console.warn('API Deprecation Notice:', deprecation);
                                     }
-                                    return [2 /*return*/];
+                                }
+                            }
+                            return [2 /*return*/, {
+                                    body: body,
+                                    headers: response.headers,
+                                }];
+                        }
+                        else {
+                            errorMessages = [];
+                            if (body.errors) {
+                                errorMessages.push(JSON.stringify(body.errors, null, 2));
+                            }
+                            if (response.headers && response.headers.get('x-request-id')) {
+                                errorMessages.push("If you report this error, please include this id: ".concat(response.headers.get('x-request-id')));
+                            }
+                            errorMessage = errorMessages.length
+                                ? ":\n".concat(errorMessages.join('\n'))
+                                : '';
+                            headers = response.headers.raw();
+                            code = response.status;
+                            statusText = response.statusText;
+                            switch (true) {
+                                case response.status === network_1.StatusCode.TooManyRequests: {
+                                    retryAfter = response.headers.get('Retry-After');
+                                    throw new ShopifyErrors.HttpThrottlingError({
+                                        message: "Shopify is throttling requests".concat(errorMessage),
+                                        code: code,
+                                        statusText: statusText,
+                                        body: body,
+                                        headers: headers,
+                                        retryAfter: retryAfter ? parseFloat(retryAfter) : undefined,
+                                    });
+                                }
+                                case response.status >= network_1.StatusCode.InternalServerError:
+                                    throw new ShopifyErrors.HttpInternalError({
+                                        message: "Shopify internal error".concat(errorMessage),
+                                        code: code,
+                                        statusText: statusText,
+                                        body: body,
+                                        headers: headers,
+                                    });
+                                default:
+                                    throw new ShopifyErrors.HttpResponseError({
+                                        message: "Received an error response (".concat(response.status, " ").concat(response.statusText, ") from Shopify").concat(errorMessage),
+                                        code: code,
+                                        statusText: statusText,
+                                        body: body,
+                                        headers: headers,
+                                    });
                             }
-                        });
-                    }); })
-                        .catch(function (error) {
-                        if (error instanceof ShopifyErrors.ShopifyError) {
-                            throw error;
+                        }
+                        return [3 /*break*/, 4];
+                    case 3:
+                        error_2 = _a.sent();
+                        if (error_2 instanceof ShopifyErrors.ShopifyError) {
+                            throw error_2;
                         }
                         else {
-                            throw new ShopifyErrors.HttpRequestError("Failed to make Shopify HTTP request: ".concat(error));
+                            throw new ShopifyErrors.HttpRequestError("Failed to make Shopify HTTP request: ".concat(error_2));
                         }
-                    })];
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
+                }
             });
         });
     };

package/dist/context.js

@@ -17,8 +17,11 @@ var Context = {
     API_VERSION: base_types_1.ApiVersion.Unstable,
     IS_EMBEDDED_APP: true,
     IS_PRIVATE_APP: false,
-    SESSION_STORAGE: new sqlite_1.SQLiteSessionStorage(dbFile),
+    // TS hack as SESSION_STORAGE is guaranteed to be set
+    // to a correct value in `initialize()`.
+    SESSION_STORAGE: null,
     initialize: function (params) {
+        var _a;
         var scopes;
         if (params.SCOPES instanceof scopes_1.AuthScopes) {
             scopes = params.SCOPES;
@@ -50,12 +53,11 @@ var Context = {
         this.API_VERSION = params.API_VERSION;
         this.IS_EMBEDDED_APP = params.IS_EMBEDDED_APP;
         this.IS_PRIVATE_APP = params.IS_PRIVATE_APP;
+        this.SESSION_STORAGE =
+            (_a = params.SESSION_STORAGE) !== null && _a !== void 0 ? _a : new sqlite_1.SQLiteSessionStorage(dbFile);
         if (params.HOST_SCHEME) {
             this.HOST_SCHEME = params.HOST_SCHEME;
         }
-        if (params.SESSION_STORAGE) {
-            this.SESSION_STORAGE = params.SESSION_STORAGE;
-        }
         if (params.USER_AGENT_PREFIX) {
             this.USER_AGENT_PREFIX = params.USER_AGENT_PREFIX;
         }

package/dist/version.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/shopify-api",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "Shopify API Library for Node - accelerate development with support for authentication, graphql proxy, webhooks",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -55,7 +55,7 @@
     "node-fetch": "^2.6.1",
     "pg": "^8.7.3",
     "redis": "^4.0.6",
-    "sqlite3": "^5.0.2",
+    "sqlite3": "^5.0.8",
     "tslib": "^2.0.3",
     "uuid": "^8.3.1"
   },