From 18df8c031832138537961abad3c60a3750ff1f9c Mon Sep 17 00:00:00 2001
From: itsokto <36706257+itsokto@users.noreply.github.com>
Date: Thu, 25 Apr 2019 16:35:36 +0300
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D1=82?=
 =?UTF-8?q?=D1=8C=20HttpClient=20=D0=BD=D0=B0=20Flurl=20(#835)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VkNet/Utils/RestClient.cs | 69 +++++++++++----------------------------
 VkNet/Utils/TypeHelper.cs |  2 --
 2 files changed, 19 insertions(+), 52 deletions(-)

diff --git a/VkNet/Utils/RestClient.cs b/VkNet/Utils/RestClient.cs
index 40fa88061..140aa3dfb 100644
--- a/VkNet/Utils/RestClient.cs
+++ b/VkNet/Utils/RestClient.cs
@@ -4,6 +4,8 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Flurl;
+using Flurl.Http;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
@@ -15,14 +17,11 @@ namespace VkNet.Utils
 	[UsedImplicitly]
 	public class RestClient : IRestClient
 	{
-		private readonly HttpClient _httpClient;
-
 		private readonly ILogger<RestClient> _logger;
 
 		/// <inheritdoc />
-		public RestClient(HttpClient httpClient, ILogger<RestClient> logger)
+		public RestClient(ILogger<RestClient> logger)
 		{
-			_httpClient = httpClient;
 			_logger = logger;
 		}
 
@@ -37,20 +36,17 @@ public RestClient(HttpClient httpClient, ILogger<RestClient> logger)
 		/// <inheritdoc />
 		public Task<HttpResponse<string>> GetAsync(Uri uri, IEnumerable<KeyValuePair<string, string>> parameters)
 		{
-			var queries = parameters
-				.Where(parameter => !string.IsNullOrWhiteSpace(parameter.Value))
-				.Select(parameter => $"{parameter.Key.ToLowerInvariant()}={parameter.Value}");
-
-			var url = new UriBuilder(uri)
+			if (_logger != null)
 			{
-				Query = string.Join("&", queries)
-			};
+				var uriBuilder = new UriBuilder(uri)
+				{
+					Query = string.Join("&", parameters.Select(x => $"{x.Key}={x.Value}"))
+				};
 
-			_logger?.LogDebug($"GET request: {url.Uri}");
-
-			var request = new HttpRequestMessage(HttpMethod.Get, url.Uri);
+				_logger.LogDebug($"GET request: {uriBuilder.Uri}");
+			}
 
-			return CallAsync(httpClient => httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead));
+			return CallAsync(() => uri.ToString().SetQueryParams(parameters).GetAsync());
 		}
 
 		/// <inheritdoc />
@@ -64,14 +60,18 @@ public Task<HttpResponse<string>> PostAsync(Uri uri, IEnumerable<KeyValuePair<st
 
 			var content = new FormUrlEncodedContent(parameters);
 
-			var request = new HttpRequestMessage(HttpMethod.Post, uri) { Content = content };
+			return CallAsync(() => uri.ToString().PostAsync(content));
+		}
 
-			return CallAsync(httpClient => httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead));
+		/// <inheritdoc />
+		public void Dispose()
+		{
+			GC.SuppressFinalize(this);
 		}
 
-		private async Task<HttpResponse<string>> CallAsync(Func<HttpClient, Task<HttpResponseMessage>> method)
+		private async Task<HttpResponse<string>> CallAsync(Func<Task<HttpResponseMessage>> method)
 		{
-			var response = await method(_httpClient).ConfigureAwait(false);
+			var response = await method().ConfigureAwait(false);
 
 			var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
@@ -82,36 +82,5 @@ private async Task<HttpResponse<string>> CallAsync(Func<HttpClient, Task<HttpRes
 				? HttpResponse<string>.Success(response.StatusCode, content, url)
 				: HttpResponse<string>.Fail(response.StatusCode, content, url);
 		}
-
-		/// <inheritdoc />
-		public void Dispose()
-		{
-			Dispose(true);
-			GC.SuppressFinalize(this);
-		}
-
-		/// <summary>
-		/// Releases unmanaged and - optionally - managed resources.
-		/// </summary>
-		~RestClient()
-		{
-			Dispose(false);
-		}
-
-		/// <summary>
-		/// Releases unmanaged and - optionally - managed resources.
-		/// </summary>
-		/// <param name="disposing">
-		/// <c> true </c> to release both managed and unmanaged resources; <c> false </c>
-		/// to release only
-		/// unmanaged resources.
-		/// </param>
-		protected virtual void Dispose(bool disposing)
-		{
-			if (disposing)
-			{
-				_httpClient?.Dispose();
-			}
-		}
 	}
 }
\ No newline at end of file
diff --git a/VkNet/Utils/TypeHelper.cs b/VkNet/Utils/TypeHelper.cs
index f215661e4..46c96f2bd 100644
--- a/VkNet/Utils/TypeHelper.cs
+++ b/VkNet/Utils/TypeHelper.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using Flurl.Http.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -39,7 +38,6 @@ public static void RegisterDefaultDependencies(this IServiceCollection container
 			container.TryAddSingleton<ICaptchaHandler, CaptchaHandler>();
 			container.TryAddSingleton<ILanguageService, LanguageService>();
 			container.TryAddSingleton<ICaptchaSolver>(sp => null);
-			container.TryAddSingleton<HttpClient>();
 			container.TryAddSingleton<IRateLimiter, RateLimiter>();
 			container.TryAddSingleton<IAwaitableConstraint, CountByIntervalAwaitableConstraint>();
 			container.RegisterAuthorization();