handle authState exceptions

demolaf · demolaf · commit aeec7dccd92e · 2025-10-08T13:10:44.000+01:00
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/configuration/auth_provider/EmailAuthProvider+FirebaseAuthUI.kt b/auth/src/main/java/com/firebase/ui/auth/compose/configuration/auth_provider/EmailAuthProvider+FirebaseAuthUI.kt
@@ -166,6 +166,8 @@ internal suspend fun FirebaseAuthUI.createOrLinkUserWithEmailAndPassword(
         if (canUpgrade && pendingCredential != null) {
             // Anonymous upgrade collision: emit merge conflict state
             updateAuthState(AuthState.MergeConflict(pendingCredential))
+        } else {
+            updateAuthState(AuthState.Error(authException))
         }
         throw authException
     } catch (e: CancellationException) {
@@ -465,6 +467,8 @@ internal suspend fun FirebaseAuthUI.signInAndLinkWithCredential(
             } else {
                 updateAuthState(AuthState.Error(authException))
             }
+        } else {
+            updateAuthState(AuthState.Error(authException))
         }
         throw authException
     } catch (e: CancellationException) {

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,8 @@ internal suspend fun FirebaseAuthUI.createOrLinkUserWithEmailAndPassword(`
`166`	`166`	`if (canUpgrade && pendingCredential != null) {`
`167`	`167`	`// Anonymous upgrade collision: emit merge conflict state`
`168`	`168`	`updateAuthState(AuthState.MergeConflict(pendingCredential))`
	`169`	`+ } else {`
	`170`	`+ updateAuthState(AuthState.Error(authException))`
`169`	`171`	`}`
`170`	`172`	`throw authException`
`171`	`173`	`} catch (e: CancellationException) {`
`@@ -465,6 +467,8 @@ internal suspend fun FirebaseAuthUI.signInAndLinkWithCredential(`
`465`	`467`	`} else {`
`466`	`468`	`updateAuthState(AuthState.Error(authException))`
`467`	`469`	`}`
	`470`	`+ } else {`
	`471`	`+ updateAuthState(AuthState.Error(authException))`
`468`	`472`	`}`
`469`	`473`	`throw authException`
`470`	`474`	`} catch (e: CancellationException) {`