Fix useMfa error handling
#50844
Merged
Fix useMfa error handling
#50844
+45
−37
Conversation
This file contains 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
Joerger
added
no-changelog
|
Can we use the American-English spelling (canceled) instead of the British-English spelling (cancelled)? |
Joerger
force-pushed
the
joerger/fix-useMfa-error-state
branch
from
01d553d to
dd33f6a
Compare
Joerger
force-pushed
the
joerger/fix-useMfa-error-state
branch
from
dd33f6a to
6de6710
Compare
gzdunek
reviewed
Jan 13, 2025
gzdunek
reviewed
Jan 14, 2025
gzdunek
approved these changes
Jan 15, 2025
kimlisa
approved these changes
Jan 16, 2025
| }: Props) { | ||
| if (!challenge && attempt.status !== 'error') return; | ||
| const showMfaDialog = | ||
| !!challenge || |
There was a problem hiding this comment.
i just want to make sure this is show mfa dialog if there IS a challenge? i think that not is throwing me off (brain farting)
There was a problem hiding this comment.
Yeah I don't know why I thought it was more readable this way, updated to:
const showError =
attempt.status === 'error' && !(attempt.error instanceof MfaCanceledError);
if (!challenge && !showError) return;
public-teleport-github-review-bot
bot
removed the request for review
from kiosion
Joerger
added a commit
that referenced
this pull request
Jan 16, 2025
mvbrock
pushed a commit
that referenced
this pull request
Jan 18, 2025
Joerger
added a commit
that referenced
this pull request
Jan 21, 2025
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jan 21, 2025
* Add SSO MFA prompt for WebUI MFA flows (#49794) * Include sso channel ID in web mfa challenges. * Handle SSO MFA challenges. * Handle sso response in backend. * Handle non-webauthn mfa response for file transfer, admin actions, and app session. * Simplify useMfa with new helpers. * Fix lint. * Use AuthnDialog for file transfers; Fix json backend logic for file transfers. * Make useMfa and AuthnDialog more reusable and error proof. * Use AuthnDialog for App sessions. * Resolve comments. * Fix broken app launcher; improve mfaRequired logic in useMfa. * Fix AuthnDialog test. * Fix merge conflict with Db web access. * fix stories. * Refactor mfa required logic. * Address bl-nero's comments. * Address Ryan's comments. * Add useMfa unit test. * Fix story lint. * Replace Promise.withResolvers for compatiblity with older browers; Fix bug where MFA couldn't be retried after a failed attempt; Add extra tests. * Fix Per-session MFA for desktops (#50793) * Add sendChallengeResponse implementation for desktop sessions. * Rename useMfaTty to useMfaEmitter. * Remove unused code. * Fix `useMfa` error handling (#50844) * Fix useMfa cancel logic to avoid duplicate error messages across dialog layers. * Add MfaCanceledError and use promise.reject for mfa cancel. * Address comments. * Fix test. * Remove outdated comment. * Add comment; Simplify who dialog logic. --------- Co-authored-by: Roman Tkachenko <roman@goteleport.com>
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.
The original error is now displayed in the MFA dialog, and the
MFA canclled by usererror is displayed at the top level after the MFA dialog is closed:Fixes #50582
This will be backported with #50529