Fix email and Google providers creating duplicate credentials (#1229)

Author: SUPERCILEX

auth/src/main/java/com/firebase/ui/auth/AuthUI.java

@@ -34,6 +34,7 @@
 import com.firebase.ui.auth.data.remote.FacebookSignInHandler;
 import com.firebase.ui.auth.data.remote.TwitterSignInHandler;
 import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
+import com.firebase.ui.auth.util.CredentialUtils;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.GoogleApiUtils;
 import com.firebase.ui.auth.util.Preconditions;
@@ -392,11 +393,13 @@ private static List<Credential> getCredentialsFromFirebaseUser(@NonNull Firebase
             }
 
             String type = ProviderUtils.providerIdToAccountType(userInfo.getProviderId());
-
-            credentials.add(new Credential.Builder(
-                    TextUtils.isEmpty(user.getEmail()) ? user.getPhoneNumber() : user.getEmail())
-                    .setAccountType(type)
-                    .build());
+            if (type == null) {
+                // Since the account type is null, we've got an email credential. Adding a fake
+                // password is the only way to tell Smart Lock that this is an email credential.
+                credentials.add(CredentialUtils.buildCredentialOrThrow(user, "pass", null));
+            } else {
+                credentials.add(CredentialUtils.buildCredentialOrThrow(user, null, type));
+            }
         }
 
         return credentials;
@@ -631,8 +634,8 @@ public EmailBuilder setAllowNewAccounts(boolean allow) {
             }
 
             /**
-             * Configures the requirement for the user to enter first and last name
-             * in the email sign up flow.
+             * Configures the requirement for the user to enter first and last name in the email
+             * sign up flow.
              * <p>
              * Name is required by default.
              */

auth/src/main/java/com/firebase/ui/auth/data/model/Resource.java

@@ -24,14 +24,6 @@ private Resource(State state, T value, Exception exception) {
         mException = exception;
     }
 
-    /**
-     * Creates a successful, empty Resource.
-     */
-    @NonNull
-    public static Resource<Void> forVoidSuccess() {
-        return new Resource<>(State.SUCCESS, null, null);
-    }
-
     /**
      * Creates a successful resource containing a value.
      */

auth/src/main/java/com/firebase/ui/auth/data/remote/SignInKickstarter.java

@@ -192,6 +192,7 @@ private void handleCredential(final Credential credential) {
             final IdpResponse response = new IdpResponse.Builder(
                     new User.Builder(EmailAuthProvider.PROVIDER_ID, id).build()).build();
 
+            setResult(Resource.<IdpResponse>forLoading());
             getAuth().signInWithEmailAndPassword(id, password)
                     .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                         @Override

auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java

@@ -13,7 +13,7 @@
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.ui.credentials.CredentialSaveActivity;
 import com.firebase.ui.auth.util.AuthHelper;
-import com.firebase.ui.auth.util.CredentialsUtil;
+import com.firebase.ui.auth.util.CredentialUtils;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.firebase.ui.auth.viewmodel.RequestCodes;
@@ -59,7 +59,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         // Forward the results of Smart Lock saving
         if (requestCode == RequestCodes.CRED_SAVE_FLOW) {
-            finish(RESULT_OK, data);
+            finish(resultCode, data);
         }
     }
 
@@ -89,7 +89,7 @@ public void startSaveCredentials(
             @Nullable String password) {
         // Build credential
         String accountType = ProviderUtils.idpResponseToAccountType(response);
-        Credential credential = CredentialsUtil.buildCredential(
+        Credential credential = CredentialUtils.buildCredential(
                 firebaseUser, password, accountType);
 
         // Start the dedicated SmartLock Activity

auth/src/main/java/com/firebase/ui/auth/ui/credentials/CredentialSaveActivity.java

@@ -14,7 +14,7 @@
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.util.ExtraConstants;
-import com.firebase.ui.auth.viewmodel.VoidResourceObserver;
+import com.firebase.ui.auth.viewmodel.ResourceObserver;
 import com.firebase.ui.auth.viewmodel.smartlock.SmartLockHandler;
 import com.google.android.gms.auth.api.credentials.Credential;
 
@@ -25,7 +25,6 @@ public class CredentialSaveActivity extends HelperActivityBase {
     private static final String TAG = "CredentialSaveActivity";
 
     private SmartLockHandler mHandler;
-    private IdpResponse mIdpResponse;
 
     @NonNull
     public static Intent createIntent(Context context,
@@ -41,29 +40,30 @@ public static Intent createIntent(Context context,
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        final IdpResponse response = getIntent().getParcelableExtra(ExtraConstants.IDP_RESPONSE);
+        Credential credential = getIntent().getParcelableExtra(ExtraConstants.CREDENTIAL);
+
         mHandler = ViewModelProviders.of(this).get(SmartLockHandler.class);
         mHandler.init(getFlowParams());
+        mHandler.setResponse(response);
 
-        Credential credential = getIntent().getParcelableExtra(ExtraConstants.CREDENTIAL);
-        mIdpResponse = getIntent().getParcelableExtra(ExtraConstants.IDP_RESPONSE);
-
-        mHandler.getOperation().observe(this, new VoidResourceObserver(
+        mHandler.getOperation().observe(this, new ResourceObserver<IdpResponse>(
                 this, R.string.fui_progress_dialog_loading) {
             @Override
-            protected void onSuccess() {
-                finish(RESULT_OK, mIdpResponse.toIntent());
+            protected void onSuccess(@NonNull IdpResponse response) {
+                finish(RESULT_OK, response.toIntent());
             }
 
             @Override
             protected void onFailure(@NonNull Exception e) {
                 // RESULT_OK since we don't want to halt sign-in just because of a credential save
                 // error.
-                finish(RESULT_OK, mIdpResponse.toIntent());
+                finish(RESULT_OK, response.toIntent());
             }
         });
 
         // Avoid double-saving
-        Resource<Void> currentOp = mHandler.getOperation().getValue();
+        Resource<IdpResponse> currentOp = mHandler.getOperation().getValue();
         if (currentOp == null) {
             Log.d(TAG, "Launching save operation.");
             mHandler.saveCredentials(credential);

auth/src/main/java/com/firebase/ui/auth/util/CredentialUtils.java

@@ -0,0 +1,67 @@
+package com.firebase.ui.auth.util;
+
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.RestrictTo;
+import android.text.TextUtils;
+
+import com.firebase.ui.auth.IdpResponse;
+import com.google.android.gms.auth.api.credentials.Credential;
+import com.google.firebase.auth.FirebaseUser;
+
+/**
+ * Utility class for working with {@link Credential} objects.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class CredentialUtils {
+    private CredentialUtils() {
+        throw new AssertionError("No instance for you!");
+    }
+
+    /**
+     * Build a credential for the specified {@link FirebaseUser} with optional password and {@link
+     * IdpResponse}.
+     * <p>
+     * If the credential cannot be built (for example, empty email) then will return {@code null}.
+     */
+    @Nullable
+    public static Credential buildCredential(@NonNull FirebaseUser user,
+                                             @Nullable String password,
+                                             @Nullable String accountType) {
+        String email = user.getEmail();
+        String phone = user.getPhoneNumber();
+        Uri profilePictureUri =
+                user.getPhotoUrl() == null ? null : Uri.parse(user.getPhotoUrl().toString());
+
+        if (TextUtils.isEmpty(email) && TextUtils.isEmpty(phone)) { return null; }
+        if (password == null && accountType == null) { return null; }
+
+        Credential.Builder builder =
+                new Credential.Builder(TextUtils.isEmpty(email) ? phone : email)
+                        .setName(user.getDisplayName())
+                        .setProfilePictureUri(profilePictureUri);
+
+        if (TextUtils.isEmpty(password)) {
+            builder.setAccountType(accountType);
+        } else {
+            builder.setPassword(password);
+        }
+
+        return builder.build();
+    }
+
+    /**
+     * @see #buildCredential(FirebaseUser, String, String)
+     */
+    @NonNull
+    public static Credential buildCredentialOrThrow(@NonNull FirebaseUser user,
+                                                    @Nullable String password,
+                                                    @Nullable String accountType) {
+        Credential credential = buildCredential(user, password, accountType);
+        if (credential == null) {
+            throw new IllegalStateException("Unable to build credential");
+        }
+        return credential;
+    }
+}