Improve GetHeaders + Add MatchesContentType ext

Author: mythz

src/ServiceStack.Text/HttpUtils.HttpClient.cs

@@ -1010,29 +1010,32 @@ public static async Task<HttpResponseMessage> PutFileToUrlAsync(this string url,
     public static void AddHeader(this HttpRequestMessage res, string name, string value) =>
         res.WithHeader(name, value);
 
-    public static string? GetHeader(this HttpRequestMessage res, string name) =>
-        res.Headers.TryGetValues(name, out var values) ? values.FirstOrDefault() : null;
-
-    public static Dictionary<string, Func<HttpResponseMessage, string?>> HeadersResolver { get; set; } = new(StringComparer.OrdinalIgnoreCase)
-    {
-        [HttpHeaders.ContentType] = res => res.Content.Headers.ContentType?.MediaType, 
-        [HttpHeaders.Expires] = res => res.Content.Headers.Expires?.ToString(), 
-        [HttpHeaders.ContentDisposition] = res => res.Content.Headers.ContentDisposition?.ToString(), 
-        [HttpHeaders.ContentEncoding] = res => res.Content.Headers.ContentEncoding?.ToString(), 
-        [HttpHeaders.ContentLength] = res => res.Content.Headers.ContentLength?.ToString(), 
-        [HttpHeaders.ETag] = res => res.Headers.ETag?.Tag.ToString(), 
-        [HttpHeaders.Vary] = res => string.Join(',', res.Headers.Vary), 
-        [HttpHeaders.CacheControl] = res => res.Headers.CacheControl?.ToString(), 
-    };
+    public static string? GetHeader(this HttpRequestMessage req, string name)
+    {
+        if (RequestHeadersResolver.TryGetValue(name, out var fn))
+            return fn(req);
+
+        return req.Headers.TryGetValues(name, out var headers)
+            ? headers.FirstOrDefault()
+            : req.Content?.Headers.TryGetValues(name, out var contentHeaders) == true
+                ? contentHeaders!.FirstOrDefault()
+                : null;
+    }
 
+    public static Dictionary<string, Func<HttpRequestMessage, string?>> RequestHeadersResolver { get; set; } = new(StringComparer.OrdinalIgnoreCase) {
+    };
+    public static Dictionary<string, Func<HttpResponseMessage, string?>> ResponseHeadersResolver { get; set; } = new(StringComparer.OrdinalIgnoreCase) {
+    };
     public static string? GetHeader(this HttpResponseMessage res, string name)
     {
-        if (HeadersResolver.TryGetValue(name, out var fn))
+        if (ResponseHeadersResolver.TryGetValue(name, out var fn))
             return fn(res);
-        
-        return res.Headers.TryGetValues(name, out var values) 
-            ? values.FirstOrDefault() 
-            : null;
+
+        return res.Headers.TryGetValues(name, out var headers)
+            ? headers.FirstOrDefault()
+            : res.Content?.Headers.TryGetValues(name, out var contentHeaders) == true
+                ? contentHeaders!.FirstOrDefault()
+                : null;
     }
 
     public static HttpRequestMessage WithHeader(this HttpRequestMessage httpReq, string name, string value)
@@ -1115,4 +1118,10 @@ public static void DownloadFileTo(this string downloadUrl, string fileName,
     }
 }
 
+public static class HttpClientExt
+{
+    public static bool MatchesContentType(this HttpResponseMessage res, string matchesContentType) => 
+        MimeTypes.MatchesContentType(res.GetHeader(HttpHeaders.ContentType), matchesContentType);
+}
+
 #endif

src/ServiceStack.Text/HttpUtils.WebRequest.cs

@@ -1181,4 +1181,10 @@ public void UploadStream(HttpWebRequest webRequest, Stream fileStream, string fi
         UploadFileFn?.Invoke(webRequest, fileStream, fileName);
     }
 }
+
+public static class HttpClientExt
+{
+    public static bool MatchesContentType(this HttpWebResponse res, string matchesContentType) => 
+        MimeTypes.MatchesContentType(res.Headers[HttpHeaders.ContentType], matchesContentType);
+}
 #endif

tests/ServiceStack.Text.Tests/UseCases/ServiceStack_Text_UseCase.cs

@@ -1,5 +1,4 @@
-#if !NETCORE
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using NUnit.Framework;
@@ -25,18 +24,22 @@ public void Dump_and_Write_GitHub_Organization_Repos_to_CSV()
         {
             var orgName = "ServiceStack";
 
-            var orgRepos = "https://api.github.com/orgs/{0}/repos".Fmt(orgName)
-                .GetJsonFromUrl(httpReq => httpReq.UserAgent = "ServiceStack.Text")
+            var orgRepos = $"https://api.github.com/orgs/{orgName}/repos"
+                .GetJsonFromUrl(req => req.With(c => c.UserAgent = "ServiceStack.Text"),
+                    responseFilter: res =>
+                    {
+                        var contentType = res.GetHeader(HttpHeaders.ContentType);
+                        Assert.That(res.MatchesContentType(MimeTypes.Json));
+                    })
                 .FromJson<List<GithubRepository>>();
 
-            "Writing {0} Github Repositories:".Print(orgName);
+            $"Writing {orgName} Github Repositories:".Print();
             orgRepos.PrintDump(); //recursive, pretty-format dump of any C# POCOs
 
-            var csvFilePath = "~/{0}-repos.csv".Fmt(orgName).MapAbsolutePath();
+            var csvFilePath = $"~/{orgName}-repos.csv".MapAbsolutePath();
             File.WriteAllText(csvFilePath, orgRepos.ToCsv());
 
-            Process.Start(csvFilePath);
+            if (Env.IsNetFramework) Process.Start(csvFilePath);
         }
     }
 }
-#endif