Skip to content

fix(auth): pre-fill email when "Continue as" button is tapped (#2423) #2425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
just1and0 wants to merge 5 commits into
base: version-10.0.0-beta04
Choose a base branch
from
Open

fix(auth): pre-fill email when "Continue as" button is tapped (#2423) #2425

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5583dca
fix(auth): pre-fill email when "Continue as" button is tapped (#2423)
just1and0 Jul 27, 2026
6268a0d
fix(auth): only pre-fill email for Email provider, not phone/other
just1and0 Jul 27, 2026
59df1d6
fix(auth): move new parameters to end of signature to preserve API co…
just1and0 Jul 27, 2026
d9f7c41
Merge branch 'version-10.0.0-beta04' into fix/2423-continue-as-prefil…
just1and0 Jul 28, 2026
10809b0
fix(auth): address review feedback for prefill email feature
just1and0 Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion auth/src/main/java/com/firebase/ui/auth/ui/method_picker/AuthMethodPicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ class MethodPickerTermsConfiguration(
* @param lastSignInPreference The last sign-in preference to show a "Continue as..." button.
* @param termsConfiguration Optional configuration for a custom ToS/Privacy Policy footer.
* When provided, replaces the default "By continuing..." text. See [MethodPickerTermsConfiguration].
* @param onContinueAsSelected A callback when the "Continue as..." button is selected, with the
* provider and saved identifier (email, phone number, etc.). Falls back to [onProviderSelected]
* if not provided.
Comment thread
just1and0 marked this conversation as resolved.
*
* @since 10.0.0
*/
Expand All @@ -102,7 +105,10 @@ fun AuthMethodPicker(
lastSignInPreference: SignInPreferenceManager.SignInPreference? = null,
customLayout: (@Composable (List<AuthProvider>, (AuthProvider) -> Unit) -> Unit)? = null,
termsConfiguration: MethodPickerTermsConfiguration? = null,
onContinueAsSelected: ((AuthProvider, String?) -> Unit)? = null,
) {
val continueAsHandler: (AuthProvider, String?) -> Unit =
onContinueAsSelected ?: { provider, _ -> onProviderSelected(provider) }
val context = LocalContext.current
val inPreview = LocalInspectionMode.current
val stringProvider = LocalAuthUIStringProvider.current
Expand Down Expand Up @@ -150,7 +156,7 @@ fun AuthMethodPicker(
provider = lastProvider,
identifier = preference.identifier,
enabled = providerButtonsEnabled,
onClick = { onProviderSelected(lastProvider) }
onClick = { continueAsHandler(lastProvider, preference.identifier) }
)
Spacer(modifier = Modifier.height(24.dp))

Expand Down
11 changes: 10 additions & 1 deletion auth/src/main/java/com/firebase/ui/auth/ui/screens/FirebaseAuthScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ fun FirebaseAuthScreen(
val pendingReauthState = remember { mutableStateOf<AuthState.ReauthenticationRequired?>(null) }
val pendingReauthOperation = remember { mutableStateOf<(suspend (android.content.Context) -> Unit)?>(null) }
val emailLinkFromDifferentDevice = remember { mutableStateOf<String?>(null) }
val prefillEmail = remember { mutableStateOf<String?>(null) }
val lastSignInPreference =
remember { mutableStateOf<SignInPreferenceManager.SignInPreference?>(null) }
val startRoute = remember(configuration.providers, configuration.isProviderChoiceAlwaysShown) {
Expand Down Expand Up @@ -231,7 +232,14 @@ fun FirebaseAuthScreen(
privacyPolicyUrl = configuration.privacyPolicyUrl,
lastSignInPreference = lastSignInPreference.value,
termsConfiguration = customMethodPickerTermsConfiguration,
onProviderSelected = onProviderSelected,
onProviderSelected = { provider ->
prefillEmail.value = null
onProviderSelected(provider)
},
onContinueAsSelected = { provider, identifier ->
prefillEmail.value = if (provider is AuthProvider.Email) identifier else null
onProviderSelected(provider)
},
)
}
}
Expand All @@ -242,6 +250,7 @@ fun FirebaseAuthScreen(
context = context,
configuration = configuration,
authUI = authUI,
prefillEmail = prefillEmail.value,
credentialForLinking = pendingLinkingCredential.value,
emailLinkFromDifferentDevice = emailLinkFromDifferentDevice.value,
onContinueWithProvider = continueWithProvider,
Expand Down
3 changes: 2 additions & 1 deletion auth/src/main/java/com/firebase/ui/auth/ui/screens/email/EmailAuthScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ fun EmailAuthScreen(
onSuccess: (AuthResult) -> Unit,
onError: (AuthException) -> Unit,
onCancel: () -> Unit,
prefillEmail: String? = null,
content: @Composable ((EmailAuthContentState) -> Unit)? = null,
) {
val provider = configuration.providers.filterIsInstance<AuthProvider.Email>().first()
Expand All @@ -150,7 +151,7 @@ fun EmailAuthScreen(
}
val mode = rememberSaveable { mutableStateOf(initialMode) }
val displayNameValue = rememberSaveable { mutableStateOf("") }
val emailTextValue = rememberSaveable { mutableStateOf("") }
val emailTextValue = rememberSaveable { mutableStateOf(prefillEmail ?: "") }
Comment thread
just1and0 marked this conversation as resolved.
val passwordTextValue = rememberSaveable { mutableStateOf("") }
val confirmPasswordTextValue = rememberSaveable { mutableStateOf("") }

Expand Down