feat(EnvelopeExpired-View): Erstellt eine Ansicht, die anzeigt, wenn der Umschlag abgelaufen ist

- View-Benutzernachrichten sind so organisiert, dass sie davon abhängen, ob der Umschlag schreibgeschützt ist oder nicht.

EnvelopeGenerator.Application/Resources/Resource.de-DE.resx

@@ -177,6 +177,9 @@
   <data name="LockedTitle" xml:space="preserve">
     <value>Dokument erfordert einen Zugriffscode</value>
   </data>
+  <data name="ReadOnlyMessage" xml:space="preserve">
+    <value>Weitergeleitet von {0}. Gültig bis {1}.</value>
+  </data>
   <data name="Reject" xml:space="preserve">
     <value>Ablehnen</value>
   </data>

EnvelopeGenerator.Application/Resources/Resource.en-US.resx

@@ -177,6 +177,9 @@
   <data name="LockedTitle" xml:space="preserve">
     <value>Document requires an access code</value>
   </data>
+  <data name="ReadOnlyMessage" xml:space="preserve">
+    <value>Forwarded by {0}. Valid until {1}.</value>
+  </data>
   <data name="Reject" xml:space="preserve">
     <value>Reject</value>
   </data>

EnvelopeGenerator.Web/Controllers/HomeController.cs

@@ -17,6 +17,7 @@ using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using static EnvelopeGenerator.Common.Constants;
 using EnvelopeGenerator.Domain.Entities;
+using Ganss.Xss;
 
 namespace EnvelopeGenerator.Web.Controllers
 {
@@ -28,19 +29,19 @@ namespace EnvelopeGenerator.Web.Controllers
         private readonly IEnvelopeHistoryService _historyService;
         private readonly IStringLocalizer<Resource> _localizer;
         private readonly IConfiguration _configuration;
-        private readonly UrlEncoder _urlEncoder;
+        private readonly HtmlSanitizer _sanitizer;
         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, UrlEncoder urlEncoder, Cultures cultures, IEnvelopeMailService envelopeMailService, 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)
         {
             this.envelopeOldService = envelopeOldService;
             _envRcvService = envelopeReceiverService;
             _historyService = historyService;
             _localizer = localizer;
             _configuration = configuration;
-            _urlEncoder = urlEncoder;
+            _sanitizer = sanitizer;
             _cultures = cultures;
             _mailService = envelopeMailService;
             _logger = logger;
@@ -52,7 +53,7 @@ namespace EnvelopeGenerator.Web.Controllers
         {
             try
             {
-                //envelopeReceiverId = _urlEncoder.Encode(envelopeReceiverId);
+                envelopeReceiverId = _sanitizer.Sanitize(envelopeReceiverId);
 
                 if (!envelopeReceiverId.TryDecode(out var decoded))
                 {
@@ -103,8 +104,8 @@ namespace EnvelopeGenerator.Web.Controllers
         {
             try
             {
-                culture = culture is not null ? _urlEncoder.Encode(culture) : null;
-                envelopeReceiverId = _urlEncoder.Encode(envelopeReceiverId);
+                culture = culture is not null ? _sanitizer.Sanitize(culture) : null;
+                envelopeReceiverId = _sanitizer.Sanitize(envelopeReceiverId);
 
                 if (UserLanguage is null && culture is null)
                 {
@@ -139,7 +140,7 @@ namespace EnvelopeGenerator.Web.Controllers
             {
                 ViewData["UserCulture"] = _cultures[UserLanguage];
 
-                envelopeReceiverId = _urlEncoder.Encode(envelopeReceiverId);
+                envelopeReceiverId = _sanitizer.Sanitize(envelopeReceiverId);
                 (string? uuid, string? signature) = envelopeReceiverId.DecodeEnvelopeReceiverId();
 
                 if (uuid is null || signature is null)
@@ -246,7 +247,7 @@ namespace EnvelopeGenerator.Web.Controllers
         {
             try
             {
-                envelopeReceiverId = _urlEncoder.Encode(envelopeReceiverId);
+                envelopeReceiverId = _sanitizer.Sanitize(envelopeReceiverId);
                 return await _envRcvService.IsExisting(envelopeReceiverId: envelopeReceiverId).ThenAsync(
                     SuccessAsync: async isExisting =>
                     {
@@ -280,7 +281,7 @@ namespace EnvelopeGenerator.Web.Controllers
         {
             try
             {
-                envelopeReceiverId = _urlEncoder.Encode(envelopeReceiverId);
+                envelopeReceiverId = _sanitizer.Sanitize(envelopeReceiverId);
 
                 await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
                 return await _envRcvService.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId).ThenAsync(
@@ -310,7 +311,7 @@ namespace EnvelopeGenerator.Web.Controllers
         {
             try
             {
-                //readOnlyKey = _urlEncoder.Encode(readOnlyKey);
+                readOnlyKey = _sanitizer.Sanitize(readOnlyKey);
 
                 // check if the readOnlyId is valid
                 if (!readOnlyKey.TryDecode(out var decodedKeys) || decodedKeys.GetEncodeType() != EncodeType.EnvelopeReceiverReadOnly)
@@ -329,6 +330,9 @@ namespace EnvelopeGenerator.Web.Controllers
 
                 var erro = erro_res.Data;
 
+                if (DateTime.Now > erro.DateValid)
+                    return View("EnvelopeExpired");
+
                 return await _envRcvService.ReadByUuidSignatureAsync(uuid: erro.Envelope!.Uuid, erro.Receiver!.Signature).ThenAsync(
                 SuccessAsync: async er =>
                 {
@@ -343,6 +347,7 @@ namespace EnvelopeGenerator.Web.Controllers
                         ViewData["EnvelopeKey"] = envelopeKey;
                         ViewData["DocumentBytes"] = bytes;
                         ViewData["IsReadOnly"] = true;
+                        ViewData["ReadOnly"] = erro;
                         ViewData["PSPDFKitLicenseKey"] = _configuration["PSPDFKitLicenseKey"];
                         return View("ShowEnvelope", er);
                     }
@@ -379,7 +384,7 @@ namespace EnvelopeGenerator.Web.Controllers
         {
             try
             {
-                language = _urlEncoder.Encode(language);
+                language = _sanitizer.Sanitize(language);
                 if (!_cultures.Languages.Contains(language))
                     return BadRequest();
 

EnvelopeGenerator.Web/Views/Home/EnvelopeExpired.cshtml

@@ -0,0 +1,24 @@
+@{
+    ViewData["Title"] = "Abgelaufen";
+}
+<div class="page container p-5">
+    <header class="text-center">
+        <div class="icon expired">
+            <svg width="72" height="72" viewBox="0 0 48 48" version="1" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 48 48">
+                <circle fill="#00ACC1" cx="17" cy="17" r="14" />
+                <circle fill="#eee" cx="17" cy="17" r="11" />
+                <rect x="16" y="8" width="2" height="9" />
+                <rect x="18.2" y="16" transform="matrix(-.707 .707 -.707 -.707 46.834 19.399)" width="2.4" height="6.8" />
+                <circle cx="17" cy="17" r="2" />
+                <circle fill="#00ACC1" cx="17" cy="17" r="1" />
+                <path fill="#FFC107" d="M11.9,42l14.4-24.1c0.8-1.3,2.7-1.3,3.4,0L44.1,42c0.8,1.3-0.2,3-1.7,3H13.6C12.1,45,11.1,43.3,11.9,42z" />
+                <path fill="#263238" d="M26.4,39.9c0-0.2,0-0.4,0.1-0.6s0.2-0.3,0.3-0.5s0.3-0.2,0.5-0.3s0.4-0.1,0.6-0.1s0.5,0,0.7,0.1 s0.4,0.2,0.5,0.3s0.2,0.3,0.3,0.5s0.1,0.4,0.1,0.6s0,0.4-0.1,0.6s-0.2,0.3-0.3,0.5s-0.3,0.2-0.5,0.3s-0.4,0.1-0.7,0.1 s-0.5,0-0.6-0.1s-0.4-0.2-0.5-0.3s-0.2-0.3-0.3-0.5S26.4,40.1,26.4,39.9z M29.2,36.8h-2.3L26.5,27h3L29.2,36.8z" />
+            </svg>
+        </div>
+        <h1>Abgelaufen!</h1>
+    </header>
+    <section class="text-center">
+        <p>Der Zeitraum für die gemeinsame Nutzung von Dokumenten ist abgelaufen.</p>
+    </section>
+</div>
+<footer class="container" id="page-footer">&copy; SignFlow 2023-2024 <a href="https://digitaldata.works">Digital Data GmbH</a></footer>

EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml

@@ -5,6 +5,7 @@
 @using DigitalData.Core.DTO;
 @using EnvelopeGenerator.Application.DTOs;
 @using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
+@using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly
 @using Newtonsoft.Json
 @using Newtonsoft.Json.Serialization
 @model EnvelopeReceiverDto;
@@ -15,14 +16,20 @@
 @{
     var userCulture = ViewData["UserCulture"] as Culture;
     var envelope = Model.Envelope;
+    var receiver_name = Model.Name;
     var document = Model.Envelope?.Documents?.FirstOrDefault();
     var sender = Model.Envelope?.User;
     var pages = document?.Elements?.Select(e => e.Page) ?? Array.Empty<int>();
     int? signatureCount = document?.Elements?.Count();
     var stPageIndexes = string.Join(pages.Count() > 1 ? ", " : "", pages.Take(pages.Count() - 1))
                   + (pages.Count() > 1 ? $" {_localizer[WebKey.and].TrySanitize(_sanitizer)} " : "") + pages.LastOrDefault();
+    var isReadOnly = false;
+    if (ViewData["IsReadOnly"] is bool isReadOnly_bool)
+        isReadOnly = isReadOnly_bool;
 }
 <div class="envelope-view">
+    @if (!isReadOnly)
+    {
     <div id="flex-action-panel" class="btn-group btn_group position-fixed bottom-0 end-0 d-flex align-items-center" role="group" aria-label="Basic mixed styles example">
         <button class="btn_complete btn btn-primary" type="button">
             <svg class="icon" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 16">
@@ -44,7 +51,7 @@
             </svg>
         </button>
     </div>
-    
+    }    
     <div class="dd-cards-container">
         <div class="dd-card">
             <div class="dd-card-preview">
@@ -57,7 +64,17 @@
                     <img class="@logo.ShowPageClass" src="@logo.Src" alt="logo">
                 </div>
                 <h2>@($"{envelope?.Title}".TrySanitize(_sanitizer))</h2>
+                @if (isReadOnly)
+                {
+                    var dateTimeSt = string.Empty;
+                    if (ViewData["ReadOnly"] is EnvelopeReceiverReadOnlyDto readOnly)
+                        dateTimeSt = readOnly.DateValid.ToLongDateString() + " - " + readOnly.DateValid.ToShortTimeString();
+                    <h6>@string.Format(_localizer["ReadOnlyMessage"], receiver_name, dateTimeSt)</h6>
+                }
+                else
+                {
                 <h6>@($"{@envelope?.Message}".TrySanitize(_sanitizer))</h6>
+                }
                 <p>
                     <small class="text-body-secondary">
                         @Html.Raw(string.Format(_localizer[WebKey.EnvelopeInfo2],   /* sanitize separately but don't sanitize the URI */
@@ -70,12 +87,15 @@
                                  sender?.Email.TrySanitize(_sanitizer)))
                     </small>
                 </p>
+                @if (!isReadOnly)
+                {
                 <div class="progress-container">
                     <div id="signed-count-bar" class="progress"></div>
                     <span class="progress-text">
                         <span id="signed-count">0</span>/<span id="signature-count">@signatureCount</span> Unterschriften
                     </span>
                 </div>
+                }
             </div>
         </div>
     </div>

EnvelopeGenerator.Web/wwwroot/css/site.css

@@ -161,6 +161,11 @@ footer {
             color: #fff;
         }
 
+        .page header .icon.expired {
+            background-color: rgba(228, 216, 213, 0.5);
+            color: #fff;
+        }
+
     .page .form {
         max-width: 30rem;
         margin: 2rem auto;