Update for cleanup

Author: localden

samples/ProtectedMCPServer/Program.cs

@@ -1,10 +1,10 @@
-using System.Net.Http.Headers;
-using System.Security.Claims;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.IdentityModel.Tokens;
 using ModelContextProtocol.AspNetCore.Authentication;
-using ModelContextProtocol.Types.Authentication;
+using ModelContextProtocol.Authentication;
 using ProtectedMCPServer.Tools;
+using System.Net.Http.Headers;
+using System.Security.Claims;
 
 var builder = WebApplication.CreateBuilder(args);
 

src/ModelContextProtocol.AspNetCore/Authentication/McpAuthenticationHandler.cs

@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using ModelContextProtocol.Types.Authentication;
+using ModelContextProtocol.Authentication;
 using ModelContextProtocol.Utils.Json;
 using System.Text.Encodings.Web;
 

src/ModelContextProtocol.AspNetCore/Authentication/McpAuthenticationOptions.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
-using ModelContextProtocol.Types.Authentication;
+using ModelContextProtocol.Authentication;
 
 namespace ModelContextProtocol.AspNetCore.Authentication;
 

src/ModelContextProtocol/Authentication/AuthorizationDelegatingHandler.cs

@@ -1,4 +1,3 @@
-using ModelContextProtocol.Authentication.Types;
 using ModelContextProtocol.Utils;
 using System.Net.Http.Headers;
 
@@ -79,11 +78,9 @@ private async Task<HttpResponseMessage> HandleUnauthorizedResponseAsync(
             {
                 if (serverSchemes.Count > 0)
                 {
-                    throw new AuthenticationSchemeMismatchException(
+                    throw new InvalidOperationException(
                         $"No matching authentication scheme found. Server supports: [{string.Join(", ", serverSchemes)}], " +
-                        $"Provider supports: [{string.Join(", ", supportedSchemes)}].",
-                        serverSchemes,
-                        supportedSchemes);
+                        $"Provider supports: [{string.Join(", ", supportedSchemes)}].");
                 }
 
                 // If the server didn't specify any schemes, use the provider's default

src/ModelContextProtocol/Authentication/AuthorizationHelpers.cs

@@ -1,4 +1,3 @@
-using ModelContextProtocol.Types.Authentication;
 using ModelContextProtocol.Utils;
 using ModelContextProtocol.Utils.Json;
 using System.Text.Json;

…ation/Types/ProtectedResourceMetadata.cs …hentication/ProtectedResourceMetadata.cssrc/ModelContextProtocol/Authentication/Types/ProtectedResourceMetadata.cs renamed to src/ModelContextProtocol/Authentication/ProtectedResourceMetadata.cs src/ModelContextProtocol/Authentication/Types/ProtectedResourceMetadata.cs renamed to src/ModelContextProtocol/Authentication/ProtectedResourceMetadata.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace ModelContextProtocol.Types.Authentication;
+namespace ModelContextProtocol.Authentication;
 
 /// <summary>
 /// Represents the resource metadata for OAuth authorization as defined in RFC 9396.

src/ModelContextProtocol/Authentication/Types/AuthenticationSchemeMismatchException.cs

@@ -1,5 +1,5 @@
 using Microsoft.Extensions.AI;
-using ModelContextProtocol.Types.Authentication;
+using ModelContextProtocol.Authentication;
 using ModelContextProtocol.Protocol.Messages;
 using ModelContextProtocol.Protocol.Types;
 using System.Diagnostics.CodeAnalysis;