fix: linking credential hangs AuthState

Author: demolaf

auth/src/main/java/com/firebase/ui/auth/compose/FirebaseAuthUI.kt

@@ -29,9 +29,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.drop
-import kotlinx.coroutines.flow.merge
-import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.tasks.await
 import java.util.concurrent.ConcurrentHashMap
 
@@ -221,7 +218,7 @@ class FirebaseAuthUI private constructor(
         ) { firebaseState, internalState ->
             // Prefer non-idle internal states (like PasswordResetLinkSent, Error, etc.)
             if (internalState !is AuthState.Idle) internalState else firebaseState
-        }
+        }.distinctUntilChanged()
     }
 
     /**

auth/src/main/java/com/firebase/ui/auth/compose/configuration/auth_provider/EmailAuthProvider+FirebaseAuthUI.kt

@@ -338,20 +338,25 @@ internal suspend fun FirebaseAuthUI.signInWithEmailAndPassword(
         } else {
             // Normal sign-in
             auth.signInWithEmailAndPassword(email, password).await()
-                .also { result ->
+                .let { result ->
                     // If there's a credential to link, link it after sign-in
                     if (credentialForLinking != null) {
-                        return result.user?.linkWithCredential(credentialForLinking)?.await()
-                            .also { linkResult ->
-                                // Merge profile from social provider
-                                linkResult?.user?.let { user ->
-                                    mergeProfile(
-                                        auth,
-                                        user.displayName,
-                                        user.photoUrl
-                                    )
-                                }
-                            }
+                        val linkResult = result.user
+                            ?.linkWithCredential(credentialForLinking)
+                            ?.await()
+
+                        // Merge profile from social provider
+                        linkResult?.user?.let { user ->
+                            mergeProfile(
+                                auth,
+                                user.displayName,
+                                user.photoUrl
+                            )
+                        }
+
+                        linkResult ?: result
+                    } else {
+                        result
                     }
                 }
         }.also {
@@ -773,7 +778,7 @@ suspend fun FirebaseAuthUI.signInWithEmailLink(
                     .getInstance(appExplicitlyForValidation)
 
                 // Safe link: Validate that both credentials can be linked
-                val result = authExplicitlyForValidation
+                authExplicitlyForValidation
                     .signInWithCredential(emailLinkCredential).await()
                     .user?.linkWithCredential(storedCredentialForLink)?.await()
                     .also { result ->
@@ -788,10 +793,9 @@ suspend fun FirebaseAuthUI.signInWithEmailLink(
                         updateAuthState(AuthState.Error(accountLinkingException))
                         throw accountLinkingException
                     }
-                return result
             } else {
                 // Non-upgrade: Sign in with email link, then link social credential
-                val result = auth.signInWithCredential(emailLinkCredential).await()
+                auth.signInWithCredential(emailLinkCredential).await()
                     // Link the social credential
                     .user?.linkWithCredential(storedCredentialForLink)?.await()
                     .also { result ->
@@ -804,7 +808,6 @@ suspend fun FirebaseAuthUI.signInWithEmailLink(
                             )
                         }
                     }
-                return result
             }
         }
         // Clear DataStore after success

composeapp/src/main/java/com/firebase/composeapp/MainActivity.kt

@@ -66,7 +66,7 @@ class MainActivity : ComponentActivity() {
                     AuthProvider.Email(
                         isDisplayNameRequired = true,
                         isEmailLinkForceSameDeviceEnabled = true,
-                        isEmailLinkSignInEnabled = true,
+                        isEmailLinkSignInEnabled = false,
                         emailLinkActionCodeSettings = actionCodeSettings {
                             // The continue URL - where to redirect after email link is clicked
                             url = "https://temp-test-aa342.firebaseapp.com"
@@ -159,10 +159,6 @@ class MainActivity : ComponentActivity() {
                                 is Route.MfaEnrollment -> NavEntry(entry) {
                                     LaunchMfaEnrollment(authUI, backStack)
                                 }
-
-                                is Route.MfaEnrollment -> NavEntry(entry) {
-                                    LaunchMfaEnrollment(authUI, backStack)
-                                }
                             }
                         }
                     )