Bit more cleanup here.

Author: localden

src/ModelContextProtocol/Protocol/Auth/AuthorizationContext.cs

@@ -8,7 +8,7 @@ internal class AuthorizationContext
     /// <summary>
     /// Gets or sets the resource metadata.
     /// </summary>
-    public ResourceMetadata? ResourceMetadata { get; set; }
+    public ProtectedResourceMetadata? ResourceMetadata { get; set; }
 
     /// <summary>
     /// Gets or sets the authorization server metadata.

src/ModelContextProtocol/Protocol/Auth/AuthorizationService.cs

@@ -26,7 +26,7 @@ public class AuthorizationService
     /// </summary>
     /// <param name="response">The HTTP response that contains the WWW-Authenticate header.</param>
     /// <returns>A <see cref="Task"/> that represents the asynchronous operation. The task result contains the resource metadata if available.</returns>
-    public static async Task<ResourceMetadata?> GetResourceMetadataFromResponseAsync(HttpResponseMessage response)
+    public static async Task<ProtectedResourceMetadata?> GetResourceMetadataFromResponseAsync(HttpResponseMessage response)
     {
         if (response.StatusCode != HttpStatusCode.Unauthorized)
         {
@@ -71,7 +71,7 @@ public class AuthorizationService
             // Read as string first, then deserialize using source-generated serializer
             using var reader = new StreamReader(contentStream);
             var json = await reader.ReadToEndAsync();
-            return JsonSerializer.Deserialize(json, McpJsonUtilities.JsonContext.Default.ResourceMetadata);
+            return JsonSerializer.Deserialize(json, McpJsonUtilities.JsonContext.Default.ProtectedResourceMetadata);
         }
         catch (Exception)
         {

src/ModelContextProtocol/Protocol/Auth/ProtectedResourceMetadata.cs

@@ -17,13 +17,13 @@ public class ProtectedResourceMetadata
     /// Gets or sets the resource identifier URI.
     /// </summary>
     [JsonPropertyName("resource")]
-    public required string Resource { get; set; }
+    public required Uri Resource { get; set; }
 
     /// <summary>
     /// Gets or sets the authorization servers that can be used for authentication.
     /// </summary>
     [JsonPropertyName("authorization_servers")]
-    public required string[] AuthorizationServers { get; set; }
+    public required Uri[] AuthorizationServers { get; set; }
 
     /// <summary>
     /// Gets or sets the bearer token methods supported by the resource.
@@ -41,18 +41,5 @@ public class ProtectedResourceMetadata
     /// Gets or sets the URL to the resource documentation.
     /// </summary>
     [JsonPropertyName("resource_documentation")]
-    public string? ResourceDocumentation { get; set; }
-
-    /// <summary>
-    /// Converts this <see cref="ProtectedResourceMetadata"/> to the internal <see cref="ResourceMetadata"/> type.
-    /// </summary>
-    /// <returns>A <see cref="ResourceMetadata"/> instance with the same values as this instance.</returns>
-    internal ResourceMetadata ToResourceMetadata() => new()
-    {
-        Resource = Resource,
-        AuthorizationServers = AuthorizationServers,
-        BearerMethodsSupported = BearerMethodsSupported,
-        ScopesSupported = ScopesSupported,
-        ResourceDocumentation = ResourceDocumentation
-    };
+    public Uri? ResourceDocumentation { get; set; }
 }

src/ModelContextProtocol/Protocol/Auth/ResourceMetadata.cs

@@ -124,7 +124,6 @@ internal static bool IsValidMcpToolSchema(JsonElement element)
     [JsonSerializable(typeof(IReadOnlyDictionary<string, object>))]
 
     // Authorization-related types
-    [JsonSerializable(typeof(Protocol.Auth.ResourceMetadata))]
     [JsonSerializable(typeof(Protocol.Auth.ProtectedResourceMetadata))]
     [JsonSerializable(typeof(Protocol.Auth.AuthorizationServerMetadata))]
     [JsonSerializable(typeof(Protocol.Auth.ClientMetadata))]

src/ModelContextProtocol/Utils/Json/McpJsonUtilities.cs

@@ -0,0 +1,114 @@
+// filepath: c:\Users\ddelimarsky\source\csharp-sdk\tests\ModelContextProtocol.Tests\Protocol\Auth\ProtectedResourceMetadataTests.cs
+using ModelContextProtocol.Protocol.Auth;
+using System.Text.Json;
+
+namespace ModelContextProtocol.Tests.Protocol.Auth;
+
+public class ProtectedResourceMetadataTests
+{
+    [Fact]
+    public void ProtectedResourceMetadata_JsonSerialization_Works()
+    {
+        // Arrange
+        var metadata = new ProtectedResourceMetadata
+        {
+            Resource = new Uri("http://localhost:7071"),
+            AuthorizationServers = [new Uri("https://login.microsoftonline.com/tenant/v2.0")],
+            BearerMethodsSupported = ["header"],
+            ScopesSupported = ["mcp.tools", "mcp.prompts"],
+            ResourceDocumentation = new Uri("https://example.com/docs")
+        };
+
+        // Act
+        var json = JsonSerializer.Serialize(metadata);
+        var deserialized = JsonSerializer.Deserialize<ProtectedResourceMetadata>(json);
+
+        // Assert
+        Assert.NotNull(deserialized);
+        Assert.Equal("http://localhost:7071", deserialized.Resource.ToString());
+        Assert.Equal("https://login.microsoftonline.com/tenant/v2.0", deserialized.AuthorizationServers[0].ToString());
+        Assert.Equal("header", deserialized.BearerMethodsSupported![0]);
+        Assert.Equal(2, deserialized.ScopesSupported!.Length);
+        Assert.Contains("mcp.tools", deserialized.ScopesSupported!);
+        Assert.Contains("mcp.prompts", deserialized.ScopesSupported!);
+        Assert.Equal("https://example.com/docs", deserialized.ResourceDocumentation!.ToString());
+    }
+
+    [Fact]
+    public void ProtectedResourceMetadata_JsonDeserialization_WorksWithStringProperties()
+    {
+        // Arrange
+        var json = @"{
+            ""resource"": ""http://localhost:7071"",
+            ""authorization_servers"": [""https://login.microsoftonline.com/tenant/v2.0""],
+            ""bearer_methods_supported"": [""header""],
+            ""scopes_supported"": [""mcp.tools"", ""mcp.prompts""],
+            ""resource_documentation"": ""https://example.com/docs""
+        }";
+
+        // Act
+        var deserialized = JsonSerializer.Deserialize<ProtectedResourceMetadata>(json);
+
+        // Assert
+        Assert.NotNull(deserialized);
+        Assert.Equal("http://localhost:7071", deserialized.Resource.ToString());
+        Assert.Equal("https://login.microsoftonline.com/tenant/v2.0", deserialized.AuthorizationServers[0].ToString());
+        Assert.Equal("header", deserialized.BearerMethodsSupported![0]);
+        Assert.Equal(2, deserialized.ScopesSupported!.Length);
+        Assert.Contains("mcp.tools", deserialized.ScopesSupported!);
+        Assert.Contains("mcp.prompts", deserialized.ScopesSupported!);
+        Assert.Equal("https://example.com/docs", deserialized.ResourceDocumentation!.ToString());
+    }
+
+    [Fact]
+    public void ResourceMetadata_JsonSerialization_Works()
+    {
+        // Arrange
+        var metadata = new ResourceMetadata
+        {
+            Resource = new Uri("http://localhost:7071"),
+            AuthorizationServers = [new Uri("https://login.microsoftonline.com/tenant/v2.0")],
+            BearerMethodsSupported = ["header"],
+            ScopesSupported = ["mcp.tools", "mcp.prompts"],
+            ResourceDocumentation = new Uri("https://example.com/docs")
+        };
+
+        // Act
+        var json = JsonSerializer.Serialize(metadata);
+        var deserialized = JsonSerializer.Deserialize<ResourceMetadata>(json);
+
+        // Assert
+        Assert.NotNull(deserialized);
+        Assert.Equal("http://localhost:7071", deserialized.Resource.ToString());
+        Assert.Equal("https://login.microsoftonline.com/tenant/v2.0", deserialized.AuthorizationServers[0].ToString());
+        Assert.Equal("header", deserialized.BearerMethodsSupported![0]);
+        Assert.Equal(2, deserialized.ScopesSupported!.Length);
+        Assert.Contains("mcp.tools", deserialized.ScopesSupported!);
+        Assert.Contains("mcp.prompts", deserialized.ScopesSupported!);
+        Assert.Equal("https://example.com/docs", deserialized.ResourceDocumentation!.ToString());
+    }
+
+    [Fact]
+    public void ToResourceMetadata_ConversionWorks()
+    {
+        // Arrange
+        var prm = new ProtectedResourceMetadata
+        {
+            Resource = new Uri("http://localhost:7071"),
+            AuthorizationServers = [new Uri("https://login.microsoftonline.com/tenant/v2.0")],
+            BearerMethodsSupported = ["header"],
+            ScopesSupported = ["mcp.tools", "mcp.prompts"],
+            ResourceDocumentation = new Uri("https://example.com/docs")
+        };
+
+        // Act
+        var resourceMetadata = prm.ToResourceMetadata();
+
+        // Assert
+        Assert.Equal(prm.Resource, resourceMetadata.Resource);
+        Assert.Equal(prm.AuthorizationServers, resourceMetadata.AuthorizationServers);
+        Assert.Equal(prm.BearerMethodsSupported, resourceMetadata.BearerMethodsSupported);
+        Assert.Equal(prm.ScopesSupported, resourceMetadata.ScopesSupported);
+        Assert.Equal(prm.ResourceDocumentation, resourceMetadata.ResourceDocumentation);
+    }
+}