From 9d1a2e7254b9c30a432061f9c8f7065ae2b0ae99 Mon Sep 17 00:00:00 2001
From: Developer 02 <developer02@didaloghe.onmicrosoft.com>
Date: Fri, 29 Nov 2024 12:05:07 +0100
Subject: [PATCH] =?UTF-8?q?refactor(HomeController):=20SMS-Code=20zum=20Se?=
 =?UTF-8?q?nden=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EnvelopeGenerator.Application/DIExtensions.cs     |  2 +-
 .../MappingProfiles/BasicDtoMappingProfile.cs     |  1 +
 .../Controllers/HomeController.cs                 | 15 ++++++++++++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/EnvelopeGenerator.Application/DIExtensions.cs b/EnvelopeGenerator.Application/DIExtensions.cs
index c8dd5eb2..694adb0d 100644
--- a/EnvelopeGenerator.Application/DIExtensions.cs
+++ b/EnvelopeGenerator.Application/DIExtensions.cs
@@ -48,7 +48,6 @@ namespace EnvelopeGenerator.Application
             services.TryAddScoped<IReceiverService, ReceiverService>();
             services.TryAddScoped<IUserReceiverService, UserReceiverService>();
             services.TryAddScoped<IEnvelopeReceiverReadOnlyService, EnvelopeReceiverReadOnlyService>();
-            services.TryAddScoped<ICodeGenerator, CodeGenerator>();
 
             //Auto mapping profiles
             services.AddAutoMapper(typeof(BasicDtoMappingProfile).Assembly);
@@ -60,6 +59,7 @@ namespace EnvelopeGenerator.Application
 
             services.AddHttpClientService<SmsParams>(smsConfigSection);
             services.TryAddSingleton<IMessagingService, GtxMessagingService>();
+            services.TryAddSingleton<ICodeGenerator, CodeGenerator>();
 
             return services;
         }
diff --git a/EnvelopeGenerator.Application/MappingProfiles/BasicDtoMappingProfile.cs b/EnvelopeGenerator.Application/MappingProfiles/BasicDtoMappingProfile.cs
index 021eebea..aad668cb 100644
--- a/EnvelopeGenerator.Application/MappingProfiles/BasicDtoMappingProfile.cs
+++ b/EnvelopeGenerator.Application/MappingProfiles/BasicDtoMappingProfile.cs
@@ -25,6 +25,7 @@ namespace EnvelopeGenerator.Application.MappingProfiles
             CreateMap<EnvelopeHistory, EnvelopeHistoryDto>();
             CreateMap<EnvelopeHistory, EnvelopeHistoryCreateDto>();
             CreateMap<EnvelopeReceiver, EnvelopeReceiverDto>();
+            CreateMap<EnvelopeReceiver, EnvelopeReceiverSecretDto>();
             CreateMap<EnvelopeType, EnvelopeTypeDto>();
             CreateMap<Receiver, ReceiverReadDto>();
             CreateMap<Receiver, ReceiverCreateDto>();
diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs
index 06db6647..0f008dd0 100644
--- a/EnvelopeGenerator.Web/Controllers/HomeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs
@@ -34,8 +34,8 @@ namespace EnvelopeGenerator.Web.Controllers
         private readonly Cultures _cultures;
         private readonly IEnvelopeMailService _mailService;
         private readonly IEnvelopeReceiverReadOnlyService _readOnlyService;
-
-        public HomeController(EnvelopeOldService envelopeOldService, ILogger<HomeController> logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer<Resource> localizer, IConfiguration configuration, HtmlSanitizer sanitizer, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService)
+        private readonly IMessagingService _msgService;
+        public HomeController(EnvelopeOldService envelopeOldService, ILogger<HomeController> logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer<Resource> localizer, IConfiguration configuration, HtmlSanitizer sanitizer, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, IMessagingService messagingService)
         {
             this.envelopeOldService = envelopeOldService;
             _envRcvService = envelopeReceiverService;
@@ -47,6 +47,7 @@ namespace EnvelopeGenerator.Web.Controllers
             _mailService = envelopeMailService;
             _logger = logger;
             _readOnlyService = readOnlyService;
+            _msgService = messagingService;
         }
 
         [HttpGet("/")]
@@ -189,7 +190,15 @@ namespace EnvelopeGenerator.Web.Controllers
                             //check if the user has phone is added
                             if (er_secret.HasPhoneNumber)
                             {
-                                return View("EnvelopeLocked").WithData("ViaSms", true);
+                                var res = await _msgService.SendSmsCodeAsync(er_secret.PhoneNumber!);
+                                if(res.Ok)
+                                    return View("EnvelopeLocked").WithData("ViaSms", true);
+                                else
+                                {
+                                    var res_json = JsonConvert.SerializeObject(res);
+                                    _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, message: $"An unexpected error occurred while sending an SMS code. Response: ${res_json}");
+                                    return this.ViewInnerServiceError();
+                                }
                             }
 
                             //continue the process without important data to minimize security errors.