Allow force NASCAR screen (#1467)

Author: samtstern

auth/src/main/java/com/firebase/ui/auth/AuthUI.java

@@ -1025,6 +1025,7 @@ private abstract class AuthIntentBuilder<T extends AuthIntentBuilder> {
         final List<IdpConfig> mProviders = new ArrayList<>();
         String mTosUrl;
         String mPrivacyPolicyUrl;
+        boolean mAlwaysShowProviderChoice = false;
         boolean mEnableCredentials = true;
         boolean mEnableHints = true;
 
@@ -1156,6 +1157,19 @@ public T setIsSmartLockEnabled(boolean enableCredentials, boolean enableHints) {
             return (T) this;
         }
 
+        /**
+         * Forces the sign-in method choice screen to always show, even if there is only
+         * a single provider configured.
+         * <p>
+         * <p>This is false by default.
+         * @param alwaysShow if true, force the sign-in choice screen to show.
+         */
+        @NonNull
+        public T setAlwaysShowSignInMethodScreen(boolean alwaysShow) {
+            mAlwaysShowProviderChoice = alwaysShow;
+            return (T) this;
+        }
+
         @CallSuper
         @NonNull
         public Intent build() {
@@ -1201,7 +1215,8 @@ protected FlowParameters getFlowParams() {
                     mPrivacyPolicyUrl,
                     mEnableCredentials,
                     mEnableHints,
-                    mEnableAnonymousUpgrade);
+                    mEnableAnonymousUpgrade,
+                    mAlwaysShowProviderChoice);
         }
     }
 }

auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java

@@ -24,7 +24,6 @@
 import android.support.annotation.StyleRes;
 import android.text.TextUtils;
 
-import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.Preconditions;
@@ -59,6 +58,7 @@ public class FlowParameters implements Parcelable {
     public final boolean enableCredentials;
     public final boolean enableHints;
     public final boolean enableAnonymousUpgrade;
+    public final boolean alwaysShowProviderChoice;
 
     public FlowParameters(
             @NonNull String appName,
@@ -69,7 +69,8 @@ public FlowParameters(
             @Nullable String privacyPolicyUrl,
             boolean enableCredentials,
             boolean enableHints,
-            boolean enableAnonymousUpgrade) {
+            boolean enableAnonymousUpgrade,
+            boolean alwaysShowProviderChoice) {
         this.appName = Preconditions.checkNotNull(appName, "appName cannot be null");
         this.providers = Collections.unmodifiableList(
                 Preconditions.checkNotNull(providers, "providers cannot be null"));
@@ -80,6 +81,7 @@ public FlowParameters(
         this.enableCredentials = enableCredentials;
         this.enableHints = enableHints;
         this.enableAnonymousUpgrade = enableAnonymousUpgrade;
+        this.alwaysShowProviderChoice = alwaysShowProviderChoice;
     }
 
     /**
@@ -108,6 +110,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(enableCredentials ? 1 : 0);
         dest.writeInt(enableHints ? 1 : 0);
         dest.writeInt(enableAnonymousUpgrade ? 1 : 0);
+        dest.writeInt(alwaysShowProviderChoice ? 1 : 0);
     }
 
     @Override
@@ -127,6 +130,7 @@ public FlowParameters createFromParcel(Parcel in) {
             boolean enableCredentials = in.readInt() != 0;
             boolean enableHints = in.readInt() != 0;
             boolean enableAnonymousUpgrade = in.readInt() != 0;
+            boolean alwaysShowProviderChoice = in.readInt() != 0;
 
             return new FlowParameters(
                     appName,
@@ -137,7 +141,8 @@ public FlowParameters createFromParcel(Parcel in) {
                     privacyPolicyUrl,
                     enableCredentials,
                     enableHints,
-                    enableAnonymousUpgrade);
+                    enableAnonymousUpgrade,
+                    alwaysShowProviderChoice);
         }
 
         @Override
@@ -162,4 +167,7 @@ public boolean isAnonymousUpgradeEnabled() {
         return enableAnonymousUpgrade;
     }
 
+    public boolean shouldShowProviderChoice() {
+        return !isSingleProviderFlow() || alwaysShowProviderChoice;
+    }
 }

auth/src/main/java/com/firebase/ui/auth/data/remote/SignInKickstarter.java

@@ -96,7 +96,7 @@ public void onComplete(@NonNull Task<CredentialRequestResponse> task) {
 
     private void startAuthMethodChoice() {
         // If there is only one provider selected, launch the flow directly
-        if (getArguments().isSingleProviderFlow()) {
+        if (!getArguments().shouldShowProviderChoice()) {
             AuthUI.IdpConfig firstIdpConfig = getArguments().providers.get(0);
             String firstProvider = firstIdpConfig.getProviderId();
             switch (firstProvider) {

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

@@ -113,7 +113,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         TextView footerText = view.findViewById(R.id.email_footer_tos_and_pp_text);
         FlowParameters flowParameters = getFlowParams();
 
-        if (flowParameters.isSingleProviderFlow()) {
+        if (!flowParameters.shouldShowProviderChoice()) {
             PrivacyDisclosureUtils.setupTermsOfServiceAndPrivacyPolicyText(requireContext(),
                     flowParameters,
                     termsText);

auth/src/main/java/com/firebase/ui/auth/ui/phone/CheckPhoneNumberFragment.java

@@ -173,7 +173,7 @@ private String getPseudoValidPhoneNumber() {
     private void setupPrivacyDisclosures(TextView footerText) {
         FlowParameters params = getFlowParams();
 
-        if (params.isSingleProviderFlow()) {
+        if (!params.shouldShowProviderChoice()) {
             PrivacyDisclosureUtils.setupTermsOfServiceAndPrivacyPolicySmsText(requireContext(),
                     params,
                     mSmsTermsText);

auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java

@@ -142,7 +142,8 @@ public static FlowParameters getFlowParameters(Collection<String> providerIds,
                 null,
                 true,
                 true,
-                enableAnonymousUpgrade);
+                enableAnonymousUpgrade,
+                false);
     }