From 94d64a2239258dc6ae159caaf8d94f3ea3a368ba Mon Sep 17 00:00:00 2001
From: Lauren Zugai <lauren@zugai.com>
Date: Wed, 12 Mar 2025 11:21:29 -0500
Subject: [PATCH] feat(react): Add '/oauth' to React app

Because:
* We are converting Backbone flows to React

This commit:
* Displays email-first Index page if path is /oauth, for React

closes FXA-6516
---
 packages/fxa-content-server/app/scripts/lib/router.js         | 4 +++-
 .../fxa-content-server/server/lib/routes/react-app/index.js   | 2 +-
 packages/fxa-settings/src/components/App/index.tsx            | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/fxa-content-server/app/scripts/lib/router.js b/packages/fxa-content-server/app/scripts/lib/router.js
index 5a36bfefa43..798c40db769 100644
--- a/packages/fxa-content-server/app/scripts/lib/router.js
+++ b/packages/fxa-content-server/app/scripts/lib/router.js
@@ -288,7 +288,9 @@ Router = Router.extend({
         contentRedirect: true,
       });
     },
-    'oauth(/)': createViewHandler(IndexView),
+    'oauth(/)': function () {
+      this.createReactOrBackboneViewHandler('oauth', IndexView);
+    },
     'oauth/force_auth(/)': function () {
       this.createReactOrBackboneViewHandler('oauth/force_auth', ForceAuthView, {
         ...Url.searchParams(this.window.location.search),
diff --git a/packages/fxa-content-server/server/lib/routes/react-app/index.js b/packages/fxa-content-server/server/lib/routes/react-app/index.js
index f07af57fa8b..940c83bf91f 100644
--- a/packages/fxa-content-server/server/lib/routes/react-app/index.js
+++ b/packages/fxa-content-server/server/lib/routes/react-app/index.js
@@ -25,7 +25,7 @@ const getReactRouteGroups = (showReactApp, reactRoute) => {
   return {
     emailFirstRoutes: {
       featureFlagOn: showReactApp.emailFirstRoutes,
-      routes: reactRoute.getRoutes(['/']),
+      routes: reactRoute.getRoutes(['/', 'oauth']),
       fullProdRollout: false,
     },
     simpleRoutes: {
diff --git a/packages/fxa-settings/src/components/App/index.tsx b/packages/fxa-settings/src/components/App/index.tsx
index 86f7df6c0d5..8efbc5d7999 100644
--- a/packages/fxa-settings/src/components/App/index.tsx
+++ b/packages/fxa-settings/src/components/App/index.tsx
@@ -324,6 +324,7 @@ const AuthAndAccountSetupRoutes = ({
     <Router>
       {/* Index */}
       <IndexContainer path="/" {...{ integration, serviceName }} />
+      <IndexContainer path="/oauth" {...{ integration, serviceName }} />
 
       {/* Legal */}
       <Legal path="/legal/*" />