set correct google sign-in webClientId

Author: war-in

src/CONFIG.ts

@@ -97,10 +97,16 @@ export default {
         WEB_CLIENT_ID: '921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com',
         // cspell:disable-next-line
         IOS_CLIENT_ID: '921154746561-s3uqn2oe4m85tufi6mqflbfbuajrm2i3.apps.googleusercontent.com',
-        // cspell:disable-next-line
-        HYBRID_APP_WEB_CLIENT_ID: '1008697809946-5e095eqem3o6ugtpc2rjf7v880tcp28p.apps.googleusercontent.com',
-        // cspell:disable-next-line
-        HYBRID_APP_IOS_CLIENT_ID: '1008697809946-sh04nqq0hea396s1qdqqbj6ia649odb2.apps.googleusercontent.com',
+        HYBRID_APP: {
+            // cspell:disable-next-line
+            IOS_CLIENT_ID: '1008697809946-sh04nqq0hea396s1qdqqbj6ia649odb2.apps.googleusercontent.com',
+            WEB_CLIENT_ID: {
+                // cspell:disable-next-line
+                IOS: '1008697809946-5e095eqem3o6ugtpc2rjf7v880tcp28p.apps.googleusercontent.com',
+                // cspell:disable-next-line
+                ANDROID: '240677659774-86pov3adub93cv4b8uj13g7varolmk2l.apps.googleusercontent.com',
+            }
+        },
     },
     GCP_GEOLOCATION_API_KEY: googleGeolocationAPIKey,
     FIREBASE_WEB_CONFIG: {

src/components/SignInButtons/GoogleSignIn/index.native.tsx

@@ -5,16 +5,30 @@ import Log from '@libs/Log';
 import {beginGoogleSignIn} from '@userActions/Session';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
+import getPlatform from '@libs/getPlatform';
 import type {GoogleSignInProps} from '.';
 import type GoogleError from './types';
 
+/**
+ * Helper function returning webClientId based on a platform used
+ */
+function getWebClientId() {
+    if (!CONFIG.IS_HYBRID_APP) {
+        return CONFIG.GOOGLE_SIGN_IN.WEB_CLIENT_ID;
+    }
+
+    return getPlatform() === CONST.PLATFORM.ANDROID
+        ? CONFIG.GOOGLE_SIGN_IN.HYBRID_APP.WEB_CLIENT_ID.ANDROID
+        : CONFIG.GOOGLE_SIGN_IN.HYBRID_APP.WEB_CLIENT_ID.IOS;
+}
+
 /**
  * Google Sign In method for iOS and android that returns identityToken.
  */
 function googleSignInRequest() {
     GoogleSignin.configure({
-        webClientId: CONFIG.IS_HYBRID_APP ? CONFIG.GOOGLE_SIGN_IN.HYBRID_APP_WEB_CLIENT_ID : CONFIG.GOOGLE_SIGN_IN.WEB_CLIENT_ID,
-        iosClientId: CONFIG.IS_HYBRID_APP ? CONFIG.GOOGLE_SIGN_IN.HYBRID_APP_IOS_CLIENT_ID : CONFIG.GOOGLE_SIGN_IN.IOS_CLIENT_ID,
+        webClientId: getWebClientId(),
+        iosClientId: CONFIG.IS_HYBRID_APP ? CONFIG.GOOGLE_SIGN_IN.HYBRID_APP.IOS_CLIENT_ID : CONFIG.GOOGLE_SIGN_IN.IOS_CLIENT_ID,
         offlineAccess: false,
     });