From e496e7161c19faccf18b84845931c442080e9c3e Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Mon, 6 May 2024 14:09:54 +0200 Subject: [PATCH] fix some stuff --- MareSynchronosServer/MareSynchronosServer/Startup.cs | 2 +- .../Services/MareConfigurationController.cs | 4 ++-- .../Services/MareConfigurationServiceClient.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MareSynchronosServer/MareSynchronosServer/Startup.cs b/MareSynchronosServer/MareSynchronosServer/Startup.cs index 10c263a..5993c51 100644 --- a/MareSynchronosServer/MareSynchronosServer/Startup.cs +++ b/MareSynchronosServer/MareSynchronosServer/Startup.cs @@ -71,7 +71,7 @@ public class Startup a.FeatureProviders.Remove(a.FeatureProviders.OfType().First()); if (mareConfig.GetValue(nameof(ServerConfiguration.MainServerAddress), defaultValue: null) == null) { - a.FeatureProviders.Add(new AllowedControllersFeatureProvider(typeof(MareServerConfigurationController), typeof(MareAuthBaseConfigurationController), typeof(ClientMessageController))); + a.FeatureProviders.Add(new AllowedControllersFeatureProvider(typeof(MareServerConfigurationController), typeof(MareBaseConfigurationController), typeof(ClientMessageController))); } else { diff --git a/MareSynchronosServer/MareSynchronosShared/Services/MareConfigurationController.cs b/MareSynchronosServer/MareSynchronosShared/Services/MareConfigurationController.cs index 3543b10..4b9a01d 100644 --- a/MareSynchronosServer/MareSynchronosShared/Services/MareConfigurationController.cs +++ b/MareSynchronosServer/MareSynchronosShared/Services/MareConfigurationController.cs @@ -37,9 +37,9 @@ public class MareStaticFilesServerConfigurationController : MareConfigurationCon } } -public class MareAuthBaseConfigurationController : MareConfigurationController +public class MareBaseConfigurationController : MareConfigurationController { - public MareAuthBaseConfigurationController(IOptionsMonitor config, ILogger logger) : base(config, logger) + public MareBaseConfigurationController(IOptionsMonitor config, ILogger logger) : base(config, logger) { } } diff --git a/MareSynchronosServer/MareSynchronosShared/Services/MareConfigurationServiceClient.cs b/MareSynchronosServer/MareSynchronosShared/Services/MareConfigurationServiceClient.cs index 61d2be8..6eaff9f 100644 --- a/MareSynchronosServer/MareSynchronosShared/Services/MareConfigurationServiceClient.cs +++ b/MareSynchronosServer/MareSynchronosShared/Services/MareConfigurationServiceClient.cs @@ -28,7 +28,7 @@ public class MareConfigurationServiceClient : IHostedService, IConfigurationS if (_config.CurrentValue.GetType() == typeof(ServerConfiguration)) return new Uri((_config.CurrentValue as ServerConfiguration).MainServerAddress, $"configuration/MareServerConfiguration/{nameof(MareServerConfigurationController.GetConfigurationEntry)}?key={key}&defaultValue={value}"); if (_config.CurrentValue.GetType() == typeof(MareConfigurationBase)) - return new Uri((_config.CurrentValue as MareConfigurationBase).MainServerAddress, $"configuration/MareAuthBaseConfiguration/{nameof(MareAuthBaseConfigurationController.GetConfigurationEntry)}?key={key}&defaultValue={value}"); + return new Uri((_config.CurrentValue as MareConfigurationBase).MainServerAddress, $"configuration/MareBaseConfiguration/{nameof(MareBaseConfigurationController.GetConfigurationEntry)}?key={key}&defaultValue={value}"); if (_config.CurrentValue.GetType() == typeof(ServicesConfiguration)) return new Uri((_config.CurrentValue as ServicesConfiguration).MainServerAddress, $"configuration/MareServicesConfiguration/{nameof(MareServicesConfigurationController.GetConfigurationEntry)}?key={key}&defaultValue={value}"); if (_config.CurrentValue.GetType() == typeof(StaticFilesServerConfiguration))