Add option to disable SmartLock

Change-Id: Ibdedc8d4ff0a556e871efb3fac663e1afe9537cf

Author: samtstern

app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

@@ -90,6 +90,8 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.no_logo)
     RadioButton mNoLogo;
 
+    @BindView(R.id.smartlock_enabled)
+    CheckBox mEnableSmartLock;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -129,6 +131,7 @@ public void signIn(View view) {
                         .setLogo(getSelectedLogo())
                         .setProviders(getSelectedProviders())
                         .setTosUrl(getSelectedTosUrl())
+                        .setIsSmartLockEnabled(mEnableSmartLock.isChecked())
                         .build(),
                 RC_SIGN_IN);
     }

app/src/main/res/layout/auth_ui_layout.xml

@@ -12,6 +12,7 @@
         android:layout_marginLeft="24dp"
         android:layout_marginRight="24dp"
         android:layout_marginTop="16dp"
+        android:paddingBottom="32dp"
         android:orientation="vertical">
 
         <TextView
@@ -126,7 +127,6 @@
             android:text="@string/logo_header" />
 
         <RadioGroup
-            android:layout_marginBottom="20dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical">
@@ -150,6 +150,22 @@
                 android:layout_height="wrap_content"
                 android:text="@string/no_logo_label" />
         </RadioGroup>
+
+        <TextView
+            style="@style/Base.TextAppearance.AppCompat.Subhead"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginTop="16dp"
+            android:text="@string/other_options_header" />
+
+        <CheckBox
+            android:id="@+id/smartlock_enabled"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:text="@string/enable_smartlock" />
+
     </LinearLayout>
 
 </ScrollView>

app/src/main/res/values/strings.xml

@@ -40,4 +40,6 @@
     <string name="profile_picture_content_desc">Profile picture</string>
     <string name="default_theme">Default theme</string>
     <string name="configuration_required">Configuration is required - see README.md</string>
+    <string name="other_options_header">Other Options:</string>
+    <string name="enable_smartlock">Enable SmartLock for Passwords</string>
 </resources>

auth/README.md

@@ -130,8 +130,8 @@ startActivityForResult(
     RC_SIGN_IN);
 ```
 
-If Google Sign-in and Facebook Sign-in are also required, then this can be
-replaced with:
+You can enable sign-in providers like Google Sign-In or Facebook Log In by calling the
+`setProviders` method:
 
 ```
 startActivityForResult(
@@ -145,7 +145,7 @@ startActivityForResult(
     RC_SIGN_IN);
 ```
 
-Finally, if a terms of service URL and a custom theme are required:
+If a terms of service URL and a custom theme are required:
 
 ```
 startActivityForResult(
@@ -158,6 +158,33 @@ startActivityForResult(
     RC_SIGN_IN);
 ```
 
+By default, FirebaseUI uses [Smart Lock for Passwords](https://developers.google.com/identity/smartlock-passwords/android/)
+to store the user's credentials and automatically sign users into your app on subsequent attempts.
+Using SmartLock is recommended to provide the best user experience, but in some cases you may want
+to disable SmartLock for testing or development.  To disable SmartLock, you can use the 
+`setIsSmartLockEnabled` method when building your sign-in Intent:
+
+```
+startActivityForResult(
+    AuthUI.getInstance()
+        .createSignInIntentBuilder()
+        .setIsSmartLockEnabled(false)
+        .build(),
+    RC_SIGN_IN);
+```
+
+It is often desirable to disable SmartLock in development but enable it in production. To achieve
+this, you can use the `BuildConfig.DEBUG` flag to control SmartLock:
+
+```
+startActivityForResult(
+    AuthUI.getInstance()
+        .createSignInIntentBuilder()
+        .setIsSmartLockEnabled(!BuildConfig.DEBUG)
+        .build(),
+    RC_SIGN_IN);
+```
+
 #### Handling the sign-in response
 
 The authentication flow provides only two response codes:
@@ -308,4 +335,4 @@ to your application like this:
 ```
 
 Note that if you do not include at least the `email` and `public_profile` scopes, FirebaseUI
-will not work properly.
+will not work properly.

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

@@ -350,6 +350,7 @@ public final class SignInIntentBuilder {
         private int mTheme = getDefaultTheme();
         private List<String> mProviders = Collections.singletonList(EMAIL_PROVIDER);
         private String mTosUrl;
+        private boolean mIsSmartLockEnabled = true;
 
         private SignInIntentBuilder() {}
 
@@ -405,6 +406,14 @@ public SignInIntentBuilder setProviders(@NonNull String... providers) {
             return this;
         }
 
+        /**
+         * Enables or disables the use of Smart Lock for Passwords in the sign in flow.
+         */
+        public SignInIntentBuilder setIsSmartLockEnabled(boolean enabled) {
+            mIsSmartLockEnabled = enabled;
+            return this;
+        }
+
         public Intent build() {
             Context context = mApp.getApplicationContext();
             List<IDPProviderParcel> providerInfo =
@@ -416,7 +425,8 @@ public Intent build() {
                             providerInfo,
                             mTheme,
                             mLogo,
-                            mTosUrl));
+                            mTosUrl,
+                            mIsSmartLockEnabled));
         }
     }
 }

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

@@ -78,10 +78,9 @@ private void startEmailHandler(String email, List<String> providers) {
                     mActivityHelper.getFlowParams(),
                     email);
             mActivityHelper.startActivityForResult(registerIntent, RC_REGISTER_ACCOUNT);
-            return;
         } else {
             // account does exist
-            for (String provider: providers) {
+            for (String provider : providers) {
                 if (provider.equalsIgnoreCase(EmailAuthProvider.PROVIDER_ID)) {
                     Intent signInIntent = SignInActivity.createIntent(
                             mActivityHelper.getApplicationContext(),
@@ -90,6 +89,7 @@ private void startEmailHandler(String email, List<String> providers) {
                     mActivityHelper.startActivityForResult(signInIntent, RC_SIGN_IN);
                     return;
                 }
+
                 Intent intent = WelcomeBackIDPPrompt.createIntent(
                         mActivityHelper.getApplicationContext(),
                         mActivityHelper.getFlowParams(),
@@ -104,7 +104,6 @@ private void startEmailHandler(String email, List<String> providers) {
                     mActivityHelper.getApplicationContext(), SignInActivity.class);
             signInIntent.putExtra(ExtraConstants.EXTRA_EMAIL, email);
             mActivityHelper.startActivityForResult(signInIntent, RC_SIGN_IN);
-            return;
         }
     }
 

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

@@ -20,14 +20,15 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.provider.IDPProviderParcel;
-import com.firebase.ui.auth.ui.email.EmailHintContainerActivity;
 import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
 import com.firebase.ui.auth.ui.idp.IDPSignInContainerActivity;
 import com.firebase.ui.auth.util.CredentialsAPI;
+import com.firebase.ui.auth.util.EmailFlowUtil;
 import com.firebase.ui.auth.util.PlayServicesHelper;
 import com.google.android.gms.auth.api.credentials.Credential;
 import com.google.android.gms.auth.api.credentials.IdentityProviders;
@@ -115,13 +116,16 @@ public void onCredentialsApiConnected(
         String password = credentialsApi.getPasswordFromCredential();
         String accountType = credentialsApi.getAccountTypeFromCredential();
 
-        if (PlayServicesHelper.isPlayServicesAvailable(this)
+        FlowParameters flowParams = activityHelper.getFlowParams();
+
+        if (flowParams.smartLockEnabled
+                && PlayServicesHelper.isPlayServicesAvailable(this)
                 && credentialsApi.isCredentialsAvailable()) {
 
             if (credentialsApi.isAutoSignInAvailable()) {
                 credentialsApi.googleSilentSignIn();
                 // TODO: (serikb) authenticate Firebase user and continue to application
-                if (password != null && !password.isEmpty()) {
+                if (!TextUtils.isEmpty(password)) {
                     // login with username/password
                     activityHelper
                             .getFirebaseAuth()
@@ -151,11 +155,11 @@ public void onSuccess(AuthResult authResult) {
 
     private void startAuthMethodChoice(ActivityHelper activityHelper) {
         List<IDPProviderParcel> providers = activityHelper.getFlowParams().providerInfo;
+
         if (providers.size() == 1
                 && providers.get(0).getProviderType().equals(EmailAuthProvider.PROVIDER_ID)) {
-
             startActivityForResult(
-                    EmailHintContainerActivity.createIntent(
+                    EmailFlowUtil.createIntent(
                             this,
                             activityHelper.getFlowParams()),
                     RC_EMAIL_FLOW);

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

@@ -46,17 +46,21 @@ public class FlowParameters implements Parcelable {
     @Nullable
     public final String termsOfServiceUrl;
 
+    public final boolean smartLockEnabled;
+
     public FlowParameters(
             @NonNull String appName,
             @NonNull List<IDPProviderParcel> providerInfo,
             @StyleRes int themeId,
             @DrawableRes int logoId,
-            @Nullable String termsOfServiceUrl) {
+            @Nullable String termsOfServiceUrl,
+            boolean smartLockEnabled) {
         this.appName = Preconditions.checkNotNull(appName, "appName cannot be null");
         this.providerInfo = Preconditions.checkNotNull(providerInfo, "providerInfo cannot be null");
         this.themeId = themeId;
         this.logoId = logoId;
         this.termsOfServiceUrl = termsOfServiceUrl;
+        this.smartLockEnabled = smartLockEnabled;
     }
 
     @Override
@@ -66,6 +70,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(themeId);
         dest.writeInt(logoId);
         dest.writeString(termsOfServiceUrl);
+        dest.writeInt(smartLockEnabled ? 1 : 0);
     }
 
     @Override
@@ -82,7 +87,11 @@ public FlowParameters createFromParcel(Parcel in) {
             int themeId = in.readInt();
             int logoId = in.readInt();
             String termsOfServiceUrl = in.readString();
-            return new FlowParameters(appName, providerInfo, themeId, logoId, termsOfServiceUrl);
+            int smartLockEnabledInt = in.readInt();
+            boolean smartLockEnabled = (smartLockEnabledInt != 0);
+
+            return new FlowParameters(
+                    appName, providerInfo, themeId, logoId, termsOfServiceUrl, smartLockEnabled);
         }
 
         @Override

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

@@ -40,7 +40,6 @@ protected void onCreate(Bundle savedInstanceState) {
                 FirebaseAuthWrapperFactory.getFirebaseAuthWrapper(mActivityHelper.getAppName());
 
         PendingIntent hintIntent = apiWrapper.getEmailHintIntent(this);
-
         if (hintIntent != null) {
             try {
                 startIntentSenderForResult(hintIntent.getIntentSender(), RC_HINT, null, 0, 0, 0);
@@ -69,7 +68,6 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                 return;
             }
             mAcquireEmailHelper.checkAccountExists(credential.getId());
-            return;
         } else {
             mAcquireEmailHelper.onActivityResult(requestCode, resultCode, data);
         }

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

@@ -35,6 +35,7 @@
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.EmailHintContainerActivity;
+import com.firebase.ui.auth.util.EmailFlowUtil;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FacebookAuthProvider;
@@ -68,9 +69,12 @@ public class AuthMethodPickerActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.auth_method_picker_layout);
+
         Button emailButton = (Button) findViewById(R.id.email_provider);
         emailButton.setOnClickListener(this);
+
         populateIdpList(mActivityHelper.getFlowParams().providerInfo);
+
         int logoId = mActivityHelper.getFlowParams().logoId;
         ImageView logo = (ImageView) findViewById(R.id.logo);
         if (logoId == AuthUI.NO_LOGO) {
@@ -173,7 +177,7 @@ public void onFailure(Bundle extra) {
     @Override
     public void onClick(View view) {
         if (view.getId() == R.id.email_provider) {
-            Intent intent = EmailHintContainerActivity.createIntent(
+            Intent intent = EmailFlowUtil.createIntent(
                     this,
                     mActivityHelper.getFlowParams());
             startActivityForResult(intent, RC_EMAIL_FLOW);