Disabled HTTP cetrificates validation for dependency injection factory;

baking-bad · Nov 7, 2022 · 06b1d74 · 06b1d74
1 parent 715c284
commit 06b1d74
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/Matrix.Sdk/MatrixClientFactory.cs b/Matrix.Sdk/MatrixClientFactory.cs
@@ -9,11 +9,13 @@ public class SingletonHttpFactory : IHttpClientFactory
     {
         private readonly HttpClient _httpClient;
 
+        public static HttpClientHandler GetHttpHandler() => new HttpClientHandler
+            { ServerCertificateCustomValidationCallback = (_, _, _, _) => true };
+
         public SingletonHttpFactory()
         {
-            var httpClientHandler = new HttpClientHandler
-                { ServerCertificateCustomValidationCallback = (_, _, _, _) => true };
-            _httpClient = new HttpClient(httpClientHandler);
+            var httpClientHandler =
+                _httpClient = new HttpClient(GetHttpHandler());
         }
 
         public HttpClient CreateClient(string name) => _httpClient;

diff --git a/Matrix.Sdk/MatrixClientServiceExtensions.cs b/Matrix.Sdk/MatrixClientServiceExtensions.cs
@@ -1,8 +1,7 @@
+using System.Net.Http;
+
 namespace Matrix.Sdk
 {
-    using System.Collections.Generic;
-    using Core;
-    using Core.Domain.RoomEvent;
     using Core.Domain.Services;
     using Core.Infrastructure.Services;
     using Microsoft.Extensions.DependencyInjection;
@@ -15,14 +14,15 @@ public static class MatrixClientServiceExtensions
     {
         public static IServiceCollection AddMatrixClient(this IServiceCollection services)
         {
-            services.AddHttpClient();
-
+            services.AddHttpClient(Constants.Matrix)
+                .ConfigurePrimaryHttpMessageHandler(SingletonHttpFactory.GetHttpHandler);
+
             services.AddSingleton<ClientService>();
-            
+
             services.AddSingleton<EventService>();
             services.AddSingleton<RoomService>();
             services.AddSingleton<UserService>();
-            
+
             services.AddTransient<IPollingService, PollingService>();
             services.AddTransient<IMatrixClient, MatrixClient>();