Merge pull request #5 from konak/beta

Merge beta into dev branch

Author: konak

src/am.kon.packages.services.web-client-service/WebClientServiceBase.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -65,7 +66,7 @@ public Task Stop()
         /// <param name="dataToSend">data to be send in request</param>
         /// <param name="httpClientName">Name of the configured client to be used for http request invocation</param>
         /// <returns>Object describing invocation result</returns>
-        public async Task<RequestInvocationResult<TData>> InvokeRequest(Uri requestUri, HttpMethod httpMethod = null, string dataToSend = null, string metiaType = HttpContentMediaTypes.ApplicationJson, string bearerToken = null, string httpClientName = HttpClientNames.Default, Encoding encoding = null)
+        public async Task<RequestInvocationResult<TData>> InvokeRequest(Uri requestUri, HttpMethod httpMethod = null, string dataToSend = null, string metiaType = HttpContentMediaTypes.ApplicationJson, string bearerToken = null, string httpClientName = HttpClientNames.Default, Encoding encoding = null, string[] acceptEncodings = null)
         {
             if (httpMethod == null)
                 httpMethod = HttpMethod.Get;
@@ -84,6 +85,10 @@ public async Task<RequestInvocationResult<TData>> InvokeRequest(Uri requestUri,
                         if (bearerToken != null)
                             requestMessage.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue(HttpAuthenticationScheme.Bearer, bearerToken);
 
+                        if (acceptEncodings != null)
+                            foreach (string acceptEncoding in acceptEncodings)
+                                requestMessage.Headers.AcceptEncoding.Add(new StringWithQualityHeaderValue(acceptEncoding));
+
                         using (HttpClient client = _clientFactory.CreateClient(httpClientName))
                         {
                             using (HttpResponseMessage resp = await client.SendAsync(requestMessage, _cancellationToken))

src/am.kon.packages.services.web-client-service/WebClientStreamDataService.cs

@@ -0,0 +1,29 @@
+using System;
+using System.IO;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace am.kon.packages.services.WebClientService
+{
+    /// <summary>
+    /// Service to be used for requests to web endpoints returning stream data
+    /// </summary>
+	public class WebClientStreamDataService : WebClientServiceBase<Stream>
+    {
+		public WebClientStreamDataService(
+            ILogger<WebClientStreamDataService> logger,
+            IConfiguration configuration,
+            IHttpClientFactory clientFactory
+            ) : base(logger, configuration, clientFactory)
+        {
+		}
+
+        protected override Task<Stream> ReadDataAsync(HttpContent content)
+        {
+            return content.ReadAsStreamAsync();
+        }
+    }
+}
+

src/am.kon.packages.services.web-client-service/WebClientService.cs renamed to src/am.kon.packages.services.web-client-service/WebClientStringDataService.cs

@@ -8,12 +8,12 @@
 namespace am.kon.packages.services.WebClientService
 {
     /// <summary>
-    /// Service to be used for requests to web endpoints
+    /// Service to be used for requests to web endpoints returning string data (HTML pages, Json objects, XML documents, etc.)
     /// </summary>
-	public class WebClientService : WebClientServiceBase<string>
+	public class WebClientStringDataService : WebClientServiceBase<string>
     {
-		public WebClientService(
-            ILogger<WebClientService> logger,
+		public WebClientStringDataService(
+            ILogger<WebClientStringDataService> logger,
             IConfiguration configuration,
             IHttpClientFactory clientFactory
             ) : base(logger, configuration, clientFactory)

src/am.kon.packages.services.web-client-service/am.kon.packages.services.web-client-service.csproj

@@ -5,7 +5,7 @@
     <RootNamespace>am.kon.packages.services.WebClientService</RootNamespace>
     <Nullable>disable</Nullable>
     <PackageId>am.kon.packages.services.web-client-service</PackageId>
-    <PackageVersion>0.1.0-beta4</PackageVersion>
+    <PackageVersion>0.1.1.0</PackageVersion>
     <Authors>konakov sergey</Authors>
     <Description>Web client component to be used as a service with dependency injection in .net core applications implementing functionality to interact with web services. Based on IHttpClientFactory.</Description>
     <RepositoryUrl>https://dev.azure.com/1662nd/Staking%20Infrastructure/_git/flow.packages.services.api-client-service</RepositoryUrl>