Skip to content

fix(oauth): merge auth params into existing authorization_endpoint query (RFC 6749 3.1) #3509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ege-arhan wants to merge 1 commit into from
+7 −2
Closed

fix(oauth): merge auth params into existing authorization_endpoint query (RFC 6749 3.1) #3509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/mcp/client/auth/oauth2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from collections.abc import AsyncGenerator, Awaitable, Callable
from dataclasses import dataclass, field
from typing import Any, Protocol, get_args
from urllib.parse import quote, urlencode, urljoin, urlparse
from urllib.parse import parse_qsl, quote, urlencode, urljoin, urlparse, urlsplit, urlunsplit

import anyio
import httpx2
Expand Down Expand Up @@ -424,7 +424,12 @@ async def _perform_authorization_code_grant(self) -> tuple[str, str]:
if "offline_access" in self.context.client_metadata.scope.split():
auth_params["prompt"] = "consent"

authorization_url = f"{auth_endpoint}?{urlencode(auth_params)}"
# RFC 6749 §3.1: authorization_endpoint MAY already carry a query
# component which MUST be retained. Merge instead of appending
# a second '?'. (TS SDK does the same via URL + searchParams.)
parts = urlsplit(auth_endpoint)
merged = parse_qsl(parts.query, keep_blank_values=True) + list(auth_params.items())
authorization_url = urlunsplit((parts.scheme, parts.netloc, parts.path, urlencode(merged), parts.fragment))
await self.context.redirect_handler(authorization_url)

# Wait for callback
Expand Down
Loading