Consolidate some OAuth logic

Author: localden

src/ModelContextProtocol/Auth/AuthorizationConfigExtensions.cs

@@ -49,7 +49,7 @@ public static AuthorizationConfig UseHttpListener(
         openBrowser ??= DefaultOpenBrowser;
 
         // Configure the handler
-        config.AuthorizationHandler = OAuthAuthorizationHelpers.CreateHttpListenerCallback(
+        config.AuthorizationHandler = OAuthHelpers.CreateHttpListenerCallback(
             openBrowser,
             hostname,
             listenPort,

src/ModelContextProtocol/Auth/McpClientExtensions.cs

@@ -98,9 +98,9 @@ public static async Task<OAuthToken> HandleUnauthorizedResponseAsync(
         }
 
         // Create OAuthAuthenticationService - use appropriate constructor based on whether we have a handler
-        OAuthAuthenticationService authService = config.AuthorizationHandler != null
-            ? new OAuthAuthenticationService(config.AuthorizationHandler)
-            : new OAuthAuthenticationService();
+        OAuthService authService = config.AuthorizationHandler != null
+            ? new OAuthService(config.AuthorizationHandler)
+            : new OAuthService();
 
         // Get resource URI
         var resourceUri = response.RequestMessage?.RequestUri ?? throw new InvalidOperationException("Request URI is not available.");

…otocol/Auth/OAuthAuthorizationHelpers.cs …odelContextProtocol/Auth/OAuthHelpers.cssrc/ModelContextProtocol/Auth/OAuthAuthorizationHelpers.cs renamed to src/ModelContextProtocol/Auth/OAuthHelpers.cs src/ModelContextProtocol/Auth/OAuthAuthorizationHelpers.cs renamed to src/ModelContextProtocol/Auth/OAuthHelpers.cs

@@ -1,21 +1,16 @@
-using System;
-using System.Collections.Generic;
+using ModelContextProtocol.Auth.Types;
+using ModelContextProtocol.Utils.Json;
 using System.Net;
-using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
 using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using ModelContextProtocol.Auth.Types;
-using ModelContextProtocol.Utils.Json;
 
 namespace ModelContextProtocol.Auth;
 
 /// <summary>
 /// Provides helper methods for handling OAuth authorization.
 /// </summary>
-public static class OAuthAuthorizationHelpers
+public static class OAuthHelpers
 {
     private static readonly HttpClient _httpClient = new();
 

…tocol/Auth/OAuthAuthenticationService.cs …odelContextProtocol/Auth/OAuthService.cssrc/ModelContextProtocol/Auth/OAuthAuthenticationService.cs renamed to src/ModelContextProtocol/Auth/OAuthService.cs src/ModelContextProtocol/Auth/OAuthAuthenticationService.cs renamed to src/ModelContextProtocol/Auth/OAuthService.cs

@@ -11,48 +11,23 @@ namespace ModelContextProtocol.Auth;
 /// <summary>
 /// Provides functionality for OAuth authentication in MCP clients.
 /// </summary>
-public class OAuthAuthenticationService
+public partial class OAuthService
 {
     private static readonly HttpClient _httpClient = new();
     private readonly Func<Uri, Task<string>>? _authorizationHandler;
 
     /// <summary>
-    /// Represents the PKCE code challenge and verifier for an authorization flow.
+    /// Initializes a new instance of the <see cref="OAuthService"/> class.
     /// </summary>
-    public class PkceValues
-    {
-        /// <summary>
-        /// The code verifier used to generate the code challenge.
-        /// </summary>
-        public string CodeVerifier { get; }
-        
-        /// <summary>
-        /// The code challenge sent to the authorization server.
-        /// </summary>
-        public string CodeChallenge { get; }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PkceValues"/> class.
-        /// </summary>
-        public PkceValues(string codeVerifier, string codeChallenge)
-        {
-            CodeVerifier = codeVerifier;
-            CodeChallenge = codeChallenge;
-        }
-    }
-    
-    /// <summary>
-    /// Initializes a new instance of the <see cref="OAuthAuthenticationService"/> class.
-    /// </summary>
-    public OAuthAuthenticationService()
+    public OAuthService()
     {
     }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="OAuthAuthenticationService"/> class with an authorization handler.
+    /// Initializes a new instance of the <see cref="OAuthService"/> class with an authorization handler.
     /// </summary>
     /// <param name="authorizationHandler">A handler to invoke when authorization is required.</param>
-    public OAuthAuthenticationService(Func<Uri, Task<string>> authorizationHandler)
+    public OAuthService(Func<Uri, Task<string>> authorizationHandler)
     {
         _authorizationHandler = authorizationHandler ?? throw new ArgumentNullException(nameof(authorizationHandler));
     }

src/ModelContextProtocol/Auth/Types/AuthorizationCodeOptions.cs

@@ -38,7 +38,7 @@ public class AuthorizationCodeOptions
     /// <summary>
     /// PKCE values for the authorization flow.
     /// </summary>
-    public OAuthAuthenticationService.PkceValues PkceValues { get; set; } = null!;
+    public PkceValues PkceValues { get; set; } = null!;
 
     /// <summary>
     /// A state value to protect against CSRF attacks.

src/ModelContextProtocol/Auth/Types/PkceValues.cs

@@ -0,0 +1,6 @@
+namespace ModelContextProtocol.Auth;
+
+
+/// <param name="CodeVerifier"> The code verifier used to generate the code challenge. </param>
+/// <param name="CodeChallenge"> The code challenge sent to the authorization server. </param>
+public record PkceValues(string CodeVerifier, string CodeChallenge);