Allow consumer to inject a HttpMessageHandler (#8)

Author: itowlson

Bindle/BindleClient.cs

@@ -16,20 +16,30 @@ string baseUri
         )
         {
             _baseUri = new Uri(SlashSafe(baseUri));
+            _httpClient = new HttpClient();
+        }
+
+        public BindleClient(
+            string baseUri,
+            HttpMessageHandler messageHandler
+        )
+        {
+            _baseUri = new Uri(SlashSafe(baseUri));
+            _httpClient = new HttpClient(messageHandler);
         }
 
         private const string INVOICE_PATH = "_i";
         private const string QUERY_PATH = "_q";
         private const string RELATIONSHIP_PATH = "_r";
 
         private readonly Uri _baseUri;
+        private readonly HttpClient _httpClient;
 
         public async Task<Invoice> GetInvoice(string invoiceId, GetInvoiceOptions options = GetInvoiceOptions.None)
         {
             var query = GetInvoiceQueryString(options);
-            var httpClient = new HttpClient();
-            var uri = new Uri(_baseUri, INVOICE_PATH + "/" + invoiceId + query);
-            var response = await httpClient.GetAsync(uri);
+            var uri = new Uri(_baseUri, $"{INVOICE_PATH}/{invoiceId}{query}");
+            var response = await _httpClient.GetAsync(uri);
             if (response == null)
             {
                 throw new Exception("No response from Bindle server");
@@ -51,14 +61,13 @@ public async Task<CreateInvoiceResult> CreateInvoice(Invoice invoice)
                 throw new Exception("Error serialising invoice to TOML");
             }
 
-            var httpClient = new HttpClient();
             var uri = new Uri(_baseUri, INVOICE_PATH);
             var requestContent = new StringContent(invoiceToml, null, "application/toml");
             if (requestContent.Headers.ContentType != null)
             {
                 requestContent.Headers.ContentType.CharSet = null;  // The Bindle server is VERY strict about the contents of the Content-Type header
             }
-            var response = await httpClient.PostAsync(uri, requestContent);
+            var response = await _httpClient.PostAsync(uri, requestContent);
 
             if (response == null)
             {
@@ -74,16 +83,14 @@ public async Task<CreateInvoiceResult> CreateInvoice(Invoice invoice)
 
         public async Task YankInvoice(string invoiceId)
         {
-            var httpClient = new HttpClient();
-            var uri = new Uri(_baseUri, INVOICE_PATH + "/" + invoiceId);
-            await httpClient.DeleteAsync(uri);
+            var uri = new Uri(_baseUri, $"{INVOICE_PATH}/{invoiceId}");
+            await _httpClient.DeleteAsync(uri);
         }
 
         public async Task<HttpContent> GetParcel(string invoiceId, string parcelId)
         {
-            var httpClient = new HttpClient();
             var uri = new Uri(_baseUri, $"{INVOICE_PATH}/{invoiceId}@{parcelId}");
-            var response = await httpClient.GetAsync(uri);
+            var response = await _httpClient.GetAsync(uri);
             if (response == null)
             {
                 throw new Exception("No response from Bindle server");
@@ -112,16 +119,14 @@ public async Task CreateParcel(string invoiceId, string parcelId, byte[] content
 
         public async Task CreateParcel(string invoiceId, string parcelId, HttpContent content)
         {
-            var httpClient = new HttpClient();
             var uri = new Uri(_baseUri, $"{INVOICE_PATH}/{invoiceId}@{parcelId}");
-            await httpClient.PostAsync(uri, content);
+            await _httpClient.PostAsync(uri, content);
         }
 
         public async Task<IEnumerable<Label>> ListMissingParcels(string invoiceId)
         {
-            var httpClient = new HttpClient();
             var uri = new Uri(_baseUri, $"{RELATIONSHIP_PATH}/missing/{invoiceId}");
-            var response = await httpClient.GetAsync(uri);
+            var response = await _httpClient.GetAsync(uri);
             if (response == null)
             {
                 throw new Exception("No response from Bindle server");