Conversation
dschom
force-pushed
the
FXA-13627
branch
3 times, most recently
from
8fca746 to
9ef88dd
Compare
dschom
force-pushed
the
FXA-13627
branch
2 times, most recently
from
3a9e392 to
b989dd5
Compare
dschom
commented
May 19, 2026
|
|
||
| if (sessionToken.uid !== emailRecord.uid) { | ||
| throw error.invalidToken('Invalid session token'); | ||
| if (!emailsMatch(email, emailRecord.email)) { |
Contributor
Author
There was a problem hiding this comment.
We can go ahead and do this check here. There's not point in going further if we know the salt is wrong.
dschom
changed the title
dschom
commented
May 27, 2026
| const credentials = await crypto.getCredentials(email, password); | ||
| try { | ||
| const accountData = await this.sessionReauthWithAuthPW( | ||
| // v1 stretching salts using the account's initial signup email, which can |
Contributor
Author
There was a problem hiding this comment.
This was recommended after working through the issue with Claude. The end result was that despite adding an extra call, this is a much more reliable way to conduct the upgrade, see my comment a little bit further down about some confusing semantics and the source of this error...
dschom
commented
May 27, 2026
| // via checkEmailAddress). Map the helper's args onto the wire format. | ||
| const accountData = await this.sessionReauthWithAuthPW( | ||
| sessionToken, | ||
| derivationEmail, |
Contributor
Author
There was a problem hiding this comment.
No more catching the incorrect email case error and retrying. This should just work now...
…s and session reauths
Because:
- v1 password stretching salts using the account's original signup
email, which can differ from the user's current primary. Clients that
used the typed/current primary computed the wrong authPW on the first
try, forcing email-case retry logic and brittle lookahead in the
password-change and reauth flows.
This commit:
- Adds GET /session/original-account-email returning the account's
signup email for the authenticated session, with swagger docs.
- Adds AuthClient.fetchOriginalAccountEmail and uses it in
sessionReauth, passwordChange, and passwordChangeWithAuthPW so v1
derivations match the stored verifier on the first attempt.
- Threads originalLoginEmail through SessionReauthOptions so callers
that already fetched the email (e.g. passwordChangeWithAuthPW) avoid
a redundant round-trip.
- Updates auth-server route, password.ts, and remote tests to the new
flow; renames the sessionReauth parameter email -> primaryEmail to
disambiguate from the derivation email.
- Replaces a Sentry.captureMessage with captureException(err, { tags })
on the v2-upgrade failure path so stacks are preserved.
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
1 participant
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-13627
Checklist
Put an
xin the boxes that applyScreenshots (Optional)
Please attach the screenshots of the changes made in case of change in user interface.
Other information (Optional)
Any other information that is important to this pull request.