Update to make sure naming is consistent

Author: localden

samples/AuthorizationExample/Program.cs

@@ -24,7 +24,7 @@ public static async Task Main(string[] args)
         var transportOptions = new SseClientTransportOptions
         {
             Endpoint = serverEndpoint,
-            AuthorizationOptions = new McpAuthorizationOptions
+            AuthorizationOptions = new AuthorizationOptions
             {
                 // Pre-registered client credentials (if applicable)
                 ClientId = "04f79824-ab56-4511-a7cb-d7deaea92dc0",

src/ModelContextProtocol.AspNetCore/McpAuthorizationExtensions.cs renamed to src/ModelContextProtocol.AspNetCore/AuthorizationExtensions.cs

@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace ModelContextProtocol.AspNetCore;
 
 /// <summary>
 /// Extension methods for using MCP authorization in ASP.NET Core applications.
 /// </summary>
-public static class McpAuthorizationExtensions
+public static class AuthorizationExtensions
 {
     /// <summary>
     /// Adds MCP authorization middleware to the specified <see cref="IApplicationBuilder"/>, which enables
@@ -16,6 +15,6 @@ public static class McpAuthorizationExtensions
     /// <returns>A reference to this instance after the operation has completed.</returns>
     public static IApplicationBuilder UseMcpAuthorization(this IApplicationBuilder builder)
     {
-        return builder.UseMiddleware<McpAuthorizationMiddleware>();
+        return builder.UseMiddleware<AuthorizationMiddleware>();
     }
 }

src/ModelContextProtocol.AspNetCore/McpAuthorizationMiddleware.cs renamed to src/ModelContextProtocol.AspNetCore/AuthorizationMiddleware.cs

@@ -2,7 +2,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using ModelContextProtocol.Protocol.Auth;
-using ModelContextProtocol.Protocol.Types;
 using ModelContextProtocol.Server;
 using ModelContextProtocol.Utils.Json;
 using System.Text.Json;
@@ -12,17 +11,17 @@ namespace ModelContextProtocol.AspNetCore;
 /// <summary>
 /// Middleware that handles authorization for MCP servers.
 /// </summary>
-internal class McpAuthorizationMiddleware
+internal class AuthorizationMiddleware
 {
     private readonly RequestDelegate _next;
-    private readonly ILogger<McpAuthorizationMiddleware> _logger;
+    private readonly ILogger<AuthorizationMiddleware> _logger;
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="McpAuthorizationMiddleware"/> class.
+    /// Initializes a new instance of the <see cref="AuthorizationMiddleware"/> class.
     /// </summary>
     /// <param name="next">The next middleware in the pipeline.</param>
     /// <param name="logger">The logger factory.</param>
-    public McpAuthorizationMiddleware(RequestDelegate next, ILogger<McpAuthorizationMiddleware> logger)
+    public AuthorizationMiddleware(RequestDelegate next, ILogger<AuthorizationMiddleware> logger)
     {
         _next = next ?? throw new ArgumentNullException(nameof(next));
         _logger = logger ?? throw new ArgumentNullException(nameof(logger));

src/ModelContextProtocol/McpAuthorizationException.cs renamed to src/ModelContextProtocol/AuthorizationException.cs

@@ -7,52 +7,52 @@ namespace ModelContextProtocol;
 /// This exception is thrown when the client fails to authenticate with an MCP server that requires
 /// authentication, such as when the OAuth authorization flow fails or when the server rejects the provided credentials.
 /// </remarks>
-public class McpAuthorizationException : McpException
+public class AuthorizationException : McpException
 {
     /// <summary>
-    /// Initializes a new instance of the <see cref="McpAuthorizationException"/> class.
+    /// Initializes a new instance of the <see cref="AuthorizationException"/> class.
     /// </summary>
-    public McpAuthorizationException() 
+    public AuthorizationException() 
         : base("Authorization failed", McpErrorCode.InvalidRequest)
     {
     }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="McpAuthorizationException"/> class with a specified error message.
+    /// Initializes a new instance of the <see cref="AuthorizationException"/> class with a specified error message.
     /// </summary>
     /// <param name="message">The message that describes the error.</param>
-    public McpAuthorizationException(string message) 
+    public AuthorizationException(string message) 
         : base(message, McpErrorCode.InvalidRequest)
     {
     }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="McpAuthorizationException"/> class with a specified error message and a reference to the inner exception that is the cause of this exception.
+    /// Initializes a new instance of the <see cref="AuthorizationException"/> class with a specified error message and a reference to the inner exception that is the cause of this exception.
     /// </summary>
     /// <param name="message">The message that describes the error.</param>
     /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
-    public McpAuthorizationException(string message, Exception? innerException) 
+    public AuthorizationException(string message, Exception? innerException) 
         : base(message, innerException, McpErrorCode.InvalidRequest)
     {
     }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="McpAuthorizationException"/> class with a specified error message and error code.
+    /// Initializes a new instance of the <see cref="AuthorizationException"/> class with a specified error message and error code.
     /// </summary>
     /// <param name="message">The message that describes the error.</param>
     /// <param name="errorCode">The MCP error code. Should use one of the standard error codes.</param>
-    public McpAuthorizationException(string message, McpErrorCode errorCode) 
+    public AuthorizationException(string message, McpErrorCode errorCode) 
         : base(message, errorCode)
     {
     }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="McpAuthorizationException"/> class with a specified error message, inner exception, and error code.
+    /// Initializes a new instance of the <see cref="AuthorizationException"/> class with a specified error message, inner exception, and error code.
     /// </summary>
     /// <param name="message">The message that describes the error.</param>
     /// <param name="innerException">The exception that is the cause of the current exception, or a null reference if no inner exception is specified.</param>
     /// <param name="errorCode">The MCP error code. Should use one of the standard error codes.</param>
-    public McpAuthorizationException(string message, Exception? innerException, McpErrorCode errorCode) 
+    public AuthorizationException(string message, Exception? innerException, McpErrorCode errorCode) 
         : base(message, innerException, errorCode)
     {
     }

src/ModelContextProtocol/Configuration/McpServerAuthorizationExtensions.cs

@@ -19,7 +19,7 @@ public static class McpServerAuthorizationExtensions
     /// <exception cref="ArgumentNullException"><paramref name="builder"/> or <paramref name="authorizationProvider"/> is <see langword="null"/>.</exception>
     public static IMcpServerBuilder WithAuthorization(
         this IMcpServerBuilder builder,
-        IMcpServerAuthorizationProvider authorizationProvider)
+        IServerAuthorizationProvider authorizationProvider)
     {
         Throw.IfNull(builder);
         Throw.IfNull(authorizationProvider);

src/ModelContextProtocol/Protocol/Auth/McpAuthorizationOptions.cs renamed to src/ModelContextProtocol/Protocol/Auth/AuthorizationOptions.cs

@@ -6,7 +6,7 @@ namespace ModelContextProtocol.Protocol.Auth;
 /// <summary>
 /// Provides authorization options for MCP clients.
 /// </summary>
-public class McpAuthorizationOptions
+public class AuthorizationOptions
 {
     /// <summary>
     /// Gets or sets a delegate that handles the OAuth 2.0 authorization code flow.

src/ModelContextProtocol/Protocol/Auth/DefaultAuthorizationHandler.cs

@@ -25,7 +25,7 @@ internal class DefaultAuthorizationHandler : IAuthorizationHandler
     /// </summary>
     /// <param name="loggerFactory">The logger factory.</param>
     /// <param name="options">The authorization options.</param>
-    public DefaultAuthorizationHandler(ILoggerFactory? loggerFactory = null, McpAuthorizationOptions? options = null)
+    public DefaultAuthorizationHandler(ILoggerFactory? loggerFactory = null, AuthorizationOptions? options = null)
     {
         _logger = loggerFactory != null 
             ? loggerFactory.CreateLogger<DefaultAuthorizationHandler>() 
@@ -47,7 +47,7 @@ public DefaultAuthorizationHandler(ILoggerFactory? loggerFactory = null, McpAuth
     /// <param name="loggerFactory">The logger factory.</param>
     /// <param name="authorizeCallback">A callback function that handles the authorization code flow.</param>
     public DefaultAuthorizationHandler(ILoggerFactory? loggerFactory = null, Func<ClientMetadata, Task<(string RedirectUri, string Code)>>? authorizeCallback = null)
-        : this(loggerFactory, new McpAuthorizationOptions { AuthorizeCallback = authorizeCallback })
+        : this(loggerFactory, new AuthorizationOptions { AuthorizeCallback = authorizeCallback })
     {
     }
 
@@ -90,7 +90,7 @@ public async Task<bool> HandleUnauthorizedResponseAsync(HttpResponseMessage resp
             _logger.LogWarning("Failed to extract resource metadata from 401 response");
 
             // Create a more specific exception
-            var exception = new McpAuthorizationException("Authorization required but no resource metadata available")
+            var exception = new AuthorizationException("Authorization required but no resource metadata available")
             {
                 ResourceUri = serverUri.ToString()
             };
@@ -106,7 +106,7 @@ public async Task<bool> HandleUnauthorizedResponseAsync(HttpResponseMessage resp
             _logger.LogWarning("Resource URL mismatch: expected {Expected}, got {Actual}", 
                 serverUri, resourceMetadata.Resource);
 
-            var exception = new McpAuthorizationException($"Resource URL mismatch: expected {serverUri}, got {resourceMetadata.Resource}");
+            var exception = new AuthorizationException($"Resource URL mismatch: expected {serverUri}, got {resourceMetadata.Resource}");
             exception.ResourceUri = resourceMetadata.Resource;
             throw exception;
         }
@@ -116,7 +116,7 @@ public async Task<bool> HandleUnauthorizedResponseAsync(HttpResponseMessage resp
         {
             _logger.LogWarning("No authorization servers found in resource metadata");
 
-            var exception = new McpAuthorizationException("No authorization servers available");
+            var exception = new AuthorizationException("No authorization servers available");
             exception.ResourceUri = resourceMetadata.Resource;
             throw exception;
         }
@@ -166,7 +166,7 @@ public async Task<bool> HandleUnauthorizedResponseAsync(HttpResponseMessage resp
             {
                 _logger.LogWarning("Authorization server does not support dynamic client registration and no client ID was provided");
 
-                var exception = new McpAuthorizationException(
+                var exception = new AuthorizationException(
                     "Authorization server does not support dynamic client registration and no client ID was provided. " +
                     "Use McpAuthorizationOptions.ClientId to provide a pre-registered client ID.");
                 exception.ResourceUri = resourceMetadata.Resource;
@@ -179,7 +179,7 @@ public async Task<bool> HandleUnauthorizedResponseAsync(HttpResponseMessage resp
             {
                 _logger.LogWarning("No authorization callback provided, can't proceed with OAuth flow");
 
-                var exception = new McpAuthorizationException(
+                var exception = new AuthorizationException(
                     "Authentication is required but no authorization callback was provided. " +
                     "Use McpAuthorizationOptions.AuthorizeCallback to provide a callback function.");
                 exception.ResourceUri = resourceMetadata.Resource;
@@ -227,11 +227,11 @@ public async Task<bool> HandleUnauthorizedResponseAsync(HttpResponseMessage resp
             _logger.LogDebug("Successfully obtained access token");
             return true;
         }
-        catch (Exception ex) when (ex is not McpAuthorizationException)
+        catch (Exception ex) when (ex is not AuthorizationException)
         {
             _logger.LogError(ex, "Failed to complete authorization flow");
 
-            var authException = new McpAuthorizationException(
+            var authException = new AuthorizationException(
                 $"Failed to complete authorization flow: {ex.Message}", ex, McpErrorCode.InvalidRequest);
 
             authException.ResourceUri = resourceMetadata.Resource;

src/ModelContextProtocol/Protocol/Auth/IMcpServerAuthorizationProvider.cs renamed to src/ModelContextProtocol/Protocol/Auth/IServerAuthorizationProvider.cs

@@ -9,7 +9,7 @@ namespace ModelContextProtocol.Protocol.Auth;
 /// This interface is implemented by authorization providers that enable MCP servers to validate tokens
 /// and control access to protected resources.
 /// </remarks>
-public interface IMcpServerAuthorizationProvider
+public interface IServerAuthorizationProvider
 {
     /// <summary>
     /// Gets the Protected Resource Metadata (PRM) for the server.

src/ModelContextProtocol/Protocol/Transport/SseClientTransport.cs

@@ -69,7 +69,7 @@ public SseClientTransport(SseClientTransportOptions transportOptions, HttpClient
     /// <param name="redirectPath">The path for the redirect URI. Default is "/callback".</param>
     /// <param name="successHtml">The HTML content to display on successful authorization. If null, a default message is shown.</param>
     /// <param name="errorHtml">The HTML template to display on failed authorization. If null, a default message is shown. Use {0} as a placeholder for the error message.</param>
-    /// <returns>A delegate that can be used for the <see cref="McpAuthorizationOptions.AuthorizeCallback"/> property.</returns>
+    /// <returns>A delegate that can be used for the <see cref="AuthorizationOptions.AuthorizeCallback"/> property.</returns>
     /// <remarks>
     /// <para>
     /// This method creates a delegate that implements a complete OAuth 2.0 authorization code flow using an HTTP listener. 
@@ -211,7 +211,7 @@ public SseClientTransport(SseClientTransportOptions transportOptions, HttpClient
     /// <param name="openBrowser">A function that opens a URL in the browser.</param>
     /// <param name="listenPort">The local port to listen on for the redirect URI.</param>
     /// <param name="redirectPath">The path for the redirect URI.</param>
-    /// <returns>A delegate that can be used for the <see cref="McpAuthorizationOptions.AuthorizeCallback"/> property.</returns>
+    /// <returns>A delegate that can be used for the <see cref="AuthorizationOptions.AuthorizeCallback"/> property.</returns>
     /// <remarks>
     /// This is a convenience method that calls <see cref="CreateHttpListenerAuthorizeCallback"/> with "localhost" as the hostname.
     /// </remarks>

src/ModelContextProtocol/Protocol/Transport/SseClientTransportOptions.cs

@@ -88,5 +88,5 @@ public required Uri Endpoint
     /// </code>
     /// </para>
     /// </remarks>
-    public McpAuthorizationOptions? AuthorizationOptions { get; init; }
+    public AuthorizationOptions? AuthorizationOptions { get; init; }
 }