updates

Author: demolaf

app/src/main/java/com/firebaseui/android/demo/HighLevelApiDemoActivity.kt

@@ -43,6 +43,7 @@ import com.firebase.ui.auth.ui.screens.AuthSuccessUiContext
 import com.firebase.ui.auth.ui.screens.FirebaseAuthScreen
 import com.firebase.ui.auth.util.EmailLinkConstants
 import com.firebase.ui.auth.util.displayIdentifier
+import com.firebase.ui.auth.util.getDisplayEmail
 import com.google.firebase.auth.actionCodeSettings
 
 class HighLevelApiDemoActivity : ComponentActivity() {
@@ -212,7 +213,7 @@ private fun AppAuthenticatedContent(
     when (state) {
         is AuthState.Success -> {
             val user = uiContext.authUI.getCurrentUser()
-            val identifier = user?.displayIdentifier().orEmpty()
+            val identifier = user.displayIdentifier()
             Column(
                 modifier = Modifier.fillMaxSize(),
                 horizontalAlignment = Alignment.CenterHorizontally,
@@ -264,7 +265,7 @@ private fun AppAuthenticatedContent(
         }
 
         is AuthState.RequiresEmailVerification -> {
-            val email = uiContext.authUI.getCurrentUser()?.email?.takeIf { it.isNotBlank() } ?: stringProvider.emailProvider
+            val email = uiContext.authUI.getCurrentUser().getDisplayEmail(stringProvider.emailProvider)
             Column(
                 modifier = Modifier.fillMaxSize(),
                 horizontalAlignment = Alignment.CenterHorizontally,

auth/src/main/java/com/firebase/ui/auth/ui/screens/FirebaseAuthScreen.kt

@@ -79,6 +79,7 @@ import com.firebase.ui.auth.ui.screens.phone.PhoneAuthScreen
 import com.firebase.ui.auth.util.EmailLinkPersistenceManager
 import com.firebase.ui.auth.util.SignInPreferenceManager
 import com.firebase.ui.auth.util.displayIdentifier
+import com.firebase.ui.auth.util.getDisplayEmail
 import com.google.firebase.auth.AuthCredential
 import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.MultiFactorResolver
@@ -734,7 +735,7 @@ private fun AuthSuccessContent(
     onManageMfa: () -> Unit,
 ) {
     val user = authUI.getCurrentUser()
-    val userIdentifier = user?.displayIdentifier().orEmpty()
+    val userIdentifier = user.displayIdentifier()
     Column(
         modifier = Modifier.fillMaxSize(),
         verticalArrangement = Arrangement.Center,
@@ -784,7 +785,7 @@ private fun EmailVerificationContent(
     onSignOut: () -> Unit,
 ) {
     val user = authUI.getCurrentUser()
-    val emailLabel = user?.email?.takeIf { it.isNotBlank() } ?: stringProvider.emailProvider
+    val emailLabel = user.getDisplayEmail(stringProvider.emailProvider)
     Column(
         modifier = Modifier.fillMaxSize(),
         verticalArrangement = Arrangement.Center,

auth/src/main/java/com/firebase/ui/auth/util/UserUtils.kt

@@ -22,11 +22,17 @@ import com.google.firebase.auth.FirebaseUser
  *
  * Each field is checked for blank (not just null) so that an empty string returned by the
  * Firebase SDK falls through to the next candidate rather than being displayed as-is.
- * [FirebaseUser.uid] is always non-null and non-blank for a signed-in user, so the result
- * is guaranteed to be non-blank.
+ * Returns an empty string if the user is null.
  */
-fun FirebaseUser.displayIdentifier(): String =
-    email?.takeIf { it.isNotBlank() }
-        ?: phoneNumber?.takeIf { it.isNotBlank() }
-        ?: displayName?.takeIf { it.isNotBlank() }
-        ?: uid
+fun FirebaseUser?.displayIdentifier(): String =
+    this?.email?.takeIf { it.isNotBlank() }
+        ?: this?.phoneNumber?.takeIf { it.isNotBlank() }
+        ?: this?.displayName?.takeIf { it.isNotBlank() }
+        ?: this?.uid
+        ?: ""
+
+/**
+ * Returns the user's email if it is non-blank, otherwise returns the provided [fallback].
+ */
+fun FirebaseUser?.getDisplayEmail(fallback: String): String =
+    this?.email?.takeIf { it.isNotBlank() } ?: fallback