From c31f081208f16d536485179761092c3db63c099e Mon Sep 17 00:00:00 2001
From: Developer 02 <developer02@didaloghe.onmicrosoft.com>
Date: Fri, 31 May 2024 09:39:31 +0200
Subject: [PATCH] Added a signature legal agreement warning and integrated the
 resource file (resx) as a JavaScript object into the _Layout.cshtml file.
 This enables the agreement warning to support multiple languages.

---
 .../Resources/Resource.de-DE.resx             |  11 +-
 .../Resources/Resource.en-US.resx             |  11 +-
 .../Controllers/LocalizationController.cs     |  33 ++++++
 .../Test/TestLocalizerController.cs           |   6 --
 .../Views/Home/ShowEnvelope.cshtml            |   8 +-
 .../Views/Shared/_Layout.cshtml               |  14 ++-
 EnvelopeGenerator.Web/wwwroot/js/app.js       | 100 ++++++++++--------
 7 files changed, 129 insertions(+), 54 deletions(-)
 create mode 100644 EnvelopeGenerator.Web/Controllers/LocalizationController.cs

diff --git a/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx b/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx
index 6633ca51..976138c9 100644
--- a/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx
+++ b/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx
@@ -120,6 +120,9 @@
   <data name="Complete" xml:space="preserve">
     <value>Abschließen</value>
   </data>
+  <data name="Confirmation" xml:space="preserve">
+    <value>Konfirmation</value>
+  </data>
   <data name="de-DE" xml:space="preserve">
     <value>Deutch</value>
   </data>
@@ -135,6 +138,9 @@
   <data name="EnvelopeInfo2" xml:space="preserve">
     <value>Erstellt am {0} von {1}. Sie können den Absender über &lt;a href="mailto:{2}?subject={3}&amp;body=Sehr%20geehrter%20{4}%20{5},%0A%0A%0A"&gt;{6}&lt;/a&gt; kontaktieren.</value>
   </data>
+  <data name="Finalize" xml:space="preserve">
+    <value>Abschließen</value>
+  </data>
   <data name="LocakedOpen" xml:space="preserve">
     <value>Öffnen</value>
   </data>
@@ -156,8 +162,11 @@
   <data name="Reject" xml:space="preserve">
     <value>Ablehnen</value>
   </data>
+  <data name="Review" xml:space="preserve">
+    <value>Überprüfung</value>
+  </data>
   <data name="SigAgree" xml:space="preserve">
-    <value>Durch Auswahl von Übernehmen und signieren stimme ich zu, dass die Signatur und die Initialen als elektronische Darstellung meiner Signatur und meiner Initialen in den Fällen gelten, in denen ich (oder mein Beauftragter) sie auf Dokumenten, einschließlich rechtsgültiger Verträge, verwende.</value>
+    <value>Durch Klick auf Abschließen stimme ich zu, dass die abgebildete und übermittelte Signatur als elektronische Darstellung meiner Signatur in den Fällen gelten, in denen ich sie auf Dokumenten, einschließlich rechtsgültiger Verträge verwende.</value>
   </data>
   <data name="SignDoc" xml:space="preserve">
     <value>Dokument unterschreiben</value>
diff --git a/EnvelopeGenerator.Application/Resources/Resource.en-US.resx b/EnvelopeGenerator.Application/Resources/Resource.en-US.resx
index 250a108a..310d7e16 100644
--- a/EnvelopeGenerator.Application/Resources/Resource.en-US.resx
+++ b/EnvelopeGenerator.Application/Resources/Resource.en-US.resx
@@ -120,6 +120,9 @@
   <data name="Complete" xml:space="preserve">
     <value>Complete</value>
   </data>
+  <data name="Confirmation" xml:space="preserve">
+    <value>Confirmation</value>
+  </data>
   <data name="de-DE" xml:space="preserve">
     <value>German</value>
   </data>
@@ -135,6 +138,9 @@
   <data name="EnvelopeInfo2" xml:space="preserve">
     <value>Created on {0} by {1}. You can contact the sender via &lt;a href="mailto:{2}?subject={3}&amp;body=Dear%20{4}%20{5},%0A%0A%0A"&gt;{6}&lt;/a&gt;.</value>
   </data>
+  <data name="Finalize" xml:space="preserve">
+    <value>Finalize</value>
+  </data>
   <data name="LocakedOpen" xml:space="preserve">
     <value>Open</value>
   </data>
@@ -156,8 +162,11 @@
   <data name="Reject" xml:space="preserve">
     <value>Reject</value>
   </data>
+  <data name="Review" xml:space="preserve">
+    <value>Review</value>
+  </data>
   <data name="SigAgree" xml:space="preserve">
-    <value>By selecting accept and sign, I agree that the signature and the initials are considered as electronic representations of my signature and my initials in cases where I (or my agent) use them on documents, including legally valid contracts.</value>
+    <value>By clicking on Finalize, I agree that the signature shown and submitted is an electronic representation of my signature in cases where I use it on documents, including legally binding contracts.</value>
   </data>
   <data name="SignDoc" xml:space="preserve">
     <value>Sign document</value>
diff --git a/EnvelopeGenerator.Web/Controllers/LocalizationController.cs b/EnvelopeGenerator.Web/Controllers/LocalizationController.cs
new file mode 100644
index 00000000..e4aad5af
--- /dev/null
+++ b/EnvelopeGenerator.Web/Controllers/LocalizationController.cs
@@ -0,0 +1,33 @@
+using EnvelopeGenerator.Application.Resources;
+using Ganss.Xss;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Localization;
+
+namespace EnvelopeGenerator.Web.Controllers
+{
+    [ApiController]
+    [Route("api/[controller]")]
+    public class LocalizationController : ControllerBase
+    {
+        private readonly IStringLocalizer<Resource> _localizer;
+        private readonly ILogger<LocalizationController> _logger;
+        private readonly HtmlSanitizer _sanitizer;
+
+        public LocalizationController(IStringLocalizer<Resource> localizer, ILogger<LocalizationController> logger, HtmlSanitizer sanitizer)
+        {
+            _localizer = localizer;
+            _logger = logger;
+            _sanitizer = sanitizer;
+        }
+
+        [HttpGet]
+        public IActionResult GetLocalized([FromQuery] string[]? name = null, [FromQuery] string[]? ignore = null)
+        {
+            ignore ??= Array.Empty<string>();
+            var pairs = name?.ToDictionary(n => n, n => _localizer[n].Value)
+                ?? _localizer.GetAllStrings().Where(ls => !ignore.Contains(ls.Name)).ToDictionary(ls => ls.Name, ls => ls.Value); ;
+            return Ok(pairs);
+        }
+    }
+}
diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestLocalizerController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestLocalizerController.cs
index 4c50d6e9..dac5d26d 100644
--- a/EnvelopeGenerator.Web/Controllers/Test/TestLocalizerController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestLocalizerController.cs
@@ -28,11 +28,5 @@ namespace EnvelopeGenerator.Web.Controllers.Test
 
         [HttpGet("culture")]
         public IActionResult GetCultures(string? lang = null) => lang is null ? Ok(_cultures) : Ok(_cultures[lang]);
-
-        [HttpGet("to-culture-info")]
-        public IActionResult ToCultureInfo(string locale) => Ok(locale.ToCultureInfo());
-
-        [HttpGet("two-letter-iso-language-name")]
-        public IActionResult TwoLetterISOLanguageName(string locale) => Ok(locale.TwoLetterISOLanguageName());
     }
 }
diff --git a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml
index 96be2ac8..b61c5770 100644
--- a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml
+++ b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml
@@ -3,6 +3,8 @@
 }
 @using DigitalData.Core.DTO;
 @using EnvelopeGenerator.Application.DTOs;
+@using Newtonsoft.Json
+@using Newtonsoft.Json.Serialization
 @model EnvelopeReceiverDto;
 @{
     ViewData["Title"] = _localizer[WebKey.SignDoc];
@@ -88,11 +90,11 @@
     }
 @if (ViewData["DocumentBytes"] is byte[] documentBytes)
 {
-    var settings = new Newtonsoft.Json.JsonSerializerSettings
+    var settings = new JsonSerializerSettings
     {
-        ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
+        ContractResolver = new CamelCasePropertyNamesContractResolver()
     };
-    var envelopeReceiverJson = Newtonsoft.Json.JsonConvert.SerializeObject(Model, settings);
+    var envelopeReceiverJson = JsonConvert.SerializeObject(Model, settings);
     var documentBase64String = Convert.ToBase64String(documentBytes);
     var envelopeKey = ViewData["EnvelopeKey"] as string;
 
diff --git a/EnvelopeGenerator.Web/Views/Shared/_Layout.cshtml b/EnvelopeGenerator.Web/Views/Shared/_Layout.cshtml
index 9ff549ba..6ade942d 100644
--- a/EnvelopeGenerator.Web/Views/Shared/_Layout.cshtml
+++ b/EnvelopeGenerator.Web/Views/Shared/_Layout.cshtml
@@ -1,4 +1,9 @@
-<!DOCTYPE html>
+@using DigitalData.Core.API
+@using Newtonsoft.Json
+@{
+    var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string;
+}
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
@@ -24,6 +29,13 @@
     <script src="~/js/util.js" asp-append-version="true"></script>
     <script src="~/js/api.js" asp-append-version="true"></script>
     @await RenderSectionAsync("Scripts", required: false)
+    @{
+        var lStrsJson = JsonConvert.SerializeObject(_localizer.ToDictionary()).TrySanitize(_sanitizer);
+    }
+    <script nonce="@nonce">
+        var localized = @Html.Raw(lStrsJson)
+    </script>
+
     <main role="main">
         <partial name="_CookieConsentPartial" />
         @RenderBody()
diff --git a/EnvelopeGenerator.Web/wwwroot/js/app.js b/EnvelopeGenerator.Web/wwwroot/js/app.js
index 22c3a7f9..98580a11 100644
--- a/EnvelopeGenerator.Web/wwwroot/js/app.js
+++ b/EnvelopeGenerator.Web/wwwroot/js/app.js
@@ -177,52 +177,68 @@ class App {
                 icon: 'warning',
             })
             return false
-
-        }
-
-        // Save changes before doing anything
-        try {
-            await this.Instance.save()
-        } catch (e) {
-            Swal.fire({
-                title: 'Fehler',
-                text: 'Umschlag konnte nicht signiert werden!',
-                icon: 'error',
-            })
-            return false
         }
 
-        // Export annotation data and save to database
-        try {
-            const json = await this.Instance.exportInstantJSON()
-            const postEnvelopeResult = await this.Network.postEnvelope(
-                this.envelopeKey,
-                this.currentDocument.id,
-                json
-            )
-
-            if (postEnvelopeResult.fatal) {
-                Swal.fire({
-                    title: 'Fehler',
-                    text: 'Umschlag konnte nicht signiert werden!',
-                    icon: 'error',
-                })
-                return false
-            }
+        return Swal.fire({
+            title: localized.Confirmation,
+            html: `<div class="text-start fs-6 p-0 m-0">${localized.SigAgree}</div>`,
+            icon: "question",
+            showCancelButton: true,
+            confirmButtonColor: "#3085d6",
+            cancelButtonColor: "#d33",
+            confirmButtonText: localized.Finalize,
+            cancelButtonText: localized.Review
+        }).then(async (result) => {
+            if (result.isConfirmed) {
+                //---
+                // Save changes before doing anything
+                try {
+                    await this.Instance.save()
+                } catch (e) {
+                    Swal.fire({
+                        title: 'Fehler',
+                        text: 'Umschlag konnte nicht signiert werden!',
+                        icon: 'error',
+                    })
+                    return false
+                }
 
-            if (postEnvelopeResult.error) {
-                Swal.fire({
-                    title: 'Warnung',
-                    text: 'Umschlag ist nicht mehr verfügbar.',
-                    icon: 'warning',
-                })
-                return false
+                // Export annotation data and save to database
+                try {
+                    const json = await this.Instance.exportInstantJSON()
+                    const postEnvelopeResult = await this.Network.postEnvelope(
+                        this.envelopeKey,
+                        this.currentDocument.id,
+                        json
+                    )
+
+                    if (postEnvelopeResult.fatal) {
+                        Swal.fire({
+                            title: 'Fehler',
+                            text: 'Umschlag konnte nicht signiert werden!',
+                            icon: 'error',
+                        })
+                        return false
+                    }
+
+                    if (postEnvelopeResult.error) {
+                        Swal.fire({
+                            title: 'Warnung',
+                            text: 'Umschlag ist nicht mehr verfügbar.',
+                            icon: 'warning',
+                        })
+                        return false
+                    }
+
+                    return true
+                } catch (e) {
+                    return false
+                }
+                //---
             }
-
-            return true
-        } catch (e) {
-            return false
-        }
+            else
+                return false;
+        });
     }