@shopify/shopify-app-remix 2.5.1 → 2.6.1

package/build/cjs/server/adapters/vercel/index.js

@@ -0,0 +1,12 @@
+'use strict';
+
+var runtime = require('@shopify/shopify-api/runtime');
+var node = require('@remix-run/node');
+require('../node/index.js');
+
+node.installGlobals();
+const fetchFunc = fetch;
+runtime.setAbstractFetchFunc(async (...args) => {
+  const response = await fetchFunc.apply(undefined, args);
+  return response;
+});

package/build/cjs/server/authenticate/admin/billing/cancel.js

@@ -10,7 +10,8 @@ function cancelBillingFactory(params, request, session) {
   return async function cancelBilling(options) {
     const {
       api,
-      logger
+      logger,
+      config
     } = params;
     logger.debug('Cancelling billing', {
       shop: session.shop,
@@ -28,6 +29,7 @@ function cancelBillingFactory(params, request, session) {
         logger.debug('API token was invalid, redirecting to OAuth', {
           shop: session.shop
         });
+        await config.sessionStorage.deleteSession(session.id);
         throw await redirectToAuthPage.redirectToAuthPage(params, request, session.shop);
       } else {
         throw error;

package/build/cjs/server/authenticate/admin/billing/check.js

@@ -10,7 +10,8 @@ function checkBillingFactory(params, request, session) {
   return async function checkBilling(options) {
     const {
       api,
-      logger
+      logger,
+      config
     } = params;
     logger.debug('Checking billing plans', {
       shop: session.shop,
@@ -28,6 +29,7 @@ function checkBillingFactory(params, request, session) {
         logger.debug('API token was invalid, redirecting to OAuth', {
           shop: session.shop
         });
+        await config.sessionStorage.deleteSession(session.id);
         throw await redirectToAuthPage.redirectToAuthPage(params, request, session.shop);
       } else {
         throw error;

package/build/cjs/server/authenticate/admin/billing/request.js

@@ -16,7 +16,8 @@ function requestBillingFactory(params, request, session) {
   }) {
     const {
       api,
-      logger
+      logger,
+      config
     } = params;
     logger.info('Requesting billing', {
       shop: session.shop,
@@ -39,6 +40,7 @@ function requestBillingFactory(params, request, session) {
         logger.debug('API token was invalid, redirecting to OAuth', {
           shop: session.shop
         });
+        await config.sessionStorage.deleteSession(session.id);
         throw await redirectToAuthPage.redirectToAuthPage(params, request, session.shop);
       } else {
         throw error;

package/build/cjs/server/authenticate/admin/billing/require.js

@@ -9,7 +9,8 @@ var redirectToAuthPage = require('../helpers/redirect-to-auth-page.js');
 function requireBillingFactory(params, request, session) {
   const {
     api,
-    logger
+    logger,
+    config
   } = params;
   return async function requireBilling(options) {
     const logContext = {
@@ -29,6 +30,7 @@ function requireBillingFactory(params, request, session) {
     } catch (error) {
       if (error instanceof shopifyApi.HttpResponseError && error.response.code === 401) {
         logger.debug('API token was invalid, redirecting to OAuth', logContext);
+        await config.sessionStorage.deleteSession(session.id);
         throw await redirectToAuthPage.redirectToAuthPage(params, request, session.shop);
       } else {
         throw error;

package/build/cjs/server/authenticate/admin/helpers/redirect-with-exitiframe.js

@@ -13,10 +13,12 @@ function redirectWithExitIframe(params, request, shop) {
   const queryParams = url.searchParams;
   const host = api.utils.sanitizeHost(queryParams.get('host'));
   queryParams.set('shop', shop);
-  queryParams.set('exitIframe', `${config.auth.path}?shop=${shop}`);
+  let destination = `${config.auth.path}?shop=${shop}`;
   if (host) {
     queryParams.set('host', host);
+    destination = `${destination}&host=${host}`;
   }
+  queryParams.set('exitIframe', destination);
   throw serverRuntime.redirect(`${config.auth.exitIframePath}?${queryParams.toString()}`);
 }
 

package/build/cjs/server/authenticate/webhooks/authenticate.js

@@ -52,6 +52,7 @@ function authenticateWebhookFactory(params) {
       topic: check.topic,
       webhookId: check.webhookId,
       payload: JSON.parse(rawBody),
+      subTopic: check.subTopic || undefined,
       session: undefined,
       admin: undefined
     };

package/build/cjs/server/shopify-app.js

@@ -86,7 +86,7 @@ function isSingleMerchantApp(_shopify, config) {
   return config.distribution === types.AppDistribution.SingleMerchant;
 }
 function deriveApi(appConfig) {
-  var _appConfig$isEmbedded, _appConfig$apiVersion;
+  var _appConfig$isEmbedded, _appConfig$apiVersion, _appConfig$future;
   let appUrl;
   try {
     appUrl = new URL(appConfig.appUrl);
@@ -112,11 +112,13 @@ function deriveApi(appConfig) {
     isEmbeddedApp: (_appConfig$isEmbedded = appConfig.isEmbeddedApp) !== null && _appConfig$isEmbedded !== void 0 ? _appConfig$isEmbedded : true,
     apiVersion: (_appConfig$apiVersion = appConfig.apiVersion) !== null && _appConfig$apiVersion !== void 0 ? _appConfig$apiVersion : shopifyApi.LATEST_API_VERSION,
     isCustomStoreApp: appConfig.distribution === types.AppDistribution.ShopifyAdmin,
-    future: {}
+    future: {
+      v10_lineItemBilling: (_appConfig$future = appConfig.future) === null || _appConfig$future === void 0 ? void 0 : _appConfig$future.v3_lineItemBilling
+    }
   });
 }
 function deriveConfig(appConfig, apiConfig) {
-  var _appConfig$distributi, _appConfig$useOnlineT, _appConfig$hooks, _appConfig$future;
+  var _appConfig$distributi, _appConfig$useOnlineT, _appConfig$hooks, _appConfig$future2;
   if (!appConfig.sessionStorage) {
     throw new shopifyApi.ShopifyError('Please provide a valid session storage. Refer to https://github.com/Shopify/shopify-app-js/blob/main/README.md#session-storage-options for options.');
   }
@@ -130,7 +132,7 @@ function deriveConfig(appConfig, apiConfig) {
     useOnlineTokens: (_appConfig$useOnlineT = appConfig.useOnlineTokens) !== null && _appConfig$useOnlineT !== void 0 ? _appConfig$useOnlineT : false,
     hooks: (_appConfig$hooks = appConfig.hooks) !== null && _appConfig$hooks !== void 0 ? _appConfig$hooks : {},
     sessionStorage: appConfig.sessionStorage,
-    future: (_appConfig$future = appConfig.future) !== null && _appConfig$future !== void 0 ? _appConfig$future : {},
+    future: (_appConfig$future2 = appConfig.future) !== null && _appConfig$future2 !== void 0 ? _appConfig$future2 : {},
     auth: {
       path: authPathPrefix,
       callbackPath: `${authPathPrefix}/callback`,

package/build/cjs/server/version.js

@@ -2,6 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const SHOPIFY_REMIX_LIBRARY_VERSION = '2.5.1';
+const SHOPIFY_REMIX_LIBRARY_VERSION = '2.6.1';
 
 exports.SHOPIFY_REMIX_LIBRARY_VERSION = SHOPIFY_REMIX_LIBRARY_VERSION;

package/build/ts/server/__test-helpers/expect-exit-iframe.d.ts

@@ -2,7 +2,8 @@ interface ExpectExitIframeRedirectOptions {
     shop?: string;
     host?: string | null;
     destination?: string;
+    addHostToExitIframePath?: boolean;
 }
-export declare function expectExitIframeRedirect(response: Response, { shop, host, destination, }?: ExpectExitIframeRedirectOptions): void;
+export declare function expectExitIframeRedirect(response: Response, { shop, host, destination, addHostToExitIframePath, }?: ExpectExitIframeRedirectOptions): void;
 export {};
 //# sourceMappingURL=expect-exit-iframe.d.ts.map

package/build/ts/server/__test-helpers/expect-exit-iframe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expect-exit-iframe.d.ts","sourceRoot":"","sources":["../../../../src/server/__test-helpers/expect-exit-iframe.ts"],"names":[],"mappings":"AAEA,UAAU,+BAA+B;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,EACE,IAAgB,EAChB,IAAkB,EAClB,WAAkC,GACnC,GAAE,+BAAoC,QAgBxC"}
+{"version":3,"file":"expect-exit-iframe.d.ts","sourceRoot":"","sources":["../../../../src/server/__test-helpers/expect-exit-iframe.ts"],"names":[],"mappings":"AAEA,UAAU,+BAA+B;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,EACE,IAAgB,EAChB,IAAkB,EAClB,WAAkC,EAClC,uBAA8B,GAC/B,GAAE,+BAAoC,QAoBxC"}

package/build/ts/server/__test-helpers/expect-exit-iframe.js

@@ -3,15 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.expectExitIframeRedirect = void 0;
 var const_1 = require("./const");
 function expectExitIframeRedirect(response, _a) {
-    var _b = _a === void 0 ? {} : _a, _c = _b.shop, shop = _c === void 0 ? const_1.TEST_SHOP : _c, _d = _b.host, host = _d === void 0 ? const_1.BASE64_HOST : _d, _e = _b.destination, destination = _e === void 0 ? "/auth?shop=".concat(shop) : _e;
+    var _b = _a === void 0 ? {} : _a, _c = _b.shop, shop = _c === void 0 ? const_1.TEST_SHOP : _c, _d = _b.host, host = _d === void 0 ? const_1.BASE64_HOST : _d, _e = _b.destination, destination = _e === void 0 ? "/auth?shop=".concat(shop) : _e, _f = _b.addHostToExitIframePath, addHostToExitIframePath = _f === void 0 ? true : _f;
     expect(response.status).toBe(302);
-    var _f = new URL(response.headers.get('location'), const_1.APP_URL), pathname = _f.pathname, searchParams = _f.searchParams;
+    var _g = new URL(response.headers.get('location'), const_1.APP_URL), pathname = _g.pathname, searchParams = _g.searchParams;
     expect(pathname).toBe('/auth/exit-iframe');
     expect(searchParams.get('shop')).toBe(shop);
-    expect(searchParams.get('exitIframe')).toBe(destination);
+    var expectedDestination = destination;
     if (host) {
         expect(searchParams.get('host')).toBe(host);
+        if (addHostToExitIframePath) {
+            expectedDestination = destination.concat("&host=".concat(host));
+        }
     }
+    expect(searchParams.get('exitIframe')).toBe(expectedDestination);
 }
 exports.expectExitIframeRedirect = expectExitIframeRedirect;
 //# sourceMappingURL=expect-exit-iframe.js.map

package/build/ts/server/__test-helpers/expect-exit-iframe.js.map

@@ -1 +1 @@
-{"version":3,"file":"expect-exit-iframe.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/expect-exit-iframe.ts"],"names":[],"mappings":";;;AAAA,iCAAwD;AAQxD,SAAgB,wBAAwB,CACtC,QAAkB,EAClB,EAIuC;QAJvC,qBAIqC,EAAE,KAAA,EAHrC,YAAgB,EAAhB,IAAI,mBAAG,iBAAS,KAAA,EAChB,YAAkB,EAAlB,IAAI,mBAAG,mBAAW,KAAA,EAClB,mBAAkC,EAAlC,WAAW,mBAAG,qBAAc,IAAI,CAAE,KAAA;IAGpC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE5B,IAAA,KAA2B,IAAI,GAAG,CACtC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAE,EACjC,eAAO,CACR,EAHM,QAAQ,cAAA,EAAE,YAAY,kBAG5B,CAAC;IACF,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAE3C,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEzD,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC;AAtBD,4DAsBC"}
+{"version":3,"file":"expect-exit-iframe.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/expect-exit-iframe.ts"],"names":[],"mappings":";;;AAAA,iCAAwD;AASxD,SAAgB,wBAAwB,CACtC,QAAkB,EAClB,EAKuC;QALvC,qBAKqC,EAAE,KAAA,EAJrC,YAAgB,EAAhB,IAAI,mBAAG,iBAAS,KAAA,EAChB,YAAkB,EAAlB,IAAI,mBAAG,mBAAW,KAAA,EAClB,mBAAkC,EAAlC,WAAW,mBAAG,qBAAc,IAAI,CAAE,KAAA,EAClC,+BAA8B,EAA9B,uBAAuB,mBAAG,IAAI,KAAA;IAGhC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE5B,IAAA,KAA2B,IAAI,GAAG,CACtC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAE,EACjC,eAAO,CACR,EAHM,QAAQ,cAAA,EAAE,YAAY,kBAG5B,CAAC;IACF,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAE3C,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE5C,IAAI,mBAAmB,GAAG,WAAW,CAAC;IACtC,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,uBAAuB,EAAE,CAAC;YAC5B,mBAAmB,GAAG,WAAW,CAAC,MAAM,CAAC,gBAAS,IAAI,CAAE,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IACD,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;AACnE,CAAC;AA3BD,4DA2BC"}

package/build/ts/server/__test-helpers/index.d.ts

@@ -1,5 +1,3 @@
-import '@shopify/shopify-api/adapters/web-api';
-import '../adapters/node';
 export * from './const';
 export * from './expect-admin-api-client';
 export * from './expect-begin-auth-redirect';

package/build/ts/server/__test-helpers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/server/__test-helpers/index.ts"],"names":[],"mappings":"AAAA,OAAO,uCAAuC,CAAC;AAC/C,OAAO,kBAAkB,CAAC;AAE1B,cAAc,SAAS,CAAC;AACxB,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mCAAmC,CAAC;AAClD,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/server/__test-helpers/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mCAAmC,CAAC;AAClD,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC"}

package/build/ts/server/__test-helpers/index.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-require("@shopify/shopify-api/adapters/web-api");
-require("../adapters/node");
 tslib_1.__exportStar(require("./const"), exports);
 tslib_1.__exportStar(require("./expect-admin-api-client"), exports);
 tslib_1.__exportStar(require("./expect-begin-auth-redirect"), exports);

package/build/ts/server/__test-helpers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/index.ts"],"names":[],"mappings":";;;AAAA,iDAA+C;AAC/C,4BAA0B;AAE1B,kDAAwB;AACxB,oEAA0C;AAC1C,uEAA6C;AAC7C,4EAAkD;AAClD,+DAAqC;AACrC,kEAAwC;AACxC,yEAA+C;AAC/C,qDAA2B;AAC3B,oDAA0B;AAC1B,gEAAsC;AACtC,yDAA+B;AAC/B,gEAAsC;AACtC,gEAAsC;AACtC,wDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/index.ts"],"names":[],"mappings":";;;AAAA,kDAAwB;AACxB,oEAA0C;AAC1C,uEAA6C;AAC7C,4EAAkD;AAClD,+DAAqC;AACrC,kEAAwC;AACxC,yEAA+C;AAC/C,qDAA2B;AAC3B,oDAA0B;AAC1B,gEAAsC;AACtC,yDAA+B;AAC/B,gEAAsC;AACtC,gEAAsC;AACtC,wDAA8B"}

package/build/ts/server/__test-helpers/request-mock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-mock.d.ts","sourceRoot":"","sources":["../../../../src/server/__test-helpers/request-mock.ts"],"names":[],"mappings":"AAEA,UAAU,sBAAsB;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAWD,wBAAsB,mBAAmB,CAAC,EACxC,OAAO,EACP,QAAQ,GACT,EAAE,sBAAsB,iBAKxB;AAED,wBAAsB,oBAAoB,CAAC,GAAG,KAAK,EAAE,sBAAsB,EAAE,iBAY5E;AAiBD,wBAAsB,aAAa,kBAkFlC;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,QAE5C"}
+{"version":3,"file":"request-mock.d.ts","sourceRoot":"","sources":["../../../../src/server/__test-helpers/request-mock.ts"],"names":[],"mappings":"AAEA,UAAU,sBAAsB;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAWD,wBAAsB,mBAAmB,CAAC,EACxC,OAAO,EACP,QAAQ,GACT,EAAE,sBAAsB,iBAKxB;AAED,wBAAsB,oBAAoB,CAAC,GAAG,KAAK,EAAE,sBAAsB,EAAE,iBAY5E;AAiBD,wBAAsB,aAAa,kBAiFlC;AAkBD,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,QAE5C"}

package/build/ts/server/__test-helpers/request-mock.js

@@ -95,78 +95,157 @@ function mockParams(response) {
 function validateMocks() {
     var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var matchedRequests, _loop_1, _b, _c, _d, index, requestMock;
+        var matchedRequests, _loop_1, _b, _c, _d, index, requestMock, e_2_1;
         var e_2, _e;
         return tslib_1.__generator(this, function (_f) {
-            if (requestMocks.length === 0 && jest_fetch_mock_1.default.mock.calls.length === 0) {
-                return [2 /*return*/];
-            }
-            matchedRequests = 0;
-            _loop_1 = function (index, requestMock) {
-                var request = requestMock.request;
-                if (jest_fetch_mock_1.default.mock.calls.length === 0) {
-                    return "continue";
-                }
-                matchedRequests++;
-                var _g = tslib_1.__read(jest_fetch_mock_1.default.mock.calls[index], 2), url = _g[0], init = _g[1];
-                var expected = {};
-                var actual = {};
-                if (request === null || request === void 0 ? void 0 : request.url) {
-                    expected.url = new URL(request.url);
-                    actual.url = new URL(url);
-                }
-                if (request === null || request === void 0 ? void 0 : request.method) {
-                    expected.method = request.method;
-                    actual.method = (init === null || init === void 0 ? void 0 : init.method) || 'GET';
-                }
-                if (request === null || request === void 0 ? void 0 : request.body) {
-                    var bodyString = new TextDecoder('utf-8').decode(request.body);
-                    expected.body = expect.stringContaining(bodyString);
-                    actual.body = (_a = init === null || init === void 0 ? void 0 : init.body) === null || _a === void 0 ? void 0 : _a.toString();
-                }
-                if (request === null || request === void 0 ? void 0 : request.headers) {
-                    expected.headers = {};
-                    actual.headers = {};
-                    // eslint-disable-next-line no-warning-comments
-                    // TODO: we're currently not checking the headers properly. We should fix this.
-                    Object.entries(request.headers).forEach(function (_a) {
-                        var _b = tslib_1.__read(_a, 2), key = _b[0], value = _b[1];
-                        expected.headers[key] = value;
-                        actual.headers[key] = (init === null || init === void 0 ? void 0 : init.headers)[key];
-                    });
-                }
-                try {
-                    expect(actual).toEqual(expected);
-                }
-                catch (error) {
-                    error.message = "".concat(init === null || init === void 0 ? void 0 : init.method, " request made to ").concat(url, " does not match expectation:\n\n").concat(error.message);
-                    throw error;
-                }
-            };
-            try {
-                for (_b = tslib_1.__values(requestMocks.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
+            switch (_f.label) {
+                case 0:
+                    if (requestMocks.length === 0 && jest_fetch_mock_1.default.mock.calls.length === 0) {
+                        return [2 /*return*/];
+                    }
+                    matchedRequests = 0;
+                    _loop_1 = function (index, requestMock) {
+                        var request, _g, url, init, expected, actual, bodyBuffer, bodyString;
+                        return tslib_1.__generator(this, function (_h) {
+                            switch (_h.label) {
+                                case 0:
+                                    request = requestMock.request;
+                                    if (jest_fetch_mock_1.default.mock.calls.length === 0) {
+                                        return [2 /*return*/, "continue"];
+                                    }
+                                    matchedRequests++;
+                                    _g = tslib_1.__read(jest_fetch_mock_1.default.mock.calls[index], 2), url = _g[0], init = _g[1];
+                                    expected = {};
+                                    actual = {};
+                                    if (request === null || request === void 0 ? void 0 : request.url) {
+                                        expected.url = new URL(request.url);
+                                        actual.url = new URL(url);
+                                    }
+                                    if (request === null || request === void 0 ? void 0 : request.method) {
+                                        expected.method = request.method;
+                                        actual.method = (init === null || init === void 0 ? void 0 : init.method) || 'GET';
+                                    }
+                                    if (!(request === null || request === void 0 ? void 0 : request.body)) return [3 /*break*/, 2];
+                                    return [4 /*yield*/, stream2buffer(request.body)];
+                                case 1:
+                                    bodyBuffer = _h.sent();
+                                    bodyString = new TextDecoder('utf-8').decode(bodyBuffer);
+                                    expected.body = expect.stringContaining(bodyString);
+                                    actual.body = (_a = init === null || init === void 0 ? void 0 : init.body) === null || _a === void 0 ? void 0 : _a.toString();
+                                    _h.label = 2;
+                                case 2:
+                                    if (request === null || request === void 0 ? void 0 : request.headers) {
+                                        expected.headers = {};
+                                        actual.headers = {};
+                                        // eslint-disable-next-line no-warning-comments
+                                        // TODO: we're currently not checking the headers properly. We should fix this.
+                                        Object.entries(request.headers).forEach(function (_a) {
+                                            var _b = tslib_1.__read(_a, 2), key = _b[0], value = _b[1];
+                                            expected.headers[key] = value;
+                                            actual.headers[key] = (init === null || init === void 0 ? void 0 : init.headers)[key];
+                                        });
+                                    }
+                                    try {
+                                        expect(actual).toEqual(expected);
+                                    }
+                                    catch (error) {
+                                        error.message = "".concat(init === null || init === void 0 ? void 0 : init.method, " request made to ").concat(url, " does not match expectation:\n\n").concat(error.message);
+                                        throw error;
+                                    }
+                                    return [2 /*return*/];
+                            }
+                        });
+                    };
+                    _f.label = 1;
+                case 1:
+                    _f.trys.push([1, 6, 7, 8]);
+                    _b = tslib_1.__values(requestMocks.entries()), _c = _b.next();
+                    _f.label = 2;
+                case 2:
+                    if (!!_c.done) return [3 /*break*/, 5];
                     _d = tslib_1.__read(_c.value, 2), index = _d[0], requestMock = _d[1];
-                    _loop_1(index, requestMock);
-                }
-            }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_e = _b.return)) _e.call(_b);
-                }
-                finally { if (e_2) throw e_2.error; }
-            }
-            if (requestMocks.length > matchedRequests) {
-                throw new Error("Expected ".concat(requestMocks.length, " request(s) to be made but they were not:\n\n").concat(JSON.stringify(requestMocks, null, 2)));
-            }
-            if (jest_fetch_mock_1.default.mock.calls.length > matchedRequests) {
-                throw new Error("".concat(jest_fetch_mock_1.default.mock.calls.length, " unexpected request(s) were made, make sure to mock all expected requests:\n\n").concat(JSON.stringify(jest_fetch_mock_1.default.mock.calls, null, 2)));
+                    return [5 /*yield**/, _loop_1(index, requestMock)];
+                case 3:
+                    _f.sent();
+                    _f.label = 4;
+                case 4:
+                    _c = _b.next();
+                    return [3 /*break*/, 2];
+                case 5: return [3 /*break*/, 8];
+                case 6:
+                    e_2_1 = _f.sent();
+                    e_2 = { error: e_2_1 };
+                    return [3 /*break*/, 8];
+                case 7:
+                    try {
+                        if (_c && !_c.done && (_e = _b.return)) _e.call(_b);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                    return [7 /*endfinally*/];
+                case 8:
+                    if (requestMocks.length > matchedRequests) {
+                        throw new Error("Expected ".concat(requestMocks.length, " request(s) to be made but they were not:\n\n").concat(JSON.stringify(requestMocks, null, 2)));
+                    }
+                    if (jest_fetch_mock_1.default.mock.calls.length > matchedRequests) {
+                        throw new Error("".concat(jest_fetch_mock_1.default.mock.calls.length, " unexpected request(s) were made, make sure to mock all expected requests:\n\n").concat(JSON.stringify(jest_fetch_mock_1.default.mock.calls, null, 2)));
+                    }
+                    return [2 /*return*/];
             }
-            return [2 /*return*/];
         });
     });
 }
 exports.validateMocks = validateMocks;
+function stream2buffer(stream) {
+    var _a, e_3, _b, _c;
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var buffers, _d, _e, _f, data, e_3_1;
+        return tslib_1.__generator(this, function (_g) {
+            switch (_g.label) {
+                case 0:
+                    buffers = [];
+                    _g.label = 1;
+                case 1:
+                    _g.trys.push([1, 6, 7, 12]);
+                    _d = true, _e = tslib_1.__asyncValues(stream);
+                    _g.label = 2;
+                case 2: return [4 /*yield*/, _e.next()];
+                case 3:
+                    if (!(_f = _g.sent(), _a = _f.done, !_a)) return [3 /*break*/, 5];
+                    _c = _f.value;
+                    _d = false;
+                    data = _c;
+                    if (typeof data === 'number') {
+                        buffers.push(Uint8Array.from([data]));
+                    }
+                    else {
+                        buffers.push(data);
+                    }
+                    _g.label = 4;
+                case 4:
+                    _d = true;
+                    return [3 /*break*/, 2];
+                case 5: return [3 /*break*/, 12];
+                case 6:
+                    e_3_1 = _g.sent();
+                    e_3 = { error: e_3_1 };
+                    return [3 /*break*/, 12];
+                case 7:
+                    _g.trys.push([7, , 10, 11]);
+                    if (!(!_d && !_a && (_b = _e.return))) return [3 /*break*/, 9];
+                    return [4 /*yield*/, _b.call(_e)];
+                case 8:
+                    _g.sent();
+                    _g.label = 9;
+                case 9: return [3 /*break*/, 11];
+                case 10:
+                    if (e_3) throw e_3.error;
+                    return [7 /*endfinally*/];
+                case 11: return [7 /*endfinally*/];
+                case 12: return [2 /*return*/, Buffer.concat(buffers)];
+            }
+        });
+    });
+}
 function skipMockChecks(value) {
     skipMockChecksFlag = value;
 }

package/build/ts/server/__test-helpers/request-mock.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-mock.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/request-mock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request-mock.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/request-mock.ts"],"names":[],"mappings":"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"}

package/build/ts/server/__test-helpers/test-config.d.ts

@@ -19,6 +19,7 @@ declare const TEST_CONFIG: {
     readonly future: Required<{
         v3_webhookAdminContext?: true | undefined;
         v3_authenticatePublic?: true | undefined;
+        v3_lineItemBilling?: true | undefined;
         unstable_newEmbeddedAuthStrategy?: true | undefined;
     }>;
 };

package/build/ts/server/__test-helpers/test-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-config.d.ts","sourceRoot":"","sources":["../../../../src/server/__test-helpers/test-config.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,WAAW,EACX,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAC,cAAc,EAAC,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAC,oBAAoB,EAAC,MAAM,6CAA6C,CAAC;AAEjF,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAC,iBAAiB,EAAc,MAAM,iBAAiB,CAAC;AAiBpE,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;CAaP,CAAC;AAQX,wBAAgB,UAAU,CACxB,SAAS,SAAS,gBAAgB,CAAC,MAAM,CAAC,EAC1C,MAAM,SAAS,iBAAiB,EAEhC,EAAC,MAAM,EAAE,GAAG,SAAS,EAAC,GAAE,SAAS,GAAG;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAEnD,GACA,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,CAa/B;AASD,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,IAAI;KACzB,GAAG,IAAI,MAAM,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,SAAS,SAAS,GAC/C,KAAK,GACL,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;CACrB,GAAG;KACD,GAAG,IAAI,MAAM,KAAK,IAAI,GAAG,SAAS,MAAM,KAAK,GAAG,KAAK,GAAG,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;CAC1E,CAAC;AAEF,KAAK,oBAAoB,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAM9E,KAAK,aAAa,CAAC,MAAM,IAAI,OAAO,CAClC,IAAI,CACF,YAAY,CACV,oBAAoB,EACpB,cAAc,EACd,oBAAoB,CAAC,MAAM,CAAC,CAC7B,EACD,QAAQ,CACT,GAAG;IACF,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC;CAC/C,CACF,CAAC;AAEF,KAAK,gBAAgB,CAAC,MAAM,IAAI,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;AAElE,KAAK,UAAU,CAAC,SAAS,SAAS,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,IAAI,MAAM,CAC1E,OAAO,WAAW,EAClB,SAAS,CACV,GAAG;IACF,MAAM,EAAE,MAAM,CAAC,OAAO,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnD,CAAC"}
+{"version":3,"file":"test-config.d.ts","sourceRoot":"","sources":["../../../../src/server/__test-helpers/test-config.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,WAAW,EACX,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAC,cAAc,EAAC,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAC,oBAAoB,EAAC,MAAM,6CAA6C,CAAC;AAEjF,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAC,iBAAiB,EAAc,MAAM,iBAAiB,CAAC;AAkBpE,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;CAaP,CAAC;AAQX,wBAAgB,UAAU,CACxB,SAAS,SAAS,gBAAgB,CAAC,MAAM,CAAC,EAC1C,MAAM,SAAS,iBAAiB,EAEhC,EAAC,MAAM,EAAE,GAAG,SAAS,EAAC,GAAE,SAAS,GAAG;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAEnD,GACA,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,CAa/B;AASD,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,IAAI;KACzB,GAAG,IAAI,MAAM,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,SAAS,SAAS,GAC/C,KAAK,GACL,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;CACrB,GAAG;KACD,GAAG,IAAI,MAAM,KAAK,IAAI,GAAG,SAAS,MAAM,KAAK,GAAG,KAAK,GAAG,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;CAC1E,CAAC;AAEF,KAAK,oBAAoB,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAM9E,KAAK,aAAa,CAAC,MAAM,IAAI,OAAO,CAClC,IAAI,CACF,YAAY,CACV,oBAAoB,EACpB,cAAc,EACd,oBAAoB,CAAC,MAAM,CAAC,CAC7B,EACD,QAAQ,CACT,GAAG;IACF,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC;CAC/C,CACF,CAAC;AAEF,KAAK,gBAAgB,CAAC,MAAM,IAAI,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;AAElE,KAAK,UAAU,CAAC,SAAS,SAAS,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,IAAI,MAAM,CAC1E,OAAO,WAAW,EAClB,SAAS,CACV,GAAG;IACF,MAAM,EAAE,MAAM,CAAC,OAAO,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnD,CAAC"}

package/build/ts/server/__test-helpers/test-config.js

@@ -15,6 +15,7 @@ var const_1 = require("./const");
 var TEST_FUTURE_FLAGS = {
     v3_authenticatePublic: true,
     v3_webhookAdminContext: true,
+    v3_lineItemBilling: true,
     unstable_newEmbeddedAuthStrategy: true,
 };
 var TEST_CONFIG = {

package/build/ts/server/__test-helpers/test-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-config.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/test-config.ts"],"names":[],"mappings":";;;;AAAA,oDAI8B;AAE9B,kGAAiF;AAKjF,iCAAyD;AAEzD;;;;;;GAMG;AACH,IAAM,iBAAiB,GAAiD;IACtE,qBAAqB,EAAE,IAAI;IAC3B,sBAAsB,EAAE,IAAI;IAC5B,gCAAgC,EAAE,IAAI;CAC9B,CAAC;AAEX,IAAM,WAAW,GAAG;IAClB,MAAM,EAAE,eAAO;IACf,YAAY,EAAE,sBAAc;IAC5B,MAAM,EAAE,CAAC,WAAW,CAAQ;IAC5B,UAAU,EAAE,gCAAkB;IAC9B,MAAM,EAAE,eAAO;IACf,MAAM,EAAE;QACN,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;QACd,KAAK,EAAE,yBAAW,CAAC,KAAK;KACzB;IACD,aAAa,EAAE,IAAI;IACnB,cAAc,EAAE,IAAI,yDAAoB,EAAE;IAC1C,MAAM,EAAE,iBAAiB;CACjB,CAAC;AAEX,2CAA2C;AAC3C,UAAU,CAAC;IACT,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;IAClC,WAAmB,CAAC,cAAc,GAAG,IAAI,yDAAoB,EAAE,CAAC;AACnE,CAAC,CAAC,CAAC;AAEH,SAAgB,UAAU,CAIxB,EAEC;IAFD,mBAAA,EAAA,KAAwD,EAEvD;IAFA,IAAA,MAAM,YAAA,EAAK,SAAS,sBAArB,UAAsB,CAAD;IAIrB,OAAO,uDACF,WAAW,GACX,SAAS,KACZ,MAAM,wCACD,WAAW,CAAC,MAAM,GACjB,SAAoC,CAAC,MAAM,GAEjD,MAAM,wCACD,WAAW,CAAC,MAAM,GAClB,MAAM,IAEL,CAAC;AACX,CAAC;AApBD,gCAoBC"}
+{"version":3,"file":"test-config.js","sourceRoot":"","sources":["../../../../src/server/__test-helpers/test-config.ts"],"names":[],"mappings":";;;;AAAA,oDAI8B;AAE9B,kGAAiF;AAKjF,iCAAyD;AAEzD;;;;;;GAMG;AACH,IAAM,iBAAiB,GAAiD;IACtE,qBAAqB,EAAE,IAAI;IAC3B,sBAAsB,EAAE,IAAI;IAC5B,kBAAkB,EAAE,IAAI;IACxB,gCAAgC,EAAE,IAAI;CAC9B,CAAC;AAEX,IAAM,WAAW,GAAG;IAClB,MAAM,EAAE,eAAO;IACf,YAAY,EAAE,sBAAc;IAC5B,MAAM,EAAE,CAAC,WAAW,CAAQ;IAC5B,UAAU,EAAE,gCAAkB;IAC9B,MAAM,EAAE,eAAO;IACf,MAAM,EAAE;QACN,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;QACd,KAAK,EAAE,yBAAW,CAAC,KAAK;KACzB;IACD,aAAa,EAAE,IAAI;IACnB,cAAc,EAAE,IAAI,yDAAoB,EAAE;IAC1C,MAAM,EAAE,iBAAiB;CACjB,CAAC;AAEX,2CAA2C;AAC3C,UAAU,CAAC;IACT,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;IAClC,WAAmB,CAAC,cAAc,GAAG,IAAI,yDAAoB,EAAE,CAAC;AACnE,CAAC,CAAC,CAAC;AAEH,SAAgB,UAAU,CAIxB,EAEC;IAFD,mBAAA,EAAA,KAAwD,EAEvD;IAFA,IAAA,MAAM,YAAA,EAAK,SAAS,sBAArB,UAAsB,CAAD;IAIrB,OAAO,uDACF,WAAW,GACX,SAAS,KACZ,MAAM,wCACD,WAAW,CAAC,MAAM,GACjB,SAAoC,CAAC,MAAM,GAEjD,MAAM,wCACD,WAAW,CAAC,MAAM,GAClB,MAAM,IAEL,CAAC;AACX,CAAC;AApBD,gCAoBC"}

package/build/ts/server/adapters/vercel/index.d.ts

@@ -0,0 +1,2 @@
+import '../node';
+//# sourceMappingURL=index.d.ts.map

package/build/ts/server/adapters/vercel/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/server/adapters/vercel/index.ts"],"names":[],"mappings":"AAGA,OAAO,SAAS,CAAC"}

package/build/ts/server/adapters/vercel/index.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var runtime_1 = require("@shopify/shopify-api/runtime");
+var node_1 = require("@remix-run/node");
+require("../node");
+(0, node_1.installGlobals)();
+var fetchFunc = fetch;
+(0, runtime_1.setAbstractFetchFunc)(function () {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var response;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, fetchFunc.apply(this, args)];
+                case 1:
+                    response = _a.sent();
+                    return [2 /*return*/, response];
+            }
+        });
+    });
+});
+//# sourceMappingURL=index.js.map

package/build/ts/server/adapters/vercel/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/server/adapters/vercel/index.ts"],"names":[],"mappings":";;;AAAA,wDAAkE;AAClE,wCAA+C;AAE/C,mBAAiB;AAEjB,IAAA,qBAAc,GAAE,CAAC;AAEjB,IAAM,SAAS,GAAG,KAAK,CAAC;AACxB,IAAA,8BAAoB,EAAC;IAAO,cAAO;SAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;QAAP,yBAAO;;;;;;wBAChB,qBAAM,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,EAAA;;oBAA5C,QAAQ,GAAG,SAAiC;oBAElD,sBAAO,QAAQ,EAAC;;;;CACjB,CAAC,CAAC"}

package/build/ts/server/authenticate/admin/billing/cancel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cancel.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/cancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAEhE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAGhD,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,SAAS,CAAC;AAElD,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,aAE6B,oBAAoB,6DAuBlE"}
+{"version":3,"file":"cancel.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/billing/cancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAEhE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAGhD,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,SAAS,CAAC;AAElD,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,aAE6B,oBAAoB,6DAwBlE"}

package/build/ts/server/authenticate/admin/billing/cancel.js

@@ -7,15 +7,15 @@ var helpers_1 = require("../helpers");
 function cancelBillingFactory(params, request, session) {
     return function cancelBilling(options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var api, logger, error_1;
+            var api, logger, config, error_1;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        api = params.api, logger = params.logger;
+                        api = params.api, logger = params.logger, config = params.config;
                         logger.debug('Cancelling billing', tslib_1.__assign({ shop: session.shop }, options));
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 7]);
+                        _a.trys.push([1, 3, , 8]);
                         return [4 /*yield*/, api.billing.cancel({
                                 session: session,
                                 subscriptionId: options.subscriptionId,
@@ -25,15 +25,18 @@ function cancelBillingFactory(params, request, session) {
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
                         error_1 = _a.sent();
-                        if (!(error_1 instanceof shopify_api_1.HttpResponseError && error_1.response.code === 401)) return [3 /*break*/, 5];
+                        if (!(error_1 instanceof shopify_api_1.HttpResponseError && error_1.response.code === 401)) return [3 /*break*/, 6];
                         logger.debug('API token was invalid, redirecting to OAuth', {
                             shop: session.shop,
                         });
+                        return [4 /*yield*/, config.sessionStorage.deleteSession(session.id)];
+                    case 4:
+                        _a.sent();
                         return [4 /*yield*/, (0, helpers_1.redirectToAuthPage)(params, request, session.shop)];
-                    case 4: throw _a.sent();
-                    case 5: throw error_1;
-                    case 6: return [3 /*break*/, 7];
-                    case 7: return [2 /*return*/];
+                    case 5: throw _a.sent();
+                    case 6: throw error_1;
+                    case 7: return [3 /*break*/, 8];
+                    case 8: return [2 /*return*/];
                 }
             });
         });