From aebb7fdbb0fbc3a4504992eeb35f5d95f948861b Mon Sep 17 00:00:00 2001
From: Stanley Dimant <root.darkarchon@outlook.com>
Date: Wed, 3 Aug 2022 22:18:29 +0200
Subject: [PATCH] adjust contextaccessor

---
 MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs | 7 ++++---
 MareSynchronosServer/MareSynchronosServer/Startup.cs      | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
index 73064d3..e579fbd 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
@@ -21,13 +21,15 @@ namespace MareSynchronosServer.Hubs
     {
         private readonly SystemInfoService _systemInfoService;
         private readonly IConfiguration _configuration;
+        private readonly IHttpContextAccessor contextAccessor;
         private readonly ILogger<MareHub> _logger;
         private readonly MareDbContext _dbContext;
 
-        public MareHub(MareDbContext mareDbContext, ILogger<MareHub> logger, SystemInfoService systemInfoService, IConfiguration configuration)
+        public MareHub(MareDbContext mareDbContext, ILogger<MareHub> logger, SystemInfoService systemInfoService, IConfiguration configuration, IHttpContextAccessor contextAccessor)
         {
             _systemInfoService = systemInfoService;
             _configuration = configuration;
+            this.contextAccessor = contextAccessor;
             _logger = logger;
             _dbContext = mareDbContext;
         }
@@ -81,8 +83,7 @@ namespace MareSynchronosServer.Hubs
 
         public override Task OnConnectedAsync()
         {
-            var feature = Context.Features.Get<IHttpContextAccessor>();
-            _logger.LogInformation("Connection from " + feature.GetIpAddress());
+            _logger.LogInformation("Connection from " + contextAccessor.GetIpAddress());
             MareMetrics.Connections.Inc();
             return base.OnConnectedAsync();
         }
diff --git a/MareSynchronosServer/MareSynchronosServer/Startup.cs b/MareSynchronosServer/MareSynchronosServer/Startup.cs
index 57b2738..efdbe3b 100644
--- a/MareSynchronosServer/MareSynchronosServer/Startup.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Startup.cs
@@ -35,6 +35,8 @@ namespace MareSynchronosServer
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddHttpContextAccessor();
+
             services.AddSignalR(hubOptions =>
             {
                 hubOptions.MaximumReceiveMessageSize = long.MaxValue;
@@ -65,7 +67,6 @@ namespace MareSynchronosServer
             services.AddHostedService<FileCleanupService>();
             services.AddHostedService(provider => provider.GetService<SystemInfoService>());
             services.AddHostedService<DiscordBot>();
-            services.AddHttpContextAccessor();
 
             services.AddDatabaseDeveloperPageExceptionFilter();
             services.AddAuthentication(options =>