From 0ca1708b8f7420f0bbe37ec4c3836b26bba2e859 Mon Sep 17 00:00:00 2001
From: Aaron Mandle <amandle@google.com>
Date: Wed, 19 Oct 2016 11:41:25 -0700
Subject: [PATCH] Audit for missed instances of Twitter

---
 .../java/com/firebase/ui/auth/ui/AuthCredentialHelper.java   | 4 ++++
 .../ui/auth/ui/account_link/WelcomeBackIdpPrompt.java        | 5 +++++
 .../java/com/firebase/ui/auth/util/CredentialsApiHelper.java | 2 ++
 .../ui/auth/ui/idp/AuthMethodPickerActivityTest.java         | 1 +
 4 files changed, 12 insertions(+)

diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/AuthCredentialHelper.java b/auth/src/main/java/com/firebase/ui/auth/ui/AuthCredentialHelper.java
index d614b9fe3..25c1203d8 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/AuthCredentialHelper.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/AuthCredentialHelper.java
@@ -19,9 +19,11 @@
 import com.firebase.ui.auth.provider.FacebookProvider;
 import com.firebase.ui.auth.provider.GoogleProvider;
 import com.firebase.ui.auth.IdpResponse;
+import com.firebase.ui.auth.provider.TwitterProvider;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.GoogleAuthProvider;
+import com.google.firebase.auth.TwitterAuthProvider;
 
 public class AuthCredentialHelper {
 
@@ -32,6 +34,8 @@ public static AuthCredential getAuthCredential(IdpResponse idpResponse) {
                 return GoogleProvider.createAuthCredential(idpResponse);
             case FacebookAuthProvider.PROVIDER_ID:
                 return FacebookProvider.createAuthCredential(idpResponse);
+            case TwitterAuthProvider.PROVIDER_ID:
+                return TwitterProvider.createAuthCredential(idpResponse);
             default:
                 return null;
         }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIdpPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIdpPrompt.java
index 30f1d4eee..cff204f22 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIdpPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIdpPrompt.java
@@ -31,6 +31,7 @@
 import com.firebase.ui.auth.provider.IdpProvider;
 import com.firebase.ui.auth.provider.IdpProvider.IdpCallback;
 import com.firebase.ui.auth.IdpResponse;
+import com.firebase.ui.auth.provider.TwitterProvider;
 import com.firebase.ui.auth.ui.ActivityHelper;
 import com.firebase.ui.auth.ui.AppCompatBase;
 import com.firebase.ui.auth.ui.AuthCredentialHelper;
@@ -45,6 +46,7 @@
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GoogleAuthProvider;
+import com.google.firebase.auth.TwitterAuthProvider;
 
 public class WelcomeBackIdpPrompt extends AppCompatBase
         implements View.OnClickListener, IdpCallback {
@@ -73,6 +75,9 @@ protected void onCreate(Bundle savedInstanceState) {
                     case FacebookAuthProvider.PROVIDER_ID:
                         mIdpProvider = new FacebookProvider(this, idpConfig);
                         break;
+                    case TwitterAuthProvider.PROVIDER_ID:
+                        mIdpProvider = new TwitterProvider(this);
+                        break;
                     default:
                         Log.w(TAG, "Unknown provider: " + mProviderId);
                         finish(RESULT_CANCELED, getIntent());
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/CredentialsApiHelper.java b/auth/src/main/java/com/firebase/ui/auth/util/CredentialsApiHelper.java
index d2a8b1ce0..877ef5228 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/CredentialsApiHelper.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/CredentialsApiHelper.java
@@ -59,6 +59,8 @@ public CredentialRequest createCredentialRequest(List<IdpConfig> providers) {
                 idps.add(IdentityProviders.GOOGLE);
             } else if (AuthUI.FACEBOOK_PROVIDER.equals(providerId)) {
                 idps.add(IdentityProviders.FACEBOOK);
+            } else if (AuthUI.TWITTER_PROVIDER.equals(providerId)) {
+                idps.add(IdentityProviders.TWITTER);
             }
         }
 
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
index 185e67106..16ec4b277 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
@@ -82,6 +82,7 @@ public void testAllProvidersArePopulated() {
         List<String> providers = Arrays.asList(
                 AuthUI.FACEBOOK_PROVIDER,
                 AuthUI.GOOGLE_PROVIDER,
+                AuthUI.TWITTER_PROVIDER,
                 AuthUI.EMAIL_PROVIDER);
 
         AuthMethodPickerActivity authMethodPickerActivity =