Fix media type subset matching. Fixes #1015

Author: commonsensesoftware

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/Http/MediaTypeFixture.cs

@@ -0,0 +1,9 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+
+namespace Asp.Versioning.Http;
+
+public class MediaTypeFixture : MinimalApiFixture
+{
+    protected override void OnAddApiVersioning( ApiVersioningOptions options ) =>
+        options.ApiVersionReader = new MediaTypeApiVersionReader();
+}

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/Http/MinimalApiFixture.cs

@@ -76,4 +76,12 @@ protected override void OnConfigureEndpoints( IEndpointRouteBuilder endpoints )
                  .WithApiVersionSet( orders )
                  .IsApiVersionNeutral();
     }
+
+    protected override void OnAddApiVersioning( ApiVersioningOptions options )
+    {
+        options.ApiVersionReader = ApiVersionReader.Combine(
+            new QueryStringApiVersionReader(),
+            new UrlSegmentApiVersionReader(),
+            new MediaTypeApiVersionReader() );
+    }
 }

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/Http/given a versioned minimal API/when using a media type.cs

@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+
+namespace Asp.Versioning.Http;
+
+using Asp.Versioning;
+using System.Net.Http;
+using System.Net.Http.Json;
+using static System.Net.Http.Headers.MediaTypeWithQualityHeaderValue;
+using static System.Net.Http.HttpMethod;
+using static System.Net.HttpStatusCode;
+
+public class when_using_a_media_type : AcceptanceTest, IClassFixture<MediaTypeFixture>
+{
+    [Fact]
+    public async Task problem_details_should_be_returned_for_accept_header_with_unsupported_api_version()
+    {
+        // arrange
+        using var request = new HttpRequestMessage( Post, "api/values" )
+        {
+            Headers = { Accept = { Parse( "application/json;v=3.0" ) } },
+            Content = JsonContent.Create( new { test = true }, Parse( "application/json;v=3.0" ) ),
+        };
+
+        // act
+        var response = await Client.SendAsync( request );
+        var problem = await response.Content.ReadAsProblemDetailsAsync();
+
+        // assert
+        response.StatusCode.Should().Be( UnsupportedMediaType );
+        problem.Type.Should().Be( ProblemDetailsDefaults.Unsupported.Type );
+    }
+
+    public when_using_a_media_type( MediaTypeFixture fixture, ITestOutputHelper console )
+        : base( fixture ) => console.WriteLine( fixture.DirectedGraphVisualizationUrl );
+}

src/AspNetCore/WebApi/src/Asp.Versioning.Http/Rfc7231ProblemDetailsWriter.cs

@@ -9,7 +9,7 @@ namespace Asp.Versioning;
 internal sealed class Rfc7231ProblemDetailsWriter : IProblemDetailsWriter
 {
     private static readonly MediaTypeHeaderValue jsonMediaType = new( "application/json" );
-    private static readonly MediaTypeHeaderValue problemDetailsJsonMediaType = new( "application/problem+json" );
+    private static readonly MediaTypeHeaderValue problemDetailsJsonMediaType = new( ProblemDetailsDefaults.MediaType.Json );
     private readonly IProblemDetailsWriter decorated;
 
     public Rfc7231ProblemDetailsWriter( IProblemDetailsWriter decorated ) => this.decorated = decorated;
@@ -36,8 +36,8 @@ public bool CanWrite( ProblemDetailsContext context )
         {
             var acceptHeaderValue = acceptHeader[i];
 
-            if ( jsonMediaType.IsSubsetOf( acceptHeaderValue ) ||
-                 problemDetailsJsonMediaType.IsSubsetOf( acceptHeaderValue ) )
+            if ( acceptHeaderValue.IsSubsetOf( jsonMediaType ) ||
+                 acceptHeaderValue.IsSubsetOf( problemDetailsJsonMediaType ) )
             {
                 return true;
             }