From 3394a580f40a15ac0c6d3d386150534872a10ba8 Mon Sep 17 00:00:00 2001 From: TekH Date: Fri, 22 Aug 2025 21:54:25 +0200 Subject: [PATCH] refactor(DocumentController): remvoe Open endpoint and its client method --- .../Controllers/DocumentController.cs | 26 +------------------ .../Controllers/EnvelopeController.cs | 9 ------- .../Services/EnvelopeOldService.cs | 18 ------------- EnvelopeGenerator.Web/wwwroot/js/app.js | 11 +------- EnvelopeGenerator.Web/wwwroot/js/network.js | 9 ------- 5 files changed, 2 insertions(+), 71 deletions(-) diff --git a/EnvelopeGenerator.Web/Controllers/DocumentController.cs b/EnvelopeGenerator.Web/Controllers/DocumentController.cs index a51de0bb..41e548f3 100644 --- a/EnvelopeGenerator.Web/Controllers/DocumentController.cs +++ b/EnvelopeGenerator.Web/Controllers/DocumentController.cs @@ -15,23 +15,18 @@ public class DocumentController : BaseController { private readonly EnvelopeOldService envelopeService; private readonly ActionService? actionService; - [Obsolete("Use MediatR")] - private readonly IEnvelopeDocumentService _envDocService; [Obsolete("Use MediatR")] - public DocumentController(DatabaseService database, EnvelopeOldService envelope, IEnvelopeDocumentService envDocService, ILogger logger) : base(database, logger) + public DocumentController(DatabaseService database, EnvelopeOldService envelope, ILogger logger) : base(database, logger) { envelopeService = envelope; actionService = database.Services?.actionService; - _envDocService = envDocService; } [Obsolete("Use MediatR")] [NonAction] public async Task Get([FromRoute] string envelopeKey, [FromQuery] int index) { - // Validate Envelope Key and load envelope - envelopeService.EnsureValidEnvelopeKey(envelopeKey); EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey); // Load document info @@ -43,23 +38,4 @@ public class DocumentController : BaseController // Return the document as bytes return File(bytes, "application/octet-stream"); } - - [Authorize(Roles = ReceiverRole.FullyAuth)] - [HttpPost("{envelopeKey}")] - [Obsolete("Use MediatR")] - public async Task Open(string envelopeKey) - { - var authSignature = this.GetAuthReceiverSignature(); - - if (authSignature != envelopeKey.GetReceiverSignature()) - return Forbid(); - - // Validate Envelope Key and load envelope - envelopeService.EnsureValidEnvelopeKey(envelopeKey); - EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey); - - actionService?.OpenEnvelope(response.Envelope, response.Receiver); - - return Ok(new object()); - } } \ No newline at end of file diff --git a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs index 85016e18..76a0fedd 100644 --- a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs +++ b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs @@ -23,8 +23,6 @@ public class EnvelopeController : BaseController [Obsolete("Use MediatR")] private readonly IEnvelopeHistoryService _histService; [Obsolete("Use MediatR")] - private readonly IReceiverService _receiverService; - [Obsolete("Use MediatR")] private readonly IEnvelopeReceiverService _envRcvService; [Obsolete("Use MediatR")] @@ -32,14 +30,12 @@ public class EnvelopeController : BaseController EnvelopeOldService envelope, ILogger logger, UrlEncoder urlEncoder, IEnvelopeHistoryService envelopeHistoryService, - IReceiverService receiverService, IEnvelopeReceiverService envelopeReceiverService) : base(database, logger) { envelopeService = envelope; actionService = database?.Services?.actionService; _urlEncoder = urlEncoder; _histService = envelopeHistoryService; - _receiverService = receiverService; _envRcvService = envelopeReceiverService; } @@ -49,9 +45,6 @@ public class EnvelopeController : BaseController { envelopeKey = _urlEncoder.Encode(envelopeKey); - // Validate Envelope Key and load envelope - envelopeService.EnsureValidEnvelopeKey(envelopeKey); - EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey); if (envelopeService.ReceiverAlreadySigned(response.Envelope, response.Receiver.Id) == true) @@ -75,8 +68,6 @@ public class EnvelopeController : BaseController if (authSignature != envelopeKey.GetReceiverSignature()) return Unauthorized(); - // Validate Envelope Key and load envelope - envelopeService.EnsureValidEnvelopeKey(envelopeKey); EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey); // Again check if receiver has already signed diff --git a/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs b/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs index 731d0e38..92216cdb 100644 --- a/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs +++ b/EnvelopeGenerator.Web/Services/EnvelopeOldService.cs @@ -33,24 +33,6 @@ public class EnvelopeOldService _configService = configService; } - public void EnsureValidEnvelopeKey(string envelopeKey) - { - _logger.LogInformation("Parsing EnvelopeKey.."); - - if (string.IsNullOrEmpty(envelopeKey)) - throw new ArgumentNullException("EnvelopeKey"); - - Tuple result = Helpers.DecodeEnvelopeReceiverId(envelopeKey); - _logger.LogInformation("EnvelopeUUID: [{0}]", result.Item1); - _logger.LogInformation("ReceiverSignature: [{0}]", result.Item2); - - if (string.IsNullOrEmpty(result.Item1)) - throw new ArgumentNullException("EnvelopeUUID"); - - if (string.IsNullOrEmpty(result.Item2)) - throw new ArgumentNullException("ReceiverSignature"); - } - [Obsolete("Use MediatR")] public async Task LoadEnvelope(string pEnvelopeKey) { diff --git a/EnvelopeGenerator.Web/wwwroot/js/app.js b/EnvelopeGenerator.Web/wwwroot/js/app.js index 93e21526..b2120eca 100644 --- a/EnvelopeGenerator.Web/wwwroot/js/app.js +++ b/EnvelopeGenerator.Web/wwwroot/js/app.js @@ -71,17 +71,8 @@ class App { try { this.signatureCount = this.currentDocument.elements.length await createAnnotations(this.currentDocument, this.Instance) - - const openResponse = await this.Network.openDocument(this.envelopeKey) - - if (openResponse.fatal || openResponse.error) { - return Swal.fire({ - title: 'Fehler', - text: 'Umschlag konnte nicht geöffnet werden!', - icon: 'error', - }) - } } catch (e) { + console.error("Error loading annotations:", e); } //add click events of external buttons diff --git a/EnvelopeGenerator.Web/wwwroot/js/network.js b/EnvelopeGenerator.Web/wwwroot/js/network.js index 327f5910..c3c53dc5 100644 --- a/EnvelopeGenerator.Web/wwwroot/js/network.js +++ b/EnvelopeGenerator.Web/wwwroot/js/network.js @@ -30,15 +30,6 @@ .then(this.wrapBinaryResponse.bind(this)) } - /** - * Tell the server that document has been seen - * @param {any} envelopeKey - */ - async openDocument(envelopeKey) { - return this.postRequest(`/api/document/${envelopeKey}`, {}) - .then(this.wrapJsonResponse.bind(this)) - } - /** * Add CSRF Token to request headers * @param {any} options