Merge branch 'version-9.1.0-dev' into feat/edge-to-edge

Author: Lyokone

README.md

@@ -48,16 +48,16 @@ libraries.
 ```groovy
 dependencies {
     // FirebaseUI for Firebase Realtime Database
-    implementation 'com.firebaseui:firebase-ui-database:8.0.2'
+    implementation 'com.firebaseui:firebase-ui-database:9.0.0'
 
     // FirebaseUI for Cloud Firestore
-    implementation 'com.firebaseui:firebase-ui-firestore:8.0.2'
+    implementation 'com.firebaseui:firebase-ui-firestore:9.0.0'
 
     // FirebaseUI for Firebase Auth
-    implementation 'com.firebaseui:firebase-ui-auth:8.0.2'
+    implementation 'com.firebaseui:firebase-ui-auth:9.0.0'
 
     // FirebaseUI for Cloud Storage
-    implementation 'com.firebaseui:firebase-ui-storage:8.0.2'
+    implementation 'com.firebaseui:firebase-ui-storage:9.0.0'
 }
 ```
 
@@ -71,6 +71,7 @@ After the project is synchronized, we're ready to start using Firebase functiona
 If you are using an old version of FirebaseUI and upgrading, please see the appropriate
 migration guide:
 
+* [Upgrade from 8.0.2 to 9.x.x](./docs/upgrade-to-9.0.md)
 * [Upgrade from 7.2.0 to 8.x.x](./docs/upgrade-to-8.0.md)
 * [Upgrade from 6.4.0 to 7.x.x](./docs/upgrade-to-7.0.md)
 * [Upgrade from 5.1.0 to 6.x.x](./docs/upgrade-to-6.0.md)

app/build.gradle.kts

@@ -10,7 +10,7 @@ android {
     namespace = "com.firebase.uidemo"
 
     defaultConfig {
-        minSdk = Config.SdkVersions.min
+        minSdk = 23
         targetSdk = Config.SdkVersions.target
 
         versionName = Config.version

auth/README.md

@@ -13,7 +13,7 @@ providers such as Google Sign-In, and Facebook Login. It is built on top of
 
 The best practices embodied in FirebaseUI aim to maximize sign-in
 and sign-up conversion for your app. It integrates with
-[Smart Lock for Passwords](https://developers.google.com/identity/smartlock-passwords/android/)
+[Credential Manager](https://developer.android.com/identity/sign-in/credential-manager)
 to store and retrieve credentials, enabling automatic and single-tap sign-in to
 your app for returning users. It also handles tricky use cases like
 account recovery and account linking that are security sensitive and
@@ -38,7 +38,6 @@ and [Web](https://github.com/firebase/firebaseui-web/).
 1. [Usage instructions](#using-firebaseui-for-authentication)
    1. [AuthUI sign-in](#authui-sign-in)
    1. [Handling responses](#handling-the-sign-in-response)
-   1. [Silent sign-in](#silent-sign-in)
    1. [Sign out](#sign-out)
    1. [Account deletion](#deleting-accounts)
    1. [Upgrading Anonymous Users](#upgrading-anonymous-users)
@@ -65,7 +64,7 @@ Gradle, add the dependency:
 ```groovy
 dependencies {
     // ...
-    implementation 'com.firebaseui:firebase-ui-auth:8.0.2'
+    implementation 'com.firebaseui:firebase-ui-auth:9.0.0'
 
     // Required only if Facebook login support is required
     // Find the latest Facebook SDK releases here: https://github.com/facebook/facebook-android-sdk/blob/master/CHANGELOG.md
@@ -406,45 +405,19 @@ Intent signInIntent =
         .build();
 ```
 
-##### Smart Lock
+##### Credential Manager
 
-By default, FirebaseUI uses [Smart Lock for Passwords](https://developers.google.com/identity/smartlock-passwords/android/)
+By default, FirebaseUI uses [Credential Manager](https://developer.android.com/identity/sign-in/credential-manager)
 to store the user's credentials and automatically sign users into your app on subsequent attempts.
-Using Smart Lock is recommended to provide the best user experience, but in some cases you may want
-to disable Smart Lock for testing or development. To disable Smart Lock, you can use the
-`setIsSmartLockEnabled` method when building your sign-in Intent:
+Using Credential Manager is recommended to provide the best user experience, but in some cases you may want
+to disable Credential Manager for testing or development. To disable Credential Manager, you can use the
+`setCredentialManagerEnabled` method when building your sign-in Intent:
 
 ```java
 Intent signInIntent =
     AuthUI.getInstance()
         .createSignInIntentBuilder()
-        .setIsSmartLockEnabled(false)
-        .build();
-```
-
-###### Smart Lock hints
-
-If you'd like to keep Smart Lock's "hints" but disable the saving/retrieving of credentials, then
-you can use the two-argument version of `setIsSmartLockEnabled`:
-
-```java
-Intent signInIntent =
-    AuthUI.getInstance()
-        .createSignInIntentBuilder()
-        .setIsSmartLockEnabled(false, true)
-        .build();
-```
-
-###### Smart Lock in dev builds
-
-It is often desirable to disable Smart Lock in development but enable it in production. To achieve
-this, you can use the `BuildConfig.DEBUG` flag to control Smart Lock:
-
-```java
-Intent signInIntent =
-    AuthUI.getInstance()
-        .createSignInIntentBuilder()
-        .setIsSmartLockEnabled(!BuildConfig.DEBUG /* credentials */, true /* hints */)
+        .setCredentialManagerEnabled(false)
         .build();
 ```
 
@@ -603,48 +576,13 @@ if (metadata.getCreationTimestamp() == metadata.getLastSignInTimestamp()) {
 }
 ```
 
-### Silent sign-in
-
-If a user is not currently signed in, then a silent sign-in process can be started first before
-displaying any UI to provide a seamless experience. Silent sign-in uses saved Smart Lock credentials
-and returns a successful `Task` only if the user has been fully signed in with Firebase.
-
-Here's an example of how you could use silent sign-in paired with Firebase anonymous sign-in to get
-your users up and running as fast as possible:
-
-```java
-List<IdpConfig> providers = getSelectedProviders();
-AuthUI.getInstance().silentSignIn(this, providers)
-        .continueWithTask(this, new Continuation<AuthResult, Task<AuthResult>>() {
-    @Override
-    public Task<AuthResult> then(@NonNull Task<AuthResult> task) {
-        if (task.isSuccessful()) {
-            return task;
-        } else {
-            // Ignore any exceptions since we don't care about credential fetch errors.
-            return FirebaseAuth.getInstance().signInAnonymously();
-        }
-    }
-}).addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
-    @Override
-    public void onComplete(@NonNull Task<AuthResult> task) {
-        if (task.isSuccessful()) {
-            // Signed in! Start loading data
-        } else {
-            // Uh oh, show error message
-        }
-    }
-});
-```
-
 ### Sign out
 
 With the integrations provided by AuthUI, signing out a user is a multi-stage process:
 
 1. The user must be signed out of the FirebaseAuth instance.
-1. Smart Lock for Passwords must be instructed to disable automatic sign-in, in
-   order to prevent an automatic sign-in loop that prevents the user from
-   switching accounts.
+1. Credential Manager must be instructed to clear the current user credential state from
+   all credential providers.
 1. If the current user signed in using either Google or Facebook, the user must
    also be signed out using the associated API for that authentication method.
    This typically ensures that the user will not be automatically signed-in
@@ -677,7 +615,7 @@ if (v.getId() == R.id.sign_out) {
 With the integrations provided by FirebaseUI Auth, deleting a user is a multi-stage process:
 
 1. The user must be deleted from Firebase Auth.
-1. Smart Lock for Passwords must be told to delete any existing Credentials for the user, so
+1. Credential Manager must be told to delete any existing Credentials for the user, so
    that they are not automatically prompted to # with a saved credential in the future.
 
 This process is encapsulated by the `AuthUI.delete()` method, which returns a `Task` representing

auth/build.gradle.kts

@@ -11,8 +11,9 @@ android {
     namespace = "com.firebase.ui.auth"
 
     defaultConfig {
-        minSdk = Config.SdkVersions.min
-        targetSdk =Config.SdkVersions.target
+        // Auth requires a higher minSdk than the current Config.SdkVersions.min
+        minSdk = 23
+        targetSdk = Config.SdkVersions.target
 
         buildConfigField("String", "VERSION_NAME", "\"${Config.version}\"")
 

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

@@ -17,15 +17,14 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.CancellationSignal;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.text.TextUtils;
 import android.util.Log;
 
 import com.facebook.login.LoginManager;
 import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
-import com.firebase.ui.auth.util.CredentialUtils;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.GoogleApiUtils;
 import com.firebase.ui.auth.util.Preconditions;
@@ -35,26 +34,22 @@
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
-import com.google.android.gms.common.api.ApiException;
 import com.google.android.gms.common.api.CommonStatusCodes;
 import com.google.android.gms.common.api.Scope;
 import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.ActionCodeSettings;
-import com.google.firebase.auth.AuthCredential;
-import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthInvalidUserException;
-import com.google.firebase.auth.FirebaseAuthProvider;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GithubAuthProvider;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.PhoneAuthProvider;
 import com.google.firebase.auth.TwitterAuthProvider;
-import com.google.firebase.auth.UserInfo;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -68,6 +63,8 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.DrawableRes;
@@ -76,6 +73,9 @@
 import androidx.annotation.RestrictTo;
 import androidx.annotation.StringDef;
 import androidx.annotation.StyleRes;
+import androidx.credentials.ClearCredentialStateRequest;
+import androidx.credentials.CredentialManagerCallback;
+import androidx.credentials.exceptions.ClearCredentialException;
 
 /**
  * The entry point to the AuthUI authentication flow, and related utility methods. If your
@@ -280,8 +280,9 @@ public Task<Void> signOut(@NonNull Context context) {
         if (!playServicesAvailable) {
             Log.w(TAG, "Google Play services not available during signOut");
         }
-
-        return signOutIdps(context).continueWith(task -> {
+        signOutIdps(context);
+        Executor singleThreadExecutor = Executors.newSingleThreadExecutor();
+        return clearCredentialState(context, singleThreadExecutor).continueWith(task -> {
             task.getResult(); // Propagate exceptions if any.
             mAuth.signOut();
             return null;
@@ -303,9 +304,10 @@ public Task<Void> delete(@NonNull final Context context) {
                     String.valueOf(CommonStatusCodes.SIGN_IN_REQUIRED),
                     "No currently signed in user."));
         }
-
-        return signOutIdps(context).continueWithTask(task -> {
-            task.getResult(); // Propagate exception if there was one.
+        signOutIdps(context);
+        Executor singleThreadExecutor = Executors.newSingleThreadExecutor();
+        return clearCredentialState(context, singleThreadExecutor).continueWithTask(task -> {
+            task.getResult(); // Propagate exceptions if any.
             return currentUser.delete();
         });
     }
@@ -338,15 +340,43 @@ public int getEmulatorPort() {
         return mEmulatorPort;
     }
 
-    private Task<Void> signOutIdps(@NonNull Context context) {
+    private void signOutIdps(@NonNull Context context) {
         if (ProviderAvailability.IS_FACEBOOK_AVAILABLE) {
             LoginManager.getInstance().logOut();
         }
-        if (GoogleApiUtils.isPlayServicesAvailable(context)) {
-            return GoogleSignIn.getClient(context, GoogleSignInOptions.DEFAULT_SIGN_IN).signOut();
-        } else {
-            return Tasks.forResult((Void) null);
-        }
+    }
+
+    /**
+     * A Task to clear the credential state in Credential Manager.
+     * @param context
+     * @param executor
+     * @return
+     */
+    private Task<Void> clearCredentialState(
+            @NonNull Context context,
+            @NonNull Executor executor
+    ) {
+        TaskCompletionSource<Void> completionSource = new TaskCompletionSource<>();
+
+        ClearCredentialStateRequest clearRequest = new ClearCredentialStateRequest();
+        GoogleApiUtils.getCredentialManager(context)
+                .clearCredentialStateAsync(
+                        clearRequest,
+                        new CancellationSignal(),
+                        executor,
+                        new CredentialManagerCallback<>() {
+                            @Override
+                            public void onResult(Void unused) {
+                                completionSource.setResult(unused);
+                            }
+
+                            @Override
+                            public void onError(@NonNull ClearCredentialException e) {
+                                completionSource.setException(e);
+                            }
+                        }
+                );
+        return completionSource.getTask();
     }
 
     /**

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

@@ -95,6 +95,11 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         mSignInButton.setOnClickListener(this);
         m#Button.setOnClickListener(this);
 
+        // Hide # button for email link authentication
+        if (getEmailProvider().equals(EmailAuthProvider.EMAIL_LINK_SIGN_IN_METHOD)) {
+            m#Button.setVisibility(View.GONE);
+        }
+
         TextView termsText = view.findViewById(R.id.email_tos_and_pp_text);
         TextView footerText = view.findViewById(R.id.email_footer_tos_and_pp_text);
         FlowParameters flowParameters = getFlowParams();

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

@@ -86,6 +86,7 @@ import androidx.credentials.exceptions.GetCredentialException
 import com.firebase.ui.auth.AuthUI.EMAIL_LINK_PROVIDER
 import com.firebase.ui.auth.util.ExtraConstants.GENERIC_OAUTH_BUTTON_ID
 import com.firebase.ui.auth.util.ExtraConstants.GENERIC_OAUTH_PROVIDER_ID
+import com.firebase.ui.auth.util.GoogleApiUtils
 import com.google.android.libraries.identity.googleid.GetGoogleIdOption
 import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
 import com.google.android.libraries.identity.googleid.GoogleIdTokenParsingException
@@ -105,7 +106,7 @@ class AuthMethodPickerActivity : AppCompatBase() {
     // For demonstration, assume that CredentialManager provides a create() method.
     private val credentialManager by lazy {
         // Replace with your actual CredentialManager instance creation.
-        CredentialManager.create(this)
+        GoogleApiUtils.getCredentialManager(this)
     }
 
     companion object {

auth/src/main/java/com/firebase/ui/auth/util/GoogleApiUtils.java

@@ -9,6 +9,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
+import androidx.credentials.CredentialManager;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public final class GoogleApiUtils {
@@ -25,4 +26,9 @@ public static boolean isPlayServicesAvailable(@NonNull Context context) {
     public static SignInClient getSignInClient(@NonNull Context context) {
         return Identity.getSignInClient(context);
     }
+
+    @NonNull
+    public static CredentialManager getCredentialManager(@NonNull Context context) {
+        return CredentialManager.create(context);
+    }
 }

auth/src/main/java/com/firebase/ui/auth/viewmodel/credentialmanager/CredentialManagerHandler.kt

@@ -18,7 +18,7 @@ import kotlinx.coroutines.launch
 class CredentialManagerHandler(application: Application) :
     AuthViewModelBase<IdpResponse>(application) {
 
-    private val credentialManager = CredentialManager.create(application)
+    private val credentialManager = GoogleApiUtils.getCredentialManager(application)
     private var response: IdpResponse? = null
 
     fun setResponse(newResponse: IdpResponse) {

buildSrc/src/main/kotlin/Config.kt

@@ -1,5 +1,5 @@
 object Config {
-    const val version = "8.0.2"
+    const val version = "9.1.0-SNAPSHOT"
     val submodules = listOf("auth", "common", "firestore", "database", "storage")
 
     private const val kotlinVersion = "2.1.0"
@@ -53,7 +53,7 @@ object Config {
         }
 
         object PlayServices {
-            const val auth = "com.google.android.gms:play-services-auth:20.3.0"
+            const val auth = "com.google.android.gms:play-services-auth:21.3.0"
         }
 
         object Provider {