@shopify/shopify-app-remix 2.0.2 → 2.2.0

package/build/ts/server/authenticate/admin/strategies/auth-code-flow.js

@@ -0,0 +1,323 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthCodeFlowStrategy = void 0;
+var tslib_1 = require("tslib");
+var shopify_api_1 = require("@shopify/shopify-api");
+var helpers_1 = require("../helpers");
+var helpers_2 = require("../../helpers");
+var AuthCodeFlowStrategy = /** @class */ (function () {
+    function AuthCodeFlowStrategy(_a) {
+        var api = _a.api, config = _a.config, logger = _a.logger;
+        this.api = api;
+        this.config = config;
+        this.logger = logger;
+    }
+    AuthCodeFlowStrategy.prototype.respondToOAuthRequests = function (request) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _a, api, config, url, isAuthRequest, isAuthCallbackRequest, shop;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this, api = _a.api, config = _a.config;
+                        url = new URL(request.url);
+                        isAuthRequest = url.pathname === config.auth.path;
+                        isAuthCallbackRequest = url.pathname === config.auth.callbackPath;
+                        if (!(isAuthRequest || isAuthCallbackRequest)) return [3 /*break*/, 4];
+                        shop = api.utils.sanitizeShop(url.searchParams.get('shop'));
+                        if (!shop)
+                            throw new Response('Shop param is invalid', { status: 400 });
+                        if (!isAuthRequest) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.handleAuthBeginRequest(request, shop)];
+                    case 1: throw _b.sent();
+                    case 2: return [4 /*yield*/, this.handleAuthCallbackRequest(request, shop)];
+                    case 3: throw _b.sent();
+                    case 4:
+                        if (!!(0, helpers_2.getSessionTokenHeader)(request)) return [3 /*break*/, 6];
+                        // This is a document request that doesn't contain a session token. We check if the app is installed.
+                        // If the app isn't installed, we initiate the OAuth auth code flow.
+                        // Requests with a header can only happen after the app is installed.
+                        return [4 /*yield*/, this.ensureInstalledOnShop(request)];
+                    case 5:
+                        // This is a document request that doesn't contain a session token. We check if the app is installed.
+                        // If the app isn't installed, we initiate the OAuth auth code flow.
+                        // Requests with a header can only happen after the app is installed.
+                        _b.sent();
+                        _b.label = 6;
+                    case 6: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    AuthCodeFlowStrategy.prototype.authenticate = function (request, session, shop) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _a, api, config, logger;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this, api = _a.api, config = _a.config, logger = _a.logger;
+                        if (!!session) return [3 /*break*/, 2];
+                        logger.debug('No session found, redirecting to OAuth', { shop: shop });
+                        return [4 /*yield*/, (0, helpers_1.redirectToAuthPage)({ config: config, logger: logger, api: api }, request, shop)];
+                    case 1:
+                        _b.sent();
+                        return [3 /*break*/, 4];
+                    case 2:
+                        if (!!session.isActive(config.scopes)) return [3 /*break*/, 4];
+                        logger.debug('Found a session, but it has expired, redirecting to OAuth', { shop: shop });
+                        return [4 /*yield*/, (0, helpers_1.redirectToAuthPage)({ config: config, logger: logger, api: api }, request, shop)];
+                    case 3:
+                        _b.sent();
+                        _b.label = 4;
+                    case 4:
+                        logger.debug('Found a valid session', { shop: shop });
+                        return [2 /*return*/, session];
+                }
+            });
+        });
+    };
+    AuthCodeFlowStrategy.prototype.ensureInstalledOnShop = function (request) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _a, api, config, logger, url, shop, offlineSession, isEmbedded, error_1;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this, api = _a.api, config = _a.config, logger = _a.logger;
+                        (0, helpers_1.validateShopAndHostParams)({ api: api, config: config, logger: logger }, request);
+                        url = new URL(request.url);
+                        shop = url.searchParams.get('shop');
+                        // Ensure app is installed
+                        logger.debug('Ensuring app is installed on shop', { shop: shop });
+                        return [4 /*yield*/, this.hasValidOfflineId(request)];
+                    case 1:
+                        if (!(_b.sent())) {
+                            logger.info("Could not find a shop, can't authenticate request");
+                            throw new Response(undefined, {
+                                status: 400,
+                                statusText: 'Bad Request',
+                            });
+                        }
+                        return [4 /*yield*/, this.getOfflineSession(request)];
+                    case 2:
+                        offlineSession = _b.sent();
+                        isEmbedded = url.searchParams.get('embedded') === '1';
+                        if (!!offlineSession) return [3 /*break*/, 5];
+                        logger.info("Shop hasn't installed app yet, redirecting to OAuth", {
+                            shop: shop,
+                        });
+                        if (!isEmbedded) return [3 /*break*/, 3];
+                        (0, helpers_1.redirectWithExitIframe)({ api: api, config: config, logger: logger }, request, shop);
+                        return [3 /*break*/, 5];
+                    case 3: return [4 /*yield*/, (0, helpers_1.beginAuth)({ api: api, config: config, logger: logger }, request, false, shop)];
+                    case 4: throw _b.sent();
+                    case 5:
+                        shop = shop || offlineSession.shop;
+                        if (!(config.isEmbeddedApp && !isEmbedded)) return [3 /*break*/, 10];
+                        _b.label = 6;
+                    case 6:
+                        _b.trys.push([6, 8, , 10]);
+                        logger.debug('Ensuring offline session is valid before embedding', {
+                            shop: shop,
+                        });
+                        return [4 /*yield*/, this.testSession(offlineSession)];
+                    case 7:
+                        _b.sent();
+                        logger.debug('Offline session is still valid, embedding app', { shop: shop });
+                        return [3 /*break*/, 10];
+                    case 8:
+                        error_1 = _b.sent();
+                        return [4 /*yield*/, this.handleInvalidOfflineSession(error_1, request, shop)];
+                    case 9:
+                        _b.sent();
+                        return [3 /*break*/, 10];
+                    case 10: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    AuthCodeFlowStrategy.prototype.handleAuthBeginRequest = function (request, shop) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _a, api, config, logger;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this, api = _a.api, config = _a.config, logger = _a.logger;
+                        logger.info('Handling OAuth begin request', { shop: shop });
+                        if (!(config.isEmbeddedApp &&
+                            request.headers.get('Sec-Fetch-Dest') === 'iframe')) return [3 /*break*/, 1];
+                        logger.debug('Auth request in iframe detected, exiting iframe', { shop: shop });
+                        throw (0, helpers_1.redirectWithExitIframe)({ api: api, config: config, logger: logger }, request, shop);
+                    case 1: return [4 /*yield*/, (0, helpers_1.beginAuth)({ api: api, config: config, logger: logger }, request, false, shop)];
+                    case 2: throw _b.sent();
+                }
+            });
+        });
+    };
+    AuthCodeFlowStrategy.prototype.handleAuthCallbackRequest = function (request, shop) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _a, api, config, logger, _b, session, responseHeaders, error_2;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        _a = this, api = _a.api, config = _a.config, logger = _a.logger;
+                        logger.info('Handling OAuth callback request');
+                        _c.label = 1;
+                    case 1:
+                        _c.trys.push([1, 8, , 10]);
+                        return [4 /*yield*/, api.auth.callback({
+                                rawRequest: request,
+                            })];
+                    case 2:
+                        _b = _c.sent(), session = _b.session, responseHeaders = _b.headers;
+                        return [4 /*yield*/, config.sessionStorage.storeSession(session)];
+                    case 3:
+                        _c.sent();
+                        if (!(config.useOnlineTokens && !session.isOnline)) return [3 /*break*/, 5];
+                        logger.info('Requesting online access token for offline session');
+                        return [4 /*yield*/, (0, helpers_1.beginAuth)({ api: api, config: config, logger: logger }, request, true, shop)];
+                    case 4:
+                        _c.sent();
+                        _c.label = 5;
+                    case 5: return [4 /*yield*/, (0, helpers_1.triggerAfterAuthHook)({ api: api, config: config, logger: logger }, session, request)];
+                    case 6:
+                        _c.sent();
+                        return [4 /*yield*/, (0, helpers_1.redirectToShopifyOrAppRoot)(request, { api: api, config: config, logger: logger }, responseHeaders)];
+                    case 7: throw _c.sent();
+                    case 8:
+                        error_2 = _c.sent();
+                        if (error_2 instanceof Response)
+                            throw error_2;
+                        return [4 /*yield*/, this.oauthCallbackError(error_2, request, shop)];
+                    case 9: throw _c.sent();
+                    case 10: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    AuthCodeFlowStrategy.prototype.getOfflineSession = function (request) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var offlineId;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getOfflineSessionId(request)];
+                    case 1:
+                        offlineId = _a.sent();
+                        return [2 /*return*/, this.config.sessionStorage.loadSession(offlineId)];
+                }
+            });
+        });
+    };
+    AuthCodeFlowStrategy.prototype.hasValidOfflineId = function (request) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = Boolean;
+                        return [4 /*yield*/, this.getOfflineSessionId(request)];
+                    case 1: return [2 /*return*/, _a.apply(void 0, [_b.sent()])];
+                }
+            });
+        });
+    };
+    AuthCodeFlowStrategy.prototype.getOfflineSessionId = function (request) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var api, url, shop;
+            return tslib_1.__generator(this, function (_a) {
+                api = this.api;
+                url = new URL(request.url);
+                shop = url.searchParams.get('shop');
+                return [2 /*return*/, shop
+                        ? api.session.getOfflineId(shop)
+                        : api.session.getCurrentId({ isOnline: false, rawRequest: request })];
+            });
+        });
+    };
+    AuthCodeFlowStrategy.prototype.testSession = function (session) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var api, client;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        api = this.api;
+                        client = new api.clients.Graphql({
+                            session: session,
+                        });
+                        return [4 /*yield*/, client.query({
+                                data: "#graphql\n        query shopifyAppShopName {\n          shop {\n            name\n          }\n        }\n      ",
+                            })];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    AuthCodeFlowStrategy.prototype.oauthCallbackError = function (error, request, shop) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var logger;
+            return tslib_1.__generator(this, function (_a) {
+                logger = this.logger;
+                logger.error('Error during OAuth callback', { error: error.message });
+                if (error instanceof shopify_api_1.CookieNotFound) {
+                    return [2 /*return*/, this.handleAuthBeginRequest(request, shop)];
+                }
+                if (error instanceof shopify_api_1.InvalidHmacError ||
+                    error instanceof shopify_api_1.InvalidOAuthError) {
+                    return [2 /*return*/, new Response(undefined, {
+                            status: 400,
+                            statusText: 'Invalid OAuth Request',
+                        })];
+                }
+                return [2 /*return*/, new Response(undefined, {
+                        status: 500,
+                        statusText: 'Internal Server Error',
+                    })];
+            });
+        });
+    };
+    AuthCodeFlowStrategy.prototype.handleInvalidOfflineSession = function (error, request, shop) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _a, api, logger, config, message, context;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this, api = _a.api, logger = _a.logger, config = _a.config;
+                        if (!(error instanceof shopify_api_1.HttpResponseError)) return [3 /*break*/, 4];
+                        if (!(error.response.code === 401)) return [3 /*break*/, 2];
+                        logger.info('Shop session is no longer valid, redirecting to OAuth', {
+                            shop: shop,
+                        });
+                        return [4 /*yield*/, (0, helpers_1.beginAuth)({ api: api, config: config, logger: logger }, request, false, shop)];
+                    case 1: throw _b.sent();
+                    case 2:
+                        message = JSON.stringify(error.response.body, null, 2);
+                        logger.error("Unexpected error during session validation: ".concat(message), {
+                            shop: shop,
+                        });
+                        throw new Response(undefined, {
+                            status: error.response.code,
+                            statusText: error.response.statusText,
+                        });
+                    case 3: return [3 /*break*/, 5];
+                    case 4:
+                        if (error instanceof shopify_api_1.GraphqlQueryError) {
+                            context = { shop: shop };
+                            if (error.response) {
+                                context.response = JSON.stringify(error.response);
+                            }
+                            logger.error("Unexpected error during session validation: ".concat(error.message), context);
+                            throw new Response(undefined, {
+                                status: 500,
+                                statusText: 'Internal Server Error',
+                            });
+                        }
+                        _b.label = 5;
+                    case 5: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return AuthCodeFlowStrategy;
+}());
+exports.AuthCodeFlowStrategy = AuthCodeFlowStrategy;
+//# sourceMappingURL=auth-code-flow.js.map

package/build/ts/server/authenticate/admin/strategies/auth-code-flow.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth-code-flow.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/auth-code-flow.ts"],"names":[],"mappings":"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"}

package/build/ts/server/authenticate/admin/strategies/types.d.ts

@@ -0,0 +1,11 @@
+import { JwtPayload, Session } from '@shopify/shopify-api';
+export interface SessionTokenContext {
+    shop: string;
+    sessionId?: string;
+    payload?: JwtPayload;
+}
+export interface AuthorizationStrategy {
+    respondToOAuthRequests: (request: Request) => Promise<void | never>;
+    authenticate: (request: Request, session: Session | undefined, shop: string) => Promise<Session | never>;
+}
+//# sourceMappingURL=types.d.ts.map

package/build/ts/server/authenticate/admin/strategies/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAEzD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,UAAU,CAAC;CACtB;AAED,MAAM,WAAW,qBAAqB;IACpC,sBAAsB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;IACpE,YAAY,EAAE,CACZ,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,IAAI,EAAE,MAAM,KACT,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC;CAC/B"}

package/build/ts/server/authenticate/admin/strategies/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/build/ts/server/authenticate/admin/strategies/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/admin/strategies/types.ts"],"names":[],"mappings":""}

package/build/ts/server/authenticate/admin/types.d.ts

@@ -171,5 +171,9 @@ export interface NonEmbeddedAdminContext<Config extends AppConfigArg, Resources
 }
 export type AdminContext<Config extends AppConfigArg, Resources extends ShopifyRestResources = ShopifyRestResources> = Config['isEmbeddedApp'] extends false ? NonEmbeddedAdminContext<Config, Resources> : EmbeddedAdminContext<Config, Resources>;
 export type AuthenticateAdmin<Config extends AppConfigArg, Resources extends ShopifyRestResources = ShopifyRestResources> = (request: Request) => Promise<AdminContext<Config, Resources>>;
+export interface SessionContext {
+    session: Session;
+    token?: JwtPayload;
+}
 export {};
 //# sourceMappingURL=types.d.ts.map

package/build/ts/server/authenticate/admin/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/admin/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAEnD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAEpD,UAAU,oBAAoB,CAC5B,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB;IAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAyDG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,KAAK,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;IAElC;;;;OAIG;IACH,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAEhC;;;;;;;;;;;;;;;;;OAiBG;IACH,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AAED,MAAM,WAAW,oBAAoB,CACnC,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,CAC7D,SAAQ,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC;IAC/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAkCG;IACH,YAAY,EAAE,UAAU,CAAC;IAEzB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAiCG;IACH,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AACD,MAAM,WAAW,uBAAuB,CACtC,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,CAC7D,SAAQ,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC;CAAG;AAEpD,MAAM,MAAM,YAAY,CACtB,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,IAC3D,MAAM,CAAC,eAAe,CAAC,SAAS,KAAK,GACrC,uBAAuB,CAAC,MAAM,EAAE,SAAS,CAAC,GAC1C,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAE5C,MAAM,MAAM,iBAAiB,CAC3B,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,IAC3D,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/admin/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAEnD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAEpD,UAAU,oBAAoB,CAC5B,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB;IAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAyDG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,KAAK,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;IAElC;;;;OAIG;IACH,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAEhC;;;;;;;;;;;;;;;;;OAiBG;IACH,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AAED,MAAM,WAAW,oBAAoB,CACnC,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,CAC7D,SAAQ,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC;IAC/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAkCG;IACH,YAAY,EAAE,UAAU,CAAC;IAEzB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAiCG;IACH,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AACD,MAAM,WAAW,uBAAuB,CACtC,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,CAC7D,SAAQ,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC;CAAG;AAEpD,MAAM,MAAM,YAAY,CACtB,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,IAC3D,MAAM,CAAC,eAAe,CAAC,SAAS,KAAK,GACrC,uBAAuB,CAAC,MAAM,EAAE,SAAS,CAAC,GAC1C,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAE5C,MAAM,MAAM,iBAAiB,CAC3B,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,IAC3D,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;AAEnE,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB"}

package/build/ts/server/authenticate/helpers/get-session-token-header.d.ts

@@ -1,2 +1,3 @@
 export declare function getSessionTokenHeader(request: Request): string | undefined;
+export declare function getSessionTokenFromUrlParam(request: Request): string | null;
 //# sourceMappingURL=get-session-token-header.d.ts.map

package/build/ts/server/authenticate/helpers/get-session-token-header.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-session-token-header.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/helpers/get-session-token-header.ts"],"names":[],"mappings":"AAAA,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAE1E"}
+{"version":3,"file":"get-session-token-header.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/helpers/get-session-token-header.ts"],"names":[],"mappings":"AAEA,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAE1E;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAI3E"}

package/build/ts/server/authenticate/helpers/get-session-token-header.js

@@ -1,9 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSessionTokenHeader = void 0;
+exports.getSessionTokenFromUrlParam = exports.getSessionTokenHeader = void 0;
+var SESSION_TOKEN_PARAM = 'id_token';
 function getSessionTokenHeader(request) {
     var _a;
     return (_a = request.headers.get('authorization')) === null || _a === void 0 ? void 0 : _a.replace('Bearer ', '');
 }
 exports.getSessionTokenHeader = getSessionTokenHeader;
+function getSessionTokenFromUrlParam(request) {
+    var url = new URL(request.url);
+    return url.searchParams.get(SESSION_TOKEN_PARAM);
+}
+exports.getSessionTokenFromUrlParam = getSessionTokenFromUrlParam;
 //# sourceMappingURL=get-session-token-header.js.map

package/build/ts/server/authenticate/helpers/get-session-token-header.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-session-token-header.js","sourceRoot":"","sources":["../../../../../src/server/authenticate/helpers/get-session-token-header.ts"],"names":[],"mappings":";;;AAAA,SAAgB,qBAAqB,CAAC,OAAgB;;IACpD,OAAO,MAAA,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,0CAAE,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AACtE,CAAC;AAFD,sDAEC"}
+{"version":3,"file":"get-session-token-header.js","sourceRoot":"","sources":["../../../../../src/server/authenticate/helpers/get-session-token-header.ts"],"names":[],"mappings":";;;AAAA,IAAM,mBAAmB,GAAG,UAAU,CAAC;AAEvC,SAAgB,qBAAqB,CAAC,OAAgB;;IACpD,OAAO,MAAA,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,0CAAE,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AACtE,CAAC;AAFD,sDAEC;AAED,SAAgB,2BAA2B,CAAC,OAAgB;IAC1D,IAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAEjC,OAAO,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACnD,CAAC;AAJD,kEAIC"}

package/build/ts/server/authenticate/helpers/reject-bot-request.d.ts

@@ -1,3 +1,3 @@
 import type { BasicParams } from '../../types';
-export declare function rejectBotRequest({ logger }: BasicParams, request: Request): void | never;
+export declare function respondToBotRequest({ logger }: BasicParams, request: Request): void | never;
 //# sourceMappingURL=reject-bot-request.d.ts.map

package/build/ts/server/authenticate/helpers/reject-bot-request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reject-bot-request.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/helpers/reject-bot-request.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAE7C,wBAAgB,gBAAgB,CAC9B,EAAC,MAAM,EAAC,EAAE,WAAW,EACrB,OAAO,EAAE,OAAO,GACf,IAAI,GAAG,KAAK,CAKd"}
+{"version":3,"file":"reject-bot-request.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/helpers/reject-bot-request.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAE7C,wBAAgB,mBAAmB,CACjC,EAAC,MAAM,EAAC,EAAE,WAAW,EACrB,OAAO,EAAE,OAAO,GACf,IAAI,GAAG,KAAK,CAKd"}

package/build/ts/server/authenticate/helpers/reject-bot-request.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rejectBotRequest = void 0;
+exports.respondToBotRequest = void 0;
 var tslib_1 = require("tslib");
 var isbot_1 = tslib_1.__importDefault(require("isbot"));
-function rejectBotRequest(_a, request) {
+function respondToBotRequest(_a, request) {
     var logger = _a.logger;
     if ((0, isbot_1.default)(request.headers.get('User-Agent'))) {
         logger.debug('Request is from a bot, skipping auth');
         throw new Response(undefined, { status: 410, statusText: 'Gone' });
     }
 }
-exports.rejectBotRequest = rejectBotRequest;
+exports.respondToBotRequest = respondToBotRequest;
 //# sourceMappingURL=reject-bot-request.js.map

package/build/ts/server/authenticate/helpers/reject-bot-request.js.map

@@ -1 +1 @@
-{"version":3,"file":"reject-bot-request.js","sourceRoot":"","sources":["../../../../../src/server/authenticate/helpers/reject-bot-request.ts"],"names":[],"mappings":";;;;AAAA,wDAA0B;AAI1B,SAAgB,gBAAgB,CAC9B,EAAqB,EACrB,OAAgB;QADf,MAAM,YAAA;IAGP,IAAI,IAAA,eAAK,EAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,EAAE;QAC5C,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACrD,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAC,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAC,CAAC,CAAC;KAClE;AACH,CAAC;AARD,4CAQC"}
+{"version":3,"file":"reject-bot-request.js","sourceRoot":"","sources":["../../../../../src/server/authenticate/helpers/reject-bot-request.ts"],"names":[],"mappings":";;;;AAAA,wDAA0B;AAI1B,SAAgB,mBAAmB,CACjC,EAAqB,EACrB,OAAgB;QADf,MAAM,YAAA;IAGP,IAAI,IAAA,eAAK,EAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,EAAE;QAC5C,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACrD,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAC,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAC,CAAC,CAAC;KAClE;AACH,CAAC;AARD,kDAQC"}

package/build/ts/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authenticate.public.app-proxy.doc.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,6BAA6B,EAAC,MAAM,wBAAwB,CAAC;AAErE,QAAA,MAAM,IAAI,EAAE,6BA4BX,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"authenticate.public.app-proxy.doc.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,6BAA6B,EAAC,MAAM,wBAAwB,CAAC;AAErE,QAAA,MAAM,IAAI,EAAE,6BA6BX,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/build/ts/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var data = {
     name: 'App proxy',
-    description: 'The `authenticate.public.appProxy` function validates app proxy requests made by Shopify, and returns a context to enable querying Shopify APIs.',
+    description: '[App proxies](/docs/apps/online-store/app-proxies) take requests to Shopify links, and redirect them to external links. The `authenticate.public.appProxy` function validates requests made to app proxies, and returns a context to enable querying Shopify APIs.',
     category: 'Authenticate',
     subCategory: 'Public',
     type: 'object',
@@ -10,7 +10,7 @@ var data = {
     definitions: [
         {
             title: 'authenticate.public.appProxy',
-            description: 'Authenticates requests coming from Shopify app proxies.',
+            description: 'Authenticates requests coming to the app from Shopify app proxies.',
             type: 'AuthenticateAppProxy',
         },
     ],

package/build/ts/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.js.map

@@ -1 +1 @@
-{"version":3,"file":"authenticate.public.app-proxy.doc.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.ts"],"names":[],"mappings":";;AAEA,IAAM,IAAI,GAAkC;IAC1C,IAAI,EAAE,WAAW;IACjB,WAAW,EACT,kJAAkJ;IACpJ,QAAQ,EAAE,cAAc;IACxB,WAAW,EAAE,QAAQ;IACrB,IAAI,EAAE,QAAQ;IACd,iBAAiB,EAAE,KAAK;IACxB,WAAW,EAAE;QACX;YACE,KAAK,EAAE,8BAA8B;YACrC,WAAW,EAAE,yDAAyD;YACtE,IAAI,EAAE,sBAAsB;SAC7B;KACF;IACD,iBAAiB,EAAE,CAAC,4BAA4B,CAAC;IACjD,OAAO,EAAE;QACP;YACE,IAAI,EAAE,mBAAmB;YACzB,QAAQ,EAAE,8BAA8B;YACxC,GAAG,EAAE,4CAA4C;SAClD;QACD;YACE,IAAI,EAAE,wBAAwB;YAC9B,QAAQ,EAAE,mCAAmC;YAC7C,GAAG,EAAE,iDAAiD;SACvD;KACF;CACF,CAAC;AAEF,kBAAe,IAAI,CAAC"}
+{"version":3,"file":"authenticate.public.app-proxy.doc.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.ts"],"names":[],"mappings":";;AAEA,IAAM,IAAI,GAAkC;IAC1C,IAAI,EAAE,WAAW;IACjB,WAAW,EACT,oQAAoQ;IACtQ,QAAQ,EAAE,cAAc;IACxB,WAAW,EAAE,QAAQ;IACrB,IAAI,EAAE,QAAQ;IACd,iBAAiB,EAAE,KAAK;IACxB,WAAW,EAAE;QACX;YACE,KAAK,EAAE,8BAA8B;YACrC,WAAW,EACT,oEAAoE;YACtE,IAAI,EAAE,sBAAsB;SAC7B;KACF;IACD,iBAAiB,EAAE,CAAC,4BAA4B,CAAC;IACjD,OAAO,EAAE;QACP;YACE,IAAI,EAAE,mBAAmB;YACzB,QAAQ,EAAE,8BAA8B;YACxC,GAAG,EAAE,4CAA4C;SAClD;QACD;YACE,IAAI,EAAE,wBAAwB;YAC9B,QAAQ,EAAE,mCAAmC;YAC7C,GAAG,EAAE,iDAAiD;SACvD;KACF;CACF,CAAC;AAEF,kBAAe,IAAI,CAAC"}

package/build/ts/server/authenticate/public/appProxy/types.d.ts

@@ -17,7 +17,7 @@ interface Context {
      * import {authenticate} from "~/shopify.server"
      *
      * export async function loader({ request }) {
-     *   const {liquid} = authenticate.public.appProxy(request);
+     *   const {liquid} = await authenticate.public.appProxy(request);
      *
      *   return liquid("Hello {{shop.name}}")
      * }
@@ -54,7 +54,7 @@ export interface AppProxyContextWithSession<Resources extends ShopifyRestResourc
      *
      * @example
      * <caption>Using the session object.</caption>
-     * <description>Get your app's data using an offline session for the shop that made the request.</description>
+     * <description>Get the session for the shop that initiated the request to the app proxy.</description>
      * ```ts
      * // app/routes/**\/.ts
      * import { json } from "@remix-run/node";
@@ -62,7 +62,10 @@ export interface AppProxyContextWithSession<Resources extends ShopifyRestResourc
      * import { getMyAppModelData } from "~/db/model.server";
      *
      * export const loader = async ({ request }) => {
+     *   // Get the session for the shop that initiated the request to the app proxy.
      *   const { session } = await authenticate.public.appProxy(request);
+     *
+     *   // Use the session data to make to queries to your database or additional requests.
      *   return json(await getMyAppModelData({shop: session.shop));
      * };
      * ```
@@ -112,7 +115,7 @@ export interface AppProxyContextWithSession<Resources extends ShopifyRestResourc
      * import { authenticate } from "../shopify.server";
      *
      * export async function action({ request }: ActionFunctionArgs) {
-     *   const { admin } = await authenticate.public.appProxy(request);
+     *   const { storefront } = await authenticate.public.appProxy(request);
      *
      *   const response = await storefront.graphql(`{blogs(first: 10) { edges { node { id } } } }`);
      *

package/build/ts/server/authenticate/public/appProxy/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/public/appProxy/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAEnE,OAAO,EAAC,eAAe,EAAE,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AAEpE,MAAM,MAAM,oBAAoB,GAAG,CACjC,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,eAAe,GAAG,0BAA0B,CAAC,CAAC;AAE3D,UAAU,OAAO;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,sBAAsB,GAAG,CACnC,IAAI,EAAE,MAAM,EACZ,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC,KAC/C,QAAQ,CAAC;AAEd,UAAU,OAAO;IACf;;;;;;;;;;;;;;;;;OAiBG;IACH,MAAM,EAAE,sBAAsB,CAAC;CAChC;AAED,MAAM,WAAW,eAAgB,SAAQ,OAAO;IAC9C;;;;OAIG;IACH,OAAO,EAAE,SAAS,CAAC;IAEnB;;;OAGG;IACH,KAAK,EAAE,SAAS,CAAC;IAEjB;;;OAGG;IACH,UAAU,EAAE,SAAS,CAAC;CACvB;AAED,MAAM,WAAW,0BAA0B,CACzC,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,CAC7D,SAAQ,OAAO;IACf;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8BG;IACH,KAAK,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;IAElC;;;;;;;;;;;;;;;;;;;OAmBG;IACH,UAAU,EAAE,iBAAiB,CAAC;CAC/B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/server/authenticate/public/appProxy/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAEnE,OAAO,EAAC,eAAe,EAAE,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AAEpE,MAAM,MAAM,oBAAoB,GAAG,CACjC,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,eAAe,GAAG,0BAA0B,CAAC,CAAC;AAE3D,UAAU,OAAO;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,sBAAsB,GAAG,CACnC,IAAI,EAAE,MAAM,EACZ,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC,KAC/C,QAAQ,CAAC;AAEd,UAAU,OAAO;IACf;;;;;;;;;;;;;;;;;OAiBG;IACH,MAAM,EAAE,sBAAsB,CAAC;CAChC;AAED,MAAM,WAAW,eAAgB,SAAQ,OAAO;IAC9C;;;;OAIG;IACH,OAAO,EAAE,SAAS,CAAC;IAEnB;;;OAGG;IACH,KAAK,EAAE,SAAS,CAAC;IAEjB;;;OAGG;IACH,UAAU,EAAE,SAAS,CAAC;CACvB;AAED,MAAM,WAAW,0BAA0B,CACzC,SAAS,SAAS,oBAAoB,GAAG,oBAAoB,CAC7D,SAAQ,OAAO;IACf;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8BG;IACH,KAAK,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;IAElC;;;;;;;;;;;;;;;;;;;OAmBG;IACH,UAAU,EAAE,iBAAiB,CAAC;CAC/B"}

package/build/ts/server/authenticate/public/checkout/authenticate.js

@@ -15,7 +15,7 @@ function authenticateCheckoutFactory(params) {
                     case 0:
                         logger = params.logger;
                         corsHeaders = (_a = options.corsHeaders) !== null && _a !== void 0 ? _a : [];
-                        (0, helpers_1.rejectBotRequest)(params, request);
+                        (0, helpers_1.respondToBotRequest)(params, request);
                         (0, helpers_1.respondToOptionsRequest)(params, request, corsHeaders);
                         sessionTokenHeader = (0, helpers_1.getSessionTokenHeader)(request);
                         logger.info('Authenticating checkout request');

package/build/ts/server/authenticate/public/checkout/authenticate.js.map

@@ -1 +1 @@
-{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/public/checkout/authenticate.ts"],"names":[],"mappings":";;;;AACA,yCAMuB;AAIvB,SAAgB,2BAA2B,CACzC,MAAmB;IAEnB,OAAO,SAAe,oBAAoB,CACxC,OAAO,EACP,OAAY;;QAAZ,wBAAA,EAAA,YAAY;;;;;;;wBAEL,MAAM,GAAI,MAAM,OAAV,CAAW;wBAElB,WAAW,GAAG,MAAA,OAAO,CAAC,WAAW,mCAAI,EAAE,CAAC;wBAE9C,IAAA,0BAAgB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBAClC,IAAA,iCAAuB,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;wBAEhD,kBAAkB,GAAG,IAAA,+BAAqB,EAAC,OAAO,CAAC,CAAC;wBAE1D,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;wBAE/C,IAAI,CAAC,kBAAkB,EAAE;4BACvB,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;4BACxD,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE;gCAC5B,MAAM,EAAE,GAAG;gCACX,UAAU,EAAE,cAAc;6BAC3B,CAAC,CAAC;yBACJ;;wBAGe,qBAAM,IAAA,8BAAoB,EAAC,MAAM,EAAE,kBAAkB,EAAE;gCACnE,aAAa,EAAE,KAAK;6BACrB,CAAC,EAAA;4BAHJ,uBACE,eAAY,GAAE,SAEZ;4BACF,OAAI,GAAE,IAAA,kCAAwB,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC;iCAC5D;;;;KACH,CAAC;AACJ,CAAC;AAjCD,kEAiCC"}
+{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../../../../../src/server/authenticate/public/checkout/authenticate.ts"],"names":[],"mappings":";;;;AACA,yCAMuB;AAIvB,SAAgB,2BAA2B,CACzC,MAAmB;IAEnB,OAAO,SAAe,oBAAoB,CACxC,OAAO,EACP,OAAY;;QAAZ,wBAAA,EAAA,YAAY;;;;;;;wBAEL,MAAM,GAAI,MAAM,OAAV,CAAW;wBAElB,WAAW,GAAG,MAAA,OAAO,CAAC,WAAW,mCAAI,EAAE,CAAC;wBAE9C,IAAA,6BAAmB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBACrC,IAAA,iCAAuB,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;wBAEhD,kBAAkB,GAAG,IAAA,+BAAqB,EAAC,OAAO,CAAC,CAAC;wBAE1D,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;wBAE/C,IAAI,CAAC,kBAAkB,EAAE;4BACvB,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;4BACxD,MAAM,IAAI,QAAQ,CAAC,SAAS,EAAE;gCAC5B,MAAM,EAAE,GAAG;gCACX,UAAU,EAAE,cAAc;6BAC3B,CAAC,CAAC;yBACJ;;wBAGe,qBAAM,IAAA,8BAAoB,EAAC,MAAM,EAAE,kBAAkB,EAAE;gCACnE,aAAa,EAAE,KAAK;6BACrB,CAAC,EAAA;4BAHJ,uBACE,eAAY,GAAE,SAEZ;4BACF,OAAI,GAAE,IAAA,kCAAwB,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC;iCAC5D;;;;KACH,CAAC;AACJ,CAAC;AAjCD,kEAiCC"}

package/build/ts/server/authenticate/public/factory.d.ts

@@ -1,5 +1,6 @@
 import { ShopifyRestResources } from '@shopify/shopify-api';
 import { BasicParams } from '../../types';
+import { FutureFlagOptions } from '../../future/flags';
 import { AuthenticatePublic } from './types';
-export declare function authenticatePublicFactory<Resources extends ShopifyRestResources>(params: BasicParams): AuthenticatePublic;
+export declare function authenticatePublicFactory<Future extends FutureFlagOptions, Resources extends ShopifyRestResources>(params: BasicParams): AuthenticatePublic<Future>;
 //# sourceMappingURL=factory.d.ts.map

package/build/ts/server/authenticate/public/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/public/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAKxC,OAAO,EAAC,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAE3C,wBAAgB,yBAAyB,CACvC,SAAS,SAAS,oBAAoB,EACtC,MAAM,EAAE,WAAW,GAAG,kBAAkB,CAoBzC"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../../src/server/authenticate/public/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,iBAAiB,EAAC,MAAM,oBAAoB,CAAC;AAKrD,OAAO,EACL,kBAAkB,EAGnB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,yBAAyB,CACvC,MAAM,SAAS,iBAAiB,EAChC,SAAS,SAAS,oBAAoB,EACtC,MAAM,EAAE,WAAW,GAAG,kBAAkB,CAAC,MAAM,CAAC,CA+BjD"}

package/build/ts/server/authenticate/public/factory.js

@@ -4,14 +4,22 @@ exports.authenticatePublicFactory = void 0;
 var authenticate_1 = require("./checkout/authenticate");
 var authenticate_2 = require("./appProxy/authenticate");
 function authenticatePublicFactory(params) {
-    var logger = params.logger;
+    var logger = params.logger, config = params.config;
     var authenticateCheckout = (0, authenticate_1.authenticateCheckoutFactory)(params);
+    var authenticateAppProxy = (0, authenticate_2.authenticateAppProxyFactory)(params);
+    if (config.future.v3_authenticatePublic) {
+        var context = {
+            checkout: authenticateCheckout,
+            appProxy: authenticateAppProxy,
+        };
+        return context;
+    }
     var authenticatePublic = function (request, options) {
         logger.deprecated('3.0.0', 'authenticate.public() will be deprecated in v3. Use authenticate.public.checkout() instead.');
         return authenticateCheckout(request, options);
     };
     authenticatePublic.checkout = authenticateCheckout;
-    authenticatePublic.appProxy = (0, authenticate_2.authenticateAppProxyFactory)(params);
+    authenticatePublic.appProxy = authenticateAppProxy;
     return authenticatePublic;
 }
 exports.authenticatePublicFactory = authenticatePublicFactory;

package/build/ts/server/authenticate/public/factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../../src/server/authenticate/public/factory.ts"],"names":[],"mappings":";;;AAIA,wDAAoE;AAEpE,wDAAoE;AAGpE,SAAgB,yBAAyB,CAEvC,MAAmB;IACZ,IAAA,MAAM,GAAI,MAAM,OAAV,CAAW;IAExB,IAAM,oBAAoB,GAAG,IAAA,0CAA2B,EAAC,MAAM,CAAC,CAAC;IACjE,IAAM,kBAAkB,GAAG,UACzB,OAAgB,EAChB,OAAoC;QAEpC,MAAM,CAAC,UAAU,CACf,OAAO,EACP,6FAA6F,CAC9F,CAAC;QAEF,OAAO,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC,CAAC;IAEF,kBAAkB,CAAC,QAAQ,GAAG,oBAAoB,CAAC;IACnD,kBAAkB,CAAC,QAAQ,GAAG,IAAA,0CAA2B,EAAY,MAAM,CAAC,CAAC;IAE7E,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAtBD,8DAsBC"}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../../src/server/authenticate/public/factory.ts"],"names":[],"mappings":";;;AAKA,wDAAoE;AAEpE,wDAAoE;AAOpE,SAAgB,yBAAyB,CAGvC,MAAmB;IACZ,IAAA,MAAM,GAAY,MAAM,OAAlB,EAAE,MAAM,GAAI,MAAM,OAAV,CAAW;IAEhC,IAAM,oBAAoB,GAAG,IAAA,0CAA2B,EAAC,MAAM,CAAC,CAAC;IACjE,IAAM,oBAAoB,GAAG,IAAA,0CAA2B,EAAY,MAAM,CAAC,CAAC;IAE5E,IAAI,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE;QACvC,IAAM,OAAO,GAA6B;YACxC,QAAQ,EAAE,oBAAoB;YAC9B,QAAQ,EAAE,oBAAoB;SAC/B,CAAC;QAEF,OAAO,OAAqC,CAAC;KAC9C;IAED,IAAM,kBAAkB,GAA6B,UACnD,OAAgB,EAChB,OAAoC;QAEpC,MAAM,CAAC,UAAU,CACf,OAAO,EACP,6FAA6F,CAC9F,CAAC;QAEF,OAAO,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC,CAAC;IAEF,kBAAkB,CAAC,QAAQ,GAAG,oBAAoB,CAAC;IACnD,kBAAkB,CAAC,QAAQ,GAAG,oBAAoB,CAAC;IAEnD,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAlCD,8DAkCC"}