No direct inclusion of HTTP client factory

Author: localden

Directory.Packages.props

@@ -9,7 +9,6 @@
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Bcl.Memory" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
     <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
@@ -19,15 +18,13 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.15" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
     <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
   </ItemGroup>
   <!-- Product dependencies .NET 9 -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
     <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.9.0" />
     <PackageVersion Include="System.IO.Pipelines" Version="9.0.4" />

samples/ProtectedMCPClient/BasicOAuthAuthorizationProvider.cs

@@ -24,8 +24,8 @@ public class BasicOAuthAuthorizationProvider : ITokenProvider
     private readonly HttpClient _httpClient;
     private readonly AuthorizationHelpers _authorizationHelpers;
 
-    // Client name for IHttpClientFactory used by the BasicOAuthAuthorizationProvider
-    public const string HttpClientName = "ProtectedMCPClient.OAuth";
+    // Lazy-initialized shared HttpClient for when no client is provided
+    private static readonly Lazy<HttpClient> _defaultHttpClient = new(() => new HttpClient());
 
     private TokenContainer? _token;
     private AuthorizationServerMetadata? _authServerMetadata;
@@ -34,27 +34,24 @@ public class BasicOAuthAuthorizationProvider : ITokenProvider
     /// Initializes a new instance of the <see cref="BasicOAuthAuthorizationProvider"/> class.
     /// </summary>
     /// <param name="serverUrl">The MCP server URL.</param>
-    /// <param name="httpClientFactory">The HTTP client factory to use for creating HTTP clients.</param>
+    /// <param name="httpClient">The HTTP client to use for OAuth requests. If null, a default HttpClient will be used.</param>
     /// <param name="authorizationHelpers">The authorization helpers.</param>
     /// <param name="clientId">OAuth client ID.</param>
     /// <param name="clientSecret">OAuth client secret.</param>
     /// <param name="redirectUri">OAuth redirect URI.</param>
     /// <param name="scopes">OAuth scopes.</param>
     public BasicOAuthAuthorizationProvider(
         Uri serverUrl,
-        IHttpClientFactory httpClientFactory,
-        AuthorizationHelpers authorizationHelpers,
+        HttpClient? httpClient,
+        AuthorizationHelpers? authorizationHelpers,
         string clientId = "demo-client",
         string clientSecret = "",
         Uri? redirectUri = null,
         IEnumerable<string>? scopes = null)
     {
         _serverUrl = serverUrl ?? throw new ArgumentNullException(nameof(serverUrl));
-        if (httpClientFactory == null) throw new ArgumentNullException(nameof(httpClientFactory));
-        _authorizationHelpers = authorizationHelpers ?? throw new ArgumentNullException(nameof(authorizationHelpers));
-        
-        // Get the HttpClient once during construction instead of for each request
-        _httpClient = httpClientFactory.CreateClient(HttpClientName);
+        _httpClient = httpClient ?? _defaultHttpClient.Value;
+        _authorizationHelpers = authorizationHelpers ?? new AuthorizationHelpers(_httpClient);
 
         _redirectUri = redirectUri ?? new Uri("http://localhost:8080/callback");
         _scopes = scopes?.ToList() ?? [];

samples/ProtectedMCPClient/Program.cs

@@ -14,33 +14,21 @@ static async Task Main(string[] args)
 
         var serverUrl = "http://localhost:7071/sse";
 
-        var services = new ServiceCollection();
-        services.AddHttpClient();
-        
+        // We can customize a shared HttpClient with a custom handler if desired
         var sharedHandler = new SocketsHttpHandler
         {
             PooledConnectionLifetime = TimeSpan.FromMinutes(2),
             PooledConnectionIdleTimeout = TimeSpan.FromMinutes(1)
         };
 
-        services.AddHttpClient(BasicOAuthAuthorizationProvider.HttpClientName)
-            .ConfigurePrimaryHttpMessageHandler(() => sharedHandler);
-            
-        services.AddHttpClient(AuthorizationHelpers.HttpClientName)
-            .ConfigurePrimaryHttpMessageHandler(() => sharedHandler);
-        
-        services.AddTransient<AuthorizationHelpers>();
+        var httpClient = new HttpClient(sharedHandler);
 
-        var serviceProvider = services.BuildServiceProvider();
-        
-        var httpClientFactory = serviceProvider.GetRequiredService<IHttpClientFactory>();
-        var authorizationHelpers = serviceProvider.GetRequiredService<AuthorizationHelpers>();
-
-        // Create the token provider with proper dependencies
+        // Create the token provider with our custom HttpClient, 
+        // letting the AuthorizationHelpers be created automatically
         var tokenProvider = new BasicOAuthAuthorizationProvider(
             new Uri(serverUrl),
-            httpClientFactory,
-            authorizationHelpers,
+            httpClient,
+            null, // AuthorizationHelpers will be created automatically
             clientId: "6ad97b5f-7a7b-413f-8603-7a3517d4adb8",
             redirectUri: new Uri("http://localhost:1179/callback"),
             scopes: ["api://167b4284-3f92-4436-92ed-38b38f83ae08/weather.read"]
@@ -57,7 +45,11 @@ static async Task Main(string[] args)
                 Name = "Secure Weather Client"
             };
 
-            var transport = new SseClientTransport(transportOptions, tokenProvider);
+            // Create a transport with authentication support using the correct constructor parameters
+            var transport = new SseClientTransport(
+                transportOptions,
+                tokenProvider
+            );
             var client = await McpClientFactory.CreateAsync(transport);
 
             var tools = await client.ListToolsAsync();

src/ModelContextProtocol/Authentication/AuthorizationHelpers.cs

@@ -10,20 +10,15 @@ namespace ModelContextProtocol.Authentication;
 public class AuthorizationHelpers
 {
     private readonly HttpClient _httpClient;
-    
-    /// <summary>
-    /// Client name for IHttpClientFactory used by the AuthorizationHelpers.
-    /// </summary>
-    public const string HttpClientName = "ModelContextProtocol.Authentication";
+    private static readonly Lazy<HttpClient> _defaultHttpClient = new(() => new HttpClient());
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AuthorizationHelpers"/> class.
     /// </summary>
-    /// <param name="httpClientFactory">The HTTP client factory to use for creating HTTP clients.</param>
-    public AuthorizationHelpers(IHttpClientFactory httpClientFactory)
+    /// <param name="httpClient">The HTTP client to use for requests. If null, a default HttpClient will be used.</param>
+    public AuthorizationHelpers(HttpClient? httpClient = null)
     {
-        Throw.IfNull(httpClientFactory);
-        _httpClient = httpClientFactory.CreateClient(HttpClientName);
+        _httpClient = httpClient ?? _defaultHttpClient.Value;
     }
 
     /// <summary>
@@ -155,7 +150,7 @@ public async Task<ProtectedResourceMetadata> ExtractProtectedResourceMetadata(
                 var parts = p.Split(['='], 2);
                 if (parts.Length != 2)
                 {
-                    return new KeyValuePair<string, string>(string.Empty, string.Empty);
+                    return new KeyValuePair<string, string?>(string.Empty, null);
                 }
 
                 var key = parts[0].Trim();
@@ -167,16 +162,11 @@ public async Task<ProtectedResourceMetadata> ExtractProtectedResourceMetadata(
                     value = value.Substring(1, value.Length - 2);
                 }
 
-                return new KeyValuePair<string, string>(key, value);
+                return new KeyValuePair<string, string?>(key, value);
             })
             .Where(kvp => !string.IsNullOrEmpty(kvp.Key))
             .ToDictionary();
 
-        if (paramDict.TryGetValue(parameterName, out var value))
-        {
-            return value;
-        }
-
-        return null;
+        return paramDict.TryGetValue(parameterName, out var value) ? value : null;
     }
 }