fix: prefer session user for phone_change verification (fixes #2430) - #2718
Open
deepshekhardas wants to merge 1 commit into
Open
fix: prefer session user for phone_change verification (fixes #2430)#2718deepshekhardas wants to merge 1 commit into
deepshekhardas wants to merge 1 commit into
Conversation
hf
changed the title
fadymak
requested changes
Sep 4, 2026
fadymak
left a comment
fadymak
left a comment
Contributor
There was a problem hiding this comment.
Thanks for the PR! I think the proper fix we want here is to perform the lookup by the token hash in the one_time_tokens table, not the phone.
It would also be helpful to have tests for these changes 🙏
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
3 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.
fix(verify): prefer session user for phone_change verification (fixes #2430)
phone_changehas no unique constraint, soFindUserByPhoneChangeAndAudiencereturns an arbitrary first match whenseveral users have an uncompleted (abandoned) pending phone change for
the same number. Verifying the OTP could then update a different
user's
phonethan the currently authenticated one.When a valid session is presented and its user's
phone_changematchesthe phone being verified, prefer the session user over the ambiguous
lookup. Unauthenticated verification keeps the existing fallback.