From e8cafca34e0666db2677e47060ce12775a8d61e6 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Thu, 2 Oct 2025 20:09:16 +0100 Subject: [PATCH] more fixes --- .../Services/MessagingDomainService.cs | 3 +++ .../SMSServices/TheSMSWorks/TheSmsWorksProxy.cs | 3 +++ MessagingService.Client/MessagingServiceClient.cs | 4 ---- MessagingService/Bootstrapper/MiddlewareRegistry.cs | 12 +++++++----- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/MessagingService.BusinessLogic/Services/MessagingDomainService.cs b/MessagingService.BusinessLogic/Services/MessagingDomainService.cs index ccfbb4e..2847048 100644 --- a/MessagingService.BusinessLogic/Services/MessagingDomainService.cs +++ b/MessagingService.BusinessLogic/Services/MessagingDomainService.cs @@ -287,6 +287,9 @@ public async Task UpdateMessageStatus(SMSCommands.UpdateMessageStatusCom case SMSServices.MessageStatus.Undeliverable: smsAggregate.MarkMessageAsUndeliverable(command.Description, command.Timestamp); break; + default: + smsAggregate.MarkMessageAsRejected(command.Description, command.Timestamp); + break; } return Result.Success(); diff --git a/MessagingService.BusinessLogic/Services/SMSServices/TheSMSWorks/TheSmsWorksProxy.cs b/MessagingService.BusinessLogic/Services/SMSServices/TheSMSWorks/TheSmsWorksProxy.cs index c240caa..e7ed862 100644 --- a/MessagingService.BusinessLogic/Services/SMSServices/TheSMSWorks/TheSmsWorksProxy.cs +++ b/MessagingService.BusinessLogic/Services/SMSServices/TheSMSWorks/TheSmsWorksProxy.cs @@ -148,6 +148,9 @@ private MessageStatus TranslateMessageStatus(String status) case "INCOMING": result = MessageStatus.Incoming; break; + default: + result = MessageStatus.Rejected; + break; } return result; diff --git a/MessagingService.Client/MessagingServiceClient.cs b/MessagingService.Client/MessagingServiceClient.cs index 5d38602..0a0900e 100644 --- a/MessagingService.Client/MessagingServiceClient.cs +++ b/MessagingService.Client/MessagingServiceClient.cs @@ -62,8 +62,6 @@ public async Task SendEmail(String accessToken, SendEmailRequest sendEmailRequest, CancellationToken cancellationToken) { - SendEmailResponse response = null; - String requestUri = this.BuildRequestUrl("/api/email/"); try @@ -138,8 +136,6 @@ public async Task SendSMS(String accessToken, SendSMSRequest sendSMSRequest, CancellationToken cancellationToken) { - SendSMSResponse response = null; - String requestUri = this.BuildRequestUrl("/api/sms/"); try diff --git a/MessagingService/Bootstrapper/MiddlewareRegistry.cs b/MessagingService/Bootstrapper/MiddlewareRegistry.cs index 406cb2f..5a8f1ab 100644 --- a/MessagingService/Bootstrapper/MiddlewareRegistry.cs +++ b/MessagingService/Bootstrapper/MiddlewareRegistry.cs @@ -30,8 +30,10 @@ namespace MessagingService.Bootstrapper [ExcludeFromCodeCoverage] public class MiddlewareRegistry : ServiceRegistry { - public MiddlewareRegistry() { + internal String GetSecurityConfigSetting(String settingName) => ConfigurationReader.GetValue("SecurityConfiguration", settingName); + public MiddlewareRegistry() { + String connectionString = Startup.Configuration.GetValue("EventStoreSettings:ConnectionString"); EventStoreClientSettings eventStoreConnectionSettings = EventStoreClientSettings.Create(connectionString); @@ -84,14 +86,14 @@ public MiddlewareRegistry() { ServerCertificateCustomValidationCallback = (message, certificate, chain, sslPolicyErrors) => true }; - options.Authority = ConfigurationReader.GetValue("SecurityConfiguration", "Authority"); - options.Audience = ConfigurationReader.GetValue("SecurityConfiguration", "ApiName"); + options.Authority = GetSecurityConfigSetting("Authority"); + options.Audience = GetSecurityConfigSetting("ApiName"); options.TokenValidationParameters = new Microsoft.IdentityModel.Tokens.TokenValidationParameters() { ValidateAudience = false, - ValidAudience = ConfigurationReader.GetValue("SecurityConfiguration", "ApiName"), - ValidIssuer = ConfigurationReader.GetValue("SecurityConfiguration", "Authority"), + ValidAudience = GetSecurityConfigSetting("ApiName"), + ValidIssuer = GetSecurityConfigSetting("Authority"), }; options.IncludeErrorDetails = true; });