From 7568274c7772c49877061c831367e48762660070 Mon Sep 17 00:00:00 2001
From: TekH <h.tek@digitaldata.works>
Date: Tue, 9 Sep 2025 20:32:35 +0200
Subject: [PATCH] refactor(ReceiverSecretDto): remove

---
 .../Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs   |  9 ++-------
 .../EnvelopeReceiver/EnvelopeReceiverSecretDto.cs |  5 ++---
 .../Common/Dto/MappingProfile.cs                  |  1 -
 .../Common/Dto/Receiver/ReceiverDto.cs            |  6 ++++++
 .../Common/Dto/Receiver/ReceiverSecretDto.cs      | 15 ---------------
 .../Controllers/HomeController.cs                 |  3 +--
 EnvelopeGenerator.Web/Extensions/WebExtensions.cs |  3 +--
 7 files changed, 12 insertions(+), 30 deletions(-)
 delete mode 100644 EnvelopeGenerator.Application/Common/Dto/Receiver/ReceiverSecretDto.cs

diff --git a/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs b/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs
index 22bddbba..3ec59e15 100644
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs
@@ -3,17 +3,12 @@ using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-/// <summary>
-/// 
-/// </summary>
-[ApiExplorerSettings(IgnoreApi = true)]
-public record EnvelopeReceiverDto : EnvelopeReceiverDto<ReceiverDto>;
 
 /// <summary>
 /// 
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public record EnvelopeReceiverDto<TReceiverDto> where TReceiverDto : ReceiverDto
+public record EnvelopeReceiverDto
 {
     /// <summary>
     /// 
@@ -23,7 +18,7 @@ public record EnvelopeReceiverDto<TReceiverDto> where TReceiverDto : ReceiverDto
     /// <summary>
     /// 
     /// </summary>
-    public TReceiverDto? Receiver { get; set; }
+    public ReceiverDto? Receiver { get; set; }
 
     /// <summary>
     /// 
diff --git a/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverSecretDto.cs b/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverSecretDto.cs
index f0169c8a..717a358f 100644
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverSecretDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverSecretDto.cs
@@ -1,5 +1,4 @@
-using EnvelopeGenerator.Application.Common.Dto.Receiver;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 
@@ -7,7 +6,7 @@ namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 /// 
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public record EnvelopeReceiverSecretDto : EnvelopeReceiverDto<ReceiverSecretDto>
+public record EnvelopeReceiverSecretDto : EnvelopeReceiverDto
 {
     /// <summary>
     /// 
diff --git a/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs b/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
index 052a0948..7db2dd76 100644
--- a/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
@@ -34,7 +34,6 @@ public class MappingProfile : Profile
         CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverSecretDto>();
         CreateMap<EnvelopeType, EnvelopeTypeDto>();
         CreateMap<Domain.Entities.Receiver, ReceiverDto>();
-        CreateMap<Domain.Entities.Receiver, ReceiverSecretDto>();
         CreateMap<Domain.Entities.EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
 
         // DTO to Entity mappings
diff --git a/EnvelopeGenerator.Application/Common/Dto/Receiver/ReceiverDto.cs b/EnvelopeGenerator.Application/Common/Dto/Receiver/ReceiverDto.cs
index 9f02e794..534a33f5 100644
--- a/EnvelopeGenerator.Application/Common/Dto/Receiver/ReceiverDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/Receiver/ReceiverDto.cs
@@ -25,6 +25,12 @@ public class ReceiverDto
     /// </summary>
     public required string Signature { get; set; }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    [JsonIgnore]
+    public string? TotpSecretkey { get; set; }
+
     /// <summary>
     /// 
     /// </summary>
diff --git a/EnvelopeGenerator.Application/Common/Dto/Receiver/ReceiverSecretDto.cs b/EnvelopeGenerator.Application/Common/Dto/Receiver/ReceiverSecretDto.cs
deleted file mode 100644
index c159aafb..00000000
--- a/EnvelopeGenerator.Application/Common/Dto/Receiver/ReceiverSecretDto.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.Common.Dto.Receiver;
-
-/// <summary>
-/// 
-/// </summary>
-[ApiExplorerSettings(IgnoreApi = true)]
-public class ReceiverSecretDto : ReceiverDto
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? TotpSecretkey { get; set; }
-}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs
index b97e9c8c..cce450ea 100644
--- a/EnvelopeGenerator.Web/Controllers/HomeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs
@@ -142,8 +142,7 @@ public class HomeController : ViewControllerBase
     }
 
     [Obsolete("Use MediatR")]
-    private async Task<IActionResult> CreateShowEnvelopeView<TReceiver>(string envelopeReceiverId, EnvelopeReceiverDto<TReceiver> er)
-        where TReceiver : ReceiverDto
+    private async Task<IActionResult> CreateShowEnvelopeView(string envelopeReceiverId, EnvelopeReceiverDto er)
     {
         try
         {
diff --git a/EnvelopeGenerator.Web/Extensions/WebExtensions.cs b/EnvelopeGenerator.Web/Extensions/WebExtensions.cs
index 286f4b9a..6eb9535e 100644
--- a/EnvelopeGenerator.Web/Extensions/WebExtensions.cs
+++ b/EnvelopeGenerator.Web/Extensions/WebExtensions.cs
@@ -30,8 +30,7 @@ public static class WebExtensions
         return int.TryParse(env_id_str, out int env_id) ? env_id : null;
     }
     
-    public static async Task SignInEnvelopeAsync<TReceiver>(this HttpContext context, EnvelopeReceiverDto<TReceiver> er, string receiverRole)
-        where TReceiver : ReceiverDto
+    public static async Task SignInEnvelopeAsync(this HttpContext context, EnvelopeReceiverDto er, string receiverRole)
     {
         var claims = new List<Claim> {
         new(ClaimTypes.NameIdentifier, er.Envelope!.Uuid),