From 1115cf34d9d0244bdd80b197797214d497a054b2 Mon Sep 17 00:00:00 2001
From: Satindar Dhillon <satindar@gmail.com>
Date: Fri, 19 Aug 2022 19:39:41 -0700
Subject: [PATCH] update google login client id for android

---
 android/Omnivore/app/src/main/res/values/strings.xml | 2 +-
 packages/api/src/routers/auth/google_auth.ts         | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/android/Omnivore/app/src/main/res/values/strings.xml b/android/Omnivore/app/src/main/res/values/strings.xml
index 90a5ab700..2f4570ea1 100644
--- a/android/Omnivore/app/src/main/res/values/strings.xml
+++ b/android/Omnivore/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <resources>
     <string name="app_name">Omnivore</string>
-    <string name="gcp_id">590528454690-ovh9ku5r3fojgr1pp5kgaimr43o96btb.apps.googleusercontent.com</string>
+    <string name="gcp_id">590528454690-mpmbvcb4c3ifmnojmrultt37eo8f64at.apps.googleusercontent.com</string>
 </resources>
diff --git a/packages/api/src/routers/auth/google_auth.ts b/packages/api/src/routers/auth/google_auth.ts
index 9a8aca56b..c414dcf5c 100644
--- a/packages/api/src/routers/auth/google_auth.ts
+++ b/packages/api/src/routers/auth/google_auth.ts
@@ -58,22 +58,21 @@ export const validateGoogleUser = async (
 }
 
 const iosClientId = env.google.auth.iosClientId
-const androidClientId = env.google.auth.androidClientId
+const webClientId = env.google.auth.clientId
 
-const googleWebClient = new OAuth2Client(env.google.auth.clientId)
+const googleWebClient = new OAuth2Client(webClientId)
 const googleIOSClient = new OAuth2Client(iosClientId)
-const googleAndroidClient = new OAuth2Client(androidClientId)
 
 export async function decodeGoogleToken(
   idToken: string,
   isAndroid: boolean
 ): Promise<DecodeTokenResult> {
   try {
-    const googleMobileClient = isAndroid ? googleAndroidClient : googleIOSClient
+    const googleMobileClient = isAndroid ? googleWebClient : googleIOSClient
 
     const loginTicket = await googleMobileClient.verifyIdToken({
       idToken,
-      audience: isAndroid ? androidClientId : iosClientId,
+      audience: isAndroid ? webClientId : iosClientId,
     })
 
     const email = loginTicket.getPayload()?.email