Fix MCP OAuth client_secret_basic authentication support #257283
Draft
+69
−17
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.
Problem
VS Code's MCP OAuth implementation was hardcoding
token_endpoint_auth_method: 'none'
during dynamic client registration, regardless of what authentication methods the authorization server actually supported. This caused token endpoint requests to fail for servers that required client authentication.Specifically:
fetchDynamicRegistration
function always requested'none'
authenticationclient_secret
in the registration response, it wasn't being used properly for token requestsclient_secret_basic
(like the MCP server in the issue) would reject token requests due to missing authenticationSolution
1. Smart Authentication Method Selection
Updated
fetchDynamicRegistration()
to inspect the server'stoken_endpoint_auth_methods_supported
and choose the most appropriate method:client_secret_basic
if supportedclient_secret_post
if supportednone
if neither is supported2. Proper Client Authentication in Token Requests
Updated
exchangeCodeForToken()
andexchangeRefreshTokenForToken()
to handle different authentication methods correctly:client_secret_basic: Use HTTP Basic authentication
Authorization: Basic <base64(client_id:client_secret)>
client_secret_post: Include credentials in request body (existing behavior)
none: Include only client_id in request body (existing behavior)
3. State Management
Added
_tokenEndpointAuthMethod
field toDynamicAuthProvider
to track the negotiated authentication method from registration through to token requests.Example
Before this fix, a server with this metadata would fail:
VS Code would request
token_endpoint_auth_method: 'none'
during registration, receive aclient_secret
, but then send token requests without proper authentication, causing them to be rejected.After this fix, VS Code will:
token_endpoint_auth_method: 'client_secret_basic'
during registrationclient_secret
and auth methodCompatibility
Fixes #257277.
Warning
Firewall rules blocked me from connecting to one or more addresses
I tried to connect to the following addresses, but was blocked by firewall rules:
electronjs.org
node-gyp
(dns block)If you need me to access, download, or install something from one of these locations, you can either:
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.