@shopify/shopify-api 1.4.3 → 3.0.0-rc.1

package/CHANGELOG.md

@@ -7,6 +7,54 @@ and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
 
+### Added
+
+- ⚠️ [Breaking] Update supported Admin API versions [#310](https://github.com/Shopify/shopify-node-api/pull/310)
+- Allow full paths in REST requests [#301](https://github.com/Shopify/shopify-node-api/pull/301)
+
+### Fixed
+
+- ⚠️ [Breaking] Stop responding to the request in the GraphQL Proxy function, returning Shopify's response instead [#312](https://github.com/Shopify/shopify-node-api/pull/312)
+
+  The examples below are in [express](https://expressjs.com/); you will now need to handle the response yourself.
+  
+  Before:
+  
+  ```js
+  app.post('/graphql', async (req, res) => {
+    await Shopify.Utils.graphqlProxy(req, res);
+  });
+  ```
+  
+  After:
+  
+  ```js
+  app.post('/graphql', async (req, res) => {
+    const response = await Shopify.Utils.graphqlProxy(req, res);
+    res.status(200).send(response.body);
+  });
+  ```
+
+## [2.1.0] - 2022-02-03
+
+### Added
+
+- Add support for January 2022 API version [#285](https://github.com/Shopify/shopify-node-api/pull/285)
+
+## [2.0.0] - 2021-10-28
+
+### Added
+
+- Add a 5 second `clockTolerance` to fix `jwt not active` error [#227](https://github.com/Shopify/shopify-node-api/pull/227)
+- [Breaking] Change default for OAuth.beginAuth to online sessions [#203](https://github.com/Shopify/shopify-node-api/pull/203)
+  - see [oauth.md](https://github.com/Shopify/shopify-node-api/blob/main/docs/usage/oauth.md) for updated docs
+- [Breaking] Return and delete session in `validateAuthCallback` [#217](https://github.com/Shopify/shopify-node-api/pull/217)
+  - see [oauth.md](https://github.com/Shopify/shopify-node-api/blob/main/docs/usage/oauth.md) for updated usage
+- [Breaking] Extract `addHandler` and `getHandler` methods for webhooks out of `register` [#205](https://github.com/Shopify/shopify-node-api/pull/205)
+- [Breaking] Sessions no longer default to `false` for `isOnline` [#169](https://github.com/Shopify/shopify-node-api/pull/169)
+- Required `Session` arguments must be passed to the constructor [#169](https://github.com/Shopify/shopify-node-api/pull/169)
+- Allow `undefined` in `AuthScopes` [#169](https://github.com/Shopify/shopify-node-api/pull/169)
+
 ## [1.4.3] - 2021-10-22
 
 ### Fixed

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

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

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

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

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

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

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

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

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

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

package/dist/__tests__/fake-resource.js

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

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

@@ -1,4 +1,5 @@
 import http from 'http';
+import { SessionInterface } from '../session/types';
 import { AuthQuery } from './types';
 declare const ShopifyOAuth: {
     SESSION_COOKIE_NAME: string;
@@ -11,7 +12,7 @@ declare const ShopifyOAuth: {
      * @param redirect Redirect url for callback
      * @param isOnline Boolean value. If true, appends 'per-user' grant options to authorization url to receive online access token.
      *                 During final oauth request, will receive back the online access token and current online session information.
-     *                 Defaults to offline access.
+     *                 Defaults to online access.
      */
     beginAuth(request: http.IncomingMessage, response: http.ServerResponse, shop: string, redirectPath: string, isOnline?: boolean): Promise<string>;
     /**
@@ -23,8 +24,9 @@ declare const ShopifyOAuth: {
      * @param response Current HTTP Response
      * @param query Current HTTP Request Query, containing the information to be validated.
      *              Depending on framework, this may need to be cast as "unknown" before being passed.
+     * @returns SessionInterface
      */
-    validateAuthCallback(request: http.IncomingMessage, response: http.ServerResponse, query: AuthQuery): Promise<void>;
+    validateAuthCallback(request: http.IncomingMessage, response: http.ServerResponse, query: AuthQuery): Promise<SessionInterface>;
     /**
      * Loads the current session id from the session cookie.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../src/auth/oauth/oauth.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAiBxB,OAAO,EACL,SAAS,EAIV,MAAM,SAAS,CAAC;AAEjB,QAAA,MAAM,YAAY;;IAGhB;;;;;;;;;;OAUG;uBAEQ,IAAI,CAAC,eAAe,YACnB,IAAI,CAAC,cAAc,QACvB,MAAM,gBACE,MAAM,uBAEnB,OAAO,CAAC,MAAM,CAAC;IAgDlB;;;;;;;;;OASG;kCAEQ,IAAI,CAAC,eAAe,YACnB,IAAI,CAAC,cAAc,SACtB,SAAS,GACf,OAAO,CAAC,IAAI,CAAC;IAqGhB;;;;;OAKG;gCAEQ,IAAI,CAAC,eAAe,YACnB,IAAI,CAAC,cAAc,GAC5B,MAAM,GAAG,SAAS;IAQrB;;;;;OAKG;0BACmB,MAAM,UAAU,MAAM,GAAG,MAAM;IAIrD;;;;OAIG;8BACuB,MAAM,GAAG,MAAM;IAIzC;;;;;;OAMG;iCAEQ,IAAI,CAAC,eAAe,YACnB,IAAI,CAAC,cAAc,uBAE5B,MAAM,GAAG,SAAS;CAiCtB,CAAC;AAgBF,OAAO,EAAC,YAAY,EAAC,CAAC"}
+{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../src/auth/oauth/oauth.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAgBxB,OAAO,EAAC,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAElD,OAAO,EACL,SAAS,EAIV,MAAM,SAAS,CAAC;AAEjB,QAAA,MAAM,YAAY;;IAGhB;;;;;;;;;;OAUG;uBAEQ,IAAI,CAAC,eAAe,YACnB,IAAI,CAAC,cAAc,QACvB,MAAM,gBACE,MAAM,uBAEnB,OAAO,CAAC,MAAM,CAAC;IAgDlB;;;;;;;;;;OAUG;kCAEQ,IAAI,CAAC,eAAe,YACnB,IAAI,CAAC,cAAc,SACtB,SAAS,GACf,OAAO,CAAC,gBAAgB,CAAC;IAuG5B;;;;;OAKG;gCAEQ,IAAI,CAAC,eAAe,YACnB,IAAI,CAAC,cAAc,GAC5B,MAAM,GAAG,SAAS;IAQrB;;;;;OAKG;0BACmB,MAAM,UAAU,MAAM,GAAG,MAAM;IAIrD;;;;OAIG;8BACuB,MAAM,GAAG,MAAM;IAIzC;;;;;;OAMG;iCAEQ,IAAI,CAAC,eAAe,YACnB,IAAI,CAAC,cAAc,uBAE5B,MAAM,GAAG,SAAS;CAiCtB,CAAC;AAgBF,OAAO,EAAC,YAAY,EAAC,CAAC"}

package/dist/auth/oauth/oauth.js

@@ -26,10 +26,10 @@ var ShopifyOAuth = {
      * @param redirect Redirect url for callback
      * @param isOnline Boolean value. If true, appends 'per-user' grant options to authorization url to receive online access token.
      *                 During final oauth request, will receive back the online access token and current online session information.
-     *                 Defaults to offline access.
+     *                 Defaults to online access.
      */
     beginAuth: function (request, response, shop, redirectPath, isOnline) {
-        if (isOnline === void 0) { isOnline = false; }
+        if (isOnline === void 0) { isOnline = true; }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var cookies, state, session, sessionStored, query, queryString;
             return tslib_1.__generator(this, function (_a) {
@@ -42,10 +42,7 @@ var ShopifyOAuth = {
                             secure: true,
                         });
                         state = nonce_1.default();
-                        session = new session_1.Session(isOnline ? uuid_1.v4() : this.getOfflineSessionId(shop));
-                        session.shop = shop;
-                        session.state = state;
-                        session.isOnline = isOnline;
+                        session = new session_1.Session(isOnline ? uuid_1.v4() : this.getOfflineSessionId(shop), shop, state, isOnline);
                         return [4 /*yield*/, context_1.Context.SESSION_STORAGE.storeSession(session)];
                     case 1:
                         sessionStored = _a.sent();
@@ -80,10 +77,11 @@ var ShopifyOAuth = {
      * @param response Current HTTP Response
      * @param query Current HTTP Request Query, containing the information to be validated.
      *              Depending on framework, this may need to be cast as "unknown" before being passed.
+     * @returns SessionInterface
      */
     validateAuthCallback: function (request, response, query) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var cookies, sessionCookie, currentSession, body, postParams, client, postResponse, responseBody, access_token, scope, rest, sessionExpiration, responseBody, oauthSessionExpiration, onlineInfo, jwtSessionId, jwtSession, sessionStored;
+            var cookies, sessionCookie, currentSession, body, postParams, client, postResponse, responseBody, access_token, scope, rest, sessionExpiration, onlineInfo, jwtSessionId, jwtSession, sessionDeleted, responseBody, sessionStored;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -120,50 +118,46 @@ var ShopifyOAuth = {
                         return [4 /*yield*/, client.post(postParams)];
                     case 2:
                         postResponse = _a.sent();
-                        if (currentSession.isOnline) {
-                            responseBody = postResponse.body;
-                            access_token = responseBody.access_token, scope = responseBody.scope, rest = tslib_1.__rest(responseBody, ["access_token", "scope"]);
-                            sessionExpiration = new Date(Date.now() + responseBody.expires_in * 1000);
-                            currentSession.accessToken = access_token;
-                            currentSession.expires = sessionExpiration;
-                            currentSession.scope = scope;
-                            currentSession.onlineAccessInfo = rest;
-                        }
-                        else {
-                            responseBody = postResponse.body;
-                            currentSession.accessToken = responseBody.access_token;
-                            currentSession.scope = responseBody.scope;
-                        }
-                        oauthSessionExpiration = currentSession.expires;
-                        if (!!currentSession.isOnline) return [3 /*break*/, 3];
-                        oauthSessionExpiration = new Date();
-                        return [3 /*break*/, 5];
-                    case 3:
-                        if (!context_1.Context.IS_EMBEDDED_APP) return [3 /*break*/, 5];
+                        if (!currentSession.isOnline) return [3 /*break*/, 5];
+                        responseBody = postResponse.body;
+                        access_token = responseBody.access_token, scope = responseBody.scope, rest = tslib_1.__rest(responseBody, ["access_token", "scope"]);
+                        sessionExpiration = new Date(Date.now() + responseBody.expires_in * 1000);
+                        currentSession.accessToken = access_token;
+                        currentSession.expires = sessionExpiration;
+                        currentSession.scope = scope;
+                        currentSession.onlineAccessInfo = rest;
+                        if (!context_1.Context.IS_EMBEDDED_APP) return [3 /*break*/, 4];
                         onlineInfo = currentSession.onlineAccessInfo;
                         jwtSessionId = this.getJwtSessionId(currentSession.shop, "" + onlineInfo.associated_user.id);
                         jwtSession = session_1.Session.cloneSession(currentSession, jwtSessionId);
-                        return [4 /*yield*/, context_1.Context.SESSION_STORAGE.storeSession(jwtSession)];
-                    case 4:
-                        _a.sent();
-                        // Make sure the current OAuth session expires along with the cookie
-                        oauthSessionExpiration = new Date(Date.now() + 30000);
-                        currentSession.expires = oauthSessionExpiration;
-                        _a.label = 5;
+                        return [4 /*yield*/, context_1.Context.SESSION_STORAGE.deleteSession(currentSession.id)];
+                    case 3:
+                        sessionDeleted = _a.sent();
+                        if (!sessionDeleted) {
+                            throw new ShopifyErrors.SessionStorageError('OAuth Session could not be deleted. Please check your session storage functionality.');
+                        }
+                        currentSession = jwtSession;
+                        _a.label = 4;
+                    case 4: return [3 /*break*/, 6];
                     case 5:
+                        responseBody = postResponse.body;
+                        currentSession.accessToken = responseBody.access_token;
+                        currentSession.scope = responseBody.scope;
+                        _a.label = 6;
+                    case 6:
                         cookies.set(ShopifyOAuth.SESSION_COOKIE_NAME, currentSession.id, {
                             signed: true,
-                            expires: oauthSessionExpiration,
+                            expires: context_1.Context.IS_EMBEDDED_APP ? new Date() : currentSession.expires,
                             sameSite: 'lax',
                             secure: true,
                         });
                         return [4 /*yield*/, context_1.Context.SESSION_STORAGE.storeSession(currentSession)];
-                    case 6:
+                    case 7:
                         sessionStored = _a.sent();
                         if (!sessionStored) {
                             throw new ShopifyErrors.SessionStorageError('OAuth Session could not be saved. Please check your session storage functionality.');
                         }
-                        return [2 /*return*/];
+                        return [2 /*return*/, currentSession];
                 }
             });
         });

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

@@ -2,9 +2,9 @@ declare class AuthScopes {
     static SCOPE_DELIMITER: string;
     private compressedScopes;
     private expandedScopes;
-    constructor(scopes: string | string[]);
-    has(scope: string | string[] | AuthScopes): boolean;
-    equals(otherScopes: string | string[] | AuthScopes): boolean;
+    constructor(scopes: string | string[] | undefined);
+    has(scope: string | string[] | AuthScopes | undefined): boolean;
+    equals(otherScopes: string | string[] | AuthScopes | undefined): boolean;
     toString(): string;
     toArray(): string[];
     private getImpliedScopes;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/auth/scopes/index.ts"],"names":[],"mappings":"AAAA,cAAM,UAAU;IACd,OAAc,eAAe,SAAO;IAEpC,OAAO,CAAC,gBAAgB,CAAc;IACtC,OAAO,CAAC,cAAc,CAAc;gBAExB,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;IAyB9B,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,UAAU;IAczC,MAAM,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,UAAU;IAelD,QAAQ;IAIR,OAAO;IAId,OAAO,CAAC,gBAAgB;CAUzB;AAED,OAAO,EAAC,UAAU,EAAC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/auth/scopes/index.ts"],"names":[],"mappings":"AAAA,cAAM,UAAU;IACd,OAAc,eAAe,SAAO;IAEpC,OAAO,CAAC,gBAAgB,CAAc;IACtC,OAAO,CAAC,cAAc,CAAc;gBAExB,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS;IAyB1C,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,UAAU,GAAG,SAAS;IAcrD,MAAM,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,UAAU,GAAG,SAAS;IAe9D,QAAQ;IAIR,OAAO;IAId,OAAO,CAAC,gBAAgB;CAUzB;AAED,OAAO,EAAC,UAAU,EAAC,CAAC"}

package/dist/auth/scopes/index.js

@@ -8,7 +8,7 @@ var AuthScopes = /** @class */ (function () {
         if (typeof scopes === 'string') {
             scopesArray = scopes.split(new RegExp(AuthScopes.SCOPE_DELIMITER + "\\s*"));
         }
-        else {
+        else if (scopes) {
             scopesArray = scopes;
         }
         scopesArray = scopesArray

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

@@ -5,15 +5,15 @@ import { SessionInterface } from './types';
  */
 declare class Session implements SessionInterface {
     readonly id: string;
-    static cloneSession(session: Session, newId: string): Session;
     shop: string;
     state: string;
-    scope: string;
+    isOnline: boolean;
+    static cloneSession(session: Session, newId: string): Session;
+    scope?: string;
     expires?: Date;
-    isOnline?: boolean;
     accessToken?: string;
     onlineAccessInfo?: OnlineAccessInfo;
-    constructor(id: string);
+    constructor(id: string, shop: string, state: string, isOnline: boolean);
     isActive(): boolean;
 }
 export { Session };

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

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/auth/session/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAGhD,OAAO,EAAC,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAEzC;;GAEG;AACH,cAAM,OAAQ,YAAW,gBAAgB;IAuB3B,QAAQ,CAAC,EAAE,EAAE,MAAM;WAtBjB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAc7D,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;gBAEtB,EAAE,EAAE,MAAM;IAExB,QAAQ,IAAI,OAAO;CAW3B;AAED,OAAO,EAAC,OAAO,EAAC,CAAC"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/auth/session/session.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAC,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAEzC;;GAEG;AACH,cAAM,OAAQ,YAAW,gBAAgB;IAuBrC,QAAQ,CAAC,EAAE,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,MAAM;IACb,QAAQ,EAAE,OAAO;WAzBZ,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAgB7D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;gBAGhC,EAAE,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,OAAO;IAGnB,QAAQ,IAAI,OAAO;CAW3B;AAED,OAAO,EAAC,OAAO,EAAC,CAAC"}

package/dist/auth/session/session.js

@@ -6,16 +6,16 @@ var context_1 = require("../../context");
  * Stores App information from logged in merchants so they can make authenticated requests to the Admin API.
  */
 var Session = /** @class */ (function () {
-    function Session(id) {
+    function Session(id, shop, state, isOnline) {
         this.id = id;
+        this.shop = shop;
+        this.state = state;
+        this.isOnline = isOnline;
     }
     Session.cloneSession = function (session, newId) {
-        var newSession = new Session(newId);
-        newSession.shop = session.shop;
-        newSession.state = session.state;
+        var newSession = new Session(newId, session.shop, session.state, session.isOnline);
         newSession.scope = session.scope;
         newSession.expires = session.expires;
-        newSession.isOnline = session.isOnline;
         newSession.accessToken = session.accessToken;
         newSession.onlineAccessInfo = session.onlineAccessInfo;
         return newSession;

package/dist/auth/session/session_storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session_storage.d.ts","sourceRoot":"","sources":["../../../src/auth/session/session_storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAEzC;;GAEG;AACH,UAAU,cAAc;IAEtB;;;;OAIG;IACH,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE1D;;;;OAIG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAAC;IAE/D;;;;OAIG;IACH,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7C;AAED,OAAO,EAAC,cAAc,EAAC,CAAC"}
+{"version":3,"file":"session_storage.d.ts","sourceRoot":"","sources":["../../../src/auth/session/session_storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAEzC;;GAEG;AACH,UAAU,cAAc;IACtB;;;;OAIG;IACH,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE1D;;;;OAIG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAAC;IAE/D;;;;OAIG;IACH,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7C;AAED,OAAO,EAAC,cAAc,EAAC,CAAC"}

package/dist/auth/session/storage/custom.d.ts

@@ -2,9 +2,13 @@ import { SessionInterface } from '../types';
 import { SessionStorage } from '../session_storage';
 export declare class CustomSessionStorage implements SessionStorage {
     readonly storeCallback: (session: SessionInterface) => Promise<boolean>;
-    readonly loadCallback: (id: string) => Promise<SessionInterface | Record<string, unknown> | undefined>;
+    readonly loadCallback: (id: string) => Promise<SessionInterface | {
+        [key: string]: unknown;
+    } | undefined>;
     readonly deleteCallback: (id: string) => Promise<boolean>;
-    constructor(storeCallback: (session: SessionInterface) => Promise<boolean>, loadCallback: (id: string) => Promise<SessionInterface | Record<string, unknown> | undefined>, deleteCallback: (id: string) => Promise<boolean>);
+    constructor(storeCallback: (session: SessionInterface) => Promise<boolean>, loadCallback: (id: string) => Promise<SessionInterface | {
+        [key: string]: unknown;
+    } | undefined>, deleteCallback: (id: string) => Promise<boolean>);
     storeSession(session: SessionInterface): Promise<boolean>;
     loadSession(id: string): Promise<SessionInterface | undefined>;
     deleteSession(id: string): Promise<boolean>;

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

@@ -1 +1 @@
-{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../../../src/auth/session/storage/custom.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAGlD,qBAAa,oBAAqB,YAAW,cAAc;IAEvD,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,OAAO,CAAC;IACvE,QAAQ,CAAC,YAAY,EAAE,CACrB,EAAE,EAAE,MAAM,KACP,OAAO,CAAC,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IACpE,QAAQ,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC;gBAJhD,aAAa,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,OAAO,CAAC,EAC9D,YAAY,EAAE,CACrB,EAAE,EAAE,MAAM,KACP,OAAO,CAAC,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,EAC3D,cAAc,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC;IAO9C,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAUzD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAqC9D,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CASzD"}
+{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../../../src/auth/session/storage/custom.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAGlD,qBAAa,oBAAqB,YAAW,cAAc;IAEvD,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,OAAO,CAAC;IACvE,QAAQ,CAAC,YAAY,EAAE,CACrB,EAAE,EAAE,MAAM,KACP,OAAO,CAAC,gBAAgB,GAAG;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAC,GAAG,SAAS,CAAC;IACrE,QAAQ,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC;gBAJhD,aAAa,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,OAAO,CAAC,EAC9D,YAAY,EAAE,CACrB,EAAE,EAAE,MAAM,KACP,OAAO,CAAC,gBAAgB,GAAG;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAC,GAAG,SAAS,CAAC,EAC5D,cAAc,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC;IAO9C,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAUzD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IA0C9D,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CASzD"}

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

@@ -53,7 +53,7 @@ var CustomSessionStorage = /** @class */ (function () {
                                 return [2 /*return*/, result];
                             }
                             else if (result instanceof Object && 'id' in result) {
-                                session = new session_1.Session(result.id);
+                                session = new session_1.Session(result.id, result.shop, result.state, result.isOnline);
                                 session = tslib_1.__assign(tslib_1.__assign({}, session), result);
                                 if (session.expires && typeof session.expires === 'string') {
                                     session.expires = new Date(session.expires);

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

@@ -1 +1 @@
-{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../../src/auth/session/storage/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAElD,qBAAa,oBAAqB,YAAW,cAAc;IACzD,OAAO,CAAC,QAAQ,CAAyC;IAE5C,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAKzD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAI9D,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAMzD"}
+{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../../src/auth/session/storage/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAElD,qBAAa,oBAAqB,YAAW,cAAc;IACzD,OAAO,CAAC,QAAQ,CAAwC;IAE3C,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAKzD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAI9D,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAMzD"}

package/dist/auth/session/types.d.ts

@@ -3,9 +3,9 @@ export interface SessionInterface {
     readonly id: string;
     shop: string;
     state: string;
-    scope: string;
+    isOnline: boolean;
+    scope?: string;
     expires?: Date;
-    isOnline?: boolean;
     accessToken?: string;
     onlineAccessInfo?: OnlineAccessInfo;
     isActive(): boolean;

package/dist/auth/session/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/auth/session/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAEhD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,QAAQ,IAAI,OAAO,CAAC;CACrB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/auth/session/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAEhD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,QAAQ,IAAI,OAAO,CAAC;CACrB"}