Warn instead of crashing on reserved email (#1812)

firebase · Jul 21, 2020 · c85355c · c85355c
1 parent ce8426a
commit c85355c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
 - Fixes issue with custom parameters for OAuth providers (#1805)
 - Restore `setGithubButtonId` when using custom layouts (#1783)
 - Improve how network errors display when they are non-fatal (#1803)
+- Warn instead of crashing when a reserved email is used (#1644)
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/email/EmailProviderResponseHandler.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/email/EmailProviderResponseHandler.java
@@ -1,7 +1,10 @@
 package com.firebase.ui.auth.viewmodel.email;
 
 import android.app.Application;
+import android.util.Log;
 
+import com.firebase.ui.auth.ErrorCodes;
+import com.firebase.ui.auth.FirebaseUiException;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.data.model.IntentRequiredException;
 import com.firebase.ui.auth.data.model.Resource;
@@ -23,6 +26,7 @@
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 
 import static com.firebase.ui.auth.AuthUI.EMAIL_LINK_PROVIDER;
@@ -70,6 +74,8 @@ public void onFailure(@NonNull Exception e) {
                                         password);
                                 handleMergeFailure(credential);
                             } else {
+                                Log.w(TAG, "Got a collision error during a non-upgrade flow", e);
+
                                 // Collision with existing user email without anonymous upgrade
                                 // it should be very hard for the user to even get to this error
                                 // due to CheckEmailFragment.
@@ -97,10 +103,14 @@ public StartWelcomeBackFlow(String email) {
         }
 
         @Override
-        public void onSuccess(String provider) {
+        public void onSuccess(@Nullable String provider) {
             if (provider == null) {
-                throw new IllegalStateException(
-                        "User has no providers even though we got a collision.");
+                Log.w(TAG, "No providers known for user ("
+                        + mEmail
+                        + ") this email address may be reserved.");
+                setResult(Resource.<IdpResponse>forFailure(
+                        new FirebaseUiException(ErrorCodes.UNKNOWN_ERROR)));
+                return;
             }
 
             if (EmailAuthProvider.PROVIDER_ID.equalsIgnoreCase(provider)) {