Update company logo and CSS classes in UI config

Changed the company logo source from digital_data.svg to wisag.svg.
Updated associated CSS class names to use wisag-specific
identifiers for show and locked states.

COPILOT_CONTEXT.md

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

EnvelopeGenerator.API/AuthScheme.cs

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

EnvelopeGenerator.API/Controllers/AnnotationController.cs

@@ -1,14 +1,12 @@
 using DigitalData.Core.Abstraction.Application.DTO;
 using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.API.Extensions;
-using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
-using EnvelopeGenerator.Application.Common.Notifications.RemoveSignature;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 using EnvelopeGenerator.Application.Histories.Queries;
 using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.API.Extensions;
 using MediatR;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
@@ -61,8 +59,8 @@ public class AnnotationController : ControllerBase
     [Obsolete("PSPDF Kit will no longer be used.")]
     public async Task<IActionResult> CreateOrUpdate([FromBody] PsPdfKitAnnotation? psPdfKitAnnotation = null, CancellationToken cancel = default)
     {
-        var signature = User.ReceiverSignature();
+        var signature = User.GetReceiverSignatureOfReceiver();
-        var uuid = User.EnvelopeUuid();
+        var uuid = User.GetEnvelopeUuidOfReceiver();
 
         var envelopeReceiver = await _mediator.ReadEnvelopeReceiverAsync(uuid, signature, cancel).ThrowIfNull(Exceptions.NotFound);
 
@@ -74,24 +72,12 @@ public class AnnotationController : ControllerBase
         else if (await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
             return Problem(statusCode: StatusCodes.Status423Locked);
 
-        var envelopeReceiverDto = await _mediator.ReadEnvelopeReceiverAsync(uuid, signature, cancel);
+        var docSignedNotification = await _mediator
-        var docSignedNotification = envelopeReceiverDto is not null
+            .ReadEnvelopeReceiverAsync(uuid, signature, cancel)
-            ? new DocSignedNotification { EnvelopeReceiver = envelopeReceiverDto, PsPdfKitAnnotation = psPdfKitAnnotation }
+            .ToDocSignedNotification(psPdfKitAnnotation)
-            : throw new NotFoundException("Envelope receiver is not found.");
+            ?? throw new NotFoundException("Envelope receiver is not found.");
 
-        try
+        await _mediator.PublishSafely(docSignedNotification, cancel);
-        {
-            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();
@@ -106,9 +92,9 @@ public class AnnotationController : ControllerBase
     [Obsolete("Use MediatR")]
     public async Task<IActionResult> Reject([FromBody] string? reason = null)
     {
-        var signature = User.ReceiverSignature();
+        var signature = User.GetReceiverSignatureOfReceiver();
-        var uuid = User.EnvelopeUuid();
+        var uuid = User.GetEnvelopeUuidOfReceiver();
-        var mail = User.ReceiverMail();
+        var mail = User.GetReceiverMailOfReceiver();
 
         var envRcvRes = await _envelopeReceiverService.ReadByUuidSignatureAsync(uuid: uuid, signature: signature);
 

EnvelopeGenerator.API/Controllers/AuthController.cs

@@ -1,4 +1,3 @@
-using DigitalData.Auth.Claims;
 using EnvelopeGenerator.API.Controllers.Interfaces;
 using EnvelopeGenerator.API.Models;
 using EnvelopeGenerator.Domain.Constants;
@@ -74,44 +73,4 @@ public partial class AuthController(IOptions<AuthTokenKeys> authTokenKeyOptions,
         => role is not null && !User.IsInRole(role)
             ? Unauthorized()
             : Ok();
-
-    /// <summary>
-    /// Checks whether the caller holds a valid per-envelope receiver token for the given envelope key.
-    /// The request must carry a cookie named <c>AuthTokenSignFLOWReceiver.{envelopeKey}</c>.
-    /// </summary>
-    /// <param name="envelopeKey">The unique envelope key extracted from the route.</param>
-    /// <response code="200">Valid per-envelope token found.</response>
-    /// <response code="401">Token is missing, expired or invalid.</response>
-    [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpGet("check/envelope/{envelopeKey}")]
-    public IActionResult CheckEnvelopeReceiver([FromRoute] string envelopeKey) => Ok();
-
-    /// <summary>
-    /// Removes the per-envelope receiver cookie for the given envelope key.
-    /// </summary>
-    /// <param name="envelopeKey">The unique envelope key whose cookie should be deleted.</param>
-    /// <response code="200">Cookie successfully deleted.</response>
-    [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
-    [HttpPost("logout/envelope/{envelopeKey}")]
-    public IActionResult LogoutEnvelopeReceiver([FromRoute] string envelopeKey)
-    {
-        var cookieName = CookieNames.GetEnvelopeReceiverCookieName(authTokenKeys.Cookie, envelopeKey);
-        Response.Cookies.Delete(cookieName);
-        return Ok();
-    }
-
-    /// <summary>
-    /// Removes all per-envelope receiver cookies from the current request.
-    /// </summary>
-    /// <response code="200">All envelope receiver cookies successfully deleted.</response>
-    [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
-    [HttpPost("logout/envelope")]
-    public IActionResult LogoutAllEnvelopeReceivers()
-    {
-        foreach (var cookieName in Request.Cookies.Keys.Where(k => CookieNames.IsEnvelopeReceiverCookie(k, authTokenKeys.Cookie)))
-            Response.Cookies.Delete(cookieName);
-        return Ok();
-    }
 }

EnvelopeGenerator.API/Controllers/CacheController.cs

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

EnvelopeGenerator.API/Controllers/DocumentController.cs

@@ -1,4 +1,3 @@
-using DigitalData.Auth.Claims;
 using EnvelopeGenerator.API.Controllers.Interfaces;
 using EnvelopeGenerator.API.Extensions;
 using EnvelopeGenerator.Application.Documents.Queries;
@@ -15,9 +14,10 @@ namespace EnvelopeGenerator.API.Controllers;
 /// <remarks>
 /// Initializes a new instance of the <see cref="DocumentController"/> class.
 /// </remarks>
+[Authorize]
 [ApiController]
 [Route("api/[controller]")]
-public class DocumentController(IMediator mediator, IAuthorizationService authService, ILogger<DocumentController> logger) : ControllerBase, IAuthController
+public class DocumentController(IMediator mediator, IAuthorizationService authService) : ControllerBase, IAuthController
 {
     /// <summary>
     /// 
@@ -51,7 +51,7 @@ public class DocumentController(IMediator mediator, IAuthorizationService authSe
             if (query is not null)
                 return BadRequest("Query parameters are not allowed for receiver role.");
 
-            var envelopeId = User.EnvelopeId();
+            var envelopeId = User.GetEnvelopeIdOfReceiver();
             var receiverDoc = await mediator.Send(new ReadDocumentQuery { EnvelopeId = envelopeId }, cancel);
             return receiverDoc.ByteData is byte[] receiverDocByte
                 ? File(receiverDocByte, "application/octet-stream")
@@ -60,25 +60,4 @@ public class DocumentController(IMediator mediator, IAuthorizationService authSe
 
         return Unauthorized();
     }
-
-    /// <summary>
-    /// Gets the document for the specified envelope key.
-    /// </summary>
-    /// <param name="envelopeKey"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpGet("{envelopeKey}")]
-    public async Task<IActionResult> GetDocumentOfReceiver(string envelopeKey, CancellationToken cancel)
-    {
-        int envelopeId = User.EnvelopeId();
-
-        var senderDoc = await mediator.Send(new ReadDocumentQuery() { EnvelopeId = envelopeId }, cancel);
-
-        if (senderDoc.ByteData is not byte[] senderDocByte)
-            return NotFound("Document is empty.");
-
-        Response.Headers.ContentDisposition = $"inline; filename=\"{envelopeKey}.pdf\"";
-        return File(senderDocByte, "application/pdf");
-    }
 }

EnvelopeGenerator.API/Controllers/EnvelopeController.cs

@@ -51,7 +51,7 @@ public class EnvelopeController : ControllerBase
     /// <response code="401">Der Benutzer ist nicht authentifiziert.</response>
     /// <response code="403">Der Benutzer hat keine Berechtigung, auf die Ressource zuzugreifen.</response>
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
-    [Authorize(AuthenticationSchemes = AuthScheme.Sender)]
+    [Authorize]
     [HttpGet]
     public async Task<IActionResult> GetAsync([FromQuery] ReadEnvelopeQuery envelope)
     {
@@ -98,7 +98,7 @@ public class EnvelopeController : ControllerBase
     [HttpPost]
     public async Task<IActionResult> CreateAsync([FromBody] CreateEnvelopeCommand command)
     {
-        var res = await _mediator.Send(command.WithAuth(User.GetId()));
+        var res = await _mediator.Send(command.Authorize(User.GetId()));
 
         if (res is null)
         {

EnvelopeGenerator.API/Controllers/EnvelopeReceiverController.cs

@@ -14,7 +14,6 @@ using EnvelopeGenerator.Application.Common.SQL;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using EnvelopeGenerator.API.Extensions;
-using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.API.Controllers;
 
@@ -74,24 +73,6 @@ public class EnvelopeReceiverController : ControllerBase
         return Ok(result);
     }
 
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="envelopeKey"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    [Authorize(Policy = AuthPolicy.Receiver)]
-    [HttpGet("{envelopeKey}")]
-    public async Task<IActionResult> GetEnvelopeReceiverOfReceiver([FromRoute] string envelopeKey, CancellationToken cancel)
-    {
-        var er = await _mediator.Send(new ReadEnvelopeReceiverQuery()
-        {
-            Key = envelopeKey
-        }, cancel);
-
-        return Ok(er.SingleOrDefault());
-    }
-
     /// <summary>
     /// Ruft den Namen des zuletzt verwendeten Empfängers basierend auf der angegebenen E-Mail-Adresse ab.
     /// </summary>
@@ -200,7 +181,7 @@ public class EnvelopeReceiverController : ControllerBase
                 SELECT @OUT_SUCCESS as [@OUT_SUCCESS];";
 
         foreach (var rcv in res.SentReceiver)
-            foreach (var sign in request.Receivers.Where(r => r.EmailAddress == rcv.EmailAddress).FirstOrDefault()?.DocReceiverElements ?? Enumerable.Empty<Application.EnvelopeReceivers.Commands.DocReceiverElementCreateDto>())
+            foreach (var sign in request.Receivers.Where(r => r.EmailAddress == rcv.EmailAddress).FirstOrDefault()?.Signatures ?? Enumerable.Empty<Application.EnvelopeReceivers.Commands.Signature>())
             {
                 using SqlConnection conn = new(_cnnStr);
                 conn.Open();

EnvelopeGenerator.API/Controllers/ReadOnlyController.cs

@@ -41,14 +41,14 @@ public class ReadOnlyController : ControllerBase
     [Obsolete("Use MediatR")]
     public async Task<IActionResult> CreateAsync([FromBody] EnvelopeReceiverReadOnlyCreateDto createDto)
     {
-        var authReceiverMail = User.ReceiverMail();
+        var authReceiverMail = User.GetReceiverMailOfReceiver();
         if (authReceiverMail is null)
         {
             _logger.LogError("EmailAddress claim is not found in envelope-receiver-read-only creation process. Create DTO is:\n {dto}", JsonConvert.SerializeObject(createDto));
             return Unauthorized();
         }
 
-        var envelopeId = User.EnvelopeId();
+        var envelopeId = User.GetEnvelopeIdOfReceiver();
 
         createDto.AddedWho = authReceiverMail;
         createDto.EnvelopeId = envelopeId;

EnvelopeGenerator.API/Controllers/SignatureController.cs

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

EnvelopeGenerator.API/Documentation/AuthProxyDocumentFilter.cs

@@ -16,12 +16,6 @@ public sealed class AuthProxyDocumentFilter : IDocumentFilter
     /// <param name="swaggerDoc"></param>
     /// <param name="context"></param>
     public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
-    {
-        AddLoginOperation(swaggerDoc, context);
-        AddEnvelopeReceiverLoginOperation(swaggerDoc, context);
-    }
-
-    private static void AddLoginOperation(OpenApiDocument swaggerDoc, DocumentFilterContext context)
     {
         const string path = "/api/auth";
 
@@ -73,51 +67,4 @@ public sealed class AuthProxyDocumentFilter : IDocumentFilter
             }
         };
     }
-
-    private static void AddEnvelopeReceiverLoginOperation(OpenApiDocument swaggerDoc, DocumentFilterContext context)
-    {
-        const string path = "/api/Auth/envelope-receiver/{key}";
-
-        var bodySchema = context.SchemaGenerator.GenerateSchema(typeof(EnvelopeReceiverLogin), context.SchemaRepository);
-
-        var operation = new OpenApiOperation
-        {
-            Summary = "Envelope receiver login (auth-hub proxy)",
-            Description = "Proxies the envelope receiver login to the auth service. " +
-                          "The `cookie` query parameter is always forwarded as `true` so the auth service sets the per-envelope cookie automatically.",
-            Tags = [new() { Name = "Auth" }],
-            Parameters =
-            {
-                new OpenApiParameter
-                {
-                    Name = "key",
-                    In = ParameterLocation.Path,
-                    Required = true,
-                    Schema = new OpenApiSchema { Type = "string" },
-                    Description = "The unique envelope receiver key."
-                }
-            },
-            RequestBody = new OpenApiRequestBody
-            {
-                Required = false,
-                Content =
-                {
-                    ["multipart/form-data"] = new OpenApiMediaType { Schema = bodySchema }
-                }
-            },
-            Responses =
-            {
-                ["200"] = new OpenApiResponse { Description = "OK – per-envelope cookie set by auth service." },
-                ["401"] = new OpenApiResponse { Description = "Unauthorized – invalid or missing access code." }
-            }
-        };
-
-        swaggerDoc.Paths[path] = new OpenApiPathItem
-        {
-            Operations =
-            {
-                [OperationType.Post] = operation
-            }
-        };
-    }
 }

EnvelopeGenerator.API/EnvelopeClaimTypes.cs

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

EnvelopeGenerator.API/EnvelopeGenerator.API.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -10,9 +10,9 @@
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
     <Product>EnvelopeGenerator.GeneratorAPI</Product>
-    <Version>1.4.0</Version>
+    <Version>1.2.3</Version>
-    <FileVersion>1.4.0</FileVersion>
+    <FileVersion>1.2.3</FileVersion>
-    <AssemblyVersion>1.4.0</AssemblyVersion>
+    <AssemblyVersion>1.2.3</AssemblyVersion>
     <PackageOutputPath>Copyright © 2025 Digital Data GmbH. All rights reserved.</PackageOutputPath>
 	<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
@@ -30,17 +30,11 @@
 
   <ItemGroup>
     <PackageReference Include="AspNetCore.Scalar" Version="1.1.8" />
-    <PackageReference Include="DigitalData.Auth.Claims" Version="1.0.3" />
     <PackageReference Include="DigitalData.Auth.Client" Version="1.3.7" />
     <PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
     <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.11" Condition="'$(TargetFramework)' == 'net8.0'" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
-    <PackageReference Include="itext" Version="8.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" />
-    <PackageReference Include="itext.bouncy-castle-adapter" Version="8.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.11" Condition="'$(TargetFramework)' == 'net8.0'" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.17" Condition="'$(TargetFramework)' == 'net8.0'" />
     <PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
     <PackageReference Include="NLog" Version="5.2.5" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
@@ -77,7 +71,6 @@
     <ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
     <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
     <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
-    <ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj" />
   </ItemGroup>
 
 </Project>

EnvelopeGenerator.API/Extensions/ReceiverClaimExtensions.cs

@@ -1,6 +1,8 @@
-using DigitalData.Auth.Claims;
+using System.Linq;
-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;
 
@@ -9,14 +11,7 @@ namespace EnvelopeGenerator.API.Extensions;
 /// </summary>
 public static class ReceiverClaimExtensions
 {
-    /// <summary>
+    private static string GetRequiredClaimOfReceiver(this ClaimsPrincipal user, string claimType)
-    /// 
-    /// </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,65 +27,75 @@ public static class ReceiverClaimExtensions
         throw new InvalidOperationException(message);
     }
 
-    private static string GetRequiredClaimValue(this ClaimsPrincipal user, params string[] claimTypes)
-    {
-        foreach (var claimType in claimTypes.Where(t => !string.IsNullOrWhiteSpace(t)).Distinct())
-        {
-            var value = user.FindFirstValue(claimType);
-            if (!string.IsNullOrWhiteSpace(value))
-                return value;
-        }
-
-        var identity = user.Identity;
-        var principalName = identity?.Name ?? "(anonymous)";
-        var authType = identity?.AuthenticationType ?? "(none)";
-        var availableClaims = string.Join(", ", user.Claims.Select(c => $"{c.Type}={c.Value}"));
-        var message = $"Required claim(s) '{string.Join("', '", claimTypes)}' are missing for user '{principalName}' (auth: {authType}). Available claims: [{availableClaims}].";
-        throw new InvalidOperationException(message);
-    }
-
     /// <summary>
     /// Gets the authenticated envelope UUID from the claims.
     /// </summary>
-    public static string EnvelopeUuid(this ClaimsPrincipal user)
+    public static string GetEnvelopeUuidOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.NameIdentifier);
-        => user.GetRequiredClaimValue(EnvelopeClaimNames.EnvelopeUuid);
 
     /// <summary>
     /// Gets the authenticated receiver signature from the claims.
     /// </summary>
-    public static string ReceiverSignature(this ClaimsPrincipal user)
+    public static string GetReceiverSignatureOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.Hash);
-        => user.GetRequiredClaimValue(EnvelopeClaimNames.ReceiverSignature);
+
+    /// <summary>
+    /// Gets the authenticated receiver display name from the claims.
+    /// </summary>
+    public static string GetReceiverNameOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.Name);
 
     /// <summary>
     /// Gets the authenticated receiver email address from the claims.
     /// </summary>
-    public static string ReceiverMail(this ClaimsPrincipal user)
+    public static string GetReceiverMailOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.Email);
-        => user.GetRequiredClaimValue(JwtRegisteredClaimNames.Email);
+
+    /// <summary>
+    /// Gets the authenticated envelope title from the claims.
+    /// </summary>
+    public static string GetEnvelopeTitleOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(EnvelopeClaimTypes.Title);
 
     /// <summary>
     /// Gets the authenticated envelope identifier from the claims.
     /// </summary>
-    public static int EnvelopeId(this ClaimsPrincipal user)
+    public static int GetEnvelopeIdOfReceiver(this ClaimsPrincipal user)
     {
-        var envIdStr = user.GetRequiredClaimValue(EnvelopeClaimNames.EnvelopeId);
+        var envIdStr = user.GetRequiredClaimOfReceiver(EnvelopeClaimTypes.Id);
-        if (int.TryParse(envIdStr, out var envId))
+        if (!int.TryParse(envIdStr, out var envId))
+        {
+            throw new InvalidOperationException($"Claim '{EnvelopeClaimTypes.Id}' is not a valid integer.");
+        }
+
         return envId;
-        else
-            throw new InvalidOperationException($"Claim '{EnvelopeClaimNames.EnvelopeId}' is not a valid integer.");
     }
 
     /// <summary>
-    /// Gets the authenticated receiver identifier from the claims.
+    /// Signs in an envelope receiver using cookie authentication and attaches envelope claims.
     /// </summary>
-    /// <param name="user"></param>
+    /// <param name="context">The current HTTP context.</param>
-    /// <returns></returns>
+    /// <param name="envelopeReceiver">Envelope receiver DTO to extract claims from.</param>
-    /// <exception cref="InvalidOperationException"></exception>
+    /// <param name="receiverRole">Role to attach to the authentication ticket.</param>
-    public static int ReceiverId(this ClaimsPrincipal user)
+    public static async Task SignInEnvelopeAsync(this HttpContext context, EnvelopeReceiverDto envelopeReceiver, string receiverRole)
     {
-        var rcvIdStr = user.GetRequiredClaimValue(EnvelopeClaimNames.ReceiverId);
+        var claims = new List<Claim>
-        if (int.TryParse(rcvIdStr, out var rcvId))
+        {
-            return rcvId;
+            new(ClaimTypes.NameIdentifier, envelopeReceiver.Envelope!.Uuid),
-        else
+            new(ClaimTypes.Hash, envelopeReceiver.Receiver!.Signature),
-            throw new InvalidOperationException($"Claim '{EnvelopeClaimNames.ReceiverId}' is not a valid integer.");
+            new(ClaimTypes.Name, envelopeReceiver.Name ?? string.Empty),
+            new(ClaimTypes.Email, envelopeReceiver.Receiver.EmailAddress),
+            new(EnvelopeClaimTypes.Title, envelopeReceiver.Envelope.Title),
+            new(EnvelopeClaimTypes.Id, envelopeReceiver.Envelope.Id.ToString()),
+            new(ClaimTypes.Role, receiverRole)
+        };
+
+        var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
+
+        var authProperties = new AuthenticationProperties
+        {
+            AllowRefresh = false,
+            IsPersistent = false
+        };
+
+        await context.SignInAsync(
+            CookieAuthenticationDefaults.AuthenticationScheme,
+            new ClaimsPrincipal(claimsIdentity),
+            authProperties);
     }
 }

EnvelopeGenerator.API/Models/EnvelopeReceiverLogin.cs

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

EnvelopeGenerator.API/Options/CacheOptions.cs

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

EnvelopeGenerator.API/Program.cs

@@ -17,11 +17,8 @@ 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;
 
 var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
 logger.Info("Logging initialized!");
@@ -113,11 +110,9 @@ try
 
         options.DocumentFilter<EnvelopeGenerator.API.Documentation.AuthProxyDocumentFilter>();
     });
-#if NET9_0_OR_GREATER
     builder.Services.AddOpenApi();
-#endif
 
-    //Add EF Core dbcontext
+    //AddEF Core dbcontext
     var useDbMigration = Environment.GetEnvironmentVariable("MIGRATION_TEST_MODE") == true.ToString() || config.GetValue<bool>("UseDbMigration");
     var cnnStrName = useDbMigration ? "DbMigrationTest" : "Default";
     var connStr = config.GetConnectionString(cnnStrName)
@@ -136,7 +131,7 @@ try
         options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
         options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
     })
-        .AddJwtBearer(AuthScheme.Sender, opt =>
+        .AddJwtBearer(opt =>
         {
             opt.TokenValidationParameters = new TokenValidationParameters
             {
@@ -168,61 +163,6 @@ try
                     return Task.CompletedTask;
                 }
             };
-        })
-        // Per-envelope receiver scheme: reads the JWT from the cookie named
-        // AuthTokenSignFLOWReceiver.{envelope_key} where envelope_key is the
-        // last path segment of the request URL.
-        // This enables simultaneous authentication for multiple envelopes
-        // within the same browser session.
-        .AddJwtBearer(AuthScheme.Receiver, opt =>
-        {
-            opt.TokenValidationParameters = new TokenValidationParameters
-            {
-                ValidateIssuerSigningKey = true,
-                IssuerSigningKeyResolver = (token, securityToken, identifier, parameters) =>
-                {
-                    var clientParams = deferredProvider.GetOptions<ClientParams>();
-                    var publicKey = clientParams!.PublicKeys.Get(authTokenKeys.Issuer, authTokenKeys.Audience);
-                    return [publicKey.SecurityKey];
-                },
-                ValidateIssuer = true,
-                ValidIssuer = authTokenKeys.Issuer,
-                ValidateAudience = true,
-                ValidAudience = authTokenKeys.Audience,
-            };
-
-            opt.Events = new JwtBearerEvents
-            {
-                OnMessageReceived = context =>
-                {
-                    var paths = context.Request.Path.Value?.Split('/', StringSplitOptions.RemoveEmptyEntries);
-
-                    // Derive the envelope key from the last route segment: /{envelope_key}
-                    var envelopeKey = paths?.LastOrDefault();
-
-                    if (envelopeKey is not null)
-                    {
-                        var cookieName = CookieNames.GetEnvelopeReceiverCookieName(authTokenKeys.Cookie, envelopeKey);
-                        if (context.Request.Cookies.TryGetValue(cookieName, out var cookieToken) && cookieToken is not null)
-                            context.Token = cookieToken;
-                    }
-
-                    return Task.CompletedTask;
-                },
-                OnTokenValidated = context =>
-                {
-                    var paths = context.Request.Path.Value?.Split('/', StringSplitOptions.RemoveEmptyEntries);
-                    var envelopeKey = paths?.LastOrDefault();
-
-                    var sub = context.Principal?.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value
-                           ?? context.Principal?.FindFirst("sub")?.Value;
-
-                    if (envelopeKey is null || sub != envelopeKey)
-                        context.Fail("Envelope key in the path does not match the token subject.");
-
-                    return Task.CompletedTask;
-                }
-            };
         });
 
     // Authentication
@@ -238,16 +178,14 @@ try
     });
 
     builder.Services.AddAuthorizationBuilder()
-        .AddPolicy(AuthPolicy.SenderOrReceiver, policy => policy.RequireRole(Role.Sender, Role.Receiver.Full))
+        .AddPolicy(AuthPolicy.SenderOrReceiver, policy =>
-
+            policy.RequireRole(Role.Sender, Role.Receiver.Full))
-        .AddPolicy(AuthPolicy.Sender, policy => policy
+        .AddPolicy(AuthPolicy.Sender, policy =>
-            .RequireRole(Role.Sender)
+            policy.RequireRole(Role.Sender))
-            .AddAuthenticationSchemes(AuthScheme.Sender))
+        .AddPolicy(AuthPolicy.Receiver, policy =>
-        .AddPolicy(AuthPolicy.Receiver, policy => policy
+            policy.RequireRole(Role.Receiver.Full))
-            .AddAuthenticationSchemes(AuthScheme.Receiver)
+        .AddPolicy(AuthPolicy.ReceiverTFA, policy =>
-            .RequireAuthenticatedUser()
+            policy.RequireRole(Role.Receiver.TFA));
-            .RequireRole(Role.Receiver.Full, "receiver"))
-        .AddPolicy(AuthPolicy.ReceiverTFA, policy => policy.RequireRole(Role.Receiver.TFA));
 
     // User manager
 #pragma warning disable CS0618 // Type or member is obsolete
@@ -261,20 +199,6 @@ try
     // Localizer
     builder.Services.AddCookieBasedLocalizer();
 
-    // Cache options
-    builder.Services.Configure<CacheOptions>(config.GetSection(CacheOptions.SectionName));
-
-    // Distributed Cache - SQL Server
-    builder.Services.AddDistributedSqlServerCache(options =>
-    {
-        config.GetSection("Cache:SqlServer").Bind(options);
-        
-        if (string.IsNullOrWhiteSpace(options.ConnectionString))
-        {
-            options.ConnectionString = connStr;
-        }
-    });
-
     // Envelope generator serives
 #pragma warning disable CS0618 // Type or member is obsolete
     builder.Services
@@ -300,9 +224,7 @@ try
 
     app.UseMiddleware<ExceptionHandlingMiddleware>();
 
-#if NET9_0_OR_GREATER
     app.MapOpenApi();
-#endif
 
     // Configure the HTTP request pipeline.
     if (app.Environment.IsDevelopment() || (app.IsDevOrDiP() && config.GetValue<bool>("UseSwagger")))
@@ -336,10 +258,8 @@ try
     app.UseAuthentication();
     app.UseAuthorization();
 
-    app.MapControllers();
-
-    // Catch-all YARP proxy — only forward requests that are not swagger/scalar/openapi paths.
     app.MapReverseProxy();
+    app.MapControllers();
 
     app.Run();
 }

EnvelopeGenerator.API/Properties/PublishProfiles/IISProfileNet8.pubxml

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

EnvelopeGenerator.API/appsettings.Development.json

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

EnvelopeGenerator.API/appsettings.json

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

EnvelopeGenerator.API/yarp.json

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

EnvelopeGenerator.Application/Common/Dto/AnnotationDto.cs

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

EnvelopeGenerator.Application/Common/Dto/DocumentDto.cs

@@ -31,5 +31,5 @@ public class DocumentDto
     /// <summary>
     /// Gets or sets the collection of elements associated with the document for receiver interactions, if any.
     /// </summary>
-    public IEnumerable<DocReceiverElementDto>? Elements { get; set; }
+    public IEnumerable<SignatureDto>? Elements { get; set; }
 }

EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs

@@ -1,12 +1,9 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
 using DigitalData.UserManager.Application.DTOs.User;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Domain.Interfaces;
 using Microsoft.AspNetCore.Mvc;
-using System.Text.Json.Serialization;
 
 namespace EnvelopeGenerator.Application.Common.Dto;
 
@@ -129,9 +126,4 @@ public record EnvelopeDto : IEnvelope
     /// 
     /// </summary>
     public IEnumerable<DocumentDto>? Documents { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public IEnumerable<ReceiverDto>? Receivers { get; set; }
 }

EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs

@@ -23,10 +23,10 @@ public class MappingProfile : Profile
     {
         // Entity to DTO mappings
         CreateMap<Config, ConfigDto>();
-        CreateMap<DocReceiverElement, DocReceiverElementDto>();
+        CreateMap<Signature, SignatureDto>();
         CreateMap<DocumentStatus, DocumentStatusDto>();
         CreateMap<EmailTemplate, EmailTemplateDto>();
-        CreateMap<Envelope, EnvelopeDto>().ForMember(dest => dest.Receivers, opt => opt.MapFrom(src => src.EnvelopeReceivers.Select(er => er.Receiver)));
+        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));
@@ -39,10 +39,7 @@ public class MappingProfile : Profile
 
         // DTO to Entity mappings
         CreateMap<ConfigDto, Config>();
-        CreateMap<DocReceiverElementDto, DocReceiverElement>();
+        CreateMap<SignatureDto, Signature>();
-        CreateMap<Signature, DocReceiverElement>()
-            .ForMember(dest => dest.Ink, opt => opt.MapFrom(src => src.DataUrl.MapDataUrlToRequiredBytes()))
-            .MapChangedWhen();
         CreateMap<DocumentStatusDto, DocumentStatus>();
         CreateMap<EmailTemplateDto, EmailTemplate>();
         CreateMap<EnvelopeDto, Envelope>();

EnvelopeGenerator.Application/Common/Dto/PsPdfKitAnnotation.cs

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

EnvelopeGenerator.Application/Common/Dto/Signature.cs

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

EnvelopeGenerator.Application/Common/Dto/SignatureDto.cs

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

EnvelopeGenerator.Application/Common/Extensions/AutoMapperAuditingExtensions.cs

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

EnvelopeGenerator.Application/Common/Notifications/SendMailHandler.cs

@@ -113,7 +113,7 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
             EmailAddress = notification.EmailAddress,
             EmailBody = temp.Body,
             EmailSubj = temp.Subject,
-            AddedWhen = DateTime.Now,
+            AddedWhen = DateTime.UtcNow,
             AddedWho = DispatcherParams.AddedWho,
             SendingProfile = DispatcherParams.SendingProfile,
             ReminderTypeId = DispatcherParams.ReminderTypeId,

EnvelopeGenerator.Application/DependencyInjection.cs

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

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/AnnotationBehavior.cs

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

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/DocStatusBehavior.cs

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

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/EnvelopeReceiverResolutionBehavior.cs

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

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/HistoryBehavior.cs

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

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/SaveSignatureBehavior.cs

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

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/SendSignedMailBehavior.cs

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

EnvelopeGenerator.Application/DocReceiverElements/Commands/SigningCommand.cs

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

EnvelopeGenerator.Application/DocReceiverElements/Queries/ReadDocReceiverElementQuery.cs

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

EnvelopeGenerator.Application/DocStatus/MappingProfile.cs

@@ -27,7 +27,7 @@ public class MappingProfile : Profile
         CreateMap<UpdateDocStatusCommand, DocumentStatus>()
         .ForMember(dest => dest.Envelope, opt => opt.Ignore())
         .ForMember(dest => dest.Receiver, opt => opt.Ignore())
-        .ForMember(dest => dest.StatusChangedWhen, opt => opt.MapFrom(src => DateTime.Now))
+        .ForMember(dest => dest.StatusChangedWhen, opt => opt.MapFrom(src => DateTime.UtcNow))
         .MapChangedWhen();
     }
 }

EnvelopeGenerator.Application/Documents/Queries/ReadDocumentQuery.cs

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

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverCommand.cs

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

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverSecretQuery.cs

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

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs

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

EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs

@@ -22,7 +22,7 @@ public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest<IEnumerable<Envelo
     /// <summary>
     /// Optionaler Benutzerfilter; wenn gesetzt, werden nur Umschläge des Benutzers geladen.
     /// </summary>
-    internal int? UserId { get; init; }
+    public int? UserId { get; init; }
 
     /// <summary>
     /// Setzt den Benutzerkontext für die Abfrage.
@@ -133,7 +133,7 @@ public class ReadEnvelopeQueryHandler : IRequestHandler<ReadEnvelopeQuery, IEnum
         }
 
         var envelopes = await query
-            .Include(e => e.EnvelopeReceivers).ThenInclude(er => er.Receiver)
+            .Include(e => e.Documents)
             .ToListAsync(cancel);
 
         return _mapper.Map<IEnumerable<EnvelopeDto>>(envelopes);

EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs

@@ -34,7 +34,7 @@ public record CreateHistoryCommand : EnvelopeReceiverQueryBase, IRequest<History
     /// <summary>
     /// 
     /// </summary>
-    public DateTime AddedWhen { get; } = DateTime.Now;
+    public DateTime AddedWhen { get; } = DateTime.UtcNow;
 
     /// <summary>
     /// 

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

@@ -448,7 +448,7 @@
     <value>Document has been reset.</value>
   </data>
   <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
-    <value>Document successfully read and confirmed!</value>
+    <value>Document successfully red and confirmed!</value>
   </data>
   <data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
     <value>You have read and confirmed the document. You will receive a written confirmation afterwards.</value>

EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs

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

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

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

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -15,7 +15,6 @@ Imports DigitalData.Core.Abstraction.Application
 Imports EnvelopeGenerator.Infrastructure
 Imports Microsoft.EntityFrameworkCore
 Imports DigitalData.Core.Abstractions
-Imports EnvelopeGenerator.Domain.Interfaces
 
 Namespace Jobs
     Public Class FinalizeDocumentJob
@@ -351,7 +350,7 @@ Namespace Jobs
                 Logger.Warn($"No SendFinalEmailToCreator - oMailToCreator [{oMailToCreator}] <> [{FinalEmailType.No}] ")
             End If
 
-            If oMailToReceivers <> FinalEmailType.No And pEnvelope.IsReadAndSign() Then
+            If oMailToReceivers <> FinalEmailType.No Then
                 Logger.Debug("Sending emails to receivers..")
                 SendFinalEmailToReceivers(pEnvelope) ', pAttachment
             Else

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurner.vb

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

EnvelopeGenerator.CommonServices/Models/ElementModel.vb

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

EnvelopeGenerator.DependencyInjection/DependencyInjection.cs

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

EnvelopeGenerator.DependencyInjection/EnvelopeGenerator.DependencyInjection.csproj

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

EnvelopeGenerator.Domain/Constants/SenderAppType.cs

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

EnvelopeGenerator.Domain/Entities/Document.cs

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

EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs

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

EnvelopeGenerator.Domain/Entities/Envelope.cs

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

EnvelopeGenerator.Domain/Entities/Signature.cs

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

EnvelopeGenerator.Domain/Interfaces/ISignature.cs

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

EnvelopeGenerator.Form/Controllers/FieldEditorController.vb

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

EnvelopeGenerator.Form/frmFieldEditor.vb

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

EnvelopeGenerator.Infrastructure/DependencyInjection.cs

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

EnvelopeGenerator.Infrastructure/EGDbContext.cs

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

EnvelopeGenerator.Infrastructure/Repositories/DocumentReceiverElementRepository.cs

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

EnvelopeGenerator.PdfEditor/Pdf.cs

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

EnvelopeGenerator.ReceiverUI/App.razor

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

EnvelopeGenerator.ReceiverUI/Data/Adjustment.cs

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

EnvelopeGenerator.ReceiverUI/Data/Customer.cs

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

EnvelopeGenerator.ReceiverUI/Data/DataItem.cs

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

EnvelopeGenerator.ReceiverUI/Data/DataItemList.cs

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

EnvelopeGenerator.ReceiverUI/Data/DeterministicRandom.cs

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

EnvelopeGenerator.ReceiverUI/Data/Term.cs

@@ -1,15 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Data {
-    public struct Term {
-        public static readonly Term[] Terms = new Term[] {
-            new Term("Payment seven days after invoice date" ),
-            new Term("Payment ten days after invoice date" ),
-            new Term("End of month" ),
-            new Term("21st of the month following invoice date" ),
-        };
-        readonly string currentName;
-        public string Name { get { return currentName; } }
-        public Term(string currentName) {
-            this.currentName = currentName;
-        }
-    }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.csproj

@@ -1,51 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <WasmBuildNative>true</WasmBuildNative>
-	<InvariantGlobalization>false</InvariantGlobalization>
-	<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
-	  
-	<Nullable>enable</Nullable>
-	<PackageId>EnvelopeGenerator.ReceiverUI</PackageId>
-	<Authors>Digital Data GmbH</Authors>
-	<Company>Digital Data GmbH</Company>
-	<Product>EnvelopeGenerator.ReceiverUI</Product>
-	<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.2</Version>
-	<!-- NuGet package version -->
-	<AssemblyVersion>1.4.2.0</AssemblyVersion>
-	<!-- Assembly version for API compatibility -->
-	<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="HarfBuzzSharp.NativeAssets.WebAssembly" Version="8.3.1.2" />
-    <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" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.11" PrivateAssets="all" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\PublishProfiles\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Update="wwwroot\docs\privacy-policy.en-US.html">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="wwwroot\docs\privacy-policy.fr-FR.html">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-</Project>

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/Constants/SenderAppType.cs

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

EnvelopeGenerator.ReceiverUI/Models/Constants/UnitOfLength.cs

@@ -1,65 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Models.Constants;
-
-/// <summary>
-/// Represents the unit of measurement for coordinate values in signature positioning.
-/// Used for converting coordinates between different systems (GdPicture14, PDF.js, iText7).
-/// </summary>
-public enum UnitOfLength
-{
-    /// <summary>
-    /// Inch unit (1 inch = 25.4 mm).
-    /// This is the native unit used by GdPicture14 (EnvelopeGenerator.Form - Legacy VB.NET app).
-    /// Database stores all coordinates (X, Y, Width, Height) in INCHES.
-    /// </summary>
-    /// <remarks>
-    /// <b>Source:</b> GdPicture14.Annotations.AnnotationStickyNote uses INCHES natively.
-    /// <br/>
-    /// <b>Evidence:</b> VB.NET code directly assigns database values to annotation properties without conversion:
-    /// <code>
-    /// oAnnotation.Left = CSng(pElement.X)   ' Direct assignment → INCHES
-    /// oAnnotation.Top = CSng(pElement.Y)
-    /// </code>
-    /// <b>Standard Page Dimensions:</b>
-    /// <list type="bullet">
-    ///   <item>A4: 8.27" × 11.69" (210mm × 297mm)</item>
-    ///   <item>Letter: 8.5" × 11"</item>
-    /// </list>
-    /// </remarks>
-    Inch = 0,
-
-    /// <summary>
-    /// PDF Point unit (1 point = 1/72 inch).
-    /// This is the standard unit used by PDF specification and PDF.js viewer.
-    /// </summary>
-    /// <remarks>
-    /// <b>Definition:</b> According to PDF specification and Microsoft documentation:
-    /// <br/>
-    /// <i>"PDF pages are sized in point units. 1 pt == 1/72 inch"</i>
-    /// <br/><br/>
-    /// <b>Conversion Formula:</b>
-    /// <code>
-    /// points = inches * 72.0
-    /// inches = points / 72.0
-    /// </code>
-    /// <b>Important:</b> Point ≠ Pixel!
-    /// <list type="bullet">
-    ///   <item><b>Point (pt):</b> Device-independent unit (always 1/72 inch)</item>
-    ///   <item><b>Pixel (px):</b> Device-dependent unit (varies with screen DPI)</item>
-    ///   <item>At 72 DPI: 1 point = 1 pixel (coincidence)</item>
-    ///   <item>At 96 DPI: 1 point ≈ 1.33 pixels</item>
-    ///   <item>At 300 DPI: 1 point ≈ 4.17 pixels</item>
-    /// </list>
-    /// <b>Standard Page Dimensions (in points):</b>
-    /// <list type="bullet">
-    ///   <item>A4: 595 × 842 points (8.27" × 11.69" × 72)</item>
-    ///   <item>Letter: 612 × 792 points (8.5" × 11" × 72)</item>
-    /// </list>
-    /// <b>Usage in EnvelopeGenerator:</b>
-    /// <list type="bullet">
-    ///   <item>PDF.js viewer expects coordinates in points</item>
-    ///   <item>iText7 library uses points for PDF manipulation</item>
-    ///   <item>PSPDFKit (Web) uses points for annotation placement</item>
-    /// </list>
-    /// </remarks>
-    Point
-}

EnvelopeGenerator.ReceiverUI/Models/EnvelopeReceiverDto.cs

@@ -1,106 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Models;
-
-/// <summary>
-/// Client-side model for the envelope receiver returned by
-/// <c>GET api/EnvelopeReceiver/{envelopeKey}</c>.
-/// </summary>
-public record EnvelopeReceiverDto
-{
-    public int EnvelopeId { get; init; }
-    public int ReceiverId { get; init; }
-    public int Sequence { get; init; }
-
-    public string? Name { get; init; }
-    public string? JobTitle { get; init; }
-    public string? CompanyName { get; init; }
-    public string? PrivateMessage { get; init; }
-
-    public DateTime AddedWhen { get; init; }
-    public DateTime? ChangedWhen { get; init; }
-    public bool HasPhoneNumber { get; init; }
-
-    public EnvelopeClientDto? Envelope { get; init; }
-    public ReceiverClientDto? Receiver { get; init; }
-}
-
-/// <summary>
-/// Client-side model for the envelope data embedded in <see cref="EnvelopeReceiverDto"/>.
-/// </summary>
-public record EnvelopeClientDto
-{
-    public int Id { get; init; }
-    public int UserId { get; init; }
-    public int Status { get; init; }
-    public string StatusName { get; init; } = string.Empty;
-    public string Uuid { get; init; } = string.Empty;
-    public string Title { get; init; } = string.Empty;
-    public string Message { get; init; } = string.Empty;
-    public DateTime AddedWhen { get; init; }
-    public DateTime? ChangedWhen { get; init; }
-    public string Language { get; init; } = "de-DE";
-    public int? EnvelopeTypeId { get; init; }
-    public string? EnvelopeTypeTitle { get; init; }
-    public int? ContractType { get; init; }
-    public int? CertificationType { get; init; }
-    public bool UseAccessCode { get; init; }
-    public bool TFAEnabled { get; init; }
-    public IEnumerable<DocumentClientDto>? Documents { get; init; }
-    public EnvelopeSenderDto? User { get; init; }
-}
-
-/// <summary>
-/// Sender (user) information embedded in <see cref="EnvelopeClientDto"/>.
-/// </summary>
-public record EnvelopeSenderDto
-{
-    public int Id { get; init; }
-    public string? Username { get; init; }
-    public string? FullName { get; init; }
-    public string? Email { get; init; }
-}
-
-/// <summary>
-/// Client-side model for a document embedded in <see cref="EnvelopeClientDto"/>.
-/// </summary>
-public record DocumentClientDto
-{
-    public int Id { get; init; }
-    public int EnvelopeId { get; init; }
-    public DateTime AddedWhen { get; init; }
-    public IEnumerable<SignatureClientDto>? Elements { get; init; }
-}
-
-/// <summary>
-/// Client-side model for a signature/annotation element embedded in <see cref="DocumentClientDto"/>.
-/// </summary>
-public record SignatureClientDto
-{
-    public int Id { get; init; }
-    public int DocumentId { get; init; }
-    public int ReceiverId { get; init; }
-    public int ElementType { get; init; }
-    public double X { get; init; }
-    public double Y { get; init; }
-    public double Width { get; init; }
-    public double Height { get; init; }
-    public int Page { get; init; }
-    public bool Required { get; init; }
-    public string? Tooltip { get; init; }
-    public bool ReadOnly { get; init; }
-    public int AnnotationIndex { get; init; }
-    public DateTime AddedWhen { get; init; }
-    public DateTime? ChangedWhen { get; init; }
-}
-
-/// <summary>
-/// Client-side model for the receiver data embedded in <see cref="EnvelopeReceiverDto"/>.
-/// </summary>
-public record ReceiverClientDto
-{
-    public int Id { get; init; }
-    public string? EmailAddress { get; init; }
-    public string? Signature { get; init; }
-    public DateTime AddedWhen { get; init; }
-    public DateTime? TfaRegDeadline { get; init; }
-}
-

EnvelopeGenerator.ReceiverUI/Models/SignatureCaptureDto.cs

@@ -1,62 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Models;
-
-/// <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
-/// <br/>
-/// <b>Storage:</b> Session-only (Blazor component state, lost on page refresh)
-/// <br/>
-/// <b>Rendering:</b> Applied signatures display: Image + Separator + Name/Position/Place/Date
-/// </remarks>
-public sealed record SignatureCaptureDto
-{
-    /// <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>Display:</b> Bold text in applied signature block
-    /// <br/>
-    /// <b>Example:</b> "Max Mustermann"
-    /// </summary>
-    public required string FullName { get; init; }
-
-    /// <summary>
-    /// Job title or position of the signer.
-    /// <br/>
-    /// <b>Required:</b> No (optional field)
-    /// <br/>
-    /// <b>Display:</b> Normal weight text between name and place/date
-    /// <br/>
-    /// <b>Example:</b> "Geschäftsführer" or empty string
-    /// </summary>
-    public string Position { get; init; } = string.Empty;
-
-    /// <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.ReceiverUI/Models/SignatureDto.cs

@@ -1,101 +0,0 @@
-using EnvelopeGenerator.ReceiverUI.Models.Constants;
-
-namespace EnvelopeGenerator.ReceiverUI.Models;
-
-/// <summary>
-/// Represents a signature position on a PDF page.
-/// Coordinates stored in INCHES (GdPicture14 native unit).
-/// Origin: Top-left corner, X increases right, Y increases down.
-/// </summary>
-public class SignatureDto
-{
-    /// <summary>Unique identifier.</summary>
-    public int Id { get; init; }
-
-    private double _x;
-    private double _y;
-
-    /// <summary>Horizontal position in INCHES from left edge.</summary>
-    public double X 
-    { 
-        get => _x * Factor;
-        init => _x = value; 
-    }
-
-    /// <summary>Vertical position in INCHES from top edge.</summary>
-    public double Y 
-    { 
-        get => _y * Factor;
-        init => _y = value; 
-    }
-
-    /// <summary>1-based page number.</summary>
-    public int Page { get; init; }
-
-    /// <summary>Sender application type that created this signature.</summary>
-    public SenderAppType SenderAppType { get; init; }
-
-    private UnitOfLength _unitOfLength;
-
-    public SignatureDto Convert(UnitOfLength unitOfLength)
-    {
-        _unitOfLength = unitOfLength;
-        return this;
-    }
-
-    public double Factor
-    {
-        get
-        {
-            if (SenderAppType != SenderAppType.LegacyFormApp)
-            {
-                throw new NotImplementedException(
-                    $"SenderAppType '{SenderAppType}' is not yet implemented. " +
-                    $"Currently, only '{nameof(SenderAppType.LegacyFormApp)}' is supported. " +
-                    $"Future implementations will handle '{nameof(SenderAppType.ReceiverUIBlazorApp)}' and other types.");
-            }
-
-            // LegacyFormApp uses GdPicture14 with INCHES
-            return _unitOfLength switch
-            {
-                UnitOfLength.Inch => 1.0,   // No conversion needed: INCHES → INCHES
-                UnitOfLength.Point => 72.0, // INCHES → PDF Points: 1 inch = 72 points (PDF standard, NOT pixels!)
-                _ => throw new InvalidOperationException(
-                    $"Unknown UnitOfLength: {_unitOfLength}. Expected '{nameof(UnitOfLength.Inch)}' or '{nameof(UnitOfLength.Point)}'.")
-            };
-        }
-    }
-}
-
-public static class SignatureDtoExtensions
-{
-    /// <summary>
-    /// Converts all signatures in the collection to the specified unit of length.
-    /// </summary>
-    /// <typeparam name="T">Type of the collection (IEnumerable, List, etc.)</typeparam>
-    /// <param name="signatures">Collection of SignatureDto objects to convert.</param>
-    /// <param name="unitOfLength">Target unit of measurement (Inch or Point).</param>
-    /// <returns>The same collection with all signatures converted to the specified unit.</returns>
-    /// <exception cref="ArgumentNullException">Thrown when signatures collection is null.</exception>
-    /// <remarks>
-    /// <b>Usage:</b>
-    /// <code>
-    /// var signatures = await SignatureService.GetAsync(envelopeKey);
-    /// var convertedSignatures = signatures.ConvertAll(UnitOfLength.Point);
-    /// </code>
-    /// <b>Note:</b> This method modifies each SignatureDto object in place and returns the same collection.
-    /// </remarks>
-    public static T Convert<T>(this T signatures, UnitOfLength unitOfLength) 
-        where T : IEnumerable<SignatureDto>
-    {
-        if (signatures == null)
-            throw new ArgumentNullException(nameof(signatures));
-
-        foreach (var signature in signatures)
-        {
-            signature.Convert(unitOfLength);
-        }
-
-        return signatures;
-    }
-}

EnvelopeGenerator.ReceiverUI/NOTICE.txt

@@ -1,12 +0,0 @@
-The following open source libraries are used and included within thеse sample/demonstration projects:
-
-Bootstrap (Open Source – MIT License)
-Copyright (c) 2011-2021 Twitter, Inc. / Copyright (c) 2011-2021 The Bootstrap Authors
-https://github.com/twbs/bootstrap/blob/main/LICENSE
-
-open-iconic (Open Source – MIT License and SIL Open Font License)
-Copyright (c) 2014 Waybury
-https://github.com/iconic/open-iconic/blob/master/ICON-LICENSE
-https://github.com/iconic/open-iconic/blob/master/FONT-LICENSE
-
-The open source libraries included in these sample/demonstration projects are done so pursuant to each individual open source library license and subject to the disclaimers and limitations on liability set forth in each open source library license.

EnvelopeGenerator.ReceiverUI/Options/ApiOptions.cs

@@ -1,10 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Options;
-
-public class ApiOptions
-{
-    public const string SectionName = "Api";
-
-    public string BaseUrl { get; set; } = string.Empty;
-
-    public bool UsePredefinedReports { get; set; } = false;
-}

EnvelopeGenerator.ReceiverUI/Options/PdfViewerOptions.cs

@@ -1,71 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Options;
-
-public class PdfViewerOptions
-{
-    public const string SectionName = "PdfViewer";
-
-    /// <summary>
-    /// Base scale for thumbnail rendering (0.2 - 1.5 recommended)
-    /// Higher values = better quality but slower rendering
-    /// Default: 0.75
-    /// </summary>
-    public double ThumbnailBaseScale { get; set; } = 0.75;
-
-    /// <summary>
-    /// Enable HiDPI/Retina support for thumbnails
-    /// Default: true
-    /// </summary>
-    public bool ThumbnailEnableHiDPI { get; set; } = true;
-
-    /// <summary>
-    /// Maximum device pixel ratio multiplier for thumbnails (1.0 - 3.0)
-    /// Caps DPR to avoid excessive memory usage on 4K+ displays
-    /// Default: 2.0
-    /// </summary>
-    public double ThumbnailMaxDPR { get; set; } = 2.0;
-
-    /// <summary>
-    /// Enable HiDPI/Retina support for main PDF canvas
-    /// Default: true
-    /// </summary>
-    public bool MainCanvasEnableHiDPI { get; set; } = true;
-
-    /// <summary>
-    /// Maximum device pixel ratio multiplier for main canvas (1.0 - 3.0)
-    /// Default: 2.0
-    /// </summary>
-    public double MainCanvasMaxDPR { get; set; } = 2.0;
-
-    /// <summary>
-    /// Enable smooth zoom transition (fade effect)
-    /// Default: true
-    /// </summary>
-    public bool EnableSmoothZoom { get; set; } = true;
-
-    /// <summary>
-    /// Zoom transition duration in milliseconds (50 - 500)
-    /// Default: 150
-    /// </summary>
-    public int ZoomTransitionDuration { get; set; } = 150;
-
-    /// <summary>
-    /// Opacity during rendering (0.0 - 1.0)
-    /// Lower values = more visible fade effect
-    /// Default: 0.85
-    /// </summary>
-    public double RenderingOpacity { get; set; } = 0.85;
-
-    /// <summary>
-    /// Delay between thumbnail renders in milliseconds (10 - 200)
-    /// Higher values = less browser stress, slower initial load
-    /// Default: 50
-    /// </summary>
-    public int ThumbnailRenderDelay { get; set; } = 50;
-
-    /// <summary>
-    /// Zoom step percentage (1 - 50)
-    /// Controls how much zoom changes per click or scroll
-    /// Default: 5 (5% per step)
-    /// </summary>
-    public int ZoomStepPercentage { get; set; } = 5;
-}

EnvelopeGenerator.ReceiverUI/Pages/EnvelopeReceiverPage_DxPdfViewer.razor

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

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

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

@@ -1,7 +0,0 @@
-@page "/sender"
-
-<h3>EnvelopeSender</h3>
-
-@code {
-
-}

EnvelopeGenerator.ReceiverUI/Pages/Example/DocumentViewer.razor

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

EnvelopeGenerator.ReceiverUI/Pages/Example/ReportDesigner.razor

@@ -1,19 +0,0 @@
-@page "/example/sender"
-@using DevExpress.DataAccess.Json;
-@using EnvelopeGenerator.ReceiverUI.Services;
-
-<DxReportDesigner ReportName="LargeDatasetReport" CssClass="dx-blazor-reporting-container" Height="@null" Width="@null" AllowMDI="true" DataSources="DataSources">
-    <DxReportDesignerWizardSettings UseFullscreenWizard="true" />
-</DxReportDesigner>
-
-@code {
-    Dictionary<string, object> DataSources = new Dictionary<string, object>();
-    protected override async Task OnInitializedAsync() {
-        await base.OnInitializedAsync();
-        var connection = CustomDataSourceWizardJsonDataConnectionStorage.GetDefaultConnection();
-        JsonDataSource jsonDataSource = new JsonDataSource();
-        jsonDataSource.JsonSource = connection.GetJsonSource();
-        await jsonDataSource.FillAsync();
-        DataSources.Add("Northwind", jsonDataSource);
-    }
-}

EnvelopeGenerator.ReceiverUI/Pages/Example/ReportViewer.razor

@@ -1,746 +0,0 @@
-@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 Microsoft.JSInterop
-@using XtraReport = DevExpress.XtraReports.UI.XtraReport
-@using BottomMarginBand = DevExpress.XtraReports.UI.BottomMarginBand
-@using XRLabel = DevExpress.XtraReports.UI.XRLabel
-@using XRPictureBox = DevExpress.XtraReports.UI.XRPictureBox
-@using XRControl = DevExpress.XtraReports.UI.XRControl
-@using ImageSizeMode = DevExpress.XtraPrinting.ImageSizeMode
-@using EnvelopeGenerator.ReceiverUI.Services
-@using DevExpress.Blazor.Reporting
-@using Microsoft.Extensions.Options
-@using EnvelopeGenerator.ReceiverUI.Options
-@using EnvelopeGenerator.ReceiverUI.Models
-@implements IDisposable
-@inject IJSRuntime JSRuntime
-@inject AnnotationService AnnotationService
-@inject IOptions<ApiOptions> AppOptions
-@inject NavigationManager Navigation
-@inject InMemoryReportStorageWebExtension ReportStorage
-@inject EnvelopeGenerator.ReceiverUI.Services.DocumentService DocumentService
-@inject EnvelopeGenerator.ReceiverUI.Services.AuthService AuthService
-@inject EnvelopeGenerator.ReceiverUI.Services.EnvelopeReceiverService EnvelopeReceiverService
-
-<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" />
-
-<div class="receiver-page-layout">
-
-<div class="receiver-signature-panel">
-
-@* ?? Envelope info header ???????????????????????????????????????????????? *@
-@if (_envelopeReceiver is not null) {
-<div class="receiver-info-header">
-    <div class="receiver-info-header__gradient">
-        <div class="receiver-info-header__left">
-            <svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" fill="currentColor" class="receiver-info-header__icon" 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="receiver-info-header__title">@(_envelopeReceiver.Envelope?.Title ?? "Dokument")</div>
-                @if (!string.IsNullOrWhiteSpace(_envelopeReceiver.Envelope?.User?.FullName) || !string.IsNullOrWhiteSpace(_envelopeReceiver.Envelope?.User?.Email)) {
-                    <div class="receiver-info-header__sender">
-                        Von
-                        @if (!string.IsNullOrWhiteSpace(_envelopeReceiver.Envelope?.User?.FullName)) {
-                            <strong>@_envelopeReceiver.Envelope!.User!.FullName</strong>
-                        }
-                        @if (!string.IsNullOrWhiteSpace(_envelopeReceiver.Envelope?.User?.Email)) {
-                            <span class="opacity-75">&lt;@_envelopeReceiver.Envelope!.User!.Email&gt;</span>
-                        }
-                        &nbsp;&middot;&nbsp; @_envelopeReceiver.Envelope?.AddedWhen.ToString("dd.MM.yyyy")
-                    </div>
-                }
-            </div>
-        </div>
-        <div class="receiver-info-header__badges">
-            @if (!string.IsNullOrWhiteSpace(_envelopeReceiver.Name)) {
-                <span class="receiver-info-badge">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="currentColor" class="me-1" viewBox="0 0 16 16">
-                        <path d="M8 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6Zm2-3a2 2 0 1 1-4 0 2 2 0 0 1 4 0Zm4 8c0 1-1 1-1 1H3s-1 0-1-1 1-4 6-4 6 3 6 4Z"/>
-                    </svg>
-                    @_envelopeReceiver.Name
-                </span>
-            }
-            @if (!string.IsNullOrWhiteSpace(_envelopeReceiver.CompanyName)) {
-                <span class="receiver-info-badge">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="currentColor" class="me-1" viewBox="0 0 16 16">
-                        <path d="M14.763.075A.5.5 0 0 1 15 .5v15a.5.5 0 0 1-.5.5h-3a.5.5 0 0 1-.5-.5V14h-1v1.5a.5.5 0 0 1-.5.5h-9a.5.5 0 0 1-.5-.5V10a.5.5 0 0 1 .342-.474L6 7.64V4.5a.5.5 0 0 1 .276-.447l8-4a.5.5 0 0 1 .487.022Z"/>
-                    </svg>
-                    @_envelopeReceiver.CompanyName
-                </span>
-            }
-            @if (!string.IsNullOrWhiteSpace(_envelopeReceiver.JobTitle)) {
-                <span class="receiver-info-badge receiver-info-badge--muted">@_envelopeReceiver.JobTitle</span>
-            }
-            @{
-                var docElements = _envelopeReceiver.Envelope?.Documents?.FirstOrDefault()?.Elements;
-                int sigCount = docElements?.Count() ?? _annotations.Count;
-            }
-            @if (sigCount > 0) {
-                <span class="receiver-info-badge receiver-info-badge--accent">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="currentColor" class="me-1" 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>
-                    @sigCount @(sigCount == 1 ? "Unterschriftsfeld" : "Unterschriftsfelder")
-                </span>
-            }
-        </div>
-    </div>
-    @if (!string.IsNullOrWhiteSpace(_envelopeReceiver.Envelope?.Message)) {
-        <div class="receiver-info-message">@_envelopeReceiver.Envelope!.Message</div>
-    }
-    @if (!string.IsNullOrWhiteSpace(_envelopeReceiver.PrivateMessage)) {
-        <div class="receiver-info-private-message">
-            <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" class="me-1 flex-shrink-0" 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>
-            @_envelopeReceiver.PrivateMessage
-        </div>
-    }
-</div>
-}
-
-@* ?? Signature action bar ???????????????????????????????????????????????? *@
-<div class="receiver-action-bar">
-    <div class="receiver-action-bar__inner">
-        <button class="btn btn-sm @(_capturedSignature is not null ? "btn-outline-success" : "btn-primary")" @onclick="OpenSignaturePopupAsync">
-            @if (_capturedSignature is not null) {
-                <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" class="me-1" viewBox="0 0 16 16">
-                    <path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
-                </svg>
-                <span>Unterschrift gespeichert</span>
-            } else {
-                <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" class="me-1" 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>Unterschrift erstellen</span>
-            }
-        </button>
-
-        @if (_annotations.Count > 0 && !SignatureApplied) {
-            <div class="receiver-action-bar__progress">
-                <div class="progress" style="height:5px; min-width:70px; width:90px;">
-                    <div class="progress-bar @(_checkedAnnotations.Count == _annotations.Count ? "bg-success" : "bg-primary")"
-                         style="width:@(_annotations.Count > 0 ? (_checkedAnnotations.Count * 100 / _annotations.Count) : 0)%"
-                         role="progressbar"></div>
-                </div>
-                <span class="text-muted" style="font-size:0.75rem;">
-                    @_checkedAnnotations.Count&thinsp;/&thinsp;@_annotations.Count
-                    Seite@(AnnotationPages.Count() == 1 ? "" : "n")&nbsp;@string.Join(",", AnnotationPages)
-                </span>
-                @if (_capturedSignature is null) {
-                    <span class="text-muted fst-italic" style="font-size:0.72rem;">Zuerst Unterschrift erstellen</span>
-                } else if (_checkedAnnotations.Count == _annotations.Count) {
-                    <span class="text-success fw-semibold" style="font-size:0.72rem;">&#10003; Wird angewendet&hellip;</span>
-                }
-            </div>
-        }
-
-        @if (!string.IsNullOrWhiteSpace(SignatureValidationMessage)) {
-            <span class="text-danger" style="font-size:0.78rem;">@SignatureValidationMessage</span>
-        }
-        @if (SignatureApplied) {
-            <span class="text-success" style="font-size:0.78rem;">
-                <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" class="me-1" viewBox="0 0 16 16">
-                    <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"/>
-                </svg>
-                Unterschrift angewendet
-            </span>
-        }
-
-        <div class="ms-auto d-flex align-items-center gap-2">
-            <button class="btn btn-sm btn-success" disabled="@(!SignatureApplied)" @onclick="ExportSignedPdfAsync">
-                <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" class="me-1" viewBox="0 0 16 16">
-                    <path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/>
-                    <path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/>
-                </svg>
-                PDF exportieren
-            </button>
-            @if (!string.IsNullOrWhiteSpace(EnvelopeKey)) {
-                <button class="btn btn-sm btn-outline-danger" @onclick="LogoutAsync" disabled="@IsLoggingOut" title="Abmelden">
-                    @if (IsLoggingOut) {
-                        <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
-                    } else {
-                        <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" 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>
-
-<DxPopup @bind-Visible="SignaturePopupVisible"
-HeaderText="Unterschrift erfassen"
-Width="620px"
-ShowFooter="true"
-CloseOnEscape="false"
-ShowCloseButton="false"
-CloseOnOutsideClick="false"
-Shown="OnPopupShownAsync">
-    <BodyContentTemplate>
-        <ul class="nav nav-tabs mb-3">
-            <li class="nav-item">
-                <button type="button" class="nav-link @(ActiveSignatureTab == SignatureTabDraw ? "active" : null)" @onclick="() => SetSignatureTabAsync(SignatureTabDraw)">Zeichnen</button>
-            </li>
-            <li class="nav-item">
-                <button type="button" class="nav-link @(ActiveSignatureTab == SignatureTabText ? "active" : null)" @onclick="() => SetSignatureTabAsync(SignatureTabText)">Text</button>
-            </li>
-            <li class="nav-item">
-                <button type="button" class="nav-link @(ActiveSignatureTab == SignatureTabImage ? "active" : null)" @onclick="() => SetSignatureTabAsync(SignatureTabImage)">Bild</button>
-            </li>
-        </ul>
-
-        @if(ActiveSignatureTab == SignatureTabDraw) {
-            <p class="text-muted mb-2">Bitte unterschreiben Sie im folgenden Feld.</p>
-            <canvas id="receiver-signature-pad" width="520" height="160" class="border rounded bg-white w-100" style="max-width: 520px; touch-action: none;"></canvas>
-        } else if(ActiveSignatureTab == SignatureTabText) {
-            <p class="text-muted mb-2">Geben Sie Ihre Unterschrift als Text ein und waehlen Sie eine Schriftart.</p>
-            <div class="row g-2 mb-2">
-                <div class="col-12 col-md-7">
-                    <input class="form-control" placeholder="Ihre Unterschrift" value="@TypedSignatureText" @oninput="OnTypedSignatureChanged" />
-                </div>
-                <div class="col-12 col-md-5">
-                    <select class="form-select" value="@TypedSignatureFont" @onchange="OnTypedSignatureFontChanged">
-                        @foreach(var font in TypedSignatureFonts) {
-                            <option value="@font.Value" style="font-family: @font.Value">@font.Text</option>
-                        }
-                    </select>
-                </div>
-            </div>
-            <canvas id="receiver-typed-signature-pad" width="520" height="160" class="border rounded bg-white w-100" style="max-width: 520px;"></canvas>
-        } else {
-            <p class="text-muted mb-2">Laden Sie ein Bild Ihrer Unterschrift hoch.</p>
-            <input id="receiver-signature-image-input" class="form-control mb-2" type="file" accept="image/png,image/jpeg,image/webp" />
-            <canvas id="receiver-image-signature-pad" width="520" height="160" class="border rounded bg-white w-100" style="max-width: 520px;"></canvas>
-        }
-
-
-        <div class="border-top mt-3 pt-3">
-            <p class="text-muted mb-2">Bitte geben Sie die folgenden Angaben ein. Das Datum wird automatisch hinzugefuegt.</p>
-            <div class="row g-2">
-                <div class="col-12 col-md-6">
-                    <label class="form-label" for="receiver-signer-name">Vor- und Nachname *</label>
-                    <input id="receiver-signer-name" class="form-control" value="@SignerFullName" @oninput="args => SignerFullName = args.Value?.ToString() ?? string.Empty" />
-                </div>
-                <div class="col-12 col-md-6">
-                    <label class="form-label" for="receiver-signer-position">Position</label>
-                    <input id="receiver-signer-position" class="form-control" value="@SignerPosition" @oninput="args => SignerPosition = args.Value?.ToString() ?? string.Empty" />
-                </div>
-                <div class="col-12 col-md-6">
-                    <label class="form-label" for="receiver-signature-place">Ort *</label>
-                    <input id="receiver-signature-place" class="form-control" value="@SignaturePlace" @oninput="args => SignaturePlace = args.Value?.ToString() ?? string.Empty" />
-                </div>
-            </div>
-        </div>
-
-        @if(!string.IsNullOrWhiteSpace(PopupValidationMessage)) {
-            <div class="text-danger mt-2">@PopupValidationMessage</div>
-        }
-    </BodyContentTemplate>
-    <FooterContentTemplate>
-        <div class="d-flex gap-2 flex-wrap justify-content-end w-100">
-            <button class="btn btn-outline-secondary" @onclick="RenewSignatureAsync">Unterschrift erneuern</button>
-            <button class="btn btn-primary" @onclick="SaveSignatureAsync">Speichern</button>
-        </div>
-    </FooterContentTemplate>
-</DxPopup>
-
-<div class="receiver-viewer-wrapper">
-@if(Report is not null) {
-    <DxReportViewer @key="ViewerKey" @ref="reportViewer" Report="Report" RootCssClasses="w-100 h-100" Zoom="1.3" />
-}
-</div>
-
-</div>
-
-@code {
-
-    const string SignatureTabDraw = "draw";
-    const string SignatureTabText = "text";
-    const string SignatureTabImage = "image";
-    const string DrawCanvasId = "receiver-signature-pad";
-    const string TypedCanvasId = "receiver-typed-signature-pad";
-    const string ImageInputId = "receiver-signature-image-input";
-    const string ImageCanvasId = "receiver-image-signature-pad";
-
-    readonly (string Text, string Value)[] TypedSignatureFonts = {
-    ("Brush Script", "'Brush Script MT', cursive"),
-    ("Segoe Script", "'Segoe Script', cursive"),
-    ("Lucida Handwriting", "'Lucida Handwriting', cursive"),
-    ("Comic Sans", "'Comic Sans MS', cursive"),
-    ("Cursive", "cursive")
-};
-
-    [Parameter] public string EnvelopeKey { get; set; } = string.Empty;
-
-    DxReportViewer? reportViewer;
-    XtraReport? Report;
-    bool SignatureApplied;
-    bool SignaturePopupVisible;
-    string? SignatureValidationMessage;
-    string? PopupValidationMessage;
-    string ActiveSignatureTab = SignatureTabDraw;
-    string TypedSignatureText = string.Empty;
-    string TypedSignatureFont = "'Brush Script MT', cursive";
-    string SignerFullName = string.Empty;
-    string SignerPosition = string.Empty;
-    string SignaturePlace = string.Empty;
-    int ViewerKey;
-    bool IsLoggingOut;
-
-    IReadOnlyList<AnnotationDto> _annotations = [];
-    IEnumerable<int> AnnotationPages => _annotations.Select(a => a.Page).Distinct().OrderBy(p => p);
-    EnvelopeReceiverDto? _envelopeReceiver;
-    record SignatureCapture(string DataUrl, string FullName, string Position, string Place);
-    SignatureCapture? _capturedSignature;
-    byte[]? _basePdfBytes;
-    // annotation IDs the user has checked via overlay checkboxes
-    readonly HashSet<long> _checkedAnnotations = [];
-    DotNetObjectReference<ReportViewer>? _dotNetRef;
-    int _lastOverlayViewerKey = -1;
-
-    async Task LogoutAsync() {
-        if (string.IsNullOrWhiteSpace(EnvelopeKey) || IsLoggingOut) return;
-        IsLoggingOut = true;
-        await InvokeAsync(StateHasChanged);
-        await AuthService.LogoutEnvelopeReceiverAsync(EnvelopeKey);
-        Navigation.NavigateTo($"/login/{Uri.EscapeDataString(EnvelopeKey)}", forceLoad: true);
-    }
-
-    protected override async Task OnInitializedAsync() {
-
-        // ? REDIRECT: /receiver/{key} -> /envelope/{key} (NEW PDF.js viewer)
-        if (!string.IsNullOrWhiteSpace(EnvelopeKey)) {
-            Navigation.NavigateTo($"/envelope/{Uri.EscapeDataString(EnvelopeKey)}", forceLoad: false);
-            return;
-        }
-
-        if (!string.IsNullOrWhiteSpace(EnvelopeKey)) {
-            var hasAccess = await AuthService.CheckEnvelopeAccessAsync(EnvelopeKey);
-            if (!hasAccess) {
-                Navigation.NavigateTo($"/login/{Uri.EscapeDataString(EnvelopeKey)}");
-                return;
-            }
-            else
-            {
-                ActiveSignatureTab = SignatureTabDraw;
-                SignaturePopupVisible = true;
-                SignatureValidationMessage = null;
-                PopupValidationMessage = null;
-            }
-        }
-
-        _annotations = await AnnotationService.GetAnnotationsAsync(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();
-        Report = initialReport;
-    }
-
-    protected override async Task OnAfterRenderAsync(bool firstRender) {
-        if (firstRender)
-            _dotNetRef = DotNetObjectReference.Create(this);
-
-
-        if (Report is not null && _annotations.Count > 0
-            && _capturedSignature is not null && !SignatureApplied
-            && _lastOverlayViewerKey != ViewerKey) {
-            _lastOverlayViewerKey = ViewerKey;
-            await JSRuntime.InvokeVoidAsync(
-                "receiverSignature.installAnnotationCheckboxes",
-                _annotations, _checkedAnnotations.ToArray(), _dotNetRef);
-        }
-    }
-
-    [JSInvokable]
-    public async Task OnAnnotationToggled(long annotationId, bool isChecked) {
-        if (isChecked)
-            _checkedAnnotations.Add(annotationId);
-        else
-            _checkedAnnotations.Remove(annotationId);
-        await InvokeAsync(StateHasChanged);
-
-        if (_capturedSignature is not null
-            && !SignatureApplied
-            && _annotations.Count > 0
-            && _checkedAnnotations.Count == _annotations.Count) {
-            // K?sa bekleme: kullan?c? son tick'in görsel feedback'ini görsün
-            await Task.Delay(400);
-            await SubmitSignaturesAsync();
-        }
-    }
-
-    void OpenSignaturePopupAsync() {
-        ActiveSignatureTab = SignatureTabDraw;
-        SignaturePopupVisible = true;
-        SignatureValidationMessage = null;
-        PopupValidationMessage = null;
-    }
-
-    async Task OnPopupShownAsync() {
-        await InitializeActiveSignatureTabAsync();
-    }
-
-    async Task SetSignatureTabAsync(string tab) {
-        ActiveSignatureTab = tab;
-        PopupValidationMessage = null;
-        await InvokeAsync(StateHasChanged);
-        await Task.Delay(50);
-        await InitializeActiveSignatureTabAsync();
-    }
-
-    async Task InitializeActiveSignatureTabAsync() {
-        if(ActiveSignatureTab == SignatureTabDraw) {
-            await JSRuntime.InvokeVoidAsync("receiverSignature.initialize", DrawCanvasId);
-        } else if(ActiveSignatureTab == SignatureTabText) {
-            await JSRuntime.InvokeVoidAsync("receiverSignature.initializeTyped", TypedCanvasId);
-            await RenderTypedSignatureAsync();
-        } else {
-            await JSRuntime.InvokeVoidAsync("receiverSignature.initializeImage", ImageInputId, ImageCanvasId);
-        }
-    }
-
-    async Task RenewSignatureAsync() {
-        PopupValidationMessage = null;
-
-        if(ActiveSignatureTab == SignatureTabDraw) {
-            await JSRuntime.InvokeVoidAsync("receiverSignature.clear", DrawCanvasId);
-        } else if(ActiveSignatureTab == SignatureTabText) {
-            TypedSignatureText = string.Empty;
-            await JSRuntime.InvokeVoidAsync("receiverSignature.clearTyped", TypedCanvasId);
-        } else {
-            await JSRuntime.InvokeVoidAsync("receiverSignature.clearImage", ImageInputId, ImageCanvasId);
-        }
-    }
-
-    void CloseSignaturePopup() {
-        PopupValidationMessage = null;
-        SignaturePopupVisible = false;
-    }
-
-    async Task OnTypedSignatureChanged(Microsoft.AspNetCore.Components.ChangeEventArgs args) {
-        TypedSignatureText = args.Value?.ToString() ?? string.Empty;
-        await RenderTypedSignatureAsync();
-    }
-
-    async Task OnTypedSignatureFontChanged(Microsoft.AspNetCore.Components.ChangeEventArgs args) {
-        TypedSignatureFont = args.Value?.ToString() ?? TypedSignatureFont;
-        await RenderTypedSignatureAsync();
-    }
-
-    async Task RenderTypedSignatureAsync() {
-        await JSRuntime.InvokeVoidAsync("receiverSignature.renderTypedSignature", TypedCanvasId, TypedSignatureText, TypedSignatureFont);
-    }
-
-    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 fuer den PDF-Export erforderlich.";
-            return;
-        }
-
-        PopupValidationMessage = null;
-        SignatureValidationMessage = null;
-        _capturedSignature = new(signatureDataUrl, SignerFullName.Trim(), SignerPosition.Trim(), SignaturePlace.Trim());
-
-        // If no annotations, apply immediately (no checkbox step needed)
-        if (_annotations.Count == 0) {
-            var freshReport = BuildFreshBaseReport();
-            AddSignature(freshReport, _capturedSignature.DataUrl, _capturedSignature.FullName, _capturedSignature.Position, _capturedSignature.Place);
-            Report = freshReport;
-            SignatureApplied = true;
-            SignaturePopupVisible = false;
-            ViewerKey++;
-            return;
-        }
-
-        // Close popup; checkboxes will appear on the PDF via OnAfterRenderAsync
-        SignaturePopupVisible = false;
-        _lastOverlayViewerKey = -1; // force overlay reinstall
-        await InvokeAsync(StateHasChanged);
-    }
-
-    async Task SubmitSignaturesAsync() {
-        if (_checkedAnnotations.Count == 0) {
-            SignatureValidationMessage = "Bitte markieren Sie mindestens ein Unterschriftsfeld im Dokument.";
-            return;
-        }
-        if (_checkedAnnotations.Count < _annotations.Count) {
-            SignatureValidationMessage = $"Bitte markieren Sie alle {_annotations.Count} Unterschriftsfelder. Noch {_annotations.Count - _checkedAnnotations.Count} offen.";
-            return;
-        }
-
-        SignatureValidationMessage = null;
-        var freshReport = BuildFreshBaseReport();
-        foreach (var ann in _annotations)
-            AddSignatureAtAnnotation(freshReport, ann, _capturedSignature!.DataUrl, _capturedSignature.FullName, _capturedSignature.Position, _capturedSignature.Place);
-
-        Report = freshReport;
-        SignatureApplied = true;
-        ViewerKey++;
-        await InvokeAsync(StateHasChanged);
-    }
-
-    async Task<string?> GetActiveSignatureDataUrlAsync() {
-        if(ActiveSignatureTab == SignatureTabDraw)
-            return await JSRuntime.InvokeAsync<string?>("receiverSignature.getDataUrl", DrawCanvasId);
-
-        if(ActiveSignatureTab == SignatureTabText) {
-            await RenderTypedSignatureAsync();
-            return await JSRuntime.InvokeAsync<string?>("receiverSignature.getTypedDataUrl", TypedCanvasId);
-        }
-
-        return await JSRuntime.InvokeAsync<string?>("receiverSignature.getImageDataUrl", ImageCanvasId);
-    }
-
-    async Task ExportSignedPdfAsync() {
-        if(!SignatureApplied || Report is null) {
-            SignatureValidationMessage = "Bitte fuegen Sie die Unterschrift zuerst zum Bericht hinzu.";
-            return;
-        }
-
-        try {
-            SignatureValidationMessage = null;
-            await reportViewer!.ExportToAsync(ExportFormat.Pdf);
-        } catch(Exception) {
-            SignatureValidationMessage = "Das signierte PDF konnte nicht exportiert werden. Bitte laden Sie die Seite neu und versuchen Sie es erneut.";
-        }
-    }
-
-    XtraReport BuildFreshBaseReport() {
-        if (_basePdfBytes is { Length: > 0 }) {
-            var report = new XtraReport();
-            var detail = new DevExpress.XtraReports.UI.DetailBand();
-            report.Bands.Add(detail);
-            detail.Controls.Add(new DevExpress.XtraReports.UI.XRPdfContent { Source = _basePdfBytes, GenerateOwnPages = true });
-            return report;
-        }
-        return CreateReportInstance();
-    }
-
-    static void AddAnnotationPlaceholders(XtraReport report, IReadOnlyList<AnnotationDto> annotations) {
-        var bottomMargin = report.Bands.OfType<BottomMarginBand>().FirstOrDefault();
-        if (bottomMargin is null) {
-            bottomMargin = new BottomMarginBand();
-            report.Bands.Add(bottomMargin);
-        }
-
-        const float sigWidth      = 230F;
-        const float sigHeight     = 154F;
-        const float bottomPad     = 6F;
-        const float defaultTopPad = 8F;
-        const float maxBandHeight = 210F;
-
-        float requiredHeight = defaultTopPad + sigHeight + bottomPad;
-        bottomMargin.HeightF = Math.Min(maxBandHeight, Math.Max(bottomMargin.HeightF, requiredHeight));
-        float topPad = Math.Max(0F, bottomMargin.HeightF - bottomPad - sigHeight);
-
-        foreach (var ann in annotations) {
-            float sigX  = (float)(ann.X);
-            var annotId = ann.Id.ToString();
-
-            var placeholder = new XRLabel {
-                Name          = $"receiverSignaturePlaceholder_{annotId}",
-                Text          = "\u270e Bitte unterschreiben",
-                BoundsF       = new RectangleF(sigX, topPad, sigWidth, sigHeight),
-                Borders       = BorderSide.All,
-                BorderColor   = System.Drawing.Color.FromArgb(230, 81, 0),
-                BackColor     = System.Drawing.Color.FromArgb(30, 255, 236, 153),
-                Font          = new DXFont("Open Sans", 10F, DXFontStyle.Regular),
-                ForeColor     = System.Drawing.Color.FromArgb(94, 38, 0),
-                TextAlignment = TextAlignment.MiddleCenter
-            };
-
-            bottomMargin.Controls.Add(placeholder);
-        }
-    }
-
-    XtraReport CreateReportInstance() {
-        return ReportStorage.TryGetReport("LargeDatasetReport", out var savedReport)
-            ? savedReport
-            : PredefinedReports.ReportsFactory.GetReport("LargeDatasetReport");
-    }
-
-    static void AddSignature(XtraReport report, string signatureDataUrl, string signerFullName, string signerPosition, string signaturePlace) {
-        var imageBytes = Convert.FromBase64String(signatureDataUrl[(signatureDataUrl.IndexOf(',') + 1)..]);
-        using var imageStream = new MemoryStream(imageBytes);
-        var imageSource = new ImageSource(DXImage.FromStream(imageStream));
-        var bottomMargin = report.Bands.OfType<BottomMarginBand>().FirstOrDefault();
-
-        if(bottomMargin is null) {
-            bottomMargin = new BottomMarginBand();
-            report.Bands.Add(bottomMargin);
-        }
-
-        RemoveExistingSignature(bottomMargin);
-
-        // Layout constants
-        const float sigX         = 390F;
-        const float sigWidth     = 230F;
-        const float sigImgHeight = 70F;
-        const float infoHeight   = 65F;  // up to 4 lines at 8pt
-        const float innerGap     = 5F;
-        const float bottomPad    = 6F;
-        const float defaultTopPad = 8F;
-        const float maxBandHeight = 210F;
-
-        float requiredHeight = defaultTopPad + sigImgHeight + innerGap + infoHeight + bottomPad;
-
-        // Grow band if needed, but cap at maxBandHeight to avoid overlapping page content
-        bottomMargin.HeightF = Math.Min(maxBandHeight, Math.Max(bottomMargin.HeightF, requiredHeight));
-
-        // If band is tighter than required, compress top padding so content still fits
-        float topPad = Math.Max(0F, bottomMargin.HeightF - bottomPad - infoHeight - innerGap - sigImgHeight);
-
-        float imageY = topPad;
-        float labelY = imageY + sigImgHeight + innerGap;
-
-        var signatureInformation = string.IsNullOrWhiteSpace(signerPosition)
-            ? $"{signerFullName}\n{signaturePlace}, {DateTime.Now:d}"
-            : $"{signerFullName}\n{signerPosition}\n{signaturePlace}, {DateTime.Now:d}";
-
-        var signature = new XRPictureBox {
-            Name = "receiverSignatureImage",
-            ImageSource = imageSource,
-            BoundsF = new RectangleF(sigX, imageY, sigWidth, sigImgHeight),
-            Sizing = ImageSizeMode.ZoomImage,
-            Borders = BorderSide.Bottom,
-            BorderColor = System.Drawing.Color.FromArgb(73, 80, 87)
-        };
-
-        var signatureLabel = new XRLabel {
-            Name = "receiverSignatureLabel",
-            Text = signatureInformation,
-            Multiline = true,
-            BoundsF = new RectangleF(sigX, labelY, sigWidth, infoHeight),
-            Font = new DXFont("Open Sans", 8F, DXFontStyle.Regular),
-            ForeColor = System.Drawing.Color.FromArgb(73, 80, 87),
-            TextAlignment = TextAlignment.TopLeft
-        };
-
-        bottomMargin.Controls.AddRange(new XRControl[] { signature, signatureLabel });
-    }
-
-    static void RemoveExistingSignature(BottomMarginBand bottomMargin) {
-        var controls = bottomMargin.Controls
-            .Cast<XRControl>()
-            .Where(control => control.Name is "receiverSignatureLabel" or "receiverSignatureImage")
-            .ToArray();
-
-        foreach(var control in controls)
-            bottomMargin.Controls.Remove(control);
-    }
-
-    static void AddSignatureAtAnnotation(XtraReport report, AnnotationDto? annotation, string signatureDataUrl, string signerFullName, string signerPosition, string signaturePlace) {
-        var imageBytes = Convert.FromBase64String(signatureDataUrl[(signatureDataUrl.IndexOf(',') + 1)..]);
-        using var imageStream = new MemoryStream(imageBytes);
-        var imageSource = new ImageSource(DXImage.FromStream(imageStream));
-
-        var detail = report.Bands.OfType<DevExpress.XtraReports.UI.DetailBand>().FirstOrDefault();
-        if (detail is null) return;
-
-        var annotId = annotation?.Id.ToString() ?? "0";
-        RemoveExistingSignatureById(detail, annotId);
-
-        const float sigWidth     = 230F;
-        const float sigImgHeight = 70F;
-        const float infoHeight   = 48.75F;
-        const float innerGap     = 5F;
-
-        float sigX   = (float)(annotation?.X ?? 390.0);
-        float imageY = (float)(annotation?.Y ?? 900.0);
-        float labelY = imageY + sigImgHeight + innerGap;
-        int targetPage = annotation?.Page ?? 1;
-
-        var signatureInformation = string.IsNullOrWhiteSpace(signerPosition)
-            ? $"{signerFullName}\n{signaturePlace}, {DateTime.Now:d}"
-            : $"{signerFullName}\n{signerPosition}\n{signaturePlace}, {DateTime.Now:d}";
-
-        var signature = new XRPictureBox {
-            Name        = $"receiverSignatureImage_{annotId}",
-            ImageSource = imageSource,
-            BoundsF     = new RectangleF(sigX, imageY, sigWidth, sigImgHeight),
-            Sizing      = ImageSizeMode.ZoomImage,
-            Borders     = BorderSide.Bottom,
-            BorderColor = System.Drawing.Color.FromArgb(73, 80, 87),
-            BackColor = Color.FromArgb(219, 219, 219)
-        };
-
-        var signatureLabel = new XRLabel {
-            Name          = $"receiverSignatureLabel_{annotId}",
-            Text          = signatureInformation,
-            Multiline     = true,
-            BoundsF       = new RectangleF(sigX, labelY - 5, sigWidth, infoHeight),
-            Font          = new DXFont("Open Sans", 8F, DXFontStyle.Regular),
-            ForeColor     = System.Drawing.Color.FromArgb(73, 80, 87),
-            TextAlignment = TextAlignment.TopCenter,
-            BackColor = Color.FromArgb(219, 219, 219)
-        };
-
-        // Show each control only on the target page using an independent print counter
-        int sigPrintCount = 0;
-        signature.BeforePrint += (_, e) => {
-            sigPrintCount++;
-            e.Cancel = sigPrintCount != targetPage;
-        };
-
-        int lblPrintCount = 0;
-        signatureLabel.BeforePrint += (_, e) => {
-            lblPrintCount++;
-            e.Cancel = lblPrintCount != targetPage;
-        };
-
-        detail.Controls.AddRange(new XRControl[] { signature, signatureLabel });
-    }
-
-    static void RemoveExistingSignatureById(DevExpress.XtraReports.UI.DetailBand detail, string annotId) {
-        var controls = detail.Controls
-            .Cast<XRControl>()
-            .Where(c => c.Name == $"receiverSignatureImage_{annotId}" || c.Name == $"receiverSignatureLabel_{annotId}")
-            .ToArray();
-        foreach (var c in controls)
-            detail.Controls.Remove(c);
-    }
-
-    public void Dispose() {
-        _dotNetRef?.Dispose();
-    }
-}
-

EnvelopeGenerator.ReceiverUI/Pages/Example/TestViewer.razor

@@ -1,81 +0,0 @@
-@page "/example/test"
-@using System.Drawing
-@using DevExpress.Drawing
-@using DevExpress.Utils
-@using DevExpress.XtraPrinting
-@using DevExpress.XtraPrinting.Drawing
-@using XtraReport = DevExpress.XtraReports.UI.XtraReport
-@using BottomMarginBand = DevExpress.XtraReports.UI.BottomMarginBand
-@using XRLabel = DevExpress.XtraReports.UI.XRLabel
-@using XRPictureBox = DevExpress.XtraReports.UI.XRPictureBox
-@using XRControl = DevExpress.XtraReports.UI.XRControl
-@using ImageSizeMode = DevExpress.XtraPrinting.ImageSizeMode
-@using EnvelopeGenerator.ReceiverUI.Services
-@using DevExpress.Blazor.Reporting
-@inject IJSRuntime JSRuntime
-@inject InMemoryReportStorageWebExtension ReportStorage
-@inject EnvelopeGenerator.ReceiverUI.Services.DocumentService DocumentService
-@inject Microsoft.Extensions.Configuration.IConfiguration Configuration
-@inject HttpClient Http
-@using System;
-
-<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" />
-
-<div class="receiver-page-layout">
-
-<div class="receiver-viewer-wrapper">
-        <embed class="w-100 h-50" src="/docs/Document.pdf" type="application/pdf" />
-        @if (PdfBytes is { Length: > 0 }) {
-            <DxPdfViewer DocumentContent="PdfBytes" CssClass="w-100 h-50" />
-        }
-        else{
-            <div>Not found</div>
-        }
-</div>
-
-</div>
-
-@code {
-
-    const string SignatureTabDraw = "draw";
-    const string SignatureTabText = "text";
-    const string SignatureTabImage = "image";
-    const string DrawCanvasId = "receiver-signature-pad";
-    const string TypedCanvasId = "receiver-typed-signature-pad";
-    const string ImageInputId = "receiver-signature-image-input";
-    const string ImageCanvasId = "receiver-image-signature-pad";
-
-    readonly (string Text, string Value)[] TypedSignatureFonts = {
-        ("Brush Script", "'Brush Script MT', cursive"),
-        ("Segoe Script", "'Segoe Script', cursive"),
-        ("Lucida Handwriting", "'Lucida Handwriting', cursive"),
-        ("Comic Sans", "'Comic Sans MS', cursive"),
-        ("Cursive", "cursive")
-    };
-
-    [Parameter] public string? EnvelopeKey { get; set; }
-
-    DxReportViewer? reportViewer;
-    XtraReport? Report;
-    string PdfViewerUrl = string.Empty;
-    byte[]? PdfBytes;
-    byte[]? SignedPdfBytes;
-    bool SignatureApplied;
-    bool SignaturePopupVisible;
-    string? PopupValidationMessage;
-    string ActiveSignatureTab = SignatureTabDraw;
-    string TypedSignatureText = string.Empty;
-    string TypedSignatureFont = "'Brush Script MT', cursive";
-    string SignerFullName = string.Empty;
-    string SignerPosition = string.Empty;
-    string SignaturePlace = string.Empty;
-    int ViewerKey;
-
-    protected override async Task OnInitializedAsync() {
-        PdfBytes = await Http.GetByteArrayAsync("/docs/Document.pdf");
-    }
-
-
-}
-

EnvelopeGenerator.ReceiverUI/Pages/IndexPage.razor

@@ -1,71 +0,0 @@
-@page "/"
-@inject IJSRuntime JS
-
-<link href="_content/DevExpress.Blazor.Themes/blazing-berry.bs5.min.css" rel="stylesheet" />
-
-<div class="home-page-wrapper">
-
-    <div class="home-hero-header">
-        <div class="home-hero-header__inner">
-            <svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="currentColor" class="home-hero-header__icon" 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>
-                <h1 class="home-hero-header__title">SignFlow</h1>
-                <p class="home-hero-header__subtitle">Willkommen im eSign-Portal</p>
-            </div>
-        </div>
-    </div>
-
-    <div class="home-content">
-        <div class="home-card card shadow border-0">
-            <div class="card-body p-4 p-md-5">
-
-                <p class="text-muted mb-4" style="font-size: 0.92rem; line-height: 1.7; text-align: justify; text-align-last: left; min-height: calc(0.92rem * 1.7 * 9);">
-                    <span id="home-description"></span>
-                </p>
-
-                <div class="mt-4 pt-3 border-top">
-                    <div class="d-flex flex-wrap justify-content-center gap-3">
-                        <div class="home-feature-badge">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" fill="currentColor" class="me-1" 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>
-                            Sicherer Zugang
-                        </div>
-                        <div class="home-feature-badge">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" fill="currentColor" class="me-1" viewBox="0 0 16 16">
-                                <path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
-                            </svg>
-                            Digitale Unterschrift
-                        </div>
-                        <div class="home-feature-badge">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" fill="currentColor" class="me-1" viewBox="0 0 16 16">
-                                <path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/>
-                                <path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/>
-                            </svg>
-                            PDF-Export
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-</div>
-
-@code {
-    private const string HomePageDescription =
-        "Das digitale Unterschriftenportal ist eine Plattform, die entwickelt wurde, um Ihre Dokumente sicher zu unterschreiben und zu verwalten. " +
-        "Mit seiner benutzerfreundlichen Oberfläche können Sie Ihre Dokumente schnell hochladen, die Unterschriftsprozesse verfolgen und Ihre digitalen Unterschriftenanwendungen einfach durchführen. " +
-        "Dieses Portal beschleunigt Ihren Arbeitsablauf mit rechtlich gültigen Unterschriften und erhöht gleichzeitig die Sicherheit Ihrer Dokumente.";
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
-        {
-            await JS.InvokeVoidAsync("receiverSignature.startTyped", "home-description", HomePageDescription, 15);
-        }
-    }
-}