Simplification

Author: localden

samples/ProtectedMCPClient/BasicOAuthAuthorizationProvider.cs

@@ -22,13 +22,12 @@ public class BasicOAuthAuthorizationProvider(
     string clientId = "demo-client",
     string clientSecret = "",
     Uri? redirectUri = null,
-    IEnumerable<string>? scopes = null,
-    HttpClient? httpClient = null) : IMcpAuthorizationProvider
+    IEnumerable<string>? scopes = null) : IMcpAuthorizationProvider
 {
     private readonly Uri _serverUrl = serverUrl ?? throw new ArgumentNullException(nameof(serverUrl));
     private readonly Uri _redirectUri = redirectUri ?? new Uri("http://localhost:8080/callback");
     private readonly List<string> _scopes = scopes?.ToList() ?? new List<string>();
-    private readonly HttpClient _httpClient = httpClient ?? new HttpClient();
+    private readonly HttpClient _httpClient = new HttpClient();
 
     // Single token storage
     private TokenContainer? _token;

samples/ProtectedMCPClient/Program.cs

@@ -13,17 +13,20 @@ static async Task Main(string[] args)
 
         var serverUrl = "http://localhost:7071/sse";
 
-        var httpClient = new HttpClient();
-
         var tokenProvider = new BasicOAuthAuthorizationProvider(
             new Uri(serverUrl), 
             clientId: "6ad97b5f-7a7b-413f-8603-7a3517d4adb8",
             redirectUri: new Uri("http://localhost:1179/callback"),
-            scopes: new List<string> { "api://167b4284-3f92-4436-92ed-38b38f83ae08/weather.read" },
-            httpClient: httpClient);
+            scopes: new List<string> { "api://167b4284-3f92-4436-92ed-38b38f83ae08/weather.read" }
+            );
+
+        var authHandler = new AuthorizationDelegatingHandler(tokenProvider, "Bearer")
+        {
+            // 3. Set the inner handler (the handler that actually sends the request)
+            InnerHandler = new HttpClientHandler() 
+        };
 
-        // Use the same HttpClient instance with the authentication provider
-        var authenticatedClient = httpClient.UseMcpAuthorizationProvider(tokenProvider);
+        var httpClient = new HttpClient(authHandler);
 
         Console.WriteLine();
         Console.WriteLine($"Connecting to weather server at {serverUrl}...");
@@ -36,7 +39,8 @@ static async Task Main(string[] args)
                 Name = "Secure Weather Client"
             };
 
-            var transport = new SseClientTransport(transportOptions, authenticatedClient);
+            // Use the single, pre-configured HttpClient
+            var transport = new SseClientTransport(transportOptions, httpClient);
 
             var client = await McpClientFactory.CreateAsync(transport);
 

src/ModelContextProtocol/Authentication/AuthorizationDelegatingHandler.cs

@@ -5,7 +5,7 @@ namespace ModelContextProtocol.Authentication;
 /// <summary>
 /// A delegating handler that adds authentication tokens to requests and handles 401 responses.
 /// </summary>
-internal class AuthorizationDelegatingHandler : DelegatingHandler
+public class AuthorizationDelegatingHandler : DelegatingHandler
 {
     private readonly IMcpAuthorizationProvider _tokenProvider;
     private readonly string _scheme;