Conversation
Because: * Users can keep 'canceling' the login when they see the merge warning until they get rate limited, and then they can bypass the merge warning by going through signin_unblock This commit: * Sends the command on this screen fixes FXA-13009
vpomerleau
approved these changes
Feb 5, 2026
Contributor
vpomerleau
left a comment
There was a problem hiding this comment.
Code looks good and works as expected when testing locally in nightly.
- Merge warning is shown on
signin_unblockwhen the final password attempt was correct (though throttled) + authorization code is correct; - merge warning not shown on signin_unblock when the final password attempt before blocking was incorrect - the merge warning is instead shown on the signin page after successfully unblocking and re-entering the correct password.
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.
Because:
This commit:
fixes FXA-13009
--
See this doc -
signin_unblockwasn't listed on places to add this check for the MVP, an oversight.Since we need the
uid, we have to wait until the user is at least partially authenticated with password before we can send this web channel message up. However, forsignin_unblock, we don't get back the user'suidafter password entry, we must wait until they are verified. So now, users in this flow will see the merge warning after the successful unblock, but they'll be redirected to email-first once they hit "cancel".I will file an issue for this: one thing that would make this flow much better because users would get "blocked" much earlier in the flow, would be the non-MVP cases shown in that doc - e.g., user has an entry in local storage and therefore as soon as we know the email they're trying to sign in with and it matches what's in local storage, use the UID there to send
can_link_account. However, there is an edge case where if a user deleted their account on another device and recreated it, we'd be sending the wrong UID up. This is probably OK, but I think that should be a separate task.edit: here's that ticket