feat(auth): make each MFA enrollment step a real navigation destination - #2467
Merged
russellwheatley merged 1 commit intoSep 2, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Code Review
This pull request refactors the MFA enrollment flow to host steps as real navigation destinations, ensuring state survives step transitions and Activity recreation. This is achieved by introducing MfaEnrollmentFlowState and custom savers for CountryData and SmsEnrollmentSession. Feedback on the changes highlights a potential security risk of cross-user state leakage, suggesting that rememberMfaEnrollmentFlowState be keyed on the user's ID. Additionally, it is recommended to wrap a composition-time popBackStack() call in a LaunchedEffect to avoid side-effects during composition.
demolaf
force-pushed
the
feat/mfa-enrollment-per-step-nav
branch
from
September 2, 2026 01:10
84abce8 to
4d4fe41
Compare
demolaf
force-pushed
the
feat/mfa-enrollment-per-step-nav
branch
from
September 2, 2026 13:17
4d4fe41 to
548c396
Compare
demolaf
force-pushed
the
feat/mfa-enrollment-per-step-nav
branch
from
September 2, 2026 13:30
548c396 to
a38bb4f
Compare
Base automatically changed from
feat/auth-per-step-nav-destinations
to
version-10.0.0-beta05
September 2, 2026 14:23
russellwheatley
force-pushed
the
feat/mfa-enrollment-per-step-nav
branch
from
September 2, 2026 14:23
a38bb4f to
bfc6583
Compare
russellwheatley
approved these changes
Sep 2, 2026
Merged
This was referenced Sep 2, 2026
demolaf
added a commit
that referenced
this pull request
Sep 6, 2026
demolaf
added a commit
that referenced
this pull request
Sep 7, 2026
* fix(auth)!: remove non-functional MFA recovery codes (#2457) * refactor(auth): scope phone verification loading state to the composition that owns it (#2454) * refactor(auth): let the phone screen own its verification loading state * fix(auth): read auth state per authUI instance when clearing loading on dispose * fix(e2e): fix flaky Google credential-linking test (#2455) * fix(auth): complete MFA challenge sign-in navigation and success callback (#2458) * feat(auth): add stable resource ids for auth input fields (#2449) * fix(auth): log diagnostic warning when Google sign-in NoCredentialException fallback exhausts (cherry picked from commit 6fa4f00) (cherry picked from commit aca99e7) (cherry picked from commit 8784b13ce29739ed7785aab9ab6fe4faad2a2981) * fix(e2e): retry and fail loudly when clearing Firebase Auth emulator data (cherry picked from commit 8eca4fa) (cherry picked from commit ac61312) (cherry picked from commit 126ba985660ff272dbfda427b644ad4fb1ca6197) * fix(e2e): don't swallow InterruptedException in emulator clear retry loop (cherry picked from commit a87cfe3) (cherry picked from commit 3f4ae70) (cherry picked from commit 1f1ada380039ed5e7476dfc2e38a683e6edb4549) * feat(auth): reshape reauthContent into a ReauthContentState content slot (#2452) * feat(auth): reshape reauthContent into a ReauthContentState content slot * fix(auth): address reauth review findings and retain state across recreation * refactor(auth): make reauthentication a request-scoped state machine * fix(auth): keep a proved reauthentication alive when its operation signs out * fix(auth): tear down phone verification when a reauthentication attempt fails * test(auth): cover sign-out-during-retry and phone reauth failure end to end * test(auth): drop the flaky phone reauth e2e case * test(auth): pin onComplete and factor refresh on successful MFA enrollment (#2462) * test(auth): pin onComplete and factor refresh on successful MFA enrollment * test(auth): pin the SMS MFA enrollment route through send, verify and resend * test(auth): pin the missing TOTP secret guard and the resend's clean enroll * feat(auth)!: make each email sign-in mode a real navigation destination (#2466) * feat(auth): make each MFA enrollment step a real navigation destination (#2467) * feat(auth)!: migrate auth navigation to Navigation 3 (#2469) * feat(auth): make reauthentication a navigation destination (#2471) * fix(auth): clear MFA enrollment flow state on every entry (#2473) * feat(auth): make each phone auth step a real navigation destination (#2472) * fix(auth): don't strand phone-only users on email verification after reload (#2474) * test(auth): cover the write-through recoveries and the custom reauth slot's sheet chrome (#2476) * test(auth): cover the three recoveries that write a value through to the step they move to * test(auth): assert a custom reauth slot's email and phone steps stay inside the library sheet --------- Co-authored-by: Ademola Fadumo <48495111+demolaf@users.noreply.github.com> Co-authored-by: demolaf <demolafadumo@gmail.com>
demolaf
added a commit
that referenced
this pull request
Sep 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
MFA enrollment kept its four steps in local composable state, so
onBackClickhand-rolled a back stack by inspecting the selected factor, and backing out of SMS enrollment discarded the phone number the user had typed. Each step is now its own destination, so system back walks them and entered data survives.Cross-step state moves into a
MfaEnrollmentFlowStateholder above the NavHost, with hand-writtenSavers so the SMS session and selected country survive Activity recreation. A TOTP secret can't survive one — the SDK'sTotpSecretis an interface with no public reconstruction path — so a lost secret is now regenerated with a fresh QR code and an explanatory message, rather than leaving the user on an opaque "No TOTP secret available" error.MfaEnrollmentDestinations.kt: shared graph extension registering the four steps, plusmfaEnrollmentStartStepso a single-allowed-factor config resolves its start step at flow entry instead of auto-advancing pastSelectFactor.MfaEnrollmentScreen: gainedstep/onNavigateToStep/onNavigateBack/flowStateas a required set (a partial subset throws at composition); a nullsteppreserves today's standalone behaviour.Added
MfaEnrollmentRouteNavigationTest,MfaEnrollmentFlowStateRestorationTestandMfaEnrollmentTotpRegenerationTest— data preservation across step switches and recreation, back-stack ordering, and TOTP regeneration.Usage
Maintainer note: Fixes internal CPRN-403