Merge branch 'master' into feat/blazor-receiver-ui

Integrate YARP to forward all /api/** requests from the browser to the backend EnvelopeGenerator.API service. Add Yarp.ReverseProxy package, configure proxy routes and clusters in appsettings.json, and register YARP in Program.cs. Add API base URL configuration and register ReceiverApiClient, LocalizationService, and ReceiverAuthState as scoped services to support both server and client scenarios. This improves API/UI separation and authentication handling.

COPILOT_CONTEXT.md

@@ -1,489 +0,0 @@
-# EnvelopeGenerator — AI Context Reference
-
-## Purpose
-Digital document signing system with **unified Blazor WASM frontend** for both Senders and Receivers. Senders create envelopes and place signature fields. Receivers view PDFs, sign documents, export stamped PDFs.
-
-**Primary Libraries:** DevExpress + PDF.js (PSPDFKit removed)
-
----
-
-## Deployment Architecture
-
-**Two Presentation Projects (Both Required):**
-
-1. **EnvelopeGenerator.API** (ASP.NET Core Web API)
-   - Runs independently (development & production)
-   - **YARP Reverse Proxy** configured via `yarp.json`
-   - Proxies requests to:
-     - `EnvelopeGenerator.ReceiverUI` (Blazor WASM)
-     - External Auth.API service
-   - Serves as single entry point for all requests
-
-2. **EnvelopeGenerator.ReceiverUI** (Blazor WebAssembly)
-   - Runs on separate host/port
-   - Accessed **only through API proxy** (not directly)
-   - Serves static files (HTML, JS, CSS, WASM)
-
-**Request Flow:**
-```
-Client ? API:8088 (YARP Proxy) ? ReceiverUI:52936 (Blazor WASM)
-                                ? Auth.API:9090 (External Auth Service)
-```
-
-**Configuration:** `EnvelopeGenerator.API/yarp.json`
-
----
-
-## ReceiverUI Route Structure
-
-### Root Route
-| Route | File | Purpose |
-|---|---|---|
-| `/` | `Index.razor` | Application entry point (landing page). | 
-
-### Sender Routes
-| Route | File | Purpose |
-|---|---|---|
-| `/sender/login` | `LoginSenderPage.razor` | Username/password authentication |
-| `/sender` | `EnvelopeSenderPage.razor` | Sender dashboard (envelope list) |
-
-### Receiver Routes
-| Route | File | Purpose |
-|---|---|---|
-| `/envelope/login/{EnvelopeKey}` | `LoginReceiverPage.razor` | Access code authentication for specific envelope |
-| `/envelope/{EnvelopeKey}` | `EnvelopeReceiverPage.razor` | View & sign envelope (PDF.js viewer) |
-
-**Multi-Envelope Support:** Receivers can login to multiple envelopes simultaneously (per-envelope cookie authentication).
-
----
-
-## Architecture Evolution
-
-### Old Architecture (Deprecated)
-- **Sender UI:** `EnvelopeGenerator.Web` (Razor Pages + PSPDFKit)
-- **Receiver UI:** `EnvelopeGenerator.ReceiverUI` (Blazor WASM + PDF.js)
-- **Backend:** `EnvelopeGenerator.API`
-
-### Current Architecture
-- **Unified Frontend:** `EnvelopeGenerator.ReceiverUI` (Blazor WASM) — **Both Senders & Receivers**
-- **Backend:** `EnvelopeGenerator.API` — **Both Senders & Receivers**
-- **Libraries:** DevExpress + PDF.js
-- **PSPDFKit:** **REMOVED**
-
----
-
-## Solution Structure
-
-| Project | Target | Purpose |
-|---|---|---|
-| `EnvelopeGenerator.API` | net8.0 | ASP.NET Core Web API. Backend for **both Senders & Receivers**. Auth, PDF serving, signature endpoints. |
-| `EnvelopeGenerator.ReceiverUI` | net8.0 WASM | **Unified Blazor WebAssembly Frontend**. UI for **both Senders & Receivers**. YARP proxy to API. |
-| `EnvelopeGenerator.Web` | net7/8/9 | **DEPRECATED.** Legacy Razor Pages (Sender UI). No longer used. |
-| `EnvelopeGenerator.Application` | multi | MediatR CQRS handlers. Business logic. |
-| `EnvelopeGenerator.Domain` | multi | Domain models, constants, interfaces. |
-| `EnvelopeGenerator.Infrastructure` | multi | EF Core repos, DB context. |
-| `EnvelopeGenerator.PdfEditor` | multi | iText7 utilities (NOT used in ReceiverUI). |
-| `EnvelopeGenerator.DependencyInjection` | multi | DI registration helpers. |
-| **VB.NET projects** (Service/Form/BBTests) | net462 | **Legacy. Do NOT touch.** |
-
----
-
-## Localization & Culture Management
-
-**Current Architecture:** Blazor WebAssembly (client-side culture management)
-
-### Implementation Details
-
-**Culture Storage:**
-- Culture preference stored in browser's `localStorage` (key: `AppCulture`)
-- Managed by `CultureService.cs` (ReceiverUI/Services)
-- Supported cultures: `de-DE`, `en-US`, `fr-FR`
-
-**Culture Initialization:**
-- **Location:** `Program.cs` (lines 53-57)
-- Sets `CultureInfo.DefaultThreadCurrentCulture/UICulture` **before** app runs
-- **WASM-Safe:** Each user has isolated browser instance
-
-**Language Selector:**
-- **Component:** `LanguageSelector.razor` (ReceiverUI/Shared)
-- Displays flag icon + language name
-- Changes culture via `CultureService.SetCultureAsync()`
-- Navigates with `forceLoad: false` (smooth transition, no page reload)
-
-### ⚠️ MIGRATION WARNING: Blazor Server/Auto
-
-**Current approach is WASM-specific and will break in Server/Auto render modes!**
-
-**Why it breaks:**
-- `Program.cs:53-57` sets **global** `DefaultThreadCurrentCulture`
-- In Server/Auto, one app instance serves **all users**
-- User A selects German → User B sees German too (shared state)
-- Thread-safety issues and culture conflicts
-
-**Migration Checklist (when moving to Server/Auto):**
-
-1. **Remove global culture initialization** from `Program.cs` (lines 53-57)
-   - See detailed warning comment in the code
-
-2. **Add RequestLocalizationMiddleware** (Server-side approach):
-   ```csharp
-   app.UseRequestLocalization(options => {
-       options.SupportedCultures = new[] { "de-DE", "en-US", "fr-FR" };
-       options.SupportedUICultures = options.SupportedCultures;
-       options.RequestCultureProviders.Insert(0, new CookieRequestCultureProvider());
-   });
-   ```
-
-3. **OR** Use **per-circuit culture** (Blazor Server approach):
-   - Store culture in circuit-scoped service
-   - Use `CascadingParameter` to distribute to components
-   - See: https://learn.microsoft.com/aspnet/core/blazor/globalization-localization
-
-4. **Update `LanguageSelector.razor`:**
-   - Remove manual `CultureInfo.DefaultThreadCurrentCulture` assignment
-   - Use middleware/circuit culture provider instead
-
-5. **Update `CultureService.cs`:**
-   - Integrate with Server-side culture provider
-   - May need to store in cookies instead of localStorage
-
-**References:**
-- Microsoft Docs: [Blazor Globalization/Localization](https://learn.microsoft.com/aspnet/core/blazor/globalization-localization)
-- Current implementation: `Program.cs`, `CultureService.cs`, `LanguageSelector.razor`
-
----
-
-## Key Files & Routes
-
-| File | Route/Purpose |
-|---|---|
-| `ReceiverUI/Pages/Index.razor` | `/` — Application entry point (landing page). |
-| `ReceiverUI/Pages/EnvelopeSenderPage.razor` | `/sender` — Sender dashboard (envelope list). |
-| `ReceiverUI/Pages/EnvelopeReceiverPage.razor` | `/envelope/{key}` — Receiver PDF viewer & signing. |
-| `ReceiverUI/Pages/LoginSenderPage.razor` | `/sender/login` — Sender username/password auth. |
-| `ReceiverUI/Pages/LoginReceiverPage.razor` | `/envelope/login/{EnvelopeKey}` — Receiver access code auth. |
-| `ReceiverUI/wwwroot/js/pdf-viewer.js` | PDF.js wrapper (zoom, pagination, thumbnails). |
-| `ReceiverUI/wwwroot/js/receiver-signature.js` | Signature pad (draw/type/image). |
-| `ReceiverUI/wwwroot/css/envelope-viewer.css` | EnvelopeViewer styles. |
-| `ReceiverUI/Services/AuthService.cs` | Receiver + Sender authentication. |
-| `ReceiverUI/Services/SignatureCacheService.cs` | Signature caching (Redis/SQL). |
-| `API/Controllers/CacheController.cs` | Signature cache endpoints. |
-
----
-
-## Coordinate System — CRITICAL
-
-**Database Format:** INCHES (GdPicture14 native)  
-**Origin:** Top-left corner  
-**Axes:** X right, Y down
-
-### Conversion Formulas
-
-| From INCHES to | Formula | Example |
-|---|---|---|
-| **DevExpress DX** | `x_DX = x_inches * 100` | 1.5" ? 150 DX |
-| **PDF Points** | `x_pt = x_inches * 72` | 1.5" ? 108 pt |
-| **PDF.js Pixels** | Normalize ? scale | `(x_inches / pageWidth) * canvasWidth * scale` |
-
-**A4 Dimensions:**
-- Width: 8.27" = 595pt = 827 DX
-- Height: 11.69" = 842pt = 1169 DX
-
-### Unit Systems
-
-| System | Unit | Origin | Y-Axis |
-|---|---|---|---|
-| **Database (GdPicture14)** | Inches | Top-left | Down |
-| PDF.js | Pixels | Top-left | Down |
-| iText7 PDF | Points (1/72") | **Bottom-left** | **Up** (flip required) |
-| ~~PSPDFKit~~ | ~~Points~~ | ~~Top-left~~ | **REMOVED** |
-
----
-
-## EnvelopeReceiver — PDF.js Viewer & Signing
-
-**Route:** `/envelope/{EnvelopeKey}`  
-**Tech:** PDF.js 3.11.174 + Blazor WASM + configurable quality  
-**File:** `ReceiverUI/Pages/EnvelopeReceiverPage.razor`
-
-### Key Features
-1. HiDPI/Retina support (4x quality)
-2. Configurable quality (`appsettings.json`)
-3. Unlimited zoom (50%-300%)
-4. Ctrl+Wheel global zoom
-5. Resizable thumbnail sidebar (150-400px, localStorage)
-6. Responsive (desktop/mobile)
-
-### Configuration
-**File:** `ReceiverUI/wwwroot/appsettings.json`
-
-```json
-{
-  "PdfViewer": {
-    "ThumbnailBaseScale": 0.75,
-    "ThumbnailEnableHiDPI": true,
-    "MainCanvasEnableHiDPI": true,
-    "ZoomStepPercentage": 5
-  }
-}
-```
-
-### JavaScript API
-**File:** `ReceiverUI/wwwroot/js/pdf-viewer.js`
-
-```javascript
-window.pdfViewer = {
-    initialize(canvasId, pdfDataUrl, dotNetRef),
-    renderPage(num),
-    renderSignatureButtons(signatures, pageNum, dotNetRef),
-    applySignature(signatureId, dataUrl, fullName, position, place),
-    zoomIn(), zoomOut(), dispose()
-}
-```
-
----
-
-## Signature Workflow — EnvelopeReceiver
-
-**IMPORTANT:** iText7 NOT used (GPL license issue). Client-side overlay system only.
-
-### Workflow Steps
-
-1. **Page Load:**
-   - Check `SignatureCacheService` for cached signature
-   - If cached ? skip popup, load signature
-   - If not ? show automatic popup (mandatory)
-
-2. **Signature Popup (DxPopup):**
-   - **Cannot close** (no X, no ESC, no outside-click)
-   - **3 Tabs:** Draw (canvas) / Text (font select) / Image (upload)
-   - **Required:** Full name, Place
-   - **Optional:** Position
-   - **Save ?** Store in `_capturedSignature`, cache via API
-
-3. **Signature Buttons:**
-   - Render purple "Unterschreiben" buttons at signature field positions
-   - Coordinates: INCHES ? POINTS ? Pixels (scaled)
-   - File: `pdf-viewer.js` ? `renderSignatureButtons()`
-
-4. **Apply Signature (Click "Unterschreiben"):**
-   - JS: Remove button, create HTML overlay
-   - Format: Image + separator + text (Name, Position, Place, Date)
-   - **NOT stamped on PDF bytes** (visual overlay only)
-
-5. **Re-rendering:**
-   - Zoom/Page change ? recalculate button positions
-   - Session state: `_capturedSignature` (lost on refresh)
-
-### Data Model
-**File:** `ReceiverUI/Models/SignatureCaptureDto.cs`
-
-```csharp
-public sealed record SignatureCaptureDto {
-    public required string DataUrl { get; init; }    // base64 PNG
-    public required string FullName { get; init; }
-    public string Position { get; init; } = "";      // Optional
-    public required string Place { get; init; }
-}
-```
-
----
-
-## Signature Caching
-
-**Purpose:** Persist signature across page refreshes (distributed cache: Redis/SQL)
-
-### API Endpoints
-**Controller:** `API/Controllers/CacheController.cs`
-
-- `POST /api/Cache/SignatureCapture/{envelopeKey}` — Save
-- `GET /api/Cache/SignatureCapture/{envelopeKey}` — Load
-- `DELETE /api/Cache/SignatureCapture/{envelopeKey}` — Delete
-
-**Cache Key Format:**
-```
-signature:91751687-8ae6-4777-bf5f-b8846085e62e:{envelopeKey}
-```
-
-**Configuration:** `appsettings.json`
-```json
-{
-  "Cache": {
-    "SignatureCacheExpiration": null  // or "02:00:00" for 2h
-  }
-}
-```
-
-### Service
-**File:** `ReceiverUI/Services/SignatureCacheService.cs`
-
-```csharp
-public class SignatureCacheService {
-    Task SaveSignatureAsync(string envelopeKey, SignatureCaptureDto signature);
-    Task<SignatureCaptureDto?> GetSignatureAsync(string envelopeKey);
-    Task DeleteSignatureAsync(string envelopeKey);
-}
-```
-
-**Error Handling:** Fire-and-forget saves, graceful degradation on load failure.
-
----
-
-## Sender Login
-
-**Route:** `/sender/login`  
-**File:** `ReceiverUI/Pages/LoginSenderPage.razor`  
-**Tech:** Bootstrap 5 + DevExpress Blazing Berry theme
-
-### AuthService Extension
-**File:** `ReceiverUI/Services/AuthService.cs`
-
-```csharp
-public enum SenderLoginResult { Success, InvalidCredentials, Error }
-
-public async Task<SenderLoginResult> LoginSenderAsync(string username, string password) {
-    var response = await http.PostAsJsonAsync(
-        $"{_api.BaseUrl}/api/auth?cookie=true",
-        new { username, password });
-    
-    return response.StatusCode switch {
-        HttpStatusCode.OK => SenderLoginResult.Success,
-        HttpStatusCode.Unauthorized => SenderLoginResult.InvalidCredentials,
-        _ => SenderLoginResult.Error
-    };
-}
-```
-
-### API Integration
-**Endpoint:** `POST /api/auth?cookie=true`
-
-**Request:**
-```json
-{ "username": "TekH", "password": "***" }
-```
-
-**Response:**
-- `200 OK` ? Cookie set, redirect to `/sender`
-- `401 Unauthorized` ? Show error: "Ungültige Anmeldedaten"
-- Other ? Show error: "Serverfehler"
-
-**Cookie:** HTTP-only, Secure (HTTPS), SameSite=Strict
-
-### UI Flow
-1. User enters username + password
-2. Click "Anmelden" or press Enter
-3. Call `AuthService.LoginSenderAsync()`
-4. Success ? `Navigation.NavigateTo("/sender", forceLoad: true)`
-5. Error ? Display alert
-
----
-
-## Receiver Login
-
-**Route:** `/envelope/login/{EnvelopeKey}`  
-**File:** `ReceiverUI/Pages/LoginReceiverPage.razor`
-
-**Multi-Envelope Support:** Cookies are stored per-envelope (e.g., `AuthTokenSignFLOWReceiver.{envelopeKey}`), allowing simultaneous authentication for multiple envelopes in the same browser session.
-
-### AuthService Method
-```csharp
-public enum EnvelopeLoginResult { Success, InvalidCode, NotFound, Error }
-
-public async Task<EnvelopeLoginResult> LoginEnvelopeReceiverAsync(string key, string accessCode) {
-    var form = new MultipartFormDataContent();
-    form.Add(new StringContent(accessCode), "AccessCode");
-    
-    var response = await http.PostAsync(
-        $"{_api.BaseUrl}/api/Auth/envelope-receiver/{Uri.EscapeDataString(key)}", form);
-    
-    return response.StatusCode switch {
-        HttpStatusCode.OK => EnvelopeLoginResult.Success,
-        HttpStatusCode.Unauthorized => EnvelopeLoginResult.InvalidCode,
-        HttpStatusCode.NotFound => EnvelopeLoginResult.NotFound,
-        _ => EnvelopeLoginResult.Error
-    };
-}
-```
-
-**Success:** Redirect to `/envelope/{key}`
-
----
-
-## NuGet Packages (ReceiverUI)
-
-| Package | Version | Purpose |
-|---|---|---|
-| `DevExpress.Blazor.*` | 25.2.3 | UI components (grids, popups, etc.) |
-| `SkiaSharp.*` | 3.119.1 | WASM rendering |
-| ~~`itext`~~ | ~~8.0.5~~ | **NOT USED** (GPL license) |
-
-**External CDN:**
-- PDF.js 3.11.174: `https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.11.174/pdf.min.js`
-
----
-
-## Mistakes History — Do NOT Repeat
-
-| Mistake | Why Wrong |
-|---|---|
-| Using iText7 in EnvelopeReceiver | GPL license issue. Use overlay system instead. |
-| Using PSPDFKit | Removed from architecture. Use PDF.js + DevExpress. |
-| Hardcoded quality values in PDF.js | Use `appsettings.json` for configurability. |
-| Complex toolbar layouts | User wants simplicity. Keep horizontal layout. |
-| Over-designed UI (gradients/badges) | User prefers simple text labels. |
-| Ignoring "revert" instructions | Revert HTML structure, not just CSS. |
-| `BottomMarginBand` for signatures | Repeats on every page. Use DetailBand. |
-| `imageY = (page-1) * 1169 + ann.Y` | Inflates DetailBand. Calculate per-page. |
-
----
-
-## Development Notes
-
-### Deprecated Projects
-**DO NOT USE:**
-- `EnvelopeGenerator.Web` (Razor Pages) — Replaced by unified ReceiverUI
-- PSPDFKit — Removed, use PDF.js + DevExpress instead
-
-### Legacy Projects (VB.NET)
-**DO NOT TOUCH:** `EnvelopeGenerator.Service`, `EnvelopeGenerator.Form`, `EnvelopeGenerator.BBTests`
-
-### Signature Coordinate Evidence
-**File:** `EnvelopeGenerator.Form/frmFieldEditor.vb` (VB.NET)
-
-```vb
-Private Const SIGNATURE_WIDTH As Single = 1.77   ' inches
-Private Const SIGNATURE_HEIGHT As Single = 1.96  ' inches
-
-Sub LoadAnnotation(pElement As Signature, ...)
-    oAnnotation.Left = CSng(pElement.X)    ' Direct INCHES assignment
-    oAnnotation.Top = CSng(pElement.Y)
-End Sub
-```
-
-Proves database uses INCHES natively.
-
----
-
-## Quick Reference
-
-### When working with coordinates:
-1. **Database ? UI:** INCHES × 72 = PDF Points
-2. **UI ? Display:** Points × scale = Pixels
-3. **iText7 stamping:** Flip Y-axis (top-down ? bottom-up)
-
-### When adding features:
-1. Check `Mistakes History` first
-2. Prefer simplicity over complexity
-3. Use `appsettings.json` for configuration
-4. Keep consistent with existing design (Bootstrap 5 + Blazing Berry)
-5. **Unified frontend:** ReceiverUI serves both Senders and Receivers
-
-### When debugging:
-1. **Coordinates:** Always check unit system (inches/points/pixels)
-2. **Authentication:** Check cookie name/domain/SameSite
-3. **Cache:** Check Redis/SQL connection + key format
-4. **Frontend confusion:** Only use ReceiverUI (Web is deprecated)
-
----
-
-**Last Updated:** Session 19 (Razor file naming convention + Index route proxy)

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,19 +1,20 @@
 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 EnvelopeGenerator.API.Extensions;
+using EnvelopeGenerator.API.Models;
 using MediatR;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using System.Dynamic;
 
 namespace EnvelopeGenerator.API.Controllers;
 
@@ -61,8 +62,8 @@ public class AnnotationController : ControllerBase
     [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 signature = User.GetReceiverSignatureOfReceiver();
+        var uuid = User.GetEnvelopeUuidOfReceiver();
 
         var envelopeReceiver = await _mediator.ReadEnvelopeReceiverAsync(uuid, signature, cancel).ThrowIfNull(Exceptions.NotFound);
 
@@ -74,24 +75,12 @@ public class AnnotationController : ControllerBase
         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.");
+        var docSignedNotification = await _mediator
+            .ReadEnvelopeReceiverAsync(uuid, signature, cancel)
+            .ToDocSignedNotification(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 _mediator.PublishSafely(docSignedNotification, cancel);
         await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
 
         return Ok();
@@ -106,9 +95,9 @@ public class AnnotationController : ControllerBase
     [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 signature = User.GetReceiverSignatureOfReceiver();
+        var uuid = User.GetEnvelopeUuidOfReceiver();
+        var mail = User.GetReceiverMailOfReceiver();
 
         var envRcvRes = await _envelopeReceiverService.ReadByUuidSignatureAsync(uuid: uuid, signature: signature);
 
@@ -129,4 +118,127 @@ public class AnnotationController : ControllerBase
         _logger.LogNotice(histRes.Notices);
         return StatusCode(500, histRes.Messages);
     }
+
+    /// <summary>
+    /// Returns the signature placeholders (id, page, x, y, width, height)
+    /// the authenticated receiver must sign on the current envelope.
+    /// Used by the Blazor receiver UI to render a custom signature overlay
+    /// on top of the DevExpress PDF viewer.
+    /// </summary>
+    [Authorize(Policy = AuthPolicy.Receiver)]
+    [HttpGet("elements")]
+    public async Task<IActionResult> GetElements(CancellationToken cancel)
+    {
+        var signature = User.GetReceiverSignatureOfReceiver();
+        var uuid = User.GetEnvelopeUuidOfReceiver();
+
+        var envelopeReceiver = await _mediator.ReadEnvelopeReceiverAsync(uuid, signature, cancel)
+            ?? throw new NotFoundException("Envelope receiver is not found.");
+
+        var elements = envelopeReceiver.Envelope?.Documents?.FirstOrDefault()?.Elements
+            ?? Enumerable.Empty<Application.Common.Dto.SignatureDto>();
+
+        // Only expose what the overlay needs (no internal columns).
+        var payload = elements
+            .Where(e => e.ReceiverId == envelopeReceiver.ReceiverId)
+            .Select(e => new
+            {
+                id       = e.Id,
+                page     = e.Page,
+                x        = e.X,
+                y        = e.Y,
+                width    = e.Width,
+                height   = e.Height,
+                required = e.Required,
+                tooltip  = e.Tooltip,
+            });
+
+        return Ok(payload);
+    }
+
+    /// <summary>
+    /// Signs the document for the authenticated receiver using a Blazor /
+    /// DevExpress friendly payload (one PNG image per placeholder, plus
+    /// optional position / city per placeholder).
+    ///
+    /// Internally produces a <see cref="PsPdfKitAnnotation"/> wrapping a
+    /// list of <see cref="AnnotationCreateDto"/> entries so that the
+    /// existing notification pipeline (mail / status / annotation persistence)
+    /// is fully reused. The Instant JSON is left blank because the Blazor
+    /// pipeline does not depend on PSPDFKit-side rendering.
+    /// </summary>
+    [Authorize(Policy = AuthPolicy.Receiver)]
+    [HttpPost("blazor")]
+    public async Task<IActionResult> SignBlazor([FromBody] BlazorSignaturePayload payload, CancellationToken cancel)
+    {
+        if (payload is null || payload.Signatures.Count == 0)
+            return BadRequest();
+
+        var signature = User.GetReceiverSignatureOfReceiver();
+        var uuid = User.GetEnvelopeUuidOfReceiver();
+
+        var envelopeReceiver = await _mediator.ReadEnvelopeReceiverAsync(uuid, signature, cancel)
+            ?? throw new NotFoundException("Envelope receiver is not found.");
+
+        if (await _mediator.IsSignedAsync(uuid, signature, cancel))
+            return Problem(statusCode: StatusCodes.Status409Conflict);
+
+        if (await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
+            return Problem(statusCode: StatusCodes.Status423Locked);
+
+        // Build a structured AnnotationCreateDto list out of the lightweight
+        // payload. One DTO per (element, kind) tuple, mirroring how the legacy
+        // PSPDFKit pipeline produced multiple form fields per placeholder.
+        var structured = new List<AnnotationCreateDto>();
+        foreach (var entry in payload.Signatures)
+        {
+            structured.Add(new AnnotationCreateDto
+            {
+                ElementId = entry.ElementId,
+                Name      = $"{entry.ElementId}#signature",
+                Type      = "signature",
+                Value     = entry.SignatureDataUrl,
+            });
+            if (!string.IsNullOrWhiteSpace(entry.Position))
+            {
+                structured.Add(new AnnotationCreateDto
+                {
+                    ElementId = entry.ElementId,
+                    Name      = $"{entry.ElementId}#position",
+                    Type      = "position",
+                    Value     = entry.Position!,
+                });
+            }
+            if (!string.IsNullOrWhiteSpace(entry.City))
+            {
+                structured.Add(new AnnotationCreateDto
+                {
+                    ElementId = entry.ElementId,
+                    Name      = $"{entry.ElementId}#city",
+                    Type      = "city",
+                    Value     = entry.City!,
+                });
+            }
+            structured.Add(new AnnotationCreateDto
+            {
+                ElementId = entry.ElementId,
+                Name      = $"{entry.ElementId}#date",
+                Type      = "date",
+                Value     = entry.SignedAt.ToString("o"),
+            });
+        }
+
+        // No PSPDFKit Instant JSON for the Blazor flow — pass an empty object.
+        var psPdfKitAnnotation = new PsPdfKitAnnotation(new ExpandoObject(), structured);
+
+        var docSignedNotification = await _mediator
+            .ReadEnvelopeReceiverAsync(uuid, signature, cancel)
+            .ToDocSignedNotification(psPdfKitAnnotation)
+            ?? throw new NotFoundException("Envelope receiver is not found.");
+
+        await _mediator.PublishSafely(docSignedNotification, cancel);
+        await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+
+        return Ok();
+    }
 }

EnvelopeGenerator.API/Controllers/AuthController.cs

@@ -1,4 +1,3 @@
-using DigitalData.Auth.Claims;
 using EnvelopeGenerator.API.Controllers.Interfaces;
 using EnvelopeGenerator.API.Models;
 using EnvelopeGenerator.Domain.Constants;
@@ -40,7 +39,7 @@ public partial class AuthController(IOptions<AuthTokenKeys> authTokenKeyOptions,
     /// <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)]
+    [Authorize(Policy = AuthPolicy.SenderOrReceiver)]
     [HttpPost("logout")]
     public async Task<IActionResult> Logout()
     {
@@ -69,49 +68,9 @@ public partial class AuthController(IOptions<AuthTokenKeys> authTokenKeyOptions,
     [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
     [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
     [HttpGet("check")]
-    [Authorize(AuthenticationSchemes = AuthScheme.Sender)]
+    [Authorize]
     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,5 +1,4 @@
 using EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
-using EnvelopeGenerator.Domain.Constants;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
@@ -14,7 +13,7 @@ namespace EnvelopeGenerator.API.Controllers;
 /// </remarks>
 [Route("api/[controller]")]
 [ApiController]
-[Authorize(Policy = AuthPolicy.SenderOrReceiver)]
+[Authorize]
 public class ConfigController(IOptionsMonitor<AnnotationParams> annotationParamsOptions) : ControllerBase
 {
     private readonly AnnotationParams _annotationParams = annotationParamsOptions.CurrentValue;

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,4 +1,3 @@
-using DigitalData.Auth.Claims;
 using EnvelopeGenerator.API.Controllers.Interfaces;
 using EnvelopeGenerator.API.Extensions;
 using EnvelopeGenerator.Application.Documents.Queries;
@@ -15,9 +14,10 @@ namespace EnvelopeGenerator.API.Controllers;
 /// <remarks>
 /// Initializes a new instance of the <see cref="DocumentController"/> class.
 /// </remarks>
+[Authorize]
 [ApiController]
 [Route("api/[controller]")]
-public class DocumentController(IMediator mediator, IAuthorizationService authService, ILogger<DocumentController> logger) : ControllerBase, IAuthController
+public class DocumentController(IMediator mediator, IAuthorizationService authService) : ControllerBase, IAuthController
 {
     /// <summary>
     /// 
@@ -51,7 +51,7 @@ public class DocumentController(IMediator mediator, IAuthorizationService authSe
             if (query is not null)
                 return BadRequest("Query parameters are not allowed for receiver role.");
 
-            var envelopeId = User.EnvelopeId();
+            var envelopeId = User.GetEnvelopeIdOfReceiver();
             var receiverDoc = await mediator.Send(new ReadDocumentQuery { EnvelopeId = envelopeId }, cancel);
             return receiverDoc.ByteData is byte[] receiverDocByte
                 ? File(receiverDocByte, "application/octet-stream")
@@ -60,25 +60,4 @@ public class DocumentController(IMediator mediator, IAuthorizationService authSe
 
         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/EnvelopeController.cs

@@ -51,7 +51,7 @@ public class EnvelopeController : ControllerBase
     /// <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)]
+    [Authorize]
     [HttpGet]
     public async Task<IActionResult> GetAsync([FromQuery] ReadEnvelopeQuery envelope)
     {
@@ -98,7 +98,7 @@ public class EnvelopeController : ControllerBase
     [HttpPost]
     public async Task<IActionResult> CreateAsync([FromBody] CreateEnvelopeCommand command)
     {
-        var res = await _mediator.Send(command.WithAuth(User.GetId()));
+        var res = await _mediator.Send(command.Authorize(User.GetId()));
 
         if (res is null)
         {

EnvelopeGenerator.API/Controllers/EnvelopeReceiverController.cs

@@ -14,7 +14,6 @@ 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;
 
@@ -74,24 +73,6 @@ public class EnvelopeReceiverController : ControllerBase
         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>
@@ -200,7 +181,7 @@ public class EnvelopeReceiverController : ControllerBase
                 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>())
+            foreach (var sign in request.Receivers.Where(r => r.EmailAddress == rcv.EmailAddress).FirstOrDefault()?.Signatures ?? Enumerable.Empty<Application.EnvelopeReceivers.Commands.Signature>())
             {
                 using SqlConnection conn = new(_cnnStr);
                 conn.Open();

EnvelopeGenerator.API/Controllers/ReadOnlyController.cs

@@ -41,14 +41,14 @@ public class ReadOnlyController : ControllerBase
     [Obsolete("Use MediatR")]
     public async Task<IActionResult> CreateAsync([FromBody] EnvelopeReceiverReadOnlyCreateDto createDto)
     {
-        var authReceiverMail = User.ReceiverMail();
+        var authReceiverMail = User.GetReceiverMailOfReceiver();
         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();
+        var envelopeId = User.GetEnvelopeIdOfReceiver();
 
         createDto.AddedWho = authReceiverMail;
         createDto.EnvelopeId = envelopeId;

EnvelopeGenerator.API/Controllers/ReceiverAuthController.cs

@@ -0,0 +1,407 @@
+using EnvelopeGenerator.API.Models;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
+using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.API.Extensions;
+using MediatR;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Mvc;
+using OtpNet;
+
+namespace EnvelopeGenerator.API.Controllers;
+
+/// <summary>
+/// REST-API für den Empfänger-Authentifizierungs-Flow.
+/// 
+/// Entspricht der Logik in EnvelopeGenerator.Web.Controllers.EnvelopeController
+/// (Main + LogInEnvelope), aber gibt JSON statt Views zurück.
+/// 
+/// Der Blazor-Client (ReceiverUI) ruft diese Endpunkte auf.
+/// 
+/// FLOW:
+/// 1. Client ruft GET  /api/receiverauth/{key}/status     → Prüft Status
+/// 2. Client ruft POST /api/receiverauth/{key}/access-code → Sendet AccessCode
+/// 3. Client ruft POST /api/receiverauth/{key}/tfa         → Sendet TFA-Code
+/// 
+/// Nach erfolgreicher Authentifizierung wird ein Cookie gesetzt (SignInEnvelopeAsync).
+/// Danach kann der Client die Dokument-Daten über die bestehenden Envelope-Endpunkte laden.
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+public class ReceiverAuthController : ControllerBase
+{
+    private readonly ILogger<ReceiverAuthController> _logger;
+    private readonly IMediator _mediator;
+    private readonly IEnvelopeReceiverService _envRcvService;
+    private readonly IEnvelopeHistoryService _historyService;
+    private readonly IAuthenticator _authenticator;
+    private readonly IReceiverService _rcvService;
+    private readonly IEnvelopeSmsHandler _envSmsHandler;
+
+    public ReceiverAuthController(
+        ILogger<ReceiverAuthController> logger,
+        IMediator mediator,
+        IEnvelopeReceiverService envRcvService,
+        IEnvelopeHistoryService historyService,
+        IAuthenticator authenticator,
+        IReceiverService rcvService,
+        IEnvelopeSmsHandler envSmsHandler)
+    {
+        _logger = logger;
+        _mediator = mediator;
+        _envRcvService = envRcvService;
+        _historyService = historyService;
+        _authenticator = authenticator;
+        _rcvService = rcvService;
+        _envSmsHandler = envSmsHandler;
+    }
+
+    // ══════════════════════════════════════════════════════════════
+    // ENDPUNKT 1: STATUS PRÜFEN
+    // Entspricht: Web.EnvelopeController.Main()
+    // ══════════════════════════════════════════════════════════════
+
+    /// <summary>
+    /// Prüft den aktuellen Status eines Umschlags für den Empfänger.
+    /// Entscheidet ob: NotFound, Rejected, Signed, AccessCode nötig, oder direkt anzeigen.
+    /// </summary>
+    /// <param name="key">Der EnvelopeReceiver-Key aus der URL (Base64-kodiert)</param>
+    /// <param name="cancel">Cancellation-Token</param>
+    /// <returns>ReceiverAuthResponse mit dem aktuellen Status</returns>
+    [HttpGet("{key}/status")]
+    public async Task<IActionResult> GetStatus([FromRoute] string key, CancellationToken cancel)
+    {
+        try
+        {
+            // ── Key dekodieren ──
+            if (!key.TryDecode(out var decoded))
+                return NotFound(new ReceiverAuthResponse { Status = "not_found" });
+
+            // ── ReadOnly-Links ──
+            if (decoded.GetEncodeType() == EncodeType.EnvelopeReceiverReadOnly)
+            {
+                return Ok(new ReceiverAuthResponse
+                {
+                    Status = "show_document",
+                    ReadOnly = true
+                });
+            }
+
+            // ── EnvelopeReceiver laden (Light-Query: ohne Documents/Elements) ──
+            var er = await _mediator.Send(
+                new ReadEnvelopeReceiverLightQuery { Key = key }, cancel);
+            if (er is null)
+                return NotFound(new ReceiverAuthResponse { Status = "not_found" });
+
+            // ── Abgelehnt? ──
+            var rejRcvrs = await _historyService.ReadRejectingReceivers(er.Envelope!.Id);
+            if (rejRcvrs.Any())
+            {
+                await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+                return Ok(new ReceiverAuthResponse
+                {
+                    Status = "rejected",
+                    Title = er.Envelope.Title,
+                    SenderEmail = er.Envelope.User?.Email
+                });
+            }
+
+            // ── Bereits signiert? ──
+            if (await _historyService.IsSigned(
+                    envelopeId: er.Envelope.Id,
+                    userReference: er.Receiver!.EmailAddress))
+            {
+                await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+                return Ok(new ReceiverAuthResponse
+                {
+                    Status = "already_signed",
+                    Title = er.Envelope.Title,
+                    SenderEmail = er.Envelope.User?.Email
+                });
+            }
+
+            // ── Kein AccessCode nötig? → Direkt SignIn ──
+            if (!er.Envelope.UseAccessCode)
+            {
+                (string? uuid, string? signature) = decoded.ParseEnvelopeReceiverId();
+                var erSecretRes = await _envRcvService.ReadWithSecretByUuidSignatureAsync(
+                    uuid: uuid!, signature: signature!);
+
+                if (erSecretRes.IsFailed)
+                    return NotFound(new ReceiverAuthResponse { Status = "not_found" });
+
+                await HttpContext.SignInEnvelopeAsync(erSecretRes.Data, Role.ReceiverFull);
+
+                return Ok(new ReceiverAuthResponse
+                {
+                    Status = "show_document",
+                    Title = er.Envelope.Title,
+                    Message = er.Envelope.Message,
+                    SenderEmail = er.Envelope.User?.Email,
+                    ReadOnly = er.Envelope.ReadOnly
+                });
+            }
+
+            // ── AccessCode nötig ──
+            // HINWEIS: Die E-Mail mit dem AccessCode wird NICHT hier gesendet.
+            // Das passiert bereits im Web-Projekt, wenn der Link generiert wird.
+            // Der Blazor-Flow übernimmt erst NACH dem E-Mail-Versand.
+            bool accessCodeAlreadyRequested = await _historyService.AccessCodeAlreadyRequested(
+                envelopeId: er.Envelope.Id,
+                userReference: er.Receiver.EmailAddress);
+
+            if (!accessCodeAlreadyRequested)
+            {
+                // AccessCode wurde noch nie angefordert — das bedeutet der Empfänger
+                // kommt zum ersten Mal. Wir zeichnen es auf, aber die E-Mail
+                // wurde bereits vom Web-Projekt gesendet.
+                await _historyService.RecordAsync(
+                    er.EnvelopeId, er.Receiver.EmailAddress, EnvelopeStatus.AccessCodeRequested);
+            }
+
+            // ── Prüfe ob der Nutzer bereits eingeloggt ist ──
+            if (User.IsInRole(Role.ReceiverFull))
+            {
+                return Ok(new ReceiverAuthResponse
+                {
+                    Status = "show_document",
+                    Title = er.Envelope.Title,
+                    Message = er.Envelope.Message,
+                    SenderEmail = er.Envelope.User?.Email,
+                    ReadOnly = er.Envelope.ReadOnly
+                });
+            }
+
+            return Ok(new ReceiverAuthResponse
+            {
+                Status = "requires_access_code",
+                Title = er.Envelope.Title,
+                SenderEmail = er.Envelope.User?.Email,
+                TfaEnabled = er.Envelope.TFAEnabled,
+                HasPhoneNumber = er.HasPhoneNumber
+            });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error checking status for key {Key}", key);
+            return StatusCode(500, new ReceiverAuthResponse
+            {
+                Status = "error",
+                ErrorMessage = "Ein unerwarteter Fehler ist aufgetreten."
+            });
+        }
+    }
+
+    // ══════════════════════════════════════════════════════════════
+    // ENDPUNKT 2: ACCESS-CODE PRÜFEN
+    // ══════════════════════════════════════════════════════════════
+
+    /// <summary>
+    /// Prüft den eingegebenen Zugangscode.
+    /// Bei Erfolg: SignIn oder TFA-Weiterleitung.
+    /// Bei Fehler: Fehlermeldung zurückgeben.
+    /// </summary>
+    [HttpPost("{key}/access-code")]
+    public async Task<IActionResult> SubmitAccessCode(
+        [FromRoute] string key,
+        [FromBody] AccessCodeRequest request,
+        CancellationToken cancel)
+    {
+        try
+        {
+            // ── Key dekodieren + Daten laden ──
+            (string? uuid, string? signature) = key.DecodeEnvelopeReceiverId();
+            if (uuid is null || signature is null)
+                return NotFound(new ReceiverAuthResponse { Status = "not_found" });
+
+            var erSecretRes = await _envRcvService.ReadWithSecretByUuidSignatureAsync(
+                uuid: uuid, signature: signature);
+
+            if (erSecretRes.IsFailed)
+                return NotFound(new ReceiverAuthResponse { Status = "not_found" });
+
+            var erSecret = erSecretRes.Data;
+
+            // ── AccessCode prüfen ──
+            if (erSecret.AccessCode != request.AccessCode)
+            {
+                await _historyService.RecordAsync(
+                    erSecret.EnvelopeId,
+                    erSecret.Receiver!.EmailAddress,
+                    EnvelopeStatus.AccessCodeIncorrect);
+
+                return Unauthorized(new ReceiverAuthResponse
+                {
+                    Status = "requires_access_code",
+                    Title = erSecret.Envelope!.Title,
+                    SenderEmail = erSecret.Envelope.User?.Email,
+                    TfaEnabled = erSecret.Envelope.TFAEnabled,
+                    HasPhoneNumber = erSecret.HasPhoneNumber,
+                    ErrorMessage = "Falscher Zugangscode."
+                });
+            }
+
+            // ── AccessCode korrekt ──
+            await _historyService.RecordAsync(
+                erSecret.EnvelopeId,
+                erSecret.Receiver!.EmailAddress,
+                EnvelopeStatus.AccessCodeCorrect);
+
+            // ── TFA erforderlich? ──
+            if (erSecret.Envelope!.TFAEnabled)
+            {
+                var rcv = erSecret.Receiver;
+                if (rcv.TotpSecretkey is null)
+                {
+                    rcv.TotpSecretkey = _authenticator.GenerateTotpSecretKey();
+                    await _rcvService.UpdateAsync(rcv);
+                }
+
+                await HttpContext.SignInEnvelopeAsync(erSecret, Role.ReceiverTFA);
+
+                if (request.PreferSms)
+                {
+                    var (smsRes, expiration) = await _envSmsHandler.SendTotpAsync(erSecret);
+
+                    return Ok(new ReceiverAuthResponse
+                    {
+                        Status = "requires_tfa",
+                        TfaType = "sms",
+                        TfaExpiration = expiration,
+                        Title = erSecret.Envelope.Title,
+                        SenderEmail = erSecret.Envelope.User?.Email,
+                        HasPhoneNumber = erSecret.HasPhoneNumber
+                    });
+                }
+                else
+                {
+                    return Ok(new ReceiverAuthResponse
+                    {
+                        Status = "requires_tfa",
+                        TfaType = "authenticator",
+                        Title = erSecret.Envelope.Title,
+                        SenderEmail = erSecret.Envelope.User?.Email,
+                        HasPhoneNumber = erSecret.HasPhoneNumber
+                    });
+                }
+            }
+
+            // ── Kein TFA → Direkt SignIn ──
+            await HttpContext.SignInEnvelopeAsync(erSecret, Role.ReceiverFull);
+
+            return Ok(new ReceiverAuthResponse
+            {
+                Status = "show_document",
+                Title = erSecret.Envelope.Title,
+                Message = erSecret.Envelope.Message,
+                SenderEmail = erSecret.Envelope.User?.Email,
+                ReadOnly = erSecret.Envelope.ReadOnly
+            });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error submitting access code for key {Key}", key);
+            return StatusCode(500, new ReceiverAuthResponse
+            {
+                Status = "error",
+                ErrorMessage = "Ein unerwarteter Fehler ist aufgetreten."
+            });
+        }
+    }
+
+    // ══════════════════════════════════════════════════════════════
+    // ENDPUNKT 3: TFA-CODE PRÜFEN
+    // ══════════════════════════════════════════════════════════════
+
+    /// <summary>
+    /// Prüft den TFA-Code (SMS oder Authenticator).
+    /// Setzt voraus, dass der Nutzer bereits mit ReceiverTFA-Rolle eingeloggt ist.
+    /// </summary>
+    [HttpPost("{key}/tfa")]
+    public async Task<IActionResult> SubmitTfaCode(
+        [FromRoute] string key,
+        [FromBody] TfaCodeRequest request,
+        CancellationToken cancel)
+    {
+        try
+        {
+            if (!User.IsInRole(Role.ReceiverTFA))
+                return Unauthorized(new ReceiverAuthResponse
+                {
+                    Status = "requires_access_code",
+                    ErrorMessage = "Bitte zuerst den Zugangscode eingeben."
+                });
+
+            (string? uuid, string? signature) = key.DecodeEnvelopeReceiverId();
+            if (uuid is null || signature is null)
+                return NotFound(new ReceiverAuthResponse { Status = "not_found" });
+
+            var erSecretRes = await _envRcvService.ReadWithSecretByUuidSignatureAsync(
+                uuid: uuid, signature: signature);
+
+            if (erSecretRes.IsFailed)
+                return NotFound(new ReceiverAuthResponse { Status = "not_found" });
+
+            var erSecret = erSecretRes.Data;
+
+            if (erSecret.Receiver!.TotpSecretkey is null)
+            {
+                _logger.LogError("TotpSecretkey is null for receiver {Signature}", signature);
+                return StatusCode(500, new ReceiverAuthResponse
+                {
+                    Status = "error",
+                    ErrorMessage = "TFA-Konfiguration fehlt."
+                });
+            }
+
+            bool codeValid;
+
+            if (request.Type == "sms")
+            {
+                codeValid = _envSmsHandler.VerifyTotp(request.Code, erSecret.Receiver.TotpSecretkey);
+            }
+            else
+            {
+                codeValid = _authenticator.VerifyTotp(
+                    request.Code,
+                    erSecret.Receiver.TotpSecretkey,
+                    window: VerificationWindow.RfcSpecifiedNetworkDelay);
+            }
+
+            if (!codeValid)
+            {
+                return Unauthorized(new ReceiverAuthResponse
+                {
+                    Status = "requires_tfa",
+                    TfaType = request.Type,
+                    Title = erSecret.Envelope!.Title,
+                    SenderEmail = erSecret.Envelope.User?.Email,
+                    HasPhoneNumber = erSecret.HasPhoneNumber,
+                    ErrorMessage = "Falscher Code."
+                });
+            }
+
+            await HttpContext.SignInEnvelopeAsync(erSecret, Role.ReceiverFull);
+
+            return Ok(new ReceiverAuthResponse
+            {
+                Status = "show_document",
+                Title = erSecret.Envelope!.Title,
+                Message = erSecret.Envelope.Message,
+                SenderEmail = erSecret.Envelope.User?.Email,
+                ReadOnly = erSecret.Envelope.ReadOnly
+            });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error submitting TFA code for key {Key}", key);
+            return StatusCode(500, new ReceiverAuthResponse
+            {
+                Status = "error",
+                ErrorMessage = "Ein unerwarteter Fehler ist aufgetreten."
+            });
+        }
+    }
+}

EnvelopeGenerator.API/Documentation/AuthProxyDocumentFilter.cs

@@ -16,12 +16,6 @@ public sealed class AuthProxyDocumentFilter : IDocumentFilter
     /// <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";
 
@@ -73,51 +67,4 @@ public sealed class AuthProxyDocumentFilter : IDocumentFilter
             }
         };
     }
-
-    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/EnvelopeClaimTypes.cs

@@ -0,0 +1,17 @@
+namespace EnvelopeGenerator.API;
+
+/// <summary>
+/// Provides custom claim types for envelope-related information.
+/// </summary>
+public static class EnvelopeClaimTypes
+{
+    /// <summary>
+    /// Claim type for the title of an envelope.
+    /// </summary>
+    public static readonly string Title = $"Envelope{nameof(Title)}";
+
+    /// <summary>
+    /// Claim type for the ID of an envelope.
+    /// </summary>
+    public static readonly string Id = $"Envelope{nameof(Id)}";
+}

EnvelopeGenerator.API/EnvelopeGenerator.API.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -10,9 +10,9 @@
     <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>
+    <Version>1.2.3</Version>
+    <FileVersion>1.2.3</FileVersion>
+    <AssemblyVersion>1.2.3</AssemblyVersion>
     <PackageOutputPath>Copyright © 2025 Digital Data GmbH. All rights reserved.</PackageOutputPath>
 	<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
@@ -30,18 +30,11 @@
 
   <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.AspNetCore.OpenApi" Version="9.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" />
     <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" />
@@ -78,7 +71,6 @@
     <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,6 +1,8 @@
-using DigitalData.Auth.Claims;
-using Microsoft.IdentityModel.JsonWebTokens;
+using System.Linq;
 using System.Security.Claims;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.Cookies;
 
 namespace EnvelopeGenerator.API.Extensions;
 
@@ -9,14 +11,7 @@ namespace EnvelopeGenerator.API.Extensions;
 /// </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)
+    private static string GetRequiredClaimOfReceiver(this ClaimsPrincipal user, string claimType)
     {
         var value = user.FindFirstValue(claimType);
         if (value is not null)
@@ -32,65 +27,75 @@ public static class ReceiverClaimExtensions
         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);
+    public static string GetEnvelopeUuidOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.NameIdentifier);
 
     /// <summary>
     /// Gets the authenticated receiver signature from the claims.
     /// </summary>
-    public static string ReceiverSignature(this ClaimsPrincipal user)
-        => user.GetRequiredClaimValue(EnvelopeClaimNames.ReceiverSignature);
+    public static string GetReceiverSignatureOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.Hash);
+
+    /// <summary>
+    /// Gets the authenticated receiver display name from the claims.
+    /// </summary>
+    public static string GetReceiverNameOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.Name);
 
     /// <summary>
     /// Gets the authenticated receiver email address from the claims.
     /// </summary>
-    public static string ReceiverMail(this ClaimsPrincipal user)
-        => user.GetRequiredClaimValue(JwtRegisteredClaimNames.Email);
+    public static string GetReceiverMailOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.Email);
+
+    /// <summary>
+    /// Gets the authenticated envelope title from the claims.
+    /// </summary>
+    public static string GetEnvelopeTitleOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(EnvelopeClaimTypes.Title);
 
     /// <summary>
     /// Gets the authenticated envelope identifier from the claims.
     /// </summary>
-    public static int EnvelopeId(this ClaimsPrincipal user)
+    public static int GetEnvelopeIdOfReceiver(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.");
+        var envIdStr = user.GetRequiredClaimOfReceiver(EnvelopeClaimTypes.Id);
+        if (!int.TryParse(envIdStr, out var envId))
+        {
+            throw new InvalidOperationException($"Claim '{EnvelopeClaimTypes.Id}' is not a valid integer.");
+        }
+
+        return envId;
     }
 
     /// <summary>
-    /// Gets the authenticated receiver identifier from the claims.
+    /// Signs in an envelope receiver using cookie authentication and attaches envelope claims.
     /// </summary>
-    /// <param name="user"></param>
-    /// <returns></returns>
-    /// <exception cref="InvalidOperationException"></exception>
-    public static int ReceiverId(this ClaimsPrincipal user)
+    /// <param name="context">The current HTTP context.</param>
+    /// <param name="envelopeReceiver">Envelope receiver DTO to extract claims from.</param>
+    /// <param name="receiverRole">Role to attach to the authentication ticket.</param>
+    public static async Task SignInEnvelopeAsync(this HttpContext context, EnvelopeReceiverDto envelopeReceiver, string receiverRole)
     {
-        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.");
+        var claims = new List<Claim>
+        {
+            new(ClaimTypes.NameIdentifier, envelopeReceiver.Envelope!.Uuid),
+            new(ClaimTypes.Hash, envelopeReceiver.Receiver!.Signature),
+            new(ClaimTypes.Name, envelopeReceiver.Name ?? string.Empty),
+            new(ClaimTypes.Email, envelopeReceiver.Receiver.EmailAddress),
+            new(EnvelopeClaimTypes.Title, envelopeReceiver.Envelope.Title),
+            new(EnvelopeClaimTypes.Id, envelopeReceiver.Envelope.Id.ToString()),
+            new(ClaimTypes.Role, receiverRole)
+        };
+
+        var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
+
+        var authProperties = new AuthenticationProperties
+        {
+            AllowRefresh = false,
+            IsPersistent = false
+        };
+
+        await context.SignInAsync(
+            CookieAuthenticationDefaults.AuthenticationScheme,
+            new ClaimsPrincipal(claimsIdentity),
+            authProperties);
     }
 }

EnvelopeGenerator.API/Models/BlazorSignaturePayload.cs

@@ -0,0 +1,42 @@
+namespace EnvelopeGenerator.API.Models;
+
+/// <summary>
+/// Lightweight payload used by the Blazor receiver UI to submit signatures.
+/// Each entry corresponds to one signature placeholder rendered as an
+/// overlay on top of the DevExpress PDF viewer.
+///
+/// The legacy MVC flow ships a full PSPDFKit InstantJSON payload via
+/// <see cref="EnvelopeGenerator.Application.Common.Notifications.DocSigned.PsPdfKitAnnotation"/>.
+/// That format is browser-library specific. The Blazor client uses a
+/// transport-neutral DTO instead: only what the server actually needs
+/// to persist the signed document (image + metadata per placeholder).
+///
+/// Conversion to the internal <c>PsPdfKitAnnotation</c> happens inside
+/// <see cref="EnvelopeGenerator.API.Controllers.AnnotationController"/>.
+/// </summary>
+public class BlazorSignaturePayload
+{
+    /// <summary>The receiver-specific signed placeholders for this envelope.</summary>
+    public List<BlazorSignatureEntry> Signatures { get; set; } = new();
+}
+
+/// <summary>
+/// A single signed placeholder.
+/// </summary>
+public class BlazorSignatureEntry
+{
+    /// <summary>The receiver's <c>DocumentReceiverElement.Id</c> being signed.</summary>
+    public int ElementId { get; set; }
+
+    /// <summary>Signature image as a data URL (e.g. "data:image/png;base64,...").</summary>
+    public string SignatureDataUrl { get; set; } = string.Empty;
+
+    /// <summary>Optional position / job title entered by the receiver.</summary>
+    public string? Position { get; set; }
+
+    /// <summary>Optional city / location entered by the receiver.</summary>
+    public string? City { get; set; }
+
+    /// <summary>Capture timestamp (client local time).</summary>
+    public DateTime SignedAt { get; set; }
+}

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/ReceiverAuthResponse.cs

@@ -0,0 +1,78 @@
+namespace EnvelopeGenerator.API.Models;
+
+/// <summary>
+/// Einheitliche Antwort des ReceiverAuthControllers.
+/// 
+/// WARUM ein einziges Response-Objekt für alle Endpunkte?
+/// - Der Client braucht nur ein Format zu verstehen
+/// - Der Status-String bestimmt, welche Felder relevant sind
+/// - Entspricht dem, was der Web-Controller bisher über ViewData verteilt hat
+/// 
+/// Status-Werte und was sie bedeuten:
+/// - "requires_access_code" → AccessCode-Eingabe zeigen
+/// - "requires_tfa"         → TFA-Code-Eingabe zeigen (nach AccessCode)
+/// - "show_document"        → Dokument laden und anzeigen
+/// - "already_signed"       → Info-Seite "Bereits unterschrieben"
+/// - "rejected"             → Info-Seite "Abgelehnt"
+/// - "not_found"            → Fehler-Seite "Nicht gefunden"
+/// - "expired"              → Fehler-Seite "Link abgelaufen"
+/// </summary>
+public class ReceiverAuthResponse
+{
+    /// <summary>Aktueller Status des Empfänger-Flows</summary>
+    public required string Status { get; init; }
+
+    /// <summary>Titel des Umschlags (z.B. "Vertragsdokument")</summary>
+    public string? Title { get; init; }
+
+    /// <summary>Nachricht des Absenders</summary>
+    public string? Message { get; init; }
+
+    /// <summary>E-Mail des Absenders (für Rückfragen-Hinweis)</summary>
+    public string? SenderEmail { get; init; }
+
+    /// <summary>Name des Empfängers</summary>
+    public string? ReceiverName { get; init; }
+
+    /// <summary>Ob TFA für diesen Umschlag aktiviert ist</summary>
+    public bool TfaEnabled { get; init; }
+
+    /// <summary>Ob der Empfänger eine Telefonnummer hat (für SMS-TFA)</summary>
+    public bool HasPhoneNumber { get; init; }
+
+    /// <summary>Ob das Dokument nur gelesen werden soll (ReadAndConfirm)</summary>
+    public bool ReadOnly { get; init; }
+
+    /// <summary>TFA-Typ: "sms" oder "authenticator" (wenn Status = "requires_tfa")</summary>
+    public string? TfaType { get; init; }
+
+    /// <summary>Ablaufzeit des SMS-Codes (für Countdown-Timer)</summary>
+    public DateTime? TfaExpiration { get; init; }
+
+    /// <summary>Fehlermeldung (z.B. "Falscher Zugangscode")</summary>
+    public string? ErrorMessage { get; init; }
+}
+
+/// <summary>
+/// Request-Body für POST /api/receiverauth/{key}/access-code
+/// </summary>
+public class AccessCodeRequest
+{
+    /// <summary>Der vom Empfänger eingegebene Zugangscode</summary>
+    public required string AccessCode { get; init; }
+
+    /// <summary>Ob SMS statt Authenticator bevorzugt wird</summary>
+    public bool PreferSms { get; init; }
+}
+
+/// <summary>
+/// Request-Body für POST /api/receiverauth/{key}/tfa
+/// </summary>
+public class TfaCodeRequest
+{
+    /// <summary>Der eingegebene TFA-Code (6-stellig)</summary>
+    public required string Code { get; init; }
+
+    /// <summary>"sms" oder "authenticator"</summary>
+    public required string Type { get; init; }
+}

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

@@ -13,15 +13,12 @@ using EnvelopeGenerator.Application;
 using DigitalData.Auth.Client;
 using DigitalData.Core.Abstractions;
 using EnvelopeGenerator.API.Models;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
 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!");
@@ -44,11 +41,7 @@ try
 
     var deferredProvider = new DeferredServiceProvider();
 
-    builder.Services.AddControllers()
-        .AddJsonOptions(options =>
-        {
-            options.JsonSerializerOptions.ReferenceHandler = System.Text.Json.Serialization.ReferenceHandler.IgnoreCycles;
-        });
+    builder.Services.AddControllers();
     builder.Services.AddHttpClient();
     builder.Services.AddReverseProxy().LoadFromConfig(builder.Configuration.GetSection("ReverseProxy"));
 
@@ -117,11 +110,9 @@ try
 
         options.DocumentFilter<EnvelopeGenerator.API.Documentation.AuthProxyDocumentFilter>();
     });
-#if NET9_0_OR_GREATER
     builder.Services.AddOpenApi();
-#endif
 
-    //Add EF Core dbcontext
+    //AddEF 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)
@@ -140,7 +131,7 @@ try
         options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
         options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
     })
-        .AddJwtBearer(AuthScheme.Sender, opt =>
+        .AddJwtBearer(opt =>
         {
             opt.TokenValidationParameters = new TokenValidationParameters
             {
@@ -172,61 +163,6 @@ try
                     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
@@ -242,17 +178,14 @@ try
     });
 
     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));
+        .AddPolicy(AuthPolicy.SenderOrReceiver, policy =>
+            policy.RequireRole(Role.Sender, Role.Receiver.Full))
+        .AddPolicy(AuthPolicy.Sender, policy =>
+            policy.RequireRole(Role.Sender))
+        .AddPolicy(AuthPolicy.Receiver, policy =>
+            policy.RequireRole(Role.Receiver.Full))
+        .AddPolicy(AuthPolicy.ReceiverTFA, policy =>
+            policy.RequireRole(Role.Receiver.TFA));
 
     // User manager
 #pragma warning disable CS0618 // Type or member is obsolete
@@ -266,20 +199,6 @@ try
     // 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
@@ -305,9 +224,7 @@ try
 
     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")))
@@ -341,10 +258,8 @@ try
     app.UseAuthentication();
     app.UseAuthorization();
 
-    app.MapControllers();
-
-    // Catch-all YARP proxy — only forward requests that are not swagger/scalar/openapi paths.
     app.MapReverseProxy();
+    app.MapControllers();
 
     app.Run();
 }

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\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

@@ -22,8 +22,8 @@
     "https": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "sender",
+      "launchBrowser": false,
+      "launchUrl": "swagger",
       "applicationUrl": "https://localhost:8088;http://localhost:5131",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"

EnvelopeGenerator.API/appsettings.Development.json

@@ -1,21 +1,10 @@
 {
-"Logging": {
-  "LogLevel": {
-    "Default": "Information",
-    "Microsoft.AspNetCore": "Warning"
-  }
-},
-"ReverseProxy": {
-  "Clusters": {
-    "receiver-ui": {
-      "Destinations": {
-        "primary": {
-          "Address": "https://localhost:52936"
-        }
-      }
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
     }
-  }
-},
+  },
   "AuthClientParams": {
     "Url": "http://172.24.12.39:9090/auth-hub",
     "PublicKeys": [

EnvelopeGenerator.API/appsettings.json

@@ -1,6 +1,6 @@
 {
   "UseSwagger": true,
-  "UseDbMigration": false,
+  "UseDbMigration": true,
   "DiPMode": true,
   "Logging": {
     "LogLevel": {
@@ -174,14 +174,6 @@
     "Receiver": [],
     "EmailTemplate": [ "TBSIG_EMAIL_TEMPLATE_AFT_UPD" ]
   },
-  "Cache": {
-    "SignatureCacheExpiration": null,
-    "SqlServer": {
-      "ConnectionString": null,
-      "SchemaName": "dbo",
-      "TableName": "TBDD_CACHE"
-    }
-  },
   "MainPageTitle": null,
   "AnnotationParams": {
     "Background": {

EnvelopeGenerator.API/yarp.json

@@ -1,177 +1,18 @@
 {
-"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" ]
+  "ReverseProxy": {
+    "Routes": {
+      "auth-login": {
+        "ClusterId": "auth-hub",
+        "Match": {
+          "Path": "/api/auth",
+          "Methods": [ "POST" ]
+        },
+        "Transforms": [
+          { "PathSet": "/api/auth/sign-flow" }
+        ]
       }
     },
-    "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": {
@@ -182,4 +23,3 @@
     }
   }
 }
-

EnvelopeGenerator.Application/Common/Dto/AnnotationDto.cs

@@ -8,77 +8,42 @@ public record AnnotationCreateDto
     /// <summary>
     /// 
     /// </summary>
-    public long Id { get; set; }
+    public int ElementId { get; init; }
 
     /// <summary>
     /// 
     /// </summary>
-    [Obsolete("Not required for DevExpress")]
-    public int ElementId { get; init; } = -1;
+    public string Name { get; init; } = null!;
 
     /// <summary>
     /// 
     /// </summary>
-    [Obsolete("Not required for DevExpress")]
-    public string Name { get; init; } = string.Empty;
+    public string Value { get; init; } = null!;
 
     /// <summary>
     /// 
     /// </summary>
-    [Obsolete("Not required for DevExpress")]
-    public string Value { get; init; } = string.Empty;
+    public string Type { get; init; } = null!;
 
     /// <summary>
     /// 
     /// </summary>
-    [Obsolete("Not required for DevExpress")]
-    public string Type { get; init; } = string.Empty;
-
-    /// <summary>
-    /// Horizontal position of the signature field on the page.
-    /// <br/><br/>
-    /// <b>Unit:</b> INCHES (GdPicture14 native), origin at the <b>top-left</b> corner of the page, X increases to the right.
-    /// <br/>
-    /// <b>Conversion to DevExpress:</b> Multiply by 100 (DX uses 1/100 inch).
-    /// Convert: <c>xDX = xInches * 100.0</c>
-    /// <br/>
-    /// <b>Conversion to PDF Points:</b> Multiply by 72 (PSPDFKit, iText7 use 1/72 inch).
-    /// Convert: <c>xPt = xInches * 72.0</c>
-    /// </summary>
     public double? X { get; init; }
 
     /// <summary>
-    /// Vertical position of the signature field on the page.
-    /// <br/><br/>
-    /// <b>Unit:</b> INCHES (GdPicture14 native), origin at the <b>top-left</b> corner of the page, Y increases downward.
-    /// <br/>
-    /// <b>Conversion to DevExpress:</b> Multiply by 100 (DX uses 1/100 inch).
-    /// Convert: <c>yDX = yInches * 100.0</c>
-    /// <br/>
-    /// <b>Conversion to PDF Points (top-left origin):</b> Multiply by 72.
-    /// Convert: <c>yPt = yInches * 72.0</c>
-    /// <br/>
-    /// <b>Conversion to PDF Points (bottom-left origin - iText7):</b> Y-flip required.
-    /// Convert: <c>yPt = (pageHeightInches - yInches - elemHeightInches) * 72.0</c>
+    /// 
     /// </summary>
     public double? Y { get; init; }
 
     /// <summary>
     /// 
     /// </summary>
-    [Obsolete("Not required for DevExpress")]
     public double? Width { get; init; }
 
     /// <summary>
     /// 
     /// </summary>
-    [Obsolete("Not required for DevExpress")]
     public double? Height { get; init; }
-
-    /// <summary>
-    /// Added to eliminate the need for SignatureDto in DevExpress 
-    /// </summary>
-    public int? Page { get; init; }
 }
 
 /// <summary>

EnvelopeGenerator.Application/Common/Dto/ConfigDto.cs

@@ -1,8 +1,11 @@
-namespace EnvelopeGenerator.Application.Common.Dto;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// Data Transfer Object representing configuration settings.
 /// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
 public class ConfigDto
 {
     /// <summary>

EnvelopeGenerator.Application/Common/Dto/DocumentDto.cs

@@ -1,8 +1,11 @@
-namespace EnvelopeGenerator.Application.Common.Dto;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// Data Transfer Object representing a document within an envelope, including optional binary data and form elements.
 /// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
 public class DocumentDto
 {
     /// <summary>
@@ -28,5 +31,5 @@ public class DocumentDto
     /// <summary>
     /// Gets or sets the collection of elements associated with the document for receiver interactions, if any.
     /// </summary>
-    public IEnumerable<DocReceiverElementDto>? Elements { get; set; }
+    public IEnumerable<SignatureDto>? Elements { get; set; }
 }

EnvelopeGenerator.Application/Common/Dto/DocumentStatusDto.cs

@@ -1,10 +1,12 @@
 using EnvelopeGenerator.Domain.Constants;
+using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// Data Transfer Object representing the status of a document for a specific receiver.
 /// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
 public class DocumentStatusDto
 {
     /// <summary>

EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs

@@ -1,14 +1,16 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
 using DigitalData.UserManager.Application.DTOs.User;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Domain.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+
 namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// 
 /// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
 public record EnvelopeDto : IEnvelope
 {
 	/// <summary>
@@ -124,9 +126,4 @@ public record EnvelopeDto : IEnvelope
     /// 
     /// </summary>
     public IEnumerable<DocumentDto>? Documents { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public IEnumerable<EnvelopeReceiverDto>? EnvelopeReceivers { get; set; }
 }

EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs

@@ -1,11 +1,13 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 
 /// <summary>
 /// 
 /// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
 public record EnvelopeReceiverDto
 {
     /// <summary>

EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverSecretDto.cs

@@ -1,8 +1,11 @@
-namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 
 /// <summary>
 /// 
 /// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
 public record EnvelopeReceiverSecretDto : EnvelopeReceiverDto
 {
     /// <summary>

EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyCreateDto.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
 namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
@@ -7,6 +8,7 @@ namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 /// 
 /// </summary>
 /// <param name="DateValid"></param>
+[ApiExplorerSettings(IgnoreApi = true)]
 public record EnvelopeReceiverReadOnlyCreateDto(
     DateTime DateValid)
 {

EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyDto.cs

@@ -1,4 +1,6 @@
-using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 
@@ -6,6 +8,7 @@ namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 /// Represents a read-only Data Transfer Object (DTO) for an envelope receiver.
 /// Contains information about the receiver, associated envelope, and audit details.
 /// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
 public class EnvelopeReceiverReadOnlyDto
 {
     /// <summary>

EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyUpdateDto.cs

@@ -1,8 +1,11 @@
-namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 
 /// <summary>
 /// Data Transfer Object for updating a read-only envelope receiver.
 /// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
 public class EnvelopeReceiverReadOnlyUpdateDto
 {
     /// <summary>

EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDto.cs

@@ -1,8 +1,11 @@
-namespace EnvelopeGenerator.Application.Common.Dto;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// Data Transfer Object representing a type of envelope with its configuration settings.
 /// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
 public class EnvelopeTypeDto
 {
     /// <summary>

EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs

@@ -7,9 +7,7 @@ using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Domain.Entities;
 
-using EnvelopeGenerator.Application.Common.Dto;
-
-namespace EnvelopeGenerator.Application.Common;
+namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// Represents the AutoMapper profile configuration for mapping between
@@ -25,37 +23,34 @@ public class MappingProfile : Profile
     {
         // Entity to DTO mappings
         CreateMap<Config, ConfigDto>();
-        CreateMap<DocReceiverElement, DocReceiverElementDto>();
+        CreateMap<Signature, SignatureDto>();
         CreateMap<DocumentStatus, DocumentStatusDto>();
         CreateMap<EmailTemplate, EmailTemplateDto>();
         CreateMap<Envelope, EnvelopeDto>();
         CreateMap<Document, DocumentDto>();
-        CreateMap<History, HistoryDto>().ForMember(dest => dest.ActionDate, opt => opt.MapFrom(src => src.ChangedWhen));
-        CreateMap<History, HistoryCreateDto>().ForMember(dest => dest.ActionDate, opt => opt.MapFrom(src => src.ChangedWhen));
-        CreateMap<EnvelopeReceiver, EnvelopeReceiverDto>();
-        CreateMap<EnvelopeReceiver, EnvelopeReceiverSecretDto>();
+        CreateMap<Domain.Entities.History, HistoryDto>().ForMember(dest => dest.ActionDate, opt => opt.MapFrom(src => src.ChangedWhen));
+        CreateMap<Domain.Entities.History, HistoryCreateDto>().ForMember(dest => dest.ActionDate, opt => opt.MapFrom(src => src.ChangedWhen));
+        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverDto>();
+        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverSecretDto>();
         CreateMap<EnvelopeType, EnvelopeTypeDto>();
-        CreateMap<Receiver, ReceiverDto>();
-        CreateMap<EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
+        CreateMap<Domain.Entities.Receiver, ReceiverDto>();
+        CreateMap<Domain.Entities.EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
         CreateMap<ElementAnnotation, AnnotationDto>();
 
         // DTO to Entity mappings
         CreateMap<ConfigDto, Config>();
-        CreateMap<DocReceiverElementDto, DocReceiverElement>();
-        CreateMap<Signature, DocReceiverElement>()
-            .ForMember(dest => dest.Ink, opt => opt.MapFrom(src => src.DataUrl.MapDataUrlToRequiredBytes()))
-            .MapChangedWhen();
+        CreateMap<SignatureDto, Signature>();
         CreateMap<DocumentStatusDto, DocumentStatus>();
         CreateMap<EmailTemplateDto, EmailTemplate>();
         CreateMap<EnvelopeDto, Envelope>();
         CreateMap<DocumentDto, Document>();
-        CreateMap<HistoryDto, History>().ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(src => src.ActionDate));
-        CreateMap<HistoryCreateDto, History>().ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(src => src.ActionDate));
-        CreateMap<EnvelopeReceiverDto, EnvelopeReceiver>();
+        CreateMap<HistoryDto, Domain.Entities.History>().ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(src => src.ActionDate));
+        CreateMap<HistoryCreateDto, Domain.Entities.History>().ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(src => src.ActionDate));
+        CreateMap<EnvelopeReceiverDto, Domain.Entities.EnvelopeReceiver>();
         CreateMap<EnvelopeTypeDto, EnvelopeType>();
-        CreateMap<ReceiverDto, Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
-        CreateMap<EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnly>();
-        CreateMap<EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly>();
+        CreateMap<ReceiverDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
+        CreateMap<EnvelopeReceiverReadOnlyCreateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
+        CreateMap<EnvelopeReceiverReadOnlyUpdateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
         CreateMap<AnnotationCreateDto, ElementAnnotation>()
             .MapAddedWhen();
 

EnvelopeGenerator.Application/Common/Dto/Messaging/GtxMessagingResponse.cs

@@ -1,6 +1,9 @@
-namespace EnvelopeGenerator.Application.Common.Dto.Messaging;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.Application.Common.Dto.Messaging;
 
 /// <summary>
 /// 
 /// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
 public class GtxMessagingResponse : Dictionary<string, object?> { }

EnvelopeGenerator.Application/Common/Dto/Messaging/SmsResponse.cs

@@ -1,8 +1,11 @@
-namespace EnvelopeGenerator.Application.Common.Dto.Messaging;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.Application.Common.Dto.Messaging;
 
 /// <summary>
 /// 
 /// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
 public record SmsResponse
 {
     /// <summary>

EnvelopeGenerator.Application/Common/Dto/PsPdfKitAnnotation.cs

@@ -1,11 +0,0 @@
-using System.Dynamic;
-
-namespace EnvelopeGenerator.Application.Common.Dto;
-
-/// <summary>
-/// Represents PSPDFKit annotation data.
-/// </summary>
-/// <param name="Instant">Instant annotation data.</param>
-/// <param name="Structured">Structured annotation data.</param>
-[Obsolete("The PSPDFKit library is deprecated.")]
-public record PsPdfKitAnnotation(ExpandoObject Instant, IEnumerable<AnnotationCreateDto> Structured);

EnvelopeGenerator.Application/Common/Dto/Receiver/ReceiverDto.cs

@@ -1,4 +1,5 @@
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using Microsoft.AspNetCore.Mvc;
 using System.Text.Json.Serialization;
 
 namespace EnvelopeGenerator.Application.Common.Dto.Receiver;
@@ -6,6 +7,7 @@ namespace EnvelopeGenerator.Application.Common.Dto.Receiver;
 /// <summary>
 /// 
 /// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
 public class ReceiverDto
 {
     /// <summary>

EnvelopeGenerator.Application/Common/Dto/Signature.cs

@@ -1,65 +0,0 @@
-namespace EnvelopeGenerator.Application.Common.Dto;
-
-/// <summary>
-/// Represents a captured signature with metadata created by the receiver in the signature popup.
-/// This model holds the signature image (as base64 data URL) along with signer information
-/// used for rendering applied signatures on the PDF canvas.
-/// </summary>
-/// <remarks>
-/// <b>Used in:</b> EnvelopeViewer.razor signature popup workflow
-/// <br/>
-/// <b>Creation:</b> User draws/types/uploads signature and fills required fields
-/// </remarks>
-public sealed record Signature
-{
-    /// <summary>
-    /// TBDD_DOCUMENT_RECEIVER_ELEMENT.ID - identifies the specific signature field on the PDF page.
-    /// </summary>
-    public required int Id { get; init; }
-
-    /// <summary>
-    /// Base64-encoded data URL of the signature image.
-    /// <br/>
-    /// <b>Format:</b> <c>data:image/png;base64,iVBORw0KG...</c>
-    /// <br/>
-    /// <b>Source:</b> Canvas.toDataURL() from signature pad (draw/text/image tabs)
-    /// <br/>
-    /// <b>Usage:</b> Set as <c>img.src</c> in applied signature overlay
-    /// </summary>
-    public required string DataUrl { get; init; }
-
-    /// <summary>
-    /// Full name of the signer (first and last name).
-    /// <br/>
-    /// <b>Required:</b> Yes (validated in popup)
-    /// <br/>
-    /// <b>Example:</b> "Max Mustermann"
-    /// </summary>
-    public required string FullName { get; init; }
-
-    private readonly string? _position = null;
-
-    /// <summary>
-    /// Job title or position of the signer.
-    /// <br/>
-    /// <b>Required:</b> No (optional field)
-    /// <br/>
-    /// <b>Example:</b> "Geschäftsführer" or empty string
-    /// </summary>
-    public string? Position
-    {
-        get => _position;
-        init => _position = string.IsNullOrWhiteSpace(value) ? value : null;
-    }
-
-    /// <summary>
-    /// Location/place where the signature was created.
-    /// <br/>
-    /// <b>Required:</b> Yes (validated in popup)
-    /// <br/>
-    /// <b>Display:</b> Shown with current date in German format (dd.MM.yyyy)
-    /// <br/>
-    /// <b>Example:</b> "Berlin" ? rendered as "Berlin, 26.01.2025"
-    /// </summary>
-    public required string Place { get; init; }
-}

EnvelopeGenerator.Application/Common/Dto/SignatureDto.cs

@@ -1,12 +1,13 @@
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Domain.Interfaces;
+using EnvelopeGenerator.Domain.Interfaces;
+using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// Data Transfer Object representing a positioned element assigned to a document receiver.
 /// </summary>
-public class DocReceiverElementDto : IDocReceiverElement
+[ApiExplorerSettings(IgnoreApi = true)]
+public class SignatureDto : ISignature
 {
     /// <summary>
     /// Gets or sets the unique identifier of the element.
@@ -92,34 +93,4 @@ public class DocReceiverElementDto : IDocReceiverElement
     /// Gets or sets the left position of the element (in layout terms).
     /// </summary>
     public double Left => X;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public IEnumerable<AnnotationDto>? Annotations { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public SenderAppType SenderAppType { get; set; } = SenderAppType.LegacyFormApp;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? FullName { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? Position { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? Place { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public byte[]? Ink { get; set; }
 }

EnvelopeGenerator.Application/Common/Extensions/AutoMapperAuditingExtensions.cs

@@ -1,6 +1,5 @@
 using AutoMapper;
 using EnvelopeGenerator.Domain.Interfaces.Auditing;
-using System;
 
 namespace EnvelopeGenerator.Application.Common.Extensions;
 
@@ -22,21 +21,4 @@ public static class AutoMapperAuditingExtensions
     public static IMappingExpression<TSource, TDestination> MapChangedWhen<TSource, TDestination>(this IMappingExpression<TSource, TDestination> expression)
         where TDestination : IHasChangedWhen
         => expression.ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(_ => DateTime.Now));
-
-    /// <summary>
-    /// Converts a base64 data URL string to a byte array.
-    /// Handles data URLs in the format: "data:image/png;base64,iVBORw0KG..."
-    /// </summary>
-    /// <param name="dataUrl">The base64 data URL string from Canvas.toDataURL()</param>
-    /// <returns>The decoded byte array, or null if the input is null or empty</returns>
-    public static byte[]? MapDataUrlToRequiredBytes(this string dataUrl)
-    {
-        // Remove data URL prefix (e.g., "data:image/png;base64,")
-        var base64Index = dataUrl.IndexOf(',', StringComparison.Ordinal);
-        if (base64Index == -1)
-            throw new ArgumentException("Invalid data URL format. Unable to extract base64 data.", nameof(dataUrl));
-
-        var base64Data = dataUrl[(base64Index + 1)..];
-        return Convert.FromBase64String(base64Data);
-    }
 }

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IDocumentReceiverElementRepository.cs

@@ -6,6 +6,6 @@ namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 /// 
 /// </summary>
 [Obsolete("Use IRepository")]
-public interface IDocumentReceiverElementRepository : ICRUDRepository<DocReceiverElement, int>
+public interface IDocumentReceiverElementRepository : ICRUDRepository<Signature, int>
 {
 }

EnvelopeGenerator.Application/Common/Interfaces/Services/IDocumentReceiverElementService.cs

@@ -8,6 +8,6 @@ namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public interface IDocumentReceiverElementService : IBasicCRUDService<DocReceiverElementDto, DocReceiverElement, int>
+public interface IDocumentReceiverElementService : IBasicCRUDService<SignatureDto, Signature, int>
 {
 }

EnvelopeGenerator.Application/Common/Notifications/DocSigned/DocSignedNotification.cs

@@ -1,37 +1,88 @@
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Notifications.RemoveSignature;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
+using System.Dynamic;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned;
 
 /// <summary>
-/// Notification raised when a document is signed by a receiver.
+/// 
 /// </summary>
-[Obsolete("This notification is deprecated. Use Signature.Commands.SignCommand instead.")]
-public record DocSignedNotification : INotification, ISendMailNotification
+/// <param name="Instant"></param>
+/// <param name="Structured"></param>
+public record PsPdfKitAnnotation(ExpandoObject Instant, IEnumerable<AnnotationCreateDto> Structured);
+
+/// <summary>
+/// 
+/// </summary>
+/// <param name="Original"></param>
+public record DocSignedNotification(EnvelopeReceiverDto Original) : EnvelopeReceiverDto(Original), INotification, ISendMailNotification
 {
     /// <summary>
-    /// The envelope receiver information.
+    /// 
     /// </summary>
-    public required EnvelopeReceiverDto EnvelopeReceiver { get; init; }
-
-    /// <summary>
-    /// The PSPDFKit annotation data.
-    /// </summary>
-    [Obsolete("The PSPDFKit library is deprecated.")]
     public PsPdfKitAnnotation? PsPdfKitAnnotation { get; init; }
 
     /// <summary>
-    /// Gets the email template type.
+    /// 
     /// </summary>
     public EmailTemplateType TemplateType => EmailTemplateType.DocumentSigned;
 
     /// <summary>
-    /// Gets the email address of the receiver.
+    /// 
     /// </summary>
-    public string EmailAddress => EnvelopeReceiver.Receiver?.EmailAddress
+    public string EmailAddress => Receiver?.EmailAddress
         ?? throw new InvalidOperationException($"Receiver is null." +
             $"DocSignedNotification:\n{this.ToJson(Format.Json.ForDiagnostics)}");
+}
+
+/// <summary>
+/// 
+/// </summary>
+public static class DocSignedNotificationExtensions
+{
+    /// <summary>
+    /// Converts an <see cref="EnvelopeReceiverDto"/> to a <see cref="DocSignedNotification"/>.
+    /// </summary>
+    /// <param name="dto">The DTO to convert.</param>
+    /// <param name="psPdfKitAnnotation"></param>
+    /// <returns>A new <see cref="DocSignedNotification"/> instance.</returns>
+    public static DocSignedNotification ToDocSignedNotification(this EnvelopeReceiverDto dto, PsPdfKitAnnotation psPdfKitAnnotation)
+        => new(dto) { PsPdfKitAnnotation = psPdfKitAnnotation };
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="dtoTask"></param>
+    /// <param name="psPdfKitAnnotation"></param>
+    /// <returns></returns>
+    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, PsPdfKitAnnotation? psPdfKitAnnotation)
+        => await dtoTask is EnvelopeReceiverDto dto ? new(dto) { PsPdfKitAnnotation = psPdfKitAnnotation } : null;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="publisher"></param>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public static async Task PublishSafely(this IPublisher publisher, DocSignedNotification notification, CancellationToken cancel = default)
+    {
+        try
+        {
+            await publisher.Publish(notification, cancel);
+        }
+        catch (Exception)
+        {
+            await publisher.Publish(new RemoveSignatureNotification()
+            {
+                EnvelopeId = notification.EnvelopeId,
+                ReceiverId = notification.ReceiverId
+            }, cancel);
+            throw;
+        }
+    }
 }

EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/AnnotationHandler.cs

@@ -1,6 +1,5 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Common.Dto;
 using MediatR;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
@@ -8,7 +7,6 @@ namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 /// <summary>
 /// 
 /// </summary>
-[Obsolete("The PSPDFKit library is deprecated.")]
 public class AnnotationHandler : INotificationHandler<DocSignedNotification>
 {
     /// <summary>

EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/DocStatusHandler.cs

@@ -1,5 +1,4 @@
 using EnvelopeGenerator.Application.DocStatus.Commands;
-using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 using System.Text.Json;
@@ -9,7 +8,6 @@ namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 /// <summary>
 /// 
 /// </summary>
-[Obsolete("This notification is deprecated. Use Signature.Commands.SignCommand instead.")]
 public class DocStatusHandler : INotificationHandler<DocSignedNotification>
 {
     private const string BlankAnnotationJson = "{}";
@@ -31,11 +29,10 @@ public class DocStatusHandler : INotificationHandler<DocSignedNotification>
     /// <param name="notification"></param>
     /// <param name="cancel"></param>
     /// <returns></returns>
-    [Obsolete("This notification is deprecated. Use Signature.Commands.SignCommand instead.")]
     public Task Handle(DocSignedNotification notification, CancellationToken cancel) => _sender.Send(new CreateDocStatusCommand()
     {
-        EnvelopeId = notification.EnvelopeReceiver.EnvelopeId,
-        ReceiverId = notification.EnvelopeReceiver.ReceiverId,
+        EnvelopeId = notification.EnvelopeId,
+        ReceiverId = notification.ReceiverId,
         Value = notification.PsPdfKitAnnotation is PsPdfKitAnnotation annot
                     ? JsonSerializer.Serialize(annot.Instant, Format.Json.ForAnnotations)
                     : BlankAnnotationJson

EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/HistoryHandler.cs

@@ -29,13 +29,13 @@ public class HistoryHandler : INotificationHandler<DocSignedNotification>
     /// <returns></returns>
     public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
     {
-        if (notification.EnvelopeReceiver.Receiver is null)
+        if (notification.Receiver is null)
             throw new InvalidOperationException($"Receiver information is missing in the notification. DocSignedNotification:\n {notification.ToJson(Format.Json.ForDiagnostics)}");
 
         await _sender.Send(new CreateHistoryCommand()
         {
-            EnvelopeId = notification.EnvelopeReceiver.EnvelopeId,
-            UserReference = notification.EnvelopeReceiver.Receiver.EmailAddress,
+            EnvelopeId = notification.EnvelopeId,
+            UserReference = notification.Receiver.EmailAddress,
             Status = EnvelopeStatus.DocumentSigned,
         }, cancel);
     }

EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/SendSignedMailHandler.cs

@@ -31,7 +31,7 @@ public class SendSignedMailHandler : SendMailHandler<DocSignedNotification>
     protected override void ConfigureEmailOut(DocSignedNotification notification, EmailOut emailOut)
     {
         emailOut.ReferenceString = notification.EmailAddress;
-        emailOut.ReferenceId = notification.EnvelopeReceiver.ReceiverId;
+        emailOut.ReferenceId = notification.ReceiverId;
     }
 
     /// <summary>
@@ -42,11 +42,11 @@ public class SendSignedMailHandler : SendMailHandler<DocSignedNotification>
     {
         var placeHolders = new Dictionary<string, string>()
         {
-            { "[NAME_RECEIVER]", notification.EnvelopeReceiver.Name ?? string.Empty },
-            { "[DOCUMENT_TITLE]", notification.EnvelopeReceiver.Envelope?.Title ?? string.Empty },
+            { "[NAME_RECEIVER]", notification.Name ?? string.Empty },
+            { "[DOCUMENT_TITLE]", notification.Envelope?.Title ?? string.Empty },
         };
 
-        if (notification.EnvelopeReceiver.Envelope.IsReadAndConfirm())
+        if (notification.Envelope.IsReadAndConfirm())
         {
             placeHolders["[SIGNATURE_TYPE]"] = "Lesen und bestätigen";
             placeHolders["[DOCUMENT_PROCESS]"] = string.Empty;

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -7,9 +7,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using QRCoder;
 using System.Reflection;
-using MediatR;
-using EnvelopeGenerator.Application.DocReceiverElements.Commands;
-using EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
 
 namespace EnvelopeGenerator.Application;
 
@@ -59,22 +56,6 @@ public static class DependencyInjection
         services.AddMediatR(cfg =>
         {
             cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly());
-            
-            // Register SignCommand pipeline behaviors in execution order
-            // 0. EnvelopeReceiverResolutionBehavior - Resolves EnvelopeReceiver from query parameters (executes FIRST)
-            cfg.AddBehavior<IPipelineBehavior<SigningCommand, Unit>, EnvelopeReceiverResolutionBehavior>();
-            
-            // 1. AnnotationBehavior - Saves annotations (executes second)
-            cfg.AddBehavior<IPipelineBehavior<SigningCommand, Unit>, AnnotationBehavior>();
-            
-            // 2. DocStatusBehavior - Creates document status (executes third)
-            cfg.AddBehavior<IPipelineBehavior<SigningCommand, Unit>, DocStatusBehavior>();
-
-            // 3. HistoryBehavior - Records history (executes fourth)
-            cfg.AddBehavior<IPipelineBehavior<SigningCommand, Unit>, HistoryBehavior>();
-            
-            // 4. SendSignedMailBehavior - Sends notification email (executes LAST, only if all previous succeed)
-            cfg.AddBehavior<IPipelineBehavior<SigningCommand, Unit>, SendSignedMailBehavior>();
         });
 
         return services;

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/AnnotationBehavior.cs

@@ -1,50 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.DocReceiverElements.Commands;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-
-namespace EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
-
-/// <summary>
-/// Pipeline behavior that saves annotations.
-/// Executes first in the signing process.
-/// </summary>
-[Obsolete("The PSPDFKit library is deprecated.")]
-public class AnnotationBehavior : IPipelineBehavior<SigningCommand, Unit>
-{
-    private readonly IRepository<ElementAnnotation> _repo;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="AnnotationBehavior"/> class.
-    /// </summary>
-    /// <param name="repository"></param>
-    public AnnotationBehavior(IRepository<ElementAnnotation> repository)
-    {
-        _repo = repository;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="next"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public async Task<Unit> Handle(SigningCommand request, RequestHandlerDelegate<Unit> next, CancellationToken cancel)
-    {
-        if(request.ReceiverAppType != ReceiverAppType.LegacyWeb)
-            if(request.PsPdfKitAnnotation is null)
-                return await next(cancel);
-            else
-                throw new BadRequestException("PsPdfKit Annotation are only supported for the legacy web receiver type.");
-
-        if (request.PsPdfKitAnnotation is PsPdfKitAnnotation annot)
-                await _repo.CreateAsync(annot.Structured, cancel);
-            else
-                throw new BadRequestException("Annotation data is missing or invalid.");
-
-            return await next(cancel);
-    }
-}

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/DocStatusBehavior.cs

@@ -1,50 +0,0 @@
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.DocStatus.Commands;
-using EnvelopeGenerator.Application.DocReceiverElements.Commands;
-using EnvelopeGenerator.Domain.Constants;
-using MediatR;
-using System.Text.Json;
-
-namespace EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
-
-/// <summary>
-/// Pipeline behavior that creates document status.
-/// Executes second in the signing process.
-/// </summary>
-public class DocStatusBehavior : IPipelineBehavior<SigningCommand, Unit>
-{
-    private const string BlankAnnotationJson = "{}";
-
-    private readonly ISender _sender;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="sender"></param>
-    public DocStatusBehavior(ISender sender)
-    {
-        _sender = sender;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="next"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    [Obsolete("This notification is deprecated. Use Signature.Commands.SignCommand instead.")]
-    public async Task<Unit> Handle(SigningCommand request, RequestHandlerDelegate<Unit> next, CancellationToken cancellationToken)
-    {
-        await _sender.Send(new CreateDocStatusCommand()
-        {
-            EnvelopeId = request.EnvelopeReceiver.EnvelopeId,
-            ReceiverId = request.EnvelopeReceiver.ReceiverId,
-            Value = request.PsPdfKitAnnotation is PsPdfKitAnnotation annot
-                        ? JsonSerializer.Serialize(annot.Instant, Format.Json.ForAnnotations)
-                        : BlankAnnotationJson
-        }, cancellationToken);
-
-        return await next(cancellationToken);
-    }
-}

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/EnvelopeReceiverResolutionBehavior.cs

@@ -1,54 +0,0 @@
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.DocReceiverElements.Commands;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-
-namespace EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
-
-/// <summary>
-/// Pipeline behavior that resolves and validates EnvelopeReceiver.
-/// Executes FIRST in the signing process - before all other behaviors.
-/// If EnvelopeReceiver is not provided, it queries the database using EnvelopeReceiverQueryBase parameters.
-/// </summary>
-public class EnvelopeReceiverResolutionBehavior : IPipelineBehavior<SigningCommand, Unit>
-{
-    private readonly IRepository<EnvelopeReceiver> _erRepo;
-    private readonly IMapper _mapper;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="erRepo"></param>
-    /// <param name="mapper"></param>
-    public EnvelopeReceiverResolutionBehavior(IRepository<EnvelopeReceiver> erRepo, IMapper mapper)
-    {
-        _erRepo = erRepo;
-        _mapper = mapper;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="next"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<Unit> Handle(SigningCommand request, RequestHandlerDelegate<Unit> next, CancellationToken cancellationToken)
-    {
-        // If EnvelopeReceiver is not provided, query it from database
-        if (request.EnvelopeReceiver is null)
-        {
-            var er = await _erRepo.Query.Where(request, notnull: true).SingleOrDefaultAsync(cancellationToken)
-                ?? throw new NotFoundException("EnvelopeReceiver not found");
-
-            request.SetEnvelopeReceiver(_mapper.Map<EnvelopeReceiverDto>(er));
-        }
-
-        return await next(cancellationToken);
-    }
-}

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/HistoryBehavior.cs

@@ -1,47 +0,0 @@
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Histories.Commands;
-using EnvelopeGenerator.Application.DocReceiverElements.Commands;
-using EnvelopeGenerator.Domain.Constants;
-using MediatR;
-
-namespace EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
-
-/// <summary>
-/// Pipeline behavior that records history.
-/// Executes third in the signing process.
-/// </summary>
-public class HistoryBehavior : IPipelineBehavior<SigningCommand, Unit>
-{
-    private readonly ISender _sender;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="sender"></param>
-    public HistoryBehavior(ISender sender)
-    {
-        _sender = sender;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="next"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<Unit> Handle(SigningCommand request, RequestHandlerDelegate<Unit> next, CancellationToken cancellationToken)
-    {
-        if (request.EnvelopeReceiver.Receiver is null)
-            throw new InvalidOperationException($"Receiver information is missing in the notification. SignCommand:\n {request.ToJson(Format.Json.ForDiagnostics)}");
-
-        await _sender.Send(new CreateHistoryCommand()
-        {
-            EnvelopeId = request.EnvelopeReceiver.EnvelopeId,
-            UserReference = request.EnvelopeReceiver.Receiver.EmailAddress,
-            Status = EnvelopeStatus.DocumentSigned,
-        }, cancellationToken);
-
-        return await next(cancellationToken);
-    }
-}

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/SaveSignatureBehavior.cs

@@ -1,70 +0,0 @@
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.DocReceiverElements.Commands;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-
-namespace EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
-
-/// <summary>
-/// Pipeline behavior that creates document status.
-/// Executes second in the signing process.
-/// </summary>
-public class SaveSignatureBehavior : IPipelineBehavior<SigningCommand, Unit>
-{
-    private readonly ISender _sender;
-
-    private readonly IRepository<DocReceiverElement> _elementRepo;
-
-    private readonly IMapper _mapper;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="elementRepo"></param>
-    /// <param name="mapper"></param>
-    public SaveSignatureBehavior(ISender sender, IRepository<DocReceiverElement> elementRepo, IMapper mapper)
-    {
-        _sender = sender;
-        _elementRepo = elementRepo;
-        _elementRepo = elementRepo;
-        _mapper = mapper;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="next"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public async Task<Unit> Handle(SigningCommand request, RequestHandlerDelegate<Unit> next, CancellationToken cancel)
-    {
-        if (request.ReceiverAppType == ReceiverAppType.LegacyWeb)
-            return await next(cancel);
-        else if(request.Signatures is not IEnumerable<Signature> signatures)
-            throw new BadRequestException($"Signatures are required for saving signature behavior.");
-
-        var elements = await _elementRepo
-            .Where(e => e.Document.EnvelopeId == request.Envelope.Id)
-            .Where(e => e.ReceiverId == request.Receiver.Id)
-            .ToListAsync(cancel);
-
-        foreach (var element in elements)
-        {
-            var signatures = request.Signatures.Where(s => s.Id == element.Id).ToList();
-            if(signatures.Count == 0)
-                throw new BadRequestException("No signature found for element with id {element.Id}.");
-            else if(signatures.Count > 1)
-                throw new BadRequestException("Multiple signatures found for element with id {element.Id}.");
-            
-            await _elementRepo.UpdateAsync(signatures.First(), e => e.Id == element.Id, cancel);
-        }
-
-        return await next(cancel);
-    }
-}

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/SendSignedMailBehavior.cs

@@ -1,122 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
-using EnvelopeGenerator.Application.Common.Configurations;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.DocReceiverElements.Commands;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Domain.Interfaces;
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-
-namespace EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
-
-/// <summary>
-/// Pipeline behavior that sends signed mail notification.
-/// Executes LAST in the signing process - only if all previous behaviors succeed.
-/// </summary>
-public class SendSignedMailBehavior : IPipelineBehavior<SigningCommand, Unit>
-{
-    private readonly IRepository<EmailTemplate> _tempRepo;
-    private readonly IRepository<EmailOut> _emailOutRepo;
-    private readonly MailParams _mailParams;
-    private readonly DispatcherParams _dispatcherParams;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="tempRepo"></param>
-    /// <param name="emailOutRepo"></param>
-    /// <param name="mailParamsOptions"></param>
-    /// <param name="dispatcherParamsOptions"></param>
-    public SendSignedMailBehavior(
-        IRepository<EmailTemplate> tempRepo,
-        IRepository<EmailOut> emailOutRepo,
-        IOptions<MailParams> mailParamsOptions,
-        IOptions<DispatcherParams> dispatcherParamsOptions)
-    {
-        _tempRepo = tempRepo;
-        _emailOutRepo = emailOutRepo;
-        _mailParams = mailParamsOptions.Value;
-        _dispatcherParams = dispatcherParamsOptions.Value;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="next"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async Task<Unit> Handle(SigningCommand request, RequestHandlerDelegate<Unit> next, CancellationToken cancellationToken)
-    {
-        var placeHolders = CreatePlaceHolders(request);
-
-        var temp = await _tempRepo
-            .Where(x => x.Name == EmailTemplateType.DocumentSigned.ToString())
-            .SingleOrDefaultAsync(cancellationToken)
-                ?? throw new InvalidOperationException($"Email template not found. SignCommand:\n {request.ToJson(Format.Json.ForDiagnostics)}");
-
-        temp.Subject = ReplacePlaceHolders(temp.Subject, placeHolders, _mailParams.Placeholders);
-        temp.Body = ReplacePlaceHolders(temp.Body, placeHolders, _mailParams.Placeholders);
-
-        var emailOut = new EmailOut
-        {
-            EmailAddress = request.EnvelopeReceiver.Receiver!.EmailAddress,
-            EmailBody = temp.Body,
-            EmailSubj = temp.Subject,
-            AddedWhen = DateTime.Now,
-            AddedWho = _dispatcherParams.AddedWho,
-            SendingProfile = _dispatcherParams.SendingProfile,
-            ReminderTypeId = _dispatcherParams.ReminderTypeId,
-            EmailAttmt1 = _dispatcherParams.EmailAttmt1,
-            WfId = (int)EnvelopeStatus.MessageConfirmationSent,
-            ReferenceString = request.EnvelopeReceiver.Receiver!.EmailAddress,
-            ReferenceId = request.EnvelopeReceiver.ReceiverId
-        };
-
-        await _emailOutRepo.CreateAsync(emailOut, cancellationToken);
-
-        return await next(cancellationToken);
-    }
-
-    private Dictionary<string, string> CreatePlaceHolders(SigningCommand request)
-    {
-        var placeHolders = new Dictionary<string, string>()
-        {
-            { "[NAME_RECEIVER]", request.EnvelopeReceiver.Name ?? string.Empty },
-            { "[DOCUMENT_TITLE]", request.EnvelopeReceiver.Envelope?.Title ?? string.Empty },
-        };
-
-        if (request.EnvelopeReceiver.Envelope.IsReadAndConfirm())
-        {
-            placeHolders["[SIGNATURE_TYPE]"] = "Lesen und bestätigen";
-            placeHolders["[DOCUMENT_PROCESS]"] = string.Empty;
-            placeHolders["[FINAL_STATUS]"] = "Lesebestätigung";
-            placeHolders["[FINAL_ACTION]"] = "Empfänger bestätigt";
-            placeHolders["[REJECTED_BY_OTHERS]"] = "anderen Empfänger abgelehnt!";
-            placeHolders["[RECEIVER_ACTION]"] = "bestätigt";
-        }
-        else
-        {
-            placeHolders["[SIGNATURE_TYPE]"] = "Signieren";
-            placeHolders["[DOCUMENT_PROCESS]"] = " und elektronisch unterschreiben";
-            placeHolders["[FINAL_STATUS]"] = "Signatur";
-            placeHolders["[FINAL_ACTION]"] = "Vertragspartner unterzeichnet";
-            placeHolders["[REJECTED_BY_OTHERS]"] = "anderen Vertragspartner abgelehnt! Ihre notwendige Unterzeichnung wurde verworfen.";
-            placeHolders["[RECEIVER_ACTION]"] = "unterschrieben";
-        }
-
-        return placeHolders;
-    }
-
-    private static string ReplacePlaceHolders(string text, params Dictionary<string, string>[] placeHoldersList)
-    {
-        foreach (var placeHolders in placeHoldersList)
-            foreach (var ph in placeHolders)
-                text = text.Replace(ph.Key, ph.Value);
-        return text;
-    }
-}

EnvelopeGenerator.Application/DocReceiverElements/Commands/SigningCommand.cs

@@ -1,78 +0,0 @@
-using MediatR;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Common.Query;
-
-namespace EnvelopeGenerator.Application.DocReceiverElements.Commands;
-
-/// <summary>
-/// Command to sign a document by a receiver.
-/// </summary>
-public record SigningCommand : EnvelopeReceiverQueryBase, IRequest
-{
-    private EnvelopeReceiverDto? _envelopeReceiver;
-
-    internal void SetEnvelopeReceiver(EnvelopeReceiverDto envelopeReceiver)
-    {
-        _envelopeReceiver = envelopeReceiver;
-    }
-
-    /// <summary>
-    /// The envelope receiver information.
-    /// </summary>
-    public EnvelopeReceiverDto EnvelopeReceiver
-    { 
-        get => _envelopeReceiver!;
-        init => _envelopeReceiver = value;
-    }
-
-    /// <summary>
-    /// The PSPDFKit annotation data.
-    /// </summary>
-    [Obsolete("This notification is deprecated. Use Signature.Commands.SignCommand instead.")]
-    public PsPdfKitAnnotation? PsPdfKitAnnotation { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public IEnumerable<Signature>? Signatures { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public ReceiverAppType ReceiverAppType { get; init; } = ReceiverAppType.ReceiverUI;
-}
-
-/// <summary>
-/// Handles the sign command. All work is done by pipeline behaviors.
-/// This handler is intentionally empty - behaviors handle all the processing.
-/// </summary>
-public class SignCommandHandler : IRequestHandler<SigningCommand>
-{
-    /// <summary>
-    /// Executes the signing command. Pipeline behaviors handle all processing.
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public Task Handle(SigningCommand request, CancellationToken cancellationToken = default)
-    {
-        return Task.CompletedTask;
-    }
-}
-
-/// <summary>
-/// 
-/// </summary>
-public enum ReceiverAppType
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    ReceiverUI = 0,
-
-    /// <summary>
-    /// 
-    /// </summary>
-    LegacyWeb = 1,
-}

EnvelopeGenerator.Application/DocReceiverElements/Queries/ReadDocReceiverElementQuery.cs

@@ -1,66 +0,0 @@
-using AutoMapper;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Common.Query;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-using EnvelopeGenerator.Application.Common.Extensions;
-using DigitalData.Core.Abstraction.Application.Repository;
-using Microsoft.EntityFrameworkCore;
-
-namespace EnvelopeGenerator.Application.DocReceiverElements.Queries;
-
-/// <summary>
-/// 
-/// </summary>
-public record ReadDocReceiverElementQuery : EnvelopeReceiverQueryBase, IRequest<IEnumerable<DocReceiverElementDto>>
-{
-}
-
-/// <summary>
-/// 
-/// </summary>
-public class ReadDocReceiverElementQueryHandler : IRequestHandler<ReadDocReceiverElementQuery, IEnumerable<DocReceiverElementDto>>
-{
-    private readonly IRepository<DocReceiverElement> _repository;
-
-    private readonly IMapper _mapper;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    /// <param name="mapper"></param>
-    public ReadDocReceiverElementQueryHandler(IRepository<DocReceiverElement> repository, IMapper mapper)
-    {
-        _repository = repository;
-        _mapper = mapper;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    /// <exception cref="NotImplementedException"></exception>
-    public async Task<IEnumerable<DocReceiverElementDto>> Handle(ReadDocReceiverElementQuery request, CancellationToken cancellationToken)
-    {
-        var q = _repository.Query;
-
-        if(request.Envelope.Id is int envelopeId)
-            q = q.Where(e => e.Document.EnvelopeId == envelopeId);
-
-        if (request.Envelope.Uuid is string envelopeUuid)
-            q = q.Where(e => e.Document.Envelope.Uuid == envelopeUuid);
-
-        if (request.Receiver.Id is int receiverId)
-            q = q.Where(e => e.ReceiverId == receiverId);
-
-        if (request.Receiver.Signature is string signature)
-            q = q.Where(e => e.Receiver.Signature == signature);
-
-        var elements = await q.ToListAsync(cancellationToken);
-
-        return _mapper.Map<IEnumerable<DocReceiverElementDto>>(elements);
-    }
-}

EnvelopeGenerator.Application/Documents/Queries/ReadDocumentQuery.cs

@@ -53,17 +53,14 @@ public class ReadDocumentQueryHandler : IRequestHandler<ReadDocumentQuery, Docum
     /// </exception>
     public async Task<DocumentDto> Handle(ReadDocumentQuery query, CancellationToken cancel)
     {
-        var docQuery = _repo.Query.Include(doc => doc.Elements).ThenInclude(e => e.Annotations);
-
         if (query.Id is not null)
         {
-            var doc = await docQuery.Where(d => d.Id == query.Id).FirstOrDefaultAsync(cancel);
-            
+            var doc = await _repo.Query.Where(d => d.Id == query.Id).FirstOrDefaultAsync(cancel);
             return _mapper.Map<DocumentDto>(doc);
         }            
         else if (query.EnvelopeId is not null)
         {
-            var doc = await docQuery.Where(d => d.EnvelopeId == query.EnvelopeId).FirstOrDefaultAsync(cancel);
+            var doc = await _repo.Query.Where(d => d.EnvelopeId == query.EnvelopeId).FirstOrDefaultAsync(cancel);
             return _mapper.Map<DocumentDto>(doc);
         }
 

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -7,7 +7,7 @@
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
 	</PropertyGroup>
-	
+
 	<ItemGroup>
 		<None Remove="Resources\Model.Designer.vb" />
 	</ItemGroup>
@@ -21,6 +21,7 @@
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
 		<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
 		<PackageReference Include="MediatR" Version="12.5.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.18" />
 		<PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
 		<PackageReference Include="Otp.NET" Version="1.4.0" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
@@ -78,25 +79,25 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-		<PackageReference Include="AutoMapper" Version="13.0.1" />
-		<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
-		<PackageReference Include="CommandDotNet">
+	  <PackageReference Include="AutoMapper" Version="13.0.1" />
+	  <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+	  <PackageReference Include="CommandDotNet">
 		<Version>7.0.5</Version>
-		</PackageReference>
+	  </PackageReference>
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-		<PackageReference Include="AutoMapper" Version="14.0.0" />
-		<PackageReference Include="CommandDotNet">
-		<Version>8.1.1</Version>
-		</PackageReference>
+	  <PackageReference Include="AutoMapper" Version="14.0.0" />
+	  <PackageReference Include="CommandDotNet">
+	    <Version>8.1.1</Version>
+	  </PackageReference>
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-		<PackageReference Include="AutoMapper" Version="14.0.0" />
-		<PackageReference Include="CommandDotNet">
-		<Version>8.1.1</Version>
-		</PackageReference>
+	  <PackageReference Include="AutoMapper" Version="14.0.0" />
+	  <PackageReference Include="CommandDotNet">
+	    <Version>8.1.1</Version>
+	  </PackageReference>
 	</ItemGroup>
 
 </Project>

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverCommand.cs

@@ -29,7 +29,7 @@ public record CreateEnvelopeReceiverCommand : CreateEnvelopeCommand, IRequest<Cr
 /// <param name="X">X-Position</param>
 /// <param name="Y">Y-Position</param>
 /// <param name="Page">Seite, auf der sie sich befindet</param>
-public record DocReceiverElementCreateDto([Required] double X, [Required] double Y, [Required] int Page);
+public record Signature([Required] double X, [Required] double Y, [Required] int Page);
 
 /// <summary>
 /// DTO für Empfänger, die erstellt oder abgerufen werden sollen.
@@ -41,7 +41,7 @@ public class ReceiverGetOrCreateCommand
     /// Unterschriften auf Dokumenten.
     /// </summary>
     [Required]
-    public List<DocReceiverElementCreateDto> DocReceiverElements { get; init; } = new();
+    public List<Signature> Signatures { get; init; } = new();
 
     /// <summary>
     /// Der Name, mit dem der Empfänger angesprochen werden soll.

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverLightQuery.cs

@@ -0,0 +1,60 @@
+using AutoMapper;
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Query;
+using EnvelopeGenerator.Application.Envelopes.Queries;
+using EnvelopeGenerator.Application.Receivers.Queries;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
+
+/// <summary>
+/// Leichte Variante von <see cref="ReadEnvelopeReceiverQuery"/>:
+/// Lädt NUR Envelope (mit Histories + User) und Receiver.
+/// Lädt NICHT Documents/Elements.
+/// 
+/// Verwendung: Status-Prüfungen wo keine Dokument-Daten benötigt werden
+/// (z.B. ReceiverAuthController.GetStatus).
+/// </summary>
+public record ReadEnvelopeReceiverLightQuery
+    : EnvelopeReceiverQueryBase<ReadEnvelopeQuery, ReadReceiverQuery>, IRequest<EnvelopeReceiverDto?>;
+
+/// <summary>
+/// Handler für <see cref="ReadEnvelopeReceiverLightQuery"/>.
+/// </summary>
+public class ReadEnvelopeReceiverLightQueryHandler
+    : IRequestHandler<ReadEnvelopeReceiverLightQuery, EnvelopeReceiverDto?>
+{
+    private readonly IRepository<EnvelopeReceiver> _repo;
+    private readonly IMapper _mapper;
+
+    /// <summary>
+    /// Konstruktor.
+    /// </summary>
+    /// <param name="repo">EnvelopeReceiver-Repository</param>
+    /// <param name="mapper">AutoMapper</param>
+    public ReadEnvelopeReceiverLightQueryHandler(IRepository<EnvelopeReceiver> repo, IMapper mapper)
+    {
+        _repo = repo;
+        _mapper = mapper;
+    }
+
+    /// <summary>
+    /// Lädt einen EnvelopeReceiver ohne Documents/Elements.
+    /// </summary>
+    public async Task<EnvelopeReceiverDto?> Handle(ReadEnvelopeReceiverLightQuery request, CancellationToken cancel)
+    {
+        var envRcv = await _repo.Query
+            .Where(request, notnull: false)
+            .AsNoTracking()
+            .Include(er => er.Envelope).ThenInclude(e => e!.Histories)
+            .Include(er => er.Envelope).ThenInclude(e => e!.User)
+            .Include(er => er.Receiver)
+            .FirstOrDefaultAsync(cancel);
+
+        return envRcv is null ? null : _mapper.Map<EnvelopeReceiverDto>(envRcv);
+    }
+}

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverSecretQuery.cs

@@ -1,127 +0,0 @@
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Envelopes.Queries;
-using EnvelopeGenerator.Application.Receivers.Queries;
-using MediatR;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.EntityFrameworkCore;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Common.Query;
-using EnvelopeGenerator.Application.Common.Extensions;
-
-namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
-
-/// <summary>
-/// Represents a query for reading an envelope receiver including sensitive fields
-/// (access code, phone number) that are excluded from the standard <see cref="ReadEnvelopeReceiverQuery"/>.
-/// </summary>
-/// <remarks>
-/// Returns a single <see cref="EnvelopeReceiverSecretDto"/> matched by UUID and receiver signature.
-/// Equivalent to the legacy <c>ReadWithSecretByUuidSignatureAsync</c> service method.
-/// </remarks>
-public record ReadEnvelopeReceiverSecretQuery
-    : EnvelopeReceiverQueryBase<ReadEnvelopeQuery, ReadReceiverQuery>,
-      IRequest<EnvelopeReceiverSecretDto?>;
-
-/// <summary>
-/// Extension methods for dispatching <see cref="ReadEnvelopeReceiverSecretQuery"/> via <see cref="IMediator"/>.
-/// </summary>
-public static class ReadEnvelopeReceiverSecretQueryExtensions
-{
-    /// <summary>
-    /// Sends a <see cref="ReadEnvelopeReceiverSecretQuery"/> using the composite key (uuid::signature).
-    /// </summary>
-    /// <param name="mediator">The mediator instance.</param>
-    /// <param name="key">Composite key in the format <c>uuid::signature</c>.</param>
-    /// <param name="cancel">Cancellation token.</param>
-    /// <returns>The matching <see cref="EnvelopeReceiverSecretDto"/>, or <c>null</c> if not found.</returns>
-    public static Task<EnvelopeReceiverSecretDto?> ReadEnvelopeReceiverSecretAsync(
-        this IMediator mediator,
-        string key,
-        CancellationToken cancel = default)
-        => mediator.Send(new ReadEnvelopeReceiverSecretQuery { Key = key }, cancel);
-
-    /// <summary>
-    /// Sends a <see cref="ReadEnvelopeReceiverSecretQuery"/> using UUID and receiver signature.
-    /// </summary>
-    /// <param name="mediator">The mediator instance.</param>
-    /// <param name="uuid">Envelope UUID.</param>
-    /// <param name="signature">Receiver signature.</param>
-    /// <param name="cancel">Cancellation token.</param>
-    /// <returns>The matching <see cref="EnvelopeReceiverSecretDto"/>, or <c>null</c> if not found.</returns>
-    public static Task<EnvelopeReceiverSecretDto?> ReadEnvelopeReceiverSecretAsync(
-        this IMediator mediator,
-        string uuid,
-        string signature,
-        CancellationToken cancel = default)
-    {
-        var q = new ReadEnvelopeReceiverSecretQuery();
-        q.Envelope.Uuid = uuid;
-        q.Receiver.Signature = signature;
-        return mediator.Send(q, cancel);
-    }
-
-    /// <summary>
-    /// Handles <see cref="ReadEnvelopeReceiverSecretQuery"/> and returns a
-    /// <see cref="EnvelopeReceiverSecretDto"/> containing sensitive fields.
-    /// </summary>
-    public class ReadEnvelopeReceiverSecretQueryHandler
-        : IRequestHandler<ReadEnvelopeReceiverSecretQuery, EnvelopeReceiverSecretDto?>
-    {
-        private readonly IRepository<EnvelopeReceiver> _repo;
-        private readonly IRepository<Receiver> _rcvRepo;
-        private readonly IMapper _mapper;
-
-        /// <summary>
-        /// Initializes a new instance of <see cref="ReadEnvelopeReceiverSecretQueryHandler"/>.
-        /// </summary>
-        /// <param name="envelopeReceiver">Repository for <see cref="EnvelopeReceiver"/>.</param>
-        /// <param name="rcvRepo">Repository for <see cref="Receiver"/>.</param>
-        /// <param name="mapper">AutoMapper instance.</param>
-        public ReadEnvelopeReceiverSecretQueryHandler(
-            IRepository<EnvelopeReceiver> envelopeReceiver,
-            IRepository<Receiver> rcvRepo,
-            IMapper mapper)
-        {
-            _repo = envelopeReceiver;
-            _rcvRepo = rcvRepo;
-            _mapper = mapper;
-        }
-
-        /// <summary>
-        /// Handles the query and returns the matching <see cref="EnvelopeReceiverSecretDto"/>.
-        /// </summary>
-        /// <param name="request">The query containing filter criteria.</param>
-        /// <param name="cancel">Cancellation token.</param>
-        /// <returns>
-        /// The matched <see cref="EnvelopeReceiverSecretDto"/>, or <c>null</c> if no record is found.
-        /// </returns>
-        public async Task<EnvelopeReceiverSecretDto?> Handle(
-            ReadEnvelopeReceiverSecretQuery request,
-            CancellationToken cancel)
-        {
-            var q = _repo.Query.Where(request, notnull: false);
-
-            var envRcvs = await q
-                .Include(er => er.Envelope).ThenInclude(e => e!.Documents!).ThenInclude(d => d.Elements)
-                .Include(er => er.Envelope).ThenInclude(e => e!.Histories)
-                .Include(er => er.Envelope).ThenInclude(e => e!.User)
-                .Include(er => er.Receiver)
-                .ToListAsync(cancel);
-
-            if (request.Receiver.HasAnyCriteria && envRcvs.Count != 0)
-            {
-                var receiver = await _rcvRepo.Query.Where(request.Receiver).FirstAsync(cancel);
-
-                foreach (var item in envRcvs)
-                    item.Envelope?.Documents?.FirstOrDefault()?.Elements?.RemoveAll(s => s.ReceiverId != receiver.Id);
-            }
-
-            var envRcv = envRcvs.FirstOrDefault();
-            if (envRcv is null)
-                return null;
-
-            return _mapper.Map<EnvelopeReceiverSecretDto>(envRcv);
-        }
-    }
-}

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs

@@ -40,10 +40,10 @@ public record CreateEnvelopeCommand : IRequest<EnvelopeDto?>
     /// </summary>
     /// <param name="userId"></param>
     /// <returns></returns>
-    public CreateEnvelopeCommand WithAuth(int userId)
+    public bool Authorize(int userId)
     {
         UserId = userId;
-        return this;
+        return true;
     }
 
     /// <summary>

EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs

@@ -14,16 +14,6 @@ namespace EnvelopeGenerator.Application.Envelopes.Queries;
 /// </summary>
 public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest<IEnumerable<EnvelopeDto>>
 {
-    /// <summary>
-    /// 
-    /// </summary>
-    public bool OnlyActive { get; init; } = false;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public bool OnlyCompleted { get; init; } = false;
-
     /// <summary>
     /// Abfrage des Include des Umschlags
     /// </summary>
@@ -32,7 +22,7 @@ public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest<IEnumerable<Envelo
     /// <summary>
     /// Optionaler Benutzerfilter; wenn gesetzt, werden nur Umschläge des Benutzers geladen.
     /// </summary>
-    internal int? UserId { get; init; }
+    public int? UserId { get; init; }
 
     /// <summary>
     /// Setzt den Benutzerkontext für die Abfrage.
@@ -142,14 +132,8 @@ public class ReadEnvelopeQueryHandler : IRequestHandler<ReadEnvelopeQuery, IEnum
                 query = query.Where(e => !status.Ignore.Contains(e.Status));
         }
 
-        if(request is { OnlyActive: true })
-            query = query.Where(e => Status.Active.Contains(e.Status));
-
-        if (request is { OnlyCompleted: true })
-            query = query.Where(e => Status.Completed.Contains(e.Status));
-
         var envelopes = await query
-            .Include(e => e.EnvelopeReceivers).ThenInclude(er => er.Receiver)
+            .Include(e => e.Documents)
             .ToListAsync(cancel);
 
         return _mapper.Map<IEnumerable<EnvelopeDto>>(envelopes);

EnvelopeGenerator.Application/Receivers/Commands/CreateReceiverCommand.cs

@@ -3,6 +3,7 @@ using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations;
 using System.Security.Cryptography;
@@ -13,6 +14,7 @@ namespace EnvelopeGenerator.Application.Receivers.Commands;
 /// <summary>
 /// 
 /// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
 public record CreateReceiverCommand : IRequest<(ReceiverDto Receiver, bool AlreadyExists)>
 {
     /// <summary>

EnvelopeGenerator.Application/Receivers/Commands/UpdateReceiverCommand.cs

@@ -1,8 +1,11 @@
-namespace EnvelopeGenerator.Application.Receivers.Commands;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.Application.Receivers.Commands;
 
 /// <summary>
 /// Data Transfer Object for updating a receiver's information.
 /// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
 public class UpdateReceiverCommand
 {
     /// <summary>

EnvelopeGenerator.Application/Resources/Resource.cs

@@ -397,412 +397,4 @@ public static class Extensions
     /// <param name="suffix"></param>
     /// <returns></returns>
     public static string LockedFooterBody(this IStringLocalizer localizer, string suffix) => localizer[nameof(LockedFooterBody) + suffix].Value;
-
-    // Sender-side UI resources
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string NewEnvelope(this IStringLocalizer localizer) => localizer[nameof(NewEnvelope)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string LoadEnvelope(this IStringLocalizer localizer) => localizer[nameof(LoadEnvelope)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string DeleteEnvelope(this IStringLocalizer localizer) => localizer[nameof(DeleteEnvelope)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string RefreshData(this IStringLocalizer localizer) => localizer[nameof(RefreshData)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string RefreshedAt(this IStringLocalizer localizer) => localizer[nameof(RefreshedAt)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string ShowDocument(this IStringLocalizer localizer) => localizer[nameof(ShowDocument)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string ContactReceiver(this IStringLocalizer localizer) => localizer[nameof(ContactReceiver)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string EnvelopeId(this IStringLocalizer localizer) => localizer[nameof(EnvelopeId)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string OpenLogDirectory(this IStringLocalizer localizer) => localizer[nameof(OpenLogDirectory)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string ShowResultsReport(this IStringLocalizer localizer) => localizer[nameof(ShowResultsReport)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string SupportMail(this IStringLocalizer localizer) => localizer[nameof(SupportMail)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string ResendInvitation(this IStringLocalizer localizer) => localizer[nameof(ResendInvitation)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string Export(this IStringLocalizer localizer) => localizer[nameof(Export)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string Receivers(this IStringLocalizer localizer) => localizer[nameof(Receivers)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string EmailSalutation(this IStringLocalizer localizer) => localizer[nameof(EmailSalutation)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string SignedWhen(this IStringLocalizer localizer) => localizer[nameof(SignedWhen)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string AccessCode(this IStringLocalizer localizer) => localizer[nameof(AccessCode)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string User(this IStringLocalizer localizer) => localizer[nameof(User)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string Type(this IStringLocalizer localizer) => localizer[nameof(Type)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string Title(this IStringLocalizer localizer) => localizer[nameof(Title)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string CreatedOn(this IStringLocalizer localizer) => localizer[nameof(CreatedOn)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string LastModified(this IStringLocalizer localizer) => localizer[nameof(LastModified)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string OpenEnvelopes(this IStringLocalizer localizer) => localizer[nameof(OpenEnvelopes)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string CompletedEnvelopes(this IStringLocalizer localizer) => localizer[nameof(CompletedEnvelopes)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string SendAccessCode(this IStringLocalizer localizer) => localizer[nameof(SendAccessCode)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string TwoFactorProperties(this IStringLocalizer localizer) => localizer[nameof(TwoFactorProperties)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string Name(this IStringLocalizer localizer) => localizer[nameof(Name)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string PhoneNumber(this IStringLocalizer localizer) => localizer[nameof(PhoneNumber)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string AddReceiver(this IStringLocalizer localizer) => localizer[nameof(AddReceiver)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string DeleteReceiver(this IStringLocalizer localizer) => localizer[nameof(DeleteReceiver)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string AddFile(this IStringLocalizer localizer) => localizer[nameof(AddFile)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string MergeFiles(this IStringLocalizer localizer) => localizer[nameof(MergeFiles)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string DeleteFile(this IStringLocalizer localizer) => localizer[nameof(DeleteFile)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string ShowFile(this IStringLocalizer localizer) => localizer[nameof(ShowFile)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string EditFields(this IStringLocalizer localizer) => localizer[nameof(EditFields)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string EditData(this IStringLocalizer localizer) => localizer[nameof(EditData)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string Save(this IStringLocalizer localizer) => localizer[nameof(Save)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string SendEnvelope(this IStringLocalizer localizer) => localizer[nameof(SendEnvelope)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string Cancel(this IStringLocalizer localizer) => localizer[nameof(Cancel)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string AddSignature(this IStringLocalizer localizer) => localizer[nameof(AddSignature)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string DeleteSignature(this IStringLocalizer localizer) => localizer[nameof(DeleteSignature)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string Language(this IStringLocalizer localizer) => localizer[nameof(Language)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string UseAccessCode(this IStringLocalizer localizer) => localizer[nameof(UseAccessCode)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string TwoFactorEnabled(this IStringLocalizer localizer) => localizer[nameof(TwoFactorEnabled)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string CertificationType(this IStringLocalizer localizer) => localizer[nameof(CertificationType)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string FinalEmailToCreator(this IStringLocalizer localizer) => localizer[nameof(FinalEmailToCreator)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string FinalEmailToReceivers(this IStringLocalizer localizer) => localizer[nameof(FinalEmailToReceivers)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string SendReminderEmails(this IStringLocalizer localizer) => localizer[nameof(SendReminderEmails)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string FirstReminderDays(this IStringLocalizer localizer) => localizer[nameof(FirstReminderDays)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string ReminderIntervalDays(this IStringLocalizer localizer) => localizer[nameof(ReminderIntervalDays)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string ExpiresWhenDays(this IStringLocalizer localizer) => localizer[nameof(ExpiresWhenDays)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string ExpiresWarningDays(this IStringLocalizer localizer) => localizer[nameof(ExpiresWarningDays)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string Message(this IStringLocalizer localizer) => localizer[nameof(Message)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string EnvelopeType(this IStringLocalizer localizer) => localizer[nameof(EnvelopeType)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string AllOptions(this IStringLocalizer localizer) => localizer[nameof(AllOptions)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string DeleteReason(this IStringLocalizer localizer) => localizer[nameof(DeleteReason)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string PleaseProvideReason(this IStringLocalizer localizer) => localizer[nameof(PleaseProvideReason)].Value;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string Status(this IStringLocalizer localizer) => localizer[nameof(Status)].Value;
 }

EnvelopeGenerator.Application/Resources/Resource.de-DE.resx

@@ -477,178 +477,4 @@
   <data name="Confirmations" xml:space="preserve">
     <value>Bestätigungen</value>
   </data>
-  <data name="NewEnvelope" xml:space="preserve">
-    <value>Neuer Umschlag</value>
-  </data>
-  <data name="LoadEnvelope" xml:space="preserve">
-    <value>Umschlag laden</value>
-  </data>
-  <data name="DeleteEnvelope" xml:space="preserve">
-    <value>Umschlag zurückrufen/löschen</value>
-  </data>
-  <data name="RefreshData" xml:space="preserve">
-    <value>Daten Aktualisieren</value>
-  </data>
-  <data name="RefreshedAt" xml:space="preserve">
-    <value>Aktualisiert: {0}</value>
-  </data>
-  <data name="ShowDocument" xml:space="preserve">
-    <value>Dokument anzeigen</value>
-  </data>
-  <data name="ContactReceiver" xml:space="preserve">
-    <value>Empfänger kontaktieren</value>
-  </data>
-  <data name="EnvelopeId" xml:space="preserve">
-    <value>Umschlag-ID: {0}</value>
-  </data>
-  <data name="OpenLogDirectory" xml:space="preserve">
-    <value>Öffne Log Verzeichnis</value>
-  </data>
-  <data name="ShowResultsReport" xml:space="preserve">
-    <value>Ergebnisbericht anzeigen</value>
-  </data>
-  <data name="SupportMail" xml:space="preserve">
-    <value>Support Mail</value>
-  </data>
-  <data name="ResendInvitation" xml:space="preserve">
-    <value>Einladung manuell versenden</value>
-  </data>
-  <data name="Export" xml:space="preserve">
-    <value>Export</value>
-  </data>
-  <data name="Receivers" xml:space="preserve">
-    <value>Empfänger</value>
-  </data>
-  <data name="EmailSalutation" xml:space="preserve">
-    <value>Email Anrede</value>
-  </data>
-  <data name="SignedWhen" xml:space="preserve">
-    <value>Unterschrieben wann</value>
-  </data>
-  <data name="AccessCode" xml:space="preserve">
-    <value>Zugangscode</value>
-  </data>
-  <data name="User" xml:space="preserve">
-    <value>Benutzer</value>
-  </data>
-  <data name="Type" xml:space="preserve">
-    <value>Typ</value>
-  </data>
-  <data name="Title" xml:space="preserve">
-    <value>Titel</value>
-  </data>
-  <data name="CreatedOn" xml:space="preserve">
-    <value>Erstellt am</value>
-  </data>
-  <data name="LastModified" xml:space="preserve">
-    <value>Zuletzt geändert am</value>
-  </data>
-  <data name="OpenEnvelopes" xml:space="preserve">
-    <value>Offene Umschläge</value>
-  </data>
-  <data name="CompletedEnvelopes" xml:space="preserve">
-    <value>Abgeschlossene Umschläge</value>
-  </data>
-  <data name="SendAccessCode" xml:space="preserve">
-    <value>Zugangscode senden</value>
-  </data>
-  <data name="TwoFactorProperties" xml:space="preserve">
-    <value>2-Faktor Eigenschaften</value>
-  </data>
-  <data name="Name" xml:space="preserve">
-    <value>Name</value>
-  </data>
-  <data name="PhoneNumber" xml:space="preserve">
-    <value>Telefonnummer</value>
-  </data>
-  <data name="AddReceiver" xml:space="preserve">
-    <value>Empfänger hinzufügen</value>
-  </data>
-  <data name="DeleteReceiver" xml:space="preserve">
-    <value>Empfänger löschen</value>
-  </data>
-  <data name="AddFile" xml:space="preserve">
-    <value>Datei hinzufügen</value>
-  </data>
-  <data name="MergeFiles" xml:space="preserve">
-    <value>Dateien zusammenführen</value>
-  </data>
-  <data name="DeleteFile" xml:space="preserve">
-    <value>Datei löschen</value>
-  </data>
-  <data name="ShowFile" xml:space="preserve">
-    <value>Datei anzeigen</value>
-  </data>
-  <data name="EditFields" xml:space="preserve">
-    <value>Felder bearbeiten</value>
-  </data>
-  <data name="EditData" xml:space="preserve">
-    <value>Daten bearbeiten</value>
-  </data>
-  <data name="Save" xml:space="preserve">
-    <value>Speichern</value>
-  </data>
-  <data name="SendEnvelope" xml:space="preserve">
-    <value>Umschlag versenden</value>
-  </data>
-  <data name="Cancel" xml:space="preserve">
-    <value>Abbrechen</value>
-  </data>
-  <data name="AddSignature" xml:space="preserve">
-    <value>Signatur hinzufügen</value>
-  </data>
-  <data name="DeleteSignature" xml:space="preserve">
-    <value>Signatur löschen</value>
-  </data>
-  <data name="Language" xml:space="preserve">
-    <value>Sprache</value>
-  </data>
-  <data name="UseAccessCode" xml:space="preserve">
-    <value>Zugangscode verwenden</value>
-  </data>
-  <data name="TwoFactorEnabled" xml:space="preserve">
-    <value>2-Faktor-Authentifizierung aktiviert</value>
-  </data>
-  <data name="CertificationType" xml:space="preserve">
-    <value>Zertifizierungstyp</value>
-  </data>
-  <data name="FinalEmailToCreator" xml:space="preserve">
-    <value>Finale E-Mail an Ersteller</value>
-  </data>
-  <data name="FinalEmailToReceivers" xml:space="preserve">
-    <value>Finale E-Mail an Empfänger</value>
-  </data>
-  <data name="SendReminderEmails" xml:space="preserve">
-    <value>Erinnerungs-E-Mails senden</value>
-  </data>
-  <data name="FirstReminderDays" xml:space="preserve">
-    <value>Erste Erinnerung (Tage)</value>
-  </data>
-  <data name="ReminderIntervalDays" xml:space="preserve">
-    <value>Erinnerungsintervall (Tage)</value>
-  </data>
-  <data name="ExpiresWhenDays" xml:space="preserve">
-    <value>Läuft ab nach (Tage)</value>
-  </data>
-  <data name="ExpiresWarningDays" xml:space="preserve">
-    <value>Ablaufwarnung (Tage)</value>
-  </data>
-  <data name="Message" xml:space="preserve">
-    <value>Nachricht</value>
-  </data>
-  <data name="EnvelopeType" xml:space="preserve">
-    <value>Umschlagtyp</value>
-  </data>
-  <data name="AllOptions" xml:space="preserve">
-    <value>Alle Optionen</value>
-  </data>
-  <data name="DeleteReason" xml:space="preserve">
-    <value>Grund für Löschung</value>
-  </data>
-  <data name="PleaseProvideReason" xml:space="preserve">
-    <value>Bitte geben Sie einen Grund an</value>
-  </data>
-  <data name="Status" xml:space="preserve">
-    <value>Status</value>
-  </data>
 </root>

EnvelopeGenerator.Application/Resources/Resource.en-US.resx

@@ -477,178 +477,4 @@
   <data name="Confirmations" xml:space="preserve">
     <value>Confirmations</value>
   </data>
-  <data name="NewEnvelope" xml:space="preserve">
-    <value>New Envelope</value>
-  </data>
-  <data name="LoadEnvelope" xml:space="preserve">
-    <value>Load Envelope</value>
-  </data>
-  <data name="DeleteEnvelope" xml:space="preserve">
-    <value>Delete Envelope</value>
-  </data>
-  <data name="RefreshData" xml:space="preserve">
-    <value>Reload Data</value>
-  </data>
-  <data name="RefreshedAt" xml:space="preserve">
-    <value>Refreshed: {0}</value>
-  </data>
-  <data name="ShowDocument" xml:space="preserve">
-    <value>Show Document</value>
-  </data>
-  <data name="ContactReceiver" xml:space="preserve">
-    <value>Contact Receiver</value>
-  </data>
-  <data name="EnvelopeId" xml:space="preserve">
-    <value>Envelope-ID: {0}</value>
-  </data>
-  <data name="OpenLogDirectory" xml:space="preserve">
-    <value>Open Log Directory</value>
-  </data>
-  <data name="ShowResultsReport" xml:space="preserve">
-    <value>Show Results Report</value>
-  </data>
-  <data name="SupportMail" xml:space="preserve">
-    <value>Support Mail</value>
-  </data>
-  <data name="ResendInvitation" xml:space="preserve">
-    <value>Send Invitation Again</value>
-  </data>
-  <data name="Export" xml:space="preserve">
-    <value>Export</value>
-  </data>
-  <data name="Receivers" xml:space="preserve">
-    <value>Receivers</value>
-  </data>
-  <data name="EmailSalutation" xml:space="preserve">
-    <value>Email Salutation</value>
-  </data>
-  <data name="SignedWhen" xml:space="preserve">
-    <value>Signed When</value>
-  </data>
-  <data name="AccessCode" xml:space="preserve">
-    <value>Access Code</value>
-  </data>
-  <data name="User" xml:space="preserve">
-    <value>User</value>
-  </data>
-  <data name="Type" xml:space="preserve">
-    <value>Type</value>
-  </data>
-  <data name="Title" xml:space="preserve">
-    <value>Title</value>
-  </data>
-  <data name="CreatedOn" xml:space="preserve">
-    <value>Created On</value>
-  </data>
-  <data name="LastModified" xml:space="preserve">
-    <value>Last Modified</value>
-  </data>
-  <data name="OpenEnvelopes" xml:space="preserve">
-    <value>Open Envelopes</value>
-  </data>
-  <data name="CompletedEnvelopes" xml:space="preserve">
-    <value>Completed Envelopes</value>
-  </data>
-  <data name="SendAccessCode" xml:space="preserve">
-    <value>Send Access Code</value>
-  </data>
-  <data name="TwoFactorProperties" xml:space="preserve">
-    <value>2-Factor Properties</value>
-  </data>
-  <data name="Name" xml:space="preserve">
-    <value>Name</value>
-  </data>
-  <data name="PhoneNumber" xml:space="preserve">
-    <value>Phone Number</value>
-  </data>
-  <data name="AddReceiver" xml:space="preserve">
-    <value>Add Receiver</value>
-  </data>
-  <data name="DeleteReceiver" xml:space="preserve">
-    <value>Delete Receiver</value>
-  </data>
-  <data name="AddFile" xml:space="preserve">
-    <value>Add File</value>
-  </data>
-  <data name="MergeFiles" xml:space="preserve">
-    <value>Merge Files</value>
-  </data>
-  <data name="DeleteFile" xml:space="preserve">
-    <value>Delete File</value>
-  </data>
-  <data name="ShowFile" xml:space="preserve">
-    <value>Show File</value>
-  </data>
-  <data name="EditFields" xml:space="preserve">
-    <value>Edit Fields</value>
-  </data>
-  <data name="EditData" xml:space="preserve">
-    <value>Edit Data</value>
-  </data>
-  <data name="Save" xml:space="preserve">
-    <value>Save</value>
-  </data>
-  <data name="SendEnvelope" xml:space="preserve">
-    <value>Send Envelope</value>
-  </data>
-  <data name="Cancel" xml:space="preserve">
-    <value>Cancel</value>
-  </data>
-  <data name="AddSignature" xml:space="preserve">
-    <value>Add Signature</value>
-  </data>
-  <data name="DeleteSignature" xml:space="preserve">
-    <value>Delete Signature</value>
-  </data>
-  <data name="Language" xml:space="preserve">
-    <value>Language</value>
-  </data>
-  <data name="UseAccessCode" xml:space="preserve">
-    <value>Use Access Code</value>
-  </data>
-  <data name="TwoFactorEnabled" xml:space="preserve">
-    <value>2-Factor Authentication Enabled</value>
-  </data>
-  <data name="CertificationType" xml:space="preserve">
-    <value>Certification Type</value>
-  </data>
-  <data name="FinalEmailToCreator" xml:space="preserve">
-    <value>Final Email to Creator</value>
-  </data>
-  <data name="FinalEmailToReceivers" xml:space="preserve">
-    <value>Final Email to Receivers</value>
-  </data>
-  <data name="SendReminderEmails" xml:space="preserve">
-    <value>Send Reminder Emails</value>
-  </data>
-  <data name="FirstReminderDays" xml:space="preserve">
-    <value>First Reminder (Days)</value>
-  </data>
-  <data name="ReminderIntervalDays" xml:space="preserve">
-    <value>Reminder Interval (Days)</value>
-  </data>
-  <data name="ExpiresWhenDays" xml:space="preserve">
-    <value>Expires After (Days)</value>
-  </data>
-  <data name="ExpiresWarningDays" xml:space="preserve">
-    <value>Expiry Warning (Days)</value>
-  </data>
-  <data name="Message" xml:space="preserve">
-    <value>Message</value>
-  </data>
-  <data name="EnvelopeType" xml:space="preserve">
-    <value>Envelope Type</value>
-  </data>
-  <data name="AllOptions" xml:space="preserve">
-    <value>All Options</value>
-  </data>
-  <data name="DeleteReason" xml:space="preserve">
-    <value>Deletion Reason</value>
-  </data>
-  <data name="PleaseProvideReason" xml:space="preserve">
-    <value>Please provide a reason</value>
-  </data>
-  <data name="Status" xml:space="preserve">
-    <value>Status</value>
-  </data>
 </root>

EnvelopeGenerator.Application/Resources/Resource.fr-FR.resx

@@ -477,178 +477,4 @@
   <data name="Confirmations" xml:space="preserve">
     <value>Confirmations</value>
   </data>
-  <data name="NewEnvelope" xml:space="preserve">
-    <value>Nouvelle enveloppe</value>
-  </data>
-  <data name="LoadEnvelope" xml:space="preserve">
-    <value>Charger l'enveloppe</value>
-  </data>
-  <data name="DeleteEnvelope" xml:space="preserve">
-    <value>Supprimer l'enveloppe</value>
-  </data>
-  <data name="RefreshData" xml:space="preserve">
-    <value>Actualiser les données</value>
-  </data>
-  <data name="RefreshedAt" xml:space="preserve">
-    <value>Actualisé : {0}</value>
-  </data>
-  <data name="ShowDocument" xml:space="preserve">
-    <value>Afficher le document</value>
-  </data>
-  <data name="ContactReceiver" xml:space="preserve">
-    <value>Contacter le destinataire</value>
-  </data>
-  <data name="EnvelopeId" xml:space="preserve">
-    <value>ID d'enveloppe : {0}</value>
-  </data>
-  <data name="OpenLogDirectory" xml:space="preserve">
-    <value>Ouvrir le répertoire des logs</value>
-  </data>
-  <data name="ShowResultsReport" xml:space="preserve">
-    <value>Afficher le rapport de résultats</value>
-  </data>
-  <data name="SupportMail" xml:space="preserve">
-    <value>E-mail de support</value>
-  </data>
-  <data name="ResendInvitation" xml:space="preserve">
-    <value>Renvoyer l'invitation</value>
-  </data>
-  <data name="Export" xml:space="preserve">
-    <value>Exporter</value>
-  </data>
-  <data name="Receivers" xml:space="preserve">
-    <value>Destinataires</value>
-  </data>
-  <data name="EmailSalutation" xml:space="preserve">
-    <value>Formule de politesse</value>
-  </data>
-  <data name="SignedWhen" xml:space="preserve">
-    <value>Signé quand</value>
-  </data>
-  <data name="AccessCode" xml:space="preserve">
-    <value>Code d'accès</value>
-  </data>
-  <data name="User" xml:space="preserve">
-    <value>Utilisateur</value>
-  </data>
-  <data name="Type" xml:space="preserve">
-    <value>Type</value>
-  </data>
-  <data name="Title" xml:space="preserve">
-    <value>Titre</value>
-  </data>
-  <data name="CreatedOn" xml:space="preserve">
-    <value>Créé le</value>
-  </data>
-  <data name="LastModified" xml:space="preserve">
-    <value>Dernière modification</value>
-  </data>
-  <data name="OpenEnvelopes" xml:space="preserve">
-    <value>Enveloppes ouvertes</value>
-  </data>
-  <data name="CompletedEnvelopes" xml:space="preserve">
-    <value>Enveloppes terminées</value>
-  </data>
-  <data name="SendAccessCode" xml:space="preserve">
-    <value>Envoyer le code d'accès</value>
-  </data>
-  <data name="TwoFactorProperties" xml:space="preserve">
-    <value>Propriétés 2-facteurs</value>
-  </data>
-  <data name="Name" xml:space="preserve">
-    <value>Nom</value>
-  </data>
-  <data name="PhoneNumber" xml:space="preserve">
-    <value>Numéro de téléphone</value>
-  </data>
-  <data name="AddReceiver" xml:space="preserve">
-    <value>Ajouter un destinataire</value>
-  </data>
-  <data name="DeleteReceiver" xml:space="preserve">
-    <value>Supprimer le destinataire</value>
-  </data>
-  <data name="AddFile" xml:space="preserve">
-    <value>Ajouter un fichier</value>
-  </data>
-  <data name="MergeFiles" xml:space="preserve">
-    <value>Fusionner les fichiers</value>
-  </data>
-  <data name="DeleteFile" xml:space="preserve">
-    <value>Supprimer le fichier</value>
-  </data>
-  <data name="ShowFile" xml:space="preserve">
-    <value>Afficher le fichier</value>
-  </data>
-  <data name="EditFields" xml:space="preserve">
-    <value>Modifier les champs</value>
-  </data>
-  <data name="EditData" xml:space="preserve">
-    <value>Modifier les données</value>
-  </data>
-  <data name="Save" xml:space="preserve">
-    <value>Enregistrer</value>
-  </data>
-  <data name="SendEnvelope" xml:space="preserve">
-    <value>Envoyer l'enveloppe</value>
-  </data>
-  <data name="Cancel" xml:space="preserve">
-    <value>Annuler</value>
-  </data>
-  <data name="AddSignature" xml:space="preserve">
-    <value>Ajouter une signature</value>
-  </data>
-  <data name="DeleteSignature" xml:space="preserve">
-    <value>Supprimer la signature</value>
-  </data>
-  <data name="Language" xml:space="preserve">
-    <value>Langue</value>
-  </data>
-  <data name="UseAccessCode" xml:space="preserve">
-    <value>Utiliser un code d'accès</value>
-  </data>
-  <data name="TwoFactorEnabled" xml:space="preserve">
-    <value>Authentification à 2 facteurs activée</value>
-  </data>
-  <data name="CertificationType" xml:space="preserve">
-    <value>Type de certification</value>
-  </data>
-  <data name="FinalEmailToCreator" xml:space="preserve">
-    <value>E-mail final au créateur</value>
-  </data>
-  <data name="FinalEmailToReceivers" xml:space="preserve">
-    <value>E-mail final aux destinataires</value>
-  </data>
-  <data name="SendReminderEmails" xml:space="preserve">
-    <value>Envoyer des e-mails de rappel</value>
-  </data>
-  <data name="FirstReminderDays" xml:space="preserve">
-    <value>Premier rappel (jours)</value>
-  </data>
-  <data name="ReminderIntervalDays" xml:space="preserve">
-    <value>Intervalle de rappel (jours)</value>
-  </data>
-  <data name="ExpiresWhenDays" xml:space="preserve">
-    <value>Expire après (jours)</value>
-  </data>
-  <data name="ExpiresWarningDays" xml:space="preserve">
-    <value>Avertissement d'expiration (jours)</value>
-  </data>
-  <data name="Message" xml:space="preserve">
-    <value>Message</value>
-  </data>
-  <data name="EnvelopeType" xml:space="preserve">
-    <value>Type d'enveloppe</value>
-  </data>
-  <data name="AllOptions" xml:space="preserve">
-    <value>Toutes les options</value>
-  </data>
-  <data name="DeleteReason" xml:space="preserve">
-    <value>Motif de suppression</value>
-  </data>
-  <data name="PleaseProvideReason" xml:space="preserve">
-    <value>Veuillez indiquer une raison</value>
-  </data>
-  <data name="Status" xml:space="preserve">
-    <value>Statut</value>
-  </data>
 </root>

EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
+using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Interfaces.Services;
-using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Services;
 
@@ -11,7 +11,7 @@ namespace EnvelopeGenerator.Application.Services;
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public class DocumentReceiverElementService : BasicCRUDService<IDocumentReceiverElementRepository, DocReceiverElementDto, DocReceiverElement, int>, IDocumentReceiverElementService
+public class DocumentReceiverElementService : BasicCRUDService<IDocumentReceiverElementRepository, SignatureDto, Signature, int>, IDocumentReceiverElementService
 {
     /// <summary>
     /// 

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -164,7 +164,7 @@ Public Class frmFinalizePDF
                     Return
                 End If
 
-                Dim sigRepo = scope.ServiceProvider.Repository(Of DocReceiverElement)()
+                Dim sigRepo = scope.ServiceProvider.Repository(Of Signature)()
                 Dim elements = sigRepo _
                     .Where(Function(sig) sig.Document.EnvelopeId = envelopeId) _
                     .Include(Function(sig) sig.Annotations) _

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurner.vb

@@ -46,7 +46,7 @@ Namespace Jobs.FinalizeDocument
                     Return pSourceBuffer
                 End If
 
-                Dim sigRepo = scope.ServiceProvider.Repository(Of DocReceiverElement)()
+                Dim sigRepo = scope.ServiceProvider.Repository(Of Signature)()
                 Dim elements = sigRepo _
                     .Where(Function(sig) sig.Document.EnvelopeId = envelopeId) _
                     .Include(Function(sig) sig.Annotations) _
@@ -58,7 +58,7 @@ Namespace Jobs.FinalizeDocument
             End Using
         End Function
 
-        Public Function BurnElementAnnotsToPDF(pSourceBuffer As Byte(), elements As List(Of DocReceiverElement)) As Byte()
+        Public Function BurnElementAnnotsToPDF(pSourceBuffer As Byte(), elements As List(Of Signature)) As Byte()
             ' Add background
             Using doc As Pdf(Of MemoryStream, MemoryStream) = Pdf.FromMemory(pSourceBuffer)
                 'TODO: take the length from the largest y

EnvelopeGenerator.CommonServices/Models/ElementModel.vb

@@ -10,8 +10,8 @@ Public Class ElementModel
         MyBase.New(pState)
     End Sub
 
-    Private Function ToElement(pRow As DataRow) As DocReceiverElement
-        Return New DocReceiverElement() With {
+    Private Function ToElement(pRow As DataRow) As Signature
+        Return New Signature() With {
             .Id = pRow.ItemEx("GUID", 0),
             .DocumentId = pRow.ItemEx("DOCUMENT_ID", 0),
             .ReceiverId = pRow.ItemEx("RECEIVER_ID", 0),
@@ -24,7 +24,7 @@ Public Class ElementModel
         }
     End Function
 
-    Private Function ToElements(pTable As DataTable) As List(Of DocReceiverElement)
+    Private Function ToElements(pTable As DataTable) As List(Of Signature)
         Return pTable?.Rows.Cast(Of DataRow).
                 Select(AddressOf ToElement).
                 ToList()
@@ -80,7 +80,7 @@ Public Class ElementModel
         End Try
     End Function
 
-    Public Function List(pDocumentId As Integer) As List(Of DocReceiverElement)
+    Public Function List(pDocumentId As Integer) As List(Of Signature)
         Try
             Dim oSql = $"SELECT * FROM [dbo].[TBSIG_DOCUMENT_RECEIVER_ELEMENT] WHERE DOCUMENT_ID = {pDocumentId} ORDER BY PAGE ASC"
             Dim oTable = Database.GetDatatable(oSql)
@@ -93,7 +93,7 @@ Public Class ElementModel
         End Try
     End Function
 
-    Public Function List(pDocumentId As Integer, pReceiverId As Integer) As List(Of DocReceiverElement)
+    Public Function List(pDocumentId As Integer, pReceiverId As Integer) As List(Of Signature)
         Try
             Dim oReceiverConstraint = ""
             If pReceiverId > 0 Then
@@ -111,7 +111,7 @@ Public Class ElementModel
         End Try
     End Function
 
-    Public Function Insert(pElement As DocReceiverElement) As Boolean
+    Public Function Insert(pElement As Signature) As Boolean
         Try
             Dim oSql = "INSERT INTO [dbo].[TBSIG_DOCUMENT_RECEIVER_ELEMENT]
                    ([DOCUMENT_ID]
@@ -161,7 +161,7 @@ Public Class ElementModel
         End Try
     End Function
 
-    Public Function Update(pElement As DocReceiverElement) As Boolean
+    Public Function Update(pElement As Signature) As Boolean
         Try
             Dim oSql = "UPDATE [dbo].[TBSIG_DOCUMENT_RECEIVER_ELEMENT]
                    SET [POSITION_X] = @POSITION_X
@@ -185,7 +185,7 @@ Public Class ElementModel
         End Try
     End Function
 
-    Private Function GetElementId(pElement As DocReceiverElement) As Integer
+    Private Function GetElementId(pElement As Signature) As Integer
         Try
             Return Database.GetScalarValue($"SELECT MAX(GUID) FROM TBSIG_DOCUMENT_RECEIVER_ELEMENT 
                 WHERE DOCUMENT_ID = {pElement.DocumentId} AND RECEIVER_ID = {pElement.ReceiverId}")
@@ -196,7 +196,7 @@ Public Class ElementModel
         End Try
     End Function
 
-    Public Function DeleteElement(pElement As DocReceiverElement) As Boolean
+    Public Function DeleteElement(pElement As Signature) As Boolean
         Try
             Dim oSql = $"DELETE FROM TBSIG_DOCUMENT_RECEIVER_ELEMENT WHERE GUID = {pElement.Id}"
             Return Database.ExecuteNonQuery(oSql)

EnvelopeGenerator.DependencyInjection/DependencyInjection.cs

@@ -1,145 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using EnvelopeGenerator.Application;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
-using EnvelopeGenerator.Application.Services;
-using EnvelopeGenerator.Infrastructure;
-using DigitalData.EmailProfilerDispatcher;
-using DigitalData.UserManager.DependencyInjection;
-
-namespace EnvelopeGenerator.DependencyInjection;
-
-/// <summary>
-/// Controls which optional services are registered by <see cref="DependencyInjection.AddEnvelopeGenerator"/>.
-/// All flags default to <c>true</c>. Set a flag to <c>false</c> if the consuming project
-/// already registers that service itself or simply does not need it.
-/// </summary>
-public sealed class EnvelopeGeneratorOptions
-{
-    /// <summary>Calls <c>AddHttpContextAccessor()</c>. Default: <c>true</c>.</summary>
-    public bool AddHttpContextAccessor { get; set; } = true;
-
-    /// <summary>
-    /// Calls <c>AddDistributedSqlServerCache()</c> with the supplied <see cref="SqlCacheOptions"/>.
-    /// Requires <see cref="SqlCacheOptions"/> to be configured. Default: <c>true</c>.
-    /// </summary>
-    public bool AddDistributedSqlServerCache { get; set; } = true;
-
-    /// <summary>
-    /// Options for the distributed SQL Server cache.
-    /// Required when <see cref="AddDistributedSqlServerCache"/> is <c>true</c>.
-    /// </summary>
-    public SqlCacheOptions? SqlCacheOptions { get; set; }
-
-    /// <summary>Calls <c>AddDispatcher&lt;TDbContext&gt;()</c>. Default: <c>true</c>.</summary>
-    public bool AddDispatcher { get; set; } = true;
-
-    /// <summary>Calls <c>AddMemoryCache()</c>. Default: <c>true</c>.</summary>
-    public bool AddMemoryCache { get; set; } = true;
-
-    /// <summary>Calls <c>AddUserManager&lt;TDbContext&gt;()</c>. Default: <c>true</c>.</summary>
-    public bool AddUserManager { get; set; } = true;
-}
-
-/// <summary>Options for <c>AddDistributedSqlServerCache</c>.</summary>
-public sealed class SqlCacheOptions
-{
-    /// <summary>SQL Server connection string.</summary>
-    public string ConnectionString { get; set; } = string.Empty;
-
-    /// <summary>Schema name. Default: <c>dbo</c>.</summary>
-    public string SchemaName { get; set; } = "dbo";
-
-    /// <summary>Table name. Default: <c>TBDD_CACHE</c>.</summary>
-    public string TableName { get; set; } = "TBDD_CACHE";
-}
-
-/// <summary>
-/// Extension methods for registering EnvelopeGenerator services into an <see cref="IServiceCollection"/>.
-/// Use <see cref="AddEnvelopeGenerator{TDbContext}"/> as the single entry-point for projects that need both the
-/// application layer (MediatR, AutoMapper, CRUD services, configuration sections) and the infrastructure
-/// layer (repositories, DbContext, SQL executors).
-/// For projects that do not need a database (e.g. lightweight API gateways or unit-test hosts), use
-/// <see cref="AddEnvelopeGeneratorCore"/> to register only the application layer.
-/// </summary>
-public static class DependencyInjection
-{
-    /// <summary>
-    /// Registers the full EnvelopeGenerator stack using <see cref="EGDbContext"/> as the DbContext type.
-    /// </summary>
-    public static IServiceCollection AddEnvelopeGenerator(
-        this IServiceCollection services,
-        IConfiguration configuration,
-        Action<EnvelopeGenerator.Infrastructure.DependencyInjection.Config>? infrastructureOptions = null,
-        Action<EnvelopeGeneratorOptions>? options = null)
-    {
-        var opt = new EnvelopeGeneratorOptions();
-        options?.Invoke(opt);
-
-#pragma warning disable CS0618
-        // Application layer: CRUD services, MediatR, AutoMapper, configuration sections.
-        services.AddEnvelopeGeneratorServices(configuration);
-
-        // Infrastructure layer: repositories, DbContext, Dapper type maps, SQL executors.
-        services.AddEnvelopeGeneratorInfrastructureServices(cfg =>
-        {
-            infrastructureOptions?.Invoke(cfg);
-        });
-#pragma warning restore CS0618
-
-        if (opt.AddHttpContextAccessor)
-            services.AddHttpContextAccessor();
-
-        if (opt.AddDistributedSqlServerCache && opt.SqlCacheOptions is { } cacheOpts)
-            services.AddDistributedSqlServerCache(o =>
-            {
-                o.ConnectionString = cacheOpts.ConnectionString;
-                o.SchemaName = cacheOpts.SchemaName;
-                o.TableName = cacheOpts.TableName;
-            });
-
-        if (opt.AddDispatcher)
-            services.AddDispatcher<EGDbContext>();
-
-        if (opt.AddMemoryCache)
-            services.AddMemoryCache();
-
-#pragma warning disable CS0618
-        if (opt.AddUserManager)
-            services.AddUserManager<EGDbContext>();
-#pragma warning restore CS0618
-
-        return services;
-    }
-
-    /// <summary>
-    /// Registers only the <em>application</em> layer services (MediatR handlers, AutoMapper profiles,
-    /// CRUD services, configuration sections) without any infrastructure / database dependencies.
-    /// </summary>
-    /// <param name="services">Service collection to register services into.</param>
-    /// <param name="configuration">Application configuration used to bind application-level option sections.</param>
-    /// <returns>The updated <see cref="IServiceCollection"/>.</returns>
-#pragma warning disable CS0618
-    public static IServiceCollection AddEnvelopeGeneratorCore(
-        this IServiceCollection services,
-        IConfiguration configuration)
-    {
-        services.AddEnvelopeGeneratorServices(configuration);
-        return services;
-    }
-#pragma warning restore CS0618
-
-    /// <summary>
-    /// Registers <see cref="EnvelopeMailService"/> as the <see cref="IEnvelopeMailService"/> scoped
-    /// implementation.
-    /// </summary>
-    /// <param name="services">Service collection to register services into.</param>
-    /// <returns>The updated <see cref="IServiceCollection"/>.</returns>
-#pragma warning disable CS0618
-    public static IServiceCollection AddEnvelopeMailService(this IServiceCollection services)
-    {
-        services.AddScoped<IEnvelopeMailService, EnvelopeMailService>();
-        return services;
-    }
-#pragma warning restore CS0618
-}

EnvelopeGenerator.DependencyInjection/EnvelopeGenerator.DependencyInjection.csproj

@@ -1,176 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
-    <!-- NuGet package metadata -->
-    <PackageId>EnvelopeGenerator</PackageId>
-    <Authors>Digital Data GmbH</Authors>
-    <Company>Digital Data GmbH</Company>
-    <Product>EnvelopeGenerator</Product>
-    <Description>
-      Envelope Generator ist eine Bibliothek zur Verwaltung und Verarbeitung digitaler Umschläge (Envelopes).
-      Dieses Paket enthält die Dependency-Injection-Erweiterungsmethoden und bündelt die Application-
-      sowie Infrastructure-Schicht in einer einzigen NuGet-Referenz.
-    </Description>
-    <Copyright>Copyright 2024 Digital Data GmbH</Copyright>
-    <RepositoryUrl>http://git.dd:3000/AppStd/EnvelopeGenerator.git</RepositoryUrl>
-    <PackageTags>digital data envelope generator di dependency injection</PackageTags>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <Version>1.2.0.3</Version>
-    <AssemblyVersion>1.2.0.3</AssemblyVersion>
-    <FileVersion>1.2.0.3</FileVersion>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-  </PropertyGroup>
-
-  <!-- ASP.NET Core shared framework (AddHttpContextAccessor, AddMemoryCache, etc.) -->
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
-  <!--
-    All dependencies are declared here.
-    Because Application and Infrastructure DLLs are bundled via PrivateAssets=all,
-    their PackageReferences have been moved to this project so that the correct
-    dependencies are written to the nuspec and a consuming project works with
-    a single package install.
-  -->
-  <ItemGroup>
-    <!-- DigitalData BaGet packages -->
-    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.6.0" />
-    <PackageReference Include="DigitalData.Core.Application" Version="3.4.0" />
-    <PackageReference Include="DigitalData.Core.Client" Version="2.1.0" />
-    <PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
-    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.6.1" />
-    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
-    <PackageReference Include="UserManager" Version="1.1.3" />
-
-    <!-- ORM / Database -->
-    <PackageReference Include="Dapper" Version="2.1.66" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
-
-    <!-- Application services -->
-    <PackageReference Include="MediatR" Version="12.5.0" />
-    <PackageReference Include="QRCoder" Version="1.6.0" />
-    <PackageReference Include="QRCoder-ImageSharp" Version="0.10.0" />
-    <PackageReference Include="QuestPDF" Version="2025.7.1" />
-    <PackageReference Include="Otp.NET" Version="1.4.0" />
-
-    <!-- Security / Identity -->
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
-
-    <!-- Utilities -->
-    <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
-    <PackageReference Include="System.Formats.Asn1" Version="10.0.3" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
-
-    <!-- DI abstractions -->
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.6" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.6" />
-  </ItemGroup>
-
-  <!-- TFM-specific packages -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="AutoMapper" Version="13.0.1" />
-    <PackageReference Include="CommandDotNet" Version="7.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.20" />
-    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.20" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="AutoMapper" Version="14.0.0" />
-    <PackageReference Include="CommandDotNet" Version="8.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.17" />
-    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.17" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageReference Include="AutoMapper" Version="14.0.0" />
-    <PackageReference Include="CommandDotNet" Version="8.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.6" />
-    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="9.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj">
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
-  </ItemGroup>
-
-  <!-- Bundle dependency DLLs into the package lib folder -->
-  <Target Name="IncludeDependencyDlls" BeforeTargets="_GetPackageFiles">
-    <ItemGroup>
-      <_DepDlls Include="&#xD;&#xA;        ..\EnvelopeGenerator.Application\bin\$(Configuration)\%(ProjectReference.TargetFramework)\EnvelopeGenerator.Application.dll;&#xD;&#xA;        ..\EnvelopeGenerator.Domain\bin\$(Configuration)\%(ProjectReference.TargetFramework)\EnvelopeGenerator.Domain.dll;&#xD;&#xA;        ..\EnvelopeGenerator.Infrastructure\bin\$(Configuration)\%(ProjectReference.TargetFramework)\EnvelopeGenerator.Infrastructure.dll" />
-    </ItemGroup>
-  </Target>
-
-  <!--
-    Rebuild all dependency projects for every TFM before packing so that
-    the DLLs bundled into the package are always up-to-date.
-    Run with: dotnet pack -c Release
-  -->
-  <Target Name="RebuildDependenciesBeforePack" BeforeTargets="GenerateNuspec">
-    <MSBuild Projects="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj"
-             Targets="Build"
-             Properties="Configuration=$(Configuration);TargetFramework=net7.0" />
-    <MSBuild Projects="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj"
-             Targets="Build"
-             Properties="Configuration=$(Configuration);TargetFramework=net8.0" />
-    <MSBuild Projects="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj"
-             Targets="Build"
-             Properties="Configuration=$(Configuration);TargetFramework=net9.0" />
-
-    <MSBuild Projects="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj"
-             Targets="Build"
-             Properties="Configuration=$(Configuration);TargetFramework=net7.0" />
-    <MSBuild Projects="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj"
-             Targets="Build"
-             Properties="Configuration=$(Configuration);TargetFramework=net8.0" />
-    <MSBuild Projects="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj"
-             Targets="Build"
-             Properties="Configuration=$(Configuration);TargetFramework=net9.0" />
-
-    <MSBuild Projects="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj"
-             Targets="Build"
-             Properties="Configuration=$(Configuration);TargetFramework=net7.0" />
-    <MSBuild Projects="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj"
-             Targets="Build"
-             Properties="Configuration=$(Configuration);TargetFramework=net8.0" />
-    <MSBuild Projects="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj"
-             Targets="Build"
-             Properties="Configuration=$(Configuration);TargetFramework=net9.0" />
-  </Target>
-
-  <Target Name="BundleReferencedDlls" AfterTargets="Build">
-    <ItemGroup>
-      <BuildOutputInPackage Include="..\EnvelopeGenerator.Application\bin\$(Configuration)\net7.0\EnvelopeGenerator.Application.dll" TargetFramework="net7.0" />
-      <BuildOutputInPackage Include="..\EnvelopeGenerator.Application\bin\$(Configuration)\net8.0\EnvelopeGenerator.Application.dll" TargetFramework="net8.0" />
-      <BuildOutputInPackage Include="..\EnvelopeGenerator.Application\bin\$(Configuration)\net9.0\EnvelopeGenerator.Application.dll" TargetFramework="net9.0" />
-      <BuildOutputInPackage Include="..\EnvelopeGenerator.Domain\bin\$(Configuration)\net7.0\EnvelopeGenerator.Domain.dll" TargetFramework="net7.0" />
-      <BuildOutputInPackage Include="..\EnvelopeGenerator.Domain\bin\$(Configuration)\net8.0\EnvelopeGenerator.Domain.dll" TargetFramework="net8.0" />
-      <BuildOutputInPackage Include="..\EnvelopeGenerator.Domain\bin\$(Configuration)\net9.0\EnvelopeGenerator.Domain.dll" TargetFramework="net9.0" />
-      <BuildOutputInPackage Include="..\EnvelopeGenerator.Infrastructure\bin\$(Configuration)\net7.0\EnvelopeGenerator.Infrastructure.dll" TargetFramework="net7.0" />
-      <BuildOutputInPackage Include="..\EnvelopeGenerator.Infrastructure\bin\$(Configuration)\net8.0\EnvelopeGenerator.Infrastructure.dll" TargetFramework="net8.0" />
-      <BuildOutputInPackage Include="..\EnvelopeGenerator.Infrastructure\bin\$(Configuration)\net9.0\EnvelopeGenerator.Infrastructure.dll" TargetFramework="net9.0" />
-    </ItemGroup>
-  </Target>
-
-</Project>

EnvelopeGenerator.Domain/Constants/EnvelopeStatus.cs

@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 
 namespace EnvelopeGenerator.Domain.Constants
 {
-    // http://wiki.dd/xwiki_prod/bin/view/Anwendungen/Produkt-Handbuch/Sonstiges/signFLOW/signFLOW%20-%20Enwickler-Handbuch/4.%20Anhang/4.3%20Historie%20und%20Status%20der%20Umschl%C3%A4ge/
+    // http://wiki.dd/xwiki13/bin/view/Anwendungen/Produkt-Handbuch/Sonstiges/SignFlow/Envelope%20Status/
     public enum EnvelopeStatus
     {
         Invalid = 0,
@@ -51,28 +49,5 @@ namespace EnvelopeGenerator.Domain.Constants
                 EnvelopeStatus.EnvelopeCreated,
                 EnvelopeStatus.DocumentMod_Rotation
             };
-
-        public static readonly List<EnvelopeStatus> Active = Enum.GetValues(typeof(EnvelopeStatus))
-            .Cast<EnvelopeStatus>()
-            .Where(status => status.IsActive())
-            .ToList();
-
-        public static readonly List<EnvelopeStatus> Completed = Enum.GetValues(typeof(EnvelopeStatus))
-            .Cast<EnvelopeStatus>()
-            .Where(status => status.IsCompleted())
-            .ToList();
-    }
-
-    public static class EnvelopeStatusExtensions
-    {
-        public static bool IsActive(this EnvelopeStatus status)
-        {
-            return status >= EnvelopeStatus.EnvelopeCreated && status < EnvelopeStatus.EnvelopePartlySigned;
-        }
-
-        public static bool IsCompleted(this EnvelopeStatus status)
-        {
-            return status >= EnvelopeStatus.EnvelopeCompletelySigned && status <= EnvelopeStatus.EnvelopeWithdrawn;
-        }
     }
 }

EnvelopeGenerator.Domain/Constants/SenderAppType.cs

@@ -1,8 +0,0 @@
-namespace EnvelopeGenerator.Domain.Constants
-{
-    public enum SenderAppType
-    {
-        LegacyFormApp = 0,
-        ReceiverUIBlazorApp = 1
-    }
-}

EnvelopeGenerator.Domain/Entities/Document.cs

@@ -18,7 +18,7 @@ namespace EnvelopeGenerator.Domain.Entities
         public Document()
         {
 #if NETFRAMEWORK
-            Elements = Enumerable.Empty<DocReceiverElement>().ToList();
+            Elements = Enumerable.Empty<Signature>().ToList();
 #endif
         }
 
@@ -60,7 +60,7 @@ namespace EnvelopeGenerator.Domain.Entities
             FileNameOriginal { get; set; }
         #endregion
 
-        public virtual List<DocReceiverElement>
+        public virtual List<Signature>
 #if nullable
             ?
 #endif

EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs

@@ -76,7 +76,7 @@ namespace EnvelopeGenerator.Domain.Entities
             ChangedWho { get; set; }
 
         [ForeignKey("ElementId")]
-        public virtual DocReceiverElement
+        public virtual Signature
 #if nullable
             ?
 #endif

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -94,7 +94,7 @@ namespace EnvelopeGenerator.Domain.Entities
         public string Language { get; set; }
 
         [Column("SEND_REMINDER_EMAILS")]
-        public bool? SendReminderEmails { get; set; }
+        public bool SendReminderEmails { get; set; }
 
         [Column("FIRST_REMINDER_DAYS")]
         public int? FirstReminderDays { get; set; }
@@ -114,7 +114,7 @@ namespace EnvelopeGenerator.Domain.Entities
         public int? CertificationType { get; set; }
 
         [Column("USE_ACCESS_CODE")]
-        public bool? UseAccessCode { get; set; }
+        public bool UseAccessCode { get; set; }
 
         [Column("FINAL_EMAIL_TO_CREATOR")]
         public int? FinalEmailToCreator { get; set; }
@@ -132,7 +132,7 @@ namespace EnvelopeGenerator.Domain.Entities
         public User User { get; set; }
 
         [Column("TFA_ENABLED")]
-        public bool? TfaEnabled { get; set; }
+        public bool TfaEnabled { get; set; }
 #if NETFRAMEWORK
             = false;
 #endif

EnvelopeGenerator.Domain/Entities/Signature.cs

@@ -11,9 +11,9 @@ using System.Collections.Generic;
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
-    public class DocReceiverElement : IDocReceiverElement, IHasReceiver, IHasAddedWhen, IUpdateAuditable
+    public class Signature : ISignature, IHasReceiver, IHasAddedWhen, IUpdateAuditable
     {
-        public DocReceiverElement()
+        public Signature()
         {
             // TODO: * Check the Form App and remove the default value
 #if NETFRAMEWORK
@@ -126,33 +126,5 @@ namespace EnvelopeGenerator.Domain.Entities
         [NotMapped]
         public double Left => Math.Round(X, 5);
 #endif
-
-        [Column("FULL_NAME", TypeName = "nvarchar(100)")]
-        public string
-#if nullable
-        ?
-# endif
-            FullName { get; set; }
-
-        [Column("POSITION", TypeName = "nvarchar(100)")]
-        public string
-#if nullable
-        ?
-#endif
-            Position { get; set; }
-
-        [Column("PLACE", TypeName = "nvarchar(100)")]
-        public string
-#if nullable
-        ?
-#endif
-            Place { get; set; }
-
-        [Column("INK", TypeName = "varbinary(MAX)")]
-        public byte[]
-#if nullable
-        ?
-#endif
-            Ink { get; set; }
     }
 }

EnvelopeGenerator.Domain/Interfaces/ISignature.cs

@@ -1,6 +1,6 @@
 namespace EnvelopeGenerator.Domain.Interfaces
 {
-    public interface IDocReceiverElement
+    public interface ISignature
     {
         int Page { get; set; }
 

EnvelopeGenerator.Form/Controllers/FieldEditorController.vb

@@ -8,7 +8,7 @@ Public Class FieldEditorController
     Inherits BaseController
 
     Private ReadOnly Document As Document
-    Public Property Elements As New List(Of DocReceiverElement)
+    Public Property Elements As New List(Of Signature)
 
     Public Class ElementInfo
         Public ReceiverId As Integer
@@ -36,7 +36,7 @@ Public Class FieldEditorController
         }
     End Function
 
-    Private Function GetElementByPosition(pAnnotation As AnnotationStickyNote, pPage As Integer, pReceiverId As Integer) As DocReceiverElement
+    Private Function GetElementByPosition(pAnnotation As AnnotationStickyNote, pPage As Integer, pReceiverId As Integer) As Signature
         Dim oElement = Elements.
             Where(Function(e)
                       Return e.Left = CSng(Math.Round(pAnnotation.Left, 5)) And
@@ -47,12 +47,12 @@ Public Class FieldEditorController
         Return oElement
     End Function
 
-    Private Function GetElementByGuid(pGuid As Integer) As DocReceiverElement
+    Private Function GetElementByGuid(pGuid As Integer) As Signature
         Dim oElement = Elements.Where(Function(e) pGuid = e.Id).SingleOrDefault()
         Return oElement
     End Function
 
-    Public Function GetElement(pAnnotation As AnnotationStickyNote) As DocReceiverElement
+    Public Function GetElement(pAnnotation As AnnotationStickyNote) As Signature
         Dim oInfo = GetElementInfo(pAnnotation.Tag)
 
         If oInfo.Guid = -1 Then
@@ -85,7 +85,7 @@ Public Class FieldEditorController
         Else
             Dim oInfo = GetElementInfo(pAnnotation.Tag)
 
-            Elements.Add(New DocReceiverElement() With {
+            Elements.Add(New Signature() With {
                 .ElementType = Constants.ElementType.Signature,
                 .Height = oAnnotationHeight,
                 .Width = oAnnotationWidth,
@@ -98,7 +98,7 @@ Public Class FieldEditorController
         End If
     End Sub
 
-    Public Function ClearElements(pPage As Integer, pReceiverId As Integer) As IEnumerable(Of DocReceiverElement)
+    Public Function ClearElements(pPage As Integer, pReceiverId As Integer) As IEnumerable(Of Signature)
         Return Elements.
             Where(Function(e) e.Page <> pPage And e.ReceiverId <> pReceiverId).
             ToList()
@@ -120,7 +120,7 @@ Public Class FieldEditorController
             All(Function(pResult) pResult = True)
     End Function
 
-    Public Function SaveElement(pElement As DocReceiverElement) As Boolean
+    Public Function SaveElement(pElement As Signature) As Boolean
         Try
             If pElement.Id > 0 Then
                 Return ElementModel.Update(pElement)
@@ -134,11 +134,11 @@ Public Class FieldEditorController
         End Try
     End Function
 
-    Public Function DeleteElement(pElement As DocReceiverElement) As Boolean
+    Public Function DeleteElement(pElement As Signature) As Boolean
         Try
             ' Element aus Datenbank löschen
             If ElementModel.DeleteElement(pElement) Then
-                Dim oElement = New List(Of DocReceiverElement)() From {pElement}
+                Dim oElement = New List(Of Signature)() From {pElement}
                 Elements = Elements.Except(oElement).ToList()
                 Return True
             Else

EnvelopeGenerator.Form/frmFieldEditor.vb

@@ -280,7 +280,7 @@ Partial Public Class frmFieldEditor
         End If
     End Sub
 
-    Private Sub LoadAnnotation(pElement As DocReceiverElement, pReceiverId As Integer)
+    Private Sub LoadAnnotation(pElement As Signature, pReceiverId As Integer)
         Dim oAnnotation As AnnotationStickyNote = Manager.AddStickyNoteAnnot(0, 0, 0, 0, "SIGNATUR")
         Dim oPage = pElement.Page
         Dim oReceiver = Receivers.Where(Function(r) r.Id = pReceiverId).Single()

EnvelopeGenerator.Infrastructure/DependencyInjection.cs

@@ -74,14 +74,14 @@ namespace EnvelopeGenerator.Infrastructure
             services.AddSQLExecutor<Envelope>();
             services.AddSQLExecutor<Receiver>();
             services.AddSQLExecutor<Document>();
-            services.AddSQLExecutor<DocReceiverElement>();
+            services.AddSQLExecutor<Signature>();
             services.AddSQLExecutor<DocumentStatus>();
 
             SetDapperTypeMap<Envelope>();
             SetDapperTypeMap<User>();
             SetDapperTypeMap<Receiver>();
             SetDapperTypeMap<Document>();
-            SetDapperTypeMap<DocReceiverElement>();
+            SetDapperTypeMap<Signature>();
             SetDapperTypeMap<DocumentStatus>();
 
             services.AddScoped<IEnvelopeExecutor, EnvelopeExecutor>();

EnvelopeGenerator.Infrastructure/EGDbContext.cs

@@ -45,7 +45,7 @@ public abstract class EGDbContextBase : DbContext
 
     public DbSet<Envelope> Envelopes { get; set; }
 
-    public DbSet<DocReceiverElement> DocumentReceiverElements { get; set; }
+    public DbSet<Signature> DocumentReceiverElements { get; set; }
 
     public DbSet<ElementAnnotation> DocumentReceiverElementAnnotations { get; set; }
 
@@ -154,7 +154,7 @@ public abstract class EGDbContextBase : DbContext
         #endregion EnvelopeDocument
 
         #region DocumentReceiverElement
-        modelBuilder.Entity<DocReceiverElement>()
+        modelBuilder.Entity<Signature>()
             .HasOne(dre => dre.Document)
             .WithMany(ed => ed.Elements)
             .HasForeignKey(dre => dre.DocumentId);
@@ -196,7 +196,7 @@ public abstract class EGDbContextBase : DbContext
         #endregion DocumentStatus
 
         #region Annotation
-        modelBuilder.Entity<DocReceiverElement>()
+        modelBuilder.Entity<Signature>()
             .HasMany(signature => signature.Annotations)
             .WithOne(annot => annot.Element)
             .HasForeignKey(annot => annot.ElementId);
@@ -217,7 +217,7 @@ public abstract class EGDbContextBase : DbContext
 
         // TODO: call add trigger methods with attributes and reflection
         AddTrigger<Config>();
-        AddTrigger<DocReceiverElement>();
+        AddTrigger<Signature>();
         AddTrigger<DocumentStatus>();
         AddTrigger<EmailTemplate>();
         AddTrigger<Envelope>();

EnvelopeGenerator.Infrastructure/EGDbContextFactory.cs

@@ -0,0 +1,48 @@
+#if NET
+using EnvelopeGenerator.Application.Common.Configurations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace EnvelopeGenerator.Infrastructure
+{
+    public class EGDbContextFactory : IDesignTimeDbContextFactory<EGDbContext>
+    {
+        public EGDbContext CreateDbContext(string[] args)
+        {
+            var config = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.migration.json")
+                .Build();
+
+            // create DbContextOptions
+            var optionsBuilder = new DbContextOptionsBuilder<EGDbContext>();
+            optionsBuilder.UseSqlServer(config.GetConnectionString("Default"));
+
+            // create DbTriggerParams
+            var triggerLists = config.GetSection("DbTriggerParams").Get<Dictionary<string, List<string>>>();
+            var dbTriggerParams = new DbTriggerParams();
+            if (triggerLists is not null)
+                foreach (var triggerList in triggerLists)
+                {
+                    if (triggerList.Value.Count == 0)
+                        continue; // Skip empty trigger lists
+
+                    var tableName = triggerList.Key;
+
+                    dbTriggerParams[tableName] = new List<string>();
+
+                    foreach (var trigger in triggerList.Value)
+                    {
+                        dbTriggerParams[tableName].Add(trigger);
+                    }
+                }
+
+            var dbContext = new EGDbContext(optionsBuilder.Options, Options.Create(dbTriggerParams));
+            dbContext.IsMigration = true;
+            return dbContext;
+        }
+    }
+}
+#endif

EnvelopeGenerator.Infrastructure/Repositories/DocumentReceiverElementRepository.cs

@@ -6,7 +6,7 @@ using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
 [Obsolete("Use IRepository")]
-public class DocumentReceiverElementRepository : CRUDRepository<DocReceiverElement, int, EGDbContext>, IDocumentReceiverElementRepository
+public class DocumentReceiverElementRepository : CRUDRepository<Signature, int, EGDbContext>, IDocumentReceiverElementRepository
 {
     public DocumentReceiverElementRepository(EGDbContext dbContext) : base(dbContext, dbContext.DocumentReceiverElements)
     {

EnvelopeGenerator.PdfEditor/Pdf.cs

@@ -103,7 +103,7 @@ namespace EnvelopeGenerator.PdfEditor
         #endregion
 
         public Pdf<TInputStream, TOutputStream> Background<TSignature>(IEnumerable<TSignature> signatures, double widthPx = 1.9500000000000002, double heightPx = 2.52)
-            where TSignature : IDocReceiverElement
+            where TSignature : ISignature
         {
             foreach (var signature in signatures)
                 Page(signature.Page, page =>

EnvelopeGenerator.ReceiverUI/App.razor

@@ -1,12 +0,0 @@
-@using System.Globalization
-
-<Router AppAssembly="@typeof(Program).Assembly">
-    <Found Context="routeData">
-        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
-    </Found>
-    <NotFound>
-        <LayoutView Layout="@typeof(MainLayout)">
-            <p>Sorry, there's nothing at this address.</p>
-        </LayoutView>
-    </NotFound>
-</Router>

EnvelopeGenerator.ReceiverUI/Data/Adjustment.cs

@@ -1,44 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Data {
-    public class Adjustment
-    {
-        public static Adjustment CreateBalanceForward(DateTime dt, int random)
-        {
-            var rnd = new DeterministicRandom(random);
-            Adjustment res = new Adjustment();
-            res.currentDateTime = dt;
-            res.currentDescription = "Balance Forward";
-            res.currentAmount = rnd.Random(10, 300) * 10;
-            return res;
-        }
-        public static Adjustment CreatePayment(DateTime dt, int random)
-        {
-            var rnd = new DeterministicRandom(random);
-            Adjustment res = new Adjustment();
-            res.currentDateTime = dt;
-            res.currentDescription = "Payment";
-            res.currentAmount = -rnd.Random(1, 40) * 10;
-            return res;
-        }
-        public static Adjustment CreateCharge(DateTime dt, int random)
-        {
-            var rnd = new DeterministicRandom(random);
-            Adjustment res = new Adjustment();
-            res.currentDateTime = dt;
-            res.currentDescription = rnd.GetRandomItem(bills);
-            res.currentAmount = rnd.Random(10, 50) * 10;
-            return res;
-        }
-
-        DateTime currentDateTime;
-        string currentDescription = "";
-        double currentAmount = 0;
-        static readonly string[] bills = new string[] { "Bill - Insurance", "Bill - Electricity", "Bill - Rent", "Bill - Phone", "Bill - Office Supplies" };
-        public DateTime Date { get { return currentDateTime; } }
-        public string Description { get { return currentDescription; } }
-        public double Amount { get { return currentAmount; } }
-
-        public Adjustment()
-        {
-        }
-    }
-}

EnvelopeGenerator.ReceiverUI/Data/Customer.cs

@@ -1,64 +0,0 @@
-using DevExpress.DataAccess.Sql;
-using DevExpress.DataAccess.Sql.DataApi;
-
-namespace EnvelopeGenerator.ReceiverUI.Data {
-    public class Customer {
-        static List<Customer> currentCustomers = new List<Customer>();
-
-        public static List<Customer> Customers { get { return currentCustomers; } }
-        static Customer() {
-            try {
-                SqlDataSource ds = new SqlDataSource("NWindConnectionString");
-                SelectQuery query = SelectQueryFluentBuilder
-                    .AddTable("Customers")
-                    .SelectAllColumns()
-                    .Build("Customers");
-                ds.Queries.Add(query);
-                ds.RebuildResultSchema();
-                ds.Fill();
-                ITable src = ds.Result["Customers"];
-                foreach(var row in src) {
-                    currentCustomers.Add(new Customer() {
-                        CustomerID = row.GetValue<string>("CustomerID"),
-                        Address = row.GetValue<string>("Address"),
-                        CompanyName = row.GetValue<string>("CompanyName"),
-                        ContactName = row.GetValue<string>("ContactName"),
-                        ContactTitle = row.GetValue<string>("ContactTitle"),
-                        Country = row.GetValue<string>("Country"),
-                        City = row.GetValue<string>("City"),
-                        Fax = row.GetValue<string>("Fax"),
-                        Phone = row.GetValue<string>("Phone"),
-                        PostalCode = row.GetValue<string>("PostalCode"),
-                        Region = row.GetValue<string>("Region")
-                    });
-                }
-            } catch {
-                currentCustomers.Add(new Customer() { 
-                    Address = "Obere Str. 57",
-                    City = "Berlin",
-                    CompanyName = "Alfreds Futterkiste",
-                    ContactName = "Maria Anders",
-                    ContactTitle = "Sales Representative",
-                    Country = "Germany",
-                    CustomerID = "ALFKI",
-                    Fax = "030-0076545",
-                    Phone = "030-0074321",
-                    PostalCode = "12209"
-                });
-            }
-        }
-
-        public string CustomerID { get; set; }
-        public string CompanyName { get; set; }
-        public string ContactName { get; set; }
-        public string ContactTitle { get; set; }
-        public string Address { get; set; }
-        public string City { get; set; }
-        public string PostalCode { get; set; }
-        public string Region { get; set; }
-        public string Country { get; set; }
-        public string Phone { get; set; }
-        public string Fax { get; set; }
-
-    }
-}

EnvelopeGenerator.ReceiverUI/Data/DataItem.cs

@@ -1,71 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Data {
-    public class DataItem {
-        static readonly string[] accountType = new string[] { "Energy", "Manufacturing", "Estate", "Food", "Services" };
-        public string CustomerID { get; set; }
-        public string CompanyName { get; set; }
-        public string ContactName { get; set; }
-        public string ContactTitle { get; set; }
-        public string Address { get; set; }
-        public string City { get; set; }
-        public string PostalCode { get; set; }
-        public string Region { get; set; }
-        public string Country { get; set; }
-        public string Phone { get; set; }
-        public string Fax { get; set; }
-        public string Email { get; set; }
-        public string Invoice { get; set; }
-        public string CustomerAccount { get; set; }
-        public string CustomerIdentifiers { get; set; }
-        public DateTime BillingDate { get; set; }
-        public DateTime BillingPeriodStart { get; set; }
-        public DateTime BillingPeriodEnd { get; set; }
-        public string Terms { get; set; }
-        public string TermsID { get; set; }
-        public Adjustment[] Adjustments { get; set; }
-
-        public DataItem(int i) {
-            var rnd = new DeterministicRandom(i);
-            Customer c = rnd.GetRandomItem(Customer.Customers);
-            CustomerID = c.CustomerID;
-            CompanyName = c.CompanyName;
-            ContactName = c.ContactName;
-            ContactTitle = c.ContactTitle;
-            Address = c.Address;
-            City = c.City;
-            PostalCode = c.PostalCode;
-            Region = c.Region;
-            Country = c.Country;
-            Phone = c.Phone;
-            Fax = c.Fax;
-            Email = ContactName.Split(' ')[0].Replace(' ', '.').ToLower() + "@" + CompanyName.Split(' ')[0].ToLower() + ".com";
-            Invoice = string.Format("{0}{1}-{2}", rnd.RandomChar, rnd.Random(100, 1000), rnd.Random(100, 1000));
-            CustomerAccount = rnd.GetRandomItem(accountType);
-            CustomerIdentifiers = string.Format("{0}-{1}", rnd.Random(1000, 10000), rnd.Random(10, 100));
-            BillingPeriodStart = rnd.RandomTime();
-            BillingPeriodEnd = rnd.RandomTime(BillingPeriodStart, 7 * 24, 30 * 24);
-            BillingDate = rnd.RandomTime(BillingPeriodEnd, 7 * 24, 30 * 24);
-            Term currentTerm = rnd.GetRandomItem(Term.Terms);
-            Terms = currentTerm.Name;
-
-            int adjustmentsCount = rnd.Random(6) + 4;
-            Adjustments = new Adjustment[adjustmentsCount];
-            int h = (int)((BillingPeriodEnd - BillingPeriodStart).TotalHours / adjustmentsCount);
-
-            Adjustments[0] = Adjustment.CreateBalanceForward(rnd.RandomTime(BillingPeriodStart, 0, h), rnd.Random(10000));
-
-            int[] items = rnd.RandomList(adjustmentsCount - 1, 2);
-
-            for(int j = 1; j < Adjustments.Length; j++) {
-                DateTime nextDate = rnd.RandomTime(BillingPeriodStart.AddHours(h * j), 0, h);
-                    switch(items[j - 1]) {
-                        case 0:
-                            Adjustments[j] = Adjustment.CreateCharge(nextDate, rnd.Random(10000));
-                            break;
-                        case 1:
-                            Adjustments[j] = Adjustment.CreatePayment(nextDate, rnd.Random(10000));
-                            break;
-                    }
-            }
-        }
-    }
-}

EnvelopeGenerator.ReceiverUI/Data/DataItemList.cs

@@ -1,70 +0,0 @@
-using System.Collections;
-
-namespace EnvelopeGenerator.ReceiverUI.Data {
-    public class DataItemList : IList<DataItem>, IList {
-        readonly int rowCount;
-
-        public DataItem this[int index] { get { return new DataItem(index); } set { } }
-        public int Count { get { return rowCount; } }
-        public bool IsReadOnly { get { return false; } }
-        public bool IsFixedSize { get { return false; } }
-        public object SyncRoot { get { return true; } }
-        public bool IsSynchronized { get { return true; } }
-        object IList.this[int index] { get { return new DataItem(index); } set { } }
-
-        public DataItemList(int rowCount) {
-            this.rowCount = rowCount;
-        }
-        public IEnumerator<DataItem> GetEnumerator() {
-            throw new NotImplementedException();
-        }
-        public int Add(object value) {
-            throw new NotImplementedException();
-        }
-        public bool Contains(object value) {
-            throw new NotImplementedException();
-        }
-        public void Clear() {
-            throw new NotImplementedException();
-        }
-        public int IndexOf(object value) {
-            throw new NotImplementedException();
-        }
-        public void Insert(int index, object value) {
-            throw new NotImplementedException();
-        }
-        public void Remove(object value) {
-            throw new NotImplementedException();
-        }
-        public void RemoveAt(int index) {
-            throw new NotImplementedException();
-        }
-        public void CopyTo(Array array, int index) {
-            throw new NotImplementedException();
-        }
-        IEnumerator IEnumerable.GetEnumerator() {
-            throw new NotImplementedException();
-        }
-        public int IndexOf(DataItem item) {
-            throw new NotImplementedException();
-        }
-        public void Insert(int index, DataItem item) {
-            throw new NotImplementedException();
-        }
-        public void Add(DataItem item) {
-            throw new NotImplementedException();
-        }
-        public bool Contains(DataItem item) {
-            throw new NotImplementedException();
-        }
-        public void CopyTo(DataItem[] array, int arrayIndex) {
-            throw new NotImplementedException();
-        }
-        public bool Remove(DataItem item) {
-            throw new NotImplementedException();
-        }
-        void ICollection<DataItem>.CopyTo(DataItem[] array, int arrayIndex) {
-            CopyTo(array, arrayIndex);
-        }
-    }
-}

EnvelopeGenerator.ReceiverUI/Data/DeterministicRandom.cs

@@ -1,60 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Data {
-    class DeterministicRandom {
-        const int randomCount = 10000;
-        static readonly int[] deterministicRandomNumbers;
-        static readonly DateTime time;
-        int rnd;
-        int Next {
-            get {
-                rnd = deterministicRandomNumbers[rnd % randomCount];
-                return rnd;
-            }
-        }
-        public char RandomChar {
-            get {
-                return (char)((int)'A' + Random(0, 26));
-            }
-        }
-        public int[] RandomList(int count, int to) {
-            int[] res = new int[count];
-            for(int i = 0; i < Math.Min(count, to); i++)
-                res[i] = i;
-            for(int i = to; i < count; i++)
-                res[i] = Random(to);
-
-            for(int i = 0; i < count; i++) {
-                int ind = Random(count);
-                int temp = res[ind];
-                res[ind] = res[i];
-                res[i] = temp;
-            }
-            return res;
-        }
-        public int Random(int to) {
-            return Random(0, to);
-        }
-        public int Random(int from, int to) {
-            return Next % Math.Max(1, to - from) + from;
-        }
-        public T GetRandomItem<T>(IList<T> list) {
-            return list[Next % list.Count];
-        }
-        public DateTime RandomTime() {
-            return RandomTime(time, 0, 30 * 24);
-        }
-        public DateTime RandomTime(DateTime from, int fromHours, int toHours) {
-            return from.AddHours(Next % (toHours - fromHours) + fromHours);
-        }
-
-        static DeterministicRandom() {
-            time = DateTime.Now.AddDays(-62);
-            Random currentRandom = new Random(randomCount);
-            deterministicRandomNumbers = new int[randomCount];
-            for(int i = 0; i < randomCount; i++)
-                deterministicRandomNumbers[i] = currentRandom.Next(randomCount);
-        }
-        public DeterministicRandom(int i) {
-            this.rnd = i + (i >> 10) + (i >> 20);
-        }
-    }
-}