fix: issues for the Sign In Screen (#2265)

Lyokone · web-flow · commit 99a930c6e1ef · 2025-10-30T16:39:56.000+01:00
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/FirebaseAuthUI.kt b/auth/src/main/java/com/firebase/ui/auth/compose/FirebaseAuthUI.kt
@@ -316,12 +316,12 @@ class FirebaseAuthUI private constructor(
 
     /**
      * Updates the internal authentication state.
-     * This method is intended for internal use by authentication operations.
+     * This method can be used to manually trigger state updates when the Firebase Auth state
+     * listener doesn't automatically detect changes (e.g., after reloading user properties).
      *
      * @param state The new [AuthState] to emit
-     * @suppress This is an internal API
      */
-    internal fun updateAuthState(state: AuthState) {
+    fun updateAuthState(state: AuthState) {
         _authStateFlow.value = state
     }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/configuration/auth_provider/AuthProvider.kt b/auth/src/main/java/com/firebase/ui/auth/compose/configuration/auth_provider/AuthProvider.kt
@@ -154,6 +154,12 @@ abstract class AuthProvider(open val providerId: String, open val providerName:
          * A list of custom password validation rules.
          */
         val passwordValidationRules: List<PasswordRule>,
+
+        /**
+         * Optional custom button label to differentiate between multiple email providers.
+         * If null, uses the default string from stringProvider. Defaults to null.
+         */
+        val buttonLabel: String? = null,
     ) : AuthProvider(providerId = Provider.EMAIL.id, providerName = Provider.EMAIL.providerName) {
         companion object {
             const val SESSION_ID_LENGTH = 10
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/ui/components/AuthProviderButton.kt b/auth/src/main/java/com/firebase/ui/auth/compose/ui/components/AuthProviderButton.kt
@@ -153,6 +153,10 @@ internal fun resolveProviderLabel(
     context: android.content.Context
 ): String = when (provider) {
     is AuthProvider.GenericOAuth -> provider.buttonLabel
+    is AuthProvider.Email -> {
+        // Use custom button label if provided, otherwise use default
+        provider.buttonLabel ?: stringProvider.signInWithEmail
+    }
     is AuthProvider.Apple -> {
         // Use Apple-specific locale if provided, otherwise use default stringProvider
         if (provider.locale != null) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/FirebaseAuthScreen.kt b/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/FirebaseAuthScreen.kt
@@ -322,8 +322,32 @@ fun FirebaseAuthScreen(
                             onReloadUser = {
                                 coroutineScope.launch {
                                     try {
+                                        // Reload user to get fresh data from server
                                         authUI.getCurrentUser()?.reload()
                                         authUI.getCurrentUser()?.getIdToken(true)
+
+                                        // Check the user's email verification status after reload
+                                        val user = authUI.getCurrentUser()
+                                        if (user != null) {
+                                            // If email is now verified, transition to Success state
+                                            if (user.isEmailVerified) {
+                                                authUI.updateAuthState(
+                                                    AuthState.Success(
+                                                        result = null,
+                                                        user = user,
+                                                        isNewUser = false
+                                                    )
+                                                )
+                                            } else {
+                                                // Email still not verified, keep showing verification screen
+                                                authUI.updateAuthState(
+                                                    AuthState.RequiresEmailVerification(
+                                                        user = user,
+                                                        email = user.email ?: ""
+                                                    )
+                                                )
+                                            }
+                                        }
                                     } catch (e: Exception) {
                                         Log.e("FirebaseAuthScreen", "Failed to refresh user", e)
                                     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/email/EmailAuthScreen.kt b/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/email/EmailAuthScreen.kt
@@ -310,15 +310,17 @@ fun EmailAuthScreen(
     } else {
         DefaultEmailAuthContent(
             configuration = configuration,
-            state = state
+            state = state,
+            onCancel = onCancel
         )
     }
 }
 
 @Composable
 private fun DefaultEmailAuthContent(
     configuration: AuthUIConfiguration,
-    state: EmailAuthContentState
+    state: EmailAuthContentState,
+    onCancel: () -> Unit
 ) {
     when (state.mode) {
         EmailAuthMode.SignIn -> {
@@ -332,7 +334,8 @@ private fun DefaultEmailAuthContent(
                 onPasswordChange = state.onPasswordChange,
                 onSignInClick = state.onSignInClick,
                 onGoToSignUp = state.onGoToSignUp,
-                onGoToResetPassword = state.onGoToResetPassword
+                onGoToResetPassword = state.onGoToResetPassword,
+                onNavigateBack = onCancel
             )
         }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/email/SignInUI.kt b/auth/src/main/java/com/firebase/ui/auth/compose/ui/screens/email/SignInUI.kt
@@ -25,10 +25,14 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -73,6 +77,7 @@ fun SignInUI(
     onSignInClick: () -> Unit,
     onGoToSignUp: () -> Unit,
     onGoToResetPassword: () -> Unit,
+    onNavigateBack: (() -> Unit)? = null,
 ) {
     val provider = configuration.providers.filterIsInstance<AuthProvider.Email>().first()
     val stringProvider = LocalAuthUIStringProvider.current
@@ -138,6 +143,16 @@ fun SignInUI(
                         modifier = Modifier.semantics { heading() }
                     )
                 },
+                navigationIcon = {
+                    if (onNavigateBack != null) {
+                        IconButton(onClick = onNavigateBack) {
+                            Icon(
+                                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                                contentDescription = stringProvider.backAction
+                            )
+                        }
+                    }
+                },
                 colors = AuthUITheme.topAppBarColors
             )
         },
diff --git a/composeapp/src/main/java/com/firebase/composeapp/HighLevelApiDemoActivity.kt b/composeapp/src/main/java/com/firebase/composeapp/HighLevelApiDemoActivity.kt
@@ -56,6 +56,23 @@ class HighLevelApiDemoActivity : ComponentActivity() {
                         serverClientId = "771411398215-o39fujhds88bs4mb5ai7u6o73g86fspp.apps.googleusercontent.com",
                     )
                 )
+                // Email/Password Sign-in
+                provider(
+                    AuthProvider.Email(
+                        isDisplayNameRequired = true,
+                        isEmailLinkSignInEnabled = false,
+                        isNewAccountsAllowed = true,
+                        minimumPasswordLength = 8,
+                        passwordValidationRules = listOf(
+                            PasswordRule.MinimumLength(8),
+                            PasswordRule.RequireLowercase,
+                            PasswordRule.RequireUppercase,
+                        ),
+                        emailLinkActionCodeSettings = null,
+                        buttonLabel = "Sign in with Email"
+                    )
+                )
+                // Email Link Sign-in (passwordless)
                 provider(
                     AuthProvider.Email(
                         isDisplayNameRequired = true,
@@ -76,7 +93,8 @@ class HighLevelApiDemoActivity : ComponentActivity() {
                             PasswordRule.MinimumLength(8),
                             PasswordRule.RequireLowercase,
                             PasswordRule.RequireUppercase,
-                        )
+                        ),
+                        buttonLabel = "Sign in with Email Link"
                     )
                 )
                 provider(

Original file line number	Diff line number	Diff line change
`@@ -316,12 +316,12 @@ class FirebaseAuthUI private constructor(`
`316`	`316`
`317`	`317`	`/**`
`318`	`318`	`* Updates the internal authentication state.`
`319`		`- * This method is intended for internal use by authentication operations.`
	`319`	`+ * This method can be used to manually trigger state updates when the Firebase Auth state`
	`320`	`+ * listener doesn't automatically detect changes (e.g., after reloading user properties).`
`320`	`321`	`*`
`321`	`322`	`* @param state The new [AuthState] to emit`
`322`		`- * @suppress This is an internal API`
`323`	`323`	`*/`
`324`		`- internal fun updateAuthState(state: AuthState) {`
	`324`	`+ fun updateAuthState(state: AuthState) {`
`325`	`325`	`_authStateFlow.value = state`
`326`	`326`	`}`
`327`	`327`
Original file line number	Diff line number	Diff line change
`@@ -310,15 +310,17 @@ fun EmailAuthScreen(`
`310`	`310`	`} else {`
`311`	`311`	`DefaultEmailAuthContent(`
`312`	`312`	`configuration = configuration,`
`313`		`- state = state`
	`313`	`+ state = state,`
	`314`	`+ onCancel = onCancel`
`314`	`315`	`)`
`315`	`316`	`}`
`316`	`317`	`}`
`317`	`318`
`318`	`319`	`@Composable`
`319`	`320`	`private fun DefaultEmailAuthContent(`
`320`	`321`	`configuration: AuthUIConfiguration,`
`321`		`- state: EmailAuthContentState`
	`322`	`+ state: EmailAuthContentState,`
	`323`	`+ onCancel: () -> Unit`
`322`	`324`	`) {`
`323`	`325`	`when (state.mode) {`
`324`	`326`	`EmailAuthMode.SignIn -> {`
`@@ -332,7 +334,8 @@ private fun DefaultEmailAuthContent(`
`332`	`334`	`onPasswordChange = state.onPasswordChange,`
`333`	`335`	`onSignInClick = state.onSignInClick,`
`334`	`336`	`onGoToSignUp = state.onGoToSignUp,`
`335`		`- onGoToResetPassword = state.onGoToResetPassword`
	`337`	`+ onGoToResetPassword = state.onGoToResetPassword,`
	`338`	`+ onNavigateBack = onCancel`
`336`	`339`	`)`
`337`	`340`	`}`
`338`	`341`