Fix MCP Authentication - Auto-evict invalid clients and trigger re-registration #250978
+141
−6
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
When an MCP server restarts and loses client information, VS Code continues using the stored client ID for authentication requests. The server returns an
invalid_client
OAuth error because the client no longer exists, but VS Code retains the invalid client indefinitely with no way to automatically recover. Users must manually clean global storage to resolve the issue.Solution
This PR implements proper handling of
invalid_client
OAuth errors per RFC 6749 section 5.2, automatically evicting invalid clients and triggering Dynamic Client Registration when needed.Key Changes
Enhanced OAuth Error Detection
isAuthorizationTokenErrorResponse()
type guard for proper error parsinginvalid_client
errors specificallyComprehensive Error Handling
exchangeCodeForToken()
detects invalid client during initial authexchangeRefreshTokenForToken()
detects invalid client during token refreshgetSessions()
andcreateSession()
handle invalid client scenariosClient Eviction Flow
InvalidClientError
class to carry OAuth error details through the system$invalidateClient()
protocol method signals client invalidity to main threadExample Flow
Testing
isAuthorizationTokenErrorResponse
type guardThis ensures VS Code gracefully handles "registration lost" scenarios in OAuth flows, eliminating the need for manual storage cleanup.
Fixes #250960.
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.