Remove the query field in the URI before reconstructing to avoid duplicated query field in new URI

[AndyJiang99]

Description

When querying a non-standard userinfo endpoint (not the Microsoft one found in https://login.microsoftonline.com/<TENANT_ID>/v2.0/.well-known/openid-configuration), and instead, using UserInfo endpoint querying method (https://learn.microsoft.com/en-us/entra/identity-platform/userinfo) , the Trino code identifies the URL with the query params, however, during the original parsing, rather than starting a URL builder from scratch, it's taking the original URL and re-appending the query string to itself, resulting in duplicate query param.
E.g. https://graph.microsoft.com/v1.0/me?select=id,userPrincipalName,displayName,email,onPremisesSamAccountName&select=id,userPrincipalName,displayName,email,onPremisesSamAccountName instead of the expected https://graph.microsoft.com/v1.0/me?select=id,userPrincipalName,displayName,email,onPremisesSamAccountName.

Additional context and related issues

Release notes

( ) This is not user-visible or is docs only, and no release notes are required.
( ) Release notes are required. Please propose a release note for me.
( ) Release notes are required, with the following suggested text:

## Section
* Fix some things. ({issue}`issuenumber`)

Summary by Sourcery

Bug Fixes:

• Strip the original query field in UriBuilder to avoid appending duplicate query parameters

[sourcery-ai]

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Strip existing query parameters from the original URI before reappending them in the OAuth2 HTTP client, preventing duplicate query strings when reconstructing request URLs.

Sequence diagram for HTTP request URI reconstruction in OAuth2 client

sequenceDiagram
participant "NimbusAirliftHttpClient"
participant "UriBuilder"
participant "HTTP Request"
NimbusAirliftHttpClient->>HTTP Request: getURI()
NimbusAirliftHttpClient->>UriBuilder: fromUri(HTTP Request URI)
UriBuilder-->>NimbusAirliftHttpClient: UriBuilder instance
NimbusAirliftHttpClient->>UriBuilder: replaceQuery(null)
NimbusAirliftHttpClient->>UriBuilder: queryParam(key, value)
NimbusAirliftHttpClient->>HTTP Request: set URI (with correct query params)

Loading

Class diagram for updated NimbusAirliftHttpClient URI handling

classDiagram
class NimbusAirliftHttpClient {
  +execute(nimbusRequest, parser)
}
class UriBuilder {
  +fromUri(uri)
  +replaceQuery(query)
  +queryParam(key, value)
}
NimbusAirliftHttpClient --> UriBuilder : uses

Loading

File-Level Changes

Change	Details	Files
Clear existing query parameters on the URI builder before reconstructing the URL	Invoke replaceQuery(null) on the UriBuilder instance Adjust UriBuilder instantiation to start without the original query string	core/trino-main/src/main/java/io/trino/server/security/oauth2/NimbusAirliftHttpClient.java

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it. You can also reply to a
  review comment with @sourcery-ai issue to create an issue from it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time. You can also comment
  @sourcery-ai title on the pull request to (re-)generate the title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time exactly where you
  want it. You can also comment @sourcery-ai summary on the pull request to
  (re-)generate the summary at any time.
• Generate reviewer's guide: Comment @sourcery-ai guide on the pull
  request to (re-)generate the reviewer's guide at any time.
• Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
  pull request to resolve all Sourcery comments. Useful if you've already
  addressed all the comments and don't want to see them anymore.
• Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
  request to dismiss all existing Sourcery reviews. Especially useful if you
  want to start fresh with a new review - don't forget to comment
  @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[sourcery-ai]

Hey there - I've reviewed your changes and they look great!

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}