Use the account selected from the hint picker when signing in with Google

Aaron Mandle · Aaron Mandle · commit b17fe5b9cc3c · 2016-06-03T16:25:06.000-07:00
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java
@@ -73,7 +73,7 @@ public String getProviderId() {
     }
 
     @Override
-    public void startLogin(Activity activity, String email) {
+    public void startLogin(Activity activity) {
         mCallbackManager = CallbackManager.Factory.create();
         LoginManager loginManager = LoginManager.getInstance();
         loginManager.registerCallback(mCallbackManager, this);
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/GoogleProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/GoogleProvider.java
@@ -18,6 +18,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.view.View;
 import android.view.View.OnClickListener;
 
@@ -40,15 +41,19 @@ public class GoogleProvider implements IDPProvider, OnClickListener {
     private Activity mActivity;
     private IDPCallback mIDPCallback;
 
-    public GoogleProvider(Activity activity, IDPProviderParcel parcel) {
+    public GoogleProvider(Activity activity, IDPProviderParcel parcel, @Nullable String email) {
         mActivity = activity;
         String mClientId = parcel.getProviderExtra().getString(CLIENT_ID_KEY);
         GoogleSignInOptions googleSignInOptions;
 
-        googleSignInOptions = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+        GoogleSignInOptions.Builder builder = new GoogleSignInOptions.Builder(GoogleSignInOptions
+                .DEFAULT_SIGN_IN)
                 .requestEmail()
-                .requestIdToken(mClientId)
-                .build();
+                .requestIdToken(mClientId);
+        if (email != null) {
+            builder.setAccountName(email);
+        }
+        googleSignInOptions = builder.build();
 
         mGoogleApiClient = new GoogleApiClient.Builder(activity)
                 .addApi(Auth.GOOGLE_SIGN_IN_API, googleSignInOptions)
@@ -104,7 +109,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     @Override
-    public void startLogin(Activity activity, String mEmail) {
+    public void startLogin(Activity activity) {
         Intent signInIntent = Auth.GoogleSignInApi.getSignInIntent(mGoogleApiClient);
         activity.startActivityForResult(signInIntent, RC_SIGN_IN);
     }
@@ -118,7 +123,7 @@ private void onError(String errorMessage) {
     @Override
     public void onClick(View view) {
         Auth.GoogleSignInApi.signOut(mGoogleApiClient);
-        startLogin(mActivity, null);
+        startLogin(mActivity);
     }
 }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/IDPProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/IDPProvider.java
@@ -32,7 +32,7 @@ public interface IDPProvider {
 
     void onActivityResult(int requestCode, int resultCode, Intent data);
 
-    void startLogin(Activity activity, String mEmail);
+    void startLogin(Activity activity);
 
     public interface IDPCallback {
         public void onSuccess(IDPResponse idpResponse);
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
@@ -68,7 +68,10 @@ protected void onCreate(Bundle savedInstanceState) {
             if (mProviderId.equals(providerParcel.getProviderType())) {
                 switch (mProviderId) {
                     case GoogleAuthProvider.PROVIDER_ID:
-                        mIdpProvider = new GoogleProvider(this, providerParcel);
+                        mIdpProvider = new GoogleProvider(
+                                this,
+                                providerParcel,
+                                getEmailFromIntent());
                         break;
                     case FacebookAuthProvider.PROVIDER_ID:
                         mIdpProvider = new FacebookProvider(this, providerParcel);
@@ -101,7 +104,7 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void onClick(View view) {
                 mActivityHelper.showLoadingDialog(R.string.progress_dialog_signing_in);
-                mIdpProvider.startLogin(WelcomeBackIDPPrompt.this, getEmailFromIntent());
+                mIdpProvider.startLogin(WelcomeBackIDPPrompt.this);
             }
         });
     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
@@ -88,7 +88,7 @@ private void populateIdpList(List<IDPProviderParcel> providers) {
                     mIdpProviders.add(new FacebookProvider(this, providerParcel));
                     break;
                 case GoogleAuthProvider.PROVIDER_ID:
-                    mIdpProviders.add(new GoogleProvider(this, providerParcel));
+                    mIdpProviders.add(new GoogleProvider(this, providerParcel, null));
                     break;
                 case EmailAuthProvider.PROVIDER_ID:
                     findViewById(R.id.email_provider).setVisibility(View.VISIBLE);
@@ -120,7 +120,7 @@ private void populateIdpList(List<IDPProviderParcel> providers) {
                     @Override
                     public void onClick(View view) {
                         mActivityHelper.showLoadingDialog(R.string.progress_dialog_loading);
-                        provider.startLogin(AuthMethodPickerActivity.this, null);
+                        provider.startLogin(AuthMethodPickerActivity.this);
                     }
                 });
                 provider.setAuthenticationCallback(this);
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/IDPSignInContainerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/IDPSignInContainerActivity.java
@@ -62,10 +62,10 @@ protected void onCreate(Bundle savedInstanceState) {
         if (mProvider.equalsIgnoreCase(FacebookAuthProvider.PROVIDER_ID)) {
             mIDPProvider = new FacebookProvider(this, providerParcel);
         } else if (mProvider.equalsIgnoreCase(GoogleAuthProvider.PROVIDER_ID)) {
-            mIDPProvider = new GoogleProvider(this, providerParcel);
+            mIDPProvider = new GoogleProvider(this, providerParcel, mEmail);
         }
         mIDPProvider.setAuthenticationCallback(this);
-        mIDPProvider.startLogin(this, mEmail);
+        mIDPProvider.startLogin(this);
     }
 
     @Override
diff --git a/auth/src/test/java/com/firebase/ui/auth/test_helpers/FacebookProviderShadow.java b/auth/src/test/java/com/firebase/ui/auth/test_helpers/FacebookProviderShadow.java
@@ -50,15 +50,15 @@ public FacebookProviderShadow() {
         }
     }
 
-    public void __constructor__(Activity activity, IDPProviderParcel parcel) {}
+    public void __constructor__(Activity activity, IDPProviderParcel parcel, String email) {}
 
     @Implementation
     public void setAuthenticationCallback(IDPProvider.IDPCallback idpCallback) {
         mCallback = idpCallback;
     }
 
     @Implementation
-    public void startLogin(Activity activity, String email) {
+    public void startLogin(Activity activity) {
         mCallback.onSuccess(mMockIdpResponse);
     }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/test_helpers/GoogleProviderShadow.java b/auth/src/test/java/com/firebase/ui/auth/test_helpers/GoogleProviderShadow.java
@@ -51,7 +51,7 @@ public GoogleProviderShadow() {
         }
     }
 
-    public void __constructor__(Activity activity, IDPProviderParcel parcel) {}
+    public void __constructor__(Activity activity, IDPProviderParcel parcel, String email) {}
 
 
         @Implementation
@@ -60,7 +60,7 @@ public void setAuthenticationCallback(IDPProvider.IDPCallback idpCallback) {
     }
 
     @Implementation
-    public void startLogin(Activity activity, String email) {
+    public void startLogin(Activity activity) {
         mCallback.onSuccess(mMockIdpResponse);
     }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/test_helpers/TestHelper.java b/auth/src/test/java/com/firebase/ui/auth/test_helpers/TestHelper.java
@@ -52,6 +52,7 @@ public static FlowParameters getFlowParameters(Context context, List<String> pro
                 FIREBASE_APP_NAME,
                 ProviderHelper.getProviderParcels(context, providerIds),
                 AuthUI.getDefaultTheme(),
+                AuthUI.NO_LOGO,
                 null
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public String getProviderId() {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`@Override`
`76`		`- public void startLogin(Activity activity, String email) {`
	`76`	`+ public void startLogin(Activity activity) {`
`77`	`77`	`mCallbackManager = CallbackManager.Factory.create();`
`78`	`78`	`LoginManager loginManager = LoginManager.getInstance();`
`79`	`79`	`loginManager.registerCallback(mCallbackManager, this);`
Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,10 @@ protected void onCreate(Bundle savedInstanceState) {`
`62`	`62`	`if (mProvider.equalsIgnoreCase(FacebookAuthProvider.PROVIDER_ID)) {`
`63`	`63`	`mIDPProvider = new FacebookProvider(this, providerParcel);`
`64`	`64`	`} else if (mProvider.equalsIgnoreCase(GoogleAuthProvider.PROVIDER_ID)) {`
`65`		`- mIDPProvider = new GoogleProvider(this, providerParcel);`
	`65`	`+ mIDPProvider = new GoogleProvider(this, providerParcel, mEmail);`
`66`	`66`	`}`
`67`	`67`	`mIDPProvider.setAuthenticationCallback(this);`
`68`		`- mIDPProvider.startLogin(this, mEmail);`
	`68`	`+ mIDPProvider.startLogin(this);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -50,15 +50,15 @@ public FacebookProviderShadow() {`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- public void __constructor__(Activity activity, IDPProviderParcel parcel) {}`
	`53`	`+ public void __constructor__(Activity activity, IDPProviderParcel parcel, String email) {}`
`54`	`54`
`55`	`55`	`@Implementation`
`56`	`56`	`public void setAuthenticationCallback(IDPProvider.IDPCallback idpCallback) {`
`57`	`57`	`mCallback = idpCallback;`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Implementation`
`61`		`- public void startLogin(Activity activity, String email) {`
	`61`	`+ public void startLogin(Activity activity) {`
`62`	`62`	`mCallback.onSuccess(mMockIdpResponse);`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public GoogleProviderShadow() {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- public void __constructor__(Activity activity, IDPProviderParcel parcel) {}`
	`54`	`+ public void __constructor__(Activity activity, IDPProviderParcel parcel, String email) {}`
`55`	`55`
`56`	`56`
`57`	`57`	`@Implementation`
`@@ -60,7 +60,7 @@ public void setAuthenticationCallback(IDPProvider.IDPCallback idpCallback) {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`@Implementation`
`63`		`- public void startLogin(Activity activity, String email) {`
	`63`	`+ public void startLogin(Activity activity) {`
`64`	`64`	`mCallback.onSuccess(mMockIdpResponse);`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ public static FlowParameters getFlowParameters(Context context, List<String> pro`
`52`	`52`	`FIREBASE_APP_NAME,`
`53`	`53`	`ProviderHelper.getProviderParcels(context, providerIds),`
`54`	`54`	`AuthUI.getDefaultTheme(),`
	`55`	`+ AuthUI.NO_LOGO,`
`55`	`56`	`null`
`56`	`57`	`);`
`57`	`58`	`}`