Cleanup

Author: localden

samples/ProtectedMCPClient/BasicOAuthAuthorizationProvider.cs

@@ -26,13 +26,11 @@ public class BasicOAuthAuthorizationProvider(
 {
     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 = new HttpClient();
+    private readonly List<string> _scopes = scopes?.ToList() ?? [];
+    private readonly HttpClient _httpClient = new();
 
-    // Single token storage
     private TokenContainer? _token;
 
-    // Store auth server metadata separately so token only stores token data
     private AuthorizationServerMetadata? _authServerMetadata;
 
     public string AuthorizationScheme => "Bearer";
@@ -82,7 +80,7 @@ public async Task<bool> HandleUnauthorizedResponseAsync(HttpResponseMessage resp
                     _authServerMetadata = authServerMetadata;
 
                     // Do the OAuth flow
-                    var token = await DoAuthorizationCodeFlowAsync(authServerMetadata, cancellationToken);
+                    var token = await InitiateAuthorizationCodeFlowAsync(authServerMetadata, cancellationToken);
                     if (token != null)
                     {
                         _token = token;
@@ -102,11 +100,9 @@ public async Task<bool> HandleUnauthorizedResponseAsync(HttpResponseMessage resp
 
     private async Task<AuthorizationServerMetadata?> GetAuthServerMetadataAsync(Uri authServerUri, CancellationToken cancellationToken)
     {
-        // Ensure trailing slash
         var baseUrl = authServerUri.ToString();
         if (!baseUrl.EndsWith("/")) baseUrl += "/";
 
-        // Try both well-known endpoints
         foreach (var path in new[] { ".well-known/openid-configuration", ".well-known/oauth-authorization-server" })
         {
             try
@@ -145,8 +141,7 @@ public async Task<bool> HandleUnauthorizedResponseAsync(HttpResponseMessage resp
             {
                 Content = requestContent
             };
-            
-            // Add client auth if we have a secret
+
             if (!string.IsNullOrEmpty(clientSecret))
             {
                 var authValue = Convert.ToBase64String(Encoding.UTF8.GetBytes($"{clientId}:{clientSecret}"));
@@ -162,7 +157,6 @@ public async Task<bool> HandleUnauthorizedResponseAsync(HttpResponseMessage resp
 
                 if (tokenResponse != null)
                 {
-                    // Set obtained time and preserve refresh token if needed
                     tokenResponse.ObtainedAt = DateTimeOffset.UtcNow;
                     if (string.IsNullOrEmpty(tokenResponse.RefreshToken))
                     {
@@ -181,22 +175,18 @@ public async Task<bool> HandleUnauthorizedResponseAsync(HttpResponseMessage resp
         return null;
     }
 
-    private async Task<TokenContainer?> DoAuthorizationCodeFlowAsync(
+    private async Task<TokenContainer?> InitiateAuthorizationCodeFlowAsync(
         AuthorizationServerMetadata authServerMetadata, 
         CancellationToken cancellationToken)
     {
-        // Generate PKCE values
         var codeVerifier = GenerateCodeVerifier();
         var codeChallenge = GenerateCodeChallenge(codeVerifier);
 
-        // Build the auth URL
         var authUrl = BuildAuthorizationUrl(authServerMetadata, codeChallenge);
 
-        // Get auth code
         var authCode = await GetAuthorizationCodeAsync(authUrl, cancellationToken);
         if (string.IsNullOrEmpty(authCode)) return null;
 
-        // Exchange for token
         return await ExchangeCodeForTokenAsync(authServerMetadata, authCode, codeVerifier, cancellationToken);
     }
 
@@ -231,18 +221,14 @@ private Uri BuildAuthorizationUrl(AuthorizationServerMetadata authServerMetadata
         {
             listener.Start();
 
-            // Open browser to the authorization URL
             OpenBrowser(authorizationUrl);
 
-            // Get the authorization code
             var context = await listener.GetContextAsync();
 
-            // Parse the response
             var query = HttpUtility.ParseQueryString(context.Request.Url?.Query ?? string.Empty);
             var code = query["code"];
             var error = query["error"];
 
-            // Send a response to the browser
             string responseHtml = "<html><body><h1>Authentication complete</h1><p>You can close this window now.</p></body></html>";
             byte[] buffer = Encoding.UTF8.GetBytes(responseHtml);
             context.Response.ContentLength64 = buffer.Length;
@@ -291,7 +277,6 @@ private Uri BuildAuthorizationUrl(AuthorizationServerMetadata authServerMetadata
                 Content = requestContent
             };
 
-            // Add client auth if we have a secret
             if (!string.IsNullOrEmpty(clientSecret))
             {
                 var authValue = Convert.ToBase64String(Encoding.UTF8.GetBytes($"{clientId}:{clientSecret}"));
@@ -307,7 +292,6 @@ private Uri BuildAuthorizationUrl(AuthorizationServerMetadata authServerMetadata
 
                 if (tokenResponse != null)
                 {
-                    // Set the time when the token was obtained
                     tokenResponse.ObtainedAt = DateTimeOffset.UtcNow;
                     return tokenResponse;
                 }

samples/ProtectedMCPClient/Program.cs

@@ -1,4 +1,3 @@
-using ModelContextProtocol.Authentication;
 using ModelContextProtocol.Client;
 using ModelContextProtocol.Protocol.Transport;
 
@@ -17,7 +16,7 @@ static async Task Main(string[] args)
             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" }
+            scopes: ["api://167b4284-3f92-4436-92ed-38b38f83ae08/weather.read"]
         );
 
         Console.WriteLine();
@@ -32,7 +31,6 @@ static async Task Main(string[] args)
             };
 
             var transport = new SseClientTransport(transportOptions, tokenProvider);
-
             var client = await McpClientFactory.CreateAsync(transport);
 
             var tools = await client.ListToolsAsync();
@@ -58,24 +56,14 @@ static async Task Main(string[] args)
                 Console.WriteLine();
             }
         }
-        catch (HttpRequestException ex) when (ex.StatusCode == System.Net.HttpStatusCode.Unauthorized)
-        {
-            // Handle authentication failures specifically
-            Console.WriteLine("Authentication failed. The server returned a 401 Unauthorized response.");
-            Console.WriteLine($"Details: {ex.Message}");
-            
-            // Additional handling for 401 - could add manual authentication retry here
-            Console.WriteLine("You might need to provide a different API key or authentication credentials.");
-        }
         catch (Exception ex)
         {
             Console.WriteLine($"Error: {ex.Message}");
             if (ex.InnerException != null)
             {
                 Console.WriteLine($"Inner error: {ex.InnerException.Message}");
             }
-            
-            // Print stack trace in debug builds
+
             #if DEBUG
             Console.WriteLine($"Stack trace: {ex.StackTrace}");
             #endif