feat(auth): make each MFA enrollment step a real navigation destination - #2467

Merged
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav
Sep 2, 2026
Merged

feat(auth): make each MFA enrollment step a real navigation destination#2467
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav

Conversation

@demolaf

Copy link
Copy Markdown
Member

MFA enrollment kept its four steps in local composable state, so onBackClick hand-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 MfaEnrollmentFlowState holder above the NavHost, with hand-written Savers so the SMS session and selected country survive Activity recreation. A TOTP secret can't survive one — the SDK's TotpSecret is 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, plus mfaEnrollmentStartStep so a single-allowed-factor config resolves its start step at flow entry instead of auto-advancing past SelectFactor.
  • MfaEnrollmentScreen: gained step/onNavigateToStep/onNavigateBack/flowState as a required set (a partial subset throws at composition); a null step preserves today's standalone behaviour.

Added MfaEnrollmentRouteNavigationTest, MfaEnrollmentFlowStateRestorationTest and MfaEnrollmentTotpRegenerationTest — data preservation across step switches and recreation, back-stack ordering, and TOTP regeneration.

Usage

val flowState = rememberMfaEnrollmentFlowState()
NavHost(...) {
mfaEnrollmentDestinations(navController, configuration, /**/ flowState = flowState)
}

Maintainer note: Fixes internal CPRN-403

@gemini-code-assistgemini-code-assistBot 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.

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
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 84abce8 to 4d4fe41CompareSeptember 2, 2026 01:10
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 4d4fe41 to 548c396CompareSeptember 2, 2026 13:17
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 548c396 to a38bb4fCompareSeptember 2, 2026 13:30
Base automatically changed from feat/auth-per-step-nav-destinations to version-10.0.0-beta05September 2, 2026 14:23
@russellwheatley
russellwheatleyforce-pushed the feat/mfa-enrollment-per-step-nav branch from a38bb4f to bfc6583CompareSeptember 2, 2026 14:23
@russellwheatley
russellwheatley merged commit bfc90ec into version-10.0.0-beta05Sep 2, 2026
9 checks passed
Sign up for freeto 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.

2 participants

@demolaf@russellwheatley
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

feat(auth): make each MFA enrollment step a real navigation destination - #2467

Merged
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav
Sep 2, 2026
Merged

feat(auth): make each MFA enrollment step a real navigation destination#2467
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav

Conversation

@demolaf

Copy link
Copy Markdown
Member

MFA enrollment kept its four steps in local composable state, so onBackClick hand-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 MfaEnrollmentFlowState holder above the NavHost, with hand-written Savers so the SMS session and selected country survive Activity recreation. A TOTP secret can't survive one — the SDK's TotpSecret is 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, plus mfaEnrollmentStartStep so a single-allowed-factor config resolves its start step at flow entry instead of auto-advancing past SelectFactor.
  • MfaEnrollmentScreen: gained step/onNavigateToStep/onNavigateBack/flowState as a required set (a partial subset throws at composition); a null step preserves today's standalone behaviour.

Added MfaEnrollmentRouteNavigationTest, MfaEnrollmentFlowStateRestorationTest and MfaEnrollmentTotpRegenerationTest — data preservation across step switches and recreation, back-stack ordering, and TOTP regeneration.

Usage

val flowState = rememberMfaEnrollmentFlowState()
NavHost(...) {
mfaEnrollmentDestinations(navController, configuration, /**/ flowState = flowState)
}

Maintainer note: Fixes internal CPRN-403

@gemini-code-assistgemini-code-assistBot 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.

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
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 84abce8 to 4d4fe41CompareSeptember 2, 2026 01:10
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 4d4fe41 to 548c396CompareSeptember 2, 2026 13:17
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 548c396 to a38bb4fCompareSeptember 2, 2026 13:30
Base automatically changed from feat/auth-per-step-nav-destinations to version-10.0.0-beta05September 2, 2026 14:23
@russellwheatley
russellwheatleyforce-pushed the feat/mfa-enrollment-per-step-nav branch from a38bb4f to bfc6583CompareSeptember 2, 2026 14:23
@russellwheatley
russellwheatley merged commit bfc90ec into version-10.0.0-beta05Sep 2, 2026
9 checks passed
Sign up for freeto 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.

2 participants

@demolaf@russellwheatley
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(auth): make each MFA enrollment step a real navigation destination - #2467

Merged
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav
Sep 2, 2026
Merged

feat(auth): make each MFA enrollment step a real navigation destination#2467
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav

Conversation

@demolaf

Copy link
Copy Markdown
Member

MFA enrollment kept its four steps in local composable state, so onBackClick hand-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 MfaEnrollmentFlowState holder above the NavHost, with hand-written Savers so the SMS session and selected country survive Activity recreation. A TOTP secret can't survive one — the SDK's TotpSecret is 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, plus mfaEnrollmentStartStep so a single-allowed-factor config resolves its start step at flow entry instead of auto-advancing past SelectFactor.
  • MfaEnrollmentScreen: gained step/onNavigateToStep/onNavigateBack/flowState as a required set (a partial subset throws at composition); a null step preserves today's standalone behaviour.

Added MfaEnrollmentRouteNavigationTest, MfaEnrollmentFlowStateRestorationTest and MfaEnrollmentTotpRegenerationTest — data preservation across step switches and recreation, back-stack ordering, and TOTP regeneration.

Usage

val flowState = rememberMfaEnrollmentFlowState()
NavHost(...) {
mfaEnrollmentDestinations(navController, configuration, /**/ flowState = flowState)
}

Maintainer note: Fixes internal CPRN-403

@gemini-code-assistgemini-code-assistBot 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.

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
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 84abce8 to 4d4fe41CompareSeptember 2, 2026 01:10
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 4d4fe41 to 548c396CompareSeptember 2, 2026 13:17
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 548c396 to a38bb4fCompareSeptember 2, 2026 13:30
Base automatically changed from feat/auth-per-step-nav-destinations to version-10.0.0-beta05September 2, 2026 14:23
@russellwheatley
russellwheatleyforce-pushed the feat/mfa-enrollment-per-step-nav branch from a38bb4f to bfc6583CompareSeptember 2, 2026 14:23
@russellwheatley
russellwheatley merged commit bfc90ec into version-10.0.0-beta05Sep 2, 2026
9 checks passed
Sign up for freeto 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.

2 participants

@demolaf@russellwheatley
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(auth): make each MFA enrollment step a real navigation destination - #2467

Merged
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav
Sep 2, 2026
Merged

feat(auth): make each MFA enrollment step a real navigation destination#2467
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav

Conversation

@demolaf

Copy link
Copy Markdown
Member

MFA enrollment kept its four steps in local composable state, so onBackClick hand-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 MfaEnrollmentFlowState holder above the NavHost, with hand-written Savers so the SMS session and selected country survive Activity recreation. A TOTP secret can't survive one — the SDK's TotpSecret is 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, plus mfaEnrollmentStartStep so a single-allowed-factor config resolves its start step at flow entry instead of auto-advancing past SelectFactor.
  • MfaEnrollmentScreen: gained step/onNavigateToStep/onNavigateBack/flowState as a required set (a partial subset throws at composition); a null step preserves today's standalone behaviour.

Added MfaEnrollmentRouteNavigationTest, MfaEnrollmentFlowStateRestorationTest and MfaEnrollmentTotpRegenerationTest — data preservation across step switches and recreation, back-stack ordering, and TOTP regeneration.

Usage

val flowState = rememberMfaEnrollmentFlowState()
NavHost(...) {
mfaEnrollmentDestinations(navController, configuration, /**/ flowState = flowState)
}

Maintainer note: Fixes internal CPRN-403

@gemini-code-assistgemini-code-assistBot 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.

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
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 84abce8 to 4d4fe41CompareSeptember 2, 2026 01:10
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 4d4fe41 to 548c396CompareSeptember 2, 2026 13:17
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 548c396 to a38bb4fCompareSeptember 2, 2026 13:30
Base automatically changed from feat/auth-per-step-nav-destinations to version-10.0.0-beta05September 2, 2026 14:23
@russellwheatley
russellwheatleyforce-pushed the feat/mfa-enrollment-per-step-nav branch from a38bb4f to bfc6583CompareSeptember 2, 2026 14:23
@russellwheatley
russellwheatley merged commit bfc90ec into version-10.0.0-beta05Sep 2, 2026
9 checks passed
Sign up for freeto 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.

2 participants

@demolaf@russellwheatley
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

feat(auth): make each MFA enrollment step a real navigation destination - #2467

Merged
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav
Sep 2, 2026
Merged

feat(auth): make each MFA enrollment step a real navigation destination#2467
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav

Conversation

@demolaf

Copy link
Copy Markdown
Member

MFA enrollment kept its four steps in local composable state, so onBackClick hand-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 MfaEnrollmentFlowState holder above the NavHost, with hand-written Savers so the SMS session and selected country survive Activity recreation. A TOTP secret can't survive one — the SDK's TotpSecret is 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, plus mfaEnrollmentStartStep so a single-allowed-factor config resolves its start step at flow entry instead of auto-advancing past SelectFactor.
  • MfaEnrollmentScreen: gained step/onNavigateToStep/onNavigateBack/flowState as a required set (a partial subset throws at composition); a null step preserves today's standalone behaviour.

Added MfaEnrollmentRouteNavigationTest, MfaEnrollmentFlowStateRestorationTest and MfaEnrollmentTotpRegenerationTest — data preservation across step switches and recreation, back-stack ordering, and TOTP regeneration.

Usage

val flowState = rememberMfaEnrollmentFlowState()
NavHost(...) {
mfaEnrollmentDestinations(navController, configuration, /**/ flowState = flowState)
}

Maintainer note: Fixes internal CPRN-403

@gemini-code-assistgemini-code-assistBot 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.

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
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 84abce8 to 4d4fe41CompareSeptember 2, 2026 01:10
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 4d4fe41 to 548c396CompareSeptember 2, 2026 13:17
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 548c396 to a38bb4fCompareSeptember 2, 2026 13:30
Base automatically changed from feat/auth-per-step-nav-destinations to version-10.0.0-beta05September 2, 2026 14:23
@russellwheatley
russellwheatleyforce-pushed the feat/mfa-enrollment-per-step-nav branch from a38bb4f to bfc6583CompareSeptember 2, 2026 14:23
@russellwheatley
russellwheatley merged commit bfc90ec into version-10.0.0-beta05Sep 2, 2026
9 checks passed
Sign up for freeto 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.

2 participants

@demolaf@russellwheatley
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(auth): make each MFA enrollment step a real navigation destination - #2467

Merged
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav
Sep 2, 2026
Merged

feat(auth): make each MFA enrollment step a real navigation destination#2467
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav

Conversation

@demolaf

Copy link
Copy Markdown
Member

MFA enrollment kept its four steps in local composable state, so onBackClick hand-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 MfaEnrollmentFlowState holder above the NavHost, with hand-written Savers so the SMS session and selected country survive Activity recreation. A TOTP secret can't survive one — the SDK's TotpSecret is 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, plus mfaEnrollmentStartStep so a single-allowed-factor config resolves its start step at flow entry instead of auto-advancing past SelectFactor.
  • MfaEnrollmentScreen: gained step/onNavigateToStep/onNavigateBack/flowState as a required set (a partial subset throws at composition); a null step preserves today's standalone behaviour.

Added MfaEnrollmentRouteNavigationTest, MfaEnrollmentFlowStateRestorationTest and MfaEnrollmentTotpRegenerationTest — data preservation across step switches and recreation, back-stack ordering, and TOTP regeneration.

Usage

val flowState = rememberMfaEnrollmentFlowState()
NavHost(...) {
mfaEnrollmentDestinations(navController, configuration, /**/ flowState = flowState)
}

Maintainer note: Fixes internal CPRN-403

@gemini-code-assistgemini-code-assistBot 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.

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
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 84abce8 to 4d4fe41CompareSeptember 2, 2026 01:10
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 4d4fe41 to 548c396CompareSeptember 2, 2026 13:17
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 548c396 to a38bb4fCompareSeptember 2, 2026 13:30
Base automatically changed from feat/auth-per-step-nav-destinations to version-10.0.0-beta05September 2, 2026 14:23
@russellwheatley
russellwheatleyforce-pushed the feat/mfa-enrollment-per-step-nav branch from a38bb4f to bfc6583CompareSeptember 2, 2026 14:23
@russellwheatley
russellwheatley merged commit bfc90ec into version-10.0.0-beta05Sep 2, 2026
9 checks passed
Sign up for freeto 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.

2 participants

@demolaf@russellwheatley
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(auth): make each MFA enrollment step a real navigation destination - #2467

Merged
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav
Sep 2, 2026
Merged

feat(auth): make each MFA enrollment step a real navigation destination#2467
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav

Conversation

@demolaf

Copy link
Copy Markdown
Member

MFA enrollment kept its four steps in local composable state, so onBackClick hand-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 MfaEnrollmentFlowState holder above the NavHost, with hand-written Savers so the SMS session and selected country survive Activity recreation. A TOTP secret can't survive one — the SDK's TotpSecret is 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, plus mfaEnrollmentStartStep so a single-allowed-factor config resolves its start step at flow entry instead of auto-advancing past SelectFactor.
  • MfaEnrollmentScreen: gained step/onNavigateToStep/onNavigateBack/flowState as a required set (a partial subset throws at composition); a null step preserves today's standalone behaviour.

Added MfaEnrollmentRouteNavigationTest, MfaEnrollmentFlowStateRestorationTest and MfaEnrollmentTotpRegenerationTest — data preservation across step switches and recreation, back-stack ordering, and TOTP regeneration.

Usage

val flowState = rememberMfaEnrollmentFlowState()
NavHost(...) {
mfaEnrollmentDestinations(navController, configuration, /**/ flowState = flowState)
}

Maintainer note: Fixes internal CPRN-403

@gemini-code-assistgemini-code-assistBot 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.

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
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 84abce8 to 4d4fe41CompareSeptember 2, 2026 01:10
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 4d4fe41 to 548c396CompareSeptember 2, 2026 13:17
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 548c396 to a38bb4fCompareSeptember 2, 2026 13:30
Base automatically changed from feat/auth-per-step-nav-destinations to version-10.0.0-beta05September 2, 2026 14:23
@russellwheatley
russellwheatleyforce-pushed the feat/mfa-enrollment-per-step-nav branch from a38bb4f to bfc6583CompareSeptember 2, 2026 14:23
@russellwheatley
russellwheatley merged commit bfc90ec into version-10.0.0-beta05Sep 2, 2026
9 checks passed
Sign up for freeto 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.

2 participants

@demolaf@russellwheatley
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

feat(auth): make each MFA enrollment step a real navigation destination - #2467

Merged
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav
Sep 2, 2026
Merged

feat(auth): make each MFA enrollment step a real navigation destination#2467
russellwheatley merged 1 commit into
version-10.0.0-beta05from
feat/mfa-enrollment-per-step-nav

Conversation

@demolaf

Copy link
Copy Markdown
Member

MFA enrollment kept its four steps in local composable state, so onBackClick hand-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 MfaEnrollmentFlowState holder above the NavHost, with hand-written Savers so the SMS session and selected country survive Activity recreation. A TOTP secret can't survive one — the SDK's TotpSecret is 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, plus mfaEnrollmentStartStep so a single-allowed-factor config resolves its start step at flow entry instead of auto-advancing past SelectFactor.
  • MfaEnrollmentScreen: gained step/onNavigateToStep/onNavigateBack/flowState as a required set (a partial subset throws at composition); a null step preserves today's standalone behaviour.

Added MfaEnrollmentRouteNavigationTest, MfaEnrollmentFlowStateRestorationTest and MfaEnrollmentTotpRegenerationTest — data preservation across step switches and recreation, back-stack ordering, and TOTP regeneration.

Usage

val flowState = rememberMfaEnrollmentFlowState()
NavHost(...) {
mfaEnrollmentDestinations(navController, configuration, /**/ flowState = flowState)
}

Maintainer note: Fixes internal CPRN-403

@gemini-code-assistgemini-code-assistBot 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.

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
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 84abce8 to 4d4fe41CompareSeptember 2, 2026 01:10
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 4d4fe41 to 548c396CompareSeptember 2, 2026 13:17
@demolaf
demolafforce-pushed the feat/mfa-enrollment-per-step-nav branch from 548c396 to a38bb4fCompareSeptember 2, 2026 13:30
Base automatically changed from feat/auth-per-step-nav-destinations to version-10.0.0-beta05September 2, 2026 14:23
@russellwheatley
russellwheatleyforce-pushed the feat/mfa-enrollment-per-step-nav branch from a38bb4f to bfc6583CompareSeptember 2, 2026 14:23
@russellwheatley
russellwheatley merged commit bfc90ec into version-10.0.0-beta05Sep 2, 2026
9 checks passed
Sign up for freeto 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.

2 participants

@demolaf@russellwheatley