From 10b1de4cf0f2bf846494deafad0592d3af1f0a04 Mon Sep 17 00:00:00 2001 From: TekH Date: Wed, 17 Sep 2025 13:17:25 +0200 Subject: [PATCH] remove envelopeRejected-endpoint --- .../Controllers/HomeController.cs | 30 +------------------ .../wwwroot/js/api-service.js | 2 +- .../wwwroot/js/api-service.min.js | 2 +- 3 files changed, 3 insertions(+), 31 deletions(-) diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs index 6fbe24f3..5472dbdd 100644 --- a/EnvelopeGenerator.Web/Controllers/HomeController.cs +++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs @@ -160,6 +160,7 @@ public class HomeController : ViewControllerBase var rejRcvrs = await _historyService.ReadRejectingReceivers(er.Envelope!.Id); if (rejRcvrs.Any()) { + await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); ViewBag.IsExt = !rejRcvrs.Contains(er.Receiver); //external if the current user is not rejected return View("EnvelopeRejected", er); } @@ -370,35 +371,6 @@ public class HomeController : ViewControllerBase } } - [Authorize(Roles = ReceiverRole.FullyAuth)] - [HttpGet("{envelopeReceiverId}/Rejected")] - [Obsolete("Use MediatR")] - public async Task EnvelopeRejected([FromRoute] string envelopeReceiverId) - { - try - { - await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); - return await _envRcvService.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId).ThenAsync( - SuccessAsync: async (er) => - { - return await _historyService.IsRejected(envelopeId: er.EnvelopeId) - ? View(er) - : Redirect($"/Envelope/{envelopeReceiverId}/Locked"); - - }, - Fail: IActionResult (messages, notices) => - { - _logger.LogNotice(notices); - return this.ViewEnvelopeNotFound(); - }); - } - catch (Exception ex) - { - _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, exception: ex); - return this.ViewInnerServiceError(); - } - } - [HttpGet("{readOnlyKey}/ReadOnly")] [Obsolete("Use MediatR")] public async Task EnvelopeReceiverReadOnly([FromRoute] string readOnlyKey) diff --git a/EnvelopeGenerator.Web/wwwroot/js/api-service.js b/EnvelopeGenerator.Web/wwwroot/js/api-service.js index 3dd1c365..285ddc12 100644 --- a/EnvelopeGenerator.Web/wwwroot/js/api-service.js +++ b/EnvelopeGenerator.Web/wwwroot/js/api-service.js @@ -10,7 +10,7 @@ class API { } static get REJECT_REDIR_URL() { - return `/envelope/${API.ENV_KEY}/rejected`; + return `/envelope/${API.ENV_KEY}`; } static get SHARE_URL() { diff --git a/EnvelopeGenerator.Web/wwwroot/js/api-service.min.js b/EnvelopeGenerator.Web/wwwroot/js/api-service.min.js index 9f06ba09..eb7e1ac4 100644 --- a/EnvelopeGenerator.Web/wwwroot/js/api-service.min.js +++ b/EnvelopeGenerator.Web/wwwroot/js/api-service.min.js @@ -1,2 +1,2 @@ -class Content{static get JSON(){return"application/json"}}class API{static get REJECT_URL(){return`/api/envelope/reject`}static get REJECT_REDIR_URL(){return`/envelope/${API.ENV_KEY}/rejected`}static get SHARE_URL(){return`/api/readonly`}static __XSRF_TOKEN +class Content{static get JSON(){return"application/json"}}class API{static get REJECT_URL(){return`/api/envelope/reject`}static get REJECT_REDIR_URL(){return`/envelope/${API.ENV_KEY}`}static get SHARE_URL(){return`/api/readonly`}static __XSRF_TOKEN static get XSRF_TOKEN(){return API.__XSRF_TOKEN??=document.getElementsByName("__RequestVerificationToken")[0].value,API.__XSRF_TOKEN}static get ENV_KEY(){return ENV_KEY??document.querySelector('meta[name="env-key"]').getAttribute("content")}}const submitForm=async n=>await fetch(n.action,{method:n.method,body:new FormData(n),headers:{"X-Requested-With":"XMLHttpRequest"}}),createRequest=async(n,t,i,r)=>fetch(t,{credentials:"include",method:n,headers:{"Content-Type":r,"X-XSRF-TOKEN":API.XSRF_TOKEN},body:JSON.stringify(i)}),createPost=(n,t,i)=>createRequest("POST",n,t,i),rejectEnvelope=n=>createPost(API.REJECT_URL,n,Content.JSON),redirect=n=>window.location.href=n,redirRejected=()=>redirect(API.REJECT_REDIR_URL),shareEnvelope=(n,t)=>createPost(API.SHARE_URL,{receiverMail:n,dateValid:t},Content.JSON); \ No newline at end of file