Skip to content

fix(oauth): use dict list value for multi-resource RFC 8707 token requests #5078

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

Open
pjaroliya wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −12
Open

fix(oauth): use dict list value for multi-resource RFC 8707 token requests #5078

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
28 changes: 16 additions & 12 deletions mcpgateway/services/oauth_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1595,12 +1595,14 @@ async def _exchange_code_for_tokens(
scopes = runtime_credentials.get("scopes", [])
if self._should_include_resource_parameter(credentials, scopes):
if isinstance(resource, list):
# RFC 8707 allows multiple resource parameters - use list of tuples
form_data: list[tuple[str, str]] = list(token_data.items())
for r in resource:
if r:
form_data.append(("resource", r))
token_data = form_data # type: ignore[assignment]
# RFC 8707 allows multiple resource parameters.
# Keep token_data as a dict with a list value — httpx's encode_urlencoded_data
# expands list values into repeated key=value pairs automatically.
# Converting to a list of tuples instead causes httpx to treat the payload as
# a raw sync iterable (IteratorByteStream) rather than form data, which
# raises RuntimeError on AsyncClient ("Attempted to send an sync request
# with an AsyncClient instance").
token_data["resource"] = [r for r in resource if r] # type: ignore[assignment]
else:
token_data["resource"] = resource

Expand Down Expand Up @@ -1706,12 +1708,14 @@ async def refresh_token(
scopes = runtime_credentials.get("scopes", [])
if self._should_include_resource_parameter(credentials, scopes):
if isinstance(resource, list):
# RFC 8707 allows multiple resource parameters - use list of tuples
form_data: list[tuple[str, str]] = list(token_data.items())
for r in resource:
if r:
form_data.append(("resource", r))
token_data = form_data # type: ignore[assignment]
# RFC 8707 allows multiple resource parameters.
# Keep token_data as a dict with a list value — httpx's encode_urlencoded_data
# expands list values into repeated key=value pairs automatically.
# Converting to a list of tuples instead causes httpx to treat the payload as
# a raw sync iterable (IteratorByteStream) rather than form data, which
# raises RuntimeError on AsyncClient ("Attempted to send an sync request
# with an AsyncClient instance").
token_data["resource"] = [r for r in resource if r] # type: ignore[assignment]
else:
token_data["resource"] = resource

Expand Down