docs: add culture management migration warnings for Server/Auto

Prepare for Blazor Server/Auto migration by documenting current
WASM-specific culture initialization approach and providing
detailed migration checklist in COPILOT_CONTEXT.md.

COPILOT_CONTEXT.md

@@ -0,0 +1,489 @@
+# 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)

COPILOT_CONTEXT_EN.md

@@ -1,946 +0,0 @@
-# EnvelopeGenerator — Copilot Context Notes (English)
-
-## Purpose
-A digital document signing system. Senders upload PDFs and place signature annotation fields via PSPDFKit (EnvelopeGenerator.Web). Receivers open the document in a Blazor WASM viewer, confirm each signature field via a checkbox overlay, draw/type/upload their signature, and export the stamped PDF.
-
----
-
-## Solution Structure
-
-| Project | Target | Description |
-|---|---|---|
-| `EnvelopeGenerator.API` | net8.0 | ASP.NET Core Web API. Receiver auth (cookie), annotation reading, PDF serving. |
-| `EnvelopeGenerator.ReceiverUI` | net8.0 WASM | Blazor WebAssembly. Receiver UI. YARP proxies API calls. |
-| `EnvelopeGenerator.Web` | net7/8/9 | Razor Pages. Sender UI + PSPDFKit annotation placement. |
-| `EnvelopeGenerator.Application` | multi | MediatR CQRS handlers. |
-| `EnvelopeGenerator.Domain` | multi | Domain models, constants, interfaces. |
-| `EnvelopeGenerator.Infrastructure` | multi | EF Core repos, DB context. |
-| `EnvelopeGenerator.PdfEditor` | multi | iText7 utilities. NOT used in ReceiverUI flow. |
-| `EnvelopeGenerator.DependencyInjection` | multi | DI registration helpers. |
-| VB.NET projects (Service/Form/BBTests) | net462 | Legacy. Do NOT touch. |
-
----
-
-## Key Files
-
-| File | Purpose |
-|---|---|
-| `ReceiverUI/Pages/EnvelopeViewer.razor` | **NEW** PDF.js-based viewer (`/envelope/{key}`). Replaces ReportViewer.razor. Simple read-only PDF viewing with zoom/navigation. |
-| `ReceiverUI/Pages/ReportViewer.razor` | **LEGACY** DevExpress-based signing page (`/receiver/{key}`). Still used for signature workflow. Will be deprecated. |
-| `ReceiverUI/wwwroot/js/pdf-viewer.js` | **NEW** PDF.js wrapper: rendering, zoom, pagination, mouse wheel control. |
-| `ReceiverUI/wwwroot/js/receiver-signature.js` | JS: checkbox overlay, signature pad (draw/type/image). |
-| `ReceiverUI/wwwroot/css/envelope-viewer.css` | **NEW** Styles for EnvelopeViewer.razor (external CSS, not inline). |
-| `ReceiverUI/wwwroot/fake-data/annotations.json` | Dev-mode fake annotations (YARP proxy target). |
-| `ReceiverUI/Models/AnnotationDto.cs` | Annotation position model. All properties non-nullable. |
-| `ReceiverUI/Services/AnnotationService.cs` | Fetches `List<AnnotationDto>` from API or fake-data. |
-| `ReceiverUI/Services/DocumentService.cs` | Fetches PDF bytes from API. |
-| `ReceiverUI/Services/AuthService.cs` | Manages receiver session cookie. |
-| `API/Controllers/AnnotationController.cs` | GET `api/Annotation/{key}` ? annotation list. |
-| `API/Controllers/DocumentController.cs` | GET `api/Document/{key}` ? PDF bytes. |
-
----
-
-## SignatureDto / AnnotationDto — Coordinate System
-
-**Database Storage Format:** INCHES (GdPicture14 native unit)  
-**Origin:** Top-left corner of page  
-**Axes:** X increases rightward, Y increases downward
-
-### Source Evidence (VB.NET Legacy Code)
-
-```vb
-' From: EnvelopeGenerator.Form/frmFieldEditor.vb
-' GdPicture14.Annotations.AnnotationStickyNote
-
-'Breite und Höhe in Inches (4,5*5cm)
-Private Const SIGNATURE_WIDTH As Single = 1.77   ' 1.77 inches = 4.5cm
-Private Const SIGNATURE_HEIGHT As Single = 1.96  ' 1.96 inches = 5cm
-
-Sub LoadAnnotation(pElement As Signature, ...)
-    oAnnotation.Left = CSng(pElement.X)      ' Direct assignment ? INCHES
-    oAnnotation.Top = CSng(pElement.Y)
-    oAnnotation.Width = CSng(pElement.Width)
-    oAnnotation.Height = CSng(pElement.Height)
-End Sub
-```
-
-### Conversion Formulas
-
-```
-Inches ? DevExpress (DX):  x_DX = x_inches * 100.0
-                          y_DX = y_inches * 100.0
-
-Inches ? PDF Points:       x_pt = x_inches * 72.0
-                          y_pt = x_inches * 72.0
-
-Inches ? PDF.js Canvas:    normalize to [0,1], then scale to pixels
-                          x_norm = x_inches / pageWidth_inches
-                          y_norm = y_inches / pageHeight_inches
-                          x_px = x_norm * canvasWidth * scale * dpr
-                          y_px = y_norm * canvasHeight * scale * dpr
-```
-
-### Unit Comparison Table
-
-| System | Unit | Origin | Conversion from INCHES |
-|--------|------|--------|------------------------|
-| **GdPicture14** (Source) | **Inches** | Top-left | Database format (no conversion) |
-| DevExpress (LEGACY) | 1/100 inch (DX) | Top-left | `x_DX = x_inches * 100` |
-| PDF.js (NEW) | Pixels | Top-left | `normalize ? scale` |
-| PDF Points (iText7) | Points (1/72") | **Bottom-left** | `x_pt = x_inches * 72` + Y-flip |
-| PSPDFKit (Web) | Points (1/72") | Top-left | `x_pt = x_inches * 72` |
-
-**A4 Page Dimensions:**
-- Width: 8.27 inches = 595 points = 827 DX units
-- Height: 11.69 inches = 842 points = 1169 DX units
-
----
-
-## EnvelopeViewer (NEW) — PDF.js Read-Only Viewer
-
-**Route:** `/envelope/{EnvelopeKey}`  
-**Purpose:** Modern, high-performance PDF viewing without signing functionality.  
-**Technology:** PDF.js 3.11.174 + custom JavaScript + configurable quality settings
-
-### Architecture
-
-**Blazor Component (`EnvelopeViewer.razor`):**
-- Fetches PDF via `DocumentService.GetDocumentAsync(EnvelopeKey)`
-- Converts to base64 data URL: `data:application/pdf;base64,{base64}`
-- Initializes PDF.js viewer via JSInterop with `DotNetObjectReference` for callbacks
-- Quality settings loaded from `appsettings.json` via `IOptions<PdfViewerOptions>`
-- Thumbnail sidebar with resizable splitter (150px-400px, localStorage persistence)
-- CSS externalized to `envelope-viewer.css`
-
-**JavaScript (`pdf-viewer.js`):**
-```javascript
-window.pdfViewer = {
-    qualityOptions,              // Configurable from appsettings.json
-    setQualityOptions(options),  // Dynamic quality update
-    initialize(canvasId, pdfDataUrl, dotNetRef),
-    renderPage(num),
-    renderThumbnail(pageNum, canvasId),
-    attachWheelEvent(),          // Ctrl+Wheel zoom (configurable step)
-    zoomIn(), zoomOut(),         // Configurable step percentage
-    dispose()
-}
-```
-
-**Options (`PdfViewerOptions.cs`):**
-```csharp
-public class PdfViewerOptions {
-    public double ThumbnailBaseScale { get; set; } = 0.75;      // 0.2-1.5
-    public bool ThumbnailEnableHiDPI { get; set; } = true;
-    public double ThumbnailMaxDPR { get; set; } = 2.0;          // 1.0-3.0
-    public bool MainCanvasEnableHiDPI { get; set; } = true;
-    public double MainCanvasMaxDPR { get; set; } = 2.0;
-    public bool EnableSmoothZoom { get; set; } = true;
-    public int ZoomTransitionDuration { get; set; } = 150;      // ms
-    public double RenderingOpacity { get; set; } = 0.85;        // 0.0-1.0
-    public int ThumbnailRenderDelay { get; set; } = 50;         // ms
-    public int ZoomStepPercentage { get; set; } = 5;            // 1-50%
-}
-```
-
-### Configuration (appsettings.json)
-
-**Location:** `EnvelopeGenerator.ReceiverUI/wwwroot/appsettings.json`
-
-```json
-{
-  "PdfViewer": {
-    "ThumbnailBaseScale": 0.75,
-    "ThumbnailEnableHiDPI": true,
-    "ThumbnailMaxDPR": 2.0,
-    "MainCanvasEnableHiDPI": true,
-    "MainCanvasMaxDPR": 2.0,
-    "EnableSmoothZoom": true,
-    "ZoomTransitionDuration": 150,
-    "RenderingOpacity": 0.85,
-    "ThumbnailRenderDelay": 50,
-    "ZoomStepPercentage": 5
-  }
-}
-```
-
-**Usage:** Edit file ? F5 (browser refresh) ? new settings applied
-
-**Presets:**
-- **High Quality**: `ThumbnailBaseScale: 1.0, MaxDPR: 3.0` (powerful devices)
-- **Balanced**: Default values (recommended)
-- **Performance**: `ThumbnailBaseScale: 0.5, EnableHiDPI: false` (mobile/low-end)
-
----
-
-### Features
-
-1. **HiDPI/Retina Support** ? 4x quality on Retina displays
-2. **Configurable Quality** ? All parameters in appsettings.json
-3. **Unlimited Zoom** ? 50%-300%, configurable step (default 5%)
-4. **Global Ctrl+Wheel Zoom** ? Works anywhere on page
-5. **Thumbnail Sidebar** ? Resizable (150-400px), high-quality rendering
-6. **Smooth Transitions** ? Configurable fade effect
-7. **Responsive Design** ? Desktop/mobile adaptive layout
-
----
-
-### Features
-
-1. **Unlimited Zoom:**
-   - Canvas size not restricted by `max-width`
-   - Frame stays fixed, scroll bars appear automatically
-   - `text-align: center` for small sizes, full scroll for zoomed views
-
-2. **Global Mouse Wheel Zoom:**
-   - Event listener on `document.body` (works anywhere on page)
-   - `Ctrl + Mouse Wheel` triggers `zoomIn()`/`zoomOut()`
-   - Calls `dotNetReference.invokeMethodAsync('OnZoomChanged', scale)` to update Blazor UI
-   - `{ passive: false }` to enable `preventDefault()`
-
-3. **Render Task Cancellation:**
-   - Stores `currentRenderTask` to cancel previous render if new one starts
-   - Catches `RenderingCancelledException` to avoid console errors
-   - Queue system (`pageNumPending`) for rapid page changes
-
-4. **Thumbnail Sidebar:**
-   - Left panel with page previews (sequential rendering, 50ms delay)
-   - Click to navigate to specific page
-   - Active page highlighted with gradient border
-   - No header/title (maximizes thumbnail space)
-   - Toggle button in toolbar to show/hide
-
-5. **Resizable Splitter:**
-   - 4px draggable divider between thumbnails and canvas
-   - Min width: 150px, Max width: 400px
-   - Visual feedback: gradient on hover/active
-   - User preference saved to localStorage (`envelopeViewer_thumbnailWidth`)
-   - Global mouse events (works anywhere during drag)
-   - `col-resize` cursor (?) for intuitive UX
-
-6. **Flex Layout:**
-   - Thumbnails and canvas in same container (`.pdf-frame`)
-   - `display: flex, flex-direction: row, align-items: stretch`
-   - Perfect vertical alignment (same top/bottom position)
-   - Responsive: column layout on mobile (<768px)
-
-7. **Responsive Design:**
-   - Desktop: 90% width, 1200px max
-   - Mobile: 95% width, adjusted heights, thumbnails collapse to top
-   - Adaptive padding and font sizes
-
-### Initialization Flow
-
-```csharp
-OnInitializedAsync():
-  1. Fetch PDF bytes from DocumentService
-  2. Convert to base64 data URL
-  3. Set _isLoading = false
-
-OnAfterRenderAsync(firstRender):
-  1. Load saved thumbnail width from localStorage
-  2. Create DotNetObjectReference
-  3. Send PdfViewerOptions to JavaScript
-  4. Initialize PDF.js viewer
-  5. Attach splitter resize listeners
-  6. Render thumbnails sequentially (configurable delay)
-```
-
-**User Interactions:**
-- Zoom: Buttons/Ctrl+Wheel/Slider ? configurable step percentage
-- Pages: Buttons/Input/Thumbnails ? navigate
-- Sidebar: Toggle button ? show/hide thumbnails
-- Splitter: Drag ? resize sidebar (150-400px)
-
-**Cleanup:**
-```csharp
-DisposeAsync():
-  - Dispose PDF.js viewer
-  - Detach event listeners
-  - Dispose DotNetObjectReference
-```
-
----
-
-### Key Differences from ReportViewer
-
-| Feature | EnvelopeViewer (NEW) | ReportViewer (LEGACY) |
-|---------|----------------------|------------------------|
-| Technology | PDF.js + Canvas | DevExpress XtraReports |
-| Route | `/envelope/{key}` | `/receiver/{key}` |
-| Purpose | Read-only viewing | Signature workflow |
-| Dependencies | PDF.js CDN | DevExpress NuGet packages |
-| Zoom | Unlimited, smooth | Report viewer default |
-| Mouse Wheel | Custom Ctrl+Wheel | Browser default |
-| File Size | Minimal (JS + CSS) | Heavy (DX libs) |
-| Maintenance | Simple, standard web | Complex, vendor-specific |
-
----
-
-## ReceiverUI Signing Flow (ReportViewer.razor — LEGACY)
-
-### On Load (`OnInitializedAsync`)
-1. `AuthService.CheckEnvelopeAccessAsync` ? redirect to login if unauthorized
-2. `AnnotationService.GetAnnotationsAsync` ? fills `_annotations`
-3. `DocumentService.GetDocumentAsync` ? fills `_basePdfBytes` (real mode)
-4. `BuildFreshBaseReport()` ? `XtraReport` for `DxReportViewer`
-
-### Signature Popup
-- Tabs: Draw / Text / Image
-- Fields: full name (required), position (optional), place (required)
-- Saved to `_capturedSignature` record
-- If annotations exist ? popup closes ? JS checkbox overlays installed
-
-### JS Checkbox Overlay (`receiver-signature.js`)
-- `receiverSignature.installAnnotationCheckboxes(annotations, checkedIds, dotNetRef)`
-- One `.annot-sig-cb-wrapper` div per annotation, absolutely positioned over viewer scroll container
-- Position: `left = pageRect.left + ann.x * scaleX`, `top = pageRect.top + ann.y * scaleY`
-  - `scaleX = pagePixelWidth / 827`, `scaleY = pagePixelHeight / 1169`
-- Click ? `dotNetRef.invokeMethodAsync('OnAnnotationToggled', id, checked)`
-
-### Apply Signatures ("Unterschriften anwenden" — `SubmitSignaturesAsync`)
-
-**Real PDF mode (`_basePdfBytes` is set):**
-- Calls `StampSignaturesOnPdf` using **iText7** directly on PDF bytes
-- Coordinate conversion: `xPt = ann.X * (72/100)`, `yPt = pageHeight - ann.Y * (72/100) - sigHeight` (Y flip: DX top-down ? PDF bottom-up)
-- Returns stamped bytes ? loaded into new `XtraReport` with `XRPdfContent`
-- Viewer refreshed with `ViewerKey++`
-
-**Dev/fake mode (`_basePdfBytes` is null):**
-- Falls back to `AddSignatureAtAnnotation` (XtraReports DetailBand + BeforePrint counter)
-- This is intentionally left as a dev fallback only
-
-### Export
-- `reportViewer.ExportToAsync(ExportFormat.Pdf)`
-
----
-
-## StampSignaturesOnPdf — iText7 Implementation
-
-```csharp
-// Located in ReportViewer.razor @code section
-// Called by SubmitSignaturesAsync when _basePdfBytes is available
-
-static byte[] StampSignaturesOnPdf(
-    byte[] sourcePdfBytes, byte[] signatureImageBytes,
-    string signerFullName, string signerPosition, string signaturePlace,
-    IReadOnlyList<AnnotationDto> annotations)
-{
-    // Opens PDF with PdfReader/PdfWriter
-    // For each annotation:
-    //   pageNum = ann.Page (clamped to totalPages)
-    //   xPt = ann.X * (72f/100f)
-    //   imgBottomY = pageHeight - ann.Y * (72f/100f) - sigHeightPt  ? Y-axis flip
-    //   PdfCanvas.AddImageFittedIntoRectangle(imageData, rect, false)
-    //   Separator line at bottom of image
-    //   Canvas text block below separator (font: Helvetica 7pt, color: RGB(73,80,87))
-    // Returns stamped byte[]
-}
-```
-
----
-
-## BuildFreshBaseReport()
-
-```csharp
-// Real PDF mode:
-var report = new XtraReport();
-var detail = new DetailBand();
-report.Bands.Add(detail);
-detail.Controls.Add(new XRPdfContent { Source = _basePdfBytes, GenerateOwnPages = true });
-return report;
-
-// Dev/fake mode: returns pre-built report from ReportStorage
-```
-
----
-
-## NuGet Packages in ReceiverUI
-
-| Package | Version | Purpose |
-|---|---|---|
-| `DevExpress.Blazor.Reporting.Viewer` | 25.2.3 | DxReportViewer (LEGACY, used in ReportViewer.razor) |
-| `DevExpress.Blazor.PdfViewer` | 25.2.3 | PDF viewer (not used in EnvelopeViewer) |
-| `DevExpress.Drawing.Skia` | 25.2.3 | Drawing backend |
-| `itext` | 8.0.5 | PDF stamping (iText7) |
-| `SkiaSharp.*` | 3.119.1 | WASM native rendering |
-
-**External CDN (EnvelopeViewer):**
-- PDF.js 3.11.174 (via `https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.11.174/pdf.min.js`)
-- PDF.js Worker (`pdf.worker.min.js`)
-
----
-
-## Mistakes History — Do NOT Repeat
-
-| Mistake | Why Wrong | Session |
-|---|---|---|
-| `BottomMarginBand` for per-page signatures | Repeats on every page; Y offset wrong | 4 |
-| `imageY = (page-1) * 1169 + ann.Y` | Inflates DetailBand; 35 pages ? 140 pages | 8 |
-| `e.Graph?.PrintingSystem` in BeforePrint | `Graph` not on `CancelEventArgs` | 5 |
-| `ctrl.Report?.PrintingSystem` | `PrintingSystem` not on `XtraReportBase` in WASM | — |
-| Adding stamp endpoint to `DocumentController` | Not needed; stamping is done client-side in ReceiverUI | — |
-| iText7 via API (server-side) | Unnecessary; iText7 runs fine in WASM directly | 10 |
-| **PDF.js: Hardcoded quality values** | **Use appsettings.json for configurability** | **11** |
-| **PDF.js: Hardcoded zoom step (1%)** | **Too granular; use configurable percentage** | **11** |
-| **Toolbar: Complex left/center/right layout** | **User wants simple horizontal layout; failed multiple times to implement** | **11** |
-| **Zoom label: Badge style (gradient/border/padding)** | **Over-designed; user prefers simple text label** | **11** |
-| **Attempting to "improve" simple designs** | **User requests simplicity; AI keeps over-engineering** | **11** |
-| **Ignoring explicit "revert" instructions** | **User said revert toolbar, AI tried to fix CSS instead of reverting HTML structure** | **11** |
-
----
-
-## DevExpress Article (2023-08-28) — Why It Does NOT Apply
-
-The article describes **X.509 cryptographic digital signatures** via `PdfDocumentSigner` + `Pkcs7Signer`.  
-Our use case is **visual/image stamping** at specific page coordinates — different problem, different API.  
-`XRPdfSignature` in the article requires pre-placed fields in the report designer, not runtime coordinates.
-
----
-
-## Layout Architecture (EnvelopeViewer)
-
-### HTML Structure
-```html
-<div class="pdf-viewer-container">
-  <div class="pdf-toolbar">
-    <!-- Zoom, page navigation, thumbnail toggle -->
-  </div>
-  
-  <div class="pdf-frame">
-    @if (_showThumbnails) {
-      <div class="pdf-thumbnails" style="width: @(_thumbnailWidth)px">
-        <!-- Page previews -->
-      </div>
-      <div class="pdf-splitter" @onmousedown="OnSplitterMouseDown">
-        <!-- Resizable divider -->
-      </div>
-    }
-    <div class="pdf-canvas-wrapper">
-      <canvas id="pdf-canvas" class="pdf-canvas"></canvas>
-    </div>
-  </div>
-</div>
-```
-
-### CSS Flexbox Layout
-```css
-.pdf-frame {
-  display: flex;
-  flex-direction: row;        /* Side-by-side */
-  align-items: stretch;       /* Same height */
-  overflow: hidden;
-}
-
-.pdf-thumbnails {
-  flex-shrink: 0;             /* Fixed width */
-  width: 260px;               /* Dynamic via inline style */
-  border-right: none;         /* Seamless join with splitter */
-}
-
-.pdf-splitter {
-  width: 4px;
-  cursor: col-resize;
-  flex-shrink: 0;
-}
-
-.pdf-canvas-wrapper {
-  flex: 1;                    /* Fill remaining space */
-  overflow: auto;             /* Scrollable for zoom */
-  padding: 2rem;
-  text-align: center;
-}
-```
-
-### Resizable Splitter Workflow
-```
-1. User hovers splitter ? cursor: col-resize (?)
-2. Mouse down ? OnSplitterMouseDown(e)
-   - _isResizing = true
-   - Store start position (clientX) and width
-   - Add 'resizing' class to body (prevent text selection)
-   - Call pdfViewer.startResize()
-
-3. Mouse move (global) ? OnSplitterMouseMove(clientX)
-   - Calculate delta = clientX - startX
-   - newWidth = startWidth + delta
-   - Clamp to 150-400px range
-   - Update _thumbnailWidth
-   - StateHasChanged() for reactive UI
-
-4. Mouse up (global) ? OnSplitterMouseUp()
-   - _isResizing = false
-   - Remove 'resizing' class
-   - Save to localStorage("envelopeViewer_thumbnailWidth")
-```
-
-### Responsive Behavior
-- **Desktop (>768px)**: Flex row, side-by-side
-- **Mobile (?768px)**: Flex column, thumbnails on top
-- **Thumbnail toggle**: Controlled by `@if (_showThumbnails)` in Razor markup
-
----
-
-## Signature Buttons in EnvelopeViewer — Interactive Overlay System
-
-**Purpose:** Render clickable "Unterschreiben" (Sign) buttons on PDF canvas at signature field positions fetched from database.
-
-### Architecture
-
-**Blazor Component (`EnvelopeViewer.razor`):**
-```csharp
-IReadOnlyList<SignatureDto> _signatures = [];
-
-protected override async Task OnInitializedAsync() {
-    var signatures = await SignatureService.GetAsync(EnvelopeKey);
-    _signatures = signatures.Convert(UnitOfLength.Point);  // INCHES ? POINTS
-}
-
-async Task RenderSignatureButtonsAsync() {
-    await JSRuntime.InvokeVoidAsync("pdfViewer.renderSignatureButtons", 
-        _signatures, _currentPage, _dotNetRef);
-}
-
-[JSInvokable]
-public void OnSignatureButtonClick(int signatureId) {
-    Console.WriteLine($"Signature #{signatureId} signed");
-}
-```
-
-**JavaScript (`pdf-viewer.js`):**
-```javascript
-renderSignatureButtons(signatures, currentPageNum, dotNetRef) {
-    this.clearSignatureButtons();  // Remove old buttons
-    
-    const pageSignatures = signatures.filter(sig => sig.page === currentPageNum);
-    const signatureLayer = document.getElementById('pdf-signature-layer');
-    
-    pageSignatures.forEach(sig => {
-        // Convert POINTS to display pixels
-        const xPx = sig.x * this.scale;  // sig.x already in PDF POINTS
-        const yPx = sig.y * this.scale;
-        
-        const button = document.createElement('button');
-        button.className = 'signature-button';
-        button.style.left = `${xPx}px`;
-        button.style.top = `${yPx}px`;
-        button.style.width = '150px';
-        button.style.height = '60px';
-        
-        // German text + pen icon
-        button.innerHTML = `
-            <div>Unterschreiben</div>
-            <svg>...</svg>
-        `;
-        
-        button.addEventListener('click', () => {
-            this.dotNetReference.invokeMethodAsync('OnSignatureButtonClick', sig.id);
-        });
-        
-        signatureLayer.appendChild(button);
-        this.signatureButtons.push(button);
-    });
-}
-
-clearSignatureButtons() {
-    this.signatureButtons.forEach(btn => btn.parentNode?.removeChild(btn));
-    this.signatureButtons = [];
-}
-```
-
-**HTML Structure:**
-```html
-<div class="pdf-page-container">
-    <canvas id="pdf-canvas"></canvas>
-    <div id="pdf-text-layer"></div>
-    <div id="pdf-signature-layer"></div>  <!-- NEW -->
-</div>
-```
-
-**CSS (`envelope-viewer.css`):**
-```css
-.pdf-signature-layer {
-    position: absolute;
-    left: 0; top: 0; right: 0; bottom: 0;
-    overflow: visible;
-    pointer-events: none;  /* Pass clicks through to canvas */
-    z-index: 20;
-}
-
-.signature-button {
-    pointer-events: auto;  /* Re-enable for buttons */
-    position: absolute;
-    width: 150px; height: 60px;
-    background: linear-gradient(135deg, #4F46E5 0%, #4338CA 100%);
-    color: white;
-    border: none;
-    border-radius: 8px;
-    cursor: pointer;
-    /* Hover: scale(1.05), shadow, darker gradient */
-}
-```
-
-### Rendering Triggers
-
-1. **Initial Load:** After PDF renders (`OnAfterRenderAsync`)
-2. **Page Change:** `NextPage()`, `PreviousPage()`, `GoToPageFromThumbnail()`
-3. **Zoom Change:** `OnZoomChanged()` (re-calculates pixel positions)
-
-### Coordinate Conversion Flow
-
-```
-Database (INCHES)
-  ? SignatureService.GetAsync()
-SignatureDto.X/Y (INCHES)
-  ? .Convert(UnitOfLength.Point)
-SignatureDto.X/Y (PDF POINTS, × 72)
-  ? JavaScript
-Display Pixels (× this.scale)
-  ? CSS
-button.style.left/top
-```
-
-**Example Calculation:**
-- Database: `X = 1.5 inches, Y = 2.0 inches`
-- After conversion: `X = 108 points, Y = 144 points` (× 72)
-- At scale 1.5: `X = 162px, Y = 216px`
-- Button positioned at `left: 162px, top: 216px`
-
-### Button Design
-
-**Visual Spec:**
-- **Size:** 150px × 60px
-- **Background:** Purple gradient `#4F46E5` ? `#4338CA` (hover: darker)
-- **Text:** "Unterschreiben" (18px, bold, white)
-- **Icon:** Pen SVG (24px white)
-- **Effects:**
-  - Hover: `scale(1.05)` + shadow `0 4px 12px rgba(79, 70, 229, 0.4)`
-  - Active: `scale(0.98)`
-  - Focus: `2px solid #7e22ce` outline
-
-**Accessibility:**
-- `tabindex="0"` for keyboard navigation
-- Focus outline for keyboard users
-- Click handler with semantic button element
-
----
-
-## Signature Workflow in EnvelopeViewer — NEW Implementation (Session 13-14)
-
-**IMPORTANT: iText7 NOT USED in EnvelopeViewer**
-- **Reason:** GPL license incompatibility (requires source code sharing)
-- **Alternative:** Client-side signature overlay system (HTML + Canvas API)
-- **Export:** Signatures are visual overlays only, NOT stamped on PDF bytes
-- **Future:** Consider PSPDFKit or commercial PDF library for actual PDF stamping
-
-### Signature Data Structure
-
-**Captured Signature (`SignatureCaptureDto`):**
-```csharp
-// Model: EnvelopeGenerator.ReceiverUI/Models/SignatureCaptureDto.cs
-public sealed record SignatureCaptureDto
-{
-    public required string DataUrl { get; init; }      // base64 PNG: "data:image/png;base64,iVBORw0KG..."
-    public required string FullName { get; init; }     // Required: "Max Mustermann"
-    public string Position { get; init; } = string.Empty;  // Optional: "Geschäftsführer"
-    public required string Place { get; init; }        // Required: "Berlin"
-}
-
-// Usage in components:
-SignatureCaptureDto? _capturedSignature;
-
-// Initialization with object initializer (required properties):
-_capturedSignature = new SignatureCaptureDto
-{
-    DataUrl = signatureDataUrl,
-    FullName = _signerFullName.Trim(),
-    Position = _signerPosition.Trim(),
-    Place = _signaturePlace.Trim()
-};
-```
-
-**Applied Signature (HTML Overlay):**
-```html
-<div class="applied-signature" data-signature-id="42" style="left: 162px; top: 216px;">
-    <img src="data:image/png;base64,..." />  <!-- Signature image (max 70px height) -->
-    <div style="border-top: 1px solid #495057;"></div>  <!-- Separator line -->
-    <div style="font-size: 9px; color: #495057;">
-        <strong>Max Mustermann</strong>     <!-- Name (bold, #212529) -->
-        <br>Geschäftsführer                <!-- Position (optional) -->
-        <br>Berlin, 26.01.2025              <!-- Place, Date (dd.MM.yyyy) -->
-    </div>
-</div>
-```
-
-### Complete Workflow (Session 14 Update)
-
-**Step 1: Page Load & Automatic Popup**
-```csharp
-protected override async Task OnInitializedAsync() {
-    // ... load PDF and signatures ...
-    
-    // Open signature popup automatically
-    _activeSignatureTab = SignatureTabDraw;
-    _signaturePopupVisible = true;
-    _popupValidationMessage = null;
-}
-```
-
-**Features:**
-- Opens automatically on page load (no manual trigger needed)
-- Cannot be closed manually (no X button, ESC disabled, no outside-click)
-- User MUST create signature before viewing PDF
-
-**Step 2: Signature Creation Popup (DxPopup)**
-
-**Tabs:**
-1. **Zeichnen (Draw):** Canvas-based signature pad (`receiver-signature.js`)
-   - Touch-friendly: `touch-action: none`
-   - Line width: 2.5px, black (`#111`)
-   - Canvas: 560×180px, rounded corners, shadow
-
-2. **Text:** Type signature with font selection
-   - Fonts: Brush Script, Segoe Script, Lucida Handwriting, Comic Sans, Cursive
-   - Real-time preview on canvas
-
-3. **Bild (Image):** Upload PNG/JPG/WebP
-   - File input with preview
-   - Auto-resize to fit canvas
-
-**Required Fields:**
-- ? **Vor- und Nachname** (Full Name) — Red asterisk `*`
-- ? **Ort** (Place) — Red asterisk `*`
-- ? **Position** — Optional, gray "(optional)" label
-
-**Validation:**
-```csharp
-async Task SaveSignatureAsync() {
-    if (string.IsNullOrWhiteSpace(_signerFullName)) {
-        _popupValidationMessage = "Bitte geben Sie Vor- und Nachname ein.";
-        return;
-    }
-    if (string.IsNullOrWhiteSpace(_signaturePlace)) {
-        _popupValidationMessage = "Bitte geben Sie den Ort ein.";
-        return;
-    }
-    var signatureDataUrl = await GetActiveSignatureDataUrlAsync();
-    if (string.IsNullOrWhiteSpace(signatureDataUrl)) {
-        _popupValidationMessage = "Die Unterschrift ist erforderlich.";
-        return;
-    }
-    
-    // Save to session state
-    _capturedSignature = new(signatureDataUrl, _signerFullName.Trim(), 
-                            _signerPosition.Trim(), _signaturePlace.Trim());
-    _signaturePopupVisible = false;
-}
-```
-
-**Design (Modern & Clean):**
-- **Tabs:** Purple active state (`#4F46E5`), 3px bottom border
-- **Inputs:** 2px solid border (`#e9ecef`), 6px border-radius, consistent padding
-- **Canvas:** Light shadow (`0 1px 3px rgba(0,0,0,0.1)`), rounded corners
-- **Buttons:**
-  - **Erneuern:** Outline secondary with refresh icon
-  - **Speichern:** Purple gradient + checkmark icon + shadow
-- **Error:** Red left border (`4px solid #dc3545`), light red background (`#fee`)
-
-**Step 3: PDF Viewing with Signature Buttons**
-
-After popup closes:
-```csharp
-protected override async Task OnAfterRenderAsync(bool firstRender) {
-    // ... PDF initialization ...
-    
-    await RenderSignatureButtonsAsync();  // Render "Unterschreiben" buttons
-}
-```
-
-**Buttons appear at signature field positions:**
-- Purple gradient background
-- "Unterschreiben" text + pen icon
-- Hover: scale(1.05) + darker color
-- Positioned using PDF POINTS ? display pixels conversion
-
-**Step 4: Apply Signature (Click "Unterschreiben")**
-
-**C# Handler:**
-```csharp
-[JSInvokable]
-public async Task OnSignatureButtonClick(int signatureId) {
-    if (_capturedSignature == null) return;
-    
-    await JSRuntime.InvokeVoidAsync("pdfViewer.applySignature", 
-        signatureId, 
-        _capturedSignature.DataUrl,
-        _capturedSignature.FullName,
-        _capturedSignature.Position,
-        _capturedSignature.Place);
-}
-```
-
-**JavaScript Implementation:**
-```javascript
-async applySignature(signatureId, signatureDataUrl, fullName, position, place) {
-    // 1. Find and remove button
-    const button = this.signatureButtons.find(btn => 
-        btn.getAttribute('data-signature-id') == signatureId);
-    button.parentNode.removeChild(button);
-    
-    // 2. Create signature container (German standard format)
-    const signatureContainer = document.createElement('div');
-    signatureContainer.className = 'applied-signature';
-    signatureContainer.style.position = 'absolute';
-    signatureContainer.style.left = button.style.left;  // Same position as button
-    signatureContainer.style.top = button.style.top;
-    signatureContainer.style.width = '230px';
-    signatureContainer.style.backgroundColor = '#f8f9fa';
-    signatureContainer.style.border = '1px solid #dee2e6';
-    signatureContainer.style.borderRadius = '6px';
-    signatureContainer.style.padding = '12px';
-    
-    // 3. Add signature image
-    const img = document.createElement('img');
-    img.src = signatureDataUrl;
-    img.style.width = '100%';
-    img.style.maxHeight = '70px';
-    img.style.objectFit = 'contain';
-    
-    // 4. Add separator line (German standard)
-    const separator = document.createElement('div');
-    separator.style.borderTop = '1px solid #495057';
-    separator.style.marginTop = '6px';
-    separator.style.marginBottom = '8px';
-    
-    // 5. Add text information
-    const today = new Date();
-    const dateStr = today.toLocaleDateString('de-DE', { 
-        day: '2-digit', month: '2-digit', year: 'numeric' 
-    });  // "26.01.2025"
-    
-    const infoHtml = [
-        `<strong>${this.escapeHtml(fullName)}</strong>`,
-        position ? this.escapeHtml(position) : null,
-        `${this.escapeHtml(place)}, ${dateStr}`
-    ].filter(x => x).join('<br>');
-    
-    const info = document.createElement('div');
-    info.style.fontSize = '9px';
-    info.style.color = '#495057';
-    info.innerHTML = infoHtml;
-    
-    // 6. Assemble and add to layer
-    signatureContainer.appendChild(img);
-    signatureContainer.appendChild(separator);
-    signatureContainer.appendChild(info);
-    
-    document.getElementById('pdf-signature-layer').appendChild(signatureContainer);
-}
-```
-
-**German Standard Layout:**
-```
-???????????????????????????????
-?  [Signature Image]          ?  ? Base64 PNG, max 70px height
-?                             ?
-???????????????????????????????  ? 1px separator (#495057)
-?                             ?
-?  Max Mustermann (Bold)      ?  ? Name (font-weight: 600, #212529)
-?  Geschäftsführer            ?  ? Position (optional, normal weight)
-?  Berlin, 26.01.2025         ?  ? Place, Date (dd.MM.yyyy)
-?                             ?
-???????????????????????????????
-```
-
-**Step 5: Persistence & Re-rendering**
-
-- **Zoom/Page Change:** Applied signatures re-render automatically
-- **Session State:** `_capturedSignature` stored in Blazor component
-- **Limitation:** Lost on page refresh (no server-side storage)
-- **Future:** Export to PDF with actual byte stamping (requires non-GPL library)
-
-**Security:**
-```javascript
-escapeHtml(text) {
-    const div = document.createElement('div');
-    div.textContent = text;  // Browser auto-escapes
-    return div.innerHTML;
-}
-```
-Protects against XSS attacks from malicious input in Name/Position/Place fields.
-
----
-
-### Popup Design Specification
-
-**DxPopup Properties:**
-```razor
-<DxPopup @bind-Visible="_signaturePopupVisible"
-         HeaderText="Unterschrift erstellen"
-         Width="620px"
-         MaxWidth="95vw"
-         ShowFooter="true"       <!-- REQUIRED for buttons to appear -->
-         CloseOnOutsideClick="false"
-         ShowCloseButton="false"  <!-- No X button -->
-         CloseOnEscape="false">  <!-- ESC disabled -->
-```
-
-**Tab Design:**
-- **Active Tab:** `border-bottom: 3px solid #4F46E5; color: #4F46E5; font-weight: 600;`
-- **Inactive Tab:** `color: #6c757d;`
-- **Tab Bar:** `border-bottom: 2px solid #e9ecef;`
-
-**Input Styling:**
-```css
-input, select {
-    border: 2px solid #e9ecef;
-    border-radius: 6px;
-    padding: 0.625rem;
-}
-```
-
-**Canvas Styling:**
-```css
-canvas {
-    border: 2px solid #e9ecef;
-    border-radius: 8px;
-    background: white;
-    box-shadow: 0 1px 3px rgba(0,0,0,0.1);
-}
-```
-
-**Button Styling:**
-```css
-/* Erneuern (Renew) */
-.btn-outline-secondary {
-    border-radius: 6px;
-    padding: 0.625rem 1.25rem;
-    font-weight: 500;
-}
-
-/* Speichern (Save) */
-.btn-primary {
-    background: linear-gradient(135deg, #4F46E5 0%, #4338CA 100%);
-    border: none;
-    border-radius: 6px;
-    padding: 0.625rem 2rem;
-    font-weight: 600;
-    box-shadow: 0 2px 4px rgba(79, 70, 229, 0.3);
-}
-```
-
-**Future Enhancement Required:**
-- Replace iText7 with commercial PDF library (e.g., PSPDFKit, Syncfusion)
-- Or use server-side stamping with Azure PDF Services
-- Or accept GPL license and open-source the stamping code
-
----
-
-
-
-
-
-
-
-
-
-

EnvelopeGenerator.API/AuthScheme.cs

@@ -0,0 +1,17 @@
+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

@@ -5,7 +5,7 @@ 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.Documents.Queries;
+using EnvelopeGenerator.Application.Common.Notifications.RemoveSignature;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 using EnvelopeGenerator.Application.Histories.Queries;
 using EnvelopeGenerator.Domain.Constants;
@@ -13,7 +13,6 @@ using MediatR;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.API.Controllers;
@@ -62,8 +61,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.GetReceiverSignatureOfReceiver();
-        var uuid = User.GetEnvelopeUuidOfReceiver();
+        var signature = User.ReceiverSignature();
+        var uuid = User.EnvelopeUuid();
 
         var envelopeReceiver = await _mediator.ReadEnvelopeReceiverAsync(uuid, signature, cancel).ThrowIfNull(Exceptions.NotFound);
 
@@ -75,12 +74,24 @@ public class AnnotationController : ControllerBase
         else if (await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
             return Problem(statusCode: StatusCodes.Status423Locked);
 
-        var docSignedNotification = await _mediator
-            .ReadEnvelopeReceiverAsync(uuid, signature, cancel)
-            .ToDocSignedNotification(psPdfKitAnnotation)
-            ?? throw new NotFoundException("Envelope receiver is not found.");
+        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.");
 
-        await _mediator.PublishSafely(docSignedNotification, cancel);
+        try
+        {
+            await _mediator.Publish(docSignedNotification, cancel);
+        }
+        catch (Exception)
+        {
+            await _mediator.Publish(new RemoveSignatureNotification()
+            {
+                EnvelopeId = docSignedNotification.EnvelopeReceiver.EnvelopeId,
+                ReceiverId = docSignedNotification.EnvelopeReceiver.ReceiverId
+            }, cancel);
+            throw;
+        }
         await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
 
         return Ok();
@@ -95,9 +106,9 @@ public class AnnotationController : ControllerBase
     [Obsolete("Use MediatR")]
     public async Task<IActionResult> Reject([FromBody] string? reason = null)
     {
-        var signature = User.GetReceiverSignatureOfReceiver();
-        var uuid = User.GetEnvelopeUuidOfReceiver();
-        var mail = User.GetReceiverMailOfReceiver();
+        var signature = User.ReceiverSignature();
+        var uuid = User.EnvelopeUuid();
+        var mail = User.ReceiverMail();
 
         var envRcvRes = await _envelopeReceiverService.ReadByUuidSignatureAsync(uuid: uuid, signature: signature);
 

EnvelopeGenerator.API/Controllers/AuthController.cs

@@ -40,7 +40,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(Policy = AuthPolicy.SenderOrReceiver)]
+    [Authorize(AuthenticationSchemes = AuthScheme.Sender)]
     [HttpPost("logout")]
     public async Task<IActionResult> Logout()
     {
@@ -69,7 +69,7 @@ public partial class AuthController(IOptions<AuthTokenKeys> authTokenKeyOptions,
     [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
     [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
     [HttpGet("check")]
-    [Authorize]
+    [Authorize(AuthenticationSchemes = AuthScheme.Sender)]
     public IActionResult Check(string? role = null)
         => role is not null && !User.IsInRole(role)
             ? Unauthorized()

EnvelopeGenerator.API/Controllers/CacheController.cs

@@ -0,0 +1,84 @@
+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,4 +1,5 @@
 using EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
+using EnvelopeGenerator.Domain.Constants;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
@@ -13,7 +14,7 @@ namespace EnvelopeGenerator.API.Controllers;
 /// </remarks>
 [Route("api/[controller]")]
 [ApiController]
-[Authorize]
+[Authorize(Policy = AuthPolicy.SenderOrReceiver)]
 public class ConfigController(IOptionsMonitor<AnnotationParams> annotationParamsOptions) : ControllerBase
 {
     private readonly AnnotationParams _annotationParams = annotationParamsOptions.CurrentValue;

EnvelopeGenerator.API/Controllers/DocReceiverElementController.cs

@@ -15,14 +15,14 @@ namespace EnvelopeGenerator.API.Controllers;
 [Authorize(Policy = AuthPolicy.Receiver)]
 [ApiController]
 [Route("api/[controller]")]
-public class SignatureController : ControllerBase
+public class DocReceiverElementController : ControllerBase
 {
     private readonly IMediator _mediator;
 
     /// <summary>
-    /// Initializes a new instance of <see cref="SignatureController"/>.
+    /// Initializes a new instance of <see cref="DocReceiverElementController"/>.
     /// </summary>
-    public SignatureController(IMediator mediator)
+    public DocReceiverElementController(IMediator mediator)
     {
         _mediator = mediator;
     }
@@ -36,15 +36,15 @@ public class SignatureController : ControllerBase
     /// <returns></returns>
     [Authorize(Policy = AuthPolicy.Receiver)]
     [HttpGet("{envelopeKey}")]
-    public async Task<IActionResult> GetAnnotsOfReceiver(string envelopeKey, CancellationToken cancel)
+    public async Task<IActionResult> Get(string envelopeKey, CancellationToken cancel)
     {
-        int envelopeId = User.GetEnvelopeIdOfReceiver();
+        int envelopeId = User.EnvelopeId();
 
-        int receiverId = User.GetReceiverIdOfReceiver();
+        int receiverId = User.ReceiverId();
 
         var doc = await _mediator.Send(new ReadDocumentQuery() { EnvelopeId = envelopeId }, cancel);
 
-        if (doc.Elements is not IEnumerable<SignatureDto> docSignatures)
+        if (doc.Elements is not IEnumerable<DocReceiverElementDto> docSignatures)
             return NotFound("Document is empty.");
 
         var rcvSignatures = docSignatures.Where(s => s.ReceiverId == receiverId).ToList();

EnvelopeGenerator.API/Controllers/DocumentController.cs

@@ -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.GetEnvelopeIdOfReceiver();
+            var envelopeId = User.EnvelopeId();
             var receiverDoc = await mediator.Send(new ReadDocumentQuery { EnvelopeId = envelopeId }, cancel);
             return receiverDoc.ByteData is byte[] receiverDocByte
                 ? File(receiverDocByte, "application/octet-stream")
@@ -71,7 +71,7 @@ public class DocumentController(IMediator mediator, IAuthorizationService authSe
     [HttpGet("{envelopeKey}")]
     public async Task<IActionResult> GetDocumentOfReceiver(string envelopeKey, CancellationToken cancel)
     {
-        int envelopeId = User.GetEnvelopeIdOfReceiver();
+        int envelopeId = User.EnvelopeId();
 
         var senderDoc = await mediator.Send(new ReadDocumentQuery() { EnvelopeId = envelopeId }, cancel);
 

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]
+    [Authorize(AuthenticationSchemes = AuthScheme.Sender)]
     [HttpGet]
     public async Task<IActionResult> GetAsync([FromQuery] ReadEnvelopeQuery envelope)
     {

EnvelopeGenerator.API/Controllers/EnvelopeReceiverController.cs

@@ -200,7 +200,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()?.Signatures ?? Enumerable.Empty<Application.EnvelopeReceivers.Commands.Signature>())
+            foreach (var sign in request.Receivers.Where(r => r.EmailAddress == rcv.EmailAddress).FirstOrDefault()?.DocReceiverElements ?? Enumerable.Empty<Application.EnvelopeReceivers.Commands.DocReceiverElementCreateDto>())
             {
                 using SqlConnection conn = new(_cnnStr);
                 conn.Open();

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.GetReceiverMailOfReceiver();
+        var authReceiverMail = User.ReceiverMail();
         if (authReceiverMail is null)
         {
             _logger.LogError("EmailAddress claim is not found in envelope-receiver-read-only creation process. Create DTO is:\n {dto}", JsonConvert.SerializeObject(createDto));
             return Unauthorized();
         }
 
-        var envelopeId = User.GetEnvelopeIdOfReceiver();
+        var envelopeId = User.EnvelopeId();
 
         createDto.AddedWho = authReceiverMail;
         createDto.EnvelopeId = envelopeId;

EnvelopeGenerator.API/EnvelopeClaimTypes.cs

@@ -1,17 +0,0 @@
-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

@@ -34,6 +34,8 @@
     <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'" />

EnvelopeGenerator.API/Extensions/ReceiverClaimExtensions.cs

@@ -1,8 +1,6 @@
-using System.Linq;
+using DigitalData.Auth.Claims;
+using Microsoft.IdentityModel.JsonWebTokens;
 using System.Security.Claims;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
 
 namespace EnvelopeGenerator.API.Extensions;
 
@@ -11,12 +9,14 @@ namespace EnvelopeGenerator.API.Extensions;
 /// </summary>
 public static class ReceiverClaimExtensions
 {
-    private static readonly string[] EnvelopeIdClaimTypes = [EnvelopeClaimTypes.Id, "envelope_id", "EnvelopeId"];
-    private static readonly string[] ReceiverIdClaimTypes = ["receiver_id", "ReceiverId"];
-    private static readonly string[] EnvelopeUuidClaimTypes = [ClaimTypes.NameIdentifier, "envelope_uuid", "EnvelopeUuid"];
-    private static readonly string[] ReceiverSignatureClaimTypes = [ClaimTypes.Hash, "receiver_sig", "ReceiverSignature"];
-
-    private static string GetRequiredClaimOfReceiver(this ClaimsPrincipal user, string claimType)
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="user"></param>
+    /// <param name="claimType"></param>
+    /// <returns></returns>
+    /// <exception cref="InvalidOperationException"></exception>
+    private static string GetRequiredClaimValue(this ClaimsPrincipal user, string claimType)
     {
         var value = user.FindFirstValue(claimType);
         if (value is not null)
@@ -32,7 +32,7 @@ public static class ReceiverClaimExtensions
         throw new InvalidOperationException(message);
     }
 
-    private static string GetRequiredClaimOfReceiver(this ClaimsPrincipal user, params string[] claimTypes)
+    private static string GetRequiredClaimValue(this ClaimsPrincipal user, params string[] claimTypes)
     {
         foreach (var claimType in claimTypes.Where(t => !string.IsNullOrWhiteSpace(t)).Distinct())
         {
@@ -52,89 +52,45 @@ public static class ReceiverClaimExtensions
     /// <summary>
     /// Gets the authenticated envelope UUID from the claims.
     /// </summary>
-    public static string GetEnvelopeUuidOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(EnvelopeUuidClaimTypes);
+    public static string EnvelopeUuid(this ClaimsPrincipal user)
+        => user.GetRequiredClaimValue(EnvelopeClaimNames.EnvelopeUuid);
 
     /// <summary>
     /// Gets the authenticated receiver signature from the claims.
     /// </summary>
-    public static string GetReceiverSignatureOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ReceiverSignatureClaimTypes);
-
-    /// <summary>
-    /// Gets the authenticated receiver display name from the claims.
-    /// </summary>
-    public static string GetReceiverNameOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.Name);
+    public static string ReceiverSignature(this ClaimsPrincipal user)
+        => user.GetRequiredClaimValue(EnvelopeClaimNames.ReceiverSignature);
 
     /// <summary>
     /// Gets the authenticated receiver email address from the claims.
     /// </summary>
-    public static string 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);
+    public static string ReceiverMail(this ClaimsPrincipal user)
+        => user.GetRequiredClaimValue(JwtRegisteredClaimNames.Email);
 
     /// <summary>
     /// Gets the authenticated envelope identifier from the claims.
     /// </summary>
-    public static int GetEnvelopeIdOfReceiver(this ClaimsPrincipal user)
+    public static int EnvelopeId(this ClaimsPrincipal user)
     {
-        var envIdStr = user.GetRequiredClaimOfReceiver(EnvelopeIdClaimTypes);
-        if (!int.TryParse(envIdStr, out var envId))
-        {
-            throw new InvalidOperationException($"Claim '{"envelope_id"}' is not a valid integer.");
-        }
-
+        var envIdStr = user.GetRequiredClaimValue(EnvelopeClaimNames.EnvelopeId);
+        if (int.TryParse(envIdStr, out var envId))
             return envId;
+        else
+            throw new InvalidOperationException($"Claim '{EnvelopeClaimNames.EnvelopeId}' is not a valid integer.");
     }
 
     /// <summary>
-    /// 
+    /// Gets the authenticated receiver identifier from the claims.
     /// </summary>
     /// <param name="user"></param>
     /// <returns></returns>
     /// <exception cref="InvalidOperationException"></exception>
-    public static int GetReceiverIdOfReceiver(this ClaimsPrincipal user)
+    public static int ReceiverId(this ClaimsPrincipal user)
     {
-        var rcvIdStr = user.GetRequiredClaimOfReceiver(ReceiverIdClaimTypes);
-        if (!int.TryParse(rcvIdStr, out var rcvId))
-        {
-            throw new InvalidOperationException($"Claim '{"receiver_id"}' is not a valid integer.");
-        }
-
+        var rcvIdStr = user.GetRequiredClaimValue(EnvelopeClaimNames.ReceiverId);
+        if (int.TryParse(rcvIdStr, out var rcvId))
             return rcvId;
-    }
-
-    /// <summary>
-    /// Signs in an envelope receiver using cookie authentication and attaches envelope claims.
-    /// </summary>
-    /// <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 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);
+        else
+            throw new InvalidOperationException($"Claim '{EnvelopeClaimNames.ReceiverId}' is not a valid integer.");
     }
 }

EnvelopeGenerator.API/Options/CacheOptions.cs

@@ -0,0 +1,18 @@
+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,13 +13,15 @@ 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!");
@@ -42,7 +44,11 @@ try
 
     var deferredProvider = new DeferredServiceProvider();
 
-    builder.Services.AddControllers();
+    builder.Services.AddControllers()
+        .AddJsonOptions(options =>
+        {
+            options.JsonSerializerOptions.ReferenceHandler = System.Text.Json.Serialization.ReferenceHandler.IgnoreCycles;
+        });
     builder.Services.AddHttpClient();
     builder.Services.AddReverseProxy().LoadFromConfig(builder.Configuration.GetSection("ReverseProxy"));
 
@@ -129,15 +135,12 @@ try
 
     var authTokenKeys = config.GetOrDefault<AuthTokenKeys>();
 
-    // Scheme name used for per-envelope receiver JWT authentication.
-    const string EnvelopeReceiverScheme = "EnvelopeReceiverJwt";
-
     builder.Services.AddAuthentication(options =>
     {
         options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
         options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
     })
-        .AddJwtBearer(opt =>
+        .AddJwtBearer(AuthScheme.Sender, opt =>
         {
             opt.TokenValidationParameters = new TokenValidationParameters
             {
@@ -175,7 +178,7 @@ try
         // last path segment of the request URL.
         // This enables simultaneous authentication for multiple envelopes
         // within the same browser session.
-        .AddJwtBearer(EnvelopeReceiverScheme, opt =>
+        .AddJwtBearer(AuthScheme.Receiver, opt =>
         {
             opt.TokenValidationParameters = new TokenValidationParameters
             {
@@ -239,19 +242,17 @@ try
     });
 
     builder.Services.AddAuthorizationBuilder()
-        .AddPolicy(AuthPolicy.SenderOrReceiver, policy =>
-            policy.RequireRole(Role.Sender, Role.Receiver.Full))
-        .AddPolicy(AuthPolicy.Sender, policy =>
-            policy.RequireRole(Role.Sender))
-        // Per-envelope policy: uses the dedicated EnvelopeReceiverJwt scheme so it
-        // never conflicts with the default JwtBearer scheme.
-        .AddPolicy(AuthPolicy.Receiver, policy =>
-            policy
-                .AddAuthenticationSchemes(EnvelopeReceiverScheme)
+        .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.ReceiverTFA, policy => policy.RequireRole(Role.Receiver.TFA));
 
     // User manager
 #pragma warning disable CS0618 // Type or member is obsolete
@@ -265,6 +266,20 @@ 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

EnvelopeGenerator.API/Properties/launchSettings.json

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

EnvelopeGenerator.API/appsettings.json

@@ -174,6 +174,14 @@
     "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,21 +1,16 @@
 {
 "ReverseProxy": {
   "Routes": {
-    "receiver-ui-receiver": {
+    "receiver-ui-root": {
       "ClusterId": "receiver-ui",
-      "Order": 100,
+      "Order": 300,
       "Match": {
-        "Path": "/receiver/{**catch-all}",
+        "Path": "/",
         "Methods": [ "GET", "HEAD" ]
-      }
       },
-    "receiver-ui-login": {
-      "ClusterId": "receiver-ui",
-      "Order": 100,
-      "Match": {
-        "Path": "/login/{**catch-all}",
-        "Methods": [ "GET", "HEAD" ]
-      }
+      "Transforms": [
+        { "PathSet": "/index.html" }
+      ]
     },
     "receiver-ui-sender": {
       "ClusterId": "receiver-ui",
@@ -23,7 +18,10 @@
       "Match": {
         "Path": "/sender/{**catch-all}",
         "Methods": [ "GET", "HEAD" ]
-      }
+      },
+      "Transforms": [
+        { "PathSet": "/index.html" }
+      ]
     },
     "receiver-ui-envelope": {
       "ClusterId": "receiver-ui",
@@ -36,6 +34,17 @@
         { "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,

EnvelopeGenerator.Application/Common/Dto/ConfigDto.cs

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

EnvelopeGenerator.Application/Common/Dto/DocReceiverElementDto.cs

@@ -1,14 +1,12 @@
 using EnvelopeGenerator.Domain.Constants;
 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>
-[ApiExplorerSettings(IgnoreApi = true)]
-public class SignatureDto : ISignature
+public class DocReceiverElementDto : IDocReceiverElement
 {
     /// <summary>
     /// Gets or sets the unique identifier of the element.
@@ -104,4 +102,24 @@ public class SignatureDto : ISignature
     /// 
     /// </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/Dto/DocumentDto.cs

@@ -1,11 +1,8 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.Common.Dto;
+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>
@@ -31,5 +28,5 @@ public class DocumentDto
     /// <summary>
     /// Gets or sets the collection of elements associated with the document for receiver interactions, if any.
     /// </summary>
-    public IEnumerable<SignatureDto>? Elements { get; set; }
+    public IEnumerable<DocReceiverElementDto>? Elements { get; set; }
 }

EnvelopeGenerator.Application/Common/Dto/DocumentStatusDto.cs

@@ -1,12 +1,10 @@
 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,16 +1,14 @@
 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>
@@ -126,4 +124,9 @@ 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,13 +1,11 @@
 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,11 +1,8 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 
 /// <summary>
 /// 
 /// </summary>
-[ApiExplorerSettings(IgnoreApi = true)]
 public record EnvelopeReceiverSecretDto : EnvelopeReceiverDto
 {
     /// <summary>

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

@@ -1,5 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
 namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
@@ -8,7 +7,6 @@ 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,6 +1,4 @@
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Common.Dto.Receiver;
-using Microsoft.AspNetCore.Mvc;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 
 namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 
@@ -8,7 +6,6 @@ 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,11 +1,8 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
+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,11 +1,8 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.Common.Dto;
+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/Messaging/GtxMessagingResponse.cs

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

EnvelopeGenerator.Application/Common/Dto/PsPdfKitAnnotation.cs

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

EnvelopeGenerator.Application/Common/Dto/Signature.cs

@@ -0,0 +1,65 @@
+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/Extensions/AutoMapperAuditingExtensions.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using EnvelopeGenerator.Domain.Interfaces.Auditing;
+using System;
 
 namespace EnvelopeGenerator.Application.Common.Extensions;
 
@@ -21,4 +22,21 @@ 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<Signature, int>
+public interface IDocumentReceiverElementRepository : ICRUDRepository<DocReceiverElement, 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<SignatureDto, Signature, int>
+public interface IDocumentReceiverElementService : IBasicCRUDService<DocReceiverElementDto, DocReceiverElement, int>
 {
 }

EnvelopeGenerator.Application/Common/MappingProfile.cs

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

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

@@ -1,88 +1,37 @@
 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>
-/// <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
+[Obsolete("This notification is deprecated. Use Signature.Commands.SignCommand instead.")]
+public record DocSignedNotification : 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 => Receiver?.EmailAddress
+    public string EmailAddress => EnvelopeReceiver.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,5 +1,6 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Application.Common.Dto;
 using MediatR;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
@@ -7,6 +8,7 @@ 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,4 +1,5 @@
 using EnvelopeGenerator.Application.DocStatus.Commands;
+using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 using System.Text.Json;
@@ -8,6 +9,7 @@ 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 = "{}";
@@ -29,10 +31,11 @@ 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.EnvelopeId,
-        ReceiverId = notification.ReceiverId,
+        EnvelopeId = notification.EnvelopeReceiver.EnvelopeId,
+        ReceiverId = notification.EnvelopeReceiver.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.Receiver is null)
+        if (notification.EnvelopeReceiver.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.EnvelopeId,
-            UserReference = notification.Receiver.EmailAddress,
+            EnvelopeId = notification.EnvelopeReceiver.EnvelopeId,
+            UserReference = notification.EnvelopeReceiver.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.ReceiverId;
+        emailOut.ReferenceId = notification.EnvelopeReceiver.ReceiverId;
     }
 
     /// <summary>
@@ -42,11 +42,11 @@ public class SendSignedMailHandler : SendMailHandler<DocSignedNotification>
     {
         var placeHolders = new Dictionary<string, string>()
         {
-            { "[NAME_RECEIVER]", notification.Name ?? string.Empty },
-            { "[DOCUMENT_TITLE]", notification.Envelope?.Title ?? string.Empty },
+            { "[NAME_RECEIVER]", notification.EnvelopeReceiver.Name ?? string.Empty },
+            { "[DOCUMENT_TITLE]", notification.EnvelopeReceiver.Envelope?.Title ?? string.Empty },
         };
 
-        if (notification.Envelope.IsReadAndConfirm())
+        if (notification.EnvelopeReceiver.Envelope.IsReadAndConfirm())
         {
             placeHolders["[SIGNATURE_TYPE]"] = "Lesen und bestätigen";
             placeHolders["[DOCUMENT_PROCESS]"] = string.Empty;

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -7,6 +7,9 @@ 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;
 
@@ -56,6 +59,22 @@ 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

@@ -0,0 +1,50 @@
+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

@@ -0,0 +1,50 @@
+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

@@ -0,0 +1,54 @@
+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

@@ -0,0 +1,47 @@
+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

@@ -0,0 +1,70 @@
+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

@@ -0,0 +1,122 @@
+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

@@ -0,0 +1,78 @@
+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

@@ -0,0 +1,66 @@
+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/EnvelopeGenerator.Application.csproj

@@ -21,7 +21,6 @@
 		<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" />

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 Signature([Required] double X, [Required] double Y, [Required] int Page);
+public record DocReceiverElementCreateDto([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<Signature> Signatures { get; init; } = new();
+    public List<DocReceiverElementCreateDto> DocReceiverElements { get; init; } = new();
 
     /// <summary>
     /// Der Name, mit dem der Empfänger angesprochen werden soll.

EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs

@@ -14,6 +14,16 @@ 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>
@@ -22,7 +32,7 @@ public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest<IEnumerable<Envelo
     /// <summary>
     /// Optionaler Benutzerfilter; wenn gesetzt, werden nur Umschläge des Benutzers geladen.
     /// </summary>
-    public int? UserId { get; init; }
+    internal int? UserId { get; init; }
 
     /// <summary>
     /// Setzt den Benutzerkontext für die Abfrage.
@@ -132,8 +142,14 @@ 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.Documents)
+            .Include(e => e.EnvelopeReceivers).ThenInclude(er => er.Receiver)
             .ToListAsync(cancel);
 
         return _mapper.Map<IEnumerable<EnvelopeDto>>(envelopes);

EnvelopeGenerator.Application/Receivers/Commands/CreateReceiverCommand.cs

@@ -3,7 +3,6 @@ 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;
@@ -14,7 +13,6 @@ 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,11 +1,8 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.Receivers.Commands;
+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,4 +397,412 @@ 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,4 +477,178 @@
   <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,4 +477,178 @@
   <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,4 +477,178 @@
   <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, SignatureDto, Signature, int>, IDocumentReceiverElementService
+public class DocumentReceiverElementService : BasicCRUDService<IDocumentReceiverElementRepository, DocReceiverElementDto, DocReceiverElement, int>, IDocumentReceiverElementService
 {
     /// <summary>
     /// 

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -164,7 +164,7 @@ Public Class frmFinalizePDF
                     Return
                 End If
 
-                Dim sigRepo = scope.ServiceProvider.Repository(Of Signature)()
+                Dim sigRepo = scope.ServiceProvider.Repository(Of DocReceiverElement)()
                 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 Signature)()
+                Dim sigRepo = scope.ServiceProvider.Repository(Of DocReceiverElement)()
                 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 Signature)) As Byte()
+        Public Function BurnElementAnnotsToPDF(pSourceBuffer As Byte(), elements As List(Of DocReceiverElement)) 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 Signature
-        Return New Signature() With {
+    Private Function ToElement(pRow As DataRow) As DocReceiverElement
+        Return New DocReceiverElement() 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 Signature)
+    Private Function ToElements(pTable As DataTable) As List(Of DocReceiverElement)
         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 Signature)
+    Public Function List(pDocumentId As Integer) As List(Of DocReceiverElement)
         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 Signature)
+    Public Function List(pDocumentId As Integer, pReceiverId As Integer) As List(Of DocReceiverElement)
         Try
             Dim oReceiverConstraint = ""
             If pReceiverId > 0 Then
@@ -111,7 +111,7 @@ Public Class ElementModel
         End Try
     End Function
 
-    Public Function Insert(pElement As Signature) As Boolean
+    Public Function Insert(pElement As DocReceiverElement) 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 Signature) As Boolean
+    Public Function Update(pElement As DocReceiverElement) 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 Signature) As Integer
+    Private Function GetElementId(pElement As DocReceiverElement) 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 Signature) As Boolean
+    Public Function DeleteElement(pElement As DocReceiverElement) As Boolean
         Try
             Dim oSql = $"DELETE FROM TBSIG_DOCUMENT_RECEIVER_ELEMENT WHERE GUID = {pElement.Id}"
             Return Database.ExecuteNonQuery(oSql)

EnvelopeGenerator.Domain/Constants/EnvelopeStatus.cs

@@ -1,8 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace EnvelopeGenerator.Domain.Constants
 {
-    // http://wiki.dd/xwiki13/bin/view/Anwendungen/Produkt-Handbuch/Sonstiges/SignFlow/Envelope%20Status/
+    // 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/
     public enum EnvelopeStatus
     {
         Invalid = 0,
@@ -49,5 +51,28 @@ 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/Entities/DocReceiverElement.cs

@@ -11,9 +11,9 @@ using System.Collections.Generic;
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
-    public class Signature : ISignature, IHasReceiver, IHasAddedWhen, IUpdateAuditable
+    public class DocReceiverElement : IDocReceiverElement, IHasReceiver, IHasAddedWhen, IUpdateAuditable
     {
-        public Signature()
+        public DocReceiverElement()
         {
             // TODO: * Check the Form App and remove the default value
 #if NETFRAMEWORK
@@ -126,5 +126,33 @@ 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/Entities/Document.cs

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

EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs

@@ -76,7 +76,7 @@ namespace EnvelopeGenerator.Domain.Entities
             ChangedWho { get; set; }
 
         [ForeignKey("ElementId")]
-        public virtual Signature
+        public virtual DocReceiverElement
 #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/Interfaces/IDocReceiverElement.cs

@@ -1,6 +1,6 @@
 namespace EnvelopeGenerator.Domain.Interfaces
 {
-    public interface ISignature
+    public interface IDocReceiverElement
     {
         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 Signature)
+    Public Property Elements As New List(Of DocReceiverElement)
 
     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 Signature
+    Private Function GetElementByPosition(pAnnotation As AnnotationStickyNote, pPage As Integer, pReceiverId As Integer) As DocReceiverElement
         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 Signature
+    Private Function GetElementByGuid(pGuid As Integer) As DocReceiverElement
         Dim oElement = Elements.Where(Function(e) pGuid = e.Id).SingleOrDefault()
         Return oElement
     End Function
 
-    Public Function GetElement(pAnnotation As AnnotationStickyNote) As Signature
+    Public Function GetElement(pAnnotation As AnnotationStickyNote) As DocReceiverElement
         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 Signature() With {
+            Elements.Add(New DocReceiverElement() 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 Signature)
+    Public Function ClearElements(pPage As Integer, pReceiverId As Integer) As IEnumerable(Of DocReceiverElement)
         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 Signature) As Boolean
+    Public Function SaveElement(pElement As DocReceiverElement) 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 Signature) As Boolean
+    Public Function DeleteElement(pElement As DocReceiverElement) As Boolean
         Try
             ' Element aus Datenbank löschen
             If ElementModel.DeleteElement(pElement) Then
-                Dim oElement = New List(Of Signature)() From {pElement}
+                Dim oElement = New List(Of DocReceiverElement)() 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 Signature, pReceiverId As Integer)
+    Private Sub LoadAnnotation(pElement As DocReceiverElement, 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<Signature>();
+            services.AddSQLExecutor<DocReceiverElement>();
             services.AddSQLExecutor<DocumentStatus>();
 
             SetDapperTypeMap<Envelope>();
             SetDapperTypeMap<User>();
             SetDapperTypeMap<Receiver>();
             SetDapperTypeMap<Document>();
-            SetDapperTypeMap<Signature>();
+            SetDapperTypeMap<DocReceiverElement>();
             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<Signature> DocumentReceiverElements { get; set; }
+    public DbSet<DocReceiverElement> DocumentReceiverElements { get; set; }
 
     public DbSet<ElementAnnotation> DocumentReceiverElementAnnotations { get; set; }
 
@@ -154,7 +154,7 @@ public abstract class EGDbContextBase : DbContext
         #endregion EnvelopeDocument
 
         #region DocumentReceiverElement
-        modelBuilder.Entity<Signature>()
+        modelBuilder.Entity<DocReceiverElement>()
             .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<Signature>()
+        modelBuilder.Entity<DocReceiverElement>()
             .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<Signature>();
+        AddTrigger<DocReceiverElement>();
         AddTrigger<DocumentStatus>();
         AddTrigger<EmailTemplate>();
         AddTrigger<Envelope>();

EnvelopeGenerator.Infrastructure/EGDbContextFactory.cs

@@ -1,48 +0,0 @@
-#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<Signature, int, EGDbContext>, IDocumentReceiverElementRepository
+public class DocumentReceiverElementRepository : CRUDRepository<DocReceiverElement, 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 : ISignature
+            where TSignature : IDocReceiverElement
         {
             foreach (var signature in signatures)
                 Page(signature.Page, page =>

EnvelopeGenerator.ReceiverUI/App.razor

@@ -1,4 +1,6 @@
-<Router AppAssembly="@typeof(Program).Assembly">
+@using System.Globalization
+
+<Router AppAssembly="@typeof(Program).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
     </Found>

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.csproj

@@ -14,21 +14,23 @@
 	<PackageIcon>Assets\icon.ico</PackageIcon>
 	<PackageTags>digital data envelope generator web</PackageTags>
 	<Description>EnvelopeGenerator.ReceiverUI is a Blazor WebAssembly application developed to manage signing processes. It uses Entity Framework Core (EF Core) for database operations. The user interface for signing processes is developed with Razor View Engine (.cshtml files) and JavaScript under wwwroot, integrated with PSPDFKit. This integration allows users to view and sign documents seamlessly.</Description>
-	<Version>1.4.1</Version>
+	<Version>1.4.2</Version>
 	<!-- NuGet package version -->
-	<AssemblyVersion>1.4.1.0</AssemblyVersion>
+	<AssemblyVersion>1.4.2.0</AssemblyVersion>
 	<!-- Assembly version for API compatibility -->
-	<FileVersion>1.4.1.0</FileVersion>
+	<FileVersion>1.4.2.0</FileVersion>
 	<!-- Windows file version -->
 	<Copyright>Copyright © 2026 Digital Data GmbH. All rights reserved.</Copyright>
 	  
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DevExpress.Blazor.PdfViewer" Version="25.2.3" />
-    <PackageReference Include="DevExpress.Blazor.Reporting.JSBasedControls" Version="25.2.3" />
-    <PackageReference Include="DevExpress.Blazor.Reporting.Viewer" Version="25.2.3" />
-    <PackageReference Include="DevExpress.Drawing.Skia" Version="25.2.3" />
+    <PackageReference Include="DevExpress.Blazor.PdfViewer" Version="25.2.8" />
+    <PackageReference Include="DevExpress.Blazor.Reporting.JSBasedControls" Version="25.2.8" />
+    <PackageReference Include="DevExpress.Blazor.Reporting.Viewer" Version="25.2.8" />
+    <PackageReference Include="DevExpress.Drawing.Skia" Version="25.2.8" />
     <PackageReference Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="8.3.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.28" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.11" />
     <PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.119.1" />
     <PackageReference Include="SkiaSharp.Views.Blazor" Version="3.119.1" />
     <NativeFileReference Include="$(HarfBuzzSharpStaticLibraryPath)\2.0.23\*.a" />
@@ -40,6 +42,9 @@
   <ItemGroup>
     <Folder Include="Properties\PublishProfiles\" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
+  </ItemGroup>
   <ItemGroup>
     <Content Update="wwwroot\docs\privacy-policy.en-US.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

EnvelopeGenerator.ReceiverUI/Models/AnnotationDto.cs

@@ -1,32 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Models;
-
-/// <summary>
-/// Represents a pre-assigned signature annotation position on a specific page.
-/// <br/><br/>
-/// <b>Coordinate unit (X, Y):</b> Inches (GdPicture14 native unit),
-/// origin at the <b>top-left</b> corner of the page, both axes increase downward/rightward.
-/// <br/><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 (1 inch = 72 points).
-/// Convert: <c>xPt = xInches * 72.0</c>
-/// <br/>
-/// <b>Y-axis for PDF (bottom-left origin):</b> Flip required for iText7.
-/// Convert: <c>yPt = (pageHeightInches - yInches - elemHeightInches) * 72.0</c>
-/// </summary>
-[Obsolete("Use SignatureDto with SignatureService.")]
-public record AnnotationDto
-{
-    /// <summary>Unique identifier of the annotation.</summary>
-    public long Id { get; init; }
-
-    /// <summary>1-based page number within the document.</summary>
-    public int Page { get; init; }
-
-    /// <summary>Horizontal position in INCHES from the left edge of the page.</summary>
-    public double X { get; init; }
-
-    /// <summary>Vertical position in INCHES from the top edge of the page.</summary>
-    public double Y { get; init; }
-}

EnvelopeGenerator.ReceiverUI/Models/EnvelopeDto.cs

@@ -0,0 +1,39 @@
+using System.Text.Json.Serialization;
+
+namespace EnvelopeGenerator.ReceiverUI.Models;
+
+public class EnvelopeDto
+{
+    [JsonPropertyName("id")]
+    public int Id { get; set; }
+
+    [JsonPropertyName("uuid")]
+    public string? Uuid { get; set; }
+
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
+
+    [JsonPropertyName("status")]
+    public int Status { get; set; }
+
+    [JsonPropertyName("docResult")]
+    public byte[]? DocResult { get; set; }
+
+    [JsonPropertyName("envelopeReceivers")]
+    public List<EnvelopeReceiverSimpleDto> EnvelopeReceivers { get; set; } = new();
+}
+
+/// <summary>
+/// Simplified receiver model for envelope list display
+/// </summary>
+public class EnvelopeReceiverSimpleDto
+{
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+
+    [JsonPropertyName("email")]
+    public string? Email { get; set; }
+
+    [JsonPropertyName("signed")]
+    public bool Signed { get; set; }
+}

EnvelopeGenerator.ReceiverUI/Options/ApiOptions.cs

@@ -6,5 +6,5 @@ public class ApiOptions
 
     public string BaseUrl { get; set; } = string.Empty;
 
-    public bool ForceToUseFakeDocument { get; set; } = false;
+    public bool UsePredefinedReports { get; set; } = false;
 }

EnvelopeGenerator.ReceiverUI/Pages/EnvelopeReceiverPage.razor

@@ -11,10 +11,12 @@
 @inject IOptions<ApiOptions> AppOptions
 @inject IOptions<PdfViewerOptions> PdfViewerOptions
 @inject IJSRuntime JSRuntime
-@inject SignatureService SignatureService
+@inject DocReceiverElementService SignatureService
+@inject SignatureCacheService SignatureCacheService
 @inject EnvelopeGenerator.ReceiverUI.Services.AuthService AuthService
 @inject EnvelopeGenerator.ReceiverUI.Services.EnvelopeReceiverService EnvelopeReceiverService
 @inject AppVersionService AppVersion
+@inject ILogger<EnvelopeReceiverPage> logger
 @implements IAsyncDisposable
 
 <link href="_content/DevExpress.Blazor.Themes/blazing-berry.bs5.min.css" rel="stylesheet" />
@@ -217,6 +219,20 @@
                         <div class="pdf-toolbar__divider"></div>
 
                         @if (_totalSignatures > 0) {
+                            <div class="pdf-toolbar__section">
+                                <button class="pdf-toolbar__btn pdf-toolbar__btn--signature-change @(_capturedSignature is not null ? "pdf-toolbar__btn--signature-change-active" : "")" 
+                                        disabled="@(_signedSignatures > 0)"
+                                        @onclick="HandleSignatureChangeClick" 
+                                        title="@GetSignatureButtonTitle()">
+                                    <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16">
+                                        <path d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"/>
+                                    </svg>
+                                    <span class="pdf-toolbar__btn-text">Unterschrift</span>
+                                </button>
+                            </div>
+
+                            <div class="pdf-toolbar__divider"></div>
+
                             <div class="pdf-toolbar__section pdf-toolbar__signature-nav">
                                 <button class="pdf-toolbar__btn pdf-toolbar__btn--signature-nav" 
                                         @onclick="GoToPreviousSignature" 
@@ -495,7 +511,7 @@ int _totalPages = 0;
 int _currentZoom = 150;
 bool _showThumbnails = true;
 bool _isLoggingOut = false;
-DotNetObjectReference<EnvelopeViewer>? _dotNetRef;
+DotNetObjectReference<EnvelopeReceiverPage>? _dotNetRef;
 IReadOnlyList<SignatureDto> _signatures = [];
 EnvelopeReceiverDto? _envelopeReceiver;
 
@@ -503,7 +519,7 @@ EnvelopeReceiverDto? _envelopeReceiver;
 int _totalSignatures = 0;
 int _signedSignatures = 0;
 int _unsignedSignatures = 0;
-int _currentSignatureIndex = 0;  // Şu an hangi imzada (1-based)
+int _currentSignatureIndex = 0;  // Current signature index (1-based)
 
 // Signature state
 SignatureCaptureDto? _capturedSignature;
@@ -529,7 +545,7 @@ const int MaxThumbnailWidth = 400;
         _isLoggingOut = true;
         await InvokeAsync(StateHasChanged);
         await AuthService.LogoutEnvelopeReceiverAsync(EnvelopeKey);
-        Navigation.NavigateTo($"/login/{Uri.EscapeDataString(EnvelopeKey)}", forceLoad: true);
+        Navigation.NavigateTo($"/envelope/login/{Uri.EscapeDataString(EnvelopeKey)}", forceLoad: true);
     }
 
     protected override async Task OnInitializedAsync() {
@@ -542,34 +558,66 @@ const int MaxThumbnailWidth = 400;
         // Check authentication
         var hasAccess = await AuthService.CheckEnvelopeAccessAsync(EnvelopeKey);
         if (!hasAccess) {
-            Navigation.NavigateTo($"/login/{Uri.EscapeDataString(EnvelopeKey)}");
+            Navigation.NavigateTo($"/envelope/login/{Uri.EscapeDataString(EnvelopeKey)}");
             return;
         }
 
         try {
-            var (pdfBytes, statusCode) = await DocumentService.GetDocumentAsync(EnvelopeKey);
+            var pdfBytes = await DocumentService.GetDocumentAsync(EnvelopeKey);
 
             if (pdfBytes is { Length: > 0 }) {
                 var base64 = Convert.ToBase64String(pdfBytes);
                 _pdfDataUrl = $"data:application/pdf;base64,{base64}";
             } else {
-                _errorMessage = $"Dokument konnte nicht geladen werden. HTTP Status: {statusCode}";
+                _errorMessage = "Dokument konnte nicht geladen werden: Keine Daten empfangen.";
             }
 
             var signatures = await SignatureService.GetAsync(EnvelopeKey);
             _signatures = signatures.Convert(UnitOfLength.Point);
 
             _envelopeReceiver = await EnvelopeReceiverService.GetAsync(EnvelopeKey);
+            if (_envelopeReceiver is null)
+            {
+                logger.LogWarning("Envelope receiver data is null for envelope {EnvelopeKey}", EnvelopeKey);
+            }
 
             await JSRuntime.InvokeVoidAsync("console.log", "Loaded signatures:", _signatures);
 
-            // Open signature popup on page load
+            // Try to load cached signature first
+            try
+            {
+                var cachedSignature = await SignatureCacheService.GetSignatureAsync(EnvelopeKey);
+                if (cachedSignature is not null)
+                {
+                    _capturedSignature = cachedSignature;
+                    _signerFullName = cachedSignature.FullName;
+                    _signerPosition = cachedSignature.Position;
+                    _signaturePlace = cachedSignature.Place;
+                    _signaturePopupVisible = false;
+                    
+                    logger.LogInformation("Cached signature loaded for envelope {EnvelopeKey}", EnvelopeKey);
+                }
+                else
+                {
                     _activeSignatureTab = SignatureTabDraw;
                     _signaturePopupVisible = true;
                     _popupValidationMessage = null;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.LogWarning(ex, "Failed to load cached signature, showing popup");
+                _activeSignatureTab = SignatureTabDraw;
+                _signaturePopupVisible = true;
+                _popupValidationMessage = null;
+            }
 
+        } catch (HttpRequestException ex) {
+            _errorMessage = $"Dokument konnte nicht geladen werden: {ex.Message}";
+            logger.LogError(ex, "Failed to load document for envelope {EnvelopeKey}", EnvelopeKey);
         } catch (Exception ex) {
             _errorMessage = $"Fehler: {ex.Message}";
+            logger.LogError(ex, "Unexpected error during initialization for envelope {EnvelopeKey}", EnvelopeKey);
         }
 
         _isLoading = false;
@@ -777,7 +825,7 @@ const int MaxThumbnailWidth = 400;
             _totalSignatures = state.Total;
             _signedSignatures = state.Signed;
             _unsignedSignatures = state.Unsigned;
-            _currentSignatureIndex = state.CurrentIndex;  // Şu an hangi imzada
+            _currentSignatureIndex = state.CurrentIndex;  // Current signature
             await InvokeAsync(StateHasChanged);
         } catch {
             // Ignore errors during counter update
@@ -799,15 +847,52 @@ const int MaxThumbnailWidth = 400;
 
     record SignatureNavState(int Total, int Signed, int Unsigned, int CurrentIndex, bool CanGoPrev, bool CanGoNext);
 
+    string GetSignatureButtonTitle()
+    {
+        if (_signedSignatures > 0)
+            return "Unterschrift ist gesperrt – bitte Seite neu laden, um zu ändern";
+        
+        return _capturedSignature is not null 
+            ? "Unterschrift ändern" 
+            : "Unterschrift erstellen";
+    }
+
+    void HandleSignatureChangeClick()
+    {
+        // If any signature is applied, button is disabled - this won't be called
+        // But just in case, do nothing
+        if (_signedSignatures > 0)
+            return;
+        
+        // No signatures applied - open popup normally
+        OpenSignaturePopup();
+    }
+
     // Signature popup methods
     void OpenSignaturePopup() {
+        // Open popup with current signature (edit mode)
         _activeSignatureTab = SignatureTabDraw;
         _signaturePopupVisible = true;
         _popupValidationMessage = null;
+        
+        // Load current signature info into form fields
+        if (_capturedSignature is not null)
+        {
+            _signerFullName = _capturedSignature.FullName;
+            _signerPosition = _capturedSignature.Position;
+            _signaturePlace = _capturedSignature.Place;
+        }
     }
 
     async Task OnPopupShownAsync() {
         await InitializeActiveSignatureTabAsync();
+        
+        // If there's an existing signature and we're on draw tab, load it to canvas
+        if (_capturedSignature is not null && _activeSignatureTab == SignatureTabDraw)
+        {
+            await Task.Delay(100); // Wait for canvas to be ready
+            await JSRuntime.InvokeVoidAsync("receiverSignature.loadExistingSignature", DrawCanvasId, _capturedSignature.DataUrl);
+        }
     }
 
     async Task SetSignatureTabAsync(string tab) {
@@ -881,6 +966,22 @@ const int MaxThumbnailWidth = 400;
         };
         _signaturePopupVisible = false;
         
+        // Save to cache (fire-and-forget, ignore errors)
+        if (!string.IsNullOrWhiteSpace(EnvelopeKey))
+        {
+            _ = Task.Run(async () =>
+            {
+                try
+                {
+                    await SignatureCacheService.SaveSignatureAsync(EnvelopeKey, _capturedSignature);
+                }
+                catch
+                {
+                    // Ignore cache errors
+                }
+            });
+        }
+        
         await InvokeAsync(StateHasChanged);
         Console.WriteLine($"Signature saved: {_signerFullName}, {_signaturePlace}");
     }

EnvelopeGenerator.ReceiverUI/Pages/EnvelopeReceiverPage_DxPdfViewer.razor

@@ -0,0 +1,112 @@
+@page "/envelope/DxPdfViewer"
+@using System.IO
+@using DevExpress.Blazor
+@using System.Reflection
+
+<link href="_content/DevExpress.Blazor.Themes/blazing-berry.bs5.min.css" rel="stylesheet" />
+
+<style>
+    .custom-drop-zone {
+        padding: 0 !important;
+        border-style: dashed;
+        border-width: 2px !important;
+        height: 230px;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        background-color: rgba(183, 183, 183, 0.1);
+    }
+
+        .custom-drop-zone.custom-drop-zone-hover {
+            border-style: solid;
+        }
+
+        .custom-drop-zone svg {
+            width: 42px;
+            height: 42px;
+        }
+
+        .custom-drop-zone > *:not(#overviewDemoSelectButton) {
+            pointer-events: none;
+        }
+
+    .pdf-viewer {
+        height: 800px !important;
+        min-height: 800px !important;
+    }
+
+    .pdf-viewer .dxbrv-surface-wrapper,
+    .pdf-viewer .dxbrv-document-surface {
+        height: 100% !important;
+        min-height: 750px !important;
+    }
+
+    .pdf-viewer .dxbrv-report-preview-content {
+        width: auto !important;
+        height: auto !important;
+        min-width: 200px !important;
+        min-height: 200px !important;
+    }
+</style>
+
+<div id="overviewDemoDropZone" class="card custom-drop-zone rounded-3 w-100 m-0">
+    <span class="drop-file-icon mb-3"></span>
+    <span class="drop-file-label">Drag and Drop File Here</span><span class="m-1">or</span>
+    <DxButton Id="overviewDemoSelectButton"
+              CssClass="m-1"
+              RenderStyle="ButtonRenderStyle.Primary"
+              Text="Select File" />
+</div>
+<DxFileInput @ref="fileInput"
+             AcceptedFileTypes="@ALLOWED_FILE_TYPES"
+             AllowedFileExtensions="@ALLOWED_FILE_TYPES"
+             CssClass="w-100"
+             ExternalDropZoneCssSelector="#overviewDemoDropZone"
+             ExternalDropZoneDragOverCssClass="custom-drop-zone-hover"
+             ExternalSelectButtonCssSelector="#overviewDemoSelectButton"
+             FilesUploading="OnFilesUploading"
+             MaxFileSize="2000000">
+</DxFileInput>
+
+@if (DocumentContent != null && DocumentContent.Length > 0)
+{
+    <div class="alert alert-success mt-3">
+        PDF loaded: @DocumentContent.Length bytes
+    </div>
+    <DxPdfViewer CssClass="w-100 pdf-viewer" DocumentContent="@DocumentContent" />
+}
+else
+{
+    <div class="alert alert-info mt-3">
+        Please upload a PDF file to view it.
+    </div>
+}
+
+@code {
+    readonly List<string> ALLOWED_FILE_TYPES = new List<string> { ".pdf" };
+    DxFileInput fileInput;
+    byte[] DocumentContent { get; set; }
+    protected override void OnInitialized()
+    {
+        Assembly assembly = Assembly.GetExecutingAssembly();
+        Stream stream = assembly.GetManifestResourceStream("EnvelopeGenerator.ReceiverUI.Resources.Invoice.pdf");
+        if (stream != null)
+        {
+            using (stream)
+            using (var binaryReader = new BinaryReader(stream))
+                DocumentContent = binaryReader.ReadBytes((int)stream.Length);
+        }
+    }
+    protected async Task OnFilesUploading(FilesUploadingEventArgs args)
+    {
+        using (MemoryStream stream = new MemoryStream())
+        {
+            IFileInputSelectedFile file = args.Files[0];
+            await file.OpenReadStream(file.Size).CopyToAsync(stream);
+            DocumentContent = stream.ToArray();
+            await InvokeAsync(StateHasChanged);
+        }
+    }
+}
+

EnvelopeGenerator.ReceiverUI/Pages/EnvelopeReceiverPage_DxReportViewer.razor

@@ -0,0 +1,49 @@
+@page "/envelope/{EnvelopeKey}/DxReportViewer"
+@using XtraReport = DevExpress.XtraReports.UI.XtraReport
+@using DevExpress.Blazor.Reporting
+@using Microsoft.Extensions.Options
+@using EnvelopeGenerator.ReceiverUI.Options
+@using EnvelopeGenerator.ReceiverUI.Services
+@inject InMemoryReportStorageWebExtension ReportStorage
+@inject DocumentService DocumentService
+@inject IOptions<ApiOptions> AppOptions
+
+<link href="_content/DevExpress.Blazor.Themes/blazing-berry.bs5.min.css" rel="stylesheet" />
+<link href="_content/DevExpress.Blazor.Reporting.Viewer/css/dx-blazor-reporting-components.bs5.css" rel="stylesheet" />
+
+
+@if (_report is not null) {
+    <DxReportViewer Report="_report" RootCssClasses="w-100 h-100" Zoom="1.3" />
+}
+
+@code {
+    [Parameter] public string EnvelopeKey { get; init; } = null!;
+
+    XtraReport? _report = null;
+
+    protected override async Task OnInitializedAsync() 
+    {
+        _report = await CreateReport();
+    }
+
+    async Task<XtraReport> CreateReport()
+    {
+        if (AppOptions.Value.UsePredefinedReports)
+        {
+            return PredefinedReports.ReportsFactory.GetReport("LargeDatasetReport");
+        }
+        else
+        {
+
+            var pdfBytes = await DocumentService.GetDocumentAsync(EnvelopeKey);
+            if (pdfBytes is null || pdfBytes.Length == 0)
+                throw new InvalidOperationException($"No PDF bytes found for EnvelopeKey: {EnvelopeKey}");
+
+            var report = new XtraReport();
+            var detail = new DevExpress.XtraReports.UI.DetailBand();
+            report.Bands.Add(detail);
+            detail.Controls.Add(new DevExpress.XtraReports.UI.XRPdfContent { Source = pdfBytes, GenerateOwnPages = true });
+            return report;
+        }
+    }
+}

EnvelopeGenerator.ReceiverUI/Pages/EnvelopeReceiverPage_embed.razor

@@ -0,0 +1,123 @@
+@page "/envelope/Embed"
+@using System.IO
+@using DevExpress.Blazor
+@using System.Reflection
+
+<link href="_content/DevExpress.Blazor.Themes/blazing-berry.bs5.min.css" rel="stylesheet" />
+
+<style>
+    .custom-drop-zone {
+        padding: 0 !important;
+        border-style: dashed;
+        border-width: 2px !important;
+        height: 230px;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        background-color: rgba(183, 183, 183, 0.1);
+    }
+
+        .custom-drop-zone.custom-drop-zone-hover {
+            border-style: solid;
+        }
+
+        .custom-drop-zone svg {
+            width: 42px;
+            height: 42px;
+        }
+
+        .custom-drop-zone > *:not(#overviewDemoSelectButton) {
+            pointer-events: none;
+        }
+
+    .pdf-viewer {
+        height: 800px !important;
+        min-height: 800px !important;
+    }
+
+    .pdf-viewer .dxbrv-surface-wrapper,
+    .pdf-viewer .dxbrv-document-surface {
+        height: 100% !important;
+        min-height: 750px !important;
+    }
+
+    .pdf-viewer .dxbrv-report-preview-content {
+        width: auto !important;
+        height: auto !important;
+        min-width: 200px !important;
+        min-height: 200px !important;
+    }
+</style>
+
+<div id="overviewDemoDropZone" class="card custom-drop-zone rounded-3 w-100 m-0">
+    <span class="drop-file-icon mb-3"></span>
+    <span class="drop-file-label">Drag and Drop File Here</span><span class="m-1">or</span>
+    <DxButton Id="overviewDemoSelectButton"
+              CssClass="m-1"
+              RenderStyle="ButtonRenderStyle.Primary"
+              Text="Select File" />
+</div>
+<DxFileInput @ref="fileInput"
+             AcceptedFileTypes="@ALLOWED_FILE_TYPES"
+             AllowedFileExtensions="@ALLOWED_FILE_TYPES"
+             CssClass="w-100"
+             ExternalDropZoneCssSelector="#overviewDemoDropZone"
+             ExternalDropZoneDragOverCssClass="custom-drop-zone-hover"
+             ExternalSelectButtonCssSelector="#overviewDemoSelectButton"
+             FilesUploading="OnFilesUploading"
+             MaxFileSize="2000000">
+</DxFileInput>
+
+@if (DocumentContent != null && DocumentContent.Length > 0)
+{
+    <div class="alert alert-success mt-3">
+        PDF loaded: @DocumentContent.Length bytes
+    </div>
+    <embed src="@GetPdfDataUrl()" type="application/pdf" class="w-100 pdf-viewer" />
+}
+else
+{
+    <div class="alert alert-info mt-3">
+        Please upload a PDF file to view it.
+    </div>
+}
+
+@code {
+    readonly List<string> ALLOWED_FILE_TYPES = new List<string> { ".pdf" };
+    DxFileInput fileInput;
+    byte[] DocumentContent { get; set; }
+    
+    protected override void OnInitialized()
+    {
+        Assembly assembly = Assembly.GetExecutingAssembly();
+        Stream stream = assembly.GetManifestResourceStream("EnvelopeGenerator.ReceiverUI.Resources.Invoice.pdf");
+        if (stream != null)
+        {
+            using (stream)
+            using (var binaryReader = new BinaryReader(stream))
+                DocumentContent = binaryReader.ReadBytes((int)stream.Length);
+        }
+    }
+    
+    protected async Task OnFilesUploading(FilesUploadingEventArgs args)
+    {
+        using (MemoryStream stream = new MemoryStream())
+        {
+            IFileInputSelectedFile file = args.Files[0];
+            await file.OpenReadStream(file.Size).CopyToAsync(stream);
+            DocumentContent = stream.ToArray();
+            await InvokeAsync(StateHasChanged);
+        }
+    }
+    
+    private string GetPdfDataUrl()
+    {
+        if (DocumentContent == null || DocumentContent.Length == 0)
+            return string.Empty;
+        
+        string base64 = Convert.ToBase64String(DocumentContent);
+        return $"data:application/pdf;base64,{base64}#toolbar=0&navpanes=0&scrollbar=1";
+    }
+}
+

EnvelopeGenerator.ReceiverUI/Pages/EnvelopeSenderPage.razor

@@ -0,0 +1,442 @@
+@page "/sender"
+@attribute [Microsoft.AspNetCore.Authorization.Authorize(Policy = "Sender")]
+
+@using System.Text.Json
+@using EnvelopeGenerator.Domain.Constants
+@using EnvelopeGenerator.ReceiverUI.Models
+@using DevExpress.Blazor
+@using EnvelopeGenerator.ReceiverUI.Services
+@inject EnvelopeGenerator.ReceiverUI.Services.EnvelopeService EnvelopeService
+@inject EnvelopeGenerator.ReceiverUI.Services.AuthService AuthService
+@inject NavigationManager Navigation
+@inject IJSRuntime JSRuntime
+@inject AppVersionService AppVersion
+
+<link href="_content/DevExpress.Blazor.Themes/blazing-berry.bs5.min.css" rel="stylesheet" />
+<link href="@AppVersion.GetVersionedUrl("css/envelope-viewer.css")" rel="stylesheet" />
+<link href="@AppVersion.GetVersionedUrl("css/sender-page.css")" rel="stylesheet" />
+
+<div class="sender-dashboard-layout">
+    <div class="sender-action-bar">
+        <div class="sender-action-bar__inner">
+            <div class="sender-title-section">
+                <div class="sender-logo">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="currentColor" viewBox="0 0 16 16">
+                        <path d="M0 4a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V4Zm2-1a1 1 0 0 0-1 1v.217l7 4.2 7-4.2V4a1 1 0 0 0-1-1H2Zm13 2.383-4.708 2.825L15 11.105V5.383Zm-.034 6.876-5.64-3.471L8 9.583l-1.326-.795-5.64 3.47A1 1 0 0 0 2 13h12a1 1 0 0 0 .966-.741ZM1 11.105l4.708-2.897L1 5.383v5.722Z"/>
+                    </svg>
+                </div>
+                <div class="sender-title">Umschlag-Übersicht</div>
+            </div>
+
+            <div class="sender-toolbar">
+                <button class="sender-btn sender-btn--primary" @onclick="CreateEnvelope" title="Neuen Umschlag erstellen">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
+                        <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"/>
+                    </svg>
+                    Neuer Umschlag
+                </button>
+
+                <button class="sender-btn" @onclick="EditEnvelope" disabled="@(_selectedEnvelope == null || IsEnvelopeSent(_selectedEnvelope))" title="Ausgewählten Umschlag bearbeiten">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
+                        <path d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5 13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"/>
+                    </svg>
+                    Bearbeiten
+                </button>
+
+                <button class="sender-btn sender-btn--danger" @onclick="DeleteEnvelope" disabled="@(_selectedEnvelope == null)" title="Ausgewählten Umschlag löschen">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
+                        <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/>
+                        <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/>
+                    </svg>
+                    Löschen
+                </button>
+
+                <button class="sender-btn" @onclick="RefreshEnvelopes" disabled="@_isLoading" title="Aktualisieren">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
+                        <path fill-rule="evenodd" d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z"/>
+                        <path d="M8 4.466V.534a.25.25 0 0 1 .41-.192l2.36 1.966c.12.1.12.284 0 .384L8.41 4.658A.25.25 0 0 1 8 4.466z"/>
+                    </svg>
+                    @if (_isLoading) {
+                        <span class="spinner-border spinner-border-sm" style="width: 14px; height: 14px;"></span>
+                    }
+                </button>
+
+                <button class="sender-btn sender-btn--logout" @onclick="LogoutAsync" disabled="@_isLoggingOut" title="Abmelden">
+                    @if (_isLoggingOut) {
+                        <span class="spinner-border spinner-border-sm" style="width: 14px; height: 14px;"></span>
+                    } else {
+                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
+                            <path fill-rule="evenodd" d="M10 12.5a.5.5 0 0 1-.5.5h-8a.5.5 0 0 1-.5-.5v-9a.5.5 0 0 1 .5-.5h8a.5.5 0 0 1 .5.5v2a.5.5 0 0 0 1 0v-2A1.5 1.5 0 0 0 9.5 2h-8A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14h8a1.5 1.5 0 0 0 1.5-1.5v-2a.5.5 0 0 0-1 0v2z"/>
+                            <path fill-rule="evenodd" d="M15.854 8.354a.5.5 0 0 0 0-.708l-3-3a.5.5 0 0 0-.708.708L14.293 7.5H5.5a.5.5 0 0 0 0 1h8.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3z"/>
+                        </svg>
+                    }
+                </button>
+            </div>
+        </div>
+    </div>
+
+    <div class="sender-content">
+        @if (_isLoading && _allEnvelopes == null) {
+            <div class="d-flex justify-content-center align-items-center h-100">
+                <div class="text-center">
+                    <div class="spinner-border text-white mb-3" style="width: 3.5rem; height: 3.5rem;" role="status">
+                        <span class="visually-hidden">Lädt...</span>
+                    </div>
+                    <p class="text-white fw-semibold">Umschläge werden geladen...</p>
+                </div>
+            </div>
+        } else if (_errorMessage != null) {
+            <div class="error-container">
+                <div class="alert alert-danger shadow-lg">
+                    <div class="d-flex align-items-start">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" fill="currentColor" class="me-3 flex-shrink-0" viewBox="0 0 16 16">
+                            <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"/>
+                            <path d="M7.002 11a1 1 0 1 1 2 0 1 1 0 0 1-2 0zM7.1 4.995a.905.905 0 1 1 1.8 0l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 4.995z"/>
+                        </svg>
+                        <div>
+                            <h5 class="mb-2">Fehler beim Laden der Umschläge</h5>
+                            <p class="mb-0">@_errorMessage</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        } else {
+            <div class="sender-grid-container">
+                <div class="sender-tabs">
+                    <button class="sender-tab @(_activeTab == "active" ? "sender-tab--active" : "")" @onclick='() => _activeTab = "active"'>
+                        <span>Aktive Umschläge</span>
+                        @if (_activeEnvelopes != null) {
+                            <span style="opacity: 0.6; margin-left: 0.5rem;">(@_activeEnvelopes.Count())</span>
+                        }
+                    </button>
+                    <button class="sender-tab @(_activeTab == "completed" ? "sender-tab--active" : "")" @onclick='() => _activeTab = "completed"'>
+                        <span>Abgeschlossene Umschläge</span>
+                        @if (_completedEnvelopes != null) {
+                            <span style="opacity: 0.6; margin-left: 0.5rem;">(@_completedEnvelopes.Count())</span>
+                        }
+                    </button>
+                </div>
+
+                <div class="sender-grid-wrapper">
+                    @if (_activeTab == "active") {
+                        <DxGrid Data="@_activeEnvelopes"
+                                @ref="_gridActive"
+                                ShowFilterRow="true"
+                                ShowSearchBox="true"
+                                AllowColumnReorder="true"
+                                AllowSort=true
+                                ColumnResizeMode="GridColumnResizeMode.ColumnsContainer"
+                                PageSize="20"
+                                PagerVisible="true"
+                                SelectionMode="GridSelectionMode.Single"
+                                SelectedDataItem="@_selectedEnvelope"
+                                SelectedDataItemChanged="@OnSelectedEnvelopeChanged"
+                                CustomizeElement="OnCustomizeElement">
+                            <Columns>
+                                <DxGridDataColumn FieldName="Id" Caption="ID">
+                                    <CellDisplayTemplate Context="cellContext">
+                                        @((cellContext.DataItem as EnvelopeDto)?.Id)
+                                    </CellDisplayTemplate>
+                                </DxGridDataColumn>
+                                <DxGridDataColumn FieldName="Title" Caption="Titel">
+                                    <CellDisplayTemplate Context="cellContext">
+                                        <strong>@((cellContext.DataItem as EnvelopeDto)?.Title)</strong>
+                                    </CellDisplayTemplate>
+                                </DxGridDataColumn>
+                                <DxGridDataColumn FieldName="Status" Caption="Status">
+                                    <CellDisplayTemplate Context="cellContext">
+                                        @{
+                                            var envelope = cellContext.DataItem as EnvelopeDto;
+                                            if (envelope != null) {
+                                                var statusInfo = GetStatusInfo(envelope.Status);
+                                                <div class="status-badge status-badge--@statusInfo.CssClass">
+                                                    <span class="status-dot status-dot--@statusInfo.DotColor"></span>
+                                                    @statusInfo.Label
+                                                </div>
+                                            }
+                                        }
+                                    </CellDisplayTemplate>
+                                </DxGridDataColumn>
+                                <DxGridDataColumn FieldName="EnvelopeReceivers" Caption="Empfänger">
+                                    <CellDisplayTemplate Context="cellContext">
+                                        @{
+                                            var envelope = cellContext.DataItem as EnvelopeDto;
+                                            if (envelope != null) {
+                                                var receivers = envelope.EnvelopeReceivers ?? new List<EnvelopeReceiverSimpleDto>();
+                                                var signed = receivers.Count(r => r.Signed);
+                                                var total = receivers.Count;
+                                                <div style="display: flex; align-items: center; gap: 0.5rem;">
+                                                    <span style="font-size: 0.875rem; color: #6b7280;">
+                                                        @signed / @total unterschrieben
+                                                    </span>
+                                                    @if (total > 0) {
+                                                        <div style="flex: 1; min-width: 60px; max-width: 120px; height: 6px; background: #e5e7eb; border-radius: 3px; overflow: hidden;">
+                                                            <div style="height: 100%; background: linear-gradient(90deg, #81c784 0%, #66bb6a 100%); width: @((signed * 100.0 / total).ToString("F0"))%;"></div>
+                                                        </div>
+                                                    }
+                                                </div>
+                                            }
+                                        }
+                                    </CellDisplayTemplate>
+                                </DxGridDataColumn>
+                            </Columns>
+                            <DetailRowTemplate Context="detailContext">
+                                <div style="padding: 1rem; background: #f9fafb;">
+                                    <h6 style="font-weight: 600; color: #374151; margin-bottom: 0.75rem;">Empfänger</h6>
+                                    @{
+                                        var envelope = detailContext.DataItem as EnvelopeDto;
+                                        if (envelope?.EnvelopeReceivers?.Any() == true) {
+                                            <div style="display: flex; flex-direction: column; gap: 0.5rem;">
+                                                @foreach (var receiver in envelope.EnvelopeReceivers) {
+                                                    <div style="display: flex; align-items: center; gap: 1rem; padding: 0.5rem; background: white; border-radius: 6px; border: 1px solid #e5e7eb;">
+                                                        <span class="receiver-badge receiver-badge--@(receiver.Signed ? "signed" : "unsigned")" style="min-width: 100px;">
+                                                            @if (receiver.Signed) {
+                                                                <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="currentColor" viewBox="0 0 16 16">
+                                                                    <path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
+                                                                </svg>
+                                                                <span>Unterschrieben</span>
+                                                            } else {
+                                                                <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="currentColor" viewBox="0 0 16 16">
+                                                                    <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"/>
+                                                                    <path d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
+                                                                </svg>
+                                                                <span>Ausstehend</span>
+                                                            }
+                                                        </span>
+                                                        <div style="flex: 1; font-size: 0.875rem;">
+                                                            <strong style="color: #1f2937;">@receiver.Name</strong>
+                                                            <span style="color: #6b7280; margin-left: 0.5rem;">@receiver.Email</span>
+                                                        </div>
+                                                    </div>
+                                                }
+                                            </div>
+                                        } else {
+                                            <p style="color: #9ca3af; font-size: 0.875rem; margin: 0;">Keine Empfänger</p>
+                                        }
+                                    }
+                                </div>
+                            </DetailRowTemplate>
+                        </DxGrid>
+                    } else {
+                        <DxGrid Data="@_completedEnvelopes"
+                                @ref="_gridCompleted"
+                                ShowFilterRow="true"
+                                ShowSearchBox="true"
+                                PageSize="20"
+                                PagerVisible="true"
+                                SelectionMode="GridSelectionMode.Single"
+                                SelectedDataItem="@_selectedEnvelope"
+                                SelectedDataItemChanged="@OnSelectedEnvelopeChanged"
+                                CustomizeElement="OnCustomizeElement">
+                            <Columns>
+                                <DxGridDataColumn FieldName="Id" Caption="ID">
+                                    <CellDisplayTemplate Context="cellContext">
+                                        @((cellContext.DataItem as EnvelopeDto)?.Id)
+                                    </CellDisplayTemplate>
+                                </DxGridDataColumn>
+                                <DxGridDataColumn FieldName="Title" Caption="Titel">
+                                    <CellDisplayTemplate Context="cellContext">
+                                        <strong>@((cellContext.DataItem as EnvelopeDto)?.Title)</strong>
+                                    </CellDisplayTemplate>
+                                </DxGridDataColumn>
+                                <DxGridDataColumn FieldName="Status" Caption="Status">
+                                    <CellDisplayTemplate Context="cellContext">
+                                        @{
+                                            var envelope = cellContext.DataItem as EnvelopeDto;
+                                            if (envelope != null) {
+                                                var statusInfo = GetStatusInfo(envelope.Status);
+                                                <div class="status-badge status-badge--@statusInfo.CssClass">
+                                                    <span class="status-dot status-dot--@statusInfo.DotColor"></span>
+                                                    @statusInfo.Label
+                                                </div>
+                                            }
+                                        }
+                                    </CellDisplayTemplate>
+                                </DxGridDataColumn>
+                                <DxGridDataColumn FieldName="EnvelopeReceivers" Caption="Empfänger">
+                                    <CellDisplayTemplate Context="cellContext">
+                                        @{
+                                            var envelope = cellContext.DataItem as EnvelopeDto;
+                                            if (envelope != null) {
+                                                var receivers = envelope.EnvelopeReceivers ?? new List<EnvelopeReceiverSimpleDto>();
+                                                var signed = receivers.Count(r => r.Signed);
+                                                var total = receivers.Count;
+                                                <div style="display: flex; align-items: center; gap: 0.5rem;">
+                                                    <span style="font-size: 0.875rem; color: #6b7280;">
+                                                        @signed / @total unterschrieben
+                                                    </span>
+                                                    @if (total > 0) {
+                                                        <div style="flex: 1; min-width: 60px; max-width: 120px; height: 6px; background: #e5e7eb; border-radius: 3px; overflow: hidden;">
+                                                            <div style="height: 100%; background: linear-gradient(90deg, #81c784 0%, #66bb6a 100%); width: @((signed * 100.0 / total).ToString("F0"))%;"></div>
+                                                        </div>
+                                                    }
+                                                </div>
+                                            }
+                                        }
+                                    </CellDisplayTemplate>
+                                </DxGridDataColumn>
+                            </Columns>
+                            <DetailRowTemplate Context="detailContext">
+                                <div style="padding: 1rem; background: #f9fafb;">
+                                    <h6 style="font-weight: 600; color: #374151; margin-bottom: 0.75rem;">Empfänger</h6>
+                                    @{
+                                        var envelope = detailContext.DataItem as EnvelopeDto;
+                                        if (envelope?.EnvelopeReceivers?.Any() == true) {
+                                            <div style="display: flex; flex-direction: column; gap: 0.5rem;">
+                                                @foreach (var receiver in envelope.EnvelopeReceivers) {
+                                                    <div style="display: flex; align-items: center; gap: 1rem; padding: 0.5rem; background: white; border-radius: 6px; border: 1px solid #e5e7eb;">
+                                                        <span class="receiver-badge receiver-badge--@(receiver.Signed ? "signed" : "unsigned")" style="min-width: 100px;">
+                                                            @if (receiver.Signed) {
+                                                                <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="currentColor" viewBox="0 0 16 16">
+                                                                    <path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
+                                                                </svg>
+                                                                <span>Unterschrieben</span>
+                                                            } else {
+                                                                <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="currentColor" viewBox="0 0 16 16">
+                                                                    <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"/>
+                                                                    <path d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
+                                                                </svg>
+                                                                <span>Ausstehend</span>
+                                                            }
+                                                        </span>
+                                                        <div style="flex: 1; font-size: 0.875rem;">
+                                                            <strong style="color: #1f2937;">@receiver.Name</strong>
+                                                            <span style="color: #6b7280; margin-left: 0.5rem;">@receiver.Email</span>
+                                                        </div>
+                                                    </div>
+                                                }
+                                            </div>
+                                        } else {
+                                            <p style="color: #9ca3af; font-size: 0.875rem; margin: 0;">Keine Empfänger</p>
+                                        }
+                                    }
+                                </div>
+                            </DetailRowTemplate>
+                        </DxGrid>
+                    }
+                </div>
+            </div>
+        }
+    </div>
+</div>
+
+@code {
+    private IEnumerable<EnvelopeDto>? _allEnvelopes;
+    private IEnumerable<EnvelopeDto>? _activeEnvelopes;
+    private IEnumerable<EnvelopeDto>? _completedEnvelopes;
+    private EnvelopeDto? _selectedEnvelope;
+    private string _activeTab = "active";
+    private bool _isLoading = true;
+    private bool _isLoggingOut = false;
+    private string? _errorMessage;
+    private DxGrid? _gridActive;
+    private DxGrid? _gridCompleted;
+
+    protected override async Task OnInitializedAsync()
+    {
+        var hasAccess = await AuthService.CheckSenderAsync();
+        if (!hasAccess)
+        {
+            Navigation.NavigateTo($"/sender/login");
+            return;
+        }
+
+        await LoadEnvelopesAsync();
+    }
+
+    async Task LoadEnvelopesAsync()
+    {
+        _isLoading = true;
+        _errorMessage = null;
+        await InvokeAsync(StateHasChanged);
+
+        try
+        {
+            _allEnvelopes = await EnvelopeService.GetAsync() ?? [];
+            
+            // Split into active and completed based on status
+            var envelopes = _allEnvelopes.ToList();
+            _activeEnvelopes = envelopes.Where(e => ((EnvelopeStatus)e.Status).IsActive()).ToList();
+            _completedEnvelopes = envelopes.Where(e => ((EnvelopeStatus)e.Status).IsCompleted()).ToList();
+
+            await JSRuntime.InvokeVoidAsync("console.log", $"Loaded {_activeEnvelopes.Count()} active and {_completedEnvelopes.Count()} completed envelopes");
+        }
+        catch (Exception ex)
+        {
+            _errorMessage = ex.Message;
+            await JSRuntime.InvokeVoidAsync("console.error", "Fehler beim Laden der Umschläge:", ex.ToString());
+        }
+        finally
+        {
+            _isLoading = false;
+            await InvokeAsync(StateHasChanged);
+        }
+    }
+
+    async Task RefreshEnvelopes()
+    {
+        await LoadEnvelopesAsync();
+    }
+
+    void CreateEnvelope()
+    {
+        // TODO: Navigate to envelope creation page
+        JSRuntime.InvokeVoidAsync("console.log", "Create envelope clicked - not yet implemented");
+    }
+
+    void EditEnvelope()
+    {
+        if (_selectedEnvelope == null) return;
+        // TODO: Navigate to envelope editor
+        JSRuntime.InvokeVoidAsync("console.log", $"Edit envelope {_selectedEnvelope.Id} clicked - not yet implemented");
+    }
+
+    void DeleteEnvelope()
+    {
+        if (_selectedEnvelope == null) return;
+        // TODO: Show delete confirmation dialog
+        JSRuntime.InvokeVoidAsync("console.log", $"Delete envelope {_selectedEnvelope.Id} clicked - not yet implemented");
+    }
+
+    async Task LogoutAsync()
+    {
+        _isLoggingOut = true;
+        await InvokeAsync(StateHasChanged);
+        await AuthService.LogoutSenderAsync();
+        Navigation.NavigateTo("/sender/login", forceLoad: true);
+    }
+
+    bool IsEnvelopeSent(EnvelopeDto envelope)
+    {
+        var status = (EnvelopeStatus)envelope.Status;
+        return status >= EnvelopeStatus.EnvelopeQueued;
+    }
+
+    (string Label, string CssClass, string DotColor) GetStatusInfo(int statusCode)
+    {
+        var status = (EnvelopeStatus)statusCode;
+        return status switch
+        {
+            EnvelopeStatus.EnvelopePartlySigned => ("Teilweise unterschrieben", "partly-signed", "green"),
+            EnvelopeStatus.EnvelopeQueued => ("In Warteschlange", "queued", "orange"),
+            EnvelopeStatus.EnvelopeSent => ("Gesendet", "sent", "orange"),
+            EnvelopeStatus.EnvelopeCompletelySigned => ("Vollständig unterschrieben", "completed", "green"),
+            EnvelopeStatus.EnvelopeDeleted => ("Gelöscht", "deleted", "red"),
+            EnvelopeStatus.EnvelopeRejected => ("Abgelehnt", "rejected", "red"),
+            EnvelopeStatus.EnvelopeWithdrawn => ("Zurückgezogen", "withdrawn", "red"),
+            EnvelopeStatus.EnvelopeCreated => ("Erstellt", "created", "blue"),
+            EnvelopeStatus.EnvelopeSaved => ("Gespeichert", "saved", "blue"),
+            _ => ("Unbekannt", "unknown", "blue")
+        };
+    }
+
+    void OnCustomizeElement(GridCustomizeElementEventArgs e)
+    {
+        // Future: Add custom row coloring based on status if needed
+    }
+
+    void OnSelectedEnvelopeChanged(object envelope)
+    {
+        _selectedEnvelope = envelope as EnvelopeDto;
+    }
+}

EnvelopeGenerator.ReceiverUI/Pages/Example/DocumentViewer.razor

@@ -1,4 +1,4 @@
-@page "/documentviewer"
+@page "/example/documentviewer"
 
 <DxDocumentViewer ReportName="LargeDatasetReport" CssClass="dx-blazor-reporting-container" Height="@null" Width="@null">
     <DxDocumentViewerTabPanelSettings Width="340" />

EnvelopeGenerator.ReceiverUI/Pages/Example/ReportDesigner.razor

@@ -1,4 +1,4 @@
-@page "/sender"
+@page "/example/sender"
 @using DevExpress.DataAccess.Json;
 @using EnvelopeGenerator.ReceiverUI.Services;
 

EnvelopeGenerator.ReceiverUI/Pages/Example/ReportViewer.razor

@@ -1,11 +1,12 @@
-@page "/receiver/{EnvelopeKey}"
-@page "/report-viewer/{EnvelopeKey}"
+@page "/example/receiver/{EnvelopeKey}"
+@page "/example/report-viewer/{EnvelopeKey}"
 @using System.Drawing
 @using DevExpress.Blazor
 @using DevExpress.Drawing
 @using DevExpress.Utils
 @using DevExpress.XtraPrinting
 @using DevExpress.XtraPrinting.Drawing
+@using EnvelopeGenerator.Application.Common.Dto
 @using Microsoft.JSInterop
 @using XtraReport = DevExpress.XtraReports.UI.XtraReport
 @using BottomMarginBand = DevExpress.XtraReports.UI.BottomMarginBand
@@ -301,7 +302,10 @@ Shown="OnPopupShownAsync">
     bool IsLoggingOut;
 
     IReadOnlyList<AnnotationDto> _annotations = [];
-    IEnumerable<int> AnnotationPages => _annotations.Select(a => a.Page).Distinct().OrderBy(p => p);
+    IEnumerable<int> AnnotationPages => _annotations
+    .Select(a => a.Page ?? throw new InvalidOperationException($"Annotation page is missing for annotation ID {a.Id}. Annotation details: X={a.X}, Y={a.Y}"))
+    .Distinct()
+    .OrderBy(p => p);
     EnvelopeReceiverDto? _envelopeReceiver;
     record SignatureCapture(string DataUrl, string FullName, string Position, string Place);
     SignatureCapture? _capturedSignature;
@@ -342,13 +346,24 @@ Shown="OnPopupShownAsync">
             }
         }
 
-        _annotations = await AnnotationService.GetAnnotationsAsync(EnvelopeKey ?? "fake");
-        _envelopeReceiver = await EnvelopeReceiverService.GetAsync(EnvelopeKey ?? "fake");
+        _annotations = await AnnotationService.GetAnnotationsAsync(EnvelopeKey);
         
-        if (!AppOptions.Value.ForceToUseFakeDocument && !string.IsNullOrWhiteSpace(EnvelopeKey)) {
-            var (pdfBytes, _) = await DocumentService.GetDocumentAsync(EnvelopeKey);
+        try {
+            _envelopeReceiver = await EnvelopeReceiverService.GetAsync(EnvelopeKey);
+        } catch (HttpRequestException ex) {
+            // Log error but continue - UI will handle null envelope receiver gracefully
+            Console.WriteLine($"Failed to load envelope receiver: {ex.Message}");
+        }
+
+        if (!AppOptions.Value.UsePredefinedReports && !string.IsNullOrWhiteSpace(EnvelopeKey)) {
+            try {
+                var pdfBytes = await DocumentService.GetDocumentAsync(EnvelopeKey);
                 if (pdfBytes is { Length: > 0 })
                     _basePdfBytes = pdfBytes;
+            } catch (HttpRequestException ex) {
+                // Log error but continue - will use predefined report instead
+                Console.WriteLine($"Failed to load document: {ex.Message}");
+            }
         }
 
         var initialReport = BuildFreshBaseReport();

EnvelopeGenerator.ReceiverUI/Pages/Example/TestViewer.razor

@@ -1,4 +1,4 @@
-@page "/test"
+@page "/example/test"
 @using System.Drawing
 @using DevExpress.Drawing
 @using DevExpress.Utils

EnvelopeGenerator.ReceiverUI/Pages/LoginReceiverPage.razor

@@ -1,4 +1,4 @@
-@page "/login/{EnvelopeKey}"
+@page "/envelope/login/{EnvelopeKey}"
 @using EnvelopeGenerator.ReceiverUI.Services
 @inject AuthService AuthService
 @inject NavigationManager Navigation

EnvelopeGenerator.ReceiverUI/Pages/LoginSenderPage.razor

@@ -0,0 +1,172 @@
+@page "/sender/login"
+@using EnvelopeGenerator.ReceiverUI.Services
+@inject AuthService AuthService
+@inject NavigationManager Navigation
+
+<link href="_content/DevExpress.Blazor.Themes/blazing-berry.bs5.min.css" rel="stylesheet" />
+
+<div class="login-page-wrapper d-flex align-items-center justify-content-center min-vh-100">
+    <div class="login-card card shadow border-0" style="max-width: 440px; width: 100%;">
+
+        <div class="card-header text-white text-center py-4 border-0" style="background: linear-gradient(135deg, #2c3e50 0%, #3498db 100%); border-radius: calc(0.375rem - 1px) calc(0.375rem - 1px) 0 0;">
+            <div class="mb-2">
+                <svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" fill="currentColor" viewBox="0 0 16 16">
+                    <path d="M11 6a3 3 0 1 1-6 0 3 3 0 0 1 6 0z"/>
+                    <path fill-rule="evenodd" d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm8-7a7 7 0 0 0-5.468 11.37C3.242 11.226 4.805 10 8 10s4.757 1.225 5.468 2.37A7 7 0 0 0 8 1z"/>
+                </svg>
+            </div>
+            <h5 class="mb-0 fw-semibold">Sender Anmeldung</h5>
+            <p class="mb-0 mt-1 opacity-75" style="font-size: 0.85rem;">Sicherer Zugang zum Sender-Dashboard</p>
+        </div>
+
+        <div class="card-body p-4">
+
+            <p class="text-muted mb-4" style="font-size: 0.875rem; line-height: 1.5;">
+                Bitte melden Sie sich mit Ihren Zugangsdaten an, um auf das Sender-Dashboard zuzugreifen.
+            </p>
+
+            @if (LoginResult == SenderLoginResult.InvalidCredentials) {
+                <div class="alert alert-danger d-flex align-items-start gap-2 py-2" role="alert">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="currentColor" class="flex-shrink-0 mt-1" viewBox="0 0 16 16">
+                        <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/>
+                    </svg>
+                    <div>
+                        <strong>Ungültige Anmeldedaten.</strong><br />
+                        <span style="font-size:0.85rem;">Benutzername oder Passwort ist falsch. Bitte versuchen Sie es erneut.</span>
+                    </div>
+                </div>
+            } else if (LoginResult == SenderLoginResult.Error) {
+                <div class="alert alert-secondary d-flex align-items-start gap-2 py-2" role="alert">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="currentColor" class="flex-shrink-0 mt-1" viewBox="0 0 16 16">
+                        <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"/>
+                        <path d="M7.002 11a1 1 0 1 1 2 0 1 1 0 0 1-2 0zM7.1 4.995a.905.905 0 1 1 1.8 0l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 4.995z"/>
+                    </svg>
+                    <div>
+                        <strong>Serverfehler.</strong><br />
+                        <span style="font-size:0.85rem;">Ein unerwarteter Fehler ist aufgetreten. Bitte versuchen Sie es später erneut.</span>
+                    </div>
+                </div>
+            }
+
+            <div class="mb-3">
+                <label class="form-label fw-medium" for="login-username">
+                    Benutzername
+                    <span class="text-danger ms-1">*</span>
+                </label>
+                <div class="input-group">
+                    <span class="input-group-text bg-light">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" viewBox="0 0 16 16">
+                            <path d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3Zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z"/>
+                        </svg>
+                    </span>
+                    <input id="login-username"
+                           type="text"
+                           class="form-control @(LoginResult == SenderLoginResult.InvalidCredentials ? "is-invalid" : null)"
+                           placeholder="Benutzername eingeben"
+                           @bind="Username"
+                           @bind:event="oninput"
+                           @onkeydown="OnKeyDownAsync"
+                           disabled="@IsLoading"
+                           autocomplete="username" />
+                </div>
+            </div>
+
+            <div class="mb-4">
+                <label class="form-label fw-medium" for="login-password">
+                    Passwort
+                    <span class="text-danger ms-1">*</span>
+                </label>
+                <div class="input-group">
+                    <span class="input-group-text bg-light border-end-0">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" viewBox="0 0 16 16">
+                            <path d="M8 1a2 2 0 0 1 2 2v4H6V3a2 2 0 0 1 2-2zm3 6V3a3 3 0 0 0-6 0v4a2 2 0 0 0-2 2v5a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V9a2 2 0 0 0-2-2z"/>
+                        </svg>
+                    </span>
+                    <input id="login-password"
+                           type="@(ShowPassword ? "text" : "password")"
+                           class="form-control border-start-0 border-end-0 @(LoginResult == SenderLoginResult.InvalidCredentials ? "is-invalid" : null)"
+                           placeholder="Passwort eingeben"
+                           @bind="Password"
+                           @bind:event="oninput"
+                           @onkeydown="OnKeyDownAsync"
+                           disabled="@IsLoading"
+                           autocomplete="current-password" />
+                    <button type="button"
+                            class="btn btn-outline-secondary border-start-0"
+                            style="border-left: none;"
+                            tabindex="-1"
+                            @onclick="() => ShowPassword = !ShowPassword">
+                        @if (ShowPassword) {
+                            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
+                                <path d="M13.359 11.238C15.06 9.72 16 8 16 8s-3-5.5-8-5.5a7.028 7.028 0 0 0-2.79.588l.77.771A5.944 5.944 0 0 1 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.134 13.134 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755-.165.165-.337.328-.517.486l.708.709z"/>
+                                <path d="M11.297 9.176a3.5 3.5 0 0 0-4.474-4.474l.823.823a2.5 2.5 0 0 1 2.829 2.829l.822.822zm-2.943 1.299.822.822a3.5 3.5 0 0 1-4.474-4.474l.823.823a2.5 2.5 0 0 0 2.829 2.829z"/>
+                                <path d="M3.35 5.47c-.18.16-.353.322-.518.487A13.134 13.134 0 0 0 1.172 8l.195.288c.335.48.83 1.12 1.465 1.755C4.121 11.332 5.881 12.5 8 12.5c.716 0 1.39-.133 2.02-.36l.77.772A7.029 7.029 0 0 1 8 13.5C3 13.5 0 8 0 8s.939-1.721 2.641-3.238l.708.709z"/>
+                                <path fill-rule="evenodd" d="M13.646 14.354l-12-12 .708-.708 12 12-.708.708z"/>
+                            </svg>
+                        } else {
+                            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
+                                <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                                <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+                            </svg>
+                        }
+                    </button>
+                </div>
+            </div>
+
+            <button class="btn btn-primary w-100 py-2 fw-medium"
+                    style="background: linear-gradient(135deg, #2c3e50 0%, #3498db 100%); border: none;"
+                    @onclick="SubmitAsync"
+                    disabled="@(IsLoading || string.IsNullOrWhiteSpace(Username) || string.IsNullOrWhiteSpace(Password))">
+                @if (IsLoading) {
+                    <span class="spinner-border spinner-border-sm me-2" role="status" aria-hidden="true"></span>
+                    <span>Anmelden …</span>
+                } else {
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="me-2" viewBox="0 0 16 16">
+                        <path fill-rule="evenodd" d="M10 3.5a.5.5 0 0 0-.5-.5h-8a.5.5 0 0 0-.5.5v9a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5v-2a.5.5 0 0 1 1 0v2A1.5 1.5 0 0 1 9.5 14h-8A1.5 1.5 0 0 1 0 12.5v-9A1.5 1.5 0 0 1 1.5 2h8A1.5 1.5 0 0 1 11 3.5v2a.5.5 0 0 1-1 0v-2z"/>
+                        <path fill-rule="evenodd" d="M4.146 8.354a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L5.707 7.5H14.5a.5.5 0 0 1 0 1H5.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3z"/>
+                    </svg>
+                    <span>Anmelden</span>
+                }
+            </button>
+
+        </div>
+
+        <div class="card-footer text-center text-muted py-3 border-0 bg-transparent" style="font-size: 0.78rem;">
+            Bei Problemen wenden Sie sich bitte an den Administrator.
+        </div>
+
+    </div>
+</div>
+
+@code {
+    string Username = string.Empty;
+    string Password = string.Empty;
+    bool ShowPassword;
+    bool IsLoading;
+    SenderLoginResult? LoginResult;
+
+    async Task OnKeyDownAsync(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs e) {
+        if (e.Key == "Enter")
+            await SubmitAsync();
+    }
+
+    async Task SubmitAsync() {
+        if (string.IsNullOrWhiteSpace(Username) || string.IsNullOrWhiteSpace(Password) || IsLoading) return;
+
+        IsLoading = true;
+        LoginResult = null;
+        await InvokeAsync(StateHasChanged);
+
+        var result = await AuthService.LoginSenderAsync(Username.Trim(), Password.Trim());
+
+        if (result == SenderLoginResult.Success) {
+            Navigation.NavigateTo("/sender", forceLoad: true);
+            return;
+        }
+
+        LoginResult = result;
+        IsLoading = false;
+        await InvokeAsync(StateHasChanged);
+    }
+}
+

EnvelopeGenerator.ReceiverUI/Program.cs

@@ -7,6 +7,9 @@ using EnvelopeGenerator.ReceiverUI.Options;
 using DevExpress.XtraReports.Services;
 using DevExpress.Blazor.Reporting;
 using DevExpress.XtraReports.Web.Extensions;
+using EnvelopeGenerator.Application.Resources;
+using Microsoft.Extensions.Localization;
+using System.Globalization;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
@@ -16,12 +19,18 @@ builder.Services.Configure<ApiOptions>(opts =>
 builder.Configuration.GetSection(ApiOptions.SectionName).Bind(opts));
 builder.Services.Configure<PdfViewerOptions>(opts =>
 builder.Configuration.GetSection(PdfViewerOptions.SectionName).Bind(opts));
-builder.Services.AddScoped<EnvelopeGenerator.ReceiverUI.Services.DocumentService>();
-builder.Services.AddScoped<EnvelopeGenerator.ReceiverUI.Services.AuthService>();
-builder.Services.AddScoped<EnvelopeGenerator.ReceiverUI.Services.AnnotationService>();
-builder.Services.AddScoped<EnvelopeGenerator.ReceiverUI.Services.EnvelopeReceiverService>();
-builder.Services.AddScoped<EnvelopeGenerator.ReceiverUI.Services.SignatureService>();
-builder.Services.AddSingleton<EnvelopeGenerator.ReceiverUI.Services.AppVersionService>();
+builder.Services.AddScoped<DocumentService>();
+builder.Services.AddScoped<AuthService>();
+builder.Services.AddScoped<AnnotationService>();
+builder.Services.AddScoped<EnvelopeReceiverService>();
+builder.Services.AddScoped<DocReceiverElementService>();
+builder.Services.AddScoped<SignatureCacheService>();
+builder.Services.AddSingleton<AppVersionService>();
+builder.Services.AddScoped<EnvelopeService>();
+builder.Services.AddScoped<CultureService>();
+
+// Localization services
+builder.Services.AddLocalization();
 
 builder.Services.AddDevExpressWebAssemblyBlazorReportViewer();
 builder.Services.AddDevExpressWebAssemblyBlazorPdfViewer();
@@ -40,5 +49,30 @@ builder.Services.AddScoped<IReportProviderAsync, CustomReportProvider>();
 ReportStorageWebExtension.RegisterExtensionGlobal(new InMemoryReportStorageWebExtension());
 
 var host = builder.Build();
+
+// ⚠️ IMPORTANT: BLAZOR WASM-SPECIFIC CULTURE INITIALIZATION
+// This approach sets DefaultThreadCurrentCulture globally, which is SAFE for WebAssembly
+// because each user runs their own isolated app instance in their browser.
+// 
+// ⚠️ TODO: REMOVE/REFACTOR WHEN MIGRATING TO BLAZOR SERVER/AUTO
+// In Server/Auto render modes, this is DANGEROUS because:
+// - Server runs a single shared instance for all users
+// - Setting global culture affects ALL connected users simultaneously
+// - Race conditions and culture conflicts will occur
+//
+// Migration Guide:
+// - Option 1: Use RequestLocalizationMiddleware for per-request culture
+// - Option 2: Use CascadingParameter with per-circuit culture state
+// - See: https://learn.microsoft.com/aspnet/core/blazor/globalization-localization
+//
+// Related files to update on migration:
+// - LanguageSelector.razor (remove manual culture setting)
+// - App.razor (may need CascadingValue for culture)
+// - Startup/Program.cs (add middleware)
+var cultureService = host.Services.GetRequiredService<CultureService>();
+var culture = await cultureService.InitializeCultureAsync();
+CultureInfo.DefaultThreadCurrentCulture = culture;
+CultureInfo.DefaultThreadCurrentUICulture = culture;
+
 await FontLoader.LoadFonts(host.Services.GetRequiredService<HttpClient>(), new List<string> { "opensans.ttf" });
 await host.RunAsync();

EnvelopeGenerator.ReceiverUI/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "EnvelopeGenerator.ReceiverUI": {
       "commandName": "Project",
-      "launchBrowser": true,
+      "launchBrowser": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },

EnvelopeGenerator.ReceiverUI/Services/AnnotationService.cs

@@ -1,5 +1,6 @@
 using System.Net.Http.Json;
 using System.Text.Json;
+using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.ReceiverUI.Models;
 using EnvelopeGenerator.ReceiverUI.Options;
 using Microsoft.Extensions.Options;