Update for consistency

Author: localden

src/ModelContextProtocol/Protocol/Auth/AuthorizationContext.cs

@@ -18,12 +18,12 @@ internal class AuthorizationContext
     /// <summary>
     /// Gets or sets the client registration response.
     /// </summary>
-    public ClientRegistrationResponse? ClientRegistration { get; set; }
+    public ClientRegistration? ClientRegistration { get; set; }
 
     /// <summary>
     /// Gets or sets the token response.
     /// </summary>
-    public TokenResponse? TokenResponse { get; set; }
+    public Token? TokenResponse { get; set; }
 
     /// <summary>
     /// Gets or sets the code verifier for PKCE.

src/ModelContextProtocol/Protocol/Auth/AuthorizationService.cs

@@ -174,7 +174,7 @@ public static Task<AuthorizationServerMetadata> DiscoverAuthorizationServerMetad
     /// <param name="clientMetadata">The client metadata for registration.</param>
     /// <returns>A <see cref="Task"/> that represents the asynchronous operation. The task result contains the client registration response.</returns>
     /// <exception cref="InvalidOperationException">Thrown when the authorization server does not support dynamic client registration.</exception>
-    public static async Task<ClientRegistrationResponse> RegisterClientAsync(
+    public static async Task<ClientRegistration> RegisterClientAsync(
         AuthorizationServerMetadata metadata,
         ClientMetadata clientMetadata)
     {
@@ -198,7 +198,7 @@ public static async Task<ClientRegistrationResponse> RegisterClientAsync(
         var contentStream = await response.Content.ReadAsStreamAsync();
         using var reader = new StreamReader(contentStream);
         var json = await reader.ReadToEndAsync();
-        var result = JsonSerializer.Deserialize(json, McpJsonUtilities.JsonContext.Default.ClientRegistrationResponse);
+        var result = JsonSerializer.Deserialize(json, McpJsonUtilities.JsonContext.Default.ClientRegistration);
 
         if (result == null)
         {
@@ -288,7 +288,7 @@ public static string CreateAuthorizationUrl(
     /// <param name="code">The authorization code received from the authorization server.</param>
     /// <param name="codeVerifier">The code verifier for PKCE.</param>
     /// <returns>A <see cref="Task"/> that represents the asynchronous operation. The task result contains the token response.</returns>
-    public static async Task<TokenResponse> ExchangeCodeForTokensAsync(
+    public static async Task<Token> ExchangeCodeForTokensAsync(
         AuthorizationServerMetadata metadata,
         string clientId,
         string? clientSecret,
@@ -330,7 +330,7 @@ public static async Task<TokenResponse> ExchangeCodeForTokensAsync(
         var contentStream = await response.Content.ReadAsStreamAsync();
         using var reader = new StreamReader(contentStream);
         var json = await reader.ReadToEndAsync();
-        var result = JsonSerializer.Deserialize(json, McpJsonUtilities.JsonContext.Default.TokenResponse);
+        var result = JsonSerializer.Deserialize(json, McpJsonUtilities.JsonContext.Default.Token);
 
         if (result == null)
         {
@@ -348,7 +348,7 @@ public static async Task<TokenResponse> ExchangeCodeForTokensAsync(
     /// <param name="clientSecret">The client secret.</param>
     /// <param name="refreshToken">The refresh token.</param>
     /// <returns>A <see cref="Task"/> that represents the asynchronous operation. The task result contains the token response.</returns>
-    public static async Task<TokenResponse> RefreshTokenAsync(
+    public static async Task<Token> RefreshTokenAsync(
         AuthorizationServerMetadata metadata,
         string clientId,
         string? clientSecret,
@@ -384,7 +384,7 @@ public static async Task<TokenResponse> RefreshTokenAsync(
         var contentStream = await response.Content.ReadAsStreamAsync();
         using var reader = new StreamReader(contentStream);
         var json = await reader.ReadToEndAsync();
-        var result = JsonSerializer.Deserialize(json, McpJsonUtilities.JsonContext.Default.TokenResponse);
+        var result = JsonSerializer.Deserialize(json, McpJsonUtilities.JsonContext.Default.Token);
 
         if (result == null)
         {

…tocol/Auth/ClientRegistrationResponse.cs …ocol/Protocol/Auth/ClientRegistration.cssrc/ModelContextProtocol/Protocol/Auth/ClientRegistrationResponse.cs renamed to src/ModelContextProtocol/Protocol/Auth/ClientRegistration.cs src/ModelContextProtocol/Protocol/Auth/ClientRegistrationResponse.cs renamed to src/ModelContextProtocol/Protocol/Auth/ClientRegistration.cs

@@ -5,7 +5,7 @@ namespace ModelContextProtocol.Protocol.Auth;
 /// <summary>
 /// Represents the OAuth 2.0 client registration response as defined in RFC 7591.
 /// </summary>
-public class ClientRegistrationResponse
+public class ClientRegistration
 {
     /// <summary>
     /// Gets or sets the OAuth 2.0 client identifier string.

src/ModelContextProtocol/Protocol/Auth/DefaultAuthorizationHandler.cs

@@ -140,7 +140,7 @@ public async Task<bool> HandleUnauthorizedResponseAsync(HttpResponseMessage resp
                 _logger.LogDebug("Using pre-configured client ID: {ClientId}", _clientId);
 
                 // Create a client registration response to store in the context
-                var clientRegistration = new ClientRegistrationResponse
+                var clientRegistration = new ClientRegistration
                 {
                     ClientId = _clientId!, // Using null-forgiving operator since we've already checked it's not null
                     ClientSecret = _clientSecret,

…tProtocol/Protocol/Auth/TokenResponse.cs …elContextProtocol/Protocol/Auth/Token.cssrc/ModelContextProtocol/Protocol/Auth/TokenResponse.cs renamed to src/ModelContextProtocol/Protocol/Auth/Token.cs src/ModelContextProtocol/Protocol/Auth/TokenResponse.cs renamed to src/ModelContextProtocol/Protocol/Auth/Token.cs

@@ -5,7 +5,7 @@ namespace ModelContextProtocol.Protocol.Auth;
 /// <summary>
 /// Represents the OAuth 2.0 token response as defined in RFC 6749.
 /// </summary>
-public class TokenResponse
+public class Token
 {
     /// <summary>
     /// Gets or sets the access token issued by the authorization server.

src/ModelContextProtocol/Utils/Json/McpJsonUtilities.cs

@@ -127,8 +127,8 @@ internal static bool IsValidMcpToolSchema(JsonElement element)
     [JsonSerializable(typeof(Protocol.Auth.ProtectedResourceMetadata))]
     [JsonSerializable(typeof(Protocol.Auth.AuthorizationServerMetadata))]
     [JsonSerializable(typeof(Protocol.Auth.ClientMetadata))]
-    [JsonSerializable(typeof(Protocol.Auth.ClientRegistrationResponse))]
-    [JsonSerializable(typeof(Protocol.Auth.TokenResponse))]
+    [JsonSerializable(typeof(Protocol.Auth.ClientRegistration))]
+    [JsonSerializable(typeof(Protocol.Auth.Token))]
 
     [ExcludeFromCodeCoverage]
     internal sealed partial class JsonContext : JsonSerializerContext;