[v17] Device Trust web: Ensure query params of redirect URL are not lost#62678
Merged
ravicious merged 3 commits intobranch/v17from Jan 8, 2026
Merged
Conversation
* Device Trust: Append query params to the processed redirect_uri * teleterm: Do not construct query params by hand This messes up the encoding. When interpolating redirect_uri within a string, the URL is simply not going to get encoded. This means that if redirect_uri is something like "https://example.com/hello?foo=1&bar=2", "bar=2" is going to be interpreted as one of the query param of the returned URL, not as one of the query params of redirect_uri. * makeDeepLinkWithSafeInput: Use URLSearchParams to construct query params This is not quite necessary, the previous code was good enough. But just to be safe, instead of constructing query params manually we can just delegate it to URLSearchParams. * teleterm deep links: Add tests for redirect_uri with query params
avatus
approved these changes
Jan 7, 2026
zmb3
approved these changes
Jan 7, 2026
public-teleport-github-review-bot
bot
removed the request for review
from codingllama
|
@ravicious - this PR will require admin approval to merge due to its size. Consider breaking it up into a series smaller changes. |
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
gzdunek
approved these changes
Jan 8, 2026
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
4 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.
Backport #62389 to branch/v18
changelog: Fixed an issue where logging in to the Web UI with Device Trust would lose query params of the redirect URL
Manual backport because v17 doesn't have a small change that was a result of updating typescript-eslint.
Also had to update Jest (by essentially backporting #56294 and #56295) because the old JSDOM version used by Jest on this branch did not support
URLSearchParams.prototype.sizewhich caused the tests for the new implementation to fail.