refactor(HomeController): Aktualisiert, um ein Dokument aus der Datenbank über EnvelopeDocumentDto zu lesen, anstatt das Dokument aus dem Dateipfad mit envelopeOldService zu lesen

EnvelopeGenerator.Application/DTOs/EnvelopeDocumentDto.cs

@@ -7,6 +7,7 @@ namespace EnvelopeGenerator.Application.DTOs
         int Id,
         int EnvelopeId,
         DateTime AddedWhen,
-        IEnumerable<DocumentReceiverElementDto>? Elements
+        byte[]? ByteData = null,
+        IEnumerable<DocumentReceiverElementDto>? Elements = null
     ) : IUnique<int>;
 }

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -84,10 +84,6 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("EXPIRES_WARNING_WHEN_DAYS")]
         public int? ExpiresWarningWhenDays { get; set; }
 
-        [Required]
-        [Column("DMZ_MOVED")]
-        public bool DmzMoved { get; set; }
-
         /// <summary>
         /// The sender of envelope
         /// </summary>

EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs

@@ -31,6 +31,9 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("FILENAME_ORIGINAL", TypeName = "nvarchar(256)")]
         public required string FilenameOriginal { get; set; }
 
+        [Column("BYTE_DATA", TypeName = "varbinary(max)")]
+        public byte[]? ByteData { get; init; }
+
         public IEnumerable<DocumentReceiverElement>? Elements { get; set; }
     }
 }

EnvelopeGenerator.Web/Controllers/HomeController.cs

@@ -17,6 +17,7 @@ using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using static EnvelopeGenerator.Common.Constants;
 using Ganss.Xss;
 using Newtonsoft.Json;
+using EnvelopeGenerator.Application.DTOs;
 
 namespace EnvelopeGenerator.Web.Controllers
 {
@@ -188,15 +189,13 @@ namespace EnvelopeGenerator.Web.Controllers
                             if (await _historyService.IsSigned(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress))
                                 return View("EnvelopeSigned");
 
-                            if (response.Envelope.Documents.Count > 0)
+                            if (er.Envelope.Documents?.FirstOrDefault() is EnvelopeDocumentDto doc && doc.ByteData is not null)
                             {
-                                var document = await envelopeOldService.GetDocument(response.Envelope.Documents[0].Id, envelopeReceiverId);
-                                byte[] bytes = await envelopeOldService.GetDocumentContents(document);
-                                ViewData["DocumentBytes"] = bytes;
+                                ViewData["DocumentBytes"] = doc.ByteData;
                             }
                             else
                             {
-                                _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, message: "No document was found.");
+                                _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, message: "No document byte-data was found in ENVELOPE_DOCUMENT table.");
 								return this.ViewDocumentNotFound();
 							}
 
@@ -351,12 +350,10 @@ namespace EnvelopeGenerator.Web.Controllers
                         _logger.LogNotice(hist_res.Notices);
                     }
 
-                    if (response.Envelope.Documents.Count > 0)
+                    if (er.Envelope.Documents?.FirstOrDefault() is EnvelopeDocumentDto doc && doc.ByteData is not null)
                     {
-                        var document = await envelopeOldService.GetDocument(response.Envelope.Documents[0].Id, envelopeKey);
-                        byte[] bytes = await envelopeOldService.GetDocumentContents(document);
+                        ViewData["DocumentBytes"] = doc.ByteData;
                         ViewData["EnvelopeKey"] = envelopeKey;
-                        ViewData["DocumentBytes"] = bytes;
                         ViewData["IsReadOnly"] = true;
                         ViewData["ReadOnly"] = erro;
                         ViewData["PSPDFKitLicenseKey"] = _configuration["PSPDFKitLicenseKey"];
@@ -364,7 +361,7 @@ namespace EnvelopeGenerator.Web.Controllers
                     }
                     else
                     {
-                        _logger.LogEnvelopeError(envelopeReceiverId: envelopeKey, message: "No document was found.");
+                        _logger.LogEnvelopeError(envelopeReceiverId: envelopeKey, message: "No document byte-data was found in ENVELOPE_DOCUMENT table.");
                         return this.ViewDocumentNotFound();
                     }
                 },

EnvelopeGenerator.Web/Program.cs

@@ -130,8 +130,6 @@ try
 
     builder.Services.AddSingleton(config.GetSection("ContactLink").Get<ContactLink>() ?? new());
 
-    builder.Services.AddCookieConsentSettings();
-
     builder.Services.AddCookieBasedLocalizer();
     
     builder.Services.AddSingleton(HtmlEncoder.Default);

EnvelopeGenerator.Web/appsettings.Development.json

@@ -5,5 +5,7 @@
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
-  }
+  },
+  "AdminPassword": "dd",
+  "UseCSPInDev": false
 }

EnvelopeGenerator.Web/appsettings.json

@@ -14,9 +14,7 @@
   "ConnectionStrings": {
     "Default": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;"
   },
-  "AdminPassword": "dd",
   "PSPDFKitLicenseKey": "SXCtGGY9XA-31OGUXQK-r7c6AkdLGPm2ljuyDr1qu0kkhLvydg-Do-fxpNUF4Rq3fS_xAnZRNFRHbXpE6sQ2BMcCSVTcXVJO6tPviexjpiT-HnrDEySlUERJnnvh-tmeOWprxS6BySPnSILkmaVQtUfOIUS-cUbvvEYHTvQBKbSF8di4XHQFyfv49ihr51axm3NVV3AXwh2EiKL5C5XdqBZ4sQ4O7vXBjM2zvxdPxlxdcNYmiU83uAzw7B83O_jubPzya4CdUHh_YH7Nlp2gP56MeG1Sw2JhMtfG3Rj14Sg4ctaeL9p6AEWca5dDjJ2li5tFIV2fQSsw6A_cowLu0gtMm5i8IfJXeIcQbMC2-0wGv1oe9hZYJvFMdzhTM_FiejM0agemxt3lJyzuyP8zbBSOgp7Si6A85krLWPZptyZBTG7pp7IHboUHfPMxCXqi-zMsqewOJtQBE2mjntU-lPryKnssOpMPfswwQX7QSkJYV5EMqNmEhQX6mEkp2wcqFzMC7bJQew1aO4pOpvChUaMvb1vgRek0HxLag0nwQYX2YrYGh7F_xXJs-8HNwJe8H0-eW4x4faayCgM5rB5772CCCsD9ThZcvXFrjNHHLGJ8WuBUFm6LArvSfFQdii_7j-_sqHMpeKZt26NFgivj1A==",
-  "UseCSPInDev": false,
   "Content-Security-Policy": [ // The first format parameter {0} will be replaced by the nonce value.
     "default-src 'self'",
     "script-src 'self' 'nonce-{0}' 'unsafe-eval'",
@@ -32,7 +30,7 @@
   "NLog": {
     "throwConfigExceptions": true,
     "variables": {
-      "logDirectory": "E:\\EnvelopeGenerator\\Logs",
+      "logDirectory": "E:\\LogFiles\\Digital Data\\signFlow",
       "logFileNamePrefix": "${shortdate}-ECM.EnvelopeGenerator.Web"
     },
     "targets": {
@@ -77,21 +75,6 @@
     "Audience": null,
     "Key": "8RGnd7x0G2TYLOIW4m_qlIls7MfbAIGNrpQJzMAUIvULHOLiG723znRa_MG-Z4yw3SErusOU4hTui2rVBMcCaQ"
   },
-  "CookieConsentSettings": {
-    "PrivacyPolicyUrl": "./privacy-policy.en.html",
-    "LegalNoticeUrl": "./cookies-policy.en.html",
-    "ContentURL": "/cookie-consent-content",
-    "ButtonAgreeClass": "btn btn-primary",
-    "ButtonDontAgreeClass": "btn btn-link text-decoration-none none-display",
-    "ButtonSaveClass": "btn btn-secondary none-display",
-    "Lang": "de",
-    "DefaultLang": "en",
-    "CookieName": "cookie-consent-settings",
-    "CookieStorageDays": 1,
-    "ModalId": "bootstrapCookieConsentSettingsModal",
-    "AlsoUseLocalStorage": false,
-    "Categories": [ "necessary" ]
-  },
   "ContactLink": {
     "Label": "Kontakt",
     "Href": "https://digitaldata.works/",
@@ -113,12 +96,6 @@
     }
   ],
   "DisableMultiLanguage": false,
-  "DispatcherConfig": {
-    "SendingProfile": 1,
-    "AddedWho": "DDEnvelopGenerator",
-    "ReminderTypeId": 202377,
-    "EmailAttmt1": ""
-  },
   "Regexes": [
     {
       "Pattern": "/^\\p{L}+(?:([\\ \\-\\']|(\\.\\ ))\\p{L}+)*$/u",
@@ -136,6 +113,12 @@
     "ShowPageClass": "dd-show-logo",
     "LockedPageClass": "dd-locked-logo"
   },
+  "DispatcherConfig": {
+    "SendingProfile": 1,
+    "AddedWho": "DDEnvelopGenerator",
+    "ReminderTypeId": 202377,
+    "EmailAttmt1": ""
+  },
   "MailConfig": {
     "Placeholders": {
       "[NAME_PORTAL]": "signFlow",

EnvelopeGenerator.Web/wwwroot/css/site.css

@@ -158,11 +158,11 @@ footer {
     width: 100%;
     z-index: 998;
     border-width: 0;
-    font-size: clamp(0.75rem, 1.5vw, 1rem);
+    font-size: clamp(0.58rem, 1.5vw, 1rem);
     display: flex;
     flex-direction: row;
     justify-content: space-around;
-    align-items: start;
+    align-items: center;
 }
 
     footer * {