Add content headers to the response for #1684

Author: alexeyzimarev

src/RestSharp/Extensions/HttpHeadersExtensions.cs

@@ -0,0 +1,26 @@
+//  Copyright © 2009-2020 John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// 
+
+using System.Net.Http.Headers;
+
+namespace RestSharp.Extensions;
+
+static class HttpHeadersExtensions {
+    public static IReadOnlyCollection<HeaderParameter> GetHeaderParameters(this HttpHeaders httpHeaders)
+        => httpHeaders
+            .SelectMany(x => x.Value.Select(y => (x.Key, y)))
+            .Select(x => new HeaderParameter(x.Key, x.y))
+            .ToList();
+}

src/RestSharp/Response/RestResponse.cs

@@ -18,6 +18,8 @@
 using System.Text;
 using RestSharp.Extensions;
 
+// ReSharper disable SuggestBaseTypeForParameter
+
 namespace RestSharp;
 
 /// <summary>
@@ -42,6 +44,7 @@ public static RestResponse<T> FromResponse(RestResponse response)
             ErrorMessage      = response.ErrorMessage,
             ErrorException    = response.ErrorException,
             Headers           = response.Headers,
+            ContentHeaders    = response.ContentHeaders,
             IsSuccessful      = response.IsSuccessful,
             ResponseStatus    = response.ResponseStatus,
             ResponseUri       = response.ResponseUri,
@@ -57,13 +60,9 @@ public static RestResponse<T> FromResponse(RestResponse response)
 /// </summary>
 [DebuggerDisplay("{" + nameof(DebuggerDisplay) + "()}")]
 public class RestResponse : RestResponseBase {
-    RestResponse SetHeaders(HttpResponseHeaders headers) {
-        var headerParams = headers
-            .SelectMany(x => x.Value.Select(y => (x.Key, y)))
-            .Select(x => new HeaderParameter(x.Key, x.y))
-            .ToList();
-        return this.With(x => x.Headers = headerParams);
-    }
+    RestResponse SetHeaders(HttpResponseHeaders httpHeaders) => this.With(x => x.Headers = httpHeaders.GetHeaderParameters());
+
+    RestResponse SetContentHeaders(HttpContentHeaders httpHeaders) => this.With(x => x.ContentHeaders = httpHeaders.GetHeaderParameters());
 
     RestResponse SetCookies(CookieCollection cookies) => this.With(x => x.Cookies = cookies);
 
@@ -124,6 +123,7 @@ async Task<RestResponse> GetDefaultResponse() {
                     Request           = request
                 }
                 .SetHeaders(httpResponse.Headers)
+                .SetContentHeaders(httpResponse.Content.Headers)
                 .SetCookies(cookieCollection);
         }
     }

src/RestSharp/Response/RestResponseBase.cs

@@ -91,9 +91,14 @@ public abstract class RestResponseBase {
     public CookieCollection? Cookies { get; protected internal set; }
 
     /// <summary>
-    /// Headers returned by server with the response
+    /// Response headers returned by server with the response
     /// </summary>
-    public IList<HeaderParameter>? Headers { get; protected internal set; }
+    public IReadOnlyCollection<HeaderParameter>? Headers { get; protected internal set; }
+
+    /// <summary>
+    /// Content headers returned by server with the response
+    /// </summary>
+    public IReadOnlyCollection<HeaderParameter>? ContentHeaders { get; protected internal set; }
 
     /// <summary>
     /// Status of the request. Will return Error for transport errors.