From 3e6e2078bbc38902f3461cef68addab360120f89 Mon Sep 17 00:00:00 2001
From: Developer 02 <developer02@didaloghe.onmicrosoft.com>
Date: Thu, 6 Feb 2025 15:49:05 +0100
Subject: [PATCH] =?UTF-8?q?feat(auth):=20Unterst=C3=BCtzung=20f=C3=BCr=20A?=
 =?UTF-8?q?uthenticator-App-Setup-Link=20hinzugef=C3=BCgt=20=20-=20Es=20wu?=
 =?UTF-8?q?rde=20ein=20neuer=20Abschnitt=20eingef=C3=BChrt,=20der=20einen?=
 =?UTF-8?q?=20Link=20f=C3=BCr=20Benutzer=20anzeigt,=20um=20ihre=20Authenti?=
 =?UTF-8?q?cator-App=20einzurichten,=20wenn=20viaAuthenticator=20aktiviert?=
 =?UTF-8?q?=20ist.=20=20-=20Abruf=20von=20envelopeKey=20aus=20ViewData=20h?=
 =?UTF-8?q?inzugef=C3=BCgt,=20um=20den=20Einrichtungslink=20zu=20erstellen?=
 =?UTF-8?q?.=20=20-=20Refactored=20codeKeyName=20Initialisierung=20f=C3=BC?=
 =?UTF-8?q?r=20saubereren=20Code.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resources/Resource.de-DE.resx             |  2 +-
 .../Resources/Resource.en-US.resx             |  2 +-
 .../Views/Home/EnvelopeLocked.cshtml          | 45 ++++++++++++-------
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx b/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx
index 6a951a19..ee0dab5a 100644
--- a/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx
+++ b/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx
@@ -166,7 +166,7 @@
     <value>Wir haben Ihnen gerade den Zugriffscode an die hinterlegte Email Adresse gesendet. Dies kann evtl. einige Minuten dauern.</value>
   </data>
   <data name="LockedBodyAuthenticator" xml:space="preserve">
-    <value>Ihr QR-Code ist bis {0} gültig.</value>
+    <value>Bitte geben Sie den in Ihrer Authenticator-App angegebenen TOTP-Code ein.</value>
   </data>
   <data name="LockedBodyAuthenticatorNew" xml:space="preserve">
     <value>Wir haben den QR-Code an Ihre E-Mail-Adresse gesendet. Ihr QR-Code ist bis {0} gültig. Sie können ihn für alle Umschläge verwenden, die Sie an diese E-Mail-Adresse erhalten.</value>
diff --git a/EnvelopeGenerator.Application/Resources/Resource.en-US.resx b/EnvelopeGenerator.Application/Resources/Resource.en-US.resx
index 4ae7197e..c5a9d2a2 100644
--- a/EnvelopeGenerator.Application/Resources/Resource.en-US.resx
+++ b/EnvelopeGenerator.Application/Resources/Resource.en-US.resx
@@ -166,7 +166,7 @@
     <value>We have just sent you the access code to the email address you provided. This may take a few minutes.</value>
   </data>
   <data name="LockedBodyAuthenticator" xml:space="preserve">
-    <value>Your QR code is valid until {0}.</value>
+    <value>Please enter the TOTP provided in your Authenticator app.</value>
   </data>
   <data name="LockedBodyAuthenticatorNew" xml:space="preserve">
     <value>We have sent the QR code to your e-mail address. Your QR code is valid until {0}. You can use it for all envelopes received at this email address.</value>
diff --git a/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml b/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml
index ab2eb857..1762f473 100644
--- a/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml
+++ b/EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml
@@ -7,8 +7,7 @@
     ViewData["Title"] = _localizer[WebKey.DocProtected];
     var userCulture = ViewData["UserCulture"] as Culture;
     string codeType = ViewData["CodeType"] is string _codeType ? _codeType : "accessCode";
-    string codePropName = char.ToUpper(codeType[0]) + codeType.Substring(1);
-    string codeKeyName = codePropName.Replace("Code", "");
+    string codeKeyName = (char.ToUpper(codeType[0]) + codeType.Substring(1)).Replace("Code", "");
     bool viaSms = codeType == "smsCode";
     bool viaAuthenticator = codeType == "authenticatorCode";
     bool viaTFA = viaSms || viaAuthenticator;
@@ -16,6 +15,7 @@
     DateTime? qrCodeExpiration = ViewData["QRCodeExpiration"] is DateTime _qrCodeExpiration ? _qrCodeExpiration : null;
     bool tfaEnabled = ViewData["TFAEnabled"] is bool _tfaEnabled && _tfaEnabled;
     bool hasPhoneNumber = ViewData["HasPhoneNumber"] is bool _hasPhoneNumber && _hasPhoneNumber;
+    var envelopeKey = ViewData["EnvelopeKey"] as string;
 }
 <div class="page container py-4 px-4">
     <header class="text-center">
@@ -31,12 +31,25 @@
         </div>
         <h1>@_localizer[WebKey.Formats.LockedTitle.Format(codeKeyName)]</h1>
     </header>
+    @if (viaAuthenticator)
+    {
+    <section class="text-center">
+        <p class="m-0 p-0">
+            Klicken Sie auf den
+            <a class="icon-link m-0 p-0" href="/tfa/@envelopeKey" style="text-decoration: none;" target="_blank">
+                Link
+                <i class="bi bi-box-arrow-up-right"></i>
+            </a>
+             um Ihre Authenticator-App einzurichten.
+        </p>
+        </section>
+    }
     <section class="text-center">
         <p>@_localizer[WebKey.Formats.LockedBody.Format(codeKeyName)].Value.Format(qrCodeExpiration.ToString())</p>
     </section>
     <div class="row m-0 p-0">
         <div class="access-code-panel justify-content-center align-items-center p-0 m-0">
-            <form id="form-access-code" class="form form-floating mb-0" method="post"> 
+            <form id="form-access-code" class="form form-floating mb-0" method="post">
                 <div class="form-floating access-code-form-floating">
                     <input type="password" id="access_code" class="form-control" name="@codeType" placeholder="@_localizer[WebKey.Formats.LockedCodeLabel.Format(codeKeyName)]" required="required">
                     <label for="access_code">@_localizer[WebKey.Formats.LockedCodeLabel.Format(codeKeyName)]</label>
@@ -47,21 +60,21 @@
                     </button>
                     @if (tfaEnabled)
                     {
-                    <div class="form-check form-switch tfa-sms">
+                        <div class="form-check form-switch tfa-sms">
                         @if(hasPhoneNumber)
-                        {
-                        <input asp-for="UserSelectSMS" class="form-check-input" name="userSelectSMS" type="checkbox" role="switch" id="flexSwitchCheckChecked">
-                        }
-                        else
-                        {
-                        <input asp-for="UserSelectSMS" class="form-check-input" name="userSelectSMS" type="checkbox" role="switch" id="flexSwitchCheckChecked" disabled>
-                        }                        
-                        <label class="form-check-label" for="flexSwitchCheckChecked">2FA per SMS</label>
-                    </div>
+                            {
+                                <input asp-for="UserSelectSMS" class="form-check-input" name="userSelectSMS" type="checkbox" role="switch" id="flexSwitchCheckChecked">
+                            }
+                            else
+                            {
+                                <input asp-for="UserSelectSMS" class="form-check-input" name="userSelectSMS" type="checkbox" role="switch" id="flexSwitchCheckChecked" disabled>
+                            }
+                            <label class="form-check-label" for="flexSwitchCheckChecked">2FA per SMS</label>
+                        </div>
                     }
                     @if (smsExpiration is not null)
                     {
-                    <div id="sms-timer" class="alert alert-primary" role="alert">00:00</div>
+                        <div id="sms-timer" class="alert alert-primary" role="alert">00:00</div>
                     }
                 </div>
             </form>
@@ -69,10 +82,10 @@
     </div>
     @if (ViewData["ErrorMessage"] is string errMsg)
     {
-    <div id="access-code-error-message" class="alert alert-danger row" role="alert">
+        <div id="access-code-error-message" class="alert alert-danger row" role="alert">
             @_sanitizer.Sanitize(errMsg)
 
-    </div>
+        </div>
     }
     <section class="no-receiver-explanation text-center">
         <details>