-
Notifications
You must be signed in to change notification settings - Fork 2.7k
(Closed) #1567
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.
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
SoldierSacha
wants to merge
137
commits into
modelcontextprotocol:main
from
sacha-development-stuff:claude/fix-oauth-merge-conflicts-011CUn5iR64uPZaLGKe1MF7J
Closed
(Closed) #1567
SoldierSacha
wants to merge
137
commits into
modelcontextprotocol:main
from
sacha-development-stuff:claude/fix-oauth-merge-conflicts-011CUn5iR64uPZaLGKe1MF7J
+1,138
−243
Conversation
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
…for-oauth-client-credentials Add OAuth client credentials grant
…mplement-client-credentials-support Fix auth registration for client credentials
…mentation-of-client-credentials-flow Refactor auth helper methods
Fix failing tests and pyright
…eerror-in-pytest-test-case Fix OAuth tests using async fixtures
Fix resumption token update logic
Add OAuth token exchange support
…change-implementation-for-test-failures Fix token exchange metadata tests
Reported-by: sachabaniassad
Fix pyright case issues in tests and example
…-test-for-client-registration Allow additional grant types during client registration
…ge-conflicts-in-sdk-fork Resolve OAuth auth flow merge conflicts
…ionreseterror-in-stdio_client-test Handle closed stdin in stdio client
# Conflicts: # src/mcp/client/auth/oauth2.py # src/mcp/shared/auth.py # tests/client/test_auth.py # tests/issues/test_88_random_error.py # tests/shared/test_streamable_http.py
…hub-merge-conflicts-for-oauth-support Resolve upstream merge conflicts while preserving OAuth extensions
This commit resolves two critical issues that arose after merging upstream changes: 1. Export missing OAuth providers: Added ClientCredentialsProvider and TokenExchangeProvider to mcp.client.auth module exports. These providers are essential for the client credentials and token exchange grant types that were added in the OAuth support fork. 2. Add redirect_uris validation: Implemented validation to ensure redirect_uris is provided when authorization_code is in the grant_types. This field is required for the authorization code flow but optional for client_credentials and token_exchange flows which don't use redirect URIs. These fixes ensure all tests pass while maintaining the integrity of the OAuth extensions including client credentials and token exchange grant types.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation and Context
How Has This Been Tested?
Breaking Changes
Types of changes
Checklist
Additional context