diff --git a/EnvelopeGenerator.Application/DependencyInjection.cs b/EnvelopeGenerator.Application/DependencyInjection.cs index 485f9b32..d8d086c1 100644 --- a/EnvelopeGenerator.Application/DependencyInjection.cs +++ b/EnvelopeGenerator.Application/DependencyInjection.cs @@ -12,6 +12,7 @@ using EnvelopeGenerator.Application.DocReceiverElements.Commands; using EnvelopeGenerator.Application.DocReceiverElements.Behaviors; using EnvelopeGenerator.Application.Common.Behaviors; using FluentValidation; +using EnvelopeGenerator.Application.EnvelopeReceivers.Commands; namespace EnvelopeGenerator.Application; @@ -53,6 +54,7 @@ public static class DependencyInjection services.Configure(config.GetSection(nameof(AuthenticatorParams))); services.Configure(config.GetSection(nameof(TotpSmsParams))); services.Configure(config.GetSection(nameof(ESignParams))); + services.Configure(config.GetSection(nameof(SendAccessCodeParams))); services.AddHttpClientService(config.GetSection(nameof(GtxMessagingParams))); services.TryAddScoped(); // Changed: Singleton → Scoped diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Commands/SendAccessCodeCommand.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Commands/SendAccessCodeCommand.cs index 5ba98838..e408e189 100644 --- a/EnvelopeGenerator.Application/EnvelopeReceivers/Commands/SendAccessCodeCommand.cs +++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Commands/SendAccessCodeCommand.cs @@ -6,6 +6,8 @@ using EnvelopeGenerator.Application.EnvelopeReceivers.Queries; using EnvelopeGenerator.Domain.Constants; using EnvelopeGenerator.Domain.Exceptions; using MediatR; +using Microsoft.Extensions.Caching.Memory; +using Microsoft.Extensions.Options; namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands; @@ -15,7 +17,17 @@ namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands; /// public record SendAccessCodeCommand(string Key) : IRequest { + internal bool MultipleRequestsAllowed { get; private set; } = false; + /// + /// + /// + /// + public SendAccessCodeCommand AllowMultipleRequests(bool allow = true) + { + MultipleRequestsAllowed = allow; + return this; + } } /// @@ -47,8 +59,13 @@ public enum SendAccessCodeResult /// /// /// -public class SendAccessCodeCommandHandler(IMediator Sender, IEnvelopeHistoryService HistoryService, IEnvelopeNotificationService NtfService) : IRequestHandler +public class SendAccessCodeCommandHandler(IMediator Sender, IEnvelopeHistoryService HistoryService, IEnvelopeNotificationService NtfService, IOptions options, IMemoryCache Cache) : IRequestHandler { + /// + /// + /// + public readonly SendAccessCodeParams Options = options.Value; + /// /// /// @@ -75,16 +92,20 @@ public class SendAccessCodeCommandHandler(IMediator Sender, IEnvelopeHistoryServ return SendAccessCodeResult.AlreadySigned; var accessCodeAlreadyRequested = await HistoryService.AccessCodeAlreadyRequested(er.EnvelopeId, userReference); - if (accessCodeAlreadyRequested) + if (accessCodeAlreadyRequested && (!request.MultipleRequestsAllowed || await IsAccessCodeRequestsDisabled(request.Key, cancel))) return SendAccessCodeResult.RequestLimitExceeded; - var historyResult = await HistoryService.RecordAsync(er.EnvelopeId, userReference, EnvelopeStatus.AccessCodeRequested); - if (historyResult.IsFailed) + // create a history record + if (!accessCodeAlreadyRequested) { - throw new ApplicationException($"Failed to record AccessCodeRequested history for envelope {er.EnvelopeId} and receiver {userReference}."); + var historyResult = await HistoryService.RecordAsync(er.EnvelopeId, userReference, EnvelopeStatus.AccessCodeRequested); + if (historyResult.IsFailed) + { + throw new ApplicationException($"Failed to record AccessCodeRequested history for envelope {er.EnvelopeId} and receiver {userReference}."); + } } - if(er.AccessCode is null) + if (er.AccessCode is null) throw new DataIntegrityException($"Access code is null for envelope receiver with key '{request.Key}' although use-access-code is true."); await NtfService.Notify(er.Receiver.EmailAddress, new DocumentAccessCodeReceivedNotification() @@ -96,6 +117,35 @@ public class SendAccessCodeCommandHandler(IMediator Sender, IEnvelopeHistoryServ NameSender = er.Envelope.User!.Username, }, cancel); + await DisableAccessCodeRequests(request.Key, cancel); + return SendAccessCodeResult.Sent; + + } + + private static string DisableAccessCodeRequestsCacheKeyPrefix => "DisableAccessCodeRequests_"; + + /// + /// + /// + /// + /// + /// + private Task IsAccessCodeRequestsDisabled(string envelopeKey, CancellationToken cancellationToken = default) + { + bool hasCache = Cache.TryGetValue(DisableAccessCodeRequestsCacheKeyPrefix + envelopeKey, out var disabled); + return Task.FromResult(hasCache && disabled); + } + + /// + /// + /// + /// + /// + /// + private Task DisableAccessCodeRequests(string envelopeKey, CancellationToken cancellationToken = default) + { + Cache.Set(DisableAccessCodeRequestsCacheKeyPrefix + envelopeKey, true, Options.RepeatRequestBlockingPeriod); + return Task.CompletedTask; } } \ No newline at end of file diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Commands/SendAccessCodeParams.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Commands/SendAccessCodeParams.cs new file mode 100644 index 00000000..adf7c968 --- /dev/null +++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Commands/SendAccessCodeParams.cs @@ -0,0 +1,12 @@ +namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands; + +/// +/// +/// +public record SendAccessCodeParams +{ + /// + /// + /// + public TimeSpan RepeatRequestBlockingPeriod { get; init; } = TimeSpan.FromMinutes(1); +} diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/AuthController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/AuthController.cs index 2c137d23..1d47be23 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/AuthController.cs +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/AuthController.cs @@ -93,6 +93,7 @@ public partial class AuthController( /// The operation is idempotent: if the code was already requested, it returns 200 without re-sending. /// /// Envelope receiver key. + /// If the access code was auto-generated while page is loading. /// MediatR instance. /// Cancellation token. /// Access code is already available or requested successfully. @@ -100,8 +101,8 @@ public partial class AuthController( /// Access code could not be persisted or e-mail could not be sent. [AllowAnonymous] [HttpPost("envelope-receiver/{key}/request-access-code")] - public async Task RequestEnvelopeReceiverAccessCode([FromRoute] string key, [FromServices] ISender sender, CancellationToken cancel) - => await sender.Send(new SendAccessCodeCommand(key), cancel) switch + public async Task RequestEnvelopeReceiverAccessCode([FromServices] ISender sender, [FromRoute] string key, [FromQuery] bool autoGenerated = true, CancellationToken cancel = default) + => await sender.Send(new SendAccessCodeCommand(key).AllowMultipleRequests(!autoGenerated), cancel) switch { SendAccessCodeResult.Sent => Ok(), SendAccessCodeResult.AlreadySigned => Conflict(), diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json index be976dc6..3491e7ba 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json @@ -289,5 +289,8 @@ "ESignParams": { "ApplicationName": "signFLOW", "DefaultReason": " Bestätigt" + }, + "SendAccessCodeParams": { + "RepeatRequestBlockingPeriod": "00:01:00" } }