@shopify/shopify-api 6.0.2 → 6.2.0

package/lib/auth/get-embedded-app-url.js

@@ -1,43 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildEmbeddedAppUrl = exports.getEmbeddedAppUrl = void 0;
-var tslib_1 = require("tslib");
-var ShopifyErrors = tslib_1.__importStar(require("../error"));
-var http_1 = require("../../runtime/http");
-var shop_validator_1 = require("../utils/shop-validator");
-var decode_host_1 = require("./decode-host");
+const tslib_1 = require("tslib");
+const ShopifyErrors = tslib_1.__importStar(require("../error"));
+const http_1 = require("../../runtime/http");
+const shop_validator_1 = require("../utils/shop-validator");
+const decode_host_1 = require("./decode-host");
 function getEmbeddedAppUrl(config) {
-    var _this = this;
-    return function (_a) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-        var request, url, host;
+    return (_a) => tslib_1.__awaiter(this, void 0, void 0, function* () {
         var adapterArgs = tslib_1.__rest(_a, []);
-        return tslib_1.__generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, http_1.abstractConvertRequest)(adapterArgs)];
-                case 1:
-                    request = _b.sent();
-                    if (!request) {
-                        throw new ShopifyErrors.MissingRequiredArgument('getEmbeddedAppUrl requires a request object argument');
-                    }
-                    if (!request.url) {
-                        throw new ShopifyErrors.InvalidRequestError('Request does not contain a URL');
-                    }
-                    url = new URL(request.url, "https://".concat(request.headers.host));
-                    host = url.searchParams.get('host');
-                    if (typeof host !== 'string') {
-                        throw new ShopifyErrors.InvalidRequestError('Request does not contain a host query parameter');
-                    }
-                    return [2 /*return*/, buildEmbeddedAppUrl(config)(host)];
-            }
-        });
-    }); };
+        const request = yield (0, http_1.abstractConvertRequest)(adapterArgs);
+        if (!request) {
+            throw new ShopifyErrors.MissingRequiredArgument('getEmbeddedAppUrl requires a request object argument');
+        }
+        if (!request.url) {
+            throw new ShopifyErrors.InvalidRequestError('Request does not contain a URL');
+        }
+        const url = new URL(request.url, `https://${request.headers.host}`);
+        const host = url.searchParams.get('host');
+        if (typeof host !== 'string') {
+            throw new ShopifyErrors.InvalidRequestError('Request does not contain a host query parameter');
+        }
+        return buildEmbeddedAppUrl(config)(host);
+    });
 }
 exports.getEmbeddedAppUrl = getEmbeddedAppUrl;
 function buildEmbeddedAppUrl(config) {
-    return function (host) {
+    return (host) => {
         (0, shop_validator_1.sanitizeHost)(config)(host, true);
-        var decodedHost = (0, decode_host_1.decodeHost)(host);
-        return "https://".concat(decodedHost, "/apps/").concat(config.apiKey);
+        const decodedHost = (0, decode_host_1.decodeHost)(host);
+        return `https://${decodedHost}/apps/${config.apiKey}`;
     };
 }
 exports.buildEmbeddedAppUrl = buildEmbeddedAppUrl;

package/lib/auth/get-embedded-app-url.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-embedded-app-url.js","sourceRoot":"","sources":["get-embedded-app-url.ts"],"names":[],"mappings":";;;;AAAA,8DAA0C;AAE1C,2CAA0D;AAC1D,0DAAqD;AAErD,6CAAyC;AAGzC,SAAgB,iBAAiB,CAAC,MAAuB;IAAzD,iBA2BC;IA1BC,OAAO,UAAO,EAAyC;;YAArC,WAAW,sBAAf,EAAgB,CAAD;;;wBACX,qBAAM,IAAA,6BAAsB,EAAC,WAAW,CAAC,EAAA;;oBAAnD,OAAO,GAAG,SAAyC;oBAEzD,IAAI,CAAC,OAAO,EAAE;wBACZ,MAAM,IAAI,aAAa,CAAC,uBAAuB,CAC7C,sDAAsD,CACvD,CAAC;qBACH;oBAED,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;wBAChB,MAAM,IAAI,aAAa,CAAC,mBAAmB,CACzC,gCAAgC,CACjC,CAAC;qBACH;oBAEK,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,kBAAW,OAAO,CAAC,OAAO,CAAC,IAAI,CAAE,CAAC,CAAC;oBAC9D,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;oBAE1C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;wBAC5B,MAAM,IAAI,aAAa,CAAC,mBAAmB,CACzC,iDAAiD,CAClD,CAAC;qBACH;oBAED,sBAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAC;;;SAC1C,CAAC;AACJ,CAAC;AA3BD,8CA2BC;AAED,SAAgB,mBAAmB,CAAC,MAAuB;IACzD,OAAO,UAAC,IAAY;QAClB,IAAA,6BAAY,EAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACjC,IAAM,WAAW,GAAG,IAAA,wBAAU,EAAC,IAAI,CAAC,CAAC;QAErC,OAAO,kBAAW,WAAW,mBAAS,MAAM,CAAC,MAAM,CAAE,CAAC;IACxD,CAAC,CAAC;AACJ,CAAC;AAPD,kDAOC"}
+{"version":3,"file":"get-embedded-app-url.js","sourceRoot":"","sources":["get-embedded-app-url.ts"],"names":[],"mappings":";;;;AAAA,gEAA0C;AAE1C,6CAA0D;AAC1D,4DAAqD;AAErD,+CAAyC;AAGzC,SAAgB,iBAAiB,CAAC,MAAuB;IACvD,OAAO,CAAO,EAAyC,EAAmB,EAAE;YAA1D,WAAW,sBAAf,EAAgB,CAAD;QAC3B,MAAM,OAAO,GAAG,MAAM,IAAA,6BAAsB,EAAC,WAAW,CAAC,CAAC;QAE1D,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,aAAa,CAAC,uBAAuB,CAC7C,sDAAsD,CACvD,CAAC;SACH;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YAChB,MAAM,IAAI,aAAa,CAAC,mBAAmB,CACzC,gCAAgC,CACjC,CAAC;SACH;QAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE1C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC5B,MAAM,IAAI,aAAa,CAAC,mBAAmB,CACzC,iDAAiD,CAClD,CAAC;SACH;QAED,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC,CAAA,CAAC;AACJ,CAAC;AA3BD,8CA2BC;AAED,SAAgB,mBAAmB,CAAC,MAAuB;IACzD,OAAO,CAAC,IAAY,EAAU,EAAE;QAC9B,IAAA,6BAAY,EAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACjC,MAAM,WAAW,GAAG,IAAA,wBAAU,EAAC,IAAI,CAAC,CAAC;QAErC,OAAO,WAAW,WAAW,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC;IACxD,CAAC,CAAC;AACJ,CAAC;AAPD,kDAOC"}

package/lib/auth/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.shopifyAuth = void 0;
-var oauth_1 = require("./oauth/oauth");
-var nonce_1 = require("./oauth/nonce");
-var safe_compare_1 = require("./oauth/safe-compare");
-var get_embedded_app_url_1 = require("./get-embedded-app-url");
+const oauth_1 = require("./oauth/oauth");
+const nonce_1 = require("./oauth/nonce");
+const safe_compare_1 = require("./oauth/safe-compare");
+const get_embedded_app_url_1 = require("./get-embedded-app-url");
 function shopifyAuth(config) {
     return {
         begin: (0, oauth_1.begin)(config),

package/lib/auth/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAEA,uCAA8C;AAC9C,uCAAoC;AACpC,qDAAiD;AACjD,+DAA8E;AAE9E,SAAgB,WAAW,CAAC,MAAuB;IACjD,OAAO;QACL,KAAK,EAAE,IAAA,aAAK,EAAC,MAAM,CAAC;QACpB,QAAQ,EAAE,IAAA,gBAAQ,EAAC,MAAM,CAAC;QAC1B,KAAK,eAAA;QACL,WAAW,4BAAA;QACX,iBAAiB,EAAE,IAAA,wCAAiB,EAAC,MAAM,CAAC;QAC5C,mBAAmB,EAAE,IAAA,0CAAmB,EAAC,MAAM,CAAC;KACjD,CAAC;AACJ,CAAC;AATD,kCASC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAEA,yCAA8C;AAC9C,yCAAoC;AACpC,uDAAiD;AACjD,iEAA8E;AAE9E,SAAgB,WAAW,CAAC,MAAuB;IACjD,OAAO;QACL,KAAK,EAAE,IAAA,aAAK,EAAC,MAAM,CAAC;QACpB,QAAQ,EAAE,IAAA,gBAAQ,EAAC,MAAM,CAAC;QAC1B,KAAK,EAAL,aAAK;QACL,WAAW,EAAX,0BAAW;QACX,iBAAiB,EAAE,IAAA,wCAAiB,EAAC,MAAM,CAAC;QAC5C,mBAAmB,EAAE,IAAA,0CAAmB,EAAC,MAAM,CAAC;KACjD,CAAC;AACJ,CAAC;AATD,kCASC"}

package/lib/auth/oauth/nonce.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nonce = void 0;
-var crypto_1 = require("../../../runtime/crypto");
+const crypto_1 = require("../../../runtime/crypto");
 function nonce() {
-    var length = 15;
+    const length = 15;
     // eslint-disable-next-line no-warning-comments
     // TODO Remove the randomBytes call when dropping Node 14 support
-    var bytes = crypto_1.crypto.getRandomValues
+    const bytes = crypto_1.crypto.getRandomValues
         ? crypto_1.crypto.getRandomValues(new Uint8Array(length))
         : crypto_1.crypto.randomBytes(length);
-    var nonce = bytes
-        .map(function (byte) {
+    const nonce = bytes
+        .map((byte) => {
         return byte % 10;
     })
         .join('');

package/lib/auth/oauth/nonce.js.map

@@ -1 +1 @@
-{"version":3,"file":"nonce.js","sourceRoot":"","sources":["nonce.ts"],"names":[],"mappings":";;;AAAA,kDAA+C;AAE/C,SAAgB,KAAK;IACnB,IAAM,MAAM,GAAG,EAAE,CAAC;IAElB,+CAA+C;IAC/C,iEAAiE;IACjE,IAAM,KAAK,GAAG,eAAM,CAAC,eAAe;QAClC,CAAC,CAAC,eAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;QAChD,CAAC,CAAE,eAAc,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAExC,IAAM,KAAK,GAAG,KAAK;SAChB,GAAG,CAAC,UAAC,IAAY;QAChB,OAAO,IAAI,GAAG,EAAE,CAAC;IACnB,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAAC;IAEZ,OAAO,KAAK,CAAC;AACf,CAAC;AAhBD,sBAgBC"}
+{"version":3,"file":"nonce.js","sourceRoot":"","sources":["nonce.ts"],"names":[],"mappings":";;;AAAA,oDAA+C;AAE/C,SAAgB,KAAK;IACnB,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,+CAA+C;IAC/C,iEAAiE;IACjE,MAAM,KAAK,GAAG,eAAM,CAAC,eAAe;QAClC,CAAC,CAAC,eAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;QAChD,CAAC,CAAE,eAAc,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAExC,MAAM,KAAK,GAAG,KAAK;SAChB,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE;QACpB,OAAO,IAAI,GAAG,EAAE,CAAC;IACnB,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAAC;IAEZ,OAAO,KAAK,CAAC;AACf,CAAC;AAhBD,sBAgBC"}

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

@@ -1 +1 @@
-{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["oauth.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAI9C,OAAO,EAIL,eAAe,EACf,cAAc,EAGf,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAGL,WAAW,EACX,cAAc,EAKf,MAAM,SAAS,CAAC;AAIjB,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,cAAc;IAClD,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,eAAe,sDAMxC,WAAW,KAAG,QAAQ,eAAe,CAAC,CAkD1C;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,eAAe,0DAI3C,cAAc,kCAyFlB"}
+{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["oauth.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAI9C,OAAO,EAKL,eAAe,EACf,cAAc,EAGf,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAGL,WAAW,EACX,cAAc,EAKf,MAAM,SAAS,CAAC;AAIjB,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,cAAc;IAClD,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,eAAe,sDAMxC,WAAW,KAAG,QAAQ,eAAe,CAAC,CAkD1C;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,eAAe,0DAI3C,cAAc,kCA0FlB"}

package/lib/auth/oauth/oauth.js

@@ -1,210 +1,171 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.callback = exports.begin = void 0;
-var tslib_1 = require("tslib");
-var uuid_1 = require("uuid");
-var processed_query_1 = tslib_1.__importDefault(require("../../utils/processed-query"));
-var ShopifyErrors = tslib_1.__importStar(require("../../error"));
-var hmac_validator_1 = require("../../utils/hmac-validator");
-var shop_validator_1 = require("../../utils/shop-validator");
-var session_1 = require("../../session/session");
-var session_utils_1 = require("../../session/session-utils");
-var http_client_1 = require("../../clients/http_client/http_client");
-var types_1 = require("../../clients/http_client/types");
-var http_1 = require("../../../runtime/http");
-var logger_1 = require("../../logger");
-var types_2 = require("./types");
-var nonce_1 = require("./nonce");
-var safe_compare_1 = require("./safe-compare");
+const tslib_1 = require("tslib");
+const uuid_1 = require("uuid");
+const processed_query_1 = tslib_1.__importDefault(require("../../utils/processed-query"));
+const ShopifyErrors = tslib_1.__importStar(require("../../error"));
+const hmac_validator_1 = require("../../utils/hmac-validator");
+const shop_validator_1 = require("../../utils/shop-validator");
+const session_1 = require("../../session/session");
+const session_utils_1 = require("../../session/session-utils");
+const http_client_1 = require("../../clients/http_client/http_client");
+const types_1 = require("../../clients/http_client/types");
+const http_1 = require("../../../runtime/http");
+const logger_1 = require("../../logger");
+const types_2 = require("./types");
+const nonce_1 = require("./nonce");
+const safe_compare_1 = require("./safe-compare");
 function begin(config) {
-    var _this = this;
-    return function (_a) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-        var log, cleanShop, request, cookies, state, query, processedQuery, redirectUrl, response;
-        var shop = _a.shop, callbackPath = _a.callbackPath, isOnline = _a.isOnline, adapterArgs = tslib_1.__rest(_a, ["shop", "callbackPath", "isOnline"]);
-        return tslib_1.__generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    throwIfPrivateApp(config.isPrivateApp, 'Cannot perform OAuth for private apps');
-                    log = (0, logger_1.logger)(config);
-                    log.info('Beginning OAuth', { shop: shop, isOnline: isOnline, callbackPath: callbackPath });
-                    cleanShop = (0, shop_validator_1.sanitizeShop)(config)(shop, true);
-                    return [4 /*yield*/, (0, http_1.abstractConvertRequest)(adapterArgs)];
-                case 1:
-                    request = _b.sent();
-                    cookies = new http_1.Cookies(request, {}, {
-                        keys: [config.apiSecretKey],
-                        secure: true,
-                    });
-                    state = (0, nonce_1.nonce)();
-                    return [4 /*yield*/, cookies.setAndSign(types_2.STATE_COOKIE_NAME, state, {
-                            expires: new Date(Date.now() + 60000),
-                            sameSite: 'lax',
-                            secure: true,
-                            path: callbackPath,
-                        })];
-                case 2:
-                    _b.sent();
-                    query = {
-                        client_id: config.apiKey,
-                        scope: config.scopes.toString(),
-                        redirect_uri: "".concat(config.hostScheme, "://").concat(config.hostName).concat(callbackPath),
-                        state: state,
-                        'grant_options[]': isOnline ? 'per-user' : '',
-                    };
-                    processedQuery = new processed_query_1.default();
-                    processedQuery.putAll(query);
-                    redirectUrl = "https://".concat(cleanShop, "/admin/oauth/authorize").concat(processedQuery.stringify());
-                    response = {
-                        statusCode: 302,
-                        statusText: 'Found',
-                        headers: tslib_1.__assign(tslib_1.__assign({}, cookies.response.headers), { Location: redirectUrl }),
-                    };
-                    log.debug("OAuth started, redirecting to ".concat(redirectUrl), { shop: shop, isOnline: isOnline });
-                    return [2 /*return*/, (0, http_1.abstractConvertResponse)(response, adapterArgs)];
-            }
+    return (_a) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        var { shop, callbackPath, isOnline } = _a, adapterArgs = tslib_1.__rest(_a, ["shop", "callbackPath", "isOnline"]);
+        throwIfCustomStoreApp(config.isCustomStoreApp, 'Cannot perform OAuth for private apps');
+        const log = (0, logger_1.logger)(config);
+        log.info('Beginning OAuth', { shop, isOnline, callbackPath });
+        const cleanShop = (0, shop_validator_1.sanitizeShop)(config)(shop, true);
+        const request = yield (0, http_1.abstractConvertRequest)(adapterArgs);
+        const response = yield (0, http_1.abstractConvertIncomingResponse)(adapterArgs);
+        const cookies = new http_1.Cookies(request, response, {
+            keys: [config.apiSecretKey],
+            secure: true,
+        });
+        const state = (0, nonce_1.nonce)();
+        yield cookies.setAndSign(types_2.STATE_COOKIE_NAME, state, {
+            expires: new Date(Date.now() + 60000),
+            sameSite: 'lax',
+            secure: true,
+            path: callbackPath,
         });
-    }); };
+        const query = {
+            client_id: config.apiKey,
+            scope: config.scopes.toString(),
+            redirect_uri: `${config.hostScheme}://${config.hostName}${callbackPath}`,
+            state,
+            'grant_options[]': isOnline ? 'per-user' : '',
+        };
+        const processedQuery = new processed_query_1.default();
+        processedQuery.putAll(query);
+        const redirectUrl = `https://${cleanShop}/admin/oauth/authorize${processedQuery.stringify()}`;
+        response.statusCode = 302;
+        response.statusText = 'Found';
+        response.headers = Object.assign(Object.assign(Object.assign({}, response.headers), cookies.response.headers), { Location: redirectUrl });
+        log.debug(`OAuth started, redirecting to ${redirectUrl}`, { shop, isOnline });
+        return (0, http_1.abstractConvertResponse)(response, adapterArgs);
+    });
 }
 exports.begin = begin;
 function callback(config) {
     return function callback(_a) {
-        var isOnlineParam = _a.isOnline, adapterArgs = tslib_1.__rest(_a, ["isOnline"]);
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var log, request, query, shop, cookies, stateFromCookie, authQuery, body, postParams, cleanShop, HttpClient, client, postResponse, session;
-            var _b;
-            return tslib_1.__generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        throwIfPrivateApp(config.isPrivateApp, 'Cannot perform OAuth for private apps');
-                        log = (0, logger_1.logger)(config);
-                        if (!(isOnlineParam !== undefined)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, log.deprecated('7.0.0', 'The isOnline param is no longer required for auth callback')];
-                    case 1:
-                        _c.sent();
-                        _c.label = 2;
-                    case 2: return [4 /*yield*/, (0, http_1.abstractConvertRequest)(adapterArgs)];
-                    case 3:
-                        request = _c.sent();
-                        query = new URL(request.url, "".concat(config.hostScheme, "://").concat(config.hostName)).searchParams;
-                        shop = query.get('shop');
-                        log.info('Completing OAuth', { shop: shop });
-                        cookies = new http_1.Cookies(request, {}, {
-                            keys: [config.apiSecretKey],
-                            secure: true,
-                        });
-                        return [4 /*yield*/, cookies.getAndVerify(types_2.STATE_COOKIE_NAME)];
-                    case 4:
-                        stateFromCookie = _c.sent();
-                        cookies.deleteCookie(types_2.STATE_COOKIE_NAME);
-                        if (!stateFromCookie) {
-                            log.error('Could not find OAuth cookie', { shop: shop });
-                            throw new ShopifyErrors.CookieNotFound("Cannot complete OAuth process. Could not find an OAuth cookie for shop url: ".concat(shop));
-                        }
-                        authQuery = Object.fromEntries(query.entries());
-                        return [4 /*yield*/, validQuery({ config: config, query: authQuery, stateFromCookie: stateFromCookie })];
-                    case 5:
-                        if (!(_c.sent())) {
-                            log.error('Invalid OAuth callback', { shop: shop, stateFromCookie: stateFromCookie });
-                            throw new ShopifyErrors.InvalidOAuthError('Invalid OAuth callback.');
-                        }
-                        log.debug('OAuth request is valid, requesting access token', { shop: shop });
-                        body = {
-                            client_id: config.apiKey,
-                            client_secret: config.apiSecretKey,
-                            code: query.get('code'),
-                        };
-                        postParams = {
-                            path: '/admin/oauth/access_token',
-                            type: types_1.DataType.JSON,
-                            data: body,
-                        };
-                        cleanShop = (0, shop_validator_1.sanitizeShop)(config)(query.get('shop'), true);
-                        HttpClient = (0, http_client_1.httpClientClass)(config);
-                        client = new HttpClient({ domain: cleanShop });
-                        return [4 /*yield*/, client.post(postParams)];
-                    case 6:
-                        postResponse = _c.sent();
-                        session = createSession({
-                            postResponse: postResponse,
-                            shop: cleanShop,
-                            stateFromCookie: stateFromCookie,
-                            config: config,
-                        });
-                        if (!!config.isEmbeddedApp) return [3 /*break*/, 8];
-                        return [4 /*yield*/, cookies.setAndSign(types_2.SESSION_COOKIE_NAME, session.id, {
-                                expires: session.expires,
-                                sameSite: 'lax',
-                                secure: true,
-                            })];
-                    case 7:
-                        _c.sent();
-                        _c.label = 8;
-                    case 8:
-                        _b = {};
-                        return [4 /*yield*/, (0, http_1.abstractConvertHeaders)(cookies.response.headers, adapterArgs)];
-                    case 9: return [2 /*return*/, (_b.headers = (_c.sent()),
-                            _b.session = session,
-                            _b)];
-                }
+        var { isOnline: isOnlineParam } = _a, adapterArgs = tslib_1.__rest(_a, ["isOnline"]);
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            throwIfCustomStoreApp(config.isCustomStoreApp, 'Cannot perform OAuth for private apps');
+            const log = (0, logger_1.logger)(config);
+            if (isOnlineParam !== undefined) {
+                yield log.deprecated('7.0.0', 'The isOnline param is no longer required for auth callback');
+            }
+            const request = yield (0, http_1.abstractConvertRequest)(adapterArgs);
+            const query = new URL(request.url, `${config.hostScheme}://${config.hostName}`).searchParams;
+            const shop = query.get('shop');
+            log.info('Completing OAuth', { shop });
+            const cookies = new http_1.Cookies(request, {}, {
+                keys: [config.apiSecretKey],
+                secure: true,
+            });
+            const stateFromCookie = yield cookies.getAndVerify(types_2.STATE_COOKIE_NAME);
+            cookies.deleteCookie(types_2.STATE_COOKIE_NAME);
+            if (!stateFromCookie) {
+                log.error('Could not find OAuth cookie', { shop });
+                throw new ShopifyErrors.CookieNotFound(`Cannot complete OAuth process. Could not find an OAuth cookie for shop url: ${shop}`);
+            }
+            const authQuery = Object.fromEntries(query.entries());
+            if (!(yield validQuery({ config, query: authQuery, stateFromCookie }))) {
+                log.error('Invalid OAuth callback', { shop, stateFromCookie });
+                throw new ShopifyErrors.InvalidOAuthError('Invalid OAuth callback.');
+            }
+            log.debug('OAuth request is valid, requesting access token', { shop });
+            const body = {
+                client_id: config.apiKey,
+                client_secret: config.apiSecretKey,
+                code: query.get('code'),
+            };
+            const postParams = {
+                path: '/admin/oauth/access_token',
+                type: types_1.DataType.JSON,
+                data: body,
+            };
+            const cleanShop = (0, shop_validator_1.sanitizeShop)(config)(query.get('shop'), true);
+            const HttpClient = (0, http_client_1.httpClientClass)(config);
+            const client = new HttpClient({ domain: cleanShop });
+            const postResponse = yield client.post(postParams);
+            const session = createSession({
+                postResponse,
+                shop: cleanShop,
+                stateFromCookie,
+                config,
             });
+            if (!config.isEmbeddedApp) {
+                yield cookies.setAndSign(types_2.SESSION_COOKIE_NAME, session.id, {
+                    expires: session.expires,
+                    sameSite: 'lax',
+                    secure: true,
+                    path: '/',
+                });
+            }
+            return {
+                headers: (yield (0, http_1.abstractConvertHeaders)(cookies.response.headers, adapterArgs)),
+                session,
+            };
         });
     };
 }
 exports.callback = callback;
-function validQuery(_a) {
-    var config = _a.config, query = _a.query, stateFromCookie = _a.stateFromCookie;
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
-        return tslib_1.__generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, hmac_validator_1.validateHmac)(config)(query)];
-                case 1: return [2 /*return*/, ((_b.sent()) &&
-                        (0, safe_compare_1.safeCompare)(query.state, stateFromCookie))];
-            }
-        });
+function validQuery({ config, query, stateFromCookie, }) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return ((yield (0, hmac_validator_1.validateHmac)(config)(query)) &&
+            (0, safe_compare_1.safeCompare)(query.state, stateFromCookie));
     });
 }
-function createSession(_a) {
-    var config = _a.config, postResponse = _a.postResponse, shop = _a.shop, stateFromCookie = _a.stateFromCookie;
-    var associatedUser = postResponse.body
+function createSession({ config, postResponse, shop, stateFromCookie, }) {
+    const associatedUser = postResponse.body
         .associated_user;
-    var isOnline = Boolean(associatedUser);
-    (0, logger_1.logger)(config).info('Creating new session', { shop: shop, isOnline: isOnline });
+    const isOnline = Boolean(associatedUser);
+    (0, logger_1.logger)(config).info('Creating new session', { shop, isOnline });
     if (isOnline) {
-        var sessionId = void 0;
-        var responseBody = postResponse.body;
-        var access_token = responseBody.access_token, scope = responseBody.scope, rest = tslib_1.__rest(responseBody, ["access_token", "scope"]);
-        var sessionExpiration = new Date(Date.now() + responseBody.expires_in * 1000);
+        let sessionId;
+        const responseBody = postResponse.body;
+        const { access_token, scope } = responseBody, rest = tslib_1.__rest(responseBody, ["access_token", "scope"]);
+        const sessionExpiration = new Date(Date.now() + responseBody.expires_in * 1000);
         if (config.isEmbeddedApp) {
-            sessionId = (0, session_utils_1.getJwtSessionId)(config)(shop, "".concat(rest.associated_user.id));
+            sessionId = (0, session_utils_1.getJwtSessionId)(config)(shop, `${rest.associated_user.id}`);
         }
         else {
             sessionId = (0, uuid_1.v4)();
         }
         return new session_1.Session({
             id: sessionId,
-            shop: shop,
+            shop,
             state: stateFromCookie,
-            isOnline: isOnline,
+            isOnline,
             accessToken: access_token,
-            scope: scope,
+            scope,
             expires: sessionExpiration,
             onlineAccessInfo: rest,
         });
     }
     else {
-        var responseBody = postResponse.body;
+        const responseBody = postResponse.body;
         return new session_1.Session({
             id: (0, session_utils_1.getOfflineId)(config)(shop),
-            shop: shop,
+            shop,
             state: stateFromCookie,
-            isOnline: isOnline,
+            isOnline,
             accessToken: responseBody.access_token,
             scope: responseBody.scope,
         });
     }
 }
-function throwIfPrivateApp(isPrivateApp, message) {
-    if (isPrivateApp) {
+function throwIfCustomStoreApp(isCustomStoreApp, message) {
+    if (isCustomStoreApp) {
         throw new ShopifyErrors.PrivateAppError(message);
     }
 }

package/lib/auth/oauth/oauth.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth.js","sourceRoot":"","sources":["oauth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth.js","sourceRoot":"","sources":["oauth.ts"],"names":[],"mappings":"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"}

package/lib/auth/oauth/safe-compare.js

@@ -1,29 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.safeCompare = void 0;
-var tslib_1 = require("tslib");
-var ShopifyErrors = tslib_1.__importStar(require("../../error"));
+const tslib_1 = require("tslib");
+const ShopifyErrors = tslib_1.__importStar(require("../../error"));
 function safeCompare(strA, strB) {
     if (typeof strA === typeof strB) {
-        var enc = new TextEncoder();
-        var buffA = enc.encode(JSON.stringify(strA));
-        var buffB = enc.encode(JSON.stringify(strB));
+        const enc = new TextEncoder();
+        const buffA = enc.encode(JSON.stringify(strA));
+        const buffB = enc.encode(JSON.stringify(strB));
         if (buffA.length === buffB.length) {
             return timingSafeEqual(buffA, buffB);
         }
     }
     else {
-        throw new ShopifyErrors.SafeCompareError("Mismatched data types provided: ".concat(typeof strA, " and ").concat(typeof strB));
+        throw new ShopifyErrors.SafeCompareError(`Mismatched data types provided: ${typeof strA} and ${typeof strB}`);
     }
     return false;
 }
 exports.safeCompare = safeCompare;
 // Buffer must be same length for this function to be secure.
 function timingSafeEqual(bufA, bufB) {
-    var viewA = new Uint8Array(bufA);
-    var viewB = new Uint8Array(bufB);
-    var out = 0;
-    for (var i = 0; i < viewA.length; i++) {
+    const viewA = new Uint8Array(bufA);
+    const viewB = new Uint8Array(bufB);
+    let out = 0;
+    for (let i = 0; i < viewA.length; i++) {
         out |= viewA[i] ^ viewB[i];
     }
     return out === 0;

package/lib/auth/oauth/safe-compare.js.map

@@ -1 +1 @@
-{"version":3,"file":"safe-compare.js","sourceRoot":"","sources":["safe-compare.ts"],"names":[],"mappings":";;;;AAAA,iEAA6C;AAE7C,SAAgB,WAAW,CACzB,IAA4D,EAC5D,IAA4D;IAE5D,IAAI,OAAO,IAAI,KAAK,OAAO,IAAI,EAAE;QAC/B,IAAM,GAAG,GAAG,IAAI,WAAW,EAAE,CAAC;QAC9B,IAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/C,IAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/C,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE;YACjC,OAAO,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SACtC;KACF;SAAM;QACL,MAAM,IAAI,aAAa,CAAC,gBAAgB,CACtC,0CAAmC,OAAO,IAAI,kBAAQ,OAAO,IAAI,CAAE,CACpE,CAAC;KACH;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAlBD,kCAkBC;AAED,6DAA6D;AAC7D,SAAS,eAAe,CAAC,IAAiB,EAAE,IAAiB;IAC3D,IAAM,KAAK,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;IACnC,IAAM,KAAK,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;KAC5B;IACD,OAAO,GAAG,KAAK,CAAC,CAAC;AACnB,CAAC"}
+{"version":3,"file":"safe-compare.js","sourceRoot":"","sources":["safe-compare.ts"],"names":[],"mappings":";;;;AAAA,mEAA6C;AAE7C,SAAgB,WAAW,CACzB,IAA4D,EAC5D,IAA4D;IAE5D,IAAI,OAAO,IAAI,KAAK,OAAO,IAAI,EAAE;QAC/B,MAAM,GAAG,GAAG,IAAI,WAAW,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/C,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE;YACjC,OAAO,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;SACtC;KACF;SAAM;QACL,MAAM,IAAI,aAAa,CAAC,gBAAgB,CACtC,mCAAmC,OAAO,IAAI,QAAQ,OAAO,IAAI,EAAE,CACpE,CAAC;KACH;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAlBD,kCAkBC;AAED,6DAA6D;AAC7D,SAAS,eAAe,CAAC,IAAiB,EAAE,IAAiB;IAC3D,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;KAC5B;IACD,OAAO,GAAG,KAAK,CAAC,CAAC;AACnB,CAAC"}