Merge pull request #2922 from whyfate/improve-restapi-accept-header

ewoutkramer · web-flow · commit 37fe2816131b · 2024-10-18T16:32:50.000+02:00
Remove the Charset from the Accept Header and replace it with the Accept-Charset Header.
diff --git a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
@@ -7,4 +7,32 @@
     <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Rest.ContentType.BuildContentType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Rest.ContentType.BuildMediaType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Rest.ContentType.BuildContentType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Rest.ContentType.BuildMediaType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
 </Suppressions>
diff --git a/src/Hl7.Fhir.Base/Rest/ContentType.cs b/src/Hl7.Fhir.Base/Rest/ContentType.cs
@@ -102,17 +102,19 @@ public static ResourceFormat GetResourceFormatFromContentType(string? contentTyp
         /// </summary>
         /// <param name="format">Whether the body is xml or json.</param>
         /// <param name="fhirVersion">Optional. The version of FHIR to add to the header.</param>
-        public static string BuildContentType(ResourceFormat format, string? fhirVersion = default) =>
-            BuildMediaType(format, fhirVersion).ToString();
+        /// <param name="excludeCharset">Optional. Whether exclude charset.</param>
+        public static string BuildContentType(ResourceFormat format, string? fhirVersion = default, bool excludeCharset = false) =>
+            BuildMediaType(format, fhirVersion, excludeCharset).ToString();
 
         /// <summary>
         /// Creates a <see cref="MediaTypeHeaderValue"/> for use in a Content-Type header, 
         /// given the serialization format and the fhir version in use.
         /// </summary>
         /// <param name="format">Whether the body is xml or json.</param>
         /// <param name="fhirVersion">Optional. The version of FHIR to add to the header.</param>
+        /// <param name="excludeCharset">Optional. Whether exclude charset.</param>
         /// <exception cref="ArgumentException">Unsupported serialization.</exception>
-        public static MediaTypeHeaderValue BuildMediaType(ResourceFormat format, string? fhirVersion = default)
+        public static MediaTypeHeaderValue BuildMediaType(ResourceFormat format, string? fhirVersion = default, bool excludeCharset = false)
         {
             var contentType = format switch
             {
@@ -121,10 +123,11 @@ public static MediaTypeHeaderValue BuildMediaType(ResourceFormat format, string?
                 _ => throw new ArgumentException("Cannot determine content type for data format " + format),
             };
 
-            var result = new MediaTypeHeaderValue(contentType)
+            var result = new MediaTypeHeaderValue(contentType);
+            if (!excludeCharset)
             {
-                CharSet = Encoding.UTF8.WebName
-            };
+                result.CharSet = Encoding.UTF8.WebName;
+            }
 
             if (fhirVersion is not null && SemVersion.TryParse(fhirVersion, out var version))
             {
diff --git a/src/Hl7.Fhir.Base/Rest/HttpContentBuilders.cs b/src/Hl7.Fhir.Base/Rest/HttpContentBuilders.cs
@@ -134,8 +134,8 @@ public static HttpRequestMessage WithAccept(this HttpRequestMessage message,
             string? contentTypeFhirVersion,
             bool requestCompressedResponse)
         {
-            message.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(
-                    ContentType.BuildContentType(serialization, contentTypeFhirVersion)));
+            message.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(ContentType.BuildContentType(serialization, contentTypeFhirVersion, true)));
+            message.Headers.AcceptCharset.Add(new StringWithQualityHeaderValue(Encoding.UTF8.WebName));
 
             if (requestCompressedResponse)
             {
diff --git a/src/Hl7.Fhir.Support.Poco.Tests/Rest/ContentTypeTests.cs b/src/Hl7.Fhir.Support.Poco.Tests/Rest/ContentTypeTests.cs
@@ -45,6 +45,14 @@ public void TestBuildingContentType(ResourceFormat format, string fhirVersion, s
             ContentType.BuildContentType(format, fhirVersion).Should().Be(expected);
         }
 
+        [DataTestMethod]
+        [DataRow(ResourceFormat.Json, "", true, "application/fhir+json")]
+        [DataRow(ResourceFormat.Xml, "", true, "application/fhir+xml")]
+        public void TestBuildingContentTypeWithExcludeCharSet(ResourceFormat format, string fhirVersion, bool excludeCharset, string expected)
+        {
+            ContentType.BuildContentType(format, fhirVersion, excludeCharset).Should().Be(expected);
+        }
+
         [TestMethod]
         public void GetResourceFormatSupportsCharset()
         {
diff --git a/src/Hl7.Fhir.Support.Poco.Tests/Rest/RequestMessageTests.cs b/src/Hl7.Fhir.Support.Poco.Tests/Rest/RequestMessageTests.cs
@@ -204,12 +204,12 @@ public void SetAccept(ResourceFormat fmt)
         {
             var settings = new FhirClientSettings { PreferredFormat = fmt, BinaryReceivePreference = BinaryTransferBehaviour.UseResource };
             var request = makeMessage(settings: settings, method: Bundle.HTTPVerb.POST);
-            request.Headers.Accept.Single().ToString().Should().Be(ContentType.BuildContentType(fmt, TESTVERSION));
+            request.Headers.Accept.Single().ToString().Should().Be(ContentType.BuildContentType(fmt, TESTVERSION, true));
             request.Headers.AcceptEncoding.Should().BeEmpty();
 
             settings.PreferCompressedResponses = true;
             request = makeMessage(settings: settings, method: Bundle.HTTPVerb.POST);
-            request.Headers.Accept.Single().ToString().Should().Be(ContentType.BuildContentType(fmt, TESTVERSION));
+            request.Headers.Accept.Single().ToString().Should().Be(ContentType.BuildContentType(fmt, TESTVERSION, true));
             request.Headers.AcceptEncoding.Select(h => h.Value).Should().BeEquivalentTo("gzip", "deflate");
         }
 

Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,8 @@ public static HttpRequestMessage WithAccept(this HttpRequestMessage message,`
`134`	`134`	`string? contentTypeFhirVersion,`
`135`	`135`	`bool requestCompressedResponse)`
`136`	`136`	`{`
`137`		`- message.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(`
`138`		`- ContentType.BuildContentType(serialization, contentTypeFhirVersion)));`
	`137`	`+ message.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(ContentType.BuildContentType(serialization, contentTypeFhirVersion, true)));`
	`138`	`+ message.Headers.AcceptCharset.Add(new StringWithQualityHeaderValue(Encoding.UTF8.WebName));`
`139`	`139`
`140`	`140`	`if (requestCompressedResponse)`
`141`	`141`	`{`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,14 @@ public void TestBuildingContentType(ResourceFormat format, string fhirVersion, s`
`45`	`45`	`ContentType.BuildContentType(format, fhirVersion).Should().Be(expected);`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ [DataTestMethod]`
	`49`	`+ [DataRow(ResourceFormat.Json, "", true, "application/fhir+json")]`
	`50`	`+ [DataRow(ResourceFormat.Xml, "", true, "application/fhir+xml")]`
	`51`	`+ public void TestBuildingContentTypeWithExcludeCharSet(ResourceFormat format, string fhirVersion, bool excludeCharset, string expected)`
	`52`	`+ {`
	`53`	`+ ContentType.BuildContentType(format, fhirVersion, excludeCharset).Should().Be(expected);`
	`54`	`+ }`
	`55`	`+`
`48`	`56`	`[TestMethod]`
`49`	`57`	`public void GetResourceFormatSupportsCharset()`
`50`	`58`	`{`
Original file line number	Diff line number	Diff line change
`@@ -204,12 +204,12 @@ public void SetAccept(ResourceFormat fmt)`
`204`	`204`	`{`
`205`	`205`	`var settings = new FhirClientSettings { PreferredFormat = fmt, BinaryReceivePreference = BinaryTransferBehaviour.UseResource };`
`206`	`206`	`var request = makeMessage(settings: settings, method: Bundle.HTTPVerb.POST);`
`207`		`- request.Headers.Accept.Single().ToString().Should().Be(ContentType.BuildContentType(fmt, TESTVERSION));`
	`207`	`+ request.Headers.Accept.Single().ToString().Should().Be(ContentType.BuildContentType(fmt, TESTVERSION, true));`
`208`	`208`	`request.Headers.AcceptEncoding.Should().BeEmpty();`
`209`	`209`
`210`	`210`	`settings.PreferCompressedResponses = true;`
`211`	`211`	`request = makeMessage(settings: settings, method: Bundle.HTTPVerb.POST);`
`212`		`- request.Headers.Accept.Single().ToString().Should().Be(ContentType.BuildContentType(fmt, TESTVERSION));`
	`212`	`+ request.Headers.Accept.Single().ToString().Should().Be(ContentType.BuildContentType(fmt, TESTVERSION, true));`
`213`	`213`	`request.Headers.AcceptEncoding.Select(h => h.Value).Should().BeEquivalentTo("gzip", "deflate");`
`214`	`214`	`}`
`215`	`215`