diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs index 9a5d42f5..8f6612d7 100644 --- a/EnvelopeGenerator.Web/Controllers/HomeController.cs +++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs @@ -42,7 +42,7 @@ public class HomeController : ViewControllerBase private readonly IMediator _mediator; [Obsolete("Use MediatR")] - public HomeController(ILogger logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer localizer, IConfiguration configuration, HtmlSanitizer sanitizer, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, IAuthenticator authenticator, IReceiverService receiverService, IEnvelopeSmsHandler envelopeSmsService, IMediator mediator) : base(logger, sanitizer, cultures, localizer) + public HomeController(ILogger logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer localizer, IConfiguration configuration, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, IAuthenticator authenticator, IReceiverService receiverService, IEnvelopeSmsHandler envelopeSmsService, IMediator mediator) : base(logger, cultures, localizer) { _envRcvService = envelopeReceiverService; _historyService = historyService; @@ -70,8 +70,6 @@ public class HomeController : ViewControllerBase { try { - envelopeReceiverId = _sanitizer.Sanitize(envelopeReceiverId); - if (!envelopeReceiverId.TryDecode(out var decoded)) { Response.StatusCode = StatusCodes.Status401Unauthorized; @@ -148,8 +146,6 @@ public class HomeController : ViewControllerBase try { ViewData["EnvelopeKey"] = envelopeReceiverId; - - envelopeReceiverId = _sanitizer.Sanitize(envelopeReceiverId); (string? uuid, string? signature) = envelopeReceiverId.DecodeEnvelopeReceiverId(); if (uuid is null || signature is null) @@ -306,8 +302,6 @@ public class HomeController : ViewControllerBase try { ViewData["EnvelopeKey"] = envelopeReceiverId; - - envelopeReceiverId = _sanitizer.Sanitize(envelopeReceiverId); (string? uuid, string? signature) = envelopeReceiverId.DecodeEnvelopeReceiverId(); if (uuid is null || signature is null) @@ -380,7 +374,6 @@ public class HomeController : ViewControllerBase { try { - envelopeReceiverId = _sanitizer.Sanitize(envelopeReceiverId); return await _envRcvService.IsExisting(envelopeReceiverId: envelopeReceiverId).ThenAsync( SuccessAsync: (Func>)(async isExisting => { @@ -415,8 +408,6 @@ public class HomeController : ViewControllerBase { try { - envelopeReceiverId = _sanitizer.Sanitize(envelopeReceiverId); - await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); return await _envRcvService.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId).ThenAsync( SuccessAsync: async (er) => @@ -445,8 +436,6 @@ public class HomeController : ViewControllerBase { try { - readOnlyKey = _sanitizer.Sanitize(readOnlyKey); - // check if the readOnlyId is valid if (!readOnlyKey.TryDecode(out var decodedKeys) || decodedKeys.GetEncodeType() != EncodeType.EnvelopeReceiverReadOnly) { diff --git a/EnvelopeGenerator.Web/Controllers/TFARegController.cs b/EnvelopeGenerator.Web/Controllers/TFARegController.cs index 44233943..8a49024e 100644 --- a/EnvelopeGenerator.Web/Controllers/TFARegController.cs +++ b/EnvelopeGenerator.Web/Controllers/TFARegController.cs @@ -26,7 +26,7 @@ public class TFARegController : ViewControllerBase private readonly TFARegParams _params; [Obsolete("Use MediatR")] - public TFARegController(ILogger logger, HtmlSanitizer sanitizer, Cultures cultures, IStringLocalizer localizer, IEnvelopeReceiverService erService, IAuthenticator authenticator, IReceiverService receiverService, IOptions tfaRegParamsOptions) : base(logger, sanitizer, cultures, localizer) + public TFARegController(ILogger logger, Cultures cultures, IStringLocalizer localizer, IEnvelopeReceiverService erService, IAuthenticator authenticator, IReceiverService receiverService, IOptions tfaRegParamsOptions) : base(logger, cultures, localizer) { _envRcvService = erService; _authenticator = authenticator; @@ -42,7 +42,6 @@ public class TFARegController : ViewControllerBase { try { - envelopeReceiverId = _sanitizer.Sanitize(envelopeReceiverId); (string? uuid, string? signature) = envelopeReceiverId.DecodeEnvelopeReceiverId(); if (uuid is null || signature is null) diff --git a/EnvelopeGenerator.Web/Controllers/ViewControllerBase.cs b/EnvelopeGenerator.Web/Controllers/ViewControllerBase.cs index 9ff5eff8..18addff7 100644 --- a/EnvelopeGenerator.Web/Controllers/ViewControllerBase.cs +++ b/EnvelopeGenerator.Web/Controllers/ViewControllerBase.cs @@ -9,14 +9,12 @@ namespace EnvelopeGenerator.Web.Controllers; public class ViewControllerBase : Controller { protected readonly ILogger _logger; - protected readonly HtmlSanitizer _sanitizer; protected readonly Cultures _cultures; protected readonly IStringLocalizer _localizer; - public ViewControllerBase(ILogger logger, HtmlSanitizer sanitizer, Cultures cultures, IStringLocalizer localizer) + public ViewControllerBase(ILogger logger, Cultures cultures, IStringLocalizer localizer) { _logger = logger; - _sanitizer = sanitizer; _cultures = cultures; _localizer = localizer; }