Skip to content

Allow additional grant types during client registration #21

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

Merged
merged 1 commit into from
Sep 29, 2025
Merged

Allow additional grant types during client registration #21

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions src/mcp/server/auth/handlers/register.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,20 @@ async def handle(self, request: Request) -> Response:
status_code=400,
)
grant_types_set: set[str] = set(client_metadata.grant_types)
valid_sets = [
required_sets = [
{"authorization_code", "refresh_token"},
{"client_credentials"},
{"token_exchange"},
{"client_credentials", "token_exchange"},
]

if grant_types_set not in valid_sets:
if not any(required_set.issubset(grant_types_set) for required_set in required_sets):
return PydanticJSONResponse(
content=RegistrationErrorResponse(
error="invalid_client_metadata",
error_description=(
"grant_types must be authorization_code and refresh_token "
"or client_credentials or token exchange or client_credentials and token_exchange"
"grant_types must include authorization_code and refresh_token, "
"client_credentials, token_exchange, or client_credentials and token_exchange"
),
),
status_code=400,
Expand Down
4 changes: 3 additions & 1 deletion src/mcp/shared/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,15 @@ class OAuthClientMetadata(BaseModel):
# client_secret_post;
# ie: we do not support client_secret_basic
token_endpoint_auth_method: Literal["none", "client_secret_post"] = "client_secret_post"
# grant_types: this implementation supports authorization_code, refresh_token, client_credentials, & token_exchange
# grant_types: this implementation supports authorization_code, refresh_token, client_credentials, token_exchange,
# and allows additional grant types provided by the client (e.g. device code)
grant_types: list[
Literal[
"authorization_code",
"refresh_token",
"client_credentials",
"token_exchange",
"urn:ietf:params:oauth:grant-type:device_code",
]
] = [
"authorization_code",
Expand Down