resolve merge conflicts

2026-09-30 16:37:16 +02:00
parent 96c7cd6e8a 940d129c11
commit 618451f0c1
6 changed files with 337 additions and 99 deletions
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/AuthService.cs
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/AuthService.cs
@@ -86,6 +86,18 @@ public class AuthService(IHttpClientFactory httpClientFactory)
        return response.IsSuccessStatusCode;
    }

+    /// <summary>
+    /// Shares the current envelope in read-only mode for the specified receiver and expiration date.
+    /// Calls POST /api/readonly/{envelopeKey}.
+    /// </summary>
+    public async Task<bool> ShareEnvelopeReadOnlyAsync(string envelopeKey, string receiverMail, DateTime dateValid, CancellationToken cancel = default)
+    {
+        using var http = CreateDefaultClient();
+        var payload = new { receiverMail, dateValid };
+        var response = await http.PostAsJsonAsync($"/api/readonly/{Uri.EscapeDataString(envelopeKey)}", payload, cancel);
+        return response.IsSuccessStatusCode;
+    }
+
    /// <summary>
    /// Removes the per-envelope receiver cookie for the given envelope key.
    /// Calls POST /api/auth/logout/envelope/{envelopeKey}.
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/ReceiverPage.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/ReceiverPage.razor
@@ -5,13 +5,18 @@
@using EnvelopeGenerator.Server.Client.Models
@using EnvelopeGenerator.Server.Client.Models.Constants
@using EnvelopeGenerator.Server.Client.Services
+@using EnvelopeGenerator.Application.Common.Extensions
@using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver
+@using EnvelopeGenerator.Application.EnvelopeReceivers.Queries
@using EnvelopeGenerator.Domain.Constants
@using Microsoft.JSInterop
@using DevExpress.Blazor
@using System.Drawing
@using System.Security.Claims
+@using System.ComponentModel.DataAnnotations
@using Microsoft.Extensions.Caching.Memory
+@using MediatR
+@using EnvelopeGenerator.Server.Extensions
@inject NavigationManager Navigation
@inject IJSRuntime JSRuntime
@inject EnvelopeGenerator.Server.Client.Services.AuthService AuthService
@@ -21,6 +26,7 @@
@inject AppVersionService AppVersion
@inject IMemoryCache MemoryCache
@inject ILogger<ReceiverPage> Logger
+@inject IMediator Mediator
@implements IDisposable

 <link href="_content/DevExpress.Blazor.Themes/blazing-berry.bs5.min.css" rel="stylesheet" />
@@ -127,17 +133,6 @@
                            <span class="pdf-toolbar__btn-text">Unterschreiben</span>
                        </button>
                    }
-
-                    <button class="pdf-toolbar__btn pdf-toolbar__btn--reject"
-                            @onclick="OpenRejectPopup"
-                            disabled="@_isRejectSubmitting"
-                            title="Ablehnen"
-                            style="flex-shrink: 0;">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16">
-                            <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z" />
-                        </svg>
-                        <span class="pdf-toolbar__btn-text">Ablehnen</span>
-                    </button>
                </div>
            </div>

@@ -355,75 +350,6 @@
    </FooterContentTemplate>
 </DxPopup>

-@* Rejection Popup *@
-<DxPopup @bind-Visible="_rejectPopupVisible"
-         HeaderText="Dokument ablehnen"
-         Width="500px"
-         MaxWidth="95vw"
-         ShowFooter="true"
-         CloseOnOutsideClick="false"
-         ShowCloseButton="false"
-         CloseOnEscape="false">
-    <BodyContentTemplate>
-        <div style="display: flex; align-items: flex-start; gap: 0.9rem; padding: 0.2rem 0 0.8rem;">
-            <div style="flex-shrink: 0; width: 36px; height: 36px; border-radius: 999px; background: #fee2e2; color: #b91c1c; display: inline-flex; align-items: center; justify-content: center;">
-                <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="currentColor" viewBox="0 0 16 16">
-                    <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z" />
-                </svg>
-            </div>
-            <div style="min-width: 0;">
-                <div style="font-size: 0.95rem; font-weight: 600; color: #1f2937; margin-bottom: 0.3rem;">
-                    Möchten Sie dieses Dokument wirklich ablehnen?
-                </div>
-                <div style="font-size: 0.84rem; color: #6b7280; line-height: 1.45;">
-                    Diese Aktion markiert den Umschlag als abgelehnt und informiert den Absender.
-                </div>
-            </div>
-        </div>
-
-        <div>
-            <label for="rp-reject-reason" class="form-label" style="font-size: 0.875rem; font-weight: 500; color: #495057;">
-                Grund <span style="color: #6c757d; font-weight: 400;">(optional)</span>
-            </label>
-            <textarea id="rp-reject-reason"
-                      class="form-control"
-                      rows="4"
-                      maxlength="1000"
-                      value="@_rejectReason"
-                      @oninput="args => _rejectReason = args.Value?.ToString() ?? string.Empty"
-                      placeholder="Grund der Ablehnung"
-                      style="border: 2px solid #e9ecef; border-radius: 8px; padding: 0.625rem; resize: vertical;"></textarea>
-        </div>
-
-        @if (!string.IsNullOrWhiteSpace(_rejectValidationMessage))
-        {
-            <div style="background: #fee2e2; border-left: 4px solid #dc2626; padding: 0.75rem 1rem; margin-top: 1rem; border-radius: 4px;">
-                <span style="color: #b91c1c; font-size: 0.875rem; font-weight: 500;">@_rejectValidationMessage</span>
-            </div>
-        }
-    </BodyContentTemplate>
-    <FooterContentTemplate>
-        <div class="d-flex gap-2 justify-content-end w-100" style="padding: 0.5rem 0;">
-            <button class="btn btn-outline-secondary"
-                    @onclick="CloseRejectPopup"
-                    disabled="@_isRejectSubmitting"
-                    style="border-radius: 6px; padding: 0.625rem 1.25rem; font-weight: 500;">
-                Zurück
-            </button>
-            <button class="btn btn-danger"
-                    @onclick="SubmitRejectAsync"
-                    disabled="@_isRejectSubmitting"
-                    style="border-radius: 6px; padding: 0.625rem 1.5rem; font-weight: 600;">
-                @if (_isRejectSubmitting)
-                {
-                    <span class="spinner-border spinner-border-sm me-1" role="status"></span>
-                }
-                Ablehnen
-            </button>
-        </div>
-    </FooterContentTemplate>
-</DxPopup>
-
@code {
    // ----- Constants -----
    const string SignatureTabDraw  = "draw";
@@ -468,12 +394,80 @@
    string _signerFullName         = string.Empty;
    string _signerPosition         = string.Empty;
    string _signaturePlace         = string.Empty;
+    bool _isLoggingOut             = false;

-    // ----- Rejection popup state -----
-    bool _rejectPopupVisible;
-    bool _isRejectSubmitting;
-    string _rejectReason = string.Empty;
-    string? _rejectValidationMessage;
+    // ----- Share popup state -----
+    bool _sharePopupVisible        = false;
+    bool _isSharing                = false;
+    string _shareReceiverMail      = string.Empty;
+    DateTime _shareDateValid       = DateTime.Today.AddDays(7);
+    string? _shareMessage;
+    bool _shareMessageIsError      = false;
+
+    async Task LogoutAsync()
+    {
+        if (_isLoggingOut || string.IsNullOrWhiteSpace(EnvelopeKey))
+            return;
+
+        _isLoggingOut = true;
+        await InvokeAsync(StateHasChanged);
+
+        try
+        {
+            await AuthService.LogoutEnvelopeReceiverAsync(EnvelopeKey);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogWarning(ex, "Receiver logout failed for {EnvelopeKey}", EnvelopeKey);
+        }
+
+        Navigation.NavigateTo($"/envelope/login/{Uri.EscapeDataString(EnvelopeKey)}", forceLoad: true);
+    }
+
+    void OpenSharePopup()
+    {
+        _shareReceiverMail = string.Empty;
+        _shareDateValid = DateTime.Today.AddDays(7);
+        _shareMessage = null;
+        _shareMessageIsError = false;
+        _sharePopupVisible = true;
+    }
+
+    void CloseSharePopup()
+    {
+        if (_isSharing)
+            return;
+
+        _sharePopupVisible = false;
+    }
+
+    void OnShareDateChanged(Microsoft.AspNetCore.Components.ChangeEventArgs args)
+    {
+        if (DateTime.TryParse(args.Value?.ToString(), out var parsedDate))
+            _shareDateValid = parsedDate.Date;
+    }
+
+    async Task ShareEnvelopeAsync()
+    {
+        if (_isSharing)
+            return;
+
+        var email = _shareReceiverMail.Trim();
+        if (string.IsNullOrWhiteSpace(email) || !new EmailAddressAttribute().IsValid(email))
+        {
+            _shareMessage = "Bitte geben Sie eine gultige E-Mail-Adresse ein.";
+            _shareMessageIsError = true;
+            return;
+        }
+
+        var minDate = DateTime.Today.AddDays(1);
+        var maxDate = DateTime.Today.AddDays(90);
+        if (_shareDateValid.Date < minDate || _shareDateValid.Date > maxDate)
+        {
+            _shareMessage = "Bitte wahlen Sie ein Datum zwischen morgen und 90 Tagen.";
+            _shareMessageIsError = true;
+            return;
+        }

    // ----- Lifecycle -----
    protected override async Task OnInitializedAsync()
@@ -485,6 +479,12 @@
            return;
        }

+        if (EnvelopeKey.TryDecode(out var decodedKeys) && decodedKeys.GetEncodeType() == EncodeType.EnvelopeReceiverReadOnly)
+        {
+            Navigation.NavigateTo($"/envelope/readonly/{Uri.EscapeDataString(EnvelopeKey)}", forceLoad: true);
+            return;
+        }
+
        // Authorization — same pattern as EnvelopeReceiverPage
        _receiverUser = await ReceiverAuthorizationService.AuthorizeAsync(EnvelopeKey);
        if (_receiverUser is null)
@@ -493,6 +493,12 @@
            return;
        }

+        if (await Mediator.IsSignedAsync(_receiverUser.EnvelopeUuid(), _receiverUser.ReceiverSignature()))
+        {
+            Navigation.NavigateTo("/envelope/signed-result", forceLoad: true);
+            return;
+        }
+
        try
        {
            // Load PDF bytes via MediatR (uses authenticated user's claims)
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/ReceiverReadOnlyPage.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/ReceiverReadOnlyPage.razor
@@ -0,0 +1,188 @@
+@page "/envelope/readonly/{ReadOnlyKey}"
+@rendermode InteractiveServer
+@using DevExpress.Blazor.Reporting
+@using DevExpress.XtraReports.UI
+@using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly
+@using EnvelopeGenerator.Application.Common.Extensions
+@using EnvelopeGenerator.Application.Common.Interfaces.Services
+@using EnvelopeGenerator.Domain.Constants
+@inject EnvelopeGenerator.Server.Client.Services.AppVersionService AppVersion
+@inject ILogger<ReceiverReadOnlyPage> Logger
+@inject IEnvelopeReceiverReadOnlyService ReadOnlyService
+@inject IEnvelopeReceiverService EnvelopeReceiverService
+@inject IEnvelopeHistoryService HistoryService
+@implements IDisposable
+
+<link href="_content/DevExpress.Blazor.Themes/blazing-berry.bs5.min.css" rel="stylesheet" />
+<link href="_content/DevExpress.Blazor.Reporting.Viewer/css/dx-blazor-reporting-components.bs5.css" rel="stylesheet" />
+<link href="@AppVersion.GetVersionedUrl("css/envelope-viewer.css")" rel="stylesheet" />
+
+<div class="envelope-viewer-layout">
+    <div class="envelope-action-bar">
+        <div class="envelope-action-bar__inner" style="padding: 0.5rem 1.25rem;">
+            <div style="display:flex; align-items:center; justify-content:space-between; gap:1rem;">
+                <div style="font-weight:600; color:#1f2937;">Dokumentansicht (Nur Lesen)</div>
+                @if (_readOnly is not null)
+                {
+                    <div style="font-size:0.8rem; color:#6b7280;">Gultig bis: @_readOnly.DateValid.ToString("dd.MM.yyyy")</div>
+                }
+            </div>
+        </div>
+    </div>
+
+    <div class="envelope-content" style="padding:0; overflow:hidden;">
+        @if (_isLoading)
+        {
+            <div class="d-flex justify-content-center align-items-center h-100">
+                <div class="text-center">
+                    <div class="spinner-border text-white mb-3" style="width:3.5rem; height:3.5rem;" role="status"></div>
+                    <p class="text-white fw-semibold">Dokument wird geladen...</p>
+                </div>
+            </div>
+        }
+        else if (!string.IsNullOrWhiteSpace(_errorMessage))
+        {
+            <div class="error-container">
+                <div class="alert alert-danger shadow-lg mb-0">
+                    <h5 class="mb-2">Dokument nicht verfugbar</h5>
+                    <p class="mb-0">@_errorMessage</p>
+                </div>
+            </div>
+        }
+        else if (_isExpired)
+        {
+            <div class="error-container">
+                <div class="alert alert-warning shadow-lg mb-0">
+                    <h5 class="mb-2">Freigabe abgelaufen</h5>
+                    <p class="mb-0">Der Zeitraum fur diese Nur-Lesen-Freigabe ist abgelaufen.</p>
+                </div>
+            </div>
+        }
+        else if (_report is not null)
+        {
+            <DxReportViewer @ref="_reportViewer"
+                            Report="_report"
+                            RootCssClasses="w-100 h-100" />
+        }
+    </div>
+</div>
+
+@code {
+    [Parameter] public string? ReadOnlyKey { get; set; }
+
+    bool _isLoading = true;
+    bool _isExpired = false;
+    string? _errorMessage;
+    EnvelopeReceiverReadOnlyDto? _readOnly;
+
+    DxReportViewer? _reportViewer;
+    XtraReport? _report;
+
+    protected override async Task OnInitializedAsync()
+    {
+        if (string.IsNullOrWhiteSpace(ReadOnlyKey))
+        {
+            _errorMessage = "Freigabe-Schlussel fehlt.";
+            _isLoading = false;
+            return;
+        }
+
+        if (!ReadOnlyKey.TryDecode(out var decodedKeys) || decodedKeys.GetEncodeType() != EncodeType.EnvelopeReceiverReadOnly)
+        {
+            _errorMessage = "Ungultiger Freigabe-Link.";
+            _isLoading = false;
+            return;
+        }
+
+        try
+        {
+            var readOnlyId = decodedKeys.ParseReadOnlyId();
+            var readOnlyRes = await ReadOnlyService.ReadByIdAsync(readOnlyId);
+            if (readOnlyRes.IsFailed)
+            {
+                _errorMessage = "Freigabe konnte nicht geladen werden.";
+                _isLoading = false;
+                return;
+            }
+
+            _readOnly = readOnlyRes.Data;
+
+            if (DateTime.Now > _readOnly.DateValid)
+            {
+                _isExpired = true;
+                _isLoading = false;
+                return;
+            }
+
+            if (_readOnly.Envelope is null || _readOnly.Receiver is null)
+            {
+                _errorMessage = "Freigabe ist unvollstandig.";
+                _isLoading = false;
+                return;
+            }
+
+            var erRes = await EnvelopeReceiverService.ReadByUuidSignatureAsync(_readOnly.Envelope.Uuid, _readOnly.Receiver.Signature);
+            if (erRes.IsFailed)
+            {
+                _errorMessage = "Dokument wurde nicht gefunden.";
+                _isLoading = false;
+                return;
+            }
+
+            var envelopeReceiver = erRes.Data;
+            var documentBytes = envelopeReceiver.Envelope?.Documents?.FirstOrDefault()?.ByteData;
+            if (documentBytes is not { Length: > 0 })
+            {
+                _errorMessage = "Dokumentdaten konnten nicht geladen werden.";
+                _isLoading = false;
+                return;
+            }
+
+            _report = BuildReport(documentBytes);
+
+            try
+            {
+                var historyResult = await HistoryService.RecordAsync((int)_readOnly.EnvelopeId, _readOnly.AddedWho, EnvelopeStatus.EnvelopeViewed);
+                if (historyResult.IsFailed)
+                    Logger.LogWarning("Failed to record EnvelopeViewed history for read-only key {ReadOnlyKey}", ReadOnlyKey);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogWarning(ex, "Failed to record read-only history for {ReadOnlyKey}", ReadOnlyKey);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Unexpected error in read-only page for {ReadOnlyKey}", ReadOnlyKey);
+            _errorMessage = "Beim Laden ist ein unerwarteter Fehler aufgetreten.";
+        }
+
+        _isLoading = false;
+    }
+
+    static XtraReport BuildReport(byte[] pdfBytes)
+    {
+        var report = new XtraReport
+        {
+            PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4,
+            Landscape = false,
+            Margins = new System.Drawing.Printing.Margins(0, 0, 0, 0)
+        };
+
+        var detail = new DetailBand { HeightF = 0f };
+        report.Bands.Add(detail);
+
+        detail.Controls.Add(new XRPdfContent
+        {
+            Source = pdfBytes,
+            GenerateOwnPages = true
+        });
+
+        return report;
+    }
+
+    public void Dispose()
+    {
+        _report?.Dispose();
+    }
+}
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeKeyRedirectController.cs
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeKeyRedirectController.cs
@@ -0,0 +1,18 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.Server.Controllers;
+
+/// <summary>
+/// Redirects legacy envelope key links to Blazor routes.
+/// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
+[Route("EnvelopeKey")]
+public class EnvelopeKeyRedirectController : Controller
+{
+    /// <summary>
+    /// Redirects /EnvelopeKey/{*path} links to /envelope/{path}.
+    /// </summary>
+    [HttpGet("{*path}")]
+    public IActionResult RedirectToEnvelopePath([FromRoute] string path)
+        => Redirect($"/envelope/{path}");
+}
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/ReadOnlyController.cs
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/ReadOnlyController.cs
@@ -1,8 +1,10 @@
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Application.Common.Interfaces.Services;
+using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Server.Extensions;
+using MediatR;
+using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
@@ -33,24 +35,36 @@ public class ReadOnlyController : ControllerBase
    }

    /// <summary>
-    /// Creates a new read-only receiver for the current envelope.
+    /// Creates a new read-only receiver for an envelope.
    /// </summary>
+    /// <param name="envelopeKey">Envelope key (uuid+signature encoded).</param>
    /// <param name="createDto">Creation payload.</param>
-    [HttpPost]
-    [Authorize(Policy = AuthPolicy.Receiver)]
+    [HttpPost("{envelopeKey}")]
+    [Authorize(Policy = AuthPolicy.SenderOrReceiver)]
    [Obsolete("Use MediatR")]
-    public async Task<IActionResult> CreateAsync([FromBody] EnvelopeReceiverReadOnlyCreateDto createDto)
+    public async Task<IActionResult> CreateAsync(
+        [FromRoute] string envelopeKey,
+        [FromBody] EnvelopeReceiverReadOnlyCreateDto createDto,
+        [FromServices] IMediator mediator,
+        CancellationToken cancel)
    {
-        var authReceiverMail = User.ReceiverMail();
-        if (authReceiverMail is null)
+        var envelopeReceiver = await mediator.Send(new ReadEnvelopeReceiverQuery { Key = envelopeKey }, cancel);
+        var authEnvelopeReceiver = envelopeReceiver.FirstOrDefault();
+
+        if (authEnvelopeReceiver?.Envelope is null)
+            return NotFound();
+
+        var addedWho = User.FindFirstValue(ClaimTypes.Email)
+            ?? authEnvelopeReceiver.Receiver?.EmailAddress;
+        if (string.IsNullOrWhiteSpace(addedWho))
        {
-            _logger.LogError("EmailAddress claim is not found in envelope-receiver-read-only creation process. Create DTO is:\n {dto}", JsonConvert.SerializeObject(createDto));
-            return Unauthorized();
+            _logger.LogError("Receiver e-mail is missing in envelope-receiver-read-only creation process. Create DTO is:\n {dto}", JsonConvert.SerializeObject(createDto));
+            return StatusCode(StatusCodes.Status500InternalServerError);
        }

-        var envelopeId = User.EnvelopeId();
+        var envelopeId = authEnvelopeReceiver.EnvelopeId;

-        createDto.AddedWho = authReceiverMail;
+        createDto.AddedWho = addedWho;
        createDto.EnvelopeId = envelopeId;

        var creationRes = await _readOnlyService.CreateAsync(createDto: createDto);
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/EnvelopeGenerator.Server.csproj
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/EnvelopeGenerator.Server.csproj
@@ -10,9 +10,9 @@
    <Authors>Digital Data GmbH</Authors>
    <Company>Digital Data GmbH</Company>
    <Product>EnvelopeGenerator.Server</Product>
-    <Version>1.2.0-beta</Version>
-    <FileVersion>1.2.0.0</FileVersion>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
+    <Version>1.4.0-beta</Version>
+    <FileVersion>1.4.0.0</FileVersion>
+    <AssemblyVersion>1.4.0.0</AssemblyVersion>
    <Copyright>Copyright © 2026 Digital Data GmbH. All rights reserved.</Copyright>
 	<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
  </PropertyGroup>