Version 10.0.0 beta04

app/src/main/java/com/firebaseui/android/demo/auth/AuthFlowControllerDemoActivity.kt

@@ -227,6 +227,7 @@ fun AuthFlowDemo(
                         is AuthState.Success -> "Success - User: ${(authState as AuthState.Success).user.email}"
                         is AuthState.Error -> "Error: ${(authState as AuthState.Error).exception.message}"
                         is AuthState.Cancelled -> "Cancelled"
+                        is AuthState.Aborted -> "Aborted"
                         is AuthState.RequiresMfa -> "MFA Required"
                         is AuthState.RequiresEmailVerification -> "Email Verification Required"
                         else -> "Unknown"

auth/README.md

@@ -179,7 +179,9 @@ class MainActivity : ComponentActivity() {
                         Toast.makeText(this, "Error: ${exception.message}", Toast.LENGTH_SHORT).show()
                     },
                     onSignInCancelled = {
-                        finish()
+                        // User backed out of a single provider (e.g. dismissed the Google
+                        // Credential Manager sheet); FirebaseAuthScreen already returns to
+                        // the method picker on its own — no action needed here.
                     }
                 )
             }
@@ -343,7 +345,12 @@ lifecycleScope.launch {
             Log.e(TAG, "Auth failed", state.exception)
         }
         is AuthState.Cancelled -> {
-            // User cancelled
+            // User cancelled a single sign-in attempt (e.g. dismissed the
+            // Credential Manager sheet, backed out of MFA); the flow stays open
+        }
+        is AuthState.Aborted -> {
+            // Flow was ended via controller.cancel()
+            finish()
         }
         else -> {
             // Handle other states (RequiresMfa, RequiresEmailVerification, etc.)
@@ -375,6 +382,7 @@ sealed class AuthState {
     data class RequiresEmailVerification(val user: FirebaseUser, val email: String) : AuthState()
     data class RequiresProfileCompletion(val user: FirebaseUser, val missingFields: List<String> = emptyList()) : AuthState()
     object Cancelled : AuthState()
+    object Aborted : AuthState()
     object PasswordResetLinkSent : AuthState()
     object EmailSignInLinkSent : AuthState()
     data class SMSAutoVerified(val credential: PhoneAuthCredential) : AuthState()
@@ -671,7 +679,8 @@ fun AuthenticationScreen() {
             }
         },
         onSignInCancelled = {
-            navigateBack()
+            // User backed out of a single provider; the screen already returns
+            // to the method picker on its own.
         }
     )
 }
@@ -684,7 +693,7 @@ fun AuthenticationScreen() {
 | `configuration` | `AuthUIConfiguration` | *Required* | Authentication configuration (providers, theme, etc.) |
 | `onSignInSuccess` | `(AuthResult) -> Unit` | *Required* | Callback when sign-in succeeds |
 | `onSignInFailure` | `(AuthException) -> Unit` | *Required* | Callback when sign-in fails |
-| `onSignInCancelled` | `() -> Unit` | *Required* | Callback when user cancels authentication |
+| `onSignInCancelled` | `() -> Unit` | *Required* | Callback when the user backs out of a single sign-in attempt (`AuthState.Cancelled`, e.g. dismissing the Google Credential Manager sheet); `FirebaseAuthScreen` already returns to the method picker itself, so this is informational only. Not called when the whole flow ends via `AuthFlowController.cancel()` (`AuthState.Aborted`) — that state is observable directly on `authUI.authStateFlow()`/`authFlowController.authStateFlow` for callers who need it |
 | `modifier` | `Modifier` | `Modifier` | Modifier for the composable |
 | `authUI` | `FirebaseAuthUI` | `FirebaseAuthUI.getInstance()` | Custom FirebaseAuthUI instance (for multi-app support) |
 | `emailLink` | `String?` | `null` | Email link for passwordless sign-in (see [Email Link Sign-In](#email-link-sign-in)) |
@@ -706,7 +715,8 @@ FirebaseAuthScreen(
         showError(exception)
     },
     onSignInCancelled = {
-        finish()
+        // User backed out of a single provider; the screen already returns
+        // to the method picker on its own.
     },
     authenticatedContent = { state, uiContext ->
         // Show a welcome screen or profile completion UI
@@ -777,7 +787,11 @@ class AuthActivity : ComponentActivity() {
                 showEmailVerificationScreen(state.user)
             }
             is AuthState.Cancelled -> {
-                // User cancelled authentication
+                // User cancelled a single sign-in attempt; the flow stays open
+                // and returns to the method picker
+            }
+            is AuthState.Aborted -> {
+                // Flow was ended via controller.cancel()
                 finish()
             }
             else -> {
@@ -1729,7 +1743,8 @@ override fun onCreate(savedInstanceState: Bundle?) {
                     // Handle error
                 },
                 onSignInCancelled = {
-                    finish()
+                    // User backed out of a single provider; the screen already
+                    // returns to the method picker on its own.
                 }
             )
         }

auth/src/main/java/com/firebase/ui/auth/AuthException.kt

@@ -513,6 +513,14 @@ abstract class AuthException(
                             cause = firebaseException
                         )
 
+                        // FirebaseAuthWebException code for backing out of the OAuth custom tab
+                        "ERROR_WEB_CONTEXT_CANCELED" -> AuthCancelledException(
+                            message = stringProvider?.errorAuthCancelled.nonEmpty()
+                                ?: firebaseException.message
+                                ?: "Authentication was cancelled",
+                            cause = firebaseException
+                        )
+
                         else -> UnknownException(
                             message = stringProvider?.errorUnknownAuth.nonEmpty()
                                 ?: firebaseException.message

auth/src/main/java/com/firebase/ui/auth/AuthFlowController.kt

@@ -18,6 +18,7 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import androidx.activity.result.ActivityResultLauncher
+import androidx.annotation.MainThread
 import com.firebase.ui.auth.configuration.AuthUIConfiguration
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -71,7 +72,10 @@ import java.util.concurrent.atomic.AtomicBoolean
  *                         // Handle error
  *                     }
  *                     is AuthState.Cancelled -> {
- *                         // User cancelled
+ *                         // User cancelled a single sign-in attempt; flow stays open
+ *                     }
+ *                     is AuthState.Aborted -> {
+ *                         // The whole flow was ended via authController.cancel()
  *                     }
  *                     else -> {}
  *                 }
@@ -93,7 +97,7 @@ import java.util.concurrent.atomic.AtomicBoolean
  * **Lifecycle Management:**
  * - [createIntent] - Generate Intent to start the auth flow Activity
  * - [start] - Alternative to launch the flow (for Activity context)
- * - [cancel] - Cancel the ongoing auth flow, transitions to [AuthState.Cancelled]
+ * - [cancel] - Cancel the ongoing auth flow, transitions to [AuthState.Aborted]
  * - [dispose] - Release all resources (coroutines, listeners). Call in onDestroy()
  *
  * @property authUI The [FirebaseAuthUI] instance managing authentication
@@ -120,7 +124,9 @@ class AuthFlowController internal constructor(
      * - [AuthState.Loading] - Authentication in progress
      * - [AuthState.Success] - User signed in successfully
      * - [AuthState.Error] - Authentication error occurred
-     * - [AuthState.Cancelled] - User cancelled the flow
+     * - [AuthState.Cancelled] - Operation-level cancellation; the user cancelled a single
+     *   sign-in attempt and the flow stays open
+     * - [AuthState.Aborted] - The whole flow was ended via [cancel]
      * - [AuthState.RequiresMfa] - Multi-factor authentication required
      * - [AuthState.RequiresEmailVerification] - Email verification required
      */
@@ -195,10 +201,14 @@ class AuthFlowController internal constructor(
     /**
      * Cancels the ongoing authentication flow.
      *
-     * This method transitions the auth state to [AuthState.Cancelled] and
+     * This method transitions the auth state to [AuthState.Aborted] and
      * signals the auth flow to terminate. The auth flow Activity will finish
      * and return [Activity.RESULT_CANCELED].
      *
+     * Unlike [AuthState.Cancelled] (an operation-level cancellation that leaves the flow
+     * open, e.g. dismissing the Google Credential Manager sheet), calling this method ends
+     * the entire flow.
+     *
      * **Example:**
      * ```kotlin
      * // User clicked a "Cancel" button
@@ -209,9 +219,10 @@ class AuthFlowController internal constructor(
      *
      * @throws IllegalStateException if the controller has been disposed
      */
+    @MainThread
     fun cancel() {
         checkNotDisposed()
-        authUI.updateAuthState(AuthState.Cancelled)
+        authUI.updateAuthState(AuthState.Aborted)
     }
 
     /**

auth/src/main/java/com/firebase/ui/auth/AuthState.kt

@@ -34,10 +34,19 @@ import com.google.firebase.auth.PhoneAuthProvider
  */
 abstract class AuthState private constructor() {
 
+    /**
+     * Whether this is a one-off notification: something a screen shows once (a dialog, a "link
+     * sent" message) and must reset back to [Idle] immediately after consuming, so it doesn't
+     * leak to a screen/Activity created later. `abstract` so every new state must explicitly
+     * decide this rather than silently defaulting one way.
+     */
+    abstract val isNotification: Boolean
+
     /**
      * Initial state before any authentication operation has been started.
      */
     class Idle internal constructor() : AuthState() {
+        override val isNotification: Boolean = false
         override fun equals(other: Any?): Boolean = other is Idle
         override fun hashCode(): Int = javaClass.hashCode()
         override fun toString(): String = "AuthState.Idle"
@@ -49,6 +58,7 @@ abstract class AuthState private constructor() {
      * @property message Optional message describing what is being loaded
      */
     class Loading(val message: String? = null) : AuthState() {
+        override val isNotification: Boolean = false
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other !is Loading) return false
@@ -72,6 +82,7 @@ abstract class AuthState private constructor() {
         val user: FirebaseUser,
         val isNewUser: Boolean = false
     ) : AuthState() {
+        override val isNotification: Boolean = false
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other !is Success) return false
@@ -101,6 +112,7 @@ abstract class AuthState private constructor() {
         val exception: Exception,
         val isRecoverable: Boolean = true
     ) : AuthState() {
+        override val isNotification: Boolean = true
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other !is Error) return false
@@ -120,13 +132,37 @@ abstract class AuthState private constructor() {
 
     /**
      * Authentication was cancelled by the user.
+     *
+     * This is an operation-level cancellation: the user backed out of a single sign-in
+     * attempt (e.g. dismissed the Google Credential Manager sheet, backed out of an MFA
+     * challenge). The flow stays open and the screen returns to the method picker.
+     *
+     * @see Aborted for the state that ends the whole flow instead
      */
     class Cancelled internal constructor() : AuthState() {
+        override val isNotification: Boolean = true
         override fun equals(other: Any?): Boolean = other is Cancelled
         override fun hashCode(): Int = javaClass.hashCode()
         override fun toString(): String = "AuthState.Cancelled"
     }
 
+    /**
+     * The entire authentication flow was aborted.
+     *
+     * This state is emitted only by [AuthFlowController.cancel]. Unlike [Cancelled], which is
+     * a normal in-flow outcome that leaves the flow open, [Aborted] ends the whole flow —
+     * for example, [FirebaseAuthActivity] finishes with `RESULT_CANCELED` when it observes
+     * this state.
+     *
+     * @see Cancelled for the operation-level state that leaves the flow open
+     */
+    class Aborted internal constructor() : AuthState() {
+        override val isNotification: Boolean = true
+        override fun equals(other: Any?): Boolean = other is Aborted
+        override fun hashCode(): Int = javaClass.hashCode()
+        override fun toString(): String = "AuthState.Aborted"
+    }
+
     /**
      * Multi-factor authentication is required to complete sign-in.
      *
@@ -137,6 +173,7 @@ abstract class AuthState private constructor() {
         val resolver: MultiFactorResolver,
         val hint: String? = null
     ) : AuthState() {
+        override val isNotification: Boolean = false
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other !is RequiresMfa) return false
@@ -164,6 +201,7 @@ abstract class AuthState private constructor() {
         val user: FirebaseUser,
         val email: String
     ) : AuthState() {
+        override val isNotification: Boolean = false
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other !is RequiresEmailVerification) return false
@@ -191,6 +229,7 @@ abstract class AuthState private constructor() {
         val user: FirebaseUser,
         val missingFields: List<String> = emptyList()
     ) : AuthState() {
+        override val isNotification: Boolean = false
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other !is RequiresProfileCompletion) return false
@@ -221,6 +260,7 @@ abstract class AuthState private constructor() {
         // Not included in equals/hashCode — lambdas have no meaningful equality.
         val retryOperation: (suspend (android.content.Context) -> Unit)? = null,
     ) : AuthState() {
+        override val isNotification: Boolean = false
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other !is ReauthenticationRequired) return false
@@ -241,6 +281,7 @@ abstract class AuthState private constructor() {
      * Password reset link has been sent to the user's email.
      */
     class PasswordResetLinkSent : AuthState() {
+        override val isNotification: Boolean = true
         override fun equals(other: Any?): Boolean = other is PasswordResetLinkSent
         override fun hashCode(): Int = javaClass.hashCode()
         override fun toString(): String = "AuthState.PasswordResetLinkSent"
@@ -250,6 +291,7 @@ abstract class AuthState private constructor() {
      * Email sign in link has been sent to the user's email.
      */
     class EmailSignInLinkSent : AuthState() {
+        override val isNotification: Boolean = true
         override fun equals(other: Any?): Boolean = other is EmailSignInLinkSent
         override fun hashCode(): Int = javaClass.hashCode()
         override fun toString(): String = "AuthState.EmailSignInLinkSent"
@@ -267,6 +309,7 @@ abstract class AuthState private constructor() {
      * @see PhoneNumberVerificationRequired for the manual verification flow
      */
     class SMSAutoVerified(val credential: PhoneAuthCredential) : AuthState() {
+        override val isNotification: Boolean = true
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other !is SMSAutoVerified) return false
@@ -305,6 +348,7 @@ abstract class AuthState private constructor() {
         val verificationId: String,
         val forceResendingToken: PhoneAuthProvider.ForceResendingToken,
     ) : AuthState() {
+        override val isNotification: Boolean = false
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (other !is PhoneNumberVerificationRequired) return false
@@ -337,5 +381,12 @@ abstract class AuthState private constructor() {
          */
         @JvmStatic
         val Cancelled: Cancelled = Cancelled()
+
+        /**
+         * Creates an Aborted state instance.
+         * @return A new [Aborted] state
+         */
+        @JvmStatic
+        val Aborted: Aborted = Aborted()
     }
 }

auth/src/main/java/com/firebase/ui/auth/FirebaseAuthActivity.kt

@@ -36,7 +36,11 @@ import java.util.concurrent.ConcurrentHashMap
  *
  * This activity displays the [FirebaseAuthScreen] composable and manages
  * the authentication flow lifecycle. It automatically finishes when the user
- * signs in successfully or cancels the flow.
+ * signs in successfully ([AuthState.Success]) or the flow is aborted
+ * ([AuthState.Aborted], e.g. via [AuthFlowController.cancel]). Operation-level
+ * cancellations ([AuthState.Cancelled], e.g. dismissing the Google Credential Manager
+ * sheet) do not finish the activity — the flow stays open and the screen returns to
+ * the method picker.
  *
  * **Do not launch this Activity directly.**
  * Use [AuthFlowController] to start the auth flow:
@@ -116,9 +120,9 @@ class FirebaseAuthActivity : ComponentActivity() {
                         setResult(RESULT_OK, resultIntent)
                         finish()
                     }
-                    is AuthState.Cancelled -> {
-                        // User cancelled the flow
+                    is AuthState.Aborted -> {
                         setResult(RESULT_CANCELED)
+                        authUI.updateAuthState(AuthState.Idle)
                         finish()
                     }
                     is AuthState.Error -> {
@@ -149,9 +153,7 @@ class FirebaseAuthActivity : ComponentActivity() {
                     onSignInFailure = { exception ->
                         // State flow will handle error
                     },
-                    onSignInCancelled = {
-                        authUI.updateAuthState(AuthState.Cancelled)
-                    }
+                    onSignInCancelled = {}
                 )
             }
         }