Repository navigation
fix(settings): When enabled, ask for 2FA before approving a v2 pairing flow - #21431
Merged
Merged
Conversation
…pairing Because: - The v2 pairing flow approved a sign-in from the desktop without asking a 2FA account for its TOTP code, unlike v1. This commit: - Adds /pair/authority/totp, reusing the v1 AuthTotp page, and sends 2FA accounts there before the approval screen. - Re-prompts for the code if the approval screen has been open longer than four minutes. - Shares the TOTP-required check between v1 AuthAllow and the v2 container. - Rejects a web channel command promptly when Firefox replies with an error for it. - Registers the route in both content-server lists and adds a v2 functional test. Fixes FXA-14643
nshirley
reviewed
Oct 8, 2026
| FXA_STATUS_TIMEOUT_MS | ||
| ); | ||
| ).catch((err) => { | ||
| console.warn('[Firefox WebChannel] fxa_status failed', err); |
Contributor
There was a problem hiding this comment.
maybe a dumb question; can/should this go to sentry? Feels kind of important if that message fails
Contributor
Author
There was a problem hiding this comment.
shows up as bread crumbs
nshirley
reviewed
Oct 8, 2026
nshirley
approved these changes
Oct 8, 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
2 participants
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.
Because
This pull request
Issue that this pull request solves
Closes: FXA-14643
Checklist
Put an
xin the boxes that applyHow to review (Optional)
Screenshots (Optional)
FXA-14643 — v2 pairing asks a 2FA account for its code before approving
Recording, after (this branch), authority side only:
video-redacted.mp4
Other information (Optional)
Any other information that is important to this pull request.