Replace Firebase AuthUI with credential manager

DeweyReed · DeweyReed · commit 95cb2100d85e · 2025-02-22T17:06:50.000+08:00
diff --git a/app/dependencies/googleReleaseRuntimeClasspath.txt b/app/dependencies/googleReleaseRuntimeClasspath.txt
@@ -26,7 +26,6 @@ androidx.appcompat:appcompat-resources:1.7.0
 androidx.appcompat:appcompat:1.7.0
 androidx.arch.core:core-common:2.2.0
 androidx.arch.core:core-runtime:2.2.0
-androidx.asynclayoutinflater:asynclayoutinflater:1.0.0
 androidx.autofill:autofill:1.0.0
 androidx.browser:browser:1.8.0
 androidx.cardview:cardview:1.0.0
@@ -76,8 +75,8 @@ androidx.constraintlayout:constraintlayout:2.1.4
 androidx.coordinatorlayout:coordinatorlayout:1.1.0
 androidx.core:core-ktx:1.13.1
 androidx.core:core:1.13.1
-androidx.credentials:credentials-play-services-auth:1.2.0-rc01
-androidx.credentials:credentials:1.2.0-rc01
+androidx.credentials:credentials-play-services-auth:1.3.0
+androidx.credentials:credentials:1.3.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview-poolingcontainer:1.0.0
 androidx.customview:customview:1.1.0
@@ -99,13 +98,10 @@ androidx.hilt:hilt-navigation-fragment:1.2.0
 androidx.hilt:hilt-navigation:1.2.0
 androidx.hilt:hilt-work:1.2.0
 androidx.interpolator:interpolator:1.0.0
-androidx.legacy:legacy-support-core-ui:1.0.0
 androidx.legacy:legacy-support-core-utils:1.0.0
-androidx.legacy:legacy-support-v4:1.0.0
 androidx.lifecycle:lifecycle-common-java8:2.8.3
 androidx.lifecycle:lifecycle-common-jvm:2.8.3
 androidx.lifecycle:lifecycle-common:2.8.3
-androidx.lifecycle:lifecycle-extensions:2.2.0
 androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.3
 androidx.lifecycle:lifecycle-livedata-core:2.8.3
 androidx.lifecycle:lifecycle-livedata-ktx:2.8.3
@@ -160,7 +156,6 @@ com.afollestad.material-dialogs:commons:0.9.6.0
 com.afollestad.material-dialogs:core:0.9.6.0
 com.android.billingclient:billing-ktx:6.2.0
 com.android.billingclient:billing:6.2.0
-com.firebaseui:firebase-ui-auth:8.0.2
 com.github.Carbs0126:NumberPickerView:642c376
 com.github.DeweyReed:ChromeMenu:0.2.0
 com.github.DeweyReed:HmsPickerView:0.2.0
@@ -181,20 +176,20 @@ com.google.android.datatransport:transport-backend-cct:3.3.0
 com.google.android.datatransport:transport-runtime:3.3.0
 com.google.android.flexbox:flexbox:3.0.0
 com.google.android.gms:play-services-auth-api-phone:18.0.2
-com.google.android.gms:play-services-auth-base:18.0.4
-com.google.android.gms:play-services-auth:20.7.0
+com.google.android.gms:play-services-auth-base:18.0.10
+com.google.android.gms:play-services-auth:21.1.1
 com.google.android.gms:play-services-base:18.3.0
-com.google.android.gms:play-services-basement:18.3.0
-com.google.android.gms:play-services-fido:20.1.0
+com.google.android.gms:play-services-basement:18.4.0
+com.google.android.gms:play-services-fido:21.0.0
 com.google.android.gms:play-services-location:19.0.0
 com.google.android.gms:play-services-places-placereport:17.0.0
-com.google.android.gms:play-services-tasks:18.1.0
-com.google.android.libraries.identity.googleid:googleid:1.1.0
+com.google.android.gms:play-services-tasks:18.2.0
+com.google.android.libraries.identity.googleid:googleid:1.1.1
 com.google.android.material:material:1.4.0
-com.google.android.play:core-common:2.0.2
+com.google.android.play:core-common:2.0.4
 com.google.android.play:integrity:1.2.0
-com.google.android.play:review-ktx:2.0.1
-com.google.android.play:review:2.0.1
+com.google.android.play:review-ktx:2.0.2
+com.google.android.play:review:2.0.2
 com.google.android.recaptcha:recaptcha:18.4.0
 com.google.code.findbugs:jsr305:3.0.2
 com.google.dagger:dagger-lint-aar:2.52
@@ -206,12 +201,14 @@ com.google.firebase:firebase-annotations:16.2.0
 com.google.firebase:firebase-appcheck-interop:17.1.0
 com.google.firebase:firebase-appcheck:18.0.0
 com.google.firebase:firebase-auth-interop:20.0.0
+com.google.firebase:firebase-auth-ktx:23.0.0
 com.google.firebase:firebase-auth:23.0.0
 com.google.firebase:firebase-bom:33.2.0
 com.google.firebase:firebase-common-ktx:21.0.0
 com.google.firebase:firebase-common:21.0.0
 com.google.firebase:firebase-components:18.0.0
 com.google.firebase:firebase-config-interop:16.0.1
+com.google.firebase:firebase-crashlytics-ktx:19.0.3
 com.google.firebase:firebase-crashlytics:19.0.3
 com.google.firebase:firebase-datatransport:19.0.0
 com.google.firebase:firebase-encoders-json:18.0.1
@@ -221,6 +218,7 @@ com.google.firebase:firebase-installations-interop:17.2.0
 com.google.firebase:firebase-installations:18.0.0
 com.google.firebase:firebase-measurement-connector:20.0.1
 com.google.firebase:firebase-sessions:2.0.3
+com.google.firebase:firebase-storage-ktx:21.0.0
 com.google.firebase:firebase-storage:21.0.0
 com.google.guava:listenablefuture:1.0
 com.jakewharton.timber:timber:5.0.1
diff --git a/flavor-google/build.gradle b/flavor-google/build.gradle
@@ -28,11 +28,9 @@ dependencies {
     implementation libs.billing
 
     implementation platform(libs.firebase.bom)
-    implementation libs.firebase.auth
-    implementation libs.firebase.auth.ui
+    implementation libs.bundles.firebase.auth
     implementation libs.firebase.storage
     implementation libs.firebase.crashlytics
-    implementation libs.playServices.auth
     implementation libs.playServices.review
 
     implementation libs.fastAdapter
diff --git a/flavor-google/src/main/java/xyz/aprildown/timer/flavor/google/backup/CloudBackupFragment.kt b/flavor-google/src/main/java/xyz/aprildown/timer/flavor/google/backup/CloudBackupFragment.kt
@@ -1,6 +1,5 @@
 package xyz.aprildown.timer.flavor.google.backup
 
-import android.app.Activity
 import android.content.Context
 import android.content.SharedPreferences
 import android.graphics.Typeface
@@ -9,11 +8,12 @@ import android.os.CountDownTimer
 import android.text.Spanned
 import android.text.style.StyleSpan
 import android.view.View
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.ActivityResultCallback
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.text.buildSpannedString
+import androidx.credentials.ClearCredentialStateRequest
+import androidx.credentials.CredentialManager
+import androidx.credentials.CustomCredential
+import androidx.credentials.GetCredentialRequest
 import androidx.hilt.navigation.fragment.hiltNavGraphViewModels
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
@@ -22,26 +22,27 @@ import androidx.navigation.fragment.findNavController
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreferenceCompat
-import com.firebase.ui.auth.AuthUI
 import com.github.deweyreed.tools.anko.longSnackbar
 import com.github.deweyreed.tools.anko.newTask
 import com.github.deweyreed.tools.anko.snackbar
 import com.github.deweyreed.tools.arch.observeEvent
 import com.github.deweyreed.tools.helper.IntentHelper
 import com.github.deweyreed.tools.helper.createChooserIntentIfDead
 import com.github.deweyreed.tools.helper.startActivityOrNothing
+import com.google.android.libraries.identity.googleid.GetSignInWithGoogleOption
+import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.firebase.auth.GoogleAuthProvider
 import com.google.firebase.auth.ktx.auth
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.storage.ktx.storage
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
 import xyz.aprildown.timer.app.base.data.FlavorData
 import xyz.aprildown.timer.app.base.utils.NavigationUtils.subLevelNavigate
 import xyz.aprildown.timer.domain.usecases.Fruit
-import xyz.aprildown.timer.domain.utils.AppConfig
-import xyz.aprildown.timer.domain.utils.Constants
 import xyz.aprildown.timer.flavor.google.BillingActivity
 import xyz.aprildown.timer.flavor.google.R
 import xyz.aprildown.timer.flavor.google.backup.usecases.AutoCloudBackup
@@ -53,6 +54,7 @@ import xyz.aprildown.timer.flavor.google.showErrorDialog
 import xyz.aprildown.timer.flavor.google.utils.IapPromotionDialog
 import xyz.aprildown.timer.flavor.google.utils.causeFirstMessage
 import xyz.aprildown.tools.helper.safeSharedPreference
+import java.util.UUID
 import javax.inject.Inject
 import xyz.aprildown.timer.app.base.R as RBase
 
@@ -75,11 +77,6 @@ internal class CloudBackupFragment : PreferenceFragmentCompat() {
 
     private var manualBackupDialog: AlertDialog? = null
 
-    private val signInLauncher = registerForActivityResult(
-        ActivityResultContracts.StartActivityForResult(),
-        getSignInResultCallback()
-    )
-
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.pref_cloud_back, rootKey)
     }
@@ -285,33 +282,41 @@ internal class CloudBackupFragment : PreferenceFragmentCompat() {
     }
 
     private fun launchSignInFlow() {
-        signInLauncher.launch(
-            AuthUI.getInstance()
-                .createSignInIntentBuilder()
-                .setLogo(RBase.mipmap.app_icon_square)
-                .setTosAndPrivacyPolicyUrls(
-                    Constants.getTermsOfServiceLink(),
-                    Constants.getPrivacyPolicyLink()
-                )
-                .setAvailableProviders(
-                    mutableListOf<AuthUI.IdpConfig>().apply {
-                        add(AuthUI.IdpConfig.GoogleBuilder().build())
-                        if (AppConfig.openDebug) {
-                            add(AuthUI.IdpConfig.EmailBuilder().build())
-                        }
+        val context = requireContext()
+        lifecycleScope.launch {
+            try {
+                val result = CredentialManager.create(context)
+                    .getCredential(
+                        context,
+                        GetCredentialRequest.Builder()
+                            .addCredentialOption(
+                                GetSignInWithGoogleOption.Builder(
+                                    context.getString(R.string.default_web_client_id)
+                                )
+                                    .setNonce(UUID.randomUUID().toString())
+                                    .build()
+                            )
+                            .build()
+                    )
+                val credential = result.credential
+                if (credential is CustomCredential &&
+                    credential.type == GoogleIdTokenCredential.TYPE_GOOGLE_ID_TOKEN_CREDENTIAL
+                ) {
+                    val googleIdTokenCredential =
+                        GoogleIdTokenCredential.createFrom(credential.data)
+                    val idToken = googleIdTokenCredential.idToken
+                    Firebase.auth.signInWithCredential(
+                        GoogleAuthProvider.getCredential(idToken, null)
+                    ).await()
+                    onAccountPaymentChanged()
+                    if (Firebase.auth.currentUser != null) {
+                        viewModel.tryToSetUpForNewSubscriber()
                     }
-                )
-                .build()
-        )
-    }
-
-    private fun getSignInResultCallback(): ActivityResultCallback<ActivityResult> {
-        return ActivityResultCallback { result ->
-            if (result.resultCode == Activity.RESULT_OK) {
-                onAccountPaymentChanged()
-                if (Firebase.auth.currentUser != null) {
-                    viewModel.tryToSetUpForNewSubscriber()
                 }
+            } catch (e: Exception) {
+                ensureActive()
+                e.printStackTrace()
+                requireView().longSnackbar(e.localizedMessage?.toString().toString())
             }
         }
     }
@@ -345,7 +350,10 @@ internal class CloudBackupFragment : PreferenceFragmentCompat() {
                     .show()
                 viewLifecycleOwner.lifecycleScope.launch {
                     try {
-                        AuthUI.getInstance().signOut(context).await()
+                        Firebase.auth.signOut()
+                        CredentialManager.create(context).clearCredentialState(
+                            ClearCredentialStateRequest()
+                        )
                         CloudBackup.cancel(context, currentBackupState)
                         onAccountPaymentChanged()
                     } catch (e: Exception) {
@@ -395,7 +403,10 @@ internal class CloudBackupFragment : PreferenceFragmentCompat() {
 
             viewLifecycleOwner.lifecycleScope.launch {
                 try {
-                    AuthUI.getInstance().delete(context).await()
+                    Firebase.auth.currentUser?.delete()?.await()
+                    CredentialManager.create(context).clearCredentialState(
+                        ClearCredentialStateRequest()
+                    )
                     CloudBackup.cancel(context, currentBackupState)
                     onAccountPaymentChanged()
                 } catch (e: Exception) {
diff --git a/flavor-google/src/main/res/values/strings.xml b/flavor-google/src/main/res/values/strings.xml
@@ -13,4 +13,6 @@
 
     <string name="backup_key_auto_cloud_backup" translatable="false">pref_auto_cloud_backup</string>
 
+    <string name="default_web_client_id" />
+
 </resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -87,6 +87,9 @@ androidx-navigation-ui = "androidx.navigation:navigation-ui-ktx:2.7.7"
 
 androidx-work = "androidx.work:work-runtime-ktx:2.9.0"
 
+androidx-crendential-core = "androidx.credentials:credentials:1.3.0"
+androidx-crendential-play = "androidx.credentials:credentials-play-services-auth:1.3.0"
+
 compose-bom = "androidx.compose:compose-bom:2024.06.00"
 compose-material = { module = "androidx.compose.material3:material3" }
 compose-icons = { module = "androidx.compose.material:material-icons-extended" }
@@ -112,12 +115,11 @@ moshi-kotlinGen = "com.squareup.moshi:moshi-kotlin-codegen:1.15.1"
 
 billing = "com.android.billingclient:billing-ktx:6.2.0"
 firebase_bom = "com.google.firebase:firebase-bom:33.2.0"
-firebase_auth = { module = "com.google.firebase:firebase-auth" }
-firebase_auth_ui = "com.firebaseui:firebase-ui-auth:8.0.2"
-firebase_storage = { module = "com.google.firebase:firebase-storage" }
-firebase_crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
-playServices_auth = "com.google.android.gms:play-services-auth:20.7.0"
-playServices_review = "com.google.android.play:review-ktx:2.0.1"
+firebase_auth = { module = "com.google.firebase:firebase-auth-ktx" }
+firebase_storage = { module = "com.google.firebase:firebase-storage-ktx" }
+firebase_crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx" }
+playServices_googleId = "com.google.android.libraries.identity.googleid:googleid:1.1.1"
+playServices_review = "com.google.android.play:review-ktx:2.0.2"
 
 androidJob = "com.github.DeweyReed:android-job:a04c817792"
 okio = "com.squareup.okio:okio:3.9.0"
@@ -173,3 +175,9 @@ compose = [
     "compose-liveData",
     "compose-constraintLayout",
 ]
+firebase-auth = [
+    "firebase_auth",
+    "androidx-crendential-core",
+    "androidx-crendential-play",
+    "playServices_googleId",
+]
