Skip to content

fix(auth): expose slot parameters through FirebaseAuthScreen#2328

Merged
demolaf merged 4 commits into
version-10.0.0-beta03from
fix/auth-screen-custom-slots
May 22, 2026
Merged

fix(auth): expose slot parameters through FirebaseAuthScreen#2328
demolaf merged 4 commits into
version-10.0.0-beta03from
fix/auth-screen-custom-slots

Conversation

@demolaf

@demolaf demolaf commented May 20, 2026

Copy link
Copy Markdown
Member

Closes #2327 .

FirebaseAuthScreen accepted customization slots on sub-screens (custom method picker layout, email/phone/MFA content) but never forwarded them, making them unreachable from the high-level API. This adds the missing parameters and wires them through.

Also refactors the demo app's Custom Slots & Theming screen into separate activities, adds a SpotlightMethodPicker demo for customMethodPickerLayout, and adds unit tests verifying each slot is forwarded correctly.

Configurable params

@Composable
fun FirebaseAuthScreen(
    configuration: AuthUIConfiguration,
    onSignInSuccess: (AuthResult) -> Unit,
    onSignInFailure: (AuthException) -> Unit,
    onSignInCancelled: () -> Unit,
    modifier: Modifier = Modifier,
    authUI: FirebaseAuthUI = FirebaseAuthUI.getInstance(),
    emailLink: String? = null,
    mfaConfiguration: MfaConfiguration = MfaConfiguration(),

    // New
    customMethodPickerLayout: (@Composable (List<AuthProvider>, (AuthProvider) -> Unit) -> Unit)? = null,
    emailContent: (@Composable (EmailAuthContentState) -> Unit)? = null,
    phoneContent: (@Composable (PhoneAuthContentState) -> Unit)? = null,
    mfaEnrollmentContent: (@Composable (MfaEnrollmentContentState) -> Unit)? = null,
    mfaChallengeContent: (@Composable (MfaChallengeContentState) -> Unit)? = null,

    authenticatedContent: (@Composable (state: AuthState, uiContext: AuthSuccessUiContext) -> Unit)? = null,
) {

}

Expected behavior

custom-slots-fix.mp4

demolaf added 2 commits May 20, 2026 16:22
- AuthMethodPicker
- EmailAuth
- PhoneAuth
- MFA Enrollment & Challenge
@demolaf demolaf marked this pull request as draft May 20, 2026 15:30

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces comprehensive UI customization capabilities to FirebaseAuthScreen by adding slot parameters for email, phone, MFA enrollment, and MFA challenge screens, as well as a custom method picker layout. The demo application has been refactored into separate activities to showcase these new features, including custom method pickers and shape customization. Review feedback suggests optimizing provider categorization using groupBy in the demo, ensuring CircularProgressIndicator uses Modifier.size() to prevent stretching and visual jumps, and reordering function parameters in AuthMethodPicker to place the lambda at the end for better Kotlin idiomaticity.

Comment thread app/src/main/java/com/firebaseui/android/demo/CustomMethodPickerDemoActivity.kt Outdated
Comment thread app/src/main/java/com/firebaseui/android/demo/EmailAuthSlotDemoActivity.kt Outdated
Comment thread app/src/main/java/com/firebaseui/android/demo/EmailAuthSlotDemoActivity.kt Outdated
Comment thread app/src/main/java/com/firebaseui/android/demo/EmailAuthSlotDemoActivity.kt Outdated
Comment thread app/src/main/java/com/firebaseui/android/demo/PhoneAuthSlotDemoActivity.kt Outdated
Comment thread app/src/main/java/com/firebaseui/android/demo/PhoneAuthSlotDemoActivity.kt Outdated
@demolaf demolaf linked an issue May 20, 2026 that may be closed by this pull request
@demolaf demolaf changed the title Fix/auth screen custom slots fix(auth): expose slot parameters through FirebaseAuthScreen May 20, 2026
@demolaf demolaf marked this pull request as ready for review May 21, 2026 08:41

@mikehardy mikehardy left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - but an LGTM comment with no details looks like a rubber stamp so I'll attest that I scanned through the whole thing with actual eyes and it looks really good. Burnt a few tokens on it as well and there were some nitpicks (there are always nitpicks) but nothing that would meet cost/benefit of even mentioning. TL;DR: looks like great work, +1

@demolaf demolaf merged commit 50de8bb into version-10.0.0-beta03 May 22, 2026
10 checks passed
demolaf added a commit that referenced this pull request Jun 16, 2026
* fix(auth): add configurable params for custom UI

- AuthMethodPicker
- EmailAuth
- PhoneAuth
- MFA Enrollment & Challenge

* fix(auth): add demo activities for email and phone authentication with customizable UI

* updates

* updates
demolaf added a commit that referenced this pull request Jun 29, 2026
* fix(auth): add configurable params for custom UI

- AuthMethodPicker
- EmailAuth
- PhoneAuth
- MFA Enrollment & Challenge

* fix(auth): add demo activities for email and phone authentication with customizable UI

* updates

* updates
demolaf added a commit that referenced this pull request Jul 1, 2026
* fix(auth): add configurable params for custom UI

- AuthMethodPicker
- EmailAuth
- PhoneAuth
- MFA Enrollment & Challenge

* fix(auth): add demo activities for email and phone authentication with customizable UI

* updates

* updates
demolaf added a commit that referenced this pull request Jul 1, 2026
* fix(auth): add configurable params for custom UI

- AuthMethodPicker
- EmailAuth
- PhoneAuth
- MFA Enrollment & Challenge

* fix(auth): add demo activities for email and phone authentication with customizable UI

* updates

* updates
demolaf added a commit that referenced this pull request Jul 2, 2026
* fix(auth): add configurable params for custom UI

- AuthMethodPicker
- EmailAuth
- PhoneAuth
- MFA Enrollment & Challenge

* fix(auth): add demo activities for email and phone authentication with customizable UI

* updates

* updates
demolaf added a commit to demolaf/FirebaseUI-Android that referenced this pull request Jul 2, 2026
…e#2328)

* fix(auth): add configurable params for custom UI

- AuthMethodPicker
- EmailAuth
- PhoneAuth
- MFA Enrollment & Challenge

* fix(auth): add demo activities for email and phone authentication with customizable UI

* updates

* updates
demolaf added a commit that referenced this pull request Jul 2, 2026
…ng (#2354)

* fix(auth): improve user identifier retrieval (#2314)

* fix(auth): improve user identifier retrieval

* updates

* fix: ensure that when selecting phone or email, it routes straight to that screen (#2311)

* fix: use secondary app if it is passed into FirebaseAuthUI (#2313)

* fix(auth): make AuthException messages customisable via AuthUIStringProvider (#2320)

* fix(auth): preserve linkDomain in email link ActionCodeSettings (#2321)

* fix(auth): log out before Facebook sign-in to clear stale cached token (#2322)

Co-authored-by: russellwheatley <russellwheatley85@gmail.com>

* Fix typo in README (#2325)

* fix(auth): emit AuthResult on sign-in success and fix MFA tooltip auto-open (#2326)

* fix(auth): update AuthState to reflect success or idle based on user result

* updates

* updates

* refactor: rename auth user state handler

* fix(auth): expose slot parameters through FirebaseAuthScreen (#2328)

* fix(auth): add configurable params for custom UI

- AuthMethodPicker
- EmailAuth
- PhoneAuth
- MFA Enrollment & Challenge

* fix(auth): add demo activities for email and phone authentication with customizable UI

* updates

* updates

* feat(auth): add customMethodPickerTermsContent slot to FirebaseAuthScreen (#2330)

* feat(auth): add termsContent slot to AuthMethodPicker for custom ToS UI

* feat(auth): add termsAccepted parameter to AuthMethodPicker for consent handling

* update example

* updates

* updates

* updates

* feat(auth): add isCredentialLinkingEnabled for authenticated users (#2319)

* feat(auth): add isCredentialLinkingEnabled for authenticated non-anonymous users

* t feat(app): add CredentialLinkingDemoActivity to sample app

# Conflicts:
#	app/src/main/AndroidManifest.xml

* updates

* feat(auth): surface GIdP password policy violations with actionable error messages (#2333)

* feat(auth): handle GIdP password policy violations with specific error messages

* updates

* updates

* cleanup

* fix(auth): allow SAML providers in AuthUIConfiguration (#2331)

* fix(auth): allow saml. prefixed provider IDs in AuthUIConfiguration validation

* updates

* feat(auth): add reauthentication flow with automatic operation retry (#2332)

* wip

# Conflicts:
#	auth/src/main/java/com/firebase/ui/auth/configuration/auth_provider/EmailAuthProvider+FirebaseAuthUI.kt
#	auth/src/main/java/com/firebase/ui/auth/ui/screens/FirebaseAuthScreen.kt

* feat(auth): add reauthentication flow with automatic operation retry

Adds AuthState.ReauthenticationRequired, withReauth(), and createReauthFlow()
to support sensitive operations that require recent sign-in. FirebaseAuthUI.delete()
and withReauth() automatically catch FirebaseAuthRecentLoginRequiredException,
emit the new state carrying the original operation as retryOperation, and
FirebaseAuthScreen presents a ModalBottomSheet overlay scoped to the user's
linked providers — no navigation away from the authenticated screen. On successful
reauthentication the original operation is retried automatically.

* test(auth): add e2e tests for reauthentication flow UI

* updates

* fix reviews

* update README

* feat(auth): implement `legacyFetchSignInWithEmail` configuration option (#2316)

* feat(auth): implement legacyFetchSignInWithEmail configuration option

* test: write tests for legacyFetchSignInWithEmail

* fix(pr): address reviewer feedback on email recovery routing

* refactor(pr): address reviewer feedback on legacy email recovery

* fix: cancellation callback + test

* chore: ignore kotlin cache

* chore: run demo app script from command line

---------

Co-authored-by: demolaf <demolafadumo@gmail.com>

* fix(auth): replace hardcoded loading state strings with translatable string resources (#2339)

* feat(auth): add localized loading messages for various sign-in states

* updates

* feat(auth): update sign-in methods to use AuthUIConfiguration for localized messages

* refactor: use periods to represent ellipsis not the unicode character

* refactor: use qualifiers, not base values in tests

* fix(auth): remember authStateFlow() to avoid resubscribing on every recomposition

* fix(auth): remember authStateFlow() in EmailAuthScreen to avoid resubscribing

* docs(auth): note FirebaseAuthUI.create() instability inside composables

---------

Co-authored-by: Russell Wheatley <russellwheatley85@gmail.com>
Co-authored-by: Nillan Sivarasa <nillan.sivarasa@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Auth-UI] [v10.0.0-beta02] AuthMethodPicker customLayout use

3 participants