Fix email -> Google account linking regression (#836)

Author: SUPERCILEX

auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java

@@ -18,6 +18,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 import android.util.Log;
 import android.view.View;
@@ -64,7 +65,7 @@ public static Intent createIntent(
             Context context,
             FlowParameters flowParams,
             User existingUser,
-            IdpResponse newUserResponse) {
+            @Nullable IdpResponse newUserResponse) {
         return HelperActivityBase.createBaseIntent(context, WelcomeBackIdpPrompt.class, flowParams)
                 .putExtra(ExtraConstants.EXTRA_USER, existingUser)
                 .putExtra(ExtraConstants.EXTRA_IDP_RESPONSE, newUserResponse);
@@ -75,8 +76,10 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.fui_welcome_back_idp_prompt_layout);
 
-        IdpResponse newUserIdpResponse = IdpResponse.fromResultIntent(getIntent());
-        mPrevCredential = ProviderUtils.getAuthCredential(newUserIdpResponse);
+        IdpResponse newUserResponse = IdpResponse.fromResultIntent(getIntent());
+        if (newUserResponse != null) {
+            mPrevCredential = ProviderUtils.getAuthCredential(newUserResponse);
+        }
 
         User oldUser = User.getUser(getIntent());
 

auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java

@@ -206,8 +206,7 @@ public void onSuccess(String provider) {
                             mListener.onExistingEmailUser(
                                     new User.Builder(EmailAuthProvider.PROVIDER_ID, email).build());
                         } else {
-                            mListener.onExistingIdpUser(
-                                    new User.Builder(EmailAuthProvider.PROVIDER_ID, email).build());
+                            mListener.onExistingIdpUser(new User.Builder(provider, email).build());
                         }
                     }
                 })

auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java

@@ -23,11 +23,11 @@
 
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
+import com.firebase.ui.auth.User;
 import com.firebase.ui.auth.ui.AppCompatBase;
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.HelperActivityBase;
-import com.firebase.ui.auth.User;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackIdpPrompt;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackPasswordPrompt;
 
@@ -104,13 +104,9 @@ public void onExistingEmailUser(User user) {
     @Override
     public void onExistingIdpUser(User user) {
         // Existing social user, direct them to sign in using their chosen provider.
-        Intent intent = WelcomeBackIdpPrompt.createIntent(
-                this,
-                getFlowParams(),
-                user,
-                new IdpResponse.Builder(user).build());
-
-        startActivityForResult(intent, RC_WELCOME_BACK_IDP);
+        startActivityForResult(
+                WelcomeBackIdpPrompt.createIntent(this, getFlowParams(), user, null),
+                RC_WELCOME_BACK_IDP);
         setSlideAnimation();
     }
 

auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java

@@ -302,9 +302,7 @@ public void onSuccess(String provider) {
                                                                 getFlowParams(),
                                                                 new User.Builder(provider, email)
                                                                         .build(),
-                                                                new IdpResponse.Builder(new User.Builder(
-                                                                        EmailAuthProvider.PROVIDER_ID,
-                                                                        email).build()).build()),
+                                                                null),
                                                         RegisterEmailActivity.RC_WELCOME_BACK_IDP);
                                             }
                                         }