From dd0b081c311ec64a538efc49ece8cfc5975c2db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= <wolf@thunderbird.net>
Date: Tue, 30 Sep 2025 15:50:49 +0200
Subject: [PATCH] feat(oauth): change TB beta gmail config to updated client id

---
 app-thunderbird/src/beta/AndroidManifest.xml  | 39 -------------------
 .../auth/TbOAuthConfigurationFactory.kt       |  5 +--
 2 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 app-thunderbird/src/beta/AndroidManifest.xml

diff --git a/app-thunderbird/src/beta/AndroidManifest.xml b/app-thunderbird/src/beta/AndroidManifest.xml
deleted file mode 100644
index 29f2d48a5c1..00000000000
--- a/app-thunderbird/src/beta/AndroidManifest.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- TODO remove once OAuth ids have been moved from TBD to TBA -->
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:installLocation="auto"
-    >
-
-    <application>
-        <activity
-            android:name="net.openid.appauth.RedirectUriReceiverActivity"
-            android:exported="true"
-            >
-
-            <!-- The library's default intent filter with `appAuthRedirectScheme` replaced by `applicationId` -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="${applicationId}" />
-                <data android:scheme="${applicationId}.mobile" />
-            </intent-filter>
-
-            <!-- Microsoft uses a special redirect URI format for Android apps -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="${applicationId}"
-                    android:scheme="msauth"
-                    />
-            </intent-filter>
-        </activity>
-
-    </application>
-</manifest>
diff --git a/app-thunderbird/src/beta/kotlin/net/thunderbird/android/auth/TbOAuthConfigurationFactory.kt b/app-thunderbird/src/beta/kotlin/net/thunderbird/android/auth/TbOAuthConfigurationFactory.kt
index 2d8668e308e..feda9a6cfdb 100644
--- a/app-thunderbird/src/beta/kotlin/net/thunderbird/android/auth/TbOAuthConfigurationFactory.kt
+++ b/app-thunderbird/src/beta/kotlin/net/thunderbird/android/auth/TbOAuthConfigurationFactory.kt
@@ -42,7 +42,6 @@ class TbOAuthConfigurationFactory : OAuthConfigurationFactory {
         )
     }
 
-    // TODO: Update clientId and redirectUri once new client ID is available
     private fun createGmailConfiguration(): Pair<List<String>, OAuthConfiguration> {
         return listOf(
             "imap.gmail.com",
@@ -50,11 +49,11 @@ class TbOAuthConfigurationFactory : OAuthConfigurationFactory {
             "smtp.gmail.com",
             "smtp.googlemail.com",
         ) to OAuthConfiguration(
-            clientId = "560629489500-rvmv3suifbrl1888pl6ppulog8krnlcp.apps.googleusercontent.com",
+            clientId = "560629489500-u95g9r3m604k2f1uqb5c7mo27coj8g9i.apps.googleusercontent.com",
             scopes = listOf("https://mail.google.com/"),
             authorizationEndpoint = "https://accounts.google.com/o/oauth2/v2/auth",
             tokenEndpoint = "https://oauth2.googleapis.com/token",
-            redirectUri = "${BuildConfig.APPLICATION_ID}.mobile:/oauth2redirect",
+            redirectUri = "${BuildConfig.APPLICATION_ID}:/oauth2redirect",
         )
     }