fix mtls handler (#15)

oguzhane · Jul 29, 2024 · 1c101fb · 1c101fb
1 parent a6b3517
commit 1c101fb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/App/Platforms/Android/MainApplication.cs b/src/App/Platforms/Android/MainApplication.cs
@@ -242,7 +242,7 @@ private void RegisterLocalServices()
 
             #region Nibblewarden
             ServiceContainer.Register<ICertificateService>("certificateService", new CertificateService());
-            ServiceContainer.Register<IHttpClientHandler>("httpClientHandler", new AndroidHttpsClientHandler());
+            ServiceContainer.Register<IHttpMessageHandler>("httpMessageHandler", new AndroidHttpsClientHandler());
             #endregion
 
             // Push

diff --git a/src/App/Platforms/Android/Security/AndroidHttpsClientHandler.cs b/src/App/Platforms/Android/Security/AndroidHttpsClientHandler.cs
@@ -9,7 +9,7 @@
 namespace Bit.Droid.Security
 {
     // Tag:Nibblewarden
-    public class AndroidHttpsClientHandler : AndroidClientHandler, IHttpClientHandler
+    public class AndroidHttpsClientHandler : AndroidMessageHandler, IHttpMessageHandler
     {
         private X509CertificateChainSpec ClientCertificate;
 
@@ -18,7 +18,7 @@ public AndroidHttpsClientHandler() : base()
             ClientCertificate = null;
         }
 
-        public HttpClientHandler AsClientHandler()
+        public HttpMessageHandler AsMessageHandler()
         {
             return this;
         }

diff --git a/src/Core/Abstractions/IHttpClientHandler.cs → src/Core/Abstractions/IHttpMessageHandler.cs b/src/Core/Abstractions/IHttpClientHandler.cs → src/Core/Abstractions/IHttpMessageHandler.cs
@@ -3,9 +3,9 @@
 namespace Bit.Core.Abstractions
 {
     // Tag:Nibblewarden
-    public interface IHttpClientHandler
+    public interface IHttpMessageHandler
     {
-        HttpClientHandler AsClientHandler();
+        HttpMessageHandler AsMessageHandler();
 
         void UseClientCertificate(ICertificateChainSpec clientCertificate);
     }

diff --git a/src/Core/Services/ApiService.cs b/src/Core/Services/ApiService.cs
@@ -40,8 +40,8 @@ public ApiService(
             string customUserAgent = null)
         {
             #region Nibblewarden
-            _httpClientHandler = ServiceContainer.Resolve<IHttpClientHandler>("httpClientHandler");
-            _httpClient = new HttpClient(_httpClientHandler.AsClientHandler());
+            _httpMessageHandler = ServiceContainer.Resolve<IHttpMessageHandler>("httpMessageHandler");
+            _httpClient = new HttpClient(_httpMessageHandler.AsMessageHandler());
             #endregion
 
             _tokenService = tokenService;
@@ -63,10 +63,10 @@ public ApiService(
         public string EventsBaseUrl { get; set; }
 
         #region Nibblewarden
-        private readonly IHttpClientHandler _httpClientHandler;
+        private readonly IHttpMessageHandler _httpMessageHandler;
         public void UseClientCertificate(ICertificateChainSpec certificateChainSpec)
         {
-            _httpClientHandler.UseClientCertificate(certificateChainSpec);
+            _httpMessageHandler.UseClientCertificate(certificateChainSpec);
         }
         #endregion