Enable automatic decompresion of GZIP

Fixes #29
Krusen · Mar 11, 2020 · b63c5a0 · b63c5a0
1 parent 6cc29cf
commit b63c5a0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/PinSharp/Http/FormUrlEncodedContent.cs b/PinSharp/Http/FormUrlEncodedContent.cs
@@ -6,7 +6,7 @@
 
 namespace PinSharp.Http
 {
-    internal class FormUrlEncodedContent : ByteArrayContent
+    public class FormUrlEncodedContent : ByteArrayContent
     {
         private static readonly Encoding DefaultHttpEncoding = Encoding.GetEncoding("ISO-8859-1");
 
@@ -16,7 +16,7 @@ public FormUrlEncodedContent(IEnumerable<KeyValuePair<string, string>> nameValue
             Headers.ContentType = new MediaTypeHeaderValue("application/x-www-form-urlencoded");
         }
 
-        private static byte[] GetContentByteArray(IEnumerable<KeyValuePair<string, string>> nameValueCollection)
+        protected static byte[] GetContentByteArray(IEnumerable<KeyValuePair<string, string>> nameValueCollection)
         {
             if (nameValueCollection == null) throw new ArgumentNullException(nameof(nameValueCollection));
 
@@ -32,15 +32,15 @@ private static byte[] GetContentByteArray(IEnumerable<KeyValuePair<string, strin
             return DefaultHttpEncoding.GetBytes(stringBuilder.ToString());
         }
 
-        private static string Encode(string data)
+        protected static string Encode(string data)
         {
             if (string.IsNullOrEmpty(data))
                 return "";
 
             return EscapeLongDataString(data);
         }
 
-        private static string EscapeLongDataString(string data)
+        protected static string EscapeLongDataString(string data)
         {
             // Uri.EscapeDataString() does not support strings longer than this
             const int maxLength = 65519;

diff --git a/PinSharp/Http/UrlEncodedHttpClient.cs b/PinSharp/Http/UrlEncodedHttpClient.cs
@@ -1,49 +1,60 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using PinSharp.Extensions;
 
 namespace PinSharp.Http
 {
-    internal class UrlEncodedHttpClient : IHttpClient
+    public class UrlEncodedHttpClient : IHttpClient
     {
         private HttpClient Client { get; }
 
         public UrlEncodedHttpClient(string baseAddress, string accessToken)
         {
-            Client = new HttpClient();
-            Client.BaseAddress = new Uri(baseAddress);
-            Client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
+            var handler = new HttpClientHandler
+            {
+                AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
+            };
+
+            Client = new HttpClient(handler)
+            {
+                BaseAddress = new Uri(baseAddress),
+                DefaultRequestHeaders =
+                {
+                    Authorization = new AuthenticationHeaderValue("Bearer", accessToken)
+                }
+            };
         }
 
-        public Task<HttpResponseMessage> GetAsync(string requestUri)
+        public virtual Task<HttpResponseMessage> GetAsync(string requestUri)
         {
             return Client.GetAsync(requestUri);
         }
 
-        public Task<HttpResponseMessage> PostAsync<T>(string requestUri, T value)
+        public virtual Task<HttpResponseMessage> PostAsync<T>(string requestUri, T value)
         {
             var content = GetFormUrlEncodedContent(value);
             return Client.PostAsync(requestUri, content);
         }
 
-        public Task<HttpResponseMessage> PatchAsync<T>(string requestUri, T value)
+        public virtual Task<HttpResponseMessage> PatchAsync<T>(string requestUri, T value)
         {
             var request = new HttpRequestMessage(new HttpMethod("PATCH"), requestUri);
             request.Headers.ExpectContinue = false;
             request.Content = GetFormUrlEncodedContent(value);
             return Client.SendAsync(request);
         }
 
-        public Task<HttpResponseMessage> DeleteAsync(string requestUri)
+        public virtual Task<HttpResponseMessage> DeleteAsync(string requestUri)
         {
             return Client.DeleteAsync(requestUri);
         }
 
-        private static FormUrlEncodedContent GetFormUrlEncodedContent(object obj)
+        protected static FormUrlEncodedContent GetFormUrlEncodedContent(object obj)
         {
             // TODO: Add attribute to ignore property?
             var data =