Save credentials with the correct id provider, other minor fixes

Change-Id: I8976b3a34062cbaf239d0f00ab3b2c02fa08779f

Author: Aaron Mandle

auth/src/main/java/com/firebase/ui/auth/ui/account_link/AccountLinkInitActivity.java

@@ -41,8 +41,9 @@ public class AccountLinkInitActivity extends AppCompatBase {
     private static final int RC_SAVE_CREDENTIALS = 3;
     private static final int RC_WELCOME_BACK_IDP_PROMPT = 4;
     private static final int RC_WELCOME_BACK_PASSWORD_PROMPT = 5;
-    private static final List<Integer> REQUEST_CODES = Arrays.asList(
-            RC_SAVE_CREDENTIALS,
+
+    // request codes where we pass the result back to the calling activity
+    private static final List<Integer> CHECKED_REQUEST_CODES = Arrays.asList(
             RC_WELCOME_BACK_IDP_PROMPT,
             RC_WELCOME_BACK_PASSWORD_PROMPT);
 
@@ -62,8 +63,10 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (REQUEST_CODES.contains(requestCode)) {
+        if (CHECKED_REQUEST_CODES.contains(requestCode)) {
             finish(resultCode, data);
+        } else if (RC_SAVE_CREDENTIALS == requestCode){
+            finish(RESULT_OK, new Intent());
         }
     }
 
@@ -86,22 +89,22 @@ public void onComplete(@NonNull Task<ProviderQueryResult> task) {
                     startActivityForResult(SaveCredentialsActivity.createIntent(
                             getApplicationContext(),
                             mActivityHelper.flowParams,
+                            null,
                             email,
                             password,
                             provider,
-                            null,
-                            mActivityHelper.getAppName()), RC_SAVE_CREDENTIALS);
+                            null), RC_SAVE_CREDENTIALS);
                 } else if (providers.size() == 1) {
                     if (providers.get(0).equals(provider)) {
                         // existing account but has this IDP linked
                         startActivityForResult(SaveCredentialsActivity.createIntent(
                                 AccountLinkInitActivity.this,
                                 mActivityHelper.flowParams,
+                                null,
                                 email,
                                 password,
                                 provider,
-                                null,
-                                mActivityHelper.getAppName()),
+                                null),
                                 RC_SAVE_CREDENTIALS);
                     } else {
                         if (providers.get(0).equals(EmailAuthProvider.PROVIDER_ID)) {
@@ -124,13 +127,26 @@ public void onComplete(@NonNull Task<ProviderQueryResult> task) {
                     }
                 } else {
                     // more than one providers
-                    startActivityForResult(WelcomeBackIDPPrompt.createIntent(
-                            getApplicationContext(),
-                            mActivityHelper.flowParams,
-                            provider,
-                            mIdpResponse,
-                            email),
-                            RC_WELCOME_BACK_IDP_PROMPT);
+                    if (providers.contains(provider)) {
+                        // this provider is already linked
+                        startActivityForResult(SaveCredentialsActivity.createIntent(
+                                AccountLinkInitActivity.this,
+                                mActivityHelper.flowParams,
+                                null,
+                                email,
+                                password,
+                                provider,
+                                null),
+                                RC_SAVE_CREDENTIALS);
+                    } else {
+                        startActivityForResult(WelcomeBackIDPPrompt.createIntent(
+                                getApplicationContext(),
+                                mActivityHelper.flowParams,
+                                provider,
+                                mIdpResponse,
+                                email),
+                                RC_WELCOME_BACK_IDP_PROMPT);
+                    }
                 }
             }
         });

auth/src/main/java/com/firebase/ui/auth/ui/account_link/SaveCredentialsActivity.java

@@ -23,7 +23,6 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
-import android.widget.Toast;
 
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.R;
@@ -151,7 +150,6 @@ public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
     public void onResult(@NonNull Status status) {
 
         if (status.isSuccess()) {
-            Toast.makeText(getApplicationContext(), "Credential saved", Toast.LENGTH_SHORT).show();
             finish(RESULT_OK, getIntent());
         } else {
             if (status.hasResolution()) {

auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java

@@ -207,7 +207,7 @@ public void onComplete(
                                     firebaseUser.getDisplayName(),
                                     firebaseUser.getEmail(),
                                     null,
-                                    firebaseUser.getProviderId(),
+                                    response.getProviderType(),
                                     photoUrl
                             ), RC_ACCOUNT_LINK);
                         }

auth/src/main/java/com/firebase/ui/auth/ui/idp/IDPSignInContainerActivity.java

@@ -79,10 +79,10 @@ protected void onCreate(Bundle savedInstanceState) {
     private void startAccountLinkingActivity(FirebaseUser firebaseUser, IDPResponse response) {
         List<String> providers = firebaseUser.getProviders();
         String provider = null;
-        if (providers.size() == 1) {
-            provider = providers.get(0);
+        if (providers.isEmpty()) {
+            Log.e(TAG, "User has no existing providers to link with" );
         } else {
-            Log.e(TAG, "Expecting a single provider, received :" + providers.size());
+            provider = firebaseUser.getProviders().get(0);
         }
         startActivityForResult(AccountLinkInitActivity.createIntent(
                 this,