fix: google signup / singin on cancel improvement (artsy#10084)

fix: do not throw error / show message when user cancels sign in / up with google
stacktasec · Apr 16, 2024 · 8ff8368 · 8ff8368
1 parent b0a3a4a
commit 8ff8368
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 17 deletions.
diff --git a/src/app/Scenes/Onboarding/OnboardingSocialPick.tsx b/src/app/Scenes/Onboarding/OnboardingSocialPick.tsx
@@ -1,4 +1,5 @@
 import { EnvelopeIcon, Spacer, Flex, Text, Join, Button, LegacyScreen } from "@artsy/palette-mobile"
+import { statusCodes } from "@react-native-google-signin/google-signin"
 import { NavigationProp, useNavigation } from "@react-navigation/native"
 import { captureMessage } from "@sentry/react-native"
 import LoadingModal from "app/Components/Modals/LoadingModal"
@@ -51,6 +52,7 @@ export const OnboardingSocialPick: React.FC<OnboardingSocialPickProps> = ({ mode
       oauthToken,
       idToken,
       appleUid,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     } = meta!
     const navParams: Omit<
       OnboardingNavigationStack["OnboardingSocialLink"],
@@ -86,20 +88,25 @@ export const OnboardingSocialPick: React.FC<OnboardingSocialPickProps> = ({ mode
   }
 
   const handleError = (error: AuthPromiseRejectType) => {
-    captureMessage("AUTH_FAILURE: " + error.message)
-
-    const canBeLinked =
-      error.error === "User Already Exists" && error.meta && error.meta.existingProviders
-    if (canBeLinked) {
-      handleErrorWithAlternativeProviders(error.meta)
+    if (error.message === statusCodes.SIGN_IN_CANCELLED) {
       return
-    }
-    GlobalStore.actions.auth.setSessionState({ isLoading: false })
+    } else {
+      captureMessage("AUTH_FAILURE: " + error.message)
 
-    InteractionManager.runAfterInteractions(() => {
-      const errorMode = error.message === "Attempt blocked" ? "attempt blocked" : "no account"
-      showErrorAlert(errorMode, error)
-    })
+      const canBeLinked =
+        error.error === "User Already Exists" && error.meta && error.meta.existingProviders
+      if (canBeLinked) {
+        handleErrorWithAlternativeProviders(error.meta)
+        return
+      }
+      GlobalStore.actions.auth.setSessionState({ isLoading: false })
+
+      InteractionManager.runAfterInteractions(() => {
+        const errorMode = error.message === "Attempt blocked" ? "attempt blocked" : "no account"
+        showErrorAlert(errorMode, error)
+        return
+      })
+    }
   }
 
   const showErrorAlert = (

diff --git a/src/app/store/AuthModel.ts b/src/app/store/AuthModel.ts
@@ -1,7 +1,7 @@
 import { ActionType, AuthService, CreatedAccount } from "@artsy/cohesion"
 import { appleAuth } from "@invertase/react-native-apple-authentication"
 import CookieManager from "@react-native-cookies/cookies"
-import { GoogleSignin } from "@react-native-google-signin/google-signin"
+import { GoogleSignin, statusCodes } from "@react-native-google-signin/google-signin"
 import * as Sentry from "@sentry/react-native"
 import { LegacyNativeModules } from "app/NativeModules/LegacyNativeModules"
 import * as RelayCache from "app/system/relay/RelayCache"
@@ -164,6 +164,7 @@ export interface AuthPromiseResolveType {
 export interface AuthPromiseRejectType {
   error?: string
   message: string
+  code?: string
   meta?: {
     email: string
     provider: OAuthProvider
@@ -772,18 +773,24 @@ export const getAuthModel = (): AuthModel => ({
             }
           }
         }
-      } catch (e) {
+      } catch (e: any) {
+        if (statusCodes.SIGN_IN_CANCELLED === e?.code) {
+          reject(new AuthError(statusCodes.SIGN_IN_CANCELLED))
+          return
+        }
+
         if (e instanceof Error) {
-          if (e.message === "DEVELOPER_ERROR") {
+          if (e?.message === "DEVELOPER_ERROR") {
             reject(
               new AuthError(
                 "Google auth does not work in firebase beta, try again in a playstore beta",
-                e.message
+                e?.message
               )
             )
             return
           }
-          reject(new AuthError("Error logging in with google", e.message))
+
+          reject(new AuthError("Error logging in with google", e?.message))
           return
         }
         reject(new AuthError("Error logging in with google"))