Add feature to open receiver envelope URLs
Introduce a new feature allowing users to open URLs for receiver envelopes directly from the sender page. This includes: - Injecting `EnvelopeReceiverService` in `SenderPage.razor`. - Adding a UI button to open receiver envelope URLs. - Implementing `OpenReceiverEnvelopeUrlAsync` for URL handling. - Extending `EnvelopeReceiverService` with methods for URL retrieval and feature check. - Updating `EnvelopeReceiverController` with new endpoints for URL access. - Introducing `SenderFeatureAccessOptions` for managing feature access. - Configuring feature access in `Program.cs` and `appsettings.json`. - Restricting feature usage to specified email addresses.
This commit is contained in:
@@ -20,6 +20,7 @@
|
|||||||
@inject EnvelopeGenerator.Server.Client.Services.UserPreferencesService UserPreferencesService
|
@inject EnvelopeGenerator.Server.Client.Services.UserPreferencesService UserPreferencesService
|
||||||
@inject EnvelopeGenerator.Server.Client.Services.CustomImagesService CustomImagesService
|
@inject EnvelopeGenerator.Server.Client.Services.CustomImagesService CustomImagesService
|
||||||
@inject EnvelopeGenerator.Server.Client.Services.PdfSignatureService PdfSignatureService
|
@inject EnvelopeGenerator.Server.Client.Services.PdfSignatureService PdfSignatureService
|
||||||
|
@inject EnvelopeGenerator.Server.Client.Services.EnvelopeReceiverService EnvelopeReceiverService
|
||||||
@inject EnvelopeGenerator.Server.Client.Services.CreateEnvelopeBootstrapStorageService CreateEnvelopeBootstrapStorageService
|
@inject EnvelopeGenerator.Server.Client.Services.CreateEnvelopeBootstrapStorageService CreateEnvelopeBootstrapStorageService
|
||||||
@inject ILogger<SenderPage> Logger
|
@inject ILogger<SenderPage> Logger
|
||||||
@inject NavigationManager Navigation
|
@inject NavigationManager Navigation
|
||||||
@@ -315,12 +316,13 @@
|
|||||||
@foreach (var receiver in envelope.EnvelopeReceivers)
|
@foreach (var receiver in envelope.EnvelopeReceivers)
|
||||||
{
|
{
|
||||||
<div style="display: flex; align-items: center; gap: 1rem; padding: 0.5rem; background: white; border-radius: 6px; border: 1px solid #e5e7eb;">
|
<div style="display: flex; align-items: center; gap: 1rem; padding: 0.5rem; background: white; border-radius: 6px; border: 1px solid #e5e7eb;">
|
||||||
@{
|
@{
|
||||||
var isRejected = IsReceiverRejected(envelope, receiver);
|
var isRejected = IsReceiverRejected(envelope, receiver);
|
||||||
var isSigned = IsReceiverSigned(envelope, receiver);
|
var isSigned = IsReceiverSigned(envelope, receiver);
|
||||||
var accessCode = receiver.AccessCode;
|
var accessCode = receiver.AccessCode;
|
||||||
var hasAccessCode = !string.IsNullOrWhiteSpace(accessCode);
|
var hasAccessCode = !string.IsNullOrWhiteSpace(accessCode);
|
||||||
}
|
var hasReceiverEnvelopeUrl = CanOpenReceiverEnvelopeUrl(envelope, receiver);
|
||||||
|
}
|
||||||
<span class="receiver-badge receiver-badge--@(isRejected ? "unsigned" : (isSigned ? "signed" : "unsigned"))" style="min-width: 100px;">
|
<span class="receiver-badge receiver-badge--@(isRejected ? "unsigned" : (isSigned ? "signed" : "unsigned"))" style="min-width: 100px;">
|
||||||
@if (isRejected)
|
@if (isRejected)
|
||||||
{
|
{
|
||||||
@@ -349,27 +351,40 @@
|
|||||||
<strong style="color: #1f2937;">@receiver.Name</strong>
|
<strong style="color: #1f2937;">@receiver.Name</strong>
|
||||||
<span style="color: #6b7280; margin-left: 0.5rem;">@receiver.Receiver?.EmailAddress</span>
|
<span style="color: #6b7280; margin-left: 0.5rem;">@receiver.Receiver?.EmailAddress</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="sender-access-code">
|
<div class="sender-access-code">
|
||||||
<span class="sender-access-code__label">@L("AccessCode", "Access code")</span>
|
<span class="sender-access-code__label">@L("AccessCode", "Access code")</span>
|
||||||
<div class="sender-access-code__row">
|
<div class="sender-access-code__row">
|
||||||
<input class="sender-access-code__value"
|
<input class="sender-access-code__value"
|
||||||
value="@(hasAccessCode ? accessCode : "-")"
|
value="@(hasAccessCode ? accessCode : "-")"
|
||||||
readonly
|
readonly
|
||||||
title="@L("AccessCode", "Access code")" />
|
title="@L("AccessCode", "Access code")" />
|
||||||
<button type="button"
|
<button type="button"
|
||||||
class="sender-access-code__copy"
|
class="sender-access-code__copy"
|
||||||
disabled="@(!hasAccessCode)"
|
disabled="@(!hasAccessCode)"
|
||||||
@onclick='() => CopyAccessCodeAsync(accessCode)'
|
@onclick='() => CopyAccessCodeAsync(accessCode)'
|
||||||
title="@L("Copy", "Copy")">
|
title="@L("Copy", "Copy")">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16" aria-hidden="true">
|
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16" aria-hidden="true">
|
||||||
<path d="M10 1.5A1.5 1.5 0 0 1 11.5 3v1H13A1.5 1.5 0 0 1 14.5 5.5v8A1.5 1.5 0 0 1 13 15H5A1.5 1.5 0 0 1 3.5 13.5V12H3A1.5 1.5 0 0 1 1.5 10.5v-8A1.5 1.5 0 0 1 3 1h7zm.5 2A.5.5 0 0 0 10 3H3a.5.5 0 0 0-.5.5v7A.5.5 0 0 0 3 11h.5V5.5A1.5 1.5 0 0 1 5 4h5.5v-.5zM5 5a.5.5 0 0 0-.5.5v8a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5v-8A.5.5 0 0 0 13 5H5z"/>
|
<path d="M10 1.5A1.5 1.5 0 0 1 11.5 3v1H13A1.5 1.5 0 0 1 14.5 5.5v8A1.5 1.5 0 0 1 13 15H5A1.5 1.5 0 0 1 3.5 13.5V12H3A1.5 1.5 0 0 1 1.5 10.5v-8A1.5 1.5 0 0 1 3 1h7zm.5 2A.5.5 0 0 0 10 3H3a.5.5 0 0 0-.5.5v7A.5.5 0 0 0 3 11h.5V5.5A1.5 1.5 0 0 1 5 4h5.5v-.5zM5 5a.5.5 0 0 0-.5.5v8a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5v-8A.5.5 0 0 0 13 5H5z"/>
|
||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
@if (_canUseReceiverEnvelopeUrl)
|
||||||
</div>
|
{
|
||||||
</div>
|
<button type="button"
|
||||||
}
|
class="sender-access-code__copy"
|
||||||
</div>
|
disabled="@(!hasReceiverEnvelopeUrl)"
|
||||||
|
@onclick='() => OpenReceiverEnvelopeUrlAsync(envelope, receiver)'
|
||||||
|
title="@L("Open", "Open")">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16" aria-hidden="true">
|
||||||
|
<path fill-rule="evenodd" d="M6.364 13.5a1.5 1.5 0 0 1-1.5-1.5V4a1.5 1.5 0 0 1 1.5-1.5h4a.5.5 0 0 1 0 1h-4a.5.5 0 0 0-.5.5v8a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5v-4a.5.5 0 0 1 1 0v4a1.5 1.5 0 0 1-1.5 1.5h-8z"/>
|
||||||
|
<path fill-rule="evenodd" d="M8.5 1a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 .5.5v5a.5.5 0 0 1-1 0V2.707L8.854 7.354a.5.5 0 1 1-.708-.708L12.793 2H9a.5.5 0 0 1-.5-.5z"/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -544,6 +559,7 @@
|
|||||||
private string _activeTab = "active";
|
private string _activeTab = "active";
|
||||||
private bool _isLoading = true;
|
private bool _isLoading = true;
|
||||||
private bool _isLoggingOut = false;
|
private bool _isLoggingOut = false;
|
||||||
|
private bool _canUseReceiverEnvelopeUrl = false;
|
||||||
private string? _errorMessage;
|
private string? _errorMessage;
|
||||||
private DxGrid? _grid;
|
private DxGrid? _grid;
|
||||||
|
|
||||||
@@ -603,6 +619,8 @@
|
|||||||
try { await ThemeService.LoadFromServerAsync(); }
|
try { await ThemeService.LoadFromServerAsync(); }
|
||||||
catch { /* swallow — default theme remains active */ }
|
catch { /* swallow — default theme remains active */ }
|
||||||
|
|
||||||
|
_canUseReceiverEnvelopeUrl = await EnvelopeReceiverService.GetReceiverEnvelopeUrlFeatureEnabledAsync();
|
||||||
|
|
||||||
// Load logo config — authenticated, so this should succeed
|
// Load logo config — authenticated, so this should succeed
|
||||||
var logos = await CustomImagesService.GetAsync();
|
var logos = await CustomImagesService.GetAsync();
|
||||||
_appLogo = logos.App;
|
_appLogo = logos.App;
|
||||||
@@ -987,6 +1005,35 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async Task OpenReceiverEnvelopeUrlAsync(EnvelopeDto envelope, EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver.EnvelopeReceiverDto receiver)
|
||||||
|
{
|
||||||
|
if (!_canUseReceiverEnvelopeUrl)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!CanOpenReceiverEnvelopeUrl(envelope, receiver))
|
||||||
|
return;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var receiverEnvelopeUrl = await EnvelopeReceiverService.GetReceiverEnvelopeUrlAsync(
|
||||||
|
envelope.Uuid,
|
||||||
|
receiver.Receiver!.Signature!);
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(receiverEnvelopeUrl))
|
||||||
|
return;
|
||||||
|
|
||||||
|
await JSRuntime.InvokeVoidAsync("open", receiverEnvelopeUrl, "_blank", "noopener,noreferrer");
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
await JSRuntime.InvokeVoidAsync("console.warn", "[Sender] Failed to open receiver envelope URL.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool CanOpenReceiverEnvelopeUrl(EnvelopeDto envelope, EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver.EnvelopeReceiverDto receiver)
|
||||||
|
=> !string.IsNullOrWhiteSpace(envelope.Uuid)
|
||||||
|
&& !string.IsNullOrWhiteSpace(receiver.Receiver?.Signature);
|
||||||
|
|
||||||
void OnCustomizeElement(GridCustomizeElementEventArgs e)
|
void OnCustomizeElement(GridCustomizeElementEventArgs e)
|
||||||
{
|
{
|
||||||
// Future: Add custom row coloring based on status if needed
|
// Future: Add custom row coloring based on status if needed
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ namespace EnvelopeGenerator.Server.Client.Services;
|
|||||||
public class EnvelopeReceiverService(IHttpClientFactory httpClientFactory)
|
public class EnvelopeReceiverService(IHttpClientFactory httpClientFactory)
|
||||||
{
|
{
|
||||||
private static readonly JsonSerializerOptions _jsonOptions = new(JsonSerializerDefaults.Web);
|
private static readonly JsonSerializerOptions _jsonOptions = new(JsonSerializerDefaults.Web);
|
||||||
|
private sealed record ReceiverEnvelopeUrlResponse(string Url);
|
||||||
|
private sealed record ReceiverEnvelopeUrlEnabledResponse(bool Enabled);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Fetches the envelope receiver data for the given envelope key from the API.
|
/// Fetches the envelope receiver data for the given envelope key from the API.
|
||||||
@@ -63,4 +65,32 @@ public class EnvelopeReceiverService(IHttpClientFactory httpClientFactory)
|
|||||||
|
|
||||||
return await response.Content.ReadFromJsonAsync<CreateEnvelopeReceiverResponse>(_jsonOptions, cancel);
|
return await response.Content.ReadFromJsonAsync<CreateEnvelopeReceiverResponse>(_jsonOptions, cancel);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<string?> GetReceiverEnvelopeUrlAsync(string envelopeUuid, string receiverSignature, CancellationToken cancel = default)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(envelopeUuid) || string.IsNullOrWhiteSpace(receiverSignature))
|
||||||
|
return null;
|
||||||
|
|
||||||
|
using var http = httpClientFactory.CreateClient("EnvelopeGenerator.Server");
|
||||||
|
var url = $"/api/EnvelopeReceiver/receiver-envelope-url?envelopeUuid={Uri.EscapeDataString(envelopeUuid)}&receiverSignature={Uri.EscapeDataString(receiverSignature)}";
|
||||||
|
var response = await http.GetAsync(url, cancel);
|
||||||
|
|
||||||
|
if (!response.IsSuccessStatusCode)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var payload = await response.Content.ReadFromJsonAsync<ReceiverEnvelopeUrlResponse>(_jsonOptions, cancel);
|
||||||
|
return payload?.Url;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> GetReceiverEnvelopeUrlFeatureEnabledAsync(CancellationToken cancel = default)
|
||||||
|
{
|
||||||
|
using var http = httpClientFactory.CreateClient("EnvelopeGenerator.Server");
|
||||||
|
var response = await http.GetAsync("/api/EnvelopeReceiver/receiver-envelope-url/enabled", cancel);
|
||||||
|
|
||||||
|
if (!response.IsSuccessStatusCode)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var payload = await response.Content.ReadFromJsonAsync<ReceiverEnvelopeUrlEnabledResponse>(_jsonOptions, cancel);
|
||||||
|
return payload?.Enabled == true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
|
|||||||
using EnvelopeGenerator.Server.Extensions;
|
using EnvelopeGenerator.Server.Extensions;
|
||||||
using EnvelopeGenerator.Domain.Constants;
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
using EnvelopeGenerator.Application.EnvelopeReceivers.Commands.CreateEnvelopeReceiver;
|
using EnvelopeGenerator.Application.EnvelopeReceivers.Commands.CreateEnvelopeReceiver;
|
||||||
|
using EnvelopeGenerator.Application.Common.Extensions;
|
||||||
|
using EnvelopeGenerator.Server.Options;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Server.Controllers;
|
namespace EnvelopeGenerator.Server.Controllers;
|
||||||
|
|
||||||
@@ -36,11 +38,12 @@ public class EnvelopeReceiverController : ControllerBase
|
|||||||
private readonly IEnvelopeReceiverExecutor _erExecutor;
|
private readonly IEnvelopeReceiverExecutor _erExecutor;
|
||||||
private readonly IDocumentExecutor _documentExecutor;
|
private readonly IDocumentExecutor _documentExecutor;
|
||||||
private readonly string _cnnStr;
|
private readonly string _cnnStr;
|
||||||
|
private readonly IOptionsMonitor<SenderFeatureAccessOptions> _senderFeatureAccessOptions;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Konstruktor für den EnvelopeReceiverController.
|
/// Konstruktor für den EnvelopeReceiverController.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public EnvelopeReceiverController(ILogger<EnvelopeReceiverController> logger, IMediator mediator, IMapper mapper, IEnvelopeExecutor envelopeExecutor, IEnvelopeReceiverExecutor erExecutor, IDocumentExecutor documentExecutor, IOptions<ConnectionString> csOpt)
|
public EnvelopeReceiverController(ILogger<EnvelopeReceiverController> logger, IMediator mediator, IMapper mapper, IEnvelopeExecutor envelopeExecutor, IEnvelopeReceiverExecutor erExecutor, IDocumentExecutor documentExecutor, IOptions<ConnectionString> csOpt, IOptionsMonitor<SenderFeatureAccessOptions> senderFeatureAccessOptions)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_mediator = mediator;
|
_mediator = mediator;
|
||||||
@@ -49,6 +52,7 @@ public class EnvelopeReceiverController : ControllerBase
|
|||||||
_erExecutor = erExecutor;
|
_erExecutor = erExecutor;
|
||||||
_documentExecutor = documentExecutor;
|
_documentExecutor = documentExecutor;
|
||||||
_cnnStr = csOpt.Value.Value;
|
_cnnStr = csOpt.Value.Value;
|
||||||
|
_senderFeatureAccessOptions = senderFeatureAccessOptions;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -112,6 +116,39 @@ public class EnvelopeReceiverController : ControllerBase
|
|||||||
return name is null ? NotFound() : Ok(name);
|
return name is null ? NotFound() : Ok(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Authorize(AuthenticationSchemes = AuthScheme.Sender)]
|
||||||
|
[HttpGet("receiver-envelope-url")]
|
||||||
|
public IActionResult GetReceiverEnvelopeUrl([FromQuery] string envelopeUuid, [FromQuery] string receiverSignature)
|
||||||
|
{
|
||||||
|
if (!CanUseReceiverEnvelopeUrlFeature())
|
||||||
|
return Forbid();
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(envelopeUuid) || string.IsNullOrWhiteSpace(receiverSignature))
|
||||||
|
return BadRequest("Envelope uuid and receiver signature are required.");
|
||||||
|
|
||||||
|
var envelopeKey = (envelopeUuid, receiverSignature).ToEnvelopeKey();
|
||||||
|
var absoluteUrl = $"{Request.Scheme}://{Request.Host}/envelope/{Uri.EscapeDataString(envelopeKey)}";
|
||||||
|
|
||||||
|
return Ok(new { url = absoluteUrl });
|
||||||
|
}
|
||||||
|
|
||||||
|
[Authorize(AuthenticationSchemes = AuthScheme.Sender)]
|
||||||
|
[HttpGet("receiver-envelope-url/enabled")]
|
||||||
|
public IActionResult GetReceiverEnvelopeUrlFeatureEnabled()
|
||||||
|
{
|
||||||
|
return Ok(new { enabled = CanUseReceiverEnvelopeUrlFeature() });
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool CanUseReceiverEnvelopeUrlFeature()
|
||||||
|
{
|
||||||
|
var senderEmail = User.GetEmail();
|
||||||
|
if (string.IsNullOrWhiteSpace(senderEmail))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var allowedEmails = _senderFeatureAccessOptions.CurrentValue.AllowedReceiverEnvelopeUrlEmails;
|
||||||
|
return allowedEmails.Any(email => string.Equals(email?.Trim(), senderEmail, StringComparison.OrdinalIgnoreCase));
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Returns recent receiver suggestions for the authenticated sender.
|
/// Returns recent receiver suggestions for the authenticated sender.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace EnvelopeGenerator.Server.Options;
|
||||||
|
|
||||||
|
public sealed class SenderFeatureAccessOptions
|
||||||
|
{
|
||||||
|
public const string SectionName = "SenderFeatureAccess";
|
||||||
|
|
||||||
|
public List<string> AllowedReceiverEnvelopeUrlEmails { get; set; } = [];
|
||||||
|
}
|
||||||
@@ -298,6 +298,7 @@ try
|
|||||||
|
|
||||||
// Cache options
|
// Cache options
|
||||||
builder.Services.Configure<CacheOptions>(config.GetSection(CacheOptions.SectionName));
|
builder.Services.Configure<CacheOptions>(config.GetSection(CacheOptions.SectionName));
|
||||||
|
builder.Services.Configure<SenderFeatureAccessOptions>(config.GetSection(SenderFeatureAccessOptions.SectionName));
|
||||||
|
|
||||||
// Distributed Cache - SQL Server
|
// Distributed Cache - SQL Server
|
||||||
builder.Services.AddDistributedSqlServerCache(options =>
|
builder.Services.AddDistributedSqlServerCache(options =>
|
||||||
|
|||||||
@@ -212,6 +212,9 @@
|
|||||||
"TableName": "TBDD_CACHE"
|
"TableName": "TBDD_CACHE"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"SenderFeatureAccess": {
|
||||||
|
"AllowedReceiverEnvelopeUrlEmails": ["h.tek@digitaldata.works"]
|
||||||
|
},
|
||||||
"MainPageTitle": null,
|
"MainPageTitle": null,
|
||||||
"AnnotationParams": {
|
"AnnotationParams": {
|
||||||
"Background": {
|
"Background": {
|
||||||
|
|||||||
Reference in New Issue
Block a user