From b19cccdc34b0ff86ff72b4c7dcf59fc5034413ca Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Tue, 7 May 2024 10:14:45 +0200 Subject: [PATCH] =?UTF-8?q?Der=20PSPDFKitLicenseKey-Schl=C3=BCssel=20wurde?= =?UTF-8?q?=20aktualisiert,=20um=20den=20Lizenzcode=20aus=20appsettings.js?= =?UTF-8?q?on=20an=20das=20Frontend=20zu=20=C3=BCbergeben.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EnvelopeGenerator.Web/Controllers/HomeController.cs | 4 ++++ EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml | 2 +- EnvelopeGenerator.Web/appsettings.json | 1 + EnvelopeGenerator.Web/wwwroot/js/app.js | 5 +++-- EnvelopeGenerator.Web/wwwroot/js/ui.js | 3 ++- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs index 5fb539b7..e60699a4 100644 --- a/EnvelopeGenerator.Web/Controllers/HomeController.cs +++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs @@ -15,6 +15,7 @@ using EnvelopeGenerator.Application.Resources; using EnvelopeGenerator.Application.DTOs; using Microsoft.AspNetCore.Localization; using Newtonsoft.Json.Linq; +using Microsoft.Extensions.Configuration; namespace EnvelopeGenerator.Web.Controllers { @@ -149,6 +150,9 @@ namespace EnvelopeGenerator.Web.Controllers new ClaimsPrincipal(claimsIdentity), authProperties); + //add PSPDFKit licence key + ViewData["PSPDFKitLicenseKey"] = _configuration["PSPDFKitLicenseKey"]; + return View("ShowEnvelope", er); }, Fail: (messages, notices) => diff --git a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml index 2684b0cc..e9df6852 100644 --- a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml +++ b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml @@ -78,7 +78,7 @@ var envelopeResponse = @Html.Raw(envelopeResponseJson); document.addEventListener("DOMContentLoaded", async () => { - const app = new App("#app", "@ViewData["EnvelopeKey"]", envelopeResponse, documentArrayBuffer); + const app = new App("#app", "@ViewData["EnvelopeKey"]", envelopeResponse, documentArrayBuffer, "@ViewData["PSPDFKitLicenseKey"]"); await app.init(); }) diff --git a/EnvelopeGenerator.Web/appsettings.json b/EnvelopeGenerator.Web/appsettings.json index 691d0bf4..c0a2b657 100644 --- a/EnvelopeGenerator.Web/appsettings.json +++ b/EnvelopeGenerator.Web/appsettings.json @@ -8,6 +8,7 @@ "Microsoft.AspNetCore.Hosting.Diagnostics": "Warning" } }, + "PSPDFKitLicenseKey": null, "AdminPassword": "dd", "AllowedOrigins": [ "https://localhost:7202" ], "NLog": { diff --git a/EnvelopeGenerator.Web/wwwroot/js/app.js b/EnvelopeGenerator.Web/wwwroot/js/app.js index 2756c48f..884479d2 100644 --- a/EnvelopeGenerator.Web/wwwroot/js/app.js +++ b/EnvelopeGenerator.Web/wwwroot/js/app.js @@ -10,7 +10,7 @@ const ActionType = { } class App { - constructor(container, envelopeKey, envelopeResponse, documentBytes) { + constructor(container, envelopeKey, envelopeResponse, documentBytes, licenseKey) { this.container = container this.envelopeKey = envelopeKey @@ -24,6 +24,7 @@ class App { this.signatureCount = 0 this.envelopeResponse = envelopeResponse; this.documentBytes = documentBytes; + this.licenseKey = licenseKey; } // This function will be called from the ShowEnvelope.razor page @@ -48,7 +49,7 @@ class App { const arrayBuffer = this.documentBytes // Load PSPDFKit - this.Instance = await this.UI.loadPSPDFKit(arrayBuffer, this.container) + this.Instance = await this.UI.loadPSPDFKit(arrayBuffer, this.container, this.licenseKey) this.UI.configurePSPDFKit(this.Instance, this.handleClick.bind(this)) this.Instance.addEventListener( diff --git a/EnvelopeGenerator.Web/wwwroot/js/ui.js b/EnvelopeGenerator.Web/wwwroot/js/ui.js index 3e1052f8..d284fe2c 100644 --- a/EnvelopeGenerator.Web/wwwroot/js/ui.js +++ b/EnvelopeGenerator.Web/wwwroot/js/ui.js @@ -14,8 +14,9 @@ // Load the PSPDFKit UI by setting a target element as the container to render in // and a arraybuffer which represents the document that should be displayed. - loadPSPDFKit(arrayBuffer, container) { + loadPSPDFKit(arrayBuffer, container, licenseKey) { return PSPDFKit.load({ + licenseKey: licenseKey, styleSheets: ['/css/site.css'], container: container, document: arrayBuffer,