Properly handle existing email users

samtstern · samtstern · commit 587615968fc1 · 2018-03-14T15:38:35.000-07:00
Change-Id: I15adb6fab8306420fa7ca6a9a837e2260691369e
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java
@@ -40,8 +40,9 @@ public void startLogin(Activity activity) {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == RC_EMAIL_FLOW && resultCode == Activity.RESULT_OK) {
-            mActivity.setResult(Activity.RESULT_OK, data);
+        if (requestCode == RC_EMAIL_FLOW
+                && (resultCode == Activity.RESULT_OK || resultCode == Activity.RESULT_CANCELED)) {
+            mActivity.setResult(resultCode, data);
             mActivity.finish();
         }
     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPrompt.java
@@ -34,6 +34,8 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.firebase.ui.auth.ErrorCodes;
+import com.firebase.ui.auth.FirebaseUiException;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.data.model.FlowParameters;
@@ -45,6 +47,7 @@
 import com.firebase.ui.auth.util.ui.ImeHelper;
 import com.firebase.ui.auth.viewmodel.email.WelcomeBackPasswordHandler;
 import com.google.firebase.auth.AuthCredential;
+import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
 import com.google.firebase.auth.FirebaseUser;
 
@@ -138,12 +141,29 @@ private void onSignInOperation(@Nullable Resource<IdpResponse> resource) {
                 break;
             case FAILURE:
                 getDialogHolder().dismissDialog();
-                String message = getString(getErrorMessage(resource.getException()));
-                mPasswordLayout.setError(message);
+                onSignInError(resource.getException());
                 break;
         }
     }
 
+    private void onSignInError(Exception e) {
+        if (e instanceof FirebaseUiException) {
+            FirebaseUiException fue = (FirebaseUiException) e;
+            if (fue.getErrorCode() == ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT) {
+                // TODO: Are we sure password will be here
+                String password = mPasswordField.getText().toString();
+                AuthCredential credential = EmailAuthProvider.getCredential(mEmail, password);
+
+                IdpResponse response = new IdpResponse.Builder(credential).build();
+                finish(RESULT_CANCELED, response.toIntent());
+                return;
+            }
+        }
+
+        String message = getString(getErrorMessage(e));
+        mPasswordLayout.setError(message);
+    }
+
     @StringRes
     private int getErrorMessage(Exception exception) {
         if (exception instanceof FirebaseAuthInvalidCredentialsException) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/AnonymousUpgradeUtils.java b/auth/src/main/java/com/firebase/ui/auth/util/AnonymousUpgradeUtils.java
@@ -6,13 +6,17 @@
 
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.ui.HelperActivityBase;
+import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
+import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
 
+import java.util.UUID;
+
 /**
  * Utilities to help with Anonymous user upgrade.
  */
@@ -74,7 +78,25 @@ public static boolean isUpgradeFailure(FlowParameters parameters,
                 && canUpgradeAnonymous(parameters, auth);
     }
 
-    private static boolean canUpgradeAnonymous(FlowParameters parameters, FirebaseAuth auth) {
+    @NonNull
+    public static Task<Boolean> validateCredential(FirebaseApp app, AuthCredential credential) {
+        // Create a new FirebaseApp for us to do this operation.
+        // TODO: is this expensive?
+        String randomName = UUID.randomUUID().toString();
+        FirebaseApp scratchApp = FirebaseApp.initializeApp(
+                app.getApplicationContext(), app.getOptions(), randomName);
+        FirebaseAuth scratchAuth = FirebaseAuth.getInstance(scratchApp);
+
+        return scratchAuth.signInWithCredential(credential)
+                .continueWith(new Continuation<AuthResult, Boolean>() {
+                    @Override
+                    public Boolean then(@NonNull Task<AuthResult> task) throws Exception {
+                        return task.isSuccessful();
+                    }
+                });
+    }
+
+    public static boolean canUpgradeAnonymous(FlowParameters parameters, FirebaseAuth auth) {
         return parameters.enableAnonymousUpgrade
                 && auth.getCurrentUser() != null
                 && auth.getCurrentUser().isAnonymous();
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/AuthHelper.java b/auth/src/main/java/com/firebase/ui/auth/util/AuthHelper.java
@@ -21,8 +21,12 @@ public AuthHelper(FlowParameters params) {
         mFlowParams = params;
     }
 
+    public FirebaseApp getFirebaseApp() {
+        return FirebaseApp.getInstance(mFlowParams.appName);
+    }
+
     public FirebaseAuth getFirebaseAuth() {
-        return FirebaseAuth.getInstance(FirebaseApp.getInstance(mFlowParams.appName));
+        return FirebaseAuth.getInstance(getFirebaseApp());
     }
 
     @Nullable
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/data/ProviderUtils.java b/auth/src/main/java/com/firebase/ui/auth/util/data/ProviderUtils.java
@@ -130,4 +130,27 @@ public String then(@NonNull Task<ProviderQueryResult> task) {
                     }
                 });
     }
+
+    public static Task<Boolean> hasProvider(FirebaseAuth auth,
+                                            String email,
+                                            final String provider) {
+
+        return auth.fetchProvidersForEmail(email)
+                .continueWith(new Continuation<ProviderQueryResult, Boolean>() {
+                    @Override
+                    public Boolean then(@NonNull Task<ProviderQueryResult> task) throws Exception {
+                        if (task.isSuccessful()) {
+                            // TODO?
+                            return false;
+                        }
+
+                        List<String> providers = task.getResult().getProviders();
+                        if (providers == null || providers.isEmpty()) {
+                            return false;
+                        }
+
+                        return providers.contains(provider);
+                    }
+                });
+    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/AuthViewModelBase.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/AuthViewModelBase.java
@@ -18,6 +18,7 @@
 public class AuthViewModelBase extends ViewModelBase<FlowParameters> {
 
     private CredentialsClient mCredentialsClient;
+    private FirebaseApp mApp;
     private FirebaseAuth mAuth;
     private PhoneAuthProvider mPhoneAuth;
 
@@ -29,8 +30,8 @@ protected AuthViewModelBase(Application application) {
 
     @Override
     protected void onCreate() {
-        FirebaseApp app = FirebaseApp.getInstance(getArguments().appName);
-        mAuth = FirebaseAuth.getInstance(app);
+        mApp = FirebaseApp.getInstance(getArguments().appName);
+        mAuth = FirebaseAuth.getInstance(mApp);
         mPhoneAuth = PhoneAuthProvider.getInstance(mAuth);
         mCredentialsClient = GoogleApiUtils.getCredentialsClient(getApplication());
     }
@@ -39,6 +40,10 @@ protected FirebaseAuth getAuth() {
         return mAuth;
     }
 
+    protected FirebaseApp getApp() {
+        return mApp;
+    }
+
     protected PhoneAuthProvider getPhoneAuth() {
         return mPhoneAuth;
     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/viewmodel/email/WelcomeBackPasswordHandler.java b/auth/src/main/java/com/firebase/ui/auth/viewmodel/email/WelcomeBackPasswordHandler.java
@@ -7,11 +7,14 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 
+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.Resource;
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.data.remote.ProfileMerger;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
+import com.firebase.ui.auth.util.AnonymousUpgradeUtils;
 import com.firebase.ui.auth.viewmodel.AuthViewModelBase;
 import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.OnCompleteListener;
@@ -66,8 +69,21 @@ public void startSignIn(@NonNull final String email,
                     .build();
         }
 
-        // Kick off the flow including signing in, linking accounts, and saving with SmartLock
-        getAuth().signInWithEmailAndPassword(email, password)
+        // Before signing in, check to see if this is an anonymous upgrade and, if so, if we will
+        // produce a conflict.
+        checkAnonymousConflict(email, password)
+                .continueWithTask(new Continuation<Void, Task<AuthResult>>() {
+                    @Override
+                    public Task<AuthResult> then(@NonNull Task<Void> task) throws Exception {
+                        // If validation failed, re-throw the exception
+                        if (!task.isSuccessful()) {
+                            throw task.getException();
+                        }
+
+                        // Kick off the flow including signing in, linking accounts, and saving with SmartLock
+                        return getAuth().signInWithEmailAndPassword(email, password);
+                    }
+                })
                 .addOnFailureListener(new TaskFailureLogger(TAG, "signInWithEmailAndPassword failed."))
                 .continueWithTask(new Continuation<AuthResult, Task<AuthResult>>() {
                     @Override
@@ -99,6 +115,30 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                 });
     }
 
+    private Task<Void> checkAnonymousConflict(String email, String password) {
+        if (!AnonymousUpgradeUtils.canUpgradeAnonymous(getArguments(), getAuth())) {
+            return Tasks.forResult(null);
+        }
+
+        final AuthCredential credential = EmailAuthProvider.getCredential(email, password);
+        return AnonymousUpgradeUtils.validateCredential(getApp(), credential)
+                .continueWith(new Continuation<Boolean, Void>() {
+                    @Override
+                    public Void then(@NonNull Task<Boolean> task) throws Exception {
+                        if (task.isSuccessful() && task.getResult()) {
+                            // Definitely conflict
+                            throw new FirebaseUiException(ErrorCodes.ANONYMOUS_UPGRADE_MERGE_CONFLICT);
+                        } else if (!task.isSuccessful()) {
+                            // Unknown error
+                            throw new FirebaseUiException(ErrorCodes.UNKNOWN_ERROR);
+                        } else {
+                            // No conflict
+                            return null;
+                        }
+                    }
+                });
+    }
+
     /**
      * Get the observable state of the sign in operation.
      */

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,9 @@ public void startLogin(Activity activity) {`
`40`	`40`
`41`	`41`	`@Override`
`42`	`42`	`public void onActivityResult(int requestCode, int resultCode, Intent data) {`
`43`		`- if (requestCode == RC_EMAIL_FLOW && resultCode == Activity.RESULT_OK) {`
`44`		`- mActivity.setResult(Activity.RESULT_OK, data);`
	`43`	`+ if (requestCode == RC_EMAIL_FLOW`
	`44`	`+ && (resultCode == Activity.RESULT_OK \|\| resultCode == Activity.RESULT_CANCELED)) {`
	`45`	`+ mActivity.setResult(resultCode, data);`
`45`	`46`	`mActivity.finish();`
`46`	`47`	`}`
`47`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,12 @@ public AuthHelper(FlowParameters params) {`
`21`	`21`	`mFlowParams = params;`
`22`	`22`	`}`
`23`	`23`
	`24`	`+ public FirebaseApp getFirebaseApp() {`
	`25`	`+ return FirebaseApp.getInstance(mFlowParams.appName);`
	`26`	`+ }`
	`27`	`+`
`24`	`28`	`public FirebaseAuth getFirebaseAuth() {`
`25`		`- return FirebaseAuth.getInstance(FirebaseApp.getInstance(mFlowParams.appName));`
	`29`	`+ return FirebaseAuth.getInstance(getFirebaseApp());`
`26`	`30`	`}`
`27`	`31`
`28`	`32`	`@Nullable`