Refactor sender resolution and add history logging

Refactored sender email resolution into a new private async
method `ResolveSenderReferenceAsync` to improve code
reusability and readability. Replaced inline logic for
resolving sender references with this method.

Added a `CreateHistoryCommand` to log envelope creation
events, including envelope ID, sender reference, and status
(`EnvelopeCreated`). This enhances auditability and ensures
consistent event logging.

AGENTS.md

@@ -69,9 +69,9 @@ This section explains every markdown file in the repo: what it contains, why it
 - **EnvelopeGenerator.Server** (Server): `@rendermode InteractiveServer` - PDF viewers requiring DevExpress backend
 - **EnvelopeGenerator.Server.Client** (WASM): `@rendermode InteractiveWebAssembly` - Login, dashboards, business logic
 
-**Backend:** EnvelopeGenerator.API (ASP.NET Core 8.0)
+**Backend + API Host:** `EnvelopeGenerator.Server` (ASP.NET Core 8.0, merged Blazor + Web API host)
 
-**Proxy:** YARP in EnvelopeGenerator.Server routes `/api/*` → `localhost:8088` (API)
+**Proxy:** YARP in `EnvelopeGenerator.Server` is used for external integrations (for example AuthHub forwarding), not for routing app APIs to `EnvelopeGenerator.API`.
 
 ### Deprecated Projects - DO NOT USE
 - `EnvelopeGenerator.ReceiverUI` - Pure WASM (migrated to Server)
@@ -80,18 +80,14 @@ This section explains every markdown file in the repo: what it contains, why it
 
 ## Development Commands
 
-### Run Both Projects (Required)
+### Run Active Host
 ```powershell
-# Terminal 1 - API Backend
-cd EnvelopeGenerator.API
-dotnet run
-
-# Terminal 2 - Blazor Frontend
+# Terminal - Blazor + Web API host
 cd EnvelopeGenerator.Server\EnvelopeGenerator.Server
 dotnet run
 ```
 
-**Critical:** Both must run simultaneously. EnvelopeGenerator.Server proxy forwards `/api/*` to API.
+**Critical:** `EnvelopeGenerator.Server` is the active runtime host for both UI and API controllers.
 
 ### Build
 ```powershell
@@ -104,10 +100,10 @@ dotnet build EnvelopeGenerator.sln
 EnvelopeGenerator.Domain/          # Entities (Envelope, Receiver, Document, etc.)
 EnvelopeGenerator.Application/     # MediatR CQRS (Commands, Queries, Handlers)
 EnvelopeGenerator.Infrastructure/  # EF Core, SQL executors, repositories
-EnvelopeGenerator.API/             # Controllers, endpoints
 EnvelopeGenerator.Server/
-  EnvelopeGenerator.Server/        # Server-side Blazor components
+  EnvelopeGenerator.Server/        # Server-side Blazor + API controllers
     ├─ Components/Pages/           # @rendermode InteractiveServer
+    ├─ Controllers/                # Active Web API endpoints
   EnvelopeGenerator.Server.Client/ # Client-side WASM components
     ├─ Pages/                      # @rendermode InteractiveWebAssembly
     ├─ Services/                   # HTTP API clients
@@ -156,15 +152,13 @@ float inches = (pixelX / canvasWidth) * pageWidthInches;
 - **Use case:** External API consumers
 - **Not suitable for:** Step-by-step UI workflow (no draft support, no partial updates)
 
-### Missing Granular Endpoints (Need to Create)
+### Sender Workflow Endpoint
 ```
-POST /api/Envelope/draft          # Create draft envelope
-PUT /api/Envelope/{id}            # Update metadata
+POST /api/Envelope                # Create/update/save/send envelope workflow payload
 DELETE /api/Envelope/{id}         # Delete with reason
 POST /api/Envelope/{id}/document  # Upload PDF
 POST /api/Envelope/{id}/receivers # Add receiver
 POST /api/Envelope/{id}/signature-fields  # Place signature field
-POST /api/Envelope/{id}/send      # Send to receivers
 ```
 
 See `FORM_APPLICATION_CONTEXT.md` for detailed workflow requirements.
@@ -199,7 +193,7 @@ Routes `/api/*`, `/swagger/*`, `/openapi/*`, `/scalar/*` → `https://localhost:
 }
 ```
 
-### API Config (`API/appsettings.json`)
+### Server Host Config (`EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json`)
 - `ConnectionStrings:Default` - SQL Server DB
 - `AllowedOrigins` - CORS (includes `http://localhost:5131`, `http://localhost:7192`)
 - `Cache:SignatureCacheExpiration` - Signature persistence timeout
@@ -237,16 +231,15 @@ Routes `/api/*`, `/swagger/*`, `/openapi/*`, `/scalar/*` → `https://localhost:
 **No automated tests exist yet.**
 
 Manual testing workflow:
-1. Start API (`dotnet run` in `EnvelopeGenerator.API`)
-2. Start EnvelopeGenerator.Server (`dotnet run` in `EnvelopeGenerator.Server\EnvelopeGenerator.Server`)
-3. Navigate to `https://localhost:5131` (or check console output for port)
-4. Test sender login at `/sender/login`
-5. Test receiver flow at `/envelope/login/{envelopeKey}`
+1. Start EnvelopeGenerator.Server (`dotnet run` in `EnvelopeGenerator.Server\EnvelopeGenerator.Server`)
+2. Navigate to `https://localhost:5131` (or check console output for port)
+3. Test sender login at `/sender/login`
+4. Test receiver flow at `/envelope/login/{envelopeKey}`
 
 ## Database
 
 **SQL Server** (DD_ECM)
-- Connection string in `API/appsettings.json`
+- Connection string in `EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json`
 - EF Core migrations NOT used (manual SQL scripts)
 - Stored procedures: `PRSIG_*` prefix
 
@@ -320,5 +313,4 @@ Each envelope maintains independent authentication state.
 None required. All config in `appsettings.json`.
 
 **Local dev ports:**
-- API: `https://localhost:8088`
-- WebUI: `https://localhost:5131` or `http://localhost:7192`
+- App host (UI + API): `https://localhost:5131` or `http://localhost:7192`

COPILOT_CONTEXT.md

@@ -39,7 +39,7 @@ This project contains:
 - `EnvelopeGenerator.Domain` — domain models, constants, shared abstractions
 - `EnvelopeGenerator.Infrastructure` — EF Core and infrastructure services
 - `EnvelopeGenerator.PdfEditor` — PDF-related backend utilities
-- `EnvelopeGenerator.API` — still exists in the solution, but the current merged app host is `EnvelopeGenerator.Server`
+- `EnvelopeGenerator.API` — deprecated project (no longer part of the active solution/runtime path)
 
 ### Legacy / Do Not Touch
 - `EnvelopeGenerator.Service`
@@ -121,7 +121,7 @@ Current controller set includes:
 - `SignatureController`
 - `TfaRegistrationController`
 
-Do not assume API behavior lives only in `EnvelopeGenerator.API`; the active merged host contains controller endpoints directly.
+Do not assume API behavior lives in `EnvelopeGenerator.API`; the active merged host contains controller endpoints directly.
 
 ---
 

EnvelopeGenerator.API/AuthScheme.cs

@@ -1,17 +0,0 @@
-namespace EnvelopeGenerator.API;
-
-/// <summary>
-/// 
-/// </summary>
-public static class AuthScheme
-{
-    /// <summary>
-    /// Scheme name used for per-envelope receiver JWT authentication.
-    /// </summary>
-    public const string Receiver = "EnvelopeGenerator.API.ReceiverJWT";
-
-    /// <summary>
-    /// Scheme name used for per-envelope sender JWT authentication.
-    /// </summary>
-    public const string Sender = "EnvelopeGenerator.API.SenderJWT";
-}

EnvelopeGenerator.API/Controllers/AnnotationController.cs

@@ -1,132 +0,0 @@
-using DigitalData.Core.Abstraction.Application.DTO;
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.API.Extensions;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
-using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
-using EnvelopeGenerator.Application.Common.Notifications.RemoveSignature;
-using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
-using EnvelopeGenerator.Application.Histories.Queries;
-using EnvelopeGenerator.Domain.Constants;
-using MediatR;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Manages annotations and signature lifecycle for envelopes.
-/// </summary>
-[Authorize(Policy = AuthPolicy.Receiver)]
-[ApiController]
-[Route("api/[controller]")]
-public class AnnotationController : ControllerBase
-{
-    [Obsolete("Use MediatR")]
-    private readonly IEnvelopeHistoryService _historyService;
-
-    [Obsolete("Use MediatR")]
-    private readonly IEnvelopeReceiverService _envelopeReceiverService;
-
-    private readonly IMediator _mediator;
-
-    private readonly ILogger<AnnotationController> _logger;
-
-    /// <summary>
-    /// Initializes a new instance of <see cref="AnnotationController"/>.
-    /// </summary>
-    [Obsolete("Use MediatR")]
-    public AnnotationController(
-        ILogger<AnnotationController> logger,
-        IEnvelopeHistoryService envelopeHistoryService,
-        IEnvelopeReceiverService envelopeReceiverService,
-        IMediator mediator)
-    {
-        _historyService = envelopeHistoryService;
-        _envelopeReceiverService = envelopeReceiverService;
-        _mediator = mediator;
-        _logger = logger;
-    }
-
-    /// <summary>
-    /// Creates or updates annotations for the authenticated envelope receiver.
-    /// </summary>
-    /// <param name="psPdfKitAnnotation">Annotation payload.</param>
-    /// <param name="cancel">Cancellation token.</param>
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpPost]
-    [Obsolete("PSPDF Kit will no longer be used.")]
-    public async Task<IActionResult> CreateOrUpdate([FromBody] PsPdfKitAnnotation? psPdfKitAnnotation = null, CancellationToken cancel = default)
-    {
-        var signature = User.ReceiverSignature();
-        var uuid = User.EnvelopeUuid();
-
-        var envelopeReceiver = await _mediator.ReadEnvelopeReceiverAsync(uuid, signature, cancel).ThrowIfNull(Exceptions.NotFound);
-
-        if (!envelopeReceiver.Envelope!.ReadOnly && psPdfKitAnnotation is null)
-            return BadRequest();
-
-        if (await _mediator.IsSignedAsync(uuid, signature, cancel))
-            return Problem(statusCode: StatusCodes.Status409Conflict);
-        else if (await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
-            return Problem(statusCode: StatusCodes.Status423Locked);
-
-        var envelopeReceiverDto = await _mediator.ReadEnvelopeReceiverAsync(uuid, signature, cancel);
-        var docSignedNotification = envelopeReceiverDto is not null
-            ? new DocSignedNotification { EnvelopeReceiver = envelopeReceiverDto, PsPdfKitAnnotation = psPdfKitAnnotation }
-            : throw new NotFoundException("Envelope receiver is not found.");
-
-        try
-        {
-            await _mediator.Publish(docSignedNotification, cancel);
-        }
-        catch (Exception)
-        {
-            await _mediator.Publish(new RemoveSignatureNotification()
-            {
-                EnvelopeId = docSignedNotification.EnvelopeReceiver.EnvelopeId,
-                ReceiverId = docSignedNotification.EnvelopeReceiver.ReceiverId
-            }, cancel);
-            throw;
-        }
-        await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-
-        return Ok();
-    }
-
-    /// <summary>
-    /// Rejects the document for the current receiver.
-    /// </summary>
-    /// <param name="reason">Optional rejection reason.</param>
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpPost("reject")]
-    [Obsolete("Use MediatR")]
-    public async Task<IActionResult> Reject([FromBody] string? reason = null)
-    {
-        var signature = User.ReceiverSignature();
-        var uuid = User.EnvelopeUuid();
-        var mail = User.ReceiverMail();
-
-        var envRcvRes = await _envelopeReceiverService.ReadByUuidSignatureAsync(uuid: uuid, signature: signature);
-
-        if (envRcvRes.IsFailed)
-        {
-            _logger.LogNotice(envRcvRes.Notices);
-            return Unauthorized("you are not authorized");
-        }
-
-        var histRes = await _historyService.RecordAsync(envRcvRes.Data.EnvelopeId, userReference: mail, EnvelopeStatus.DocumentRejected, comment: reason);
-        if (histRes.IsSuccess)
-        {
-            await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-            return NoContent();
-        }
-
-        _logger.LogEnvelopeError(uuid: uuid, signature: signature, message: "Unexpected error happened in api/envelope/reject");
-        _logger.LogNotice(histRes.Notices);
-        return StatusCode(500, histRes.Messages);
-    }
-}

EnvelopeGenerator.API/Controllers/AuthController.cs

@@ -1,117 +0,0 @@
-using DigitalData.Auth.Claims;
-using EnvelopeGenerator.API.Controllers.Interfaces;
-using EnvelopeGenerator.API.Models;
-using EnvelopeGenerator.Domain.Constants;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Controller verantwortlich für die Benutzer-Authentifizierung, einschließlich Anmelden, Abmelden und Überprüfung des Authentifizierungsstatus.
-/// </summary>
-[Route("api/[controller]")]
-[ApiController]
-public partial class AuthController(IOptions<AuthTokenKeys> authTokenKeyOptions, IAuthorizationService authService) : ControllerBase, IAuthController
-{
-    private readonly AuthTokenKeys authTokenKeys = authTokenKeyOptions.Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public IAuthorizationService AuthService { get; } = authService;
-
-    /// <summary>
-    /// Entfernt das Authentifizierungs-Cookie des Benutzers (AuthCookie)
-    /// </summary>
-    /// <returns>
-    /// Gibt eine HTTP 200 oder 401.
-    /// </returns>
-    /// <remarks>
-    /// Sample request:
-    ///
-    ///     POST /api/auth/logout
-    ///
-    /// </remarks>
-    /// <response code="200">Erfolgreich gelöscht, wenn der Benutzer ein berechtigtes Cookie hat.</response>
-    /// <response code="401">Wenn es kein zugelassenes Cookie gibt, wird „nicht zugelassen“ zurückgegeben.</response>
-    [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
-    [Authorize(AuthenticationSchemes = AuthScheme.Sender)]
-    [HttpPost("logout")]
-    public async Task<IActionResult> Logout()
-    {
-        if (await this.IsUserInPolicyAsync(AuthPolicy.Sender))
-            Response.Cookies.Delete(authTokenKeys.Cookie);
-        else if (await this.IsUserInPolicyAsync(AuthPolicy.ReceiverOrReceiverTFA))
-            await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-        else
-            return Unauthorized();
-
-        return Ok();
-    }
-
-    /// <summary>
-    /// Prüft, ob der Benutzer ein autorisiertes Token hat.
-    /// </summary>
-    /// <returns>Wenn ein autorisiertes Token vorhanden ist HTTP 200 asynchron 401</returns>
-    /// <remarks>
-    /// Sample request:
-    ///
-    ///     GET /api/auth
-    ///
-    /// </remarks>
-    /// <response code="200">Wenn es einen autorisierten Cookie gibt.</response>
-    /// <response code="401">Wenn kein Cookie vorhanden ist oder nicht autorisierte.</response>
-    [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
-    [HttpGet("check")]
-    [Authorize(AuthenticationSchemes = AuthScheme.Sender)]
-    public IActionResult Check(string? role = null)
-        => role is not null && !User.IsInRole(role)
-            ? Unauthorized()
-            : Ok();
-
-    /// <summary>
-    /// Checks whether the caller holds a valid per-envelope receiver token for the given envelope key.
-    /// The request must carry a cookie named <c>AuthTokenSignFLOWReceiver.{envelopeKey}</c>.
-    /// </summary>
-    /// <param name="envelopeKey">The unique envelope key extracted from the route.</param>
-    /// <response code="200">Valid per-envelope token found.</response>
-    /// <response code="401">Token is missing, expired or invalid.</response>
-    [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpGet("check/envelope/{envelopeKey}")]
-    public IActionResult CheckEnvelopeReceiver([FromRoute] string envelopeKey) => Ok();
-
-    /// <summary>
-    /// Removes the per-envelope receiver cookie for the given envelope key.
-    /// </summary>
-    /// <param name="envelopeKey">The unique envelope key whose cookie should be deleted.</param>
-    /// <response code="200">Cookie successfully deleted.</response>
-    [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
-    [HttpPost("logout/envelope/{envelopeKey}")]
-    public IActionResult LogoutEnvelopeReceiver([FromRoute] string envelopeKey)
-    {
-        var cookieName = CookieNames.GetEnvelopeReceiverCookieName(authTokenKeys.Cookie, envelopeKey);
-        Response.Cookies.Delete(cookieName);
-        return Ok();
-    }
-
-    /// <summary>
-    /// Removes all per-envelope receiver cookies from the current request.
-    /// </summary>
-    /// <response code="200">All envelope receiver cookies successfully deleted.</response>
-    [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
-    [HttpPost("logout/envelope")]
-    public IActionResult LogoutAllEnvelopeReceivers()
-    {
-        foreach (var cookieName in Request.Cookies.Keys.Where(k => CookieNames.IsEnvelopeReceiverCookie(k, authTokenKeys.Cookie)))
-            Response.Cookies.Delete(cookieName);
-        return Ok();
-    }
-}

EnvelopeGenerator.API/Controllers/CacheController.cs

@@ -1,84 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using Microsoft.Extensions.Options;
-using System.Text.Json;
-using EnvelopeGenerator.API.Options;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.API.Extensions;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Manages cached data for receivers using distributed cache.
-/// </summary>
-[ApiController]
-[Route("api/[controller]")]
-[Authorize(Policy = AuthPolicy.Receiver)]
-public class CacheController(
-    IDistributedCache cache,
-    IOptions<CacheOptions> cacheOptions) : ControllerBase
-{
-    private const string SignatureCacheKeyPrefix = "envelope-generator.receiver-ui.signature:";
-
-    /// <summary>
-    /// Stores a receiver's signature in cache for the specified envelope.
-    /// </summary>
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpPost("SignatureCapture/{envelopeKey}")]
-    public async Task<IActionResult> SaveSignature(
-        [FromRoute] string envelopeKey,
-        [FromBody] SignatureCacheRequest request,
-        CancellationToken cancel)
-    {
-        var cacheKey = $"{SignatureCacheKeyPrefix}{User.ReceiverSignature()}";
-        var json = JsonSerializer.Serialize(request);
-        
-        var options = cacheOptions.Value.SignatureCacheExpiration.HasValue
-            ? new DistributedCacheEntryOptions { AbsoluteExpirationRelativeToNow = cacheOptions.Value.SignatureCacheExpiration.Value }
-            : null;
-
-        await cache.SetStringAsync(cacheKey, json, options ?? new DistributedCacheEntryOptions(), cancel);
-
-        return Ok();
-    }
-
-    /// <summary>
-    /// Retrieves a cached signature for the specified envelope.
-    /// </summary>
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpGet("SignatureCapture/{envelopeKey}")]
-    public async Task<IActionResult> GetSignature([FromRoute] string envelopeKey, CancellationToken cancel)
-    {
-        var cacheKey = $"{SignatureCacheKeyPrefix}{User.ReceiverSignature()}";
-        var json = await cache.GetStringAsync(cacheKey, cancel);
-
-        if (json is null)
-            return NotFound();
-
-        var signature = JsonSerializer.Deserialize<SignatureCacheRequest>(json);
-        return Ok(signature);
-    }
-
-    /// <summary>
-    /// Deletes a cached signature for the specified envelope.
-    /// </summary>
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpDelete("SignatureCapture/{envelopeKey}")]
-    public async Task<IActionResult> DeleteSignature([FromRoute] string envelopeKey, CancellationToken cancel)
-    {
-        var cacheKey = $"{SignatureCacheKeyPrefix}{User.ReceiverSignature()}";
-        await cache.RemoveAsync(cacheKey, cancel);
-
-        return Ok();
-    }
-}
-
-/// <summary>
-/// Request model for caching signature data.
-/// </summary>
-public sealed record SignatureCacheRequest(
-    string DataUrl,
-    string FullName,
-    string Place,
-    string? Position = null);

EnvelopeGenerator.API/Controllers/ConfigController.cs

@@ -1,31 +0,0 @@
-using EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-using EnvelopeGenerator.Domain.Constants;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Exposes configuration data required by the client applications.
-/// </summary>
-/// <remarks>
-/// Initializes a new instance of <see cref="ConfigController"/>.
-/// </remarks>
-[Route("api/[controller]")]
-[ApiController]
-[Authorize(Policy = AuthPolicy.SenderOrReceiver)]
-public class ConfigController(IOptionsMonitor<AnnotationParams> annotationParamsOptions) : ControllerBase
-{
-    private readonly AnnotationParams _annotationParams = annotationParamsOptions.CurrentValue;
-
-    /// <summary>
-    /// Returns annotation configuration that was previously rendered by MVC.
-    /// </summary>
-    [HttpGet("Annotations")]
-    [Obsolete("PSPDF Kit will no longer be used.")]
-    public IActionResult GetAnnotationParams()
-    {
-        return Ok(_annotationParams.AnnotationJSObject);
-    }
-}

EnvelopeGenerator.API/Controllers/DocReceiverElementController.cs

@@ -1,57 +0,0 @@
-using EnvelopeGenerator.API.Extensions;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Documents.Queries;
-using EnvelopeGenerator.Domain.Constants;
-using MediatR;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// 
-/// </summary>
-[Authorize(Policy = AuthPolicy.Receiver)]
-[ApiController]
-[Route("api/[controller]")]
-public class DocReceiverElementController : ControllerBase
-{
-    private readonly IMediator _mediator;
-
-    /// <summary>
-    /// Initializes a new instance of <see cref="DocReceiverElementController"/>.
-    /// </summary>
-    public DocReceiverElementController(IMediator mediator)
-    {
-        _mediator = mediator;
-    }
-
-    //TODO: update to use signature query
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="envelopeKey"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpGet("{envelopeKey}")]
-    public async Task<IActionResult> Get(string envelopeKey, CancellationToken cancel)
-    {
-        int envelopeId = User.EnvelopeId();
-
-        int receiverId = User.ReceiverId();
-
-        var doc = await _mediator.Send(new ReadDocumentQuery() { EnvelopeId = envelopeId }, cancel);
-
-        if (doc.Elements is not IEnumerable<DocReceiverElementDto> docSignatures)
-            return NotFound("Document is empty.");
-
-        var rcvSignatures = docSignatures.Where(s => s.ReceiverId == receiverId).ToList();
-
-        if (rcvSignatures is null)
-            return NotFound("No signatures found for the current receiver.");
-        else
-            return Ok(rcvSignatures);
-    }
-}

EnvelopeGenerator.API/Controllers/DocumentController.cs

@@ -1,84 +0,0 @@
-using DigitalData.Auth.Claims;
-using EnvelopeGenerator.API.Controllers.Interfaces;
-using EnvelopeGenerator.API.Extensions;
-using EnvelopeGenerator.Application.Documents.Queries;
-using EnvelopeGenerator.Domain.Constants;
-using MediatR;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Provides access to envelope documents for authenticated receivers.
-/// </summary>
-/// <remarks>
-/// Initializes a new instance of the <see cref="DocumentController"/> class.
-/// </remarks>
-[ApiController]
-[Route("api/[controller]")]
-public class DocumentController(IMediator mediator, IAuthorizationService authService, ILogger<DocumentController> logger) : ControllerBase, IAuthController
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public IAuthorizationService AuthService => authService;
-
-    /// <summary>
-    /// Returns the document bytes receiver.
-    /// </summary>
-    /// <param name="query">Encoded envelope key.</param>
-    /// <param name="cancel">Cancellation token.</param>
-    [HttpGet]
-    [Authorize(Policy = AuthPolicy.SenderOrReceiver)]
-    public async Task<IActionResult> GetDocument(CancellationToken cancel, [FromQuery] ReadDocumentQuery? query = null)
-    {
-        // Sender: expects query with envelope key
-        if (await this.IsUserInPolicyAsync(AuthPolicy.Sender))
-        {
-            if (query is null)
-                return BadRequest("Missing document query.");
-
-            var senderDoc = await mediator.Send(query, cancel);
-            return senderDoc.ByteData is byte[] senderDocByte
-                ? File(senderDocByte, "application/octet-stream")
-                : NotFound("Document is empty.");
-        }
-
-        // Receiver: resolve envelope id from claims
-        if (await this.IsUserInPolicyAsync(AuthPolicy.Receiver))
-        {           
-            if (query is not null)
-                return BadRequest("Query parameters are not allowed for receiver role.");
-
-            var envelopeId = User.EnvelopeId();
-            var receiverDoc = await mediator.Send(new ReadDocumentQuery { EnvelopeId = envelopeId }, cancel);
-            return receiverDoc.ByteData is byte[] receiverDocByte
-                ? File(receiverDocByte, "application/octet-stream")
-                : NotFound("Document is empty.");
-        }
-
-        return Unauthorized();
-    }
-
-    /// <summary>
-    /// Gets the document for the specified envelope key.
-    /// </summary>
-    /// <param name="envelopeKey"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpGet("{envelopeKey}")]
-    public async Task<IActionResult> GetDocumentOfReceiver(string envelopeKey, CancellationToken cancel)
-    {
-        int envelopeId = User.EnvelopeId();
-
-        var senderDoc = await mediator.Send(new ReadDocumentQuery() { EnvelopeId = envelopeId }, cancel);
-
-        if (senderDoc.ByteData is not byte[] senderDocByte)
-            return NotFound("Document is empty.");
-
-        Response.Headers.ContentDisposition = $"inline; filename=\"{envelopeKey}.pdf\"";
-        return File(senderDocByte, "application/pdf");
-    }
-}

EnvelopeGenerator.API/Controllers/EmailTemplateController.cs

@@ -1,69 +0,0 @@
-using AutoMapper;
-using EnvelopeGenerator.Application.EmailTemplates.Commands;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using MediatR;
-using EnvelopeGenerator.Application.Common.Dto;
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Application.EmailTemplates.Queries;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Controller for managing temp templates.
-/// Steuerung zur Verwaltung von E-Mail-Vorlagen.
-/// </summary>
-/// <remarks>
-/// Initialisiert eine neue Instanz der <see cref="EmailTemplateController"/>-Klasse.
-/// </remarks>
-/// <param name="mediator">
-/// Die Mediator-Instanz, die zum Senden von Befehlen und Abfragen verwendet wird.
-/// </param>
-[Route("api/[controller]")]
-[ApiController]
-[Authorize(Policy = AuthPolicy.Sender)]
-public class EmailTemplateController(IMediator mediator) : ControllerBase
-{
-    /// <summary>
-    /// Ruft E-Mail-Vorlagen basierend auf der angegebenen Abfrage ab.
-    /// Gibt alles zurück, wenn keine Id- oder Typ-Informationen eingegeben wurden.
-    /// </summary>
-    /// <param name="emailTemplate">Die Abfrageparameter zum Abrufen von E-Mail-Vorlagen.</param>
-    /// <param name="cancel"></param>
-    /// <returns>Gibt HTTP-Antwort zurück</returns>
-    /// <remarks>
-    /// Sample request:
-    /// GET /api/EmailTemplate?emailTemplateId=123
-    /// </remarks>
-    /// <response code="200">Wenn die E-Mail-Vorlagen erfolgreich abgerufen werden.</response>
-    /// <response code="400">Wenn die Abfrageparameter ungültig sind.</response>
-    /// <response code="401">Wenn der Benutzer nicht authentifiziert ist.</response>
-    /// <response code="404">Wenn die gesuchte Abfrage nicht gefunden wird.</response>
-    [HttpGet]
-    public async Task<IActionResult> Get([FromQuery] ReadEmailTemplateQuery emailTemplate, CancellationToken cancel)
-    {
-        var result = await mediator.Send(emailTemplate, cancel);
-        return Ok(result);
-    }
-
-    /// <summary>
-    /// Updates an temp template or resets it if no update command is provided.
-    /// Aktualisiert eine E-Mail-Vorlage oder setzt sie zurück, wenn kein Aktualisierungsbefehl angegeben ist.
-    /// </summary>
-    /// <param name="update"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    /// <response code="200">Wenn die E-Mail-Vorlage erfolgreich aktualisiert oder zurückgesetzt wird.</response>
-    /// <response code="400">Wenn die Abfrage ohne einen String gesendet wird.</response>
-    /// <response code="401">Wenn der Benutzer nicht authentifiziert ist.</response>
-    /// <response code="404">Wenn die gesuchte Abfrage nicht gefunden wird.</response>
-    [HttpPut]
-    public async Task<IActionResult> Update([FromBody] UpdateEmailTemplateCommand update, CancellationToken cancel)
-    {
-        await mediator.Send(update, cancel);
-        return Ok();
-    }
-}

EnvelopeGenerator.API/Controllers/EnvelopeController.cs

@@ -1,111 +0,0 @@
-using EnvelopeGenerator.API.Extensions;
-using EnvelopeGenerator.Application.Envelopes.Commands;
-using EnvelopeGenerator.Application.Envelopes.Queries;
-using MediatR;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Dieser Controller stellt Endpunkte für die Verwaltung von Umschlägen bereit.
-/// </summary>
-/// <remarks>
-/// Die API ermöglicht das Abrufen und Verwalten von Umschlägen basierend auf Benutzerinformationen und Statusfiltern.
-/// 
-/// Mögliche Antworten:
-/// - 200 OK: Die Anfrage war erfolgreich, und die angeforderten Daten werden zurückgegeben.
-/// - 400 Bad Request: Die Anfrage war fehlerhaft oder unvollständig.
-/// - 401 Unauthorized: Der Benutzer ist nicht authentifiziert.
-/// - 403 Forbidden: Der Benutzer hat keine Berechtigung, auf die Ressource zuzugreifen.
-/// - 404 Not Found: Die angeforderte Ressource wurde nicht gefunden.
-/// - 500 Internal Server Error: Ein unerwarteter Fehler ist aufgetreten.
-/// </remarks>
-[Route("api/[controller]")]
-[ApiController]
-[Authorize]
-public class EnvelopeController : ControllerBase
-{
-    private readonly ILogger<EnvelopeController> _logger;
-    private readonly IMediator _mediator;
-
-    /// <summary>
-    /// Erstellt eine neue Instanz des EnvelopeControllers.
-    /// </summary>
-    /// <param name="logger">Der Logger, der für das Protokollieren von Informationen verwendet wird.</param>
-    /// <param name="mediator"></param>
-    public EnvelopeController(ILogger<EnvelopeController> logger, IMediator mediator)
-    {
-        _logger = logger;
-        _mediator = mediator;
-    }
-
-    /// <summary>
-    /// Ruft eine Liste von Umschlägen basierend auf dem Benutzer und den angegebenen Statusfiltern ab.
-    /// </summary>
-    /// <param name="envelope"></param>
-    /// <returns>Eine IActionResult-Instanz, die die abgerufenen Umschläge oder einen Fehlerstatus enthält.</returns>
-    /// <response code="200">Die Anfrage war erfolgreich, und die Umschläge werden zurückgegeben.</response>
-    /// <response code="400">Die Anfrage war fehlerhaft oder unvollständig.</response>
-    /// <response code="401">Der Benutzer ist nicht authentifiziert.</response>
-    /// <response code="403">Der Benutzer hat keine Berechtigung, auf die Ressource zuzugreifen.</response>
-    /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
-    [Authorize(AuthenticationSchemes = AuthScheme.Sender)]
-    [HttpGet]
-    public async Task<IActionResult> GetAsync([FromQuery] ReadEnvelopeQuery envelope)
-    {
-        var result = await _mediator.Send(envelope.Authorize(User.GetId()));
-        return result.Any() ? Ok(result) : NotFound();
-    }
-
-    /// <summary>
-    /// Ruft das Ergebnis eines Dokuments basierend auf der ID ab.
-    /// </summary>
-    /// <param name="query"></param>
-    /// <param name="view">Gibt an, ob das Dokument inline angezeigt werden soll (true) oder als Download bereitgestellt wird (false).</param>
-    /// <returns>Eine IActionResult-Instanz, die das Dokument oder einen Fehlerstatus enthält.</returns>
-    /// <response code="200">Das Dokument wurde erfolgreich abgerufen.</response>
-    /// <response code="404">Das Dokument wurde nicht gefunden oder ist nicht verfügbar.</response>
-    /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
-    [HttpGet("doc-result")]
-    public async Task<IActionResult> GetDocResultAsync([FromQuery] ReadEnvelopeQuery query, [FromQuery] bool view = false)
-    {
-        var envelopes = await _mediator.Send(query.Authorize(User.GetId()));
-        var envelope = envelopes.FirstOrDefault();
-
-        if (envelope is null)
-            return NotFound("Envelope not available.");
-        if (envelope.DocResult is null)
-            return NotFound("The document has not been fully signed or the result has not yet been released.");
-
-        if (view)
-        {
-            Response.Headers.Append("Content-Disposition", "inline; filename=\"" + envelope.Uuid + ".pdf\"");
-            return File(envelope.DocResult, "application/pdf");
-        }
-
-        return File(envelope.DocResult, "application/pdf", $"{envelope.Uuid}.pdf");
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    [NonAction]
-    [Authorize]
-    [HttpPost]
-    public async Task<IActionResult> CreateAsync([FromBody] CreateEnvelopeCommand command)
-    {
-        var res = await _mediator.Send(command.WithAuth(User.GetId()));
-
-        if (res is null)
-        {
-            _logger.LogError("Failed to create envelope. Envelope details: {EnvelopeDetails}", JsonConvert.SerializeObject(command));
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
-        else
-            return Ok(res);
-    }
-}

EnvelopeGenerator.API/Controllers/EnvelopeReceiverController.cs

@@ -1,281 +0,0 @@
-using AutoMapper;
-using EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
-using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
-using EnvelopeGenerator.Application.Envelopes.Queries;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.API.Models;
-using MediatR;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Data.SqlClient;
-using Microsoft.Extensions.Options;
-using System.Data;
-using EnvelopeGenerator.Application.Common.SQL;
-using EnvelopeGenerator.Application.Common.Dto.Receiver;
-using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
-using EnvelopeGenerator.API.Extensions;
-using EnvelopeGenerator.Domain.Constants;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Controller für die Verwaltung von Umschlagempfängern.
-/// </summary>
-/// <remarks>
-/// Dieser Controller bietet Endpunkte für das Abrufen und Verwalten von Umschlagempfängerdaten.
-/// </remarks>
-[Route("api/[controller]")]
-[Authorize]
-[ApiController]
-public class EnvelopeReceiverController : ControllerBase
-{
-    private readonly ILogger<EnvelopeReceiverController> _logger;
-    private readonly IMediator _mediator;
-    private readonly IMapper _mapper;
-    private readonly IEnvelopeExecutor _envelopeExecutor;
-    private readonly IEnvelopeReceiverExecutor _erExecutor;
-    private readonly IDocumentExecutor _documentExecutor;
-    private readonly string _cnnStr;
-
-    /// <summary>
-    /// Konstruktor für den EnvelopeReceiverController.
-    /// </summary>
-    public EnvelopeReceiverController(ILogger<EnvelopeReceiverController> logger, IMediator mediator, IMapper mapper, IEnvelopeExecutor envelopeExecutor, IEnvelopeReceiverExecutor erExecutor, IDocumentExecutor documentExecutor, IOptions<ConnectionString> csOpt)
-    {
-        _logger = logger;
-        _mediator = mediator;
-        _mapper = mapper;
-        _envelopeExecutor = envelopeExecutor;
-        _erExecutor = erExecutor;
-        _documentExecutor = documentExecutor;
-        _cnnStr = csOpt.Value.Value;
-    }
-
-    /// <summary>
-    /// Ruft eine Liste von Umschlagempfängern basierend auf den angegebenen Abfrageparametern ab.
-    /// </summary>
-    /// <param name="envelopeReceiver">Die Abfrageparameter für die Filterung von Umschlagempfängern.</param>
-    /// <returns>Eine HTTP-Antwort mit der Liste der gefundenen Umschlagempfänger oder einem Fehlerstatus.</returns>
-    /// <remarks>
-    /// Dieser Endpunkt ermöglicht es, Umschlagempfänger basierend auf dem Benutzernamen und optionalen Statusfiltern abzurufen.
-    /// Wenn der Benutzername nicht ermittelt werden kann, wird ein Serverfehler zurückgegeben.
-    /// </remarks>
-    /// <response code="200">Die Liste der Umschlagempfänger wurde erfolgreich abgerufen.</response>
-    /// <response code="401">Wenn kein autorisierter Token vorhanden ist</response>
-    /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
-    [Authorize]
-    [HttpGet]
-    public async Task<IActionResult> GetEnvelopeReceiver([FromQuery] ReadEnvelopeReceiverQuery envelopeReceiver)
-    {
-        envelopeReceiver = envelopeReceiver with { Username = User.GetUsername() };
-
-        var result = await _mediator.Send(envelopeReceiver);
-
-        return Ok(result);
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="envelopeKey"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpGet("{envelopeKey}")]
-    public async Task<IActionResult> GetEnvelopeReceiverOfReceiver([FromRoute] string envelopeKey, CancellationToken cancel)
-    {
-        var er = await _mediator.Send(new ReadEnvelopeReceiverQuery()
-        {
-            Key = envelopeKey
-        }, cancel);
-
-        return Ok(er.SingleOrDefault());
-    }
-
-    /// <summary>
-    /// Ruft den Namen des zuletzt verwendeten Empfängers basierend auf der angegebenen E-Mail-Adresse ab.
-    /// </summary>
-    /// <param name="receiver">Abfrage, bei der nur eine der Angaben ID, Signatur oder E-Mail-Adresse des Empfängers eingegeben werden muss.</param>
-    /// <returns>Eine HTTP-Antwort mit dem Namen des Empfängers oder einem Fehlerstatus.</returns>
-    /// <remarks>
-    /// Dieser Endpunkt ermöglicht es, den Namen des zuletzt verwendeten Empfängers basierend auf der E-Mail-Adresse abzurufen.
-    /// </remarks>
-    /// <response code="200">Der Name des Empfängers wurde erfolgreich abgerufen.</response>
-    /// <response code="401">Wenn kein autorisierter Token vorhanden ist</response>
-    /// <response code="404">Kein Empfänger gefunden.</response>
-    /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
-    [Authorize]
-    [HttpGet("salute")]
-    public async Task<IActionResult> GetReceiverName([FromQuery] ReadReceiverNameQuery receiver)
-    {
-        var name = await _mediator.Send(receiver);
-        return name is null ? NotFound() : Ok(name);
-    }
-
-    /// <summary>
-    /// Datenübertragungsobjekt mit Informationen zu Umschlägen, Empfängern und Unterschriften.
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancel"></param>
-    /// <returns>HTTP-Antwort</returns>
-    /// <remarks>
-    /// Sample request:
-    ///
-    ///     POST /api/envelope
-    ///     {
-    ///        "title": "Vertragsdokument",
-    ///        "message": "Bitte unterschreiben Sie dieses Dokument.",
-    ///        "document": {
-    ///            "dataAsBase64": "dGVzdC1iYXNlNjQtZGF0YQ=="  
-    ///        },
-    ///        "receivers": [
-    ///            {
-    ///                "emailAddress": "example@example.com",
-    ///                "signatures": [
-    ///                    {
-    ///                        "x": 100,
-    ///                        "y": 200,
-    ///                        "page": 1
-    ///                    }
-    ///                ],
-    ///                "name": "Max Mustermann",
-    ///                "phoneNumber": "+49123456789"
-    ///            }
-    ///        ],
-    ///        "tfaEnabled": false
-    ///     }
-    ///
-    /// </remarks>
-    /// <response code="202">Envelope-Erstellung und Sendeprozessbefehl erfolgreich</response>
-    /// <response code="400">Wenn ein Fehler im HTTP-Body auftritt</response>
-    /// <response code="401">Wenn kein autorisierter Token vorhanden ist</response>
-    /// <response code="500">Es handelt sich um einen unerwarteten Fehler. Die Protokolle sollten überprüft werden.</response>
-    [Authorize]
-    [HttpPost]
-    public async Task<IActionResult> CreateAsync([FromBody] CreateEnvelopeReceiverCommand request, CancellationToken cancel)
-    {
-        #region Create Envelope
-        var envelope = await _envelopeExecutor.CreateEnvelopeAsync(User.GetId(), request.Title, request.Message, request.TFAEnabled, cancel);
-        #endregion
-
-        #region Add receivers
-        List<EnvelopeReceiver> sentReceivers = new();
-        List<ReceiverGetOrCreateCommand> unsentReceivers = new();
-
-        foreach (var receiver in request.Receivers)
-        {
-            var envelopeReceiver = await _erExecutor.AddEnvelopeReceiverAsync(envelope.Uuid, receiver.EmailAddress, receiver.Salution, receiver.PhoneNumber, cancel);
-
-            if (envelopeReceiver is null)
-                unsentReceivers.Add(receiver);
-            else
-                sentReceivers.Add(envelopeReceiver);
-        }
-
-        var res = _mapper.Map<CreateEnvelopeReceiverResponse>(envelope);
-        res.UnsentReceivers = unsentReceivers;
-        res.SentReceiver = _mapper.Map<List<ReceiverDto>>(sentReceivers.Select(er => er.Receiver));
-        #endregion
-
-        #region Add document
-        var document = await _documentExecutor.CreateDocumentAsync(request.Document.DataAsBase64, envelope.Uuid, cancel);
-
-        if (document is null)
-            return StatusCode(StatusCodes.Status500InternalServerError, "Document creation is failed.");
-        #endregion
-
-        #region Add document element
-        // @DOC_ID, @RECEIVER_ID, @POSITION_X, @POSITION_Y, @PAGE
-        string sql = @"
-                DECLARE @OUT_SUCCESS bit;
-
-                EXEC [dbo].[PRSIG_API_ADD_DOC_RECEIVER_ELEM]
-                    {0},
-                    {1},
-                    {2},
-                    {3},
-                    {4},
-                    @OUT_SUCCESS OUTPUT;
-
-                SELECT @OUT_SUCCESS as [@OUT_SUCCESS];";
-
-        foreach (var rcv in res.SentReceiver)
-            foreach (var sign in request.Receivers.Where(r => r.EmailAddress == rcv.EmailAddress).FirstOrDefault()?.DocReceiverElements ?? Enumerable.Empty<Application.EnvelopeReceivers.Commands.DocReceiverElementCreateDto>())
-            {
-                using SqlConnection conn = new(_cnnStr);
-                conn.Open();
-
-                var formattedSQL = string.Format(sql, document.Id.ToSqlParam(), rcv.Id.ToSqlParam(), sign.X.ToSqlParam(), sign.Y.ToSqlParam(), sign.Page.ToSqlParam());
-
-                using SqlCommand cmd = new(formattedSQL, conn);
-                cmd.CommandType = CommandType.Text;
-
-                using SqlDataReader reader = cmd.ExecuteReader();
-                if (reader.Read())
-                {
-                    bool outSuccess = reader.GetBoolean(0);
-                    if (!outSuccess)
-                        _logger.LogWarning(
-                            "PRSIG_API_ADD_DOC_RECEIVER_ELEM returned OUT_SUCCESS=false. DOC_ID={DocId}, RECEIVER_ID={ReceiverId}, Page={Page}",
-                            document.Id, rcv.Id, sign.Page);
-                }
-            }
-        #endregion
-
-        #region Create history
-        // ENV_UID, STATUS_ID, USER_ID,
-        string sql_hist = @"
-                DECLARE @OUT_SUCCESS bit;
-
-                EXEC [dbo].[PRSIG_API_ADD_HISTORY_STATE]
-                    {0},
-                    {1},
-                    {2},
-                    @OUT_SUCCESS OUTPUT;
-
-                SELECT @OUT_SUCCESS as [@OUT_SUCCESS];";
-
-        using (SqlConnection conn = new(_cnnStr))
-        {
-            conn.Open();
-            var formattedSQL_hist = string.Format(sql_hist, envelope.Uuid.ToSqlParam(), 1003.ToSqlParam(), User.GetId().ToSqlParam());
-            using SqlCommand cmd = new(formattedSQL_hist, conn);
-            cmd.CommandType = CommandType.Text;
-
-            using SqlDataReader reader = cmd.ExecuteReader();
-            if (reader.Read())
-            {
-                bool outSuccess = reader.GetBoolean(0);
-                if (!outSuccess)
-                    _logger.LogWarning(
-                        "PRSIG_API_ADD_HISTORY_STATE returned OUT_SUCCESS=false. EnvelopeUuid={EnvelopeUuid}",
-                        envelope.Uuid);
-            }
-        }
-        #endregion
-
-        return Ok(res);
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    public static bool IsBase64String(string input)
-    {
-        if (string.IsNullOrWhiteSpace(input))
-            return false;
-
-        try
-        {
-            Convert.FromBase64String(input);
-            return true;
-        }
-        catch (FormatException)
-        {
-            return false;
-        }
-    }
-
-}

EnvelopeGenerator.API/Controllers/EnvelopeTypeController.cs

@@ -1,39 +0,0 @@
-using MediatR;
-using EnvelopeGenerator.Application.EnvelopeTypes.Queries;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.GeneratorAPI.Controllers;
-
-/// <summary>
-/// 
-/// </summary>
-[ApiExplorerSettings(IgnoreApi = true)]
-[Route("api/[controller]")]
-[ApiController]
-public class EnvelopeTypeController : ControllerBase
-{
-    private readonly ILogger<EnvelopeTypeController> _logger;
-    private readonly IMediator _mediator;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="logger"></param>
-    /// <param name="mediator"></param>
-    public EnvelopeTypeController(ILogger<EnvelopeTypeController> logger, IMediator mediator)
-    {
-        _logger = logger;
-        _mediator = mediator;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet]
-    public async Task<IActionResult> GetAllAsync()
-    {
-        var result = await _mediator.Send(new ReadEnvelopeTypesQuery());
-        return Ok(result);
-    }
-}

EnvelopeGenerator.API/Controllers/HistoryController.cs

@@ -1,118 +0,0 @@
-using MediatR;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Memory;
-using EnvelopeGenerator.Application.Histories.Queries;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Application.Common.Extensions;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Dieser Controller stellt Endpunkte für den Zugriff auf die Umschlaghistorie bereit.
-/// </summary>
-[Route("api/[controller]")]
-[ApiController]
-[Authorize]
-public class HistoryController : ControllerBase
-{
-    private readonly IMemoryCache _memoryCache;
-
-    private readonly IMediator _mediator;
-
-    /// <summary>
-    /// Konstruktor für den HistoryController.
-    /// </summary>
-    /// <param name="memoryCache"></param>
-    /// <param name="mediator"></param>
-    public HistoryController(IMemoryCache memoryCache, IMediator mediator)
-    {
-        _memoryCache = memoryCache;
-        _mediator = mediator;
-    }
-
-    /// <summary>
-    /// Gibt alle möglichen Verweise auf alle möglichen Include in einem Verlaufsdatensatz zurück. (z. B. DocumentSigned bezieht sich auf Receiver.)
-    /// Dies wird hinzugefügt, damit Client-Anwendungen sich selbst auf dem neuesten Stand halten können.
-    /// 1 - Sender:
-    /// Historische Datensätze über den Include der Empfänger. Diese haben Statuscodes, die mit 1* beginnen.
-    /// 2 - Receiver:
-    /// Historische Datensätze, die sich auf den Include des Absenders beziehen. Sie haben Statuscodes, die mit 2* beginnen.
-    /// 3 - System:
-    /// Historische Datensätze, die sich auf den allgemeinen Zustand des Umschlags beziehen. Diese haben Statuscodes, die mit 3* beginnen.
-    /// 4 - Unknown: 
-    /// Ein unbekannter Datensatz weist auf einen möglichen Mangel oder eine Unstimmigkeit im Aktualisierungsprozess der Anwendung hin.
-    /// </summary>
-    /// <returns></returns>
-    /// <response code="200"></response>
-    [HttpGet("related")]
-    [Authorize]
-    public IActionResult GetReferenceTypes(ReferenceType? referenceType = null)
-    {
-        return referenceType is null 
-            ? Ok(_memoryCache.GetEnumAsDictionary<ReferenceType>("gen.api", ReferenceType.Unknown))
-            : Ok(referenceType.ToString());
-    }
-
-    /// <summary>
-    /// Gibt alle möglichen Include in einem Verlaufsdatensatz zurück.
-    /// Dies wird hinzugefügt, damit Client-Anwendungen sich selbst auf dem neuesten Stand halten können.
-    /// 1003: EnvelopeQueued
-    /// 1006: EnvelopeCompletelySigned
-    /// 1007: EnvelopeReportCreated
-    /// 1008: EnvelopeArchived
-    /// 1009: EnvelopeDeleted
-    /// 10007: EnvelopeRejected
-    /// 10009: EnvelopeWithdrawn
-    /// 2001: AccessCodeRequested
-    /// 2002: AccessCodeCorrect
-    /// 2003: AccessCodeIncorrect
-    /// 2004: DocumentOpened
-    /// 2005: DocumentSigned
-    /// 2006: DocumentForwarded
-    /// 2007: DocumentRejected
-    /// 2008: EnvelopeShared
-    /// 2009: EnvelopeViewed
-    /// 3001: MessageInvitationSent (Wird von Trigger verwendet)
-    /// 3002: MessageAccessCodeSent
-    /// 3003: MessageConfirmationSent
-    /// 3004: MessageDeletionSent
-    /// 3005: MessageCompletionSent
-    /// </summary>
-    /// <param name="status">
-    /// Abfrageparameter, der angibt, auf welche Referenz sich der Include bezieht.
-    /// 1 - Sender: Historische Datensätze, die sich auf den Include des Absenders beziehen. Sie haben Statuscodes, die mit 1* beginnen.
-    /// 2 - Receiver: Historische Datensätze über den Include der Empfänger. Diese haben Statuscodes, die mit 2* beginnen.
-    /// 3 - System: Diese werden durch Datenbank-Trigger aktualisiert und sind in den Tabellen EnvelopeHistory und EmailOut zu finden.Sie arbeiten 
-    /// integriert mit der Anwendung EmailProfiler, um E-Mails zu versenden und haben die Codes, die mit 3* beginnen.
-    /// </param>
-    /// <returns>Gibt die HTTP-Antwort zurück.</returns>
-    /// <response code="200"></response>
-    [HttpGet("status")]
-    [Authorize]
-    public IActionResult GetEnvelopeStatus([FromQuery] EnvelopeStatus? status = null)
-    {
-        return status is null
-            ? Ok(_memoryCache.GetEnumAsDictionary<EnvelopeStatus>("gen.api", Status.NonHist, Status.RelatedToFormApp))
-            : Ok(status.ToString());
-    }
-
-    /// <summary>
-    /// Ruft die gesamte Umschlaghistorie basierend auf den angegebenen Abfrageparametern ab.
-    /// </summary>
-    /// <param name="historyQuery">Die Abfrageparameter, die die Filterkriterien für die Umschlaghistorie definieren.</param>
-    /// <param name="cancel"></param>
-    /// <returns>Eine Liste von Historieneinträgen, die den angegebenen Kriterien entsprechen, oder nur der letzte Eintrag.</returns>
-    /// <response code="200">Die Anfrage war erfolgreich, und die Umschlaghistorie wird zurückgegeben.</response>
-    /// <response code="400">Die Anfrage war ungültig oder unvollständig.</response>
-    /// <response code="401">Der Benutzer ist nicht authentifiziert.</response>
-    /// <response code="403">Der Benutzer hat keine Berechtigung, auf die Ressource zuzugreifen.</response>
-    /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
-    [HttpGet]
-    [Authorize]
-    public async Task<IActionResult> GetAllAsync([FromQuery] ReadHistoryQuery historyQuery, CancellationToken cancel)
-    {
-        var history = await _mediator.Send(historyQuery, cancel).ThrowIfEmpty(Exceptions.NotFound);
-        return Ok((historyQuery.OnlyLast) ? history.MaxBy(h => h.AddedWhen) : history);
-    }
-}

EnvelopeGenerator.API/Controllers/Interfaces/IAuthController.cs

@@ -1,38 +0,0 @@
-using System.Security.Claims;
-using Microsoft.AspNetCore.Authorization;
-
-namespace EnvelopeGenerator.API.Controllers.Interfaces;
-
-/// <summary>
-/// 
-/// </summary>
-public interface IAuthController
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    IAuthorizationService AuthService { get; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    ClaimsPrincipal User { get; }
-}
-
-/// <summary>
-/// 
-/// </summary>
-public static class AuthControllerExtensions
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="controller"></param>
-    /// <param name="policyName"></param>
-    /// <returns></returns>
-    public static async Task<bool> IsUserInPolicyAsync(this IAuthController controller, string policyName)
-    {
-        var result = await controller.AuthService.AuthorizeAsync(controller.User, policyName);
-        return result.Succeeded;
-    }
-}

EnvelopeGenerator.API/Controllers/LocalizationController.cs

@@ -1,121 +0,0 @@
-using DigitalData.Core.API;
-using EnvelopeGenerator.Application.Resources;
-using Microsoft.AspNetCore.Localization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Localization;
-using EnvelopeGenerator.Application.Resources;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Controller für die Verwaltung der Lokalisierung und Spracheinstellungen.
-/// </summary>
-[ApiExplorerSettings(IgnoreApi = true)]
-[Route("api/[controller]")]
-[ApiController]
-public class LocalizationController : ControllerBase
-{
-    private static readonly Guid L_KEY = Guid.NewGuid();
-
-    private readonly ILogger<LocalizationController> _logger;
-    private readonly IStringLocalizer<Resource> _mLocalizer;
-    private readonly IStringLocalizer<Resource> _localizer;
-    private readonly IMemoryCache _cache;
-
-    /// <summary>
-    /// Konstruktor für den <see cref="LocalizationController"/>.
-    /// </summary>
-    /// <param name="logger">Logger für die Protokollierung.</param>
-    /// <param name="localizer">Lokalisierungsdienst für Ressourcen.</param>
-    /// <param name="memoryCache">Speicher-Cache für die Zwischenspeicherung von Daten.</param>
-    /// <param name="_modelLocalizer">Lokalisierungsdienst für Modelle.</param>
-    public LocalizationController(
-        ILogger<LocalizationController> logger,
-        IStringLocalizer<Resource> localizer,
-        IMemoryCache memoryCache,
-        IStringLocalizer<Resource> _modelLocalizer)
-    {
-        _logger = logger;
-        _localizer = localizer;
-        _cache = memoryCache;
-        _mLocalizer = _modelLocalizer;
-    }
-
-    /// <summary>
-    /// Ruft alle lokalisierten Daten ab.
-    /// </summary>
-    /// <returns>Eine Liste aller lokalisierten Daten.</returns>
-    [HttpGet]
-    public IActionResult GetAll() => Ok(_cache.GetOrCreate(Language ?? string.Empty + L_KEY, _ => _mLocalizer.ToDictionary()));
-
-    /// <summary>
-    /// Ruft die aktuelle Sprache ab.
-    /// </summary>
-    /// <returns>Die aktuelle Sprache oder ein NotFound-Ergebnis, wenn keine Sprache gesetzt ist.</returns>
-    [HttpGet("lang")]
-    public IActionResult GetLanguage() => Language is null ? NotFound() : Ok(Language);
-
-    /// <summary>
-    /// Setzt die Sprache.
-    /// </summary>
-    /// <param name="language">Die zu setzende Sprache.</param>
-    /// <returns>Ein Ok-Ergebnis, wenn die Sprache erfolgreich gesetzt wurde, oder ein BadRequest-Ergebnis, wenn die Eingabe ungültig ist.</returns>
-    [HttpPost("lang")]
-    public IActionResult SetLanguage([FromQuery] string language)
-    {
-        if (string.IsNullOrEmpty(language))
-            return BadRequest();
-
-        Language = language;
-        return Ok();
-    }
-
-    /// <summary>
-    /// Löscht die aktuelle Sprache.
-    /// </summary>
-    /// <returns>Ein Ok-Ergebnis, wenn die Sprache erfolgreich gelöscht wurde.</returns>
-    [HttpDelete("lang")]
-    public IActionResult DeleteLanguage()
-    {
-        Language = null;
-        return Ok();
-    }
-
-    /// <summary>
-    /// Eigenschaft für die Verwaltung der aktuellen Sprache über Cookies.
-    /// </summary>
-    private string? Language
-    {
-        get
-        {
-            var cookieValue = Request.Cookies[CookieRequestCultureProvider.DefaultCookieName];
-
-            if (string.IsNullOrEmpty(cookieValue))
-                return null;
-
-            var culture = CookieRequestCultureProvider.ParseCookieValue(cookieValue)?.Cultures[0];
-            return culture?.Value ?? null;
-        }
-        set
-        {
-            if (value is null)
-                Response.Cookies.Delete(CookieRequestCultureProvider.DefaultCookieName);
-            else
-            {
-                var cookieOptions = new CookieOptions()
-                {
-                    Expires = DateTimeOffset.UtcNow.AddYears(1),
-                    Secure = false,
-                    SameSite = SameSiteMode.Strict,
-                    HttpOnly = true
-                };
-
-                Response.Cookies.Append(
-                    CookieRequestCultureProvider.DefaultCookieName,
-                    CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(value)),
-                    cookieOptions);
-            }
-        }
-    }
-}

EnvelopeGenerator.API/Controllers/ReadOnlyController.cs

@@ -1,91 +0,0 @@
-using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.API.Extensions;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Manages read-only envelope sharing flows.
-/// </summary>
-[Route("api/[controller]")]
-[ApiController]
-public class ReadOnlyController : ControllerBase
-{
-    private readonly ILogger<ReadOnlyController> _logger;
-    private readonly IEnvelopeReceiverReadOnlyService _readOnlyService;
-    private readonly IEnvelopeMailService _mailService;
-    private readonly IEnvelopeHistoryService _historyService;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ReadOnlyController"/> class.
-    /// </summary>
-    public ReadOnlyController(ILogger<ReadOnlyController> logger, IEnvelopeReceiverReadOnlyService readOnlyService, IEnvelopeMailService mailService, IEnvelopeHistoryService historyService)
-    {
-        _logger = logger;
-        _readOnlyService = readOnlyService;
-        _mailService = mailService;
-        _historyService = historyService;
-    }
-
-    /// <summary>
-    /// Creates a new read-only receiver for the current envelope.
-    /// </summary>
-    /// <param name="createDto">Creation payload.</param>
-    [HttpPost]
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [Obsolete("Use MediatR")]
-    public async Task<IActionResult> CreateAsync([FromBody] EnvelopeReceiverReadOnlyCreateDto createDto)
-    {
-        var authReceiverMail = User.ReceiverMail();
-        if (authReceiverMail is null)
-        {
-            _logger.LogError("EmailAddress claim is not found in envelope-receiver-read-only creation process. Create DTO is:\n {dto}", JsonConvert.SerializeObject(createDto));
-            return Unauthorized();
-        }
-
-        var envelopeId = User.EnvelopeId();
-
-        createDto.AddedWho = authReceiverMail;
-        createDto.EnvelopeId = envelopeId;
-
-        var creationRes = await _readOnlyService.CreateAsync(createDto: createDto);
-
-        if (creationRes.IsFailed)
-        {
-            _logger.LogNotice(creationRes);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
-
-        var readRes = await _readOnlyService.ReadByIdAsync(creationRes.Data.Id);
-        if (readRes.IsFailed)
-        {
-            _logger.LogNotice(creationRes);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
-
-        var newReadOnly = readRes.Data;
-
-        return await _mailService.SendAsync(newReadOnly).ThenAsync<int, IActionResult>(SuccessAsync: async _ =>
-        {
-            var histRes = await _historyService.RecordAsync((int)createDto.EnvelopeId, createDto.AddedWho, EnvelopeStatus.EnvelopeShared);
-            if (histRes.IsFailed)
-            {
-                _logger.LogError("Although the envelope was sent as read-only, the EnvelopeShared history could not be saved. Create DTO:\n{createDto}", JsonConvert.SerializeObject(createDto));
-                _logger.LogNotice(histRes.Notices);
-            }
-
-            return Ok();
-        },
-
-        Fail: (msg, ntc) =>
-        {
-            _logger.LogNotice(ntc);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        });
-    }
-}

EnvelopeGenerator.API/Controllers/ReceiverController.cs

@@ -1,47 +0,0 @@
-using MediatR;
-using EnvelopeGenerator.Application.Receivers.Queries;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.GeneratorAPI.Controllers;
-
-/// <summary>
-/// Controller für die Verwaltung von Empfängern.
-/// </summary>
-/// <remarks>
-/// Dieser Controller bietet Endpunkte für das Abrufen von Empfängern basierend auf E-Mail-Adresse oder Signatur.
-/// </remarks>
-[Route("api/[controller]")]
-[ApiController]
-[Authorize]
-public class ReceiverController : ControllerBase
-{
-    private readonly IMediator _mediator;
-
-    /// <summary>
-    /// Initialisiert eine neue Instanz des <see cref="ReceiverController"/>-Controllers.
-    /// </summary>
-    /// <param name="mediator">Mediator für Anfragen.</param>
-    public ReceiverController(IMediator mediator)
-    {
-        _mediator = mediator;
-    }
-
-    /// <summary>
-    /// Ruft eine Liste von Empfängern ab, basierend auf den angegebenen Abfrageparametern.
-    /// </summary>
-    /// <param name="receiver">Die Abfrageparameter, einschließlich E-Mail-Adresse und Signatur.</param>
-    /// <returns>Eine Liste von Empfängern oder ein Fehlerstatus.</returns>
-    [HttpGet]
-    public async Task<IActionResult> Get([FromQuery] ReadReceiverQuery receiver)
-    {
-        if (!receiver.HasAnyCriteria)
-        {
-            var all = await _mediator.Send(new ReadReceiverQuery());
-            return Ok(all);
-        }
-
-        var result = await _mediator.Send(receiver);
-        return result is null ? NotFound() : Ok(result);
-    }
-}

EnvelopeGenerator.API/Controllers/TfaRegistrationController.cs

@@ -1,129 +0,0 @@
-using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
-using EnvelopeGenerator.Application.Resources;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.API.Models;
-using Ganss.Xss;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Options;
-
-namespace EnvelopeGenerator.API.Controllers;
-
-/// <summary>
-/// Exposes endpoints for registering and managing two-factor authentication for envelope receivers.
-/// </summary>
-[ApiController]
-[Route("api/tfa")]
-public class TfaRegistrationController : ControllerBase
-{
-    private readonly ILogger<TfaRegistrationController> _logger;
-    private readonly IEnvelopeReceiverService _envelopeReceiverService;
-    private readonly IAuthenticator _authenticator;
-    private readonly IReceiverService _receiverService;
-    private readonly TFARegParams _parameters;
-    private readonly IStringLocalizer<Resource> _localizer;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="TfaRegistrationController"/> class.
-    /// </summary>
-    public TfaRegistrationController(
-        ILogger<TfaRegistrationController> logger,
-        IEnvelopeReceiverService envelopeReceiverService,
-        IAuthenticator authenticator,
-        IReceiverService receiverService,
-        IOptions<TFARegParams> tfaRegParamsOptions,
-        IStringLocalizer<Resource> localizer)
-    {
-        _logger = logger;
-        _envelopeReceiverService = envelopeReceiverService;
-        _authenticator = authenticator;
-        _receiverService = receiverService;
-        _parameters = tfaRegParamsOptions.Value;
-        _localizer = localizer;
-    }
-
-    /// <summary>
-    /// Generates registration metadata (QR code and deadline) for a receiver.
-    /// </summary>
-    /// <param name="envelopeReceiverId">Encoded envelope receiver id.</param>
-    [Authorize]
-    [HttpGet("{envelopeReceiverId}")]
-    public async Task<IActionResult> RegisterAsync(string envelopeReceiverId)
-    {
-        try
-        {
-            var (uuid, signature) = envelopeReceiverId.DecodeEnvelopeReceiverId();
-
-            if (uuid is null || signature is null)
-            {
-                _logger.LogEnvelopeError(uuid: uuid, signature: signature, message: _localizer.WrongEnvelopeReceiverId());
-                return Unauthorized(new { message = _localizer.WrongEnvelopeReceiverId() });
-            }
-
-            var secretResult = await _envelopeReceiverService.ReadWithSecretByUuidSignatureAsync(uuid: uuid, signature: signature);
-            if (secretResult.IsFailed)
-            {
-                _logger.LogNotice(secretResult.Notices);
-                return NotFound(new { message = _localizer.WrongEnvelopeReceiverId() });
-            }
-
-            var envelopeReceiver = secretResult.Data;
-
-            if (!envelopeReceiver.Envelope!.TFAEnabled)
-                return Unauthorized(new { message = _localizer.WrongAccessCode() });
-
-            var receiver = envelopeReceiver.Receiver;
-            receiver!.TotpSecretkey = _authenticator.GenerateTotpSecretKey();
-            await _receiverService.UpdateAsync(receiver);
-            var totpQr64 = _authenticator.GenerateTotpQrCode(userEmail: receiver.EmailAddress, secretKey: receiver.TotpSecretkey).ToBase64String();
-
-            if (receiver.TfaRegDeadline is null)
-            {
-                receiver.TfaRegDeadline = _parameters.Deadline;
-                await _receiverService.UpdateAsync(receiver);
-            }
-            else if (receiver.TfaRegDeadline <= DateTime.Now)
-            {
-                return StatusCode(StatusCodes.Status410Gone, new { message = _localizer.WrongAccessCode() });
-            }
-
-            return Ok(new
-            {
-                envelopeReceiver.EnvelopeId,
-                envelopeReceiver.Envelope!.Uuid,
-                envelopeReceiver.Receiver!.Signature,
-                receiver.TfaRegDeadline,
-                TotpQR64 = totpQr64
-            });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, exception: ex, message: _localizer.WrongEnvelopeReceiverId());
-            return StatusCode(StatusCodes.Status500InternalServerError, new { message = _localizer.UnexpectedError() });
-        }
-    }
-
-    /// <summary>
-    /// Logs out the envelope receiver from cookie authentication.
-    /// </summary>
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpPost("auth/logout")]
-    public async Task<IActionResult> LogOutAsync()
-    {
-        try
-        {
-            await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-            return Ok();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "{message}", ex.Message);
-            return StatusCode(StatusCodes.Status500InternalServerError, new { message = _localizer.UnexpectedError() });
-        }
-    }
-}

EnvelopeGenerator.API/Documentation/AuthProxyDocumentFilter.cs

@@ -1,123 +0,0 @@
-using EnvelopeGenerator.API.Models;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
-
-namespace EnvelopeGenerator.API.Documentation;
-
-/// <summary>
-/// 
-/// </summary>
-public sealed class AuthProxyDocumentFilter : IDocumentFilter
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="swaggerDoc"></param>
-    /// <param name="context"></param>
-    public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
-    {
-        AddLoginOperation(swaggerDoc, context);
-        AddEnvelopeReceiverLoginOperation(swaggerDoc, context);
-    }
-
-    private static void AddLoginOperation(OpenApiDocument swaggerDoc, DocumentFilterContext context)
-    {
-        const string path = "/api/auth";
-
-        var loginSchema = context.SchemaGenerator.GenerateSchema(typeof(Login), context.SchemaRepository);
-        var loginExample = new OpenApiObject
-        {
-            ["password"] = new OpenApiString(""),
-            ["username"] = new OpenApiString("")
-        };
-
-        var operation = new OpenApiOperation
-        {
-            Summary = "Proxy login (auth-hub)",
-            Description = "Proxies the request to the auth service. Add query parameter `cookie=true|false`.",
-            Tags = [new() { Name = "Auth" }],
-            Parameters =
-            {
-                new OpenApiParameter
-                {
-                    Name = "cookie",
-                    In = ParameterLocation.Query,
-                    Required = false,
-                    Schema = new OpenApiSchema { Type = "boolean", Default = new OpenApiBoolean(true) },
-                    Example = new OpenApiBoolean(true),
-                    Description = "If true, auth service sets the auth cookie."
-                }
-            },
-            RequestBody = new OpenApiRequestBody
-            {
-                Required = true,
-                Content =
-                {
-                    ["application/json"] = new OpenApiMediaType { Schema = loginSchema, Example = loginExample },
-                    ["multipart/form-data"] = new OpenApiMediaType { Schema = loginSchema, Example = loginExample }
-                }
-            },
-            Responses =
-            {
-                ["200"] = new OpenApiResponse { Description = "OK (proxied response)" },
-                ["401"] = new OpenApiResponse { Description = "Unauthorized" }
-            }
-        };
-
-        swaggerDoc.Paths[path] = new OpenApiPathItem
-        {
-            Operations =
-            {
-                [OperationType.Post] = operation
-            }
-        };
-    }
-
-    private static void AddEnvelopeReceiverLoginOperation(OpenApiDocument swaggerDoc, DocumentFilterContext context)
-    {
-        const string path = "/api/Auth/envelope-receiver/{key}";
-
-        var bodySchema = context.SchemaGenerator.GenerateSchema(typeof(EnvelopeReceiverLogin), context.SchemaRepository);
-
-        var operation = new OpenApiOperation
-        {
-            Summary = "Envelope receiver login (auth-hub proxy)",
-            Description = "Proxies the envelope receiver login to the auth service. " +
-                          "The `cookie` query parameter is always forwarded as `true` so the auth service sets the per-envelope cookie automatically.",
-            Tags = [new() { Name = "Auth" }],
-            Parameters =
-            {
-                new OpenApiParameter
-                {
-                    Name = "key",
-                    In = ParameterLocation.Path,
-                    Required = true,
-                    Schema = new OpenApiSchema { Type = "string" },
-                    Description = "The unique envelope receiver key."
-                }
-            },
-            RequestBody = new OpenApiRequestBody
-            {
-                Required = false,
-                Content =
-                {
-                    ["multipart/form-data"] = new OpenApiMediaType { Schema = bodySchema }
-                }
-            },
-            Responses =
-            {
-                ["200"] = new OpenApiResponse { Description = "OK – per-envelope cookie set by auth service." },
-                ["401"] = new OpenApiResponse { Description = "Unauthorized – invalid or missing access code." }
-            }
-        };
-
-        swaggerDoc.Paths[path] = new OpenApiPathItem
-        {
-            Operations =
-            {
-                [OperationType.Post] = operation
-            }
-        };
-    }
-}

EnvelopeGenerator.API/EnvelopeGenerator.API.csproj

@@ -1,84 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageId>EnvelopeGenerator.GeneratorAPI</PackageId>
-    <Title></Title>
-    <Authors>Digital Data GmbH</Authors>
-    <Company>Digital Data GmbH</Company>
-    <Product>EnvelopeGenerator.GeneratorAPI</Product>
-    <Version>1.4.0</Version>
-    <FileVersion>1.4.0</FileVersion>
-    <AssemblyVersion>1.4.0</AssemblyVersion>
-    <PackageOutputPath>Copyright © 2025 Digital Data GmbH. All rights reserved.</PackageOutputPath>
-	<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="ClientApp\**" />
-    <Content Remove="ClientApp\**" />
-    <EmbeddedResource Remove="ClientApp\**" />
-    <None Remove="ClientApp\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="yarp.json" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AspNetCore.Scalar" Version="1.1.8" />
-    <PackageReference Include="DigitalData.Auth.Claims" Version="1.0.3" />
-    <PackageReference Include="DigitalData.Auth.Client" Version="1.3.7" />
-    <PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
-    <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.28" />
-    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.11" Condition="'$(TargetFramework)' == 'net8.0'" />
-    <PackageReference Include="itext" Version="8.0.5" />
-    <PackageReference Include="itext.bouncy-castle-adapter" Version="8.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.11" Condition="'$(TargetFramework)' == 'net8.0'" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.17" Condition="'$(TargetFramework)' == 'net8.0'" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
-    <PackageReference Include="NLog" Version="5.2.5" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
-    <PackageReference Include="Scalar.AspNetCore" Version="2.2.1" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
-    <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="3.2.0" />
-    <PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="System.DirectoryServices" Version="7.0.1" />
-    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
-    <PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.1" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="System.DirectoryServices" Version="8.0.0" />
-    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="8.0.1" />
-    <PackageReference Include="System.DirectoryServices.Protocols" Version="8.0.1" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageReference Include="System.DirectoryServices" Version="9.0.4" />
-    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="9.0.4" />
-    <PackageReference Include="System.DirectoryServices.Protocols" Version="9.0.4" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="wwwroot\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
-    <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
-    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
-    <ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj" />
-  </ItemGroup>
-
-</Project>

EnvelopeGenerator.API/Extensions/ReceiverClaimExtensions.cs

@@ -1,96 +0,0 @@
-using DigitalData.Auth.Claims;
-using Microsoft.IdentityModel.JsonWebTokens;
-using System.Security.Claims;
-
-namespace EnvelopeGenerator.API.Extensions;
-
-/// <summary>
-/// Provides helper methods for working with envelope-specific authentication claims.
-/// </summary>
-public static class ReceiverClaimExtensions
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="user"></param>
-    /// <param name="claimType"></param>
-    /// <returns></returns>
-    /// <exception cref="InvalidOperationException"></exception>
-    private static string GetRequiredClaimValue(this ClaimsPrincipal user, string claimType)
-    {
-        var value = user.FindFirstValue(claimType);
-        if (value is not null)
-        {
-            return value;
-        }
-
-        var identity = user.Identity;
-        var principalName = identity?.Name ?? "(anonymous)";
-        var authType = identity?.AuthenticationType ?? "(none)";
-        var availableClaims = string.Join(", ", user.Claims.Select(c => $"{c.Type}={c.Value}"));
-        var message = $"Required claim '{claimType}' is missing for user '{principalName}' (auth: {authType}). Available claims: [{availableClaims}].";
-        throw new InvalidOperationException(message);
-    }
-
-    private static string GetRequiredClaimValue(this ClaimsPrincipal user, params string[] claimTypes)
-    {
-        foreach (var claimType in claimTypes.Where(t => !string.IsNullOrWhiteSpace(t)).Distinct())
-        {
-            var value = user.FindFirstValue(claimType);
-            if (!string.IsNullOrWhiteSpace(value))
-                return value;
-        }
-
-        var identity = user.Identity;
-        var principalName = identity?.Name ?? "(anonymous)";
-        var authType = identity?.AuthenticationType ?? "(none)";
-        var availableClaims = string.Join(", ", user.Claims.Select(c => $"{c.Type}={c.Value}"));
-        var message = $"Required claim(s) '{string.Join("', '", claimTypes)}' are missing for user '{principalName}' (auth: {authType}). Available claims: [{availableClaims}].";
-        throw new InvalidOperationException(message);
-    }
-
-    /// <summary>
-    /// Gets the authenticated envelope UUID from the claims.
-    /// </summary>
-    public static string EnvelopeUuid(this ClaimsPrincipal user)
-        => user.GetRequiredClaimValue(EnvelopeClaimNames.EnvelopeUuid);
-
-    /// <summary>
-    /// Gets the authenticated receiver signature from the claims.
-    /// </summary>
-    public static string ReceiverSignature(this ClaimsPrincipal user)
-        => user.GetRequiredClaimValue(EnvelopeClaimNames.ReceiverSignature);
-
-    /// <summary>
-    /// Gets the authenticated receiver email address from the claims.
-    /// </summary>
-    public static string ReceiverMail(this ClaimsPrincipal user)
-        => user.GetRequiredClaimValue(JwtRegisteredClaimNames.Email);
-
-    /// <summary>
-    /// Gets the authenticated envelope identifier from the claims.
-    /// </summary>
-    public static int EnvelopeId(this ClaimsPrincipal user)
-    {
-        var envIdStr = user.GetRequiredClaimValue(EnvelopeClaimNames.EnvelopeId);
-        if (int.TryParse(envIdStr, out var envId))
-            return envId;
-        else
-            throw new InvalidOperationException($"Claim '{EnvelopeClaimNames.EnvelopeId}' is not a valid integer.");
-    }
-
-    /// <summary>
-    /// Gets the authenticated receiver identifier from the claims.
-    /// </summary>
-    /// <param name="user"></param>
-    /// <returns></returns>
-    /// <exception cref="InvalidOperationException"></exception>
-    public static int ReceiverId(this ClaimsPrincipal user)
-    {
-        var rcvIdStr = user.GetRequiredClaimValue(EnvelopeClaimNames.ReceiverId);
-        if (int.TryParse(rcvIdStr, out var rcvId))
-            return rcvId;
-        else
-            throw new InvalidOperationException($"Claim '{EnvelopeClaimNames.ReceiverId}' is not a valid integer.");
-    }
-}

EnvelopeGenerator.API/Extensions/SenderClaimExtensions.cs

@@ -1,95 +0,0 @@
-using System.Security.Claims;
-
-namespace EnvelopeGenerator.API.Extensions
-{
-    /// <summary>
-    /// Provides extension methods for extracting user information from a <see cref="ClaimsPrincipal"/>.
-    /// </summary>
-    public static class SenderClaimExtensions
-    {
-        private static string GetRequiredClaimOfSender(this ClaimsPrincipal user, string claimType)
-        {
-            var value = user.FindFirstValue(claimType);
-            if (value is not null)
-            {
-                return value;
-            }
-
-            var identity = user.Identity;
-            var principalName = identity?.Name ?? "(anonymous)";
-            var authType = identity?.AuthenticationType ?? "(none)";
-            var availableClaims = string.Join(", ", user.Claims.Select(c => $"{c.Type}={c.Value}"));
-            var message = $"Required claim '{claimType}' is missing for user '{principalName}' (auth: {authType}). Available claims: [{availableClaims}].";
-            throw new InvalidOperationException(message);
-        }
-
-        private static string GetRequiredClaimOfSender(this ClaimsPrincipal user, params string[] claimTypes)
-        {
-            string? value = null;
-
-            foreach (var claimType in claimTypes)
-            {
-                value = user.FindFirstValue(claimType);
-                if (value is not null)
-                    return value;
-            }
-
-            var identity = user.Identity;
-            var principalName = identity?.Name ?? "(anonymous)";
-            var authType = identity?.AuthenticationType ?? "(none)";
-            var availableClaims = string.Join(", ", user.Claims.Select(c => $"{c.Type}={c.Value}"));
-            var message = $"Required claim among [{string.Join(", ", claimTypes)}] is missing for user '{principalName}' (auth: {authType}). Available claims: [{availableClaims}].";
-            throw new InvalidOperationException(message);
-        }
-
-        /// <summary>
-        /// Retrieves the user's ID from the claims. Throws an exception if the ID is missing or invalid.
-        /// </summary>
-        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
-        /// <returns>The user's ID as an integer.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if the user ID claim is missing or invalid.</exception>
-        public static int GetId(this ClaimsPrincipal user)
-        {
-            var idValue = user.GetRequiredClaimOfSender(ClaimTypes.NameIdentifier, "sub");
-
-            if (!int.TryParse(idValue, out var result))
-            {
-                throw new InvalidOperationException("User ID claim is missing or invalid. This may indicate a misconfigured or forged JWT token.");
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Retrieves the username from the claims.
-        /// </summary>
-        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
-        /// <returns>The username as a string.</returns>
-        public static string GetUsername(this ClaimsPrincipal user)
-            => user.GetRequiredClaimOfSender(ClaimTypes.Name);
-
-        /// <summary>
-        /// Retrieves the user's surname (last name) from the claims.
-        /// </summary>
-        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
-        /// <returns>The surname as a string.</returns>
-        public static string GetName(this ClaimsPrincipal user)
-            => user.GetRequiredClaimOfSender(ClaimTypes.Surname);
-
-        /// <summary>
-        /// Retrieves the user's given name (first name) from the claims.
-        /// </summary>
-        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
-        /// <returns>The given name as a string.</returns>
-        public static string GetPrename(this ClaimsPrincipal user)
-            => user.GetRequiredClaimOfSender(ClaimTypes.GivenName);
-
-        /// <summary>
-        /// Retrieves the user's email address from the claims.
-        /// </summary>
-        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
-        /// <returns>The email address as a string.</returns>
-        public static string GetEmail(this ClaimsPrincipal user)
-            => user.GetRequiredClaimOfSender(ClaimTypes.Email);
-    }
-}

EnvelopeGenerator.API/Jenkinsfile

@@ -1,10 +0,0 @@
-pipeline {
-    agent any
-    stages {
-        stage('Build') {
-            steps {
-                sh 'dotnet build'
-            }
-        }
-    }
-}

EnvelopeGenerator.API/Middleware/ExceptionHandlingMiddleware.cs

@@ -1,84 +0,0 @@
-namespace EnvelopeGenerator.API.Middleware;
-
-using DigitalData.Core.Exceptions;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using System.Net;
-using System.Text.Json;
-
-/// <summary>
-/// Middleware for handling exceptions globally in the application.
-/// Captures exceptions thrown during the request pipeline execution,
-/// logs them, and returns an appropriate HTTP response with a JSON error message.
-/// </summary>
-public class ExceptionHandlingMiddleware
-{
-    private readonly RequestDelegate _next;
-    private readonly ILogger<ExceptionHandlingMiddleware> _logger;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ExceptionHandlingMiddleware"/> class.
-    /// </summary>
-    /// <param name="next">The next middleware in the request pipeline.</param>
-    /// <param name="logger">The logger instance for logging exceptions.</param>
-    public ExceptionHandlingMiddleware(RequestDelegate next, ILogger<ExceptionHandlingMiddleware> logger)
-    {
-        _next = next;
-        _logger = logger;
-    }
-
-    /// <summary>
-    /// Invokes the middleware to handle the HTTP request.
-    /// </summary>
-    /// <param name="context">The HTTP context of the current request.</param>
-    /// <returns>A task that represents the asynchronous operation.</returns>
-    public async Task InvokeAsync(HttpContext context)
-    {
-        try
-        {
-            await _next(context); // Continue down the pipeline
-        }
-        catch (Exception ex)
-        {
-            await HandleExceptionAsync(context, ex, _logger);
-        }
-    }
-
-    /// <summary>
-    /// Handles exceptions by logging them and writing an appropriate JSON response.
-    /// </summary>
-    /// <param name="context">The HTTP context of the current request.</param>
-    /// <param name="exception">The exception that occurred.</param>
-    /// <param name="logger">The logger instance for logging the exception.</param>
-    /// <returns>A task that represents the asynchronous operation.</returns>
-    private static async Task HandleExceptionAsync(HttpContext context, Exception exception, ILogger logger)
-    {
-        context.Response.ContentType = "application/json";
-
-        string message;
-
-        switch (exception)
-        {
-            case BadRequestException badRequestEx:
-                context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
-                message = badRequestEx.Message;
-                break;
-
-            case NotFoundException notFoundEx:
-                context.Response.StatusCode = (int)HttpStatusCode.NotFound;
-                message = notFoundEx.Message;
-                break;
-
-            default:
-                logger.LogError(exception, "Unhandled exception occurred.");
-                context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
-                message = "An unexpected error occurred.";
-                break;
-        }
-
-        await context.Response.WriteAsync(JsonSerializer.Serialize(new
-        {
-            message
-        }));
-    }
-}

EnvelopeGenerator.API/Models/Auth.cs

@@ -1,14 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-public record Auth(string? AccessCode = null, string? SmsCode = null, string? AuthenticatorCode = null, bool UserSelectSMS = default)
-{
-    public bool HasAccessCode => AccessCode is not null;
-
-    public bool HasSmsCode => SmsCode is not null;
-
-    public bool HasAuthenticatorCode => AuthenticatorCode is not null;
-
-    public bool HasMulti => new[] { HasAccessCode, HasSmsCode, HasAuthenticatorCode }.Count(state => state) > 1;
-
-    public bool HasNone => !(HasAccessCode || HasSmsCode || HasAuthenticatorCode);
-}

EnvelopeGenerator.API/Models/AuthTokenKeys.cs

@@ -1,28 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-/// <summary>
-/// Represents the keys and default values used for authentication token handling 
-/// within the Envelope Generator API.
-/// </summary>
-public class AuthTokenKeys
-{
-    /// <summary>
-    /// Gets the name of the cookie used to store the authentication token.
-    /// </summary>
-    public string Cookie { get; init; } = "AuthToken";
-
-    /// <summary>
-    /// Gets the name of the query string parameter used to pass the authentication token.
-    /// </summary>
-    public string QueryString { get; init; } = "AuthToken";
-
-    /// <summary>
-    /// Gets the expected issuer value for the authentication token.
-    /// </summary>
-    public string Issuer { get; init; } = "auth.digitaldata.works";
-
-    /// <summary>
-    /// Gets the expected audience value for the authentication token.
-    /// </summary>
-    public string Audience { get; init; } = "sign-flow.digitaldata.works";
-}

EnvelopeGenerator.API/Models/ConnectionString.cs

@@ -1,12 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-/// <summary>
-/// 
-/// </summary>
-public class ConnectionString
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public string Value { get; set; } = string.Empty;
-}

EnvelopeGenerator.API/Models/ContactLink.cs

@@ -1,60 +0,0 @@
-namespace EnvelopeGenerator.API.Models
-{
-    /// <summary>
-    /// Represents a hyperlink for contact purposes with various HTML attributes.
-    /// </summary>
-    public class ContactLink
-    {
-        /// <summary>
-        /// Gets or sets the label of the hyperlink.
-        /// </summary>
-        public string Label { get; init; } = "Contact";
-
-        /// <summary>
-        /// Gets or sets the URL that the hyperlink points to.
-        /// </summary>
-        public string Href { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets the target where the hyperlink should open.
-        /// Commonly used values are "_blank", "_self", "_parent", "_top".
-        /// </summary>
-        public string Target { get; set; } = "_blank";
-
-        /// <summary>
-        /// Gets or sets the relationship of the linked URL as space-separated link types.
-        /// Examples include "nofollow", "noopener", "noreferrer".
-        /// </summary>
-        public string Rel { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets the filename that should be downloaded when clicking the hyperlink.
-        /// This attribute will only have an effect if the href attribute is set.
-        /// </summary>
-        public string Download { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets the language of the linked resource. Useful when linking to
-        /// content in another language.
-        /// </summary>
-        public string HrefLang { get; set; } = "en";
-
-        /// <summary>
-        /// Gets or sets the MIME type of the linked URL. Helps browsers to handle
-        /// the type correctly when the link is clicked.
-        /// </summary>
-        public string Type { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets additional information about the hyperlink, typically viewed
-        /// as a tooltip when the mouse hovers over the link.
-        /// </summary>
-        public string Title { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets an identifier for the hyperlink, unique within the HTML document.
-        /// </summary>
-        public string Id { get; set; } = string.Empty;
-    }
-
-}

EnvelopeGenerator.API/Models/Culture.cs

@@ -1,17 +0,0 @@
-using System.Globalization;
-
-namespace EnvelopeGenerator.API.Models;
-
-public class Culture
-{
-    private string _language = string.Empty;
-    public string Language { get => _language;
-        init {
-            _language = value;
-            Info = new(value);
-        } 
-    }
-    public string FIClass { get; init; } = string.Empty;
-
-    public CultureInfo? Info { get; init; }
-}

EnvelopeGenerator.API/Models/Cultures.cs

@@ -1,12 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-public class Cultures : List<Culture>
-{
-    public IEnumerable<string> Languages => this.Select(c => c.Language);
-
-    public IEnumerable<string> FIClasses => this.Select(c => c.FIClass);
-
-    public Culture Default => this.First();
-    
-    public Culture? this[string? language] => language is null ? null : this.Where(c => c.Language == language).FirstOrDefault();
-}

EnvelopeGenerator.API/Models/CustomImages.cs

@@ -1,6 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-public class CustomImages : Dictionary<string, Image>
-{
-    public new Image this[string key] => TryGetValue(key, out var img) && img is not null ? img : new();
-}

EnvelopeGenerator.API/Models/EnvelopeReceiverLogin.cs

@@ -1,7 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-/// <summary>
-/// Request body for the envelope-receiver login endpoint.
-/// </summary>
-/// <param name="AccessCode">The access code sent to the receiver.</param>
-public record EnvelopeReceiverLogin(string? AccessCode = null);

EnvelopeGenerator.API/Models/ErrorViewModel.cs

@@ -1,10 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-public class ErrorViewModel
-{
-    public string Title { get; init; } = "404";
-
-    public string Subtitle { get; init; } = "Hmmm...";
-
-    public string Body { get; init; } = "It looks like one of the developers fell asleep";
-}

EnvelopeGenerator.API/Models/Image.cs

@@ -1,10 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-public class Image
-{
-    public string Src { get; init; } = string.Empty;
-
-    public Dictionary<string, string> Classes { get; init; } = new();
-
-    public string GetClassIn(string page) => Classes.TryGetValue(page, out var cls) && cls is not null ? cls : string.Empty;
-}

EnvelopeGenerator.API/Models/Login.cs

@@ -1,13 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace EnvelopeGenerator.API.Models;
-
-/// <summary>
-/// Repräsentiert ein Login-Modell mit erforderlichem Passwort und optionaler ID und Benutzername.
-/// </summary>
-/// <param name="Password">Das erforderliche Passwort für das Login.</param>
-/// <param name="UserId">Die optionale ID des Benutzers.</param>
-/// <param name="Username">Der optionale Benutzername.</param>
-public record Login([Required] string Password, int? UserId = null, string? Username = null)
-{
-}

EnvelopeGenerator.API/Models/MainViewModel.cs

@@ -1,6 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-public class MainViewModel
-{
-    public string? Title { get; init; }
-}

EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Annotation.cs

@@ -1,93 +0,0 @@
-using EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-using System.Text.Json.Serialization;
-
-namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-
-public record Annotation : IAnnotation
-{
-    public required string Name { get; init; }
-
-    #region Bound Annotation
-    [JsonIgnore]
-    public string? HorBoundAnnotName { get; init; }
-
-    [JsonIgnore]
-    public string? VerBoundAnnotName { get; init; }
-    #endregion
-
-    #region Layout
-    [JsonIgnore]
-    public double? MarginLeft { get; set; }
-
-    [JsonIgnore]
-    public double MarginLeftRatio { get; init; } = 1;
-
-    [JsonIgnore]
-    public double? MarginTop { get; set; }
-
-    [JsonIgnore]
-    public double MarginTopRatio { get; init; } = 1;
-
-    public double? Width { get; set; }
-
-    [JsonIgnore]
-    public double WidthRatio { get; init; } = 1;
-
-    public double? Height { get; set; }
-
-    [JsonIgnore]
-    public double HeightRatio { get; init; } = 1;
-    #endregion
-
-    #region Position
-    public double Left => (MarginLeft ?? 0) + (HorBoundAnnot?.HorBoundary ?? 0);
-
-    public double Top => (MarginTop ?? 0) + (VerBoundAnnot?.VerBoundary ?? 0);
-    #endregion
-
-    #region Boundary
-    [JsonIgnore]
-    public double HorBoundary => Left + (Width ?? 0);
-
-    [JsonIgnore]
-    public double VerBoundary => Top + (Height ?? 0);
-    #endregion
-
-    #region BoundAnnot
-    [JsonIgnore]
-    public Annotation? HorBoundAnnot { get; set; }
-
-    [JsonIgnore]
-    public Annotation? VerBoundAnnot { get; set; }
-    #endregion
-
-    public Color? BackgroundColor { get; init; }
-
-    #region Border
-    public Color? BorderColor { get; init; }
-
-    public string? BorderStyle { get; init; }
-
-    public int? BorderWidth { get; set; }
-    #endregion
-
-    [JsonIgnore]
-    internal Annotation Default 
-    { 
-        set 
-        {
-            // To set null value, annotation must have null (0) value but null must has non-null value
-            if (MarginLeft == null && value.MarginLeft != null)
-                MarginLeft = value.MarginLeft * MarginLeftRatio;
-
-            if (MarginTop == null && value.MarginTop != null)
-                MarginTop = value.MarginTop * MarginTopRatio;
-
-            if (Width == null && value.Width != null)
-                Width = value.Width * WidthRatio;
-
-            if (Height == null && value.Height != null)
-                Height = value.Height * HeightRatio;
-        }
-    }
-};

EnvelopeGenerator.API/Models/PsPdfKitAnnotation/AnnotationParams.cs

@@ -1,80 +0,0 @@
-using EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-using System.Text.Json.Serialization;
-
-namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-
-public class AnnotationParams
-{
-    public AnnotationParams()
-    {
-        _AnnotationJSObjectInitor = new(CreateAnnotationJSObject);
-    }
-
-    public Background? Background { get; init; }
-
-    #region Annotation
-    [JsonIgnore]
-    public Annotation? DefaultAnnotation { get; init; }
-
-    private readonly List<Annotation> _annots = new List<Annotation>();
-
-    public bool TryGet(string name, out Annotation annotation)
-    {
-#pragma warning disable CS8601 // Possible null reference assignment.
-        annotation = _annots.FirstOrDefault(a => a.Name == name);
-#pragma warning restore CS8601 // Possible null reference assignment.
-        return annotation is not null;
-    }
-
-    public required IEnumerable<Annotation> Annotations
-    {
-        get => _annots;
-        init
-        {
-            _annots = value.ToList();
-
-            if (DefaultAnnotation is not null)
-                foreach (var annot in _annots)
-                    annot.Default = DefaultAnnotation;
-
-            for (int i = 0; i < _annots.Count; i++)
-            {
-                #region set bound annotations
-                // horizontal
-                if (_annots[i].HorBoundAnnotName is string horBoundAnnotName)
-                    if (TryGet(horBoundAnnotName, out var horBoundAnnot))
-                        _annots[i].HorBoundAnnot = horBoundAnnot;
-                    else
-                        throw new InvalidOperationException($"{horBoundAnnotName} added as bound anotation. However, it is not defined.");
-
-                // vertical
-                if (_annots[i].VerBoundAnnotName is string verBoundAnnotName)
-                    if (TryGet(verBoundAnnotName, out var verBoundAnnot))
-                        _annots[i].VerBoundAnnot = verBoundAnnot;
-                    else
-                        throw new InvalidOperationException($"{verBoundAnnotName} added as bound anotation. However, it is not defined.");
-                #endregion
-            }
-        }
-    }
-    #endregion
-
-    #region AnnotationJSObject
-    private Dictionary<string, IAnnotation> CreateAnnotationJSObject()
-    {
-        var dict = _annots.ToDictionary(a => a.Name.ToLower(), a => a as IAnnotation);
-
-        if (Background is not null)
-        {
-            Background.Locate(_annots);
-            dict.Add(Background.Name.ToLower(), Background);
-        }            
-
-        return dict;
-    }
-
-    private readonly Lazy<Dictionary<string, IAnnotation>> _AnnotationJSObjectInitor;
-
-    public Dictionary<string, IAnnotation> AnnotationJSObject => _AnnotationJSObjectInitor.Value;
-    #endregion
-}

EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Background.cs

@@ -1,58 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-
-/// <summary>
-/// The Background is an annotation for the PSPDF Kit. However, it has no function.
-/// It is only the first annotation as a background for other annotations.
-/// </summary>
-public record Background : IAnnotation
-{
-    [JsonIgnore]
-    public double Margin { get; init; }
-
-    public string Name { get; } = "Background";
-
-    public double? Width { get; set; }
-
-    public double? Height { get; set; }
-
-    public double Left { get; set; }
-
-    public double Top { get; set; }
-
-    public Color? BackgroundColor { get; init; }
-
-    #region Border
-    public Color? BorderColor { get; init; }
-
-    public string? BorderStyle { get; init; }
-
-    public int? BorderWidth { get; set; }
-    #endregion
-
-    public void Locate(IEnumerable<IAnnotation> annotations)
-    {
-        // set Top
-        if (annotations.MinBy(a => a.Top)?.Top is double minTop)
-            Top = minTop;
-
-        // set Left
-        if (annotations.MinBy(a => a.Left)?.Left is double minLeft)
-            Left = minLeft;
-
-        // set Width
-        if(annotations.MaxBy(a => a.GetRight())?.GetRight() is double maxRight)
-            Width = maxRight - Left;
-
-        // set Height
-        if (annotations.MaxBy(a => a.GetBottom())?.GetBottom() is double maxBottom)
-            Height = maxBottom - Top;
-
-        // add margins
-        Top -= Margin;
-        Left -= Margin;
-        Width += Margin * 2;
-        Height += Margin * 2;
-    }
-}

EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Color.cs

@@ -1,10 +0,0 @@
-namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-
-public record Color
-{
-    public int R { get; init; } = 0;
-
-    public int G { get; init; } = 0;
-
-    public int B { get; init; } = 0;
-}

EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Extensions.cs

@@ -1,8 +0,0 @@
-namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-
-public static class Extensions
-{
-    public static double GetRight(this IAnnotation annotation) => annotation.Left + annotation?.Width ?? 0;
-
-    public static double GetBottom(this IAnnotation annotation) => annotation.Top + annotation?.Height ?? 0;
-}

EnvelopeGenerator.API/Models/PsPdfKitAnnotation/IAnnotation.cs

@@ -1,22 +0,0 @@
-namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-
-public interface IAnnotation
-{
-    string Name { get; }
-
-    double? Width { get; }
-
-    double? Height { get; }
-
-    double Left { get; }
-
-    double Top { get; }
-
-    Color? BackgroundColor { get; }
-
-    Color? BorderColor { get; }
-
-    string? BorderStyle { get; }
-
-    int? BorderWidth { get; }
-}

EnvelopeGenerator.API/Models/TFARegParams.cs

@@ -1,17 +0,0 @@
-namespace EnvelopeGenerator.API.Models;
-
-/// <summary>
-/// Represents the parameters for two-factor authentication (2FA) registration.
-/// </summary>
-public class TFARegParams
-{
-    /// <summary>
-    /// The maximum allowed time for completing the registration process.
-    /// </summary>
-    public TimeSpan TimeLimit { get; init; } = new(0, 30, 0);
-
-    /// <summary>
-    /// The deadline for registration, calculated as the current time plus the <see cref="TimeLimit"/>.
-    /// </summary>
-    public DateTime Deadline => DateTime.Now.AddTicks(TimeLimit.Ticks);
-}

EnvelopeGenerator.API/Options/CacheOptions.cs

@@ -1,18 +0,0 @@
-namespace EnvelopeGenerator.API.Options;
-
-/// <summary>
-/// Configuration options for distributed caching.
-/// </summary>
-public sealed class CacheOptions
-{
-    /// <summary>
-    /// Configuration section name in appsettings.json.
-    /// </summary>
-    public const string SectionName = "Cache";
-
-    /// <summary>
-    /// Signature cache expiration time.
-    /// If null, signatures will not expire automatically.
-    /// </summary>
-    public TimeSpan? SignatureCacheExpiration { get; set; }
-}

EnvelopeGenerator.API/Program.cs

@@ -1,355 +0,0 @@
-using DigitalData.Core.API;
-using DigitalData.Core.Application;
-using EnvelopeGenerator.Infrastructure;
-using EnvelopeGenerator.Domain.Constants;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Localization;
-using Microsoft.EntityFrameworkCore;
-using System.Globalization;
-using Scalar.AspNetCore;
-using Microsoft.OpenApi.Models;
-using DigitalData.UserManager.DependencyInjection;
-using EnvelopeGenerator.Application;
-using DigitalData.Auth.Client;
-using DigitalData.Core.Abstractions;
-using EnvelopeGenerator.API.Models;
-using Microsoft.IdentityModel.Tokens;
-using DigitalData.Core.Abstractions.Security.Extensions;
-using EnvelopeGenerator.API.Middleware;
-using EnvelopeGenerator.API.Options;
-using NLog.Web;
-using NLog;
-using DigitalData.Auth.Claims;
-using EnvelopeGenerator.API;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-
-var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
-logger.Info("Logging initialized!");
-
-try
-{
-    var builder = WebApplication.CreateBuilder(args);
-
-    builder.Configuration.AddJsonFile("yarp.json", optional: true, reloadOnChange: true);
-
-    builder.Logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
-
-    if (!builder.Environment.IsDevelopment())
-    {
-        builder.Logging.ClearProviders();
-        builder.Host.UseNLog();
-    }
-
-    var config = builder.Configuration;
-
-    var deferredProvider = new DeferredServiceProvider();
-
-    builder.Services.AddControllers()
-        .AddJsonOptions(options =>
-        {
-            options.JsonSerializerOptions.ReferenceHandler = System.Text.Json.Serialization.ReferenceHandler.IgnoreCycles;
-        });
-    builder.Services.AddHttpClient();
-    builder.Services.AddReverseProxy().LoadFromConfig(builder.Configuration.GetSection("ReverseProxy"));
-
-    // CORS Policy
-    var allowedOrigins = config.GetSection("AllowedOrigins").Get<string[]>() ??
-        throw new InvalidOperationException("AllowedOrigins section is missing in the configuration.");
-    builder.Services.AddCors(options =>
-    {
-        options.AddPolicy("AllowSpecificOriginsPolicy", builder =>
-        {
-            builder.WithOrigins(allowedOrigins)
-                   .SetIsOriginAllowedToAllowWildcardSubdomains()
-                   .AllowAnyMethod()
-                   .AllowAnyHeader()
-                   .AllowCredentials();
-        });
-    });
-
-    // Swagger
-    builder.Services.AddEndpointsApiExplorer();
-    builder.Services.AddSwaggerGen(options =>
-    {
-        options.SwaggerDoc("v1", new OpenApiInfo
-        {
-            Version = "v1",
-            Title = "signFLOW Absender-API",
-            Description = "Eine API zur Verwaltung der Erstellung, des Versands und der Nachverfolgung von Umschlägen in der signFLOW-Anwendung.",
-            Contact = new OpenApiContact
-            {
-                Name = "Digital Data GmbH",
-                Url = new Uri("https://digitaldata.works/digitale-signatur#kontakt"),
-                Email = "info-flow@digitaldata.works"
-            },
-        });
-
-        options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
-        {
-            Name = "Authorization",
-            Type = SecuritySchemeType.Http,
-            Scheme = "bearer",
-            BearerFormat = "JWT",
-            In = ParameterLocation.Header,
-            Description = "JWT-Autorisierungs-Header unter Verwendung des Bearer-Schemas.",
-        });
-
-        options.AddSecurityRequirement(new OpenApiSecurityRequirement
-    {
-        {
-            new OpenApiSecurityScheme
-            {
-                Reference = new OpenApiReference
-                {
-                    Type = Microsoft.OpenApi.Models.ReferenceType.SecurityScheme,
-                    Id = "Bearer"
-                }
-            },
-            Array.Empty<string>()
-        }
-    });
-
-        var xmlFiles = Directory.GetFiles(AppContext.BaseDirectory, "*.xml");
-        foreach (var xmlFile in xmlFiles)
-        {
-            options.IncludeXmlComments(xmlFile);
-        }
-
-        options.DocumentFilter<EnvelopeGenerator.API.Documentation.AuthProxyDocumentFilter>();
-    });
-#if NET9_0_OR_GREATER
-    builder.Services.AddOpenApi();
-#endif
-
-    //Add EF Core dbcontext
-    var useDbMigration = Environment.GetEnvironmentVariable("MIGRATION_TEST_MODE") == true.ToString() || config.GetValue<bool>("UseDbMigration");
-    var cnnStrName = useDbMigration ? "DbMigrationTest" : "Default";
-    var connStr = config.GetConnectionString(cnnStrName)
-        ?? throw new InvalidOperationException($"Connection string '{cnnStrName}' is missing in the application configuration.");
-
-    builder.Services.Configure<ConnectionString>(cs => cs.Value = connStr);
-
-    builder.Services.AddDbContext<EGDbContext>(options => options.UseSqlServer(connStr));
-
-    builder.Services.AddAuthHubClient(config.GetSection("AuthClientParams"));
-
-    var authTokenKeys = config.GetOrDefault<AuthTokenKeys>();
-
-    builder.Services.AddAuthentication(options =>
-    {
-        options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-        options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-    })
-        .AddJwtBearer(AuthScheme.Sender, opt =>
-        {
-            opt.TokenValidationParameters = new TokenValidationParameters
-            {
-                ValidateIssuerSigningKey = true,
-                IssuerSigningKeyResolver = (token, securityToken, identifier, parameters) =>
-                {
-                    var clientParams = deferredProvider.GetOptions<ClientParams>();
-                    var publicKey = clientParams!.PublicKeys.Get(authTokenKeys.Issuer, authTokenKeys.Audience);
-                    return [publicKey.SecurityKey];
-                },
-                ValidateIssuer = true,
-                ValidIssuer = authTokenKeys.Issuer,
-                ValidateAudience = true,
-                ValidAudience = authTokenKeys.Audience,
-            };
-
-            opt.Events = new JwtBearerEvents
-            {
-                OnMessageReceived = context =>
-                {
-                    // if there is no token read related cookie or query string
-                    if (context.Token is null)   // if there is no token
-                    {
-                        if (context.Request.Cookies.TryGetValue(authTokenKeys.Cookie, out var cookieToken) && cookieToken is not null)
-                            context.Token = cookieToken;
-                        else if (context.Request.Query.TryGetValue(authTokenKeys.QueryString, out var queryStrToken))
-                            context.Token = queryStrToken;
-                    }
-                    return Task.CompletedTask;
-                }
-            };
-        })
-        // Per-envelope receiver scheme: reads the JWT from the cookie named
-        // AuthTokenSignFLOWReceiver.{envelope_key} where envelope_key is the
-        // last path segment of the request URL.
-        // This enables simultaneous authentication for multiple envelopes
-        // within the same browser session.
-        .AddJwtBearer(AuthScheme.Receiver, opt =>
-        {
-            opt.TokenValidationParameters = new TokenValidationParameters
-            {
-                ValidateIssuerSigningKey = true,
-                IssuerSigningKeyResolver = (token, securityToken, identifier, parameters) =>
-                {
-                    var clientParams = deferredProvider.GetOptions<ClientParams>();
-                    var publicKey = clientParams!.PublicKeys.Get(authTokenKeys.Issuer, authTokenKeys.Audience);
-                    return [publicKey.SecurityKey];
-                },
-                ValidateIssuer = true,
-                ValidIssuer = authTokenKeys.Issuer,
-                ValidateAudience = true,
-                ValidAudience = authTokenKeys.Audience,
-            };
-
-            opt.Events = new JwtBearerEvents
-            {
-                OnMessageReceived = context =>
-                {
-                    var paths = context.Request.Path.Value?.Split('/', StringSplitOptions.RemoveEmptyEntries);
-
-                    // Derive the envelope key from the last route segment: /{envelope_key}
-                    var envelopeKey = paths?.LastOrDefault();
-
-                    if (envelopeKey is not null)
-                    {
-                        var cookieName = CookieNames.GetEnvelopeReceiverCookieName(authTokenKeys.Cookie, envelopeKey);
-                        if (context.Request.Cookies.TryGetValue(cookieName, out var cookieToken) && cookieToken is not null)
-                            context.Token = cookieToken;
-                    }
-
-                    return Task.CompletedTask;
-                },
-                OnTokenValidated = context =>
-                {
-                    var paths = context.Request.Path.Value?.Split('/', StringSplitOptions.RemoveEmptyEntries);
-                    var envelopeKey = paths?.LastOrDefault();
-
-                    var sub = context.Principal?.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value
-                           ?? context.Principal?.FindFirst("sub")?.Value;
-
-                    if (envelopeKey is null || sub != envelopeKey)
-                        context.Fail("Envelope key in the path does not match the token subject.");
-
-                    return Task.CompletedTask;
-                }
-            };
-        });
-
-    // Authentication
-    builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
-    .AddCookie(options =>
-    {
-        options.Cookie.HttpOnly = true;  // Makes the cookie inaccessible to client-side scripts for security
-        options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest; // Ensures cookies are sent over HTTPS only
-        options.Cookie.SameSite = SameSiteMode.Strict; // Protects against CSRF attacks by restricting how cookies are sent with requests from external sites
-        options.LoginPath = "/api/auth/login";
-        options.LogoutPath = "/api/auth/logout";
-        options.SlidingExpiration = true;
-    });
-
-    builder.Services.AddAuthorizationBuilder()
-        .AddPolicy(AuthPolicy.SenderOrReceiver, policy => policy
-            .RequireRole(Role.Sender, Role.Receiver.Full)
-            .AddAuthenticationSchemes(AuthScheme.Sender, AuthScheme.Receiver))
-        .AddPolicy(AuthPolicy.Sender, policy => policy
-            .RequireRole(Role.Sender)
-            .AddAuthenticationSchemes(AuthScheme.Sender))
-        .AddPolicy(AuthPolicy.Receiver, policy => policy
-            .AddAuthenticationSchemes(AuthScheme.Receiver)
-            .RequireAuthenticatedUser()
-            .RequireRole(Role.Receiver.Full, "receiver"))
-        .AddPolicy(AuthPolicy.ReceiverTFA, policy => policy.RequireRole(Role.Receiver.TFA));
-
-    // User manager
-#pragma warning disable CS0618 // Type or member is obsolete
-    builder.Services.AddUserManager<EGDbContext>();
-#pragma warning restore CS0618 // Type or member is obsolete
-
-    // LDAP
-    builder.ConfigureBySection<DirectorySearchOptions>();
-    builder.Services.AddDirectorySearchService(config.GetSection("DirectorySearchOptions"));
-
-    // Localizer
-    builder.Services.AddCookieBasedLocalizer();
-
-    // Cache options
-    builder.Services.Configure<CacheOptions>(config.GetSection(CacheOptions.SectionName));
-
-    // Distributed Cache - SQL Server
-    builder.Services.AddDistributedSqlServerCache(options =>
-    {
-        config.GetSection("Cache:SqlServer").Bind(options);
-        
-        if (string.IsNullOrWhiteSpace(options.ConnectionString))
-        {
-            options.ConnectionString = connStr;
-        }
-    });
-
-    // Envelope generator serives
-#pragma warning disable CS0618 // Type or member is obsolete
-    builder.Services
-        .AddEnvelopeGeneratorInfrastructureServices(opt =>
-        {
-            opt.AddDbTriggerParams(config);
-            opt.AddDbContext((provider, options) =>
-            {
-                var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
-                options.UseSqlServer(connStr)
-                        .LogTo(log => logger.LogInformation("{log}", log), Microsoft.Extensions.Logging.LogLevel.Trace)
-                        .EnableSensitiveDataLogging()
-                        .EnableDetailedErrors();
-            });
-            opt.AddSQLExecutor(executor => executor.ConnectionString = connStr);
-        })
-        .AddEnvelopeGeneratorServices(config);
-#pragma warning restore CS0618 // Type or member is obsolete
-
-    var app = builder.Build();
-
-    deferredProvider.Factory = () => app.Services;
-
-    app.UseMiddleware<ExceptionHandlingMiddleware>();
-
-#if NET9_0_OR_GREATER
-    app.MapOpenApi();
-#endif
-
-    // Configure the HTTP request pipeline.
-    if (app.Environment.IsDevelopment() || (app.IsDevOrDiP() && config.GetValue<bool>("UseSwagger")))
-    {
-        app.UseSwagger();
-        app.UseSwaggerUI();
-        app.MapScalarApiReference();
-    }
-
-    // Set CORS policy
-    app.UseCors("AllowSpecificOriginsPolicy");
-
-    // Localizer
-    string[] supportedCultureNames = ["de-DE", "en-US"];
-    IList<CultureInfo> list = [.. supportedCultureNames.Select(cn => new CultureInfo(cn))];
-    var cultureInfo = list.FirstOrDefault() ?? throw new InvalidOperationException("There is no supported culture.");
-    var requestLocalizationOptions = new RequestLocalizationOptions
-    {
-        SupportedCultures = list,
-        SupportedUICultures = list
-    };
-    requestLocalizationOptions.RequestCultureProviders.Add(new QueryStringRequestCultureProvider());
-    app.UseRequestLocalization(requestLocalizationOptions);
-
-
-    app.UseHttpsRedirection();
-
-    app.UseDefaultFiles();
-    app.UseStaticFiles();
-
-    app.UseAuthentication();
-    app.UseAuthorization();
-
-    app.MapControllers();
-
-    // Catch-all YARP proxy — only forward requests that are not swagger/scalar/openapi paths.
-    app.MapReverseProxy();
-
-    app.Run();
-}
-catch (Exception ex)
-{
-    logger.Error(ex, "Stopped program because of exception");
-    throw;
-}

EnvelopeGenerator.API/Properties/PublishProfiles/IISProfileNet8.pubxml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
-  <PropertyGroup>
-    <WebPublishMethod>Package</WebPublishMethod>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <ProjectGuid>5e0e17c0-ff5a-4246-bf87-1add85376a27</ProjectGuid>
-    <DesktopBuildPackageLocation>M:\App&amp;Service\0 DD - Smart UP\signFLOW\PreRelease\API\net8\$(Version)\EnvelopeGenerator.API.zip</DesktopBuildPackageLocation>
-    <PackageAsSingleFile>true</PackageAsSingleFile>
-    <DeployIisAppPath>EnvelopeGenerator</DeployIisAppPath>
-    <_TargetId>IISWebDeployPackage</_TargetId>
-    <TargetFramework>net8.0</TargetFramework>
-  </PropertyGroup>
-</Project>

EnvelopeGenerator.API/Properties/launchSettings.json

@@ -1,51 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:4176",
-      "sslPort": 44300
-    }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5131",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "sender",
-      "applicationUrl": "https://localhost:8088;http://localhost:5131",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "angular": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "",
-      "applicationUrl": "https://localhost:7174;http://localhost:5131",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

EnvelopeGenerator.API/appsettings.Development.json

@@ -1,29 +0,0 @@
-{
-"Logging": {
-  "LogLevel": {
-    "Default": "Information",
-    "Microsoft.AspNetCore": "Warning"
-  }
-},
-"ReverseProxy": {
-  "Clusters": {
-    "receiver-ui": {
-      "Destinations": {
-        "primary": {
-          "Address": "https://localhost:52936"
-        }
-      }
-    }
-  }
-},
-  "AuthClientParams": {
-    "Url": "http://172.24.12.39:9090/auth-hub",
-    "PublicKeys": [
-      {
-        "Issuer": "auth.digitaldata.works",
-        "Audience": "sign-flow.digitaldata.works"
-      }
-    ],
-    "RetryDelay": "00:00:05"
-  }
-}

EnvelopeGenerator.API/appsettings.json

@@ -1,256 +0,0 @@
-{
-  "UseSwagger": true,
-  "UseDbMigration": false,
-  "DiPMode": true,
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*",
-  "AllowedOrigins": [ "http://localhost:4200", "http://172.24.12.39:9090", "https://localhost:8088", "http://localhost:5131", "http://localhost:7192" ],
-  "ConnectionStrings": {
-    "Default": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;",
-    "DbMigrationTest": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM_DATA_MIGR_TEST;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;"
-  },
-  "DirectorySearchOptions": {
-    "ServerName": "DD-VMP01-DC01",
-    "Root": "DC=dd-gan,DC=local,DC=digitaldata,DC=works",
-    "UserCacheExpirationDays": 1,
-    "CustomSearchFilters": {
-      "User": "(&(objectClass=user)(sAMAccountName=*))",
-      "Group": "(&(objectClass=group)(samAccountName=*))"
-    }
-  },
-  "AuthClientParams": {
-    "Url": "http://172.24.12.39:9090/auth-hub",
-    "PublicKeys": [
-      {
-        "Issuer": "auth.digitaldata.works",
-        "Audience": "sign-flow.digitaldata.works"
-      }
-    ],
-    "RetryDelay": "00:00:05"
-  },
-  "AuthTokenKeys": {
-    "Cookie": "AuthToken",
-    "QueryString": "AuthToken",
-    "Issuer": "auth.digitaldata.works",
-    "Audience": "sign-flow.digitaldata.works"
-  },
-  "PSPDFKitLicenseKey": "SXCtGGY9XA-31OGUXQK-r7c6AkdLGPm2ljuyDr1qu0kkhLvydg-Do-fxpNUF4Rq3fS_xAnZRNFRHbXpE6sQ2BMcCSVTcXVJO6tPviexjpiT-HnrDEySlUERJnnvh-tmeOWprxS6BySPnSILkmaVQtUfOIUS-cUbvvEYHTvQBKbSF8di4XHQFyfv49ihr51axm3NVV3AXwh2EiKL5C5XdqBZ4sQ4O7vXBjM2zvxdPxlxdcNYmiU83uAzw7B83O_jubPzya4CdUHh_YH7Nlp2gP56MeG1Sw2JhMtfG3Rj14Sg4ctaeL9p6AEWca5dDjJ2li5tFIV2fQSsw6A_cowLu0gtMm5i8IfJXeIcQbMC2-0wGv1oe9hZYJvFMdzhTM_FiejM0agemxt3lJyzuyP8zbBSOgp7Si6A85krLWPZptyZBTG7pp7IHboUHfPMxCXqi-zMsqewOJtQBE2mjntU-lPryKnssOpMPfswwQX7QSkJYV5EMqNmEhQX6mEkp2wcqFzMC7bJQew1aO4pOpvChUaMvb1vgRek0HxLag0nwQYX2YrYGh7F_xXJs-8HNwJe8H0-eW4x4faayCgM5rB5772CCCsD9ThZcvXFrjNHHLGJ8WuBUFm6LArvSfFQdii_7j-_sqHMpeKZt26NFgivj1A==",
-  "Content-Security-Policy": [ // The first format parameter {0} will be replaced by the nonce value.
-    "default-src 'self'",
-    "script-src 'self' 'nonce-{0}' 'unsafe-eval'",
-    "style-src 'self' 'unsafe-inline' https://fonts.googleapis.com:*",
-    "img-src 'self' data: https: blob:",
-    "font-src 'self' https://fonts.gstatic.com:*",
-    "connect-src 'self' https://nominatim.openstreetmap.org:* http://localhost:* https://localhost:* ws://localhost:* wss://localhost:* blob:",
-    "frame-src 'self'",
-    "media-src 'self'",
-    "object-src 'self'"
-  ],
-  "NLog": {
-    "throwConfigExceptions": true,
-    "variables": {
-      "logDirectory": "E:\\LogFiles\\Digital Data\\signFlow",
-      "logFileNamePrefix": "${shortdate}-ECM.EnvelopeGenerator.Web"
-    },
-    "targets": {
-      "infoLogs": {
-        "type": "File",
-        "fileName": "${logDirectory}\\${logFileNamePrefix}-Info.log",
-        "maxArchiveDays": 30
-      },
-      "errorLogs": {
-        "type": "File",
-        "fileName": "${logDirectory}\\${logFileNamePrefix}-Error.log",
-        "maxArchiveDays": 30
-      },
-      "criticalLogs": {
-        "type": "File",
-        "fileName": "${logDirectory}\\${logFileNamePrefix}-Critical.log",
-        "maxArchiveDays": 30
-      }
-    },
-    // Trace, Debug, Info, Warn, Error and *Fatal*
-    "rules": [
-      {
-        "logger": "*",
-        "minLevel": "Info",
-        "maxLevel": "Warn",
-        "writeTo": "infoLogs"
-      },
-      {
-        "logger": "*",
-        "level": "Error",
-        "writeTo": "errorLogs"
-      },
-      {
-        "logger": "*",
-        "level": "Fatal",
-        "writeTo": "criticalLogs"
-      }
-    ]
-  },
-  "ContactLink": {
-    "Label": "Kontakt",
-    "Href": "https://digitaldata.works/",
-    "HrefLang": "de",
-    "Target": "_blank",
-    "Title": "Digital Data GmbH"
-  },
-  /* Resx naming format is -> Resource.language.resx (eg: Resource.de_DE.resx). 
-     To add a new language, first you should write the required resx file.
-     first is the default culture name. */
-  "Cultures": [
-    {
-      "Language": "de-DE",
-      "FIClass": "fi-de"
-    },
-    {
-      "Language": "en-US",
-      "FIClass": "fi-us"
-    }
-  ],
-  "DisableMultiLanguage": false,
-  "Regexes": [
-    {
-      "Pattern": "/^\\p{L}+(?:([\\ \\-\\']|(\\.\\ ))\\p{L}+)*$/u",
-      "Name": "City",
-      "Platforms": [ ".NET" ]
-    },
-    {
-      "Pattern": "/^[a-zA-Z\\u0080-\\u024F]+(?:([\\ \\-\\']|(\\.\\ ))[a-zA-Z\\u0080-\\u024F]+)*$/",
-      "Name": "City",
-      "Platforms": [ "javascript" ]
-    }
-  ],
-  "CustomImages": {
-    "App": {
-      "Src": "/img/DD_signFLOW_LOGO.png",
-      "Classes": {
-        "Main": "signFlow-logo"
-      }
-    },
-    "Company": {
-      "Src": "/img/digital_data.svg",
-      "Classes": {
-        "Show": "dd-show-logo",
-        "Locked": "dd-locked-logo"
-      }
-    }
-  },
-  "DispatcherParams": {
-    "SendingProfile": 1,
-    "AddedWho": "DDEnvelopGenerator",
-    "ReminderTypeId": 202377,
-    "EmailAttmt1": ""
-  },
-  "MailParams": {
-    "Placeholders": {
-      "[NAME_PORTAL]": "signFlow",
-      "[SIGNATURE_TYPE]": "signieren",
-      "[REASON]": ""
-    }
-  },
-  "GtxMessagingParams": {
-    "Uri": "https://rest.gtx-messaging.net",
-    "Path": "smsc/sendsms/f566f7e5-bdf2-4a9a-bf52-ed88215a432e/json",
-    "Headers": {},
-    "QueryParams": {
-      "from": "signFlow"
-    }
-  },
-  "TFARegParams": {
-    "TimeLimit": "00:30:00"
-  },
-  "DbTriggerParams": {
-    "Envelope": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
-    "EnvelopeHistory": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
-    "EmailOut": [ "TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD" ],
-    "EnvelopeReceiverReadOnly": [ "TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD" ],
-    "Receiver": [],
-    "EmailTemplate": [ "TBSIG_EMAIL_TEMPLATE_AFT_UPD" ]
-  },
-  "Cache": {
-    "SignatureCacheExpiration": null,
-    "SqlServer": {
-      "ConnectionString": null,
-      "SchemaName": "dbo",
-      "TableName": "TBDD_CACHE"
-    }
-  },
-  "MainPageTitle": null,
-  "AnnotationParams": {
-    "Background": {
-      "Margin": 0.20,
-      "BackgroundColor": {
-        "R": 222,
-        "G": 220,
-        "B": 215
-      },
-      "BorderColor": {
-        "R": 204,
-        "G": 202,
-        "B": 198
-      },
-      "BorderStyle": "underline",
-      "BorderWidth": 4
-    },
-    "DefaultAnnotation": {
-      "Width": 1,
-      "Height": 0.5,
-      "MarginTop": 1
-    },
-    "Annotations": [
-      {
-        "Name": "Signature",
-        "MarginTop": 0
-      },
-      {
-        "Name": "PositionLabel",
-        "VerBoundAnnotName": "Signature",
-        "WidthRatio": 1.2,
-        "HeightRatio": 0.5,
-        "MarginTopRatio": 0.22
-      },
-      {
-        "Name": "Position",
-        "VerBoundAnnotName": "PositionLabel",
-        "WidthRatio": 1.2,
-        "HeightRatio": 0.5,
-        "MarginTopRatio": -0.05
-      },
-      {
-        "Name": "CityLabel",
-        "VerBoundAnnotName": "Position",
-        "WidthRatio": 1.2,
-        "HeightRatio": 0.5,
-        "MarginTopRatio": 0.05
-      },
-      {
-        "Name": "City",
-        "VerBoundAnnotName": "CityLabel",
-        "WidthRatio": 1.2,
-        "HeightRatio": 0.5,
-        "MarginTopRatio": -0.05
-      },
-      {
-        "Name": "DateLabel",
-        "VerBoundAnnotName": "City",
-        "WidthRatio": 1.55,
-        "HeightRatio": 0.5,
-        "MarginTopRatio": 0.05
-      },
-      {
-        "Name": "Date",
-        "VerBoundAnnotName": "DateLabel",
-        "WidthRatio": 1.55,
-        "HeightRatio": 0.5,
-        "MarginTopRatio": -0.1
-      }
-    ]
-  }
-}

EnvelopeGenerator.API/yarp.json

@@ -1,185 +0,0 @@
-{
-"ReverseProxy": {
-  "Routes": {
-    "receiver-ui-root": {
-      "ClusterId": "receiver-ui",
-      "Order": 300,
-      "Match": {
-        "Path": "/",
-        "Methods": [ "GET", "HEAD" ]
-      },
-      "Transforms": [
-        { "PathSet": "/index.html" }
-      ]
-    },
-    "receiver-ui-sender": {
-      "ClusterId": "receiver-ui",
-      "Order": 100,
-      "Match": {
-        "Path": "/sender/{**catch-all}",
-        "Methods": [ "GET", "HEAD" ]
-      },
-      "Transforms": [
-        { "PathSet": "/index.html" }
-      ]
-    },
-    "receiver-ui-envelope": {
-      "ClusterId": "receiver-ui",
-      "Order": 100,
-      "Match": {
-        "Path": "/envelope/{EnvelopeKey}",
-        "Methods": [ "GET", "HEAD" ]
-      },
-      "Transforms": [
-        { "PathSet": "/index.html" }
-      ]
-    },
-    "receiver-ui-envelope-dxreportviewer": {
-      "ClusterId": "receiver-ui",
-      "Order": 90,
-      "Match": {
-        "Path": "/envelope/{EnvelopeKey}/DxReportViewer",
-        "Methods": [ "GET", "HEAD" ]
-      },
-      "Transforms": [
-        { "PathSet": "/index.html" }
-      ]
-    },
-    "receiver-ui-blazor-framework": {
-      "ClusterId": "receiver-ui",
-      "Order": 50,
-      "Match": {
-        "Path": "/_framework/{**catch-all}",
-        "Methods": [ "GET", "HEAD" ]
-      }
-    },
-    "receiver-ui-blazor-content": {
-      "ClusterId": "receiver-ui",
-      "Order": 50,
-      "Match": {
-        "Path": "/_content/{**catch-all}",
-        "Methods": [ "GET", "HEAD" ]
-      }
-    },
-    "receiver-ui-static-css": {
-      "ClusterId": "receiver-ui",
-      "Order": 200,
-      "Match": {
-        "Path": "/css/{**catch-all}",
-        "Methods": [ "GET", "HEAD" ]
-      },
-      "Transforms": [
-        {
-          "ResponseHeader": "Cache-Control",
-          "Set": "no-cache, no-store, must-revalidate",
-          "When": "Always"
-        }
-      ]
-    },
-    "receiver-ui-static-js": {
-      "ClusterId": "receiver-ui",
-      "Order": 200,
-      "Match": {
-        "Path": "/js/{**catch-all}",
-        "Methods": [ "GET", "HEAD" ]
-      },
-      "Transforms": [
-        {
-          "ResponseHeader": "Cache-Control",
-          "Set": "no-cache, no-store, must-revalidate",
-          "When": "Always"
-        }
-      ]
-    },
-    "receiver-ui-fake-data": {
-      "ClusterId": "receiver-ui",
-      "Order": 200,
-      "Match": {
-        "Path": "/fake-data/{**catch-all}",
-        "Methods": [ "GET", "HEAD" ]
-      }
-    },
-    "receiver-ui-appsettings": {
-      "ClusterId": "receiver-ui",
-      "Order": 50,
-      "Match": {
-        "Path": "/appsettings.json",
-        "Methods": [ "GET", "HEAD" ]
-      }
-    },
-    "receiver-ui-appsettings-dev": {
-      "ClusterId": "receiver-ui",
-      "Order": 50,
-      "Match": {
-        "Path": "/appsettings.Development.json",
-        "Methods": [ "GET", "HEAD" ]
-      }
-    },
-    "receiver-ui-styles": {
-      "ClusterId": "receiver-ui",
-      "Order": 50,
-      "Match": {
-        "Path": "/EnvelopeGenerator.ReceiverUI.styles.css",
-        "Methods": [ "GET", "HEAD" ]
-      }
-    },
-    "receiver-ui-fonts": {
-      "ClusterId": "receiver-ui",
-      "Order": 200,
-      "Match": {
-        "Path": "/fonts/{**catch-all}",
-        "Methods": [ "GET", "HEAD" ]
-      }
-    },
-    "receiver-ui-images": {
-      "ClusterId": "receiver-ui",
-      "Order": 200,
-      "Match": {
-        "Path": "/images/{**catch-all}",
-        "Methods": [ "GET", "HEAD" ]
-      }
-    },
-    "auth-login": {
-      "ClusterId": "auth-hub",
-      "Match": {
-        "Path": "/api/auth",
-        "Methods": [ "POST" ]
-      },
-      "Transforms": [
-        { "PathSet": "/api/auth/sign-flow" }
-      ]
-    },
-    "auth-envelope-receiver-login": {
-      "ClusterId": "auth-hub",
-      "Match": {
-        "Path": "/api/Auth/envelope-receiver/{key}",
-        "Methods": [ "POST" ]
-      },
-      "Transforms": [
-        { "PathPattern": "/api/auth/envelope-receiver/{key}" },
-        {
-          "QueryValueParameter": "cookie",
-          "Set": "true"
-        }
-      ]
-    }
-  },
-    "Clusters": {
-      "receiver-ui": {
-        "Destinations": {
-          "primary": {
-            "Address": "https://localhost:52936"
-          }
-        }
-      },
-      "auth-hub": {
-        "Destinations": {
-          "primary": {
-            "Address": "http://172.24.12.39:9090"
-          }
-        }
-      }
-    }
-  }
-}
-

EnvelopeGenerator.Application/Common/Notifications/EnvelopeDeleted/EnvelopeDeletedNotification.cs

@@ -0,0 +1,21 @@
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.EnvelopeDeleted;
+
+public record EnvelopeDeletedNotification : INotification, ISendMailNotification
+{
+    public required Envelope Envelope { get; init; }
+
+    public required EnvelopeReceiver EnvelopeReceiver { get; init; }
+
+    public required string Reason { get; init; }
+
+    public required string SenderReference { get; init; }
+
+    public EmailTemplateType TemplateType => EmailTemplateType.DocumentDeleted;
+
+    public string EmailAddress => EnvelopeReceiver.Receiver?.EmailAddress
+        ?? throw new InvalidOperationException("Receiver email is missing for EnvelopeDeletedNotification.");
+}

EnvelopeGenerator.Application/Common/Notifications/EnvelopeDeleted/Handlers/SendDeletedMailHandler.cs

@@ -0,0 +1,42 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
+using EnvelopeGenerator.Application.Common.Configurations;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using Microsoft.Extensions.Options;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.EnvelopeDeleted.Handlers;
+
+public class SendDeletedMailHandler : SendMailHandler<EnvelopeDeletedNotification>
+{
+    public SendDeletedMailHandler(
+        IRepository<EmailTemplate> tempRepo,
+        IRepository<EmailOut> emailOutRepo,
+        IOptions<MailParams> mailParamsOptions,
+        IOptions<DispatcherParams> dispatcherParamsOptions)
+        : base(tempRepo, emailOutRepo, mailParamsOptions, dispatcherParamsOptions)
+    {
+    }
+
+    protected override void ConfigureEmailOut(EnvelopeDeletedNotification notification, EmailOut emailOut)
+    {
+        emailOut.ReferenceString = notification.EmailAddress;
+        emailOut.ReferenceId = notification.EnvelopeReceiver.ReceiverId;
+        emailOut.WfId = (int)EnvelopeStatus.MessageDeletionSent;
+    }
+
+    protected override Dictionary<string, string> CreatePlaceHolders(EnvelopeDeletedNotification notification)
+    {
+        var senderName = notification.Envelope.User?.Email;
+        if (string.IsNullOrWhiteSpace(senderName))
+            senderName = notification.SenderReference;
+
+        return new Dictionary<string, string>
+        {
+            ["[NAME_RECEIVER]"] = notification.EnvelopeReceiver.Name ?? string.Empty,
+            ["[NAME_SENDER]"] = senderName ?? string.Empty,
+            ["[DOCUMENT_TITLE]"] = notification.Envelope.Title ?? string.Empty,
+            ["[REASON]"] = notification.Reason
+        };
+    }
+}

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs

@@ -1,5 +1,4 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using MediatR;
 using System.ComponentModel.DataAnnotations;
@@ -13,23 +12,29 @@ namespace EnvelopeGenerator.Application.Envelopes.Commands;
 /// </summary>
 public record CreateEnvelopeCommand : IRequest<EnvelopeDto?>
 {
+    public int? EnvelopeId { get; init; }
+
     /// <summary>
     /// Der Titel des Umschlags. Dies ist ein Pflichtfeld.
     /// </summary>
-    [Required]
-    public required string Title { get; set; }
+    public string? Title { get; set; }
 
     /// <summary>
     /// Die Nachricht, die im Umschlag enthalten sein soll. Dies ist ein Pflichtfeld.
     /// </summary>
-    [Required]
-    public required string Message { get; set; }
+    public string? Message { get; set; }
 
     /// <summary>
     /// Gibt an, ob die Zwei-Faktor-Authentifizierung für den Umschlag aktiviert ist. Standardmäßig false.
     /// </summary>
     public bool TFAEnabled { get; set; } = false;
 
+    public bool Send { get; init; }
+
+    public CreateEnvelopeDocumentDto? Document { get; init; }
+
+    public List<CreateEnvelopeReceiverDto> Receivers { get; init; } = new();
+
     /// <summary>
     /// ID des Absenders
     /// </summary>
@@ -55,4 +60,14 @@ public record CreateEnvelopeCommand : IRequest<EnvelopeDto?>
     [JsonIgnore]
     [NotMapped]
     public bool UseSQLExecutor { get; set; } = true;
-}
+}
+
+public record CreateEnvelopeDocumentDto(string DataAsBase64);
+
+public record CreateEnvelopeFieldDto(double X, double Y, int Page);
+
+public record CreateEnvelopeReceiverDto(
+    string EmailAddress,
+    string? Name,
+    string? PhoneNumber,
+    List<CreateEnvelopeFieldDto> Fields);

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs

@@ -2,9 +2,14 @@
 using MediatR;
 using Microsoft.Extensions.DependencyInjection;
 using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
+using EnvelopeGenerator.Application.Histories.Commands;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain;
+using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Application.Envelopes.Commands;
 
@@ -19,6 +24,16 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
 
     private IRepository<Envelope> Repository => _provider.GetRequiredService<IRepository<Envelope>>();
 
+    private IRepository<Document> DocumentRepository => _provider.GetRequiredService<IRepository<Document>>();
+
+    private IRepository<EnvelopeReceiver> EnvelopeReceiverRepository => _provider.GetRequiredService<IRepository<EnvelopeReceiver>>();
+
+    private IRepository<Receiver> ReceiverRepository => _provider.GetRequiredService<IRepository<Receiver>>();
+
+    private IRepository<DocReceiverElement> DocReceiverElementRepository => _provider.GetRequiredService<IRepository<DocReceiverElement>>();
+
+    private IMediator Mediator => _provider.GetRequiredService<IMediator>();
+
     private readonly IMapper _mapper;
 
     /// <summary>
@@ -40,10 +55,321 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
     /// <returns></returns>
     public async Task<EnvelopeDto?> Handle(CreateEnvelopeCommand request, CancellationToken cancel)
     {
-        var envelope = request.UseSQLExecutor
-            ? await Executor.CreateEnvelopeAsync(request.UserId, request.Title, request.Message, request.TFAEnabled, cancel)
-            : await Repository.CreateAsync(request, cancel);
+        var now = DateTime.Now;
+        var title = request.Title?.Trim() ?? string.Empty;
+        var message = request.Message?.Trim() ?? string.Empty;
+
+        Envelope envelope;
+        if (request.EnvelopeId is int envelopeId)
+        {
+            envelope = await Repository.Query
+                .Include(e => e.User)
+                .FirstOrDefaultAsync(e => e.Id == envelopeId, cancel)
+                ?? throw new BadRequestException($"Envelope {envelopeId} not found.");
+
+            if (envelope.UserId != request.UserId)
+                throw new ForbiddenException();
+
+            await Repository.UpdateAsync(e =>
+            {
+                e.Title = title;
+                e.Message = message;
+                e.TfaEnabled = request.TFAEnabled;
+                e.Status = EnvelopeStatus.EnvelopeSaved;
+                e.ChangedWhen = now;
+            }, e => e.Id == envelopeId, cancel);
+
+            envelope.Title = title;
+            envelope.Message = message;
+            envelope.TfaEnabled = request.TFAEnabled;
+            envelope.Status = EnvelopeStatus.EnvelopeSaved;
+            envelope.ChangedWhen = now;
+        }
+        else
+        {
+            envelope = request.UseSQLExecutor
+                ? await Executor.CreateEnvelopeAsync(request.UserId, title, message, request.TFAEnabled, cancel)
+                : await Repository.CreateAsync(new Envelope
+                {
+                    UserId = request.UserId,
+                    Status = EnvelopeStatus.EnvelopeCreated,
+                    Uuid = Guid.NewGuid().ToString(),
+                    Title = title,
+                    Message = message,
+                    AddedWhen = now,
+                    ChangedWhen = now,
+                    Comment = string.Empty,
+                    Language = "de-DE",
+                    TfaEnabled = request.TFAEnabled,
+                    UseAccessCode = false,
+                    SendReminderEmails = false
+                }, cancel);
+
+            await Mediator.Send(new CreateHistoryCommand
+            {
+                EnvelopeId = envelope.Id,
+                UserReference = await ResolveSenderReferenceAsync(envelope, cancel),
+                Status = EnvelopeStatus.EnvelopeCreated
+            }, cancel);
+        }
+
+        await UpsertDocumentAsync(envelope.Id, request.Document, now, cancel);
+        await UpsertReceiversAndFieldsAsync(envelope.Id, request.Receivers, now, cancel);
+
+        if (request.Send)
+            await SendEnvelopeAsync(envelope, cancel);
+
+        envelope = await Repository.Query
+            .Include(e => e.User)
+            .Include(e => e.EnvelopeReceivers)
+                .ThenInclude(er => er.Receiver)
+            .FirstAsync(e => e.Id == envelope.Id, cancel);
 
         return _mapper.Map<EnvelopeDto>(envelope);
     }
-}
+
+    private async Task<string> ResolveSenderReferenceAsync(Envelope envelope, CancellationToken cancel)
+    {
+        if (!string.IsNullOrWhiteSpace(envelope.User?.Email))
+            return envelope.User.Email;
+
+        var senderEmail = await Repository.Query
+            .Where(e => e.Id == envelope.Id)
+            .Select(e => e.User.Email)
+            .FirstOrDefaultAsync(cancel);
+
+        if (string.IsNullOrWhiteSpace(senderEmail))
+            throw new BadRequestException("Envelope sender email is missing.");
+
+        return senderEmail;
+    }
+
+    private async Task UpsertDocumentAsync(int envelopeId, CreateEnvelopeDocumentDto? document, DateTime now, CancellationToken cancel)
+    {
+        if (document is null || string.IsNullOrWhiteSpace(document.DataAsBase64))
+            return;
+
+        byte[] bytes;
+        try
+        {
+            bytes = Convert.FromBase64String(document.DataAsBase64);
+        }
+        catch (FormatException)
+        {
+            throw new BadRequestException("Document payload is not valid base64.");
+        }
+
+        var existingDocumentId = await DocumentRepository.Query
+            .Where(d => d.EnvelopeId == envelopeId)
+            .Select(d => (int?)d.Id)
+            .FirstOrDefaultAsync(cancel);
+
+        if (existingDocumentId is null)
+        {
+            await DocumentRepository.CreateAsync(new Document
+            {
+                EnvelopeId = envelopeId,
+                AddedWhen = now,
+                ByteData = bytes,
+                Filename = string.Empty,
+                Filepath = string.Empty,
+                FileNameOriginal = string.Empty
+            }, cancel);
+
+            return;
+        }
+
+        await DocumentRepository.UpdateAsync(d =>
+        {
+            d.ByteData = bytes;
+        }, d => d.Id == existingDocumentId.Value, cancel);
+    }
+
+    private async Task UpsertReceiversAndFieldsAsync(int envelopeId, IReadOnlyCollection<CreateEnvelopeReceiverDto> receivers, DateTime now, CancellationToken cancel)
+    {
+        var filteredReceivers = receivers
+            .Where(r => !string.IsNullOrWhiteSpace(r.EmailAddress))
+            .Select(r => r with
+            {
+                EmailAddress = r.EmailAddress.Trim().ToLowerInvariant(),
+                Name = r.Name?.Trim(),
+                PhoneNumber = string.IsNullOrWhiteSpace(r.PhoneNumber) ? null : r.PhoneNumber.Trim(),
+                Fields = r.Fields ?? new List<CreateEnvelopeFieldDto>()
+            })
+            .GroupBy(r => r.EmailAddress, StringComparer.OrdinalIgnoreCase)
+            .Select(g => g.First())
+            .ToList();
+
+        if (filteredReceivers.Count == 0)
+            return;
+
+        var document = await DocumentRepository.Query
+            .FirstOrDefaultAsync(d => d.EnvelopeId == envelopeId, cancel);
+
+        if (document is null)
+            return;
+
+        var currentLinks = await EnvelopeReceiverRepository.Query
+            .Include(er => er.Receiver)
+            .Where(er => er.EnvelopeId == envelopeId)
+            .ToListAsync(cancel);
+
+        var linksByEmail = currentLinks
+            .Where(er => !string.IsNullOrWhiteSpace(er.Receiver?.EmailAddress))
+            .GroupBy(er => er.Receiver!.EmailAddress, StringComparer.OrdinalIgnoreCase)
+            .ToDictionary(g => g.Key.ToLowerInvariant(), g => g.First(), StringComparer.OrdinalIgnoreCase);
+
+        var sequence = currentLinks.Count > 0 ? currentLinks.Max(er => er.Sequence) : 0;
+
+        foreach (var receiverDraft in filteredReceivers)
+        {
+            var linkResult = await GetOrCreateEnvelopeReceiverAsync(envelopeId, receiverDraft, linksByEmail, now, sequence, cancel);
+            var link = linkResult.Link;
+            sequence = linkResult.NextSequence;
+
+            await DocReceiverElementRepository.DeleteAsync(query => query
+                .Where(e => e.DocumentId == document.Id)
+                .Where(e => e.ReceiverId == link.ReceiverId), cancel);
+
+            foreach (var field in receiverDraft.Fields.Where(f => f.Page > 0))
+            {
+                await DocReceiverElementRepository.CreateAsync(new DocReceiverElement
+                {
+                    DocumentId = document.Id,
+                    ReceiverId = link.ReceiverId,
+                    ElementType = 1,
+                    X = field.X,
+                    Y = field.Y,
+                    Width = 1.77,
+                    Height = 1.96,
+                    Page = field.Page,
+                    Required = true,
+                    ReadOnly = false,
+                    AnnotationIndex = 0,
+                    AddedWhen = now,
+                    FullName = link.Name,
+                    Position = string.Empty,
+                    Place = string.Empty,
+                    Tooltip = string.Empty
+                }, cancel);
+            }
+        }
+    }
+
+    private async Task<(EnvelopeReceiver Link, int NextSequence)> GetOrCreateEnvelopeReceiverAsync(
+        int envelopeId,
+        CreateEnvelopeReceiverDto receiverDraft,
+        IDictionary<string, EnvelopeReceiver> linksByEmail,
+        DateTime now,
+        int sequence,
+        CancellationToken cancel)
+    {
+        if (linksByEmail.TryGetValue(receiverDraft.EmailAddress, out var existingLink))
+        {
+            var nextName = string.IsNullOrWhiteSpace(receiverDraft.Name) ? existingLink.Name : receiverDraft.Name!;
+            var nextPhoneNumber = receiverDraft.PhoneNumber ?? existingLink.PhoneNumber;
+
+            await EnvelopeReceiverRepository.UpdateAsync(er =>
+            {
+                er.Name = nextName;
+                er.PhoneNumber = nextPhoneNumber;
+                er.ChangedWhen = now;
+            }, er => er.EnvelopeId == existingLink.EnvelopeId && er.ReceiverId == existingLink.ReceiverId, cancel);
+
+            existingLink.Name = nextName;
+            existingLink.PhoneNumber = nextPhoneNumber;
+            return (existingLink, sequence);
+        }
+
+        var receiver = await ReceiverRepository.Query
+            .FirstOrDefaultAsync(r => r.EmailAddress != null && r.EmailAddress.ToLower() == receiverDraft.EmailAddress, cancel);
+
+        if (receiver is null)
+        {
+            receiver = await ReceiverRepository.CreateAsync(new Receiver
+            {
+                EmailAddress = receiverDraft.EmailAddress,
+                Signature = receiverDraft.EmailAddress.ToUpperInvariant().GetChecksum(),
+                AddedWhen = now,
+                TotpSecretkey = string.Empty,
+                TfaRegDeadline = null
+            }, cancel);
+        }
+
+        sequence++;
+        var link = await EnvelopeReceiverRepository.CreateAsync(new EnvelopeReceiver
+        {
+            EnvelopeId = envelopeId,
+            ReceiverId = receiver.Id,
+            Sequence = sequence,
+            Name = receiverDraft.Name ?? receiverDraft.EmailAddress,
+            JobTitle = string.Empty,
+            CompanyName = string.Empty,
+            PrivateMessage = string.Empty,
+            AccessCode = string.Empty,
+            AddedWhen = now,
+            ChangedWhen = now,
+            PhoneNumber = receiverDraft.PhoneNumber ?? string.Empty
+        }, cancel);
+
+        link.Receiver = receiver;
+        linksByEmail[receiverDraft.EmailAddress] = link;
+        return (link, sequence);
+    }
+
+    private async Task SendEnvelopeAsync(Envelope envelope, CancellationToken cancel)
+    {
+        var hasDocument = await DocumentRepository.Query
+            .AnyAsync(d => d.EnvelopeId == envelope.Id && d.ByteData != null && d.ByteData.Length > 0, cancel);
+
+        if (!hasDocument)
+            throw new BadRequestException("Cannot send envelope without a document.");
+
+        var links = await EnvelopeReceiverRepository.Query
+            .Include(er => er.Receiver)
+            .Where(er => er.EnvelopeId == envelope.Id)
+            .ToListAsync(cancel);
+
+        if (links.Count == 0)
+            throw new BadRequestException("Cannot send envelope without receivers.");
+
+        var receiverIds = links.Select(l => l.ReceiverId).Distinct().ToList();
+        var documentIds = await DocumentRepository.Query
+            .Where(d => d.EnvelopeId == envelope.Id)
+            .Select(d => d.Id)
+            .ToListAsync(cancel);
+
+        var receiverFieldCounts = await DocReceiverElementRepository.Query
+            .Where(e => documentIds.Contains(e.DocumentId))
+            .Where(e => receiverIds.Contains(e.ReceiverId))
+            .GroupBy(e => e.ReceiverId)
+            .Select(g => new { ReceiverId = g.Key, Count = g.Count() })
+            .ToDictionaryAsync(x => x.ReceiverId, x => x.Count, cancel);
+
+        var receiversWithoutFields = links
+            .Where(link => !receiverFieldCounts.TryGetValue(link.ReceiverId, out var count) || count <= 0)
+            .Select(link => link.Name)
+            .ToList();
+
+        if (receiversWithoutFields.Count > 0)
+            throw new BadRequestException("Cannot send envelope because some receivers have no signature fields.");
+
+        var changedWhen = DateTime.Now;
+        await Repository.UpdateAsync(e =>
+        {
+            e.Status = EnvelopeStatus.EnvelopeQueued;
+            e.ChangedWhen = changedWhen;
+        }, e => e.Id == envelope.Id, cancel);
+
+        var userReference = await ResolveSenderReferenceAsync(envelope, cancel);
+
+        await Mediator.Send(new CreateHistoryCommand
+        {
+            EnvelopeId = envelope.Id,
+            UserReference = userReference,
+            Status = EnvelopeStatus.EnvelopeQueued
+        }, cancel);
+
+        envelope.Status = EnvelopeStatus.EnvelopeQueued;
+    }
+}

EnvelopeGenerator.Application/Envelopes/Commands/DeleteEnvelopeCommand.cs

@@ -0,0 +1,25 @@
+using System.ComponentModel.DataAnnotations;
+using EnvelopeGenerator.Domain.Constants;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Envelopes.Commands;
+
+public record DeleteEnvelopeResultDto(int EnvelopeId, EnvelopeStatus AppliedStatus, bool IsNoOp);
+
+public record DeleteEnvelopeCommand : IRequest<DeleteEnvelopeResultDto>
+{
+    [Required]
+    public int EnvelopeId { get; init; }
+
+    [Required]
+    [MinLength(1)]
+    public string Reason { get; init; } = string.Empty;
+
+    internal int UserId { get; private set; }
+
+    public DeleteEnvelopeCommand WithAuth(int userId)
+    {
+        UserId = userId;
+        return this;
+    }
+}

EnvelopeGenerator.Application/Envelopes/Commands/DeleteEnvelopeCommandHandler.cs

@@ -0,0 +1,89 @@
+using EnvelopeGenerator.Application.Common.Notifications.EnvelopeDeleted;
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Histories.Commands;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
+
+namespace EnvelopeGenerator.Application.Envelopes.Commands;
+
+public class DeleteEnvelopeCommandHandler : IRequestHandler<DeleteEnvelopeCommand, DeleteEnvelopeResultDto>
+{
+    private readonly IRepository<Envelope> _envelopeRepository;
+    private readonly IMediator _mediator;
+
+    public DeleteEnvelopeCommandHandler(
+        IRepository<Envelope> envelopeRepository,
+        IMediator mediator)
+    {
+        _envelopeRepository = envelopeRepository;
+        _mediator = mediator;
+    }
+
+    public async Task<DeleteEnvelopeResultDto> Handle(DeleteEnvelopeCommand request, CancellationToken cancel)
+    {
+        var reason = request.Reason?.Trim();
+        if (string.IsNullOrWhiteSpace(reason))
+            throw new BadRequestException("Please provide a reason.");
+
+        var envelope = await _envelopeRepository.Query
+            .Include(e => e.User)
+            .Include(e => e.EnvelopeReceivers)
+                .ThenInclude(er => er.Receiver)
+            .FirstOrDefaultAsync(e => e.Id == request.EnvelopeId, cancel)
+            ?? throw new NotFoundException($"Envelope {request.EnvelopeId} not found.");
+
+        if (envelope.UserId != request.UserId)
+            throw new ForbiddenException();
+
+        if (envelope.Status is EnvelopeStatus.EnvelopeDeleted or EnvelopeStatus.EnvelopeWithdrawn)
+            return new DeleteEnvelopeResultDto(envelope.Id, envelope.Status, IsNoOp: true);
+
+        var targetStatus = envelope.Status > EnvelopeStatus.EnvelopeSaved
+            ? EnvelopeStatus.EnvelopeWithdrawn
+            : EnvelopeStatus.EnvelopeDeleted;
+
+        var changedWhen = DateTime.Now;
+        envelope.Status = targetStatus;
+        envelope.Comment = reason;
+        envelope.ChangedWhen = changedWhen;
+
+        await _envelopeRepository.UpdateAsync(e =>
+        {
+            e.Status = targetStatus;
+            e.Comment = reason;
+            e.ChangedWhen = changedWhen;
+        }, e => e.Id == envelope.Id, cancel);
+
+        var userReference = envelope.User?.Email;
+        if (string.IsNullOrWhiteSpace(userReference))
+            throw new BadRequestException("Envelope sender email is missing.");
+
+        await _mediator.Send(new CreateHistoryCommand
+        {
+            EnvelopeId = envelope.Id,
+            UserReference = userReference,
+            Status = targetStatus,
+            Comment = reason
+        }, cancel);
+
+        foreach (var envelopeReceiver in envelope.EnvelopeReceivers ?? Enumerable.Empty<EnvelopeReceiver>())
+        {
+            if (envelopeReceiver.Receiver is null)
+                continue;
+
+            await _mediator.Publish(new EnvelopeDeletedNotification
+            {
+                Envelope = envelope,
+                EnvelopeReceiver = envelopeReceiver,
+                Reason = reason,
+                SenderReference = userReference
+            }, cancel);
+        }
+
+        return new DeleteEnvelopeResultDto(envelope.Id, targetStatus, IsNoOp: false);
+    }
+}

EnvelopeGenerator.Infrastructure/DependencyInjection.cs

@@ -214,4 +214,4 @@ namespace EnvelopeGenerator.Infrastructure
 #endif
         }
     }
-}
+}

EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/EnvelopeService.cs

@@ -1,4 +1,5 @@
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Envelopes.Commands;
 using Microsoft.AspNetCore.WebUtilities;
 using System.Net.Http;
 using System.Net.Http.Json;
@@ -12,6 +13,8 @@ namespace EnvelopeGenerator.Server.Client.Services;
 public class EnvelopeService(IHttpClientFactory clientFactory)
 {
     private static readonly JsonSerializerOptions _jsonOptions = new(JsonSerializerDefaults.Web);
+    private sealed record DeleteEnvelopeRequest(string Reason);
+    private sealed record ErrorResponse(string? Message);
 
     /// <summary>
     /// Fetches envelopes from the API with optional filters.
@@ -61,4 +64,83 @@ public class EnvelopeService(IHttpClientFactory clientFactory)
 
         return await response.Content.ReadFromJsonAsync<IEnumerable<EnvelopeDto>>(_jsonOptions, cancel);
     }
+
+    public async Task DeleteAsync(int envelopeId, string reason, CancellationToken cancel = default)
+    {
+        var httpClient = clientFactory.CreateClient("EnvelopeGenerator.Server");
+        using var request = new HttpRequestMessage(HttpMethod.Delete, $"/api/Envelope/{envelopeId}")
+        {
+            Content = JsonContent.Create(new DeleteEnvelopeRequest(reason), options: _jsonOptions)
+        };
+
+        var response = await httpClient.SendAsync(request, cancel);
+        if (response.IsSuccessStatusCode)
+            return;
+
+        string? message = null;
+        try
+        {
+            var error = await response.Content.ReadFromJsonAsync<ErrorResponse>(_jsonOptions, cancel);
+            message = error?.Message;
+        }
+        catch
+        {
+            message = null;
+        }
+
+        var statusCode = (int)response.StatusCode;
+        var reasonPhrase = response.ReasonPhrase ?? "Unknown error";
+        throw new HttpRequestException(
+            $"Failed to delete envelope. Status: {statusCode} ({reasonPhrase}){(string.IsNullOrWhiteSpace(message) ? string.Empty : $" - {message}")}",
+            null,
+            response.StatusCode);
+    }
+
+    public async Task<EnvelopeDto?> UpsertAsync(
+        CreateEnvelopeCommand request,
+        CancellationToken cancel = default)
+    {
+        var httpClient = clientFactory.CreateClient("EnvelopeGenerator.Server");
+        var payload = new
+        {
+            EnvelopeId = request.EnvelopeId,
+            Title = request.Title,
+            Message = request.Message,
+            TFAEnabled = request.TFAEnabled,
+            Send = request.Send,
+            Document = request.Document is null
+                ? null
+                : new { DataAsBase64 = request.Document.DataAsBase64 },
+            Receivers = request.Receivers.Select(r => new
+            {
+                EmailAddress = r.EmailAddress,
+                Name = r.Name,
+                PhoneNumber = r.PhoneNumber,
+                Fields = r.Fields.Select(f => new { X = f.X, Y = f.Y, Page = f.Page }).ToList()
+            }).ToList()
+        };
+
+        var response = await httpClient.PostAsJsonAsync("/api/Envelope", payload, _jsonOptions, cancel);
+
+        if (response.IsSuccessStatusCode)
+            return await response.Content.ReadFromJsonAsync<EnvelopeDto>(_jsonOptions, cancel);
+
+        string? message = null;
+        try
+        {
+            var error = await response.Content.ReadFromJsonAsync<ErrorResponse>(_jsonOptions, cancel);
+            message = error?.Message;
+        }
+        catch
+        {
+            message = null;
+        }
+
+        var statusCode = (int)response.StatusCode;
+        var reasonPhrase = response.ReasonPhrase ?? "Unknown error";
+        throw new HttpRequestException(
+            $"Failed to save envelope. Status: {statusCode} ({reasonPhrase}){(string.IsNullOrWhiteSpace(message) ? string.Empty : $" - {message}")}",
+            null,
+            response.StatusCode);
+    }
 }

EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeSenderEditorPage.razor

@@ -3,9 +3,11 @@
 @using DevExpress.Blazor.PdfViewer
 @using DevExpress.Blazor.Reporting.Models
 @using DevExpress.Blazor
-@using EnvelopeGenerator.Application.EnvelopeReceivers.Commands
+@using EnvelopeGenerator.Application.Common.Dto
+@using EnvelopeGenerator.Application.Envelopes.Commands
 @using EnvelopeGenerator.Server.Client.Services
 @using EnvelopeGenerator.Server.Services
+@using Microsoft.AspNetCore.WebUtilities
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.Extensions.Caching.Memory
 @inject IJSRuntime JSRuntime
@@ -13,7 +15,8 @@
 @inject AppVersionService AppVersion
 @inject ILogger<EnvelopeSenderEditorPage> Logger
 @inject EnvelopeReceiverPageDataService ReceiverPageDataService
-@inject EnvelopeReceiverService EnvelopeReceiverService
+@inject EnvelopeService EnvelopeService
+@inject IEnvelopeAuthService EnvelopeAuthService
 @inject IMemoryCache MemoryCache
 
 <link href="_content/DevExpress.Blazor.Themes/blazing-berry.bs5.min.css" rel="stylesheet" />
@@ -169,41 +172,55 @@
                                style="display: none;" />
                 </label>
 
-                @if (_pdfLoaded)
+                @if (_pdfLoaded && _signatureFields.Count > 0)
                 {
-                    @* Clear all fields *@
-                    @if (_signatureFields.Count > 0)
-                    {
-                        <button class="pdf-toolbar__btn pdf-toolbar__btn--reset"
-                                @onclick="ClearAllFieldsAsync"
-                                title="Alle Signaturfelder entfernen">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16">
-                                <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z" />
-                                <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1 0-2h3a1 1 0 0 1 1-1h3a1 1 0 0 1 1 1h3a1 1 0 0 1 1 1zM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3h11V2h-11v1z" />
-                            </svg>
-                        </button>
-                    }
-
-                    @* Save *@
-                    <button class="pdf-toolbar__btn pdf-toolbar__btn--success"
-                            @onclick="SaveAsync"
-                            disabled="@_isSaving"
-                            title="Speichern"
-                            style="background: linear-gradient(135deg,#059669,#047857); color:#fff; border-radius:6px; padding:0.3rem 0.75rem; font-size:0.75rem; font-weight:600; border:none;">
-                        @if (_isSaving)
-                        {
-                            <span class="spinner-border spinner-border-sm me-1" role="status"
-                                  style="width:0.8rem;height:0.8rem;border-width:2px;"></span>
-                        }
-                        else
-                        {
-                            <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" class="me-1" viewBox="0 0 16 16">
-                                <path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z" />
-                            </svg>
-                        }
-                        Speichern
+                    <button class="pdf-toolbar__btn pdf-toolbar__btn--reset"
+                            @onclick="ClearAllFieldsAsync"
+                            title="Alle Signaturfelder entfernen">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16">
+                            <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z" />
+                            <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1 0-2h3a1 1 0 0 1 1-1h3a1 1 0 0 1 1 1h3a1 1 0 0 1 1 1zM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3h11V2h-11v1z" />
+                        </svg>
                     </button>
                 }
+
+                <button class="pdf-toolbar__btn pdf-toolbar__btn--draft"
+                        @onclick="SaveDraftAsync"
+                        disabled="@_isSaving"
+                        title="Speichern">
+                    @if (_isSaving)
+                    {
+                        <span class="spinner-border spinner-border-sm me-1" role="status"
+                              style="width:0.8rem;height:0.8rem;border-width:2px;"></span>
+                    }
+                    else
+                    {
+                        <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" class="me-1" viewBox="0 0 16 16">
+                            <path d="M2 2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V5.414A2 2 0 0 0 15.414 4L12 0.586A2 2 0 0 0 10.586 0H2zm9 1.5v2A1.5 1.5 0 0 1 9.5 7h-3A1.5 1.5 0 0 1 5 5.5v-4h5.586a1 1 0 0 1 .707.293L14.207 4.707A1 1 0 0 1 14.5 5.414V12a.5.5 0 0 1-.5.5H2a.5.5 0 0 1-.5-.5V4A.5.5 0 0 1 2 3.5h9z"/>
+                            <path d="M5.5 1.5v4a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-4h-4zM4 9a1 1 0 0 0-1 1v3h10v-3a1 1 0 0 0-1-1H4z"/>
+                        </svg>
+                    }
+                    <span class="pdf-toolbar__btn-text">Speichern</span>
+                </button>
+
+                <button class="pdf-toolbar__btn pdf-toolbar__btn--success"
+                        @onclick="SendAsync"
+                        disabled="@_isSaving"
+                        title="Umschlag senden"
+                        style="background: linear-gradient(135deg,#059669,#047857); color:#fff; border-radius:6px; padding:0.3rem 0.75rem; font-size:0.75rem; font-weight:600; border:none;">
+                    @if (_isSaving)
+                    {
+                        <span class="spinner-border spinner-border-sm me-1" role="status"
+                              style="width:0.8rem;height:0.8rem;border-width:2px;"></span>
+                    }
+                    else
+                    {
+                        <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" class="me-1" viewBox="0 0 16 16">
+                            <path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z" />
+                        </svg>
+                    }
+                    Senden
+                </button>
             </div>
         </div>
 
@@ -358,7 +375,7 @@
 
 @* ── Save result popup (success + error) ── *@
 <DxPopup @bind-Visible="_savePopupVisible"
-         HeaderText="@(_saveErrorMessage is null ? "Umschlag erstellt" : "Fehler")"
+         HeaderText="@(_saveErrorMessage is null ? _saveSuccessHeader : "Fehler")"
          Width="460px"
          MaxWidth="95vw"
          ShowFooter="true"
@@ -377,10 +394,10 @@
                 </div>
                 <div>
                     <p style="margin:0 0 0.4rem;font-weight:600;color:#1f2937;font-size:0.95rem;">
-                        Umschlag wurde erfolgreich erstellt.
+                        @_saveSuccessTitle
                     </p>
                     <p style="margin:0;color:#6b7280;font-size:0.85rem;line-height:1.5;">
-                        Der Umschlag wurde gespeichert und die Empfänger wurden benachrichtigt.
+                        @_saveSuccessBody
                     </p>
                 </div>
             </div>
@@ -410,12 +427,21 @@
         <div style="display:flex;gap:0.5rem;justify-content:flex-end;width:100%;padding:0.5rem 0;">
             @if (_saveErrorMessage is null)
             {
-                <button class="btn btn-primary"
-                        @onclick="GoToDashboard"
-                        style="background:linear-gradient(135deg,#059669,#047857);border:none;border-radius:6px;
-                                   padding:0.5rem 1.5rem;font-weight:600;color:#fff;">
-                    Zur Übersicht
+                <button class="btn btn-outline-secondary"
+                        @onclick="() => _savePopupVisible = false"
+                        style="border-radius:6px;padding:0.5rem 1.25rem;font-weight:500;">
+                    Schließen
                 </button>
+
+                @if (_saveNavigateToDashboard)
+                {
+                    <button class="btn btn-primary"
+                            @onclick="GoToDashboard"
+                            style="background:linear-gradient(135deg,#059669,#047857);border:none;border-radius:6px;
+                                       padding:0.5rem 1.5rem;font-weight:600;color:#fff;">
+                        Zur Übersicht
+                    </button>
+                }
             }
             else
             {
@@ -434,6 +460,9 @@
     [SupplyParameterFromQuery(Name = "esid")]
     public string? Esid { get; set; }
 
+    [SupplyParameterFromQuery(Name = "envelopeId")]
+    public int? EnvelopeId { get; set; }
+
     // ── Constants ──
     // Signature field size in PDF points (fixed): 1.77" × 1.96"
     const double SigWidthPt = 1.77 * 72;   // 127.44 pt
@@ -452,6 +481,9 @@
     string? _errorMessage;
     byte[]? _pdfBytes;          // Current rendered PDF (original + placeholders burned in)
     byte[]? _originalPdfBytes;  // Pristine upload — never modified, used as base for redraw
+    int? _loadedEnvelopeId;
+    int? _editingEnvelopeId;
+    bool _isLoadingEnvelopeForEdit;
 
     List<SignatureFieldDraft> _signatureFields = [];
     ReceiverDraft? _pendingReceiverForPlacement; // Set when user clicks "Signatur hinzufügen"
@@ -460,6 +492,10 @@
     bool _isSaving = false;
     bool _savePopupVisible = false;
     string? _saveErrorMessage = null;
+    string _saveSuccessHeader = "Erfolg";
+    string _saveSuccessTitle = "Vorgang erfolgreich abgeschlossen.";
+    string _saveSuccessBody = string.Empty;
+    bool _saveNavigateToDashboard = false;
 
     // ── Envelope metadata ──
     string _envelopeTitle = string.Empty;
@@ -481,6 +517,7 @@
 
     // ── Cache key helper ──
     string SessionKey => $"sender-editor:{Esid}";
+    bool IsEditMode => EnvelopeId.HasValue && EnvelopeId.Value > 0;
 
     // ── Lifecycle ──
 
@@ -500,12 +537,27 @@
         if (string.IsNullOrWhiteSpace(Esid))
         {
             var sid = Guid.NewGuid().ToString("N");
-            NavigationManager.NavigateTo($"/sender/editor?esid={sid}", forceLoad: false);
+            var editQuery = EnvelopeId.HasValue && EnvelopeId.Value > 0
+                ? $"&envelopeId={EnvelopeId.Value}"
+                : string.Empty;
+            NavigationManager.NavigateTo($"/sender/editor?esid={sid}{editQuery}", forceLoad: false);
         }
     }
 
-    protected override void OnParametersSet()
+    protected override async Task OnParametersSetAsync()
     {
+        if (EnvelopeId.HasValue && EnvelopeId.Value > 0)
+            _editingEnvelopeId = EnvelopeId.Value;
+
+        if (IsEditMode && _loadedEnvelopeId != EnvelopeId)
+        {
+            await LoadEnvelopeForEditAsync(EnvelopeId!.Value);
+            return;
+        }
+
+        if (IsEditMode)
+            return;
+
         // After the esid is set via query param, try to restore from cache.
         if (!string.IsNullOrWhiteSpace(Esid)
             && MemoryCache.TryGetValue(SessionKey, out EditorSessionData? cached)
@@ -525,6 +577,90 @@
         }
     }
 
+    async Task LoadEnvelopeForEditAsync(int envelopeId)
+    {
+        if (_isLoadingEnvelopeForEdit)
+            return;
+
+        _isLoadingEnvelopeForEdit = true;
+        _errorMessage = null;
+
+        try
+        {
+            var user = EnvelopeAuthService.GetCurrentUser();
+            if (user?.Identity is null || !user.Identity.IsAuthenticated)
+                throw new InvalidOperationException("Sender is not authenticated.");
+
+            var envelopes = await EnvelopeService.GetAsync(id: envelopeId);
+            var envelope = envelopes?.FirstOrDefault()
+                ?? throw new InvalidOperationException($"Envelope {envelopeId} not found.");
+
+            var document = await ReceiverPageDataService.GetDocumentDetailsOfSenderAsync(user, envelopeId);
+
+            _envelopeTitle = envelope.Title ?? string.Empty;
+            _envelopeMessage = envelope.Message ?? string.Empty;
+
+            var envelopeReceivers = envelope.EnvelopeReceivers?.ToList() ?? [];
+            _receivers = envelopeReceivers
+                .Select((er, index) => new ReceiverDraft(
+                    Guid.NewGuid(),
+                    er.Name ?? er.Receiver?.EmailAddress ?? $"Receiver {er.ReceiverId}",
+                    er.Receiver?.EmailAddress ?? string.Empty,
+                    string.Empty,
+                    ReceiverPalette[index % ReceiverPalette.Length]))
+                .ToList();
+
+            var receiverById = envelopeReceivers.ToDictionary(er => er.ReceiverId, er => er);
+            var colorByEmail = _receivers
+                .Where(r => !string.IsNullOrWhiteSpace(r.Email))
+                .GroupBy(r => r.Email, StringComparer.OrdinalIgnoreCase)
+                .ToDictionary(g => g.Key, g => g.First().Color, StringComparer.OrdinalIgnoreCase);
+
+            _signatureFields = (document?.Elements ?? Enumerable.Empty<DocReceiverElementDto>())
+                .Select(element =>
+                {
+                    receiverById.TryGetValue(element.ReceiverId, out var envelopeReceiver);
+
+                    var receiverName = envelopeReceiver?.Name
+                        ?? envelopeReceiver?.Receiver?.EmailAddress
+                        ?? element.FullName
+                        ?? $"Receiver {element.ReceiverId}";
+
+                    var receiverEmail = envelopeReceiver?.Receiver?.EmailAddress;
+                    var color = (!string.IsNullOrWhiteSpace(receiverEmail) && colorByEmail.TryGetValue(receiverEmail, out var receiverColor))
+                        ? receiverColor
+                        : ReceiverPalette[Math.Abs(element.ReceiverId) % ReceiverPalette.Length];
+
+                    return new SignatureFieldDraft(
+                        XPt: element.X * 72.0,
+                        YPt: element.Y * 72.0,
+                        Page: element.Page,
+                        ReceiverName: receiverName,
+                        Color: color);
+                })
+                .ToList();
+
+            _originalPdfBytes = document?.ByteData;
+            _pdfLoaded = _originalPdfBytes is { Length: > 0 };
+            _pdfBytes = _pdfLoaded
+                ? DrawPlaceholders(_originalPdfBytes!, _signatureFields)
+                : null;
+            _fileName = $"Envelope-{envelopeId}.pdf";
+            _pendingReceiverForPlacement = null;
+            _loadedEnvelopeId = envelopeId;
+            _editingEnvelopeId = envelopeId;
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Failed to load envelope {EnvelopeId} for edit mode", envelopeId);
+            _errorMessage = $"Fehler beim Laden des Umschlags #{envelopeId}: {ex.Message}";
+        }
+        finally
+        {
+            _isLoadingEnvelopeForEdit = false;
+        }
+    }
+
     // ── PDF upload ──
     async Task OnPdfFileSelectedAsync(InputFileChangeEventArgs e)
     {
@@ -670,8 +806,48 @@
         NavigationManager.NavigateTo("/sender");
     }
 
-    // ── Save — POST /api/EnvelopeReceiver ──
-    async Task SaveAsync()
+    async Task SaveDraftAsync()
+    {
+        _isSaving = true;
+        _saveErrorMessage = null;
+        await InvokeAsync(StateHasChanged);
+
+        try
+        {
+            var previousEnvelopeId = EnvelopeId;
+            var command = BuildCreateEnvelopeCommand(send: false);
+            Logger.LogInformation("[SenderEditor] Saving draft. EnvelopeId={EnvelopeId} IsEditMode={IsEditMode}", command.EnvelopeId, IsEditMode);
+            var result = await EnvelopeService.UpsertAsync(command);
+
+            if (result is null)
+                throw new InvalidOperationException("Draft save did not return a result.");
+
+            EnvelopeId = result.Id;
+            _loadedEnvelopeId = result.Id;
+            _editingEnvelopeId = result.Id;
+
+            if (previousEnvelopeId != result.Id)
+            {
+                var sid = string.IsNullOrWhiteSpace(Esid) ? Guid.NewGuid().ToString("N") : Esid;
+                NavigationManager.NavigateTo($"/sender/editor?esid={sid}&envelopeId={result.Id}", forceLoad: false);
+            }
+
+            NavigationManager.NavigateTo("/sender", forceLoad: false);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "[SenderEditor] Failed to save draft");
+            _saveErrorMessage = ex.Message;
+            _savePopupVisible = true;
+        }
+        finally
+        {
+            _isSaving = false;
+        }
+    }
+
+    // ── Send envelope ──
+    async Task SendAsync()
     {
         // ── Validation ──
         _titleTouched = true;
@@ -717,57 +893,38 @@
 
         try
         {
-            // ── Build request ──
-            // Document: use the ORIGINAL pdf (without placeholder burn-in) as base64
-            var docBase64 = Convert.ToBase64String(_originalPdfBytes);
+            var envelopeId = _editingEnvelopeId
+                ?? EnvelopeId
+                ?? _loadedEnvelopeId
+                ?? GetEnvelopeIdFromCurrentUri();
 
-            // Build receivers list — each receiver gets their own signature fields
-            // Coordinate conversion: PDF points → inches (DB stores inches)
-            var receiversCmd = _receivers.Select(receiver =>
+            if (!envelopeId.HasValue || envelopeId.Value <= 0)
             {
-                var fields = _signatureFields
-                    .Where(f => f.ReceiverName == receiver.FullName)
-                    .Select(f => new DocReceiverElementCreateDto(
-                        X: f.XPt / 72.0,
-                        Y: f.YPt / 72.0,
-                        Page: f.Page))
-                    .ToList();
+                var saveResult = await EnvelopeService.UpsertAsync(BuildCreateEnvelopeCommand(send: false))
+                    ?? throw new InvalidOperationException("Draft save did not return a result.");
 
-                return new ReceiverGetOrCreateCommand
-                {
-                    EmailAddress = receiver.Email,
-                    Salution = receiver.FullName,
-                    PhoneNumber = string.IsNullOrWhiteSpace(receiver.PhoneNumber)
-                                            ? null
-                                            : receiver.PhoneNumber,
-                    DocReceiverElements = fields,
-                };
-            }).ToList();
+                envelopeId = saveResult.Id;
+                EnvelopeId = saveResult.Id;
+                _loadedEnvelopeId = saveResult.Id;
+                _editingEnvelopeId = saveResult.Id;
+            }
 
-            var command = new CreateEnvelopeReceiverCommand
-            {
-                Title = _envelopeTitle.Trim(),
-                Message = string.IsNullOrWhiteSpace(_envelopeMessage)
-                                 ? "Bitte unterzeichnen Sie das beigefügte Dokument."
-                                 : _envelopeMessage.Trim(),
-                TFAEnabled = false,
-                Document = new DocumentCreateCommand { DataAsBase64 = docBase64 },
-                Receivers = receiversCmd,
-            };
+            var sendResult = await EnvelopeService.UpsertAsync(BuildCreateEnvelopeCommand(send: true) with { EnvelopeId = envelopeId })
+                ?? throw new InvalidOperationException("Send did not return a result.");
 
-            var result = await EnvelopeReceiverService.CreateAsync(command);
-
-            Logger.LogInformation(
-                "[SenderEditor] Envelope created. Id={Id} SentReceivers={Count}",
-                result?.Id, result?.SentReceiver.Count());
+            Logger.LogInformation("[SenderEditor] Envelope sent from draft. Id={Id} Status={Status}", sendResult.Id, sendResult.Status);
 
             // Success — show popup; GoToDashboard clears cache and navigates
             _saveErrorMessage = null;
+            _saveSuccessHeader = "Umschlag gesendet";
+            _saveSuccessTitle = "Umschlag wurde erfolgreich gesendet.";
+            _saveSuccessBody = "Der bestehende Entwurf wurde versendet.";
+            _saveNavigateToDashboard = true;
             _savePopupVisible = true;
         }
         catch (Exception ex)
         {
-            Logger.LogError(ex, "[SenderEditor] Failed to create envelope");
+            Logger.LogError(ex, "[SenderEditor] Failed to send envelope draft");
             _saveErrorMessage = ex.Message;
             _savePopupVisible = true;
         }
@@ -777,6 +934,71 @@
         }
     }
 
+    CreateEnvelopeCommand BuildCreateEnvelopeCommand(bool send)
+    {
+        var envelopeId = _editingEnvelopeId
+            ?? EnvelopeId
+            ?? _loadedEnvelopeId
+            ?? GetEnvelopeIdFromCurrentUri();
+
+        if (IsEditMode && envelopeId is null)
+            throw new InvalidOperationException("Edit mode envelope id is missing.");
+
+        var docBase64 = _originalPdfBytes is { Length: > 0 }
+            ? Convert.ToBase64String(_originalPdfBytes)
+            : null;
+
+        var receiverCommands = _receivers.Select(receiver =>
+        {
+            var fields = _signatureFields
+                .Where(f => f.ReceiverName == receiver.FullName)
+            .Select(f => new CreateEnvelopeFieldDto(
+                    X: f.XPt / 72.0,
+                    Y: f.YPt / 72.0,
+                    Page: f.Page))
+                .ToList();
+
+            return new CreateEnvelopeReceiverDto(
+                EmailAddress: receiver.Email,
+                Name: receiver.FullName,
+                PhoneNumber: string.IsNullOrWhiteSpace(receiver.PhoneNumber) ? null : receiver.PhoneNumber,
+                Fields: fields);
+        }).ToList();
+
+        return new CreateEnvelopeCommand
+        {
+            EnvelopeId = envelopeId,
+            Title = _envelopeTitle,
+            Message = _envelopeMessage,
+            TFAEnabled = false,
+            Send = send,
+            Document = string.IsNullOrWhiteSpace(docBase64) ? null : new CreateEnvelopeDocumentDto(docBase64),
+            Receivers = receiverCommands
+        };
+    }
+
+    int? GetEnvelopeIdFromCurrentUri()
+    {
+        try
+        {
+            var uri = NavigationManager.ToAbsoluteUri(NavigationManager.Uri);
+            if (string.IsNullOrWhiteSpace(uri.Query))
+                return null;
+
+            var query = QueryHelpers.ParseQuery(uri.Query);
+            if (!query.TryGetValue("envelopeId", out var raw))
+                return null;
+
+            return int.TryParse(raw.ToString(), out var id) && id > 0
+                ? id
+                : null;
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
     // ── Cache persistence ──
     void PersistSession()
     {

EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeSenderPage.razor

@@ -73,7 +73,7 @@
                     Neuer Umschlag
                 </button>
 
-                <button class="sender-btn" @onclick="EditEnvelope" disabled="@(_selectedEnvelope == null || IsEnvelopeSent(_selectedEnvelope))" title="Ausgewählten Umschlag bearbeiten">
+                <button class="sender-btn" @onclick="EditEnvelope" disabled="@(_selectedEnvelope == null || !IsEnvelopeEditable(_selectedEnvelope))" title="Ausgewählten Umschlag bearbeiten">
                     <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
                         <path d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z" />
                     </svg>
@@ -521,6 +521,54 @@
     </BodyContentTemplate>
 </DxPopup>
 
+<DxPopup @bind-Visible="@_deletePopupVisible"
+         HeaderText="Umschlag löschen"
+         Width="560px"
+         MaxWidth="95vw"
+         ShowFooter="true"
+         CloseOnOutsideClick="false"
+         ShowCloseButton="true"
+         CloseOnEscape="true"
+         ShowHeader="true"
+         CssClass="sender-delete-popup">
+    <BodyContentTemplate>
+        <div style="display:flex;flex-direction:column;gap:0.75rem;">
+            <p style="margin:0;color:#374151;font-size:0.9rem;line-height:1.45;">
+                Bitte geben Sie einen Grund an, warum der Umschlag gelöscht/zurückgezogen werden soll.
+            </p>
+            @if (_selectedEnvelope is not null)
+            {
+                <p style="margin:0;color:#6b7280;font-size:0.825rem;">
+                    Umschlag: <strong>#@_selectedEnvelope.Id - @_selectedEnvelope.Title</strong>
+                </p>
+            }
+            <DxMemo @bind-Text="_deleteReason"
+                    NullText="Begründung eingeben..."
+                    Rows="5"
+                    MaxLength="2000"
+                    CssClass="w-100" />
+            @if (!string.IsNullOrWhiteSpace(_deleteErrorMessage))
+            {
+                <div class="alert alert-danger" style="margin:0;padding:0.5rem 0.75rem;font-size:0.85rem;">
+                    @_deleteErrorMessage
+                </div>
+            }
+        </div>
+    </BodyContentTemplate>
+    <FooterContentTemplate>
+        <div style="display:flex;justify-content:flex-end;gap:0.5rem;width:100%;">
+            <DxButton Text="Abbrechen"
+                      RenderStyle="ButtonRenderStyle.Secondary"
+                      Click="CloseDeletePopup"
+                      Enabled="@(!_isDeletingEnvelope)" />
+            <DxButton Text="Löschen"
+                      RenderStyle="ButtonRenderStyle.Danger"
+                      Click="ConfirmDeleteEnvelopeAsync"
+                      Enabled="@(!_isDeletingEnvelope)" />
+        </div>
+    </FooterContentTemplate>
+</DxPopup>
+
 @code {
     private IEnumerable<EnvelopeDto>? _allEnvelopes;
     private IEnumerable<EnvelopeDto>? _activeEnvelopes;
@@ -549,6 +597,11 @@
     private bool _exportSelectedRowsOnly = false;
     private bool _isExporting = false;
 
+    private bool _deletePopupVisible = false;
+    private bool _isDeletingEnvelope = false;
+    private string _deleteReason = string.Empty;
+    private string? _deleteErrorMessage;
+
     // Stable keys used to store/restore each grid's layout in UserPreferences.GridLayouts
     private const string GridKeyActive = "sender.active-envelopes";
     private const string GridKeyCompleted = "sender.completed-envelopes";
@@ -675,13 +728,59 @@
     void EditEnvelope()
     {
         if (_selectedEnvelope == null) return;
-        // TODO: Navigate to envelope editor
+        if (!IsEnvelopeEditable(_selectedEnvelope)) return;
+
+        Navigation.NavigateTo($"/sender/editor?envelopeId={_selectedEnvelope.Id}");
     }
 
     void DeleteEnvelope()
     {
         if (_selectedEnvelope == null) return;
-        // TODO: Show delete confirmation dialog
+        _deleteReason = string.Empty;
+        _deleteErrorMessage = null;
+        _deletePopupVisible = true;
+    }
+
+    void CloseDeletePopup()
+    {
+        if (_isDeletingEnvelope)
+            return;
+
+        _deletePopupVisible = false;
+        _deleteErrorMessage = null;
+    }
+
+    async Task ConfirmDeleteEnvelopeAsync()
+    {
+        if (_selectedEnvelope is null)
+            return;
+
+        if (string.IsNullOrWhiteSpace(_deleteReason))
+        {
+            _deleteErrorMessage = "Bitte geben Sie einen Löschgrund an.";
+            return;
+        }
+
+        _isDeletingEnvelope = true;
+        _deleteErrorMessage = null;
+        await InvokeAsync(StateHasChanged);
+
+        try
+        {
+            await EnvelopeService.DeleteAsync(_selectedEnvelope.Id, _deleteReason.Trim());
+            _deletePopupVisible = false;
+            _selectedEnvelope = null;
+            await LoadEnvelopesAsync();
+        }
+        catch (Exception ex)
+        {
+            _deleteErrorMessage = ex.Message;
+        }
+        finally
+        {
+            _isDeletingEnvelope = false;
+            await InvokeAsync(StateHasChanged);
+        }
     }
 
     async Task LogoutAsync()
@@ -699,6 +798,12 @@
         return status >= EnvelopeStatus.EnvelopeQueued;
     }
 
+    bool IsEnvelopeEditable(EnvelopeDto envelope)
+    {
+        var status = (EnvelopeStatus)envelope.Status;
+        return status is EnvelopeStatus.EnvelopeCreated or EnvelopeStatus.EnvelopeSaved;
+    }
+
     (string Label, string CssClass, string DotColor) GetStatusInfo(EnvelopeStatus status)
     {
         return status switch

EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeController.cs

@@ -27,6 +27,8 @@ namespace EnvelopeGenerator.Server.Controllers;
 [Authorize]
 public class EnvelopeController : ControllerBase
 {
+    public record DeleteEnvelopeRequest(string Reason);
+
     private readonly ILogger<EnvelopeController> _logger;
     private readonly IMediator _mediator;
 
@@ -93,7 +95,6 @@ public class EnvelopeController : ControllerBase
     /// </summary>
     /// <param name="command"></param>
     /// <returns></returns>
-    [NonAction]
     [Authorize(AuthenticationSchemes = AuthScheme.Sender)]
     [HttpPost]
     public async Task<IActionResult> CreateAsync([FromBody] CreateEnvelopeCommand command)
@@ -108,4 +109,18 @@ public class EnvelopeController : ControllerBase
         else
             return Ok(res);
     }
-}
+
+    [Authorize(AuthenticationSchemes = AuthScheme.Sender)]
+    [HttpDelete("{id:int}")]
+    public async Task<IActionResult> DeleteAsync([FromRoute] int id, [FromBody] DeleteEnvelopeRequest request)
+    {
+        var result = await _mediator.Send(new DeleteEnvelopeCommand
+        {
+            EnvelopeId = id,
+            Reason = request?.Reason ?? string.Empty
+        }.WithAuth(User.GetId()));
+
+        return Ok(result);
+    }
+
+}

EnvelopeGenerator.Server/EnvelopeGenerator.Server/Middleware/ExceptionHandlingMiddleware.cs

@@ -69,6 +69,11 @@ public class ExceptionHandlingMiddleware
                 message = notFoundEx.Message;
                 break;
 
+            case ForbiddenException forbiddenEx:
+                context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                message = forbiddenEx.Message;
+                break;
+
             default:
                 logger.LogError(exception, "Unhandled exception occurred.");
                 context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;

EnvelopeGenerator.Server/EnvelopeGenerator.Server/Services/EnvelopeReceiverPageDataService.cs

@@ -49,6 +49,14 @@ public class EnvelopeReceiverPageDataService(
             : throw new NotFoundException($"Document for envelope {envelopeId} not found.");
     }
 
+    /// <summary>
+    /// Loads the full document DTO (including receiver elements) for the authenticated sender.
+    /// </summary>
+    public async Task<DocumentDto?> GetDocumentDetailsOfSenderAsync(ClaimsPrincipal user, int envelopeId, CancellationToken cancellationToken = default)
+    {
+        return await mediator.Send(new ReadDocumentQuery(EnvelopeId: envelopeId, UserId: user.SenderId()), cancellationToken);
+    }
+
     /// <summary>
     /// Loads the current receiver's signature placeholders.
     /// </summary>

EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json

@@ -186,7 +186,8 @@
   },
   "DbTriggerParams": {
     "Envelope": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
-    "EnvelopeHistory": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
+    "History": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
+    "DocReceiverElement": [ "TBSIG_DOCUMENT_RECEIVER_ELEMENT_AFT_INS", "TBSIG_DOCUMENT_RECEIVER_ELEMENT_AFT_UPD" ],
     "EmailOut": [ "TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD" ],
     "EnvelopeReceiverReadOnly": [ "TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD" ],
     "Receiver": [],

EnvelopeGenerator.Server/EnvelopeGenerator.Server/wwwroot/css/envelope-viewer.css

@@ -542,6 +542,40 @@ body.resizing {
     color: white;
 }
 
+/* Draft save button for sender editor */
+.pdf-toolbar__btn--draft {
+    display: flex;
+    align-items: center;
+    gap: 0.35rem;
+    min-width: auto;
+    padding: 0.3rem 0.75rem;
+    font-size: 0.75rem;
+    font-weight: 600;
+    color: #0f4c81;
+    border: 1px solid rgba(14, 165, 233, 0.34);
+    background: linear-gradient(135deg, rgba(14, 165, 233, 0.12) 0%, rgba(2, 132, 199, 0.1) 100%);
+}
+
+.pdf-toolbar__btn--draft:hover:not(:disabled) {
+    color: #ffffff;
+    border-color: transparent;
+    background: linear-gradient(135deg, #0ea5e9 0%, #0284c7 100%);
+    box-shadow: 0 4px 12px rgba(2, 132, 199, 0.28);
+}
+
+.pdf-toolbar__btn--draft:disabled {
+    color: #64748b;
+}
+
+.pdf-toolbar__btn--draft svg {
+    flex-shrink: 0;
+    transition: color 0.2s ease;
+}
+
+.pdf-toolbar__btn--draft .pdf-toolbar__btn-text {
+    color: inherit;
+}
+
 /* Signature Change Button */
 .pdf-toolbar__btn--signature-change {
     display: flex;

EnvelopeGenerator.Tests/Application/DeleteEnvelopeCommandTests.cs

@@ -0,0 +1,109 @@
+using DigitalData.Core.Exceptions;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
+using EnvelopeGenerator.Application.Envelopes.Commands;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace EnvelopeGenerator.Tests.Application;
+
+[TestFixture]
+public class DeleteEnvelopeCommandTests : TestBase
+{
+    protected override void ConfigureServices(IServiceCollection services)
+    {
+    }
+
+    [Test]
+    public async Task DeleteEnvelope_DraftEnvelope_ShouldSetDeleted_CreateHistory_AndQueueDeletionEmail()
+    {
+        CancellationToken cancel = default;
+        var reason = "Invalid receiver data";
+
+        var envelope = this.CreateEnvelope(User.Id);
+        envelope.Status = EnvelopeStatus.EnvelopeCreated;
+        envelope = await GetRepository<Envelope>().CreateAsync(envelope, cancel);
+
+        var createReceiverCmd = this.CreateReceiverCommand();
+        (var receiver, _) = await Mediator.Send(createReceiverCmd, cancel);
+
+        var envReceiver = this.CreateEnvelopeReceiver(envelope.Id, receiver.Id);
+        await GetRepository<EnvelopeReceiver>().CreateAsync(envReceiver, cancel);
+
+        var result = await Mediator.Send(new DeleteEnvelopeCommand
+        {
+            EnvelopeId = envelope.Id,
+            Reason = reason
+        }.WithAuth(User.Id), cancel);
+
+        Assert.That(result.EnvelopeId, Is.EqualTo(envelope.Id));
+        Assert.That(result.AppliedStatus, Is.EqualTo(EnvelopeStatus.EnvelopeDeleted));
+        Assert.That(result.IsNoOp, Is.False);
+
+        var histories = await GetRepository<History>().Query
+            .Where(h => h.EnvelopeId == envelope.Id && h.Status == EnvelopeStatus.EnvelopeDeleted)
+            .ToListAsync(cancel);
+        Assert.That(histories, Has.Count.EqualTo(1));
+        Assert.That(histories[0].Comment, Is.EqualTo(reason));
+
+        var emails = await GetRepository<EmailOut>().Query
+            .Where(e => e.WfId == (int)EnvelopeStatus.MessageDeletionSent && e.ReferenceId == receiver.Id)
+            .ToListAsync(cancel);
+        Assert.That(emails, Has.Count.EqualTo(1));
+        Assert.That(emails[0].EmailAddress, Is.EqualTo(receiver.EmailAddress));
+    }
+
+    [Test]
+    public async Task DeleteEnvelope_SentEnvelope_ShouldSetWithdrawn()
+    {
+        CancellationToken cancel = default;
+
+        var envelope = this.CreateEnvelope(User.Id);
+        envelope.Status = EnvelopeStatus.EnvelopeQueued;
+        envelope = await GetRepository<Envelope>().CreateAsync(envelope, cancel);
+
+        var result = await Mediator.Send(new DeleteEnvelopeCommand
+        {
+            EnvelopeId = envelope.Id,
+            Reason = "Sender requested cancellation"
+        }.WithAuth(User.Id), cancel);
+
+        Assert.That(result.AppliedStatus, Is.EqualTo(EnvelopeStatus.EnvelopeWithdrawn));
+
+        var histories = await GetRepository<History>().Query
+            .Where(h => h.EnvelopeId == envelope.Id && h.Status == EnvelopeStatus.EnvelopeWithdrawn)
+            .ToListAsync(cancel);
+        Assert.That(histories, Has.Count.EqualTo(1));
+    }
+
+    [Test]
+    public void DeleteEnvelope_MissingReason_ShouldThrowBadRequest()
+    {
+        Assert.ThrowsAsync<BadRequestException>(async () =>
+            await Mediator.Send(new DeleteEnvelopeCommand
+            {
+                EnvelopeId = 123,
+                Reason = "   "
+            }.WithAuth(User.Id)));
+    }
+
+    [Test]
+    public async Task DeleteEnvelope_WrongOwner_ShouldThrowForbidden()
+    {
+        CancellationToken cancel = default;
+
+        var envelope = this.CreateEnvelope(User.Id);
+        envelope = await GetRepository<Envelope>().CreateAsync(envelope, cancel);
+
+        var otherUserCmd = this.CreateUserCommand();
+        var otherUser = await GetRepository<DigitalData.UserManager.Domain.Entities.User>().CreateAsync(otherUserCmd, cancel);
+
+        Assert.ThrowsAsync<ForbiddenException>(async () =>
+            await Mediator.Send(new DeleteEnvelopeCommand
+            {
+                EnvelopeId = envelope.Id,
+                Reason = "Not allowed"
+            }.WithAuth(otherUser.Id), cancel));
+    }
+}

EnvelopeGenerator.Tests/Application/Fake.cs

@@ -52,7 +52,7 @@ public class Fake
 
             services.AddEnvelopeGeneratorInfrastructureServices(opt =>
             {
-                opt.AddDbContext(dbCtxOpt => dbCtxOpt.UseInMemoryDatabase("EnvelopeGeneratorTestDb"));
+                opt.AddDbContext(dbCtxOpt => dbCtxOpt.UseInMemoryDatabase($"EnvelopeGeneratorTestDb_{Guid.NewGuid():N}"));
 
                 opt.AddDbTriggerParams(context.Configuration);
 
@@ -308,4 +308,4 @@ public static class Extensions
             .Select(_ => fake.CreateUserCommand())
             .ToList();
     #endregion
-}
+}

EnvelopeGenerator.Tests/Application/TestBase.cs

@@ -38,7 +38,10 @@ public abstract class TestBase : Faker
 
         // Add seed email templates
         foreach (var temp in SeedEmailTemplates)
+        {
+            temp.LangCode ??= "de";
             await repo.CreateAsync(temp);
+        }
     }
 
     [TearDown]
@@ -140,4 +143,4 @@ public abstract class TestBase : Faker
             ChangedWhen = DateTime.Parse("2025-05-12 10:43:44.290")
         }
     };
-}
+}

EnvelopeGenerator.Web/appsettings.Database.json

@@ -7,9 +7,10 @@
   "DbTriggerParams": {
     "Envelope": [ "TBSIG_ENVELOPE_AFT_INS" ],
     "History": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
+    "DocReceiverElement": [ "TBSIG_DOCUMENT_RECEIVER_ELEMENT_AFT_INS", "TBSIG_DOCUMENT_RECEIVER_ELEMENT_AFT_UPD" ],
     "EmailOut": [ "TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD" ],
     "EnvelopeReceiverReadOnly": [ "TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD" ],
     "Receiver": [],
     "EmailTemplate": [ "TBSIG_EMAIL_TEMPLATE_AFT_UPD" ]
   }
-}
+}

EnvelopeGenerator.sln

@@ -36,8 +36,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.PdfEditor
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Tests", "EnvelopeGenerator.Tests\EnvelopeGenerator.Tests.csproj", "{224C4845-1CDE-22B7-F3A9-1FF9297F70E8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.API", "EnvelopeGenerator.API\EnvelopeGenerator.API.csproj", "{EC768913-6270-14F4-1DD3-69C87A659462}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.DependencyInjection", "EnvelopeGenerator.DependencyInjection\EnvelopeGenerator.DependencyInjection.csproj", "{5DCCF9A1-C03F-90E6-87D3-E96DB25250C2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EnvelopeGenerator.Server", "EnvelopeGenerator.Server", "{BF1700D5-592E-4FFA-84E8-5480E289A1F0}"
@@ -95,10 +93,6 @@ Global
 		{224C4845-1CDE-22B7-F3A9-1FF9297F70E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{224C4845-1CDE-22B7-F3A9-1FF9297F70E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{224C4845-1CDE-22B7-F3A9-1FF9297F70E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC768913-6270-14F4-1DD3-69C87A659462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC768913-6270-14F4-1DD3-69C87A659462}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC768913-6270-14F4-1DD3-69C87A659462}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC768913-6270-14F4-1DD3-69C87A659462}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5DCCF9A1-C03F-90E6-87D3-E96DB25250C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5DCCF9A1-C03F-90E6-87D3-E96DB25250C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5DCCF9A1-C03F-90E6-87D3-E96DB25250C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -136,7 +130,6 @@ Global
 		{6D56C01F-D6CB-4D8A-BD3D-4FD34326998C} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 		{211619F5-AE25-4BA5-A552-BACAFE0632D3} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB}
 		{224C4845-1CDE-22B7-F3A9-1FF9297F70E8} = {0CBC2432-A561-4440-89BC-671B66A24146}
-		{EC768913-6270-14F4-1DD3-69C87A659462} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 		{5DCCF9A1-C03F-90E6-87D3-E96DB25250C2} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 		{BF1700D5-592E-4FFA-84E8-5480E289A1F0} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 		{4E6C54DA-576D-0955-2564-9EC890BB8279} = {BF1700D5-592E-4FFA-84E8-5480E289A1F0}

FORM_APPLICATION_CONTEXT.md

@@ -1,7 +1,7 @@
 # EnvelopeGenerator.Form — VB.NET Desktop Application Context
 
 ## Purpose
-**Legacy Windows Forms application** for envelope creation, management, and signature field placement. Built with **DevExpress components** and **GdPicture14** for PDF manipulation. This application is being **migrated to EnvelopeGenerator.Server + API** architecture.
+**Legacy Windows Forms application** for envelope creation, management, and signature field placement. Built with **DevExpress components** and **GdPicture14** for PDF manipulation. This application is being **migrated to `EnvelopeGenerator.Server` architecture** (merged Blazor + Web API host).
 
 **Primary Libraries:** DevExpress XtraGrid/XtraEditors, GdPicture14, VB.NET (.NET Framework 4.6.2)
 
@@ -368,7 +368,7 @@ End Sub
 
 ---
 
-## Migration to EnvelopeGenerator.Server + API
+## Migration to EnvelopeGenerator.Server
 
 ### Mapping Table
 

SENDER_SAVE_EDIT_MIGRATION_PLAN.md

@@ -0,0 +1,281 @@
+# Sender Save/Edit Migration Plan (Legacy Form -> Blazor Server)
+
+## Objective
+Migrate the legacy `frmEnvelopeEditor` save/edit workflow into current architecture so that:
+
+1. Sender can **save incomplete envelope as draft** (`EnvelopeSaved = 1002`) from `EnvelopeSenderEditorPage.razor`.
+2. Sender can **resume editing** saved/created envelopes from `EnvelopeSenderPage.razor` via **Bearbeiten** and continue where they left off.
+
+This plan introduces a distinct draft flow and a same-ID send-from-draft flow, aligned with legacy Form app semantics.
+
+---
+
+## Scope
+
+### In scope
+- Add separate **Save** and **Send** actions in sender editor.
+- Persist draft data server-side with partial/incomplete payload support.
+- Re-open existing draft from dashboard and restore editor state.
+- Preserve existing delete/withdraw logic and status model.
+- Add endpoints and application commands required for progressive sender workflow.
+
+### Out of scope (this ticket)
+- Full redesign of editor UX.
+- Multi-document support parity with `frmOrderFiles`.
+- New DB schema changes (unless separately approved).
+
+---
+
+## Current Gap Analysis
+
+## Current behavior (problem)
+- `EnvelopeSenderEditorPage.razor` has only one save path (`SaveAsync`) that behaves like "send":
+  - requires title + PDF + receivers + fields.
+  - calls `EnvelopeReceiverService.CreateAsync(...)` -> `/api/EnvelopeReceiver` monolithic create/send pipeline.
+- `EnvelopeSenderPage.razor` `EditEnvelope()` is TODO and does not navigate to editable persisted draft data.
+
+## Legacy behavior (target)
+- `frmEnvelopeEditor` has both:
+  - **Save**: persists envelope without full validation/sending.
+  - **Send**: validates required business data then sends invitations.
+- Dashboard "Bearbeiten" opens selected unsent envelope and restores work state.
+
+---
+
+## Architectural Decisions
+
+1. **Split command model by intent**
+   - Draft persistence must not reuse monolithic `/api/EnvelopeReceiver` create+send endpoint.
+   - Introduce dedicated sender workflow commands/endpoints for draft lifecycle.
+
+2. **Progressive persistence**
+   - Persist envelope metadata, document, receivers, and fields incrementally.
+   - Draft save accepts partial data and updates only provided segments.
+
+3. **Status ownership**
+   - Draft operations set status to `EnvelopeSaved` (1002).
+   - Send operation transitions to queued/sent path (existing 1003+ behavior).
+
+4. **Editor route strategy**
+   - Keep `/sender/editor` for new envelope.
+   - Support edit mode via query: `/sender/editor?envelopeId={id}` (or route variant in follow-up if preferred).
+
+5. **No DB schema migration by default**
+   - Use existing tables (`TBSIG_ENVELOPE`, `TBSIG_DOCUMENT`, `TBSIG_ENVELOPE_RECEIVER`, `TBSIG_DOC_RECEIVER_ELEMENT`).
+   - If a field is missing for a requirement, handle in application logic first and escalate only if unavoidable.
+
+---
+
+## Target Workflow
+
+## A) New envelope (draft first)
+1. User opens `/sender/editor`.
+2. User enters any subset of data.
+3. User clicks **Save**.
+4. System creates or updates draft envelope and sets status `EnvelopeSaved`.
+5. User gets confirmation and remains in editor (or optional return to dashboard).
+
+## B) New envelope (direct send)
+1. User fills required data.
+2. User clicks **Send**.
+3. System validates complete data and sends invitations.
+4. Status transitions to queued/sent flow.
+
+## C) Edit existing draft/created
+1. User selects row in `/sender` with `EnvelopeCreated` or `EnvelopeSaved`.
+2. User clicks **Bearbeiten**.
+3. App navigates to `/sender/editor?envelopeId={id}`.
+4. Editor loads persisted data (metadata, PDF, receivers, fields).
+5. User can save again (draft) or send.
+
+---
+
+## Detailed Implementation Plan
+
+## Phase 1 - Contracts and Application Use Cases
+
+### 1.1 Add sender draft commands (Application)
+- `CreateEnvelopeCommand` (create/update draft with partial data)
+- `ReadEnvelopeDraftQuery` (load full editable projection by envelope id)
+- `CreateEnvelopeCommand` (same request, `Send=true` for final send)
+
+Each command should enforce sender ownership (`UserId`) and return structured result DTOs.
+
+### 1.2 Validation policy split
+- **Draft Save validation (minimal):**
+  - title optional at first save? choose one policy and keep consistent.
+  - no requirement for receivers/fields/document.
+- **Send validation (strict):**
+  - title required
+  - document required
+  - at least one receiver
+  - required signature field mapping per receiver (business rule)
+
+### 1.3 History policy
+- On draft save/update: optional lightweight history entry (`EnvelopeSaved`) if legacy parity requires it.
+- On send: keep current history/send pipeline behavior.
+
+---
+
+## Phase 2 - Server Endpoints
+
+Implement in `EnvelopeGenerator.Server` only.
+
+### 2.1 Draft endpoints
+- `POST /api/Envelope`
+  - Create/update draft envelope (partial payload allowed), and send when `Send=true`.
+- `GET /api/Envelope/{id}/draft`
+  - Read full editable aggregate for editor hydration.
+
+### 2.2 Authorization + errors
+- 400 validation issues
+- 403 sender mismatch
+- 404 envelope not found
+- 409 invalid state transition (optional, if needed)
+
+---
+
+## Phase 3 - Sender Editor UI (`EnvelopeSenderEditorPage.razor`)
+
+### 3.1 Action buttons
+- Keep current action as **Send** (rename from "Speichern" to "Senden").
+- Add separate **Save** button next to Send.
+
+### 3.2 Editor mode state
+- Add `_editingEnvelopeId` from query param `envelopeId`.
+- `null` => create mode, value => edit mode.
+
+### 3.3 Load existing draft
+- On parameter set / first render in edit mode:
+  - call draft read endpoint.
+  - hydrate title, message, PDF bytes, receiver list, field list.
+  - map DB inches <-> PDF points correctly:
+    - DB inches -> UI points: `pt = inches * 72`
+    - UI points -> DB inches: `inches = pt / 72`
+
+### 3.4 Save behavior (new)
+- Save button calls `SaveDraftAsync()`:
+  - no strict send validations.
+  - create draft if no id yet, otherwise update.
+  - force status `EnvelopeSaved`.
+  - keep user in editor and show non-blocking success feedback.
+
+### 3.5 Send behavior (existing path replacement)
+- Send button calls `SendAsync()`:
+  - strict validation.
+  - if no draft id: create draft first then send, or direct send command.
+  - if edit mode: send current draft id.
+
+### 3.6 Session cache coexistence
+- Keep `esid` memory cache for transient UX resilience.
+- In edit mode, server data is source of truth; cache is fallback only.
+
+---
+
+## Phase 4 - Dashboard Edit Resume (`EnvelopeSenderPage.razor`)
+
+### 4.1 Edit button enablement
+- Enable **Bearbeiten** for statuses:
+  - `EnvelopeCreated`
+  - `EnvelopeSaved`
+- Keep disabled for sent/queued/completed/deleted/withdrawn/rejected.
+
+### 4.2 Navigation
+- Implement `EditEnvelope()`:
+  - `Navigation.NavigateTo($"/sender/editor?envelopeId={_selectedEnvelope.Id}")`.
+
+### 4.3 Optional UX
+- Double-click on editable rows can open editor instead of preview (or keep current preview behavior per product decision).
+
+---
+
+## Phase 5 - Data Mapping Rules
+
+1. **Document**
+   - Persist original PDF bytes (no visual placeholder burn-in).
+2. **Receivers**
+   - Draft can contain receivers with/without fields.
+3. **Fields**
+   - Store in DB inches with fixed signature size semantics.
+4. **Ownership**
+   - Sender can read/update/send only own envelopes.
+
+---
+
+## Suggested DTO Shape (Draft)
+
+Use one aggregate DTO for editor hydration/save/update:
+
+- `EnvelopeDraftDto`
+  - `EnvelopeId`
+  - `Status`
+  - `Title`
+  - `Message`
+  - `DocumentBase64` (or document id + fetch endpoint)
+  - `Receivers[]`
+    - `ReceiverId?`
+    - `Name`
+    - `Email`
+    - `Phone`
+    - `Fields[] { XInches, YInches, Page }`
+
+---
+
+## Migration Strategy
+
+## Step A (safe vertical slice)
+- Add read/edit route query handling and dashboard navigation first.
+- Hydrate editor from existing envelope data where possible.
+
+## Step B (draft save)
+- Implement draft create/update endpoints + app commands.
+- Wire Save button.
+
+## Step C (send from draft)
+- Move Send to explicit command/endpoint.
+- Ensure existing email/history behavior remains intact.
+
+## Step D (hardening)
+- Add tests + manual QA checklist.
+
+---
+
+## Testing Plan
+
+## Automated (Application)
+- Save draft with partial data -> status `EnvelopeSaved`.
+- Edit draft updates existing records, no duplicate orphan data.
+- Send draft with missing required data -> validation error.
+- Send draft complete -> queued/sent flow success.
+- Ownership checks -> 403 behavior.
+
+## Manual (UI)
+1. New editor -> save with only title.
+2. Reopen from dashboard -> state restored.
+3. Add PDF only -> save -> reopen -> PDF still present.
+4. Add receivers/fields incrementally -> save repeatedly.
+5. Final send -> status transitions and receiver notifications.
+
+---
+
+## Risks and Mitigations
+
+1. **Monolithic endpoint coupling risk**
+   - Mitigation: draft/send dedicated endpoints.
+2. **Data duplication on repeated save**
+   - Mitigation: idempotent upsert logic for receivers/fields.
+3. **Coordinate regression**
+   - Mitigation: centralize inches/points conversion helpers.
+4. **Trigger side effects/history duplication**
+   - Mitigation: verify DB-trigger interactions per status events.
+
+---
+
+## Definition of Done
+
+- Editor has two distinct actions: **Save** and **Send**.
+- Save allows incomplete payload and persists with `EnvelopeSaved` status.
+- Dashboard **Bearbeiten** opens editor for `EnvelopeCreated`/`EnvelopeSaved` and restores state.
+- Sender can continue from last saved point and eventually send.
+- Server endpoints support save/edit/send draft workflow with same envelope id.
+- No DB schema changes introduced without explicit approval.