diff --git a/MareSynchronosServer/MareSynchronosServer/Controllers/ClientMessageController.cs b/MareSynchronosServer/MareSynchronosServer/Controllers/ClientMessageController.cs index 92fc9b2..16e3b25 100644 --- a/MareSynchronosServer/MareSynchronosServer/Controllers/ClientMessageController.cs +++ b/MareSynchronosServer/MareSynchronosServer/Controllers/ClientMessageController.cs @@ -23,7 +23,7 @@ public class ClientMessageController : Controller [Route("sendMessage")] [HttpPost] - public async Task SendMessage(ClientMessage msg) + public async Task SendMessage([FromBody] ClientMessage msg) { bool hasUid = !string.IsNullOrEmpty(msg.UID); diff --git a/MareSynchronosServer/MareSynchronosServices/Discord/MareModule.cs b/MareSynchronosServer/MareSynchronosServices/Discord/MareModule.cs index af6df71..3d474a1 100644 --- a/MareSynchronosServer/MareSynchronosServices/Discord/MareModule.cs +++ b/MareSynchronosServer/MareSynchronosServices/Discord/MareModule.cs @@ -10,6 +10,7 @@ using MareSynchronosShared.Utils; using MareSynchronosShared.Services; using StackExchange.Redis; using MareSynchronos.API.Data.Enum; +using System.Net.Http.Headers; namespace MareSynchronosServices.Discord; @@ -30,12 +31,13 @@ public class MareModule : InteractionModuleBase private readonly IConfigurationService _mareClientConfigurationService; private readonly IConfigurationService _mareServicesConfiguration; private readonly IConnectionMultiplexer _connectionMultiplexer; + private readonly ServerTokenGenerator _serverTokenGenerator; private Random random = new(); public MareModule(ILogger logger, IServiceProvider services, DiscordBotServices botServices, IConfigurationService mareClientConfigurationService, IConfigurationService mareServicesConfiguration, - IConnectionMultiplexer connectionMultiplexer) + IConnectionMultiplexer connectionMultiplexer, ServerTokenGenerator serverTokenGenerator) { _logger = logger; _services = services; @@ -43,6 +45,7 @@ public class MareModule : InteractionModuleBase _mareClientConfigurationService = mareClientConfigurationService; _mareServicesConfiguration = mareServicesConfiguration; _connectionMultiplexer = connectionMultiplexer; + _serverTokenGenerator = serverTokenGenerator; } //[SlashCommand("register", "Starts the registration process")] @@ -372,6 +375,7 @@ public class MareModule : InteractionModuleBase try { using HttpClient c = new HttpClient(); + c.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", _serverTokenGenerator.Token); await c.PostAsJsonAsync(new Uri(_mareServicesConfiguration.GetValue (nameof(ServicesConfiguration.MainServerAddress)), "/msgc/sendMessage"), new ClientMessage(messageType, message, uid ?? string.Empty)) .ConfigureAwait(false);