Harden token exchange shop context handling#2081
Closed
lizkenyon wants to merge 1 commit into
Closed
Conversation
9b924ba to
1f65f90
Compare
lizkenyon
commented
Jun 18, 2026
| ) | ||
| end | ||
|
|
||
| def requested_shopify_domain |
Contributor
Author
There was a problem hiding this comment.
AI:
This split keeps requested shop context available for bootstrap and routing, while aligning authenticated helpers with verified token/session context.
lizkenyon
commented
Jun 18, 2026
| return false if requested_domain.blank? | ||
|
|
||
| authenticated_domain = current_shopify_session&.shop || jwt_shopify_domain | ||
| return false if authenticated_domain.blank? || authenticated_domain == requested_domain |
Contributor
Author
There was a problem hiding this comment.
AI:
This keeps the added validation scoped to cases where both contexts are available, so existing missing/invalid token bounce and retry behavior remains unchanged.
e758b18 to
0e5e485
Compare
0e5e485 to
a09ccc0
Compare
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.
What this PR does
Reviewer's guide to testing
Validated locally with:
Things to focus on
lib/shopify_app/controller_concerns/token_exchange.rbChecklist
CHANGELOG.mdif the changes would impact usersREADME.md, if appropriate./docs, if necessary