Skip to content

Audit for missed instances of Twitter #366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 19, 2016
Merged

Audit for missed instances of Twitter #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions auth/src/main/java/com/firebase/ui/auth/ui/AuthCredentialHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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;
}
Expand Down
5 changes: 5 additions & 0 deletions auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIdpPrompt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down Expand Up @@ -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());
Expand Down
2 changes: 2 additions & 0 deletions auth/src/main/java/com/firebase/ui/auth/util/CredentialsApiHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
1 change: 1 addition & 0 deletions auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down