From 1a1bd8978d7b80777af22e3b94fd306915cdddcf Mon Sep 17 00:00:00 2001
From: Bret Little <bret.little@shopify.com>
Date: Mon, 18 Nov 2024 11:45:07 -0500
Subject: [PATCH 1/2] Add params to override the login and authorize paths

---
 .changeset/tricky-mails-peel.md            | 16 +++++++++++++
 packages/hydrogen/src/customer/customer.ts | 26 ++++++++++++----------
 packages/hydrogen/src/customer/types.ts    |  6 +++++
 3 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/tricky-mails-peel.md

diff --git a/.changeset/tricky-mails-peel.md b/.changeset/tricky-mails-peel.md
new file mode 100644
index 0000000000..28cc7a5037
--- /dev/null
+++ b/.changeset/tricky-mails-peel.md
@@ -0,0 +1,16 @@
+---
+'@shopify/hydrogen': patch
+---
+
+Add params to override the login and authorize paths:
+
+```ts
+const hydrogenContext = createHydrogenContext({
+  // ...
+  customerAccount: {
+    loginPath = '/account/login',
+    authorizePath = '/account/authorize',
+    defaultRedirectPath = '/account',
+  },
+});
+```
diff --git a/packages/hydrogen/src/customer/customer.ts b/packages/hydrogen/src/customer/customer.ts
index 4c2a5b759c..b830647cd6 100644
--- a/packages/hydrogen/src/customer/customer.ts
+++ b/packages/hydrogen/src/customer/customer.ts
@@ -51,17 +51,16 @@ import type {
 import {createCustomerAccountHelper, URL_TYPE} from './customer-account-helper';
 import {warnOnce} from '../utils/warning';
 
-const DEFAULT_LOGIN_URL = '/account/login';
-const DEFAULT_AUTH_URL = '/account/authorize';
-const DEFAULT_REDIRECT_PATH = '/account';
-
-function defaultAuthStatusHandler(request: CrossRuntimeRequest) {
-  if (!request.url) return DEFAULT_LOGIN_URL;
+function defaultAuthStatusHandler(
+  request: CrossRuntimeRequest,
+  defaultLoginUrl: string,
+) {
+  if (!request.url) return defaultLoginUrl;
 
   const {pathname} = new URL(request.url);
 
   const redirectTo =
-    DEFAULT_LOGIN_URL +
+    defaultLoginUrl +
     `?${new URLSearchParams({return_to: pathname}).toString()}`;
 
   return redirect(redirectTo);
@@ -79,6 +78,9 @@ export function createCustomerAccountClient({
   customAuthStatusHandler,
   logErrors = true,
   unstableB2b = false,
+  loginPath = '/account/login',
+  authorizePath = '/account/authorize',
+  defaultRedirectPath = '/account',
 }: CustomerAccountOptions): CustomerAccount {
   if (customerApiVersion !== DEFAULT_CUSTOMER_API_VERSION) {
     console.warn(
@@ -106,7 +108,7 @@ export function createCustomerAccountClient({
 
   const authStatusHandler = customAuthStatusHandler
     ? customAuthStatusHandler
-    : () => defaultAuthStatusHandler(request);
+    : () => defaultAuthStatusHandler(request, loginPath);
 
   const requestUrl = new URL(request.url);
   const httpsOrigin =
@@ -115,7 +117,7 @@ export function createCustomerAccountClient({
       : requestUrl.origin;
   const redirectUri = ensureLocalRedirectUrl({
     requestUrl: httpsOrigin,
-    defaultUrl: DEFAULT_AUTH_URL,
+    defaultUrl: authorizePath,
     redirectUrl: authUrl,
   });
 
@@ -400,7 +402,7 @@ export function createCustomerAccountClient({
         redirectPath:
           getRedirectUrl(request.url) ||
           getHeader(request, 'Referer') ||
-          DEFAULT_REDIRECT_PATH,
+          defaultRedirectPath,
       });
 
       loginUrl.searchParams.append('code_challenge', challenge);
@@ -430,7 +432,7 @@ export function createCustomerAccountClient({
 
       clearSession(session);
 
-      return redirect(logoutUrl, {headers: options?.headers || {}});
+      return redirect(logoutUrl);
     },
     isLoggedIn,
     handleAuthStatus,
@@ -565,7 +567,7 @@ export function createCustomerAccountClient({
 
       await exchangeForStorefrontCustomerAccessToken();
 
-      return redirect(redirectPath || DEFAULT_REDIRECT_PATH);
+      return redirect(redirectPath || defaultRedirectPath);
     },
     UNSTABLE_setBuyer: setBuyer,
     UNSTABLE_getBuyer: getBuyer,
diff --git a/packages/hydrogen/src/customer/types.ts b/packages/hydrogen/src/customer/types.ts
index b1e24607c4..c051aab374 100644
--- a/packages/hydrogen/src/customer/types.ts
+++ b/packages/hydrogen/src/customer/types.ts
@@ -152,6 +152,12 @@ export type CustomerAccountOptions = {
   logErrors?: boolean | ((error?: Error) => boolean);
   /** UNSTABLE feature, this will eventually goes away. If true then we will exchange customerAccessToken for storefrontCustomerAccessToken. */
   unstableB2b?: boolean;
+  /** The path to redirect to after login. Defaults to `/account`. */
+  defaultRedirectPath?: string;
+  /** The path to login. Defaults to `/account/login`. */
+  loginPath?: string;
+  /** The oauth authorize path. Defaults to `/account/authorize`. */
+  authorizePath?: string;
 };
 
 /** Below are types meant for documentation only. Ensure it stay in sync with the type above. */

From 83ab41aa9658c57c952466269982836dd7f1c476 Mon Sep 17 00:00:00 2001
From: Bret Little <bret.little@shopify.com>
Date: Fri, 6 Dec 2024 13:21:11 -0500
Subject: [PATCH 2/2] Update packages/hydrogen/src/customer/customer.ts

Co-authored-by: Helen Lin <helen.lin@shopify.com>
---
 packages/hydrogen/src/customer/customer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/hydrogen/src/customer/customer.ts b/packages/hydrogen/src/customer/customer.ts
index b830647cd6..306e738d17 100644
--- a/packages/hydrogen/src/customer/customer.ts
+++ b/packages/hydrogen/src/customer/customer.ts
@@ -432,7 +432,7 @@ export function createCustomerAccountClient({
 
       clearSession(session);
 
-      return redirect(logoutUrl);
+      return redirect(logoutUrl, {headers: options?.headers || {}});
     },
     isLoggedIn,
     handleAuthStatus,