Merge pull request #25446 from infinitered/lindboe/fix-gsi-logging

Improve Google Sign In error logging
Expensify · Oct 13, 2023 · 9e19e40 · 9e19e40
2 parents b5f94e9 + 7e18467
commit 9e19e40
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/components/SignInButtons/GoogleSignIn/index.native.js b/src/components/SignInButtons/GoogleSignIn/index.native.js
@@ -25,14 +25,18 @@ function googleSignInRequest() {
         .then((response) => response.idToken)
         .then((token) => Session.beginGoogleSignIn(token))
         .catch((error) => {
+            // Handle unexpected error shape
+            if (error === undefined || error.code === undefined) {
+                Log.alert(`[Google Sign In] Google sign in failed: ${error}`);
+            }
+            /** The logged code is useful for debugging any new errors that are not specifically handled. To decode, see:
+              - The common status codes documentation: https://developers.google.com/android/reference/com/google/android/gms/common/api/CommonStatusCodes
+              - The Google Sign In codes documentation: https://developers.google.com/android/reference/com/google/android/gms/auth/api/signin/GoogleSignInStatusCodes
+            */
             if (error.code === statusCodes.SIGN_IN_CANCELLED) {
-                Log.alert('[Google Sign In] Google sign in cancelled', true, {error});
-            } else if (error.code === statusCodes.IN_PROGRESS) {
-                Log.alert('[Google Sign In] Google sign in already in progress', true, {error});
-            } else if (error.code === statusCodes.PLAY_SERVICES_NOT_AVAILABLE) {
-                Log.alert('[Google Sign In] Google play services not available or outdated', true, {error});
+                Log.info('[Google Sign In] Google Sign In cancelled');
             } else {
-                Log.alert('[Google Sign In] Unknown Google sign in error', true, {error});
+                Log.alert(`[Google Sign In] Error Code: ${error.code}. ${error.message}`, {}, false);
             }
         });
 }