fix(auth, android): handle failure to upgrade anonymous user

This is related to a #4487 - attempting to re-login with credential after anonymous user signs in with apple sign-in on android
invertase · Nov 16, 2020 · 41fad36 · 41fad36
1 parent 8ead604
commit 41fad36
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/.../auth/android/src/main/java/io/invertase/firebase/auth/ReactNativeFirebaseAuthModule.java b/.../auth/android/src/main/java/io/invertase/firebase/auth/ReactNativeFirebaseAuthModule.java
@@ -1314,13 +1314,18 @@ private void linkWithCredential(
               if (exception instanceof FirebaseAuthUserCollisionException) {
                 FirebaseAuthUserCollisionException authUserCollisionException = (FirebaseAuthUserCollisionException) exception;
                 AuthCredential updatedCredential = authUserCollisionException.getUpdatedCredential();
-                firebaseAuth.signInWithCredential(updatedCredential).addOnCompleteListener(getExecutor(), result -> {
-                  if (result.isSuccessful()) {
-                    promiseWithAuthResult(result.getResult(), promise);
-                  } else {
-                    promiseRejectAuthException(promise, exception);
-                  }
-                });
+                try {
+                  firebaseAuth.signInWithCredential(updatedCredential).addOnCompleteListener(getExecutor(), result -> {
+                    if (result.isSuccessful()) {
+                      promiseWithAuthResult(result.getResult(), promise);
+                    } else {
+                      promiseRejectAuthException(promise, exception);
+                    }
+                  });
+                } catch (Exception e) {
+                  // we the attempt to log in after the collision failed, reject back to JS
+                  promiseRejectAuthException(promise, exception);
+                }
               } else {
                 promiseRejectAuthException(promise, exception);
               }