From 57e4dfb3fbcfe8308b1005c4f2f9490f91fd9717 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Mon, 10 Feb 2025 16:58:57 +0100 Subject: [PATCH] =?UTF-8?q?feat(EnvelopeLocked):=20Link=20zum=20Senden=20v?= =?UTF-8?q?on=20E-Mails=20zu=20LockedFooterBodyAccess=20hinzugef=C3=BCgt.?= =?UTF-8?q?=20=20-=20Gebunden=20mit=20Modell.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EnvelopeGenerator.Application/Resources/Resource.de-DE.resx | 2 +- EnvelopeGenerator.Application/Resources/Resource.en-US.resx | 2 +- EnvelopeGenerator.Web/Controllers/HomeController.cs | 4 +++- EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml | 5 ++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx b/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx index 1c14ef2c..ca8a6a7d 100644 --- a/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx +++ b/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx @@ -184,7 +184,7 @@ SMS-Code - Bitte überprüfen Sie Ihr Email Postfach inklusive Spam-Ordner. Sie können auch den Absender (hier muss die email des Versenders stehen) bitten, Ihnen den Code auf anderem Wege zukommen zu lassen. + Bitte überprüfen Sie Ihr Email Postfach inklusive Spam-Ordner. Sie können auch den Absender <a class="mail-link" href="mailto:{0}?subject={1}&body={2}" target="_blank">{0}</a> bitten, Ihnen den Code auf anderem Wege zukommen zu lassen. Der neue QR-Code wird nur einmal für einen bestimmten Zeitraum gesendet und nach dem Scannen in Ihrer Authenticator-App gespeichert. Er kann für alle Umschläge verwendet werden, die an dieselbe E-Mail-Adresse gesendet werden, bis er abläuft. Wenn Sie die QR-Code-Mail nicht erhalten oder sie sowohl aus der Mail als auch aus authenticator löschen, kontaktieren Sie bitte den Absender. diff --git a/EnvelopeGenerator.Application/Resources/Resource.en-US.resx b/EnvelopeGenerator.Application/Resources/Resource.en-US.resx index 4fdf2852..c2a8658c 100644 --- a/EnvelopeGenerator.Application/Resources/Resource.en-US.resx +++ b/EnvelopeGenerator.Application/Resources/Resource.en-US.resx @@ -184,7 +184,7 @@ SMS Code - Please check your email inbox including the spam folder. You can also ask the sender (the sender's email must appear here) to send you the code by other means. + Please check your email inbox including the spam folder. You can also ask the sender <a class="mail-link" href="mailto:{0}?subject={1}&body={2}" target="_blank">{0}</a> to send you the code by other means. The new QR code is sent only once for a given period and is saved in your authenticator app once scanned. It can be used for all envelopes received at the same email address until it expires. If you do not receive the QR code mail or delete it both from the mail and from authenticator, please contact the sender. diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs index cebebce7..1779c6ec 100644 --- a/EnvelopeGenerator.Web/Controllers/HomeController.cs +++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs @@ -137,7 +137,9 @@ public class HomeController : ViewControllerBase Success: er => View() .WithData("EnvelopeKey", envelopeReceiverId) .WithData("TFAEnabled", er.Envelope!.TFAEnabled) - .WithData("HasPhoneNumber", er.HasPhoneNumber), + .WithData("HasPhoneNumber", er.HasPhoneNumber) + .WithData("SenderEmail", er.Envelope.User!.Email) + .WithData("EnvelopeTitle", er.Envelope.Title), Fail: IActionResult (messages, notices) => { _logger.LogNotice(notices); diff --git a/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml b/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml index 846e7c83..008209a2 100644 --- a/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml +++ b/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml @@ -2,6 +2,7 @@ @using Newtonsoft.Json @model Auth; @{ + //TODO: Create view model var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string; var logo = _logoOpt.Value; ViewData["Title"] = _localizer[WebKey.DocProtected]; @@ -16,6 +17,8 @@ bool hasPhoneNumber = ViewData["HasPhoneNumber"] is bool _hasPhoneNumber && _hasPhoneNumber; var envelopeKey = ViewData["EnvelopeKey"] as string; DateTime? tfaRegDeadline = ViewData["TfaRegDeadline"] is DateTime _deadline ? _deadline : null; + var senderEmail = ViewData["SenderEmail"] as string ?? string.Empty; + var envelopeTitle = ViewData["EnvelopeTitle"] as string ?? string.Empty; }
@@ -90,7 +93,7 @@
@_localizer[WebKey.Formats.LockedFooterTitle.Format(codeKeyName)] -

@_localizer[WebKey.Formats.LockedFooterBody.Format(codeKeyName)]

+

@Html.Raw(_localizer[WebKey.Formats.LockedFooterBody.Format(codeKeyName)].Value.Format(senderEmail, "Envelope - " + envelopeTitle, string.Empty))