Merge branch 'master' into bugfix/devexpress-pdf-not-displaying

Replaced the WASM client-side authentication service with a new
SSR (Server-Side Rendering) authentication service to resolve
issues in SSR mode caused by self-referencing HTTP requests and
the lack of `HttpContext`.

Added `IEnvelopeAuthService` interface and its implementation
`EnvelopeAuthService`, which directly accesses `HttpContext.User`
to validate user authentication and claims. Registered the service
in the DI container with a scoped lifetime.

Updated `EnvelopeReceiverPage.razor` to use the new SSR service
for authentication checks and logout logic. Changes to the page
were reverted due to a merge conflict, with a detailed plan
provided for re-application.

Improved logging for debugging authentication issues and outlined
a migration checklist, including testing, unit tests, and
documentation updates. These changes improve performance, ensure
SSR compatibility, and eliminate unnecessary HTTP requests.

AGENTS.md

@@ -0,0 +1,263 @@
+# EnvelopeGenerator - Agent Guide
+
+## Must Read First
+- **`COPILOT_CONTEXT.md`** - Architecture, coordinate systems, migration status
+- **`FORM_APPLICATION_CONTEXT.md`** - Legacy VB.NET features to migrate
+
+## Active Architecture (Post-Migration)
+
+**Frontend:** Blazor Auto (Server+WASM hybrid)
+- **WebUI** (Server): `@rendermode InteractiveServer` - PDF viewers requiring DevExpress backend
+- **WebUI.Client** (WASM): `@rendermode InteractiveWebAssembly` - Login, dashboards, business logic
+
+**Backend:** EnvelopeGenerator.API (ASP.NET Core 8.0)
+
+**Proxy:** YARP in WebUI routes `/api/*` → `localhost:8088` (API)
+
+### Deprecated Projects - DO NOT USE
+- `EnvelopeGenerator.ReceiverUI` - Pure WASM (migrated to WebUI)
+- `EnvelopeGenerator.Web` - Razor Pages (replaced by WebUI)
+- **VB.NET projects** (`Form`, `Service`, `BBTests`) - Legacy, read-only for reference
+
+## Development Commands
+
+### Run Both Projects (Required)
+```powershell
+# Terminal 1 - API Backend
+cd EnvelopeGenerator.API
+dotnet run
+
+# Terminal 2 - Blazor Frontend
+cd EnvelopeGenerator.WebUI\EnvelopeGenerator.WebUI
+dotnet run
+```
+
+**Critical:** Both must run simultaneously. WebUI proxy forwards `/api/*` to API.
+
+### Build
+```powershell
+dotnet build EnvelopeGenerator.sln
+```
+
+## Project Boundaries
+
+```
+EnvelopeGenerator.Domain/          # Entities (Envelope, Receiver, Document, etc.)
+EnvelopeGenerator.Application/     # MediatR CQRS (Commands, Queries, Handlers)
+EnvelopeGenerator.Infrastructure/  # EF Core, SQL executors, repositories
+EnvelopeGenerator.API/             # Controllers, endpoints
+EnvelopeGenerator.WebUI/           # Server-side Blazor components
+  ├─ Components/Pages/             # @rendermode InteractiveServer
+EnvelopeGenerator.WebUI.Client/    # Client-side WASM components
+  ├─ Pages/                        # @rendermode InteractiveWebAssembly
+  ├─ Services/                     # HTTP API clients
+  ├─ Models/                       # DTOs
+```
+
+## Route Structure (Critical)
+
+| Route | File Location | Render Mode | Purpose |
+|-------|--------------|-------------|---------|
+| `/` | `WebUI.Client/Pages/Index.razor` | WASM | Landing page |
+| `/sender/login` | `WebUI.Client/Pages/LoginSenderPage.razor` | WASM | Sender auth |
+| `/sender` | `WebUI.Client/Pages/EnvelopeSenderPage.razor` | WASM | Sender dashboard |
+| `/envelope/login/{key}` | `WebUI.Client/Pages/LoginReceiverPage.razor` | WASM | Receiver auth |
+| `/envelope/{key}` | `WebUI/Components/Pages/EnvelopeReceiverPage.razor` | **Server** | PDF viewer + signing |
+
+**Rule:** PDF viewers MUST use `@rendermode InteractiveServer` (DevExpress backend requirement). Everything else uses WASM.
+
+## Coordinate System (CRITICAL)
+
+**Database stores INCHES** (GdPicture14 native). Origin: top-left, Y-axis down.
+
+### Conversions
+```csharp
+// Database (INCHES) → PDF Points
+float points = inches * 72;
+
+// Database (INCHES) → DevExpress DX
+float dx = inches * 100;
+
+// PDF.js Pixels → Database (INCHES)
+float inches = (pixelX / canvasWidth) * pageWidthInches;
+```
+
+**A4 Page:** 8.27" wide × 11.69" tall = 595pt × 842pt
+
+**Signature Field Size:** 1.77" × 1.96" (FIXED, do not change)
+
+**Evidence:** See `COPILOT_CONTEXT.md` lines 158-185, `EnvelopeGenerator.Form/frmFieldEditor.vb`
+
+## API Architecture Quirks
+
+### Monolithic Endpoint (Avoid for UI)
+`POST /api/EnvelopeReceiver` - Creates envelope+document+receivers+fields atomically.
+- **Use case:** External API consumers
+- **Not suitable for:** Step-by-step UI workflow (no draft support, no partial updates)
+
+### Missing Granular Endpoints (Need to Create)
+```
+POST /api/Envelope/draft          # Create draft envelope
+PUT /api/Envelope/{id}            # Update metadata
+DELETE /api/Envelope/{id}         # Delete with reason
+POST /api/Envelope/{id}/document  # Upload PDF
+POST /api/Envelope/{id}/receivers # Add receiver
+POST /api/Envelope/{id}/signature-fields  # Place signature field
+POST /api/Envelope/{id}/send      # Send to receivers
+```
+
+See `FORM_APPLICATION_CONTEXT.md` for detailed workflow requirements.
+
+## Status Color Coding
+
+Form app uses DevExpress `CustomDrawCell`. WebUI needs CSS:
+
+```css
+.envelope-row.status-partly-signed { background-color: #81C784; } /* GREEN_300 */
+.envelope-row.status-queued,
+.envelope-row.status-sent { background-color: #FFB74D; } /* ORANGE_300 */
+.envelope-row.status-completed { background-color: #81C784; }
+.envelope-row.status-deleted,
+.envelope-row.status-rejected { background-color: #E57373; } /* RED_300 */
+```
+
+## Configuration
+
+### YARP Proxy (`WebUI/yarp.json`)
+Routes `/api/*`, `/swagger/*`, `/openapi/*`, `/scalar/*` → `https://localhost:8088`
+
+### PDF.js Settings (`WebUI/wwwroot/appsettings.json`)
+```json
+{
+  "PdfViewerOptions": {
+    "ThumbnailBaseScale": 0.75,
+    "ThumbnailEnableHiDPI": true,
+    "MainCanvasEnableHiDPI": true,
+    "ZoomStepPercentage": 5
+  }
+}
+```
+
+### API Config (`API/appsettings.json`)
+- `ConnectionStrings:Default` - SQL Server DB
+- `AllowedOrigins` - CORS (includes `http://localhost:5131`, `http://localhost:7192`)
+- `Cache:SignatureCacheExpiration` - Signature persistence timeout
+- `PSPDFKitLicenseKey` - **DEPRECATED** (use PDF.js instead)
+
+## Migration Status
+
+### Complete ✅
+- Receiver login/authentication
+- PDF viewing with PDF.js (HiDPI, zoom, thumbnails)
+- Signature capture (draw/type/image)
+- Signature caching (Redis/SQL)
+- Sender login
+
+### Missing (High Priority) ❌
+- Sender dashboard (`/sender`) - Empty stub
+- Envelope editor (`/sender/envelope/{id}`)
+- Signature field placement tool (PDF.js + draggable overlays)
+- Granular API endpoints (draft, receivers, fields)
+- Master-detail grids for receivers/history
+
+## Common Mistakes (DO NOT REPEAT)
+
+| Mistake | Why Wrong |
+|---------|-----------|
+| Using iText7 in receiver pages | GPL license issue. Use PDF.js overlays. |
+| Using PSPDFKit | Removed from architecture. Use PDF.js + DevExpress. |
+| `@rendermode InteractiveWebAssembly` on PDF viewers | DevExpress DxPdfViewer requires server-side rendering. |
+| Hardcoded quality in PDF.js | Use `appsettings.json` `PdfViewerOptions`. |
+| Coordinates in points/pixels for DB | Database uses INCHES. Convert before save. |
+| `BottomMarginBand` for signatures | Repeats on every page. Use `DetailBand`. |
+
+## Testing
+
+**No automated tests exist yet.**
+
+Manual testing workflow:
+1. Start API (`dotnet run` in `EnvelopeGenerator.API`)
+2. Start WebUI (`dotnet run` in `EnvelopeGenerator.WebUI\EnvelopeGenerator.WebUI`)
+3. Navigate to `https://localhost:5131` (or check console output for port)
+4. Test sender login at `/sender/login`
+5. Test receiver flow at `/envelope/login/{envelopeKey}`
+
+## Database
+
+**SQL Server** (DD_ECM)
+- Connection string in `API/appsettings.json`
+- EF Core migrations NOT used (manual SQL scripts)
+- Stored procedures: `PRSIG_*` prefix
+
+**Key Tables:**
+- `TBSIG_ENVELOPE` - Envelope metadata
+- `TBSIG_ENVELOPE_RECEIVER` - Receiver assignments
+- `TBSIG_DOC_RECEIVER_ELEMENT` - Signature fields (X, Y in INCHES)
+- `TBSIG_RECEIVER` - Receiver registry
+- `TBSIG_DOCUMENT` - PDF binary data
+- `TBSIG_ENVELOPE_HISTORY` - Audit trail
+
+## DevExpress
+
+**License:** Commercial (v25.2.3)
+**Components Used:**
+- `DxGrid` - Master-detail grids
+- `DxPdfViewer` - Server-side PDF rendering
+- `DxPopup` - Modal dialogs
+- `DxToolbar` - Action bars
+- `DxFormLayout` - Forms
+
+**Theme:** Blazing Berry (default)
+
+## JavaScript Interop
+
+**PDF Viewer:** `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 Pad:** `wwwroot/js/receiver-signature.js`
+```javascript
+window.receiverSignature = {
+    initializeDrawPad(canvasId, dotNetRef),
+    getSignatureDataUrl(canvasId),
+    clearPad(canvasId)
+}
+```
+
+## Multi-Envelope Support
+
+Receivers can login to **multiple envelopes simultaneously** via per-envelope cookies:
+```
+AuthTokenSignFLOWReceiver.{envelopeKey}
+```
+
+Each envelope maintains independent authentication state.
+
+## External Dependencies
+
+**CDN:**
+- PDF.js 3.11.174: `https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.11.174/pdf.min.js`
+
+**NuGet (WebUI.Client):**
+- `DevExpress.Blazor.*` 25.2.3
+- `SkiaSharp.*` 3.119.1 (WASM rendering)
+
+**External Services:**
+- LDAP/AD authentication (optional)
+- GTX Messaging (SMS 2FA)
+- Email dispatcher (signFlow)
+
+## Environment Variables
+
+None required. All config in `appsettings.json`.
+
+**Local dev ports:**
+- API: `https://localhost:8088`
+- WebUI: `https://localhost:5131` or `http://localhost:7192`

COPILOT_CONTEXT.md

@@ -0,0 +1,542 @@
+# EnvelopeGenerator — AI Context Reference
+
+## Purpose
+Digital document signing system with **unified Blazor Auto (Server+WASM hybrid) 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)
+
+---
+
+## Migration Notice
+
+**EnvelopeGenerator.ReceiverUI ? EnvelopeGenerator.WebUI Migration**
+
+The project has been migrated from pure Blazor WebAssembly (`ReceiverUI`) to **Blazor Auto (Server+WASM hybrid)** architecture (`WebUI`) to resolve DevExpress `DxPdfViewer` compatibility issues.
+
+**Reason:** DevExpress `DxPdfViewer` requires backend server-side rendering services that are NOT available in pure WebAssembly projects.
+
+**New Structure:**
+- **WebUI** (Server project): Hosts server-side components, YARP proxy, DevExpress backend services
+- **WebUI.Client** (WASM project): Client-side components, business logic, services
+
+**Migration Details:** See `MIGRATION_CONTEXT.md`
+
+---
+
+## Deployment Architecture
+
+**Two Presentation Projects (Both Required):**
+
+1. **EnvelopeGenerator.API** (ASP.NET Core Web API)
+   - Runs independently (development & production)
+   - Backend services for document management, authentication, signature endpoints
+   - Serves as API endpoint for WebUI
+
+2. **EnvelopeGenerator.WebUI** (Blazor Auto - Server+WASM Hybrid)
+   - **Server Project (`EnvelopeGenerator.WebUI`):**
+     - **YARP Reverse Proxy** configured via `yarp.json`
+     - Proxies `/api/*` requests to `API:8088`
+     - Hosts server-side components (`@rendermode InteractiveServer`)
+     - DevExpress server-side services (DxPdfViewer backend)
+   - **Client Project (`EnvelopeGenerator.WebUI.Client`):**
+     - Client-side components (`@rendermode InteractiveWebAssembly`)
+     - Business logic services (AuthService, DocumentService, etc.)
+     - WASM runtime
+
+**Request Flow:**
+```
+Client ? WebUI:XXXX (Blazor Auto)
+            ?? Server-side Pages (DxPdfViewer)
+            ?? Client-side Pages (WASM)
+            ?? YARP Proxy: /api/* ? API:8088
+```
+
+**Configuration:** `EnvelopeGenerator.WebUI/yarp.json`
+
+---
+
+## WebUI Route Structure
+
+### Root Route
+| Route | File | Location | Render Mode |
+|---|---|---|---|
+| `/` | `Index.razor` | `WebUI.Client/Pages/` | `@rendermode InteractiveWebAssembly` |
+
+### Sender Routes
+| Route | File | Location | Render Mode |
+|---|---|---|---|
+| `/sender/login` | `LoginSenderPage.razor` | `WebUI.Client/Pages/` | `@rendermode InteractiveWebAssembly` |
+| `/sender` | `EnvelopeSenderPage.razor` | `WebUI.Client/Pages/` | `@rendermode InteractiveWebAssembly` |
+
+### Receiver Routes (PDF Viewers)
+| Route | File | Location | Render Mode |
+|---|---|---|---|
+| `/envelope/login/{EnvelopeKey}` | `LoginReceiverPage.razor` | `WebUI.Client/Pages/` | `@rendermode InteractiveWebAssembly` |
+| `/envelope/{EnvelopeKey}` | `EnvelopeReceiverPage.razor` | `WebUI/Components/Pages/` | `@rendermode InteractiveServer` |
+| `/envelope/DxPdfViewer` | `EnvelopeReceiverPage_DxPdfViewer.razor` | `WebUI/Components/Pages/` | `@rendermode InteractiveServer` |
+| `/envelope/{EnvelopeKey}/DxReportViewer` | `EnvelopeReceiverPage_DxReportViewer.razor` | `WebUI/Components/Pages/` | `@rendermode InteractiveServer` |
+| `/envelope/Embed` | `EnvelopeReceiverPage_embed.razor` | `WebUI/Components/Pages/` | `@rendermode InteractiveServer` |
+
+**Multi-Envelope Support:** Receivers can login to multiple envelopes simultaneously (per-envelope cookie authentication).
+
+**Render Mode Strategy:**
+- **Client-side Pages (WASM):** Login, Sender dashboard, Index (no DevExpress backend required)
+- **Server-side Pages (Server):** PDF viewers (DevExpress DxPdfViewer requires backend)
+
+---
+
+## Architecture Evolution
+
+### Old Architecture (Deprecated v1)
+- **Sender UI:** `EnvelopeGenerator.Web` (Razor Pages + PSPDFKit)
+- **Receiver UI:** Separate project
+- **Backend:** `EnvelopeGenerator.API`
+
+### Intermediate Architecture (Deprecated v2)
+- **Unified Frontend:** `EnvelopeGenerator.ReceiverUI` (Pure Blazor WASM)
+- **Backend:** `EnvelopeGenerator.API`
+- **Issue:** DevExpress `DxPdfViewer` displayed blank screen (no backend services in WASM)
+
+### Current Architecture (Active)
+- **Frontend:** `EnvelopeGenerator.WebUI` (Blazor Auto - Server+WASM Hybrid)
+  - **WebUI** (Server): Server-side components, YARP proxy, DevExpress backend
+  - **WebUI.Client** (WASM): Client-side components, services, business logic
+- **Backend:** `EnvelopeGenerator.API`
+- **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.WebUI` | net8.0 | **Blazor Auto Server Project**. YARP proxy, server-side components, DevExpress backend services. |
+| `EnvelopeGenerator.WebUI.Client` | net8.0 WASM | **Blazor Auto Client Project**. Client-side components, services, business logic. |
+| `EnvelopeGenerator.ReceiverUI` | net8.0 WASM | **DEPRECATED.** Pure Blazor WASM (migrated to WebUI). |
+| `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 WebUI). |
+| `EnvelopeGenerator.DependencyInjection` | multi | DI registration helpers. |
+| **VB.NET projects** (Service/Form/BBTests) | net462 | **Legacy. Do NOT touch.** |
+
+---
+
+## Localization & Culture Management
+
+**Current Architecture:** Blazor WebAssembly (client-side culture management)
+
+### Implementation Details
+
+**Culture Storage:**
+- Culture preference stored in browser's `localStorage` (key: `AppCulture`)
+- Managed by `CultureService.cs` (ReceiverUI/Services)
+- Supported cultures: `de-DE`, `en-US`, `fr-FR`
+
+**Culture Initialization:**
+- **Location:** `Program.cs` (lines 53-57)
+- Sets `CultureInfo.DefaultThreadCurrentCulture/UICulture` **before** app runs
+- **WASM-Safe:** Each user has isolated browser instance
+
+**Language Selector:**
+- **Component:** `LanguageSelector.razor` (ReceiverUI/Shared)
+- Displays flag icon + language name
+- Changes culture via `CultureService.SetCultureAsync()`
+- Navigates with `forceLoad: false` (smooth transition, no page reload)
+
+### ⚠️ MIGRATION WARNING: Blazor Server/Auto
+
+**Current approach is WASM-specific and will break in Server/Auto render modes!**
+
+**Why it breaks:**
+- `Program.cs:53-57` sets **global** `DefaultThreadCurrentCulture`
+- In Server/Auto, one app instance serves **all users**
+- User A selects German → User B sees German too (shared state)
+- Thread-safety issues and culture conflicts
+
+**Migration Checklist (when moving to Server/Auto):**
+
+1. **Remove global culture initialization** from `Program.cs` (lines 53-57)
+   - See detailed warning comment in the code
+
+2. **Add RequestLocalizationMiddleware** (Server-side approach):
+   ```csharp
+   app.UseRequestLocalization(options => {
+       options.SupportedCultures = new[] { "de-DE", "en-US", "fr-FR" };
+       options.SupportedUICultures = options.SupportedCultures;
+       options.RequestCultureProviders.Insert(0, new CookieRequestCultureProvider());
+   });
+   ```
+
+3. **OR** Use **per-circuit culture** (Blazor Server approach):
+   - Store culture in circuit-scoped service
+   - Use `CascadingParameter` to distribute to components
+   - See: https://learn.microsoft.com/aspnet/core/blazor/globalization-localization
+
+4. **Update `LanguageSelector.razor`:**
+   - Remove manual `CultureInfo.DefaultThreadCurrentCulture` assignment
+   - Use middleware/circuit culture provider instead
+
+5. **Update `CultureService.cs`:**
+   - Integrate with Server-side culture provider
+   - May need to store in cookies instead of localStorage
+
+**References:**
+- Microsoft Docs: [Blazor Globalization/Localization](https://learn.microsoft.com/aspnet/core/blazor/globalization-localization)
+- Current implementation: `Program.cs`, `CultureService.cs`, `LanguageSelector.razor`
+
+---
+
+## Key Files & Routes
+
+### Client-Side Pages (WebUI.Client)
+| File | Route | Purpose |
+|---|---|---|
+| `WebUI.Client/Pages/Index.razor` | `/` | Application entry point (landing page). |
+| `WebUI.Client/Pages/EnvelopeSenderPage.razor` | `/sender` | Sender dashboard (envelope list). |
+| `WebUI.Client/Pages/LoginSenderPage.razor` | `/sender/login` | Sender username/password auth. |
+| `WebUI.Client/Pages/LoginReceiverPage.razor` | `/envelope/login/{EnvelopeKey}` | Receiver access code auth. |
+
+### Server-Side Pages (WebUI)
+| File | Route | Purpose |
+|---|---|---|
+| `WebUI/Components/Pages/EnvelopeReceiverPage.razor` | `/envelope/{key}` | Receiver PDF viewer & signing (PDF.js). |
+| `WebUI/Components/Pages/EnvelopeReceiverPage_DxPdfViewer.razor` | `/envelope/DxPdfViewer` | DevExpress PDF Viewer (test page). |
+| `WebUI/Components/Pages/EnvelopeReceiverPage_DxReportViewer.razor` | `/envelope/{key}/DxReportViewer` | DevExpress Report Viewer. |
+| `WebUI/Components/Pages/EnvelopeReceiverPage_embed.razor` | `/envelope/Embed` | Embedded PDF viewer (iframe). |
+
+### Services & Assets
+| File | Purpose |
+|---|---|
+| `WebUI.Client/Services/AuthService.cs` | Receiver + Sender authentication. |
+| `WebUI.Client/Services/SignatureCacheService.cs` | Signature caching (Redis/SQL). |
+| `WebUI.Client/Services/DocumentService.cs` | PDF document retrieval. |
+| `WebUI/wwwroot/js/pdf-viewer.js` | PDF.js wrapper (zoom, pagination, thumbnails). |
+| `WebUI/wwwroot/js/receiver-signature.js` | Signature pad (draw/type/image). |
+| `WebUI/wwwroot/css/envelope-viewer.css` | EnvelopeViewer styles. |
+| `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 Server (`@rendermode InteractiveServer`) + configurable quality  
+**File:** `WebUI/Components/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:** `WebUI/wwwroot/appsettings.json`
+
+```json
+{
+  "PdfViewer": {
+    "ThumbnailBaseScale": 0.75,
+    "ThumbnailEnableHiDPI": true,
+    "MainCanvasEnableHiDPI": true,
+    "ZoomStepPercentage": 5
+  }
+}
+```
+
+### JavaScript API
+**File:** `WebUI/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:** `WebUI.Client/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:** `WebUI.Client/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:** `WebUI.Client/Pages/LoginSenderPage.razor`  
+**Tech:** Bootstrap 5 + DevExpress Blazing Berry theme
+
+### AuthService Extension
+**File:** `WebUI.Client/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:** `WebUI.Client/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 (WebUI.Client)
+
+| 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.ReceiverUI` (Pure Blazor WASM) — Migrated to WebUI (DevExpress compatibility issue)
+- `EnvelopeGenerator.Web` (Razor Pages) — Replaced by unified WebUI
+- 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:** WebUI serves both Senders and Receivers
+6. **Render mode:** Client-side (WASM) for login/dashboard, Server-side for PDF viewers
+
+### 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 WebUI (ReceiverUI/Web are deprecated)
+5. **Blank DxPdfViewer:** Ensure page has `@rendermode InteractiveServer`
+
+---
+
+**Last Updated:** 2025-01-27 (ReceiverUI ? WebUI migration complete)

EnvelopeGenerator.API/AuthScheme.cs

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

EnvelopeGenerator.API/Controllers/AnnotationController.cs

@@ -1,12 +1,14 @@
 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;
@@ -59,8 +61,8 @@ public class AnnotationController : ControllerBase
     [Obsolete("PSPDF Kit will no longer be used.")]
     public async Task<IActionResult> CreateOrUpdate([FromBody] PsPdfKitAnnotation? psPdfKitAnnotation = null, CancellationToken cancel = default)
     {
-        var signature = User.GetReceiverSignatureOfReceiver();
+        var signature = User.ReceiverSignature();
-        var uuid = User.GetEnvelopeUuidOfReceiver();
+        var uuid = User.EnvelopeUuid();
 
         var envelopeReceiver = await _mediator.ReadEnvelopeReceiverAsync(uuid, signature, cancel).ThrowIfNull(Exceptions.NotFound);
 
@@ -72,12 +74,24 @@ public class AnnotationController : ControllerBase
         else if (await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
             return Problem(statusCode: StatusCodes.Status423Locked);
 
-        var docSignedNotification = await _mediator
+        var envelopeReceiverDto = await _mediator.ReadEnvelopeReceiverAsync(uuid, signature, cancel);
-            .ReadEnvelopeReceiverAsync(uuid, signature, cancel)
+        var docSignedNotification = envelopeReceiverDto is not null
-            .ToDocSignedNotification(psPdfKitAnnotation)
+            ? new DocSignedNotification { EnvelopeReceiver = envelopeReceiverDto, PsPdfKitAnnotation = psPdfKitAnnotation }
-            ?? throw new NotFoundException("Envelope receiver is not found.");
+            : throw new NotFoundException("Envelope receiver is not found.");
 
-        await _mediator.PublishSafely(docSignedNotification, cancel);
+        try
+        {
+            await _mediator.Publish(docSignedNotification, cancel);
+        }
+        catch (Exception)
+        {
+            await _mediator.Publish(new RemoveSignatureNotification()
+            {
+                EnvelopeId = docSignedNotification.EnvelopeReceiver.EnvelopeId,
+                ReceiverId = docSignedNotification.EnvelopeReceiver.ReceiverId
+            }, cancel);
+            throw;
+        }
         await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
 
         return Ok();
@@ -92,9 +106,9 @@ public class AnnotationController : ControllerBase
     [Obsolete("Use MediatR")]
     public async Task<IActionResult> Reject([FromBody] string? reason = null)
     {
-        var signature = User.GetReceiverSignatureOfReceiver();
+        var signature = User.ReceiverSignature();
-        var uuid = User.GetEnvelopeUuidOfReceiver();
+        var uuid = User.EnvelopeUuid();
-        var mail = User.GetReceiverMailOfReceiver();
+        var mail = User.ReceiverMail();
 
         var envRcvRes = await _envelopeReceiverService.ReadByUuidSignatureAsync(uuid: uuid, signature: signature);
 

EnvelopeGenerator.API/Controllers/AuthController.cs

@@ -1,3 +1,4 @@
+using DigitalData.Auth.Claims;
 using EnvelopeGenerator.API.Controllers.Interfaces;
 using EnvelopeGenerator.API.Models;
 using EnvelopeGenerator.Domain.Constants;
@@ -39,7 +40,7 @@ public partial class AuthController(IOptions<AuthTokenKeys> authTokenKeyOptions,
     /// <response code="401">Wenn es kein zugelassenes Cookie gibt, wird „nicht zugelassen“ zurückgegeben.</response>
     [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
     [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
-    [Authorize(Policy = AuthPolicy.SenderOrReceiver)]
+    [Authorize(AuthenticationSchemes = AuthScheme.Sender)]
     [HttpPost("logout")]
     public async Task<IActionResult> Logout()
     {
@@ -68,9 +69,49 @@ public partial class AuthController(IOptions<AuthTokenKeys> authTokenKeyOptions,
     [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
     [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
     [HttpGet("check")]
-    [Authorize]
+    [Authorize(AuthenticationSchemes = AuthScheme.Sender)]
     public IActionResult Check(string? role = null)
         => role is not null && !User.IsInRole(role)
             ? Unauthorized()
             : 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

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

EnvelopeGenerator.API/Controllers/ConfigController.cs

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

EnvelopeGenerator.API/Controllers/DocReceiverElementController.cs

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

EnvelopeGenerator.API/Controllers/DocumentController.cs

@@ -1,3 +1,4 @@
+using DigitalData.Auth.Claims;
 using EnvelopeGenerator.API.Controllers.Interfaces;
 using EnvelopeGenerator.API.Extensions;
 using EnvelopeGenerator.Application.Documents.Queries;
@@ -14,10 +15,9 @@ 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) : ControllerBase, IAuthController
+public class DocumentController(IMediator mediator, IAuthorizationService authService, ILogger<DocumentController> logger) : 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.GetEnvelopeIdOfReceiver();
+            var envelopeId = User.EnvelopeId();
             var receiverDoc = await mediator.Send(new ReadDocumentQuery { EnvelopeId = envelopeId }, cancel);
             return receiverDoc.ByteData is byte[] receiverDocByte
                 ? File(receiverDocByte, "application/octet-stream")
@@ -60,4 +60,25 @@ 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/EmailTemplateController.cs

@@ -1,17 +1,14 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.EmailTemplates;
+using EnvelopeGenerator.Application.EmailTemplates.Commands;
-using EnvelopeGenerator.Application.EmailTemplates.Commands.Update;
-using EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
-using EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using MediatR;
-using System.Threading.Tasks;
 using EnvelopeGenerator.Application.Common.Dto;
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.EmailTemplates.Queries;
 
 namespace EnvelopeGenerator.API.Controllers;
 
@@ -22,20 +19,20 @@ namespace EnvelopeGenerator.API.Controllers;
 /// <remarks>
 /// Initialisiert eine neue Instanz der <see cref="EmailTemplateController"/>-Klasse.
 /// </remarks>
-/// <param name="mapper">
+/// <param name="mediator">
-/// <param name="repository">
+/// Die Mediator-Instanz, die zum Senden von Befehlen und Abfragen verwendet wird.
-/// Die AutoMapper-Instanz, die zum Zuordnen von Objekten verwendet wird.
 /// </param>
 [Route("api/[controller]")]
 [ApiController]
 [Authorize(Policy = AuthPolicy.Sender)]
-public class EmailTemplateController(IMapper mapper, IRepository<EmailTemplate> repository, IMediator mediator) : ControllerBase
+public class EmailTemplateController(IMediator mediator) : ControllerBase
 {
     /// <summary>
     /// Ruft E-Mail-Vorlagen basierend auf der angegebenen Abfrage ab.
     /// Gibt alles zurück, wenn keine Id- oder Typ-Informationen eingegeben wurden.
     /// </summary>
     /// <param name="emailTemplate">Die Abfrageparameter zum Abrufen von E-Mail-Vorlagen.</param>
+    /// <param name="cancel"></param>
     /// <returns>Gibt HTTP-Antwort zurück</returns>
     /// <remarks>
     /// Sample request:
@@ -46,58 +43,27 @@ public class EmailTemplateController(IMapper mapper, IRepository<EmailTemplate>
     /// <response code="401">Wenn der Benutzer nicht authentifiziert ist.</response>
     /// <response code="404">Wenn die gesuchte Abfrage nicht gefunden wird.</response>
     [HttpGet]
-    public async Task<IActionResult> Get([FromQuery] ReadEmailTemplateQuery? emailTemplate = null)
+    public async Task<IActionResult> Get([FromQuery] ReadEmailTemplateQuery emailTemplate, CancellationToken cancel)
     {
-        if (emailTemplate is null || (emailTemplate.Id is null && emailTemplate.Type is null))
+        var result = await mediator.Send(emailTemplate, cancel);
-        {
+        return Ok(result);
-            var temps = await repository.Query.ToListAsync();
-            return Ok(mapper.Map<IEnumerable<EmailTemplateDto>>(temps));
-        }
-        else
-        {
-            var temp = await mediator.Send(emailTemplate);
-            return temp is null ? NotFound() : Ok(temp);
-        }
     }
 
     /// <summary>
     /// Updates an temp template or resets it if no update command is provided.
     /// Aktualisiert eine E-Mail-Vorlage oder setzt sie zurück, wenn kein Aktualisierungsbefehl angegeben ist.
     /// </summary>
-    /// <param name="temp">Die E-Mail-Vorlagenabfrage.</param>
+    /// <param name="update"></param>
-    /// <param name="update">Der Aktualisierungsbefehl für die E-Mail-Vorlage.
+    /// <param name="cancel"></param>
-    /// Wird auf Standardwert aktualisiert, wenn die Anfrage ohne http-Body gesendet wird.
+    /// <returns></returns>
-    /// </param>
-    /// <returns>Gibt HTTP-Antwort zurück</returns>
-    /// <remarks>
-    /// Sample request:
-    /// PUT /api/EmailTemplate
-    /// {
-    ///     "emailTemplateId": 123,
-    ///     "newContent": "Updated content"
-    /// }
-    /// </remarks>
     /// <response code="200">Wenn die E-Mail-Vorlage erfolgreich aktualisiert oder zurückgesetzt wird.</response>
     /// <response code="400">Wenn die Abfrage ohne einen String gesendet wird.</response>
     /// <response code="401">Wenn der Benutzer nicht authentifiziert ist.</response>
     /// <response code="404">Wenn die gesuchte Abfrage nicht gefunden wird.</response>
     [HttpPut]
-    public async Task<IActionResult> Update([FromQuery] EmailTemplateQueryBase? temp = null, [FromBody] UpdateEmailTemplateCommand? update = null)
+    public async Task<IActionResult> Update([FromBody] UpdateEmailTemplateCommand update, CancellationToken cancel)
     {
-        if (update is null)
+        await mediator.Send(update, cancel);
-        {
+        return Ok();
-            await mediator.Send(new ResetEmailTemplateCommand(temp));
-            return Ok();
-        }
-        else if (temp is null)
-        {
-            return BadRequest("No both id and type");
-        }
-        else
-        {
-            update.EmailTemplateQuery = temp;
-            await mediator.Send(update);
-            return Ok();
-        }
     }
 }

EnvelopeGenerator.API/Controllers/EnvelopeController.cs

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

EnvelopeGenerator.API/Controllers/EnvelopeReceiverController.cs

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

EnvelopeGenerator.API/Controllers/ReadOnlyController.cs

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

EnvelopeGenerator.API/Documentation/AuthProxyDocumentFilter.cs

@@ -16,6 +16,12 @@ 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";
 
@@ -67,4 +73,51 @@ 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

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

EnvelopeGenerator.API/EnvelopeGenerator.API.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.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.2.3</Version>
+    <Version>1.4.0</Version>
-    <FileVersion>1.2.3</FileVersion>
+    <FileVersion>1.4.0</FileVersion>
-    <AssemblyVersion>1.2.3</AssemblyVersion>
+    <AssemblyVersion>1.4.0</AssemblyVersion>
     <PackageOutputPath>Copyright © 2025 Digital Data GmbH. All rights reserved.</PackageOutputPath>
 	<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
@@ -30,13 +30,23 @@
 
   <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="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
+    <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.28" />
+    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.11" Condition="'$(TargetFramework)' == 'net8.0'" />
+    <PackageReference Include="itext" Version="8.0.5" />
+    <PackageReference Include="itext.bouncy-castle-adapter" Version="8.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" Condition="'$(TargetFramework)' == 'net9.0'" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.11" Condition="'$(TargetFramework)' == 'net8.0'" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" Condition="'$(TargetFramework)' == 'net9.0'" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.17" Condition="'$(TargetFramework)' == 'net8.0'" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
     <PackageReference Include="NLog" Version="5.2.5" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
     <PackageReference Include="Scalar.AspNetCore" Version="2.2.1" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="3.2.0" />
     <PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
@@ -68,6 +78,7 @@
     <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,8 +1,6 @@
-using System.Linq;
+using DigitalData.Auth.Claims;
+using Microsoft.IdentityModel.JsonWebTokens;
 using System.Security.Claims;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
 
 namespace EnvelopeGenerator.API.Extensions;
 
@@ -11,7 +9,14 @@ namespace EnvelopeGenerator.API.Extensions;
 /// </summary>
 public static class ReceiverClaimExtensions
 {
-    private static string GetRequiredClaimOfReceiver(this ClaimsPrincipal user, string claimType)
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="user"></param>
+    /// <param name="claimType"></param>
+    /// <returns></returns>
+    /// <exception cref="InvalidOperationException"></exception>
+    private static string GetRequiredClaimValue(this ClaimsPrincipal user, string claimType)
     {
         var value = user.FindFirstValue(claimType);
         if (value is not null)
@@ -27,75 +32,65 @@ 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 GetEnvelopeUuidOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.NameIdentifier);
+    public static string EnvelopeUuid(this ClaimsPrincipal user)
+        => user.GetRequiredClaimValue(EnvelopeClaimNames.EnvelopeUuid);
 
     /// <summary>
     /// Gets the authenticated receiver signature from the claims.
     /// </summary>
-    public static string GetReceiverSignatureOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.Hash);
+    public static string ReceiverSignature(this ClaimsPrincipal user)
-
+        => 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 GetReceiverMailOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.Email);
+    public static string ReceiverMail(this ClaimsPrincipal user)
-
+        => 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 GetEnvelopeIdOfReceiver(this ClaimsPrincipal user)
+    public static int EnvelopeId(this ClaimsPrincipal user)
     {
-        var envIdStr = user.GetRequiredClaimOfReceiver(EnvelopeClaimTypes.Id);
+        var envIdStr = user.GetRequiredClaimValue(EnvelopeClaimNames.EnvelopeId);
-        if (!int.TryParse(envIdStr, out var envId))
+        if (int.TryParse(envIdStr, out var envId))
-        {
+            return envId;
-            throw new InvalidOperationException($"Claim '{EnvelopeClaimTypes.Id}' is not a valid integer.");
+        else
-        }
+            throw new InvalidOperationException($"Claim '{EnvelopeClaimNames.EnvelopeId}' is not a valid integer.");
-
-        return envId;
     }
 
     /// <summary>
-    /// Signs in an envelope receiver using cookie authentication and attaches envelope claims.
+    /// Gets the authenticated receiver identifier from the claims.
     /// </summary>
-    /// <param name="context">The current HTTP context.</param>
+    /// <param name="user"></param>
-    /// <param name="envelopeReceiver">Envelope receiver DTO to extract claims from.</param>
+    /// <returns></returns>
-    /// <param name="receiverRole">Role to attach to the authentication ticket.</param>
+    /// <exception cref="InvalidOperationException"></exception>
-    public static async Task SignInEnvelopeAsync(this HttpContext context, EnvelopeReceiverDto envelopeReceiver, string receiverRole)
+    public static int ReceiverId(this ClaimsPrincipal user)
     {
-        var claims = new List<Claim>
+        var rcvIdStr = user.GetRequiredClaimValue(EnvelopeClaimNames.ReceiverId);
-        {
+        if (int.TryParse(rcvIdStr, out var rcvId))
-            new(ClaimTypes.NameIdentifier, envelopeReceiver.Envelope!.Uuid),
+            return rcvId;
-            new(ClaimTypes.Hash, envelopeReceiver.Receiver!.Signature),
+        else
-            new(ClaimTypes.Name, envelopeReceiver.Name ?? string.Empty),
+            throw new InvalidOperationException($"Claim '{EnvelopeClaimNames.ReceiverId}' is not a valid integer.");
-            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

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

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

EnvelopeGenerator.API/Program.cs

@@ -13,12 +13,15 @@ using EnvelopeGenerator.Application;
 using DigitalData.Auth.Client;
 using DigitalData.Core.Abstractions;
 using EnvelopeGenerator.API.Models;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.IdentityModel.Tokens;
 using DigitalData.Core.Abstractions.Security.Extensions;
 using EnvelopeGenerator.API.Middleware;
+using EnvelopeGenerator.API.Options;
 using NLog.Web;
 using NLog;
+using DigitalData.Auth.Claims;
+using EnvelopeGenerator.API;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
 
 var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
 logger.Info("Logging initialized!");
@@ -41,7 +44,11 @@ try
 
     var deferredProvider = new DeferredServiceProvider();
 
-    builder.Services.AddControllers();
+    builder.Services.AddControllers()
+        .AddJsonOptions(options =>
+        {
+            options.JsonSerializerOptions.ReferenceHandler = System.Text.Json.Serialization.ReferenceHandler.IgnoreCycles;
+        });
     builder.Services.AddHttpClient();
     builder.Services.AddReverseProxy().LoadFromConfig(builder.Configuration.GetSection("ReverseProxy"));
 
@@ -110,9 +117,11 @@ try
 
         options.DocumentFilter<EnvelopeGenerator.API.Documentation.AuthProxyDocumentFilter>();
     });
+#if NET9_0_OR_GREATER
     builder.Services.AddOpenApi();
+#endif
 
-    //AddEF Core dbcontext
+    //Add EF Core dbcontext
     var useDbMigration = Environment.GetEnvironmentVariable("MIGRATION_TEST_MODE") == true.ToString() || config.GetValue<bool>("UseDbMigration");
     var cnnStrName = useDbMigration ? "DbMigrationTest" : "Default";
     var connStr = config.GetConnectionString(cnnStrName)
@@ -131,7 +140,7 @@ try
         options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
         options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
     })
-        .AddJwtBearer(opt =>
+        .AddJwtBearer(AuthScheme.Sender, opt =>
         {
             opt.TokenValidationParameters = new TokenValidationParameters
             {
@@ -163,6 +172,61 @@ 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
@@ -178,14 +242,17 @@ try
     });
 
     builder.Services.AddAuthorizationBuilder()
-        .AddPolicy(AuthPolicy.SenderOrReceiver, policy =>
+        .AddPolicy(AuthPolicy.SenderOrReceiver, policy => policy
-            policy.RequireRole(Role.Sender, Role.Receiver.Full))
+            .RequireRole(Role.Sender, Role.Receiver.Full)
-        .AddPolicy(AuthPolicy.Sender, policy =>
+            .AddAuthenticationSchemes(AuthScheme.Sender, AuthScheme.Receiver))
-            policy.RequireRole(Role.Sender))
+        .AddPolicy(AuthPolicy.Sender, policy => policy
-        .AddPolicy(AuthPolicy.Receiver, policy =>
+            .RequireRole(Role.Sender)
-            policy.RequireRole(Role.Receiver.Full))
+            .AddAuthenticationSchemes(AuthScheme.Sender))
-        .AddPolicy(AuthPolicy.ReceiverTFA, policy =>
+        .AddPolicy(AuthPolicy.Receiver, policy => policy
-            policy.RequireRole(Role.Receiver.TFA));
+            .AddAuthenticationSchemes(AuthScheme.Receiver)
+            .RequireAuthenticatedUser()
+            .RequireRole(Role.Receiver.Full, "receiver"))
+        .AddPolicy(AuthPolicy.ReceiverTFA, policy => policy.RequireRole(Role.Receiver.TFA));
 
     // User manager
 #pragma warning disable CS0618 // Type or member is obsolete
@@ -199,6 +266,20 @@ try
     // Localizer
     builder.Services.AddCookieBasedLocalizer();
 
+    // Cache options
+    builder.Services.Configure<CacheOptions>(config.GetSection(CacheOptions.SectionName));
+
+    // Distributed Cache - SQL Server
+    builder.Services.AddDistributedSqlServerCache(options =>
+    {
+        config.GetSection("Cache:SqlServer").Bind(options);
+        
+        if (string.IsNullOrWhiteSpace(options.ConnectionString))
+        {
+            options.ConnectionString = connStr;
+        }
+    });
+
     // Envelope generator serives
 #pragma warning disable CS0618 // Type or member is obsolete
     builder.Services
@@ -224,7 +305,9 @@ 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")))
@@ -258,9 +341,11 @@ try
     app.UseAuthentication();
     app.UseAuthorization();
 
-    app.MapReverseProxy();
     app.MapControllers();
 
+    // Catch-all YARP proxy — only forward requests that are not swagger/scalar/openapi paths.
+    app.MapReverseProxy();
+
     app.Run();
 }
 catch (Exception ex)

EnvelopeGenerator.API/Properties/PublishProfiles/IISProfileNet8.pubxml

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

EnvelopeGenerator.API/Properties/launchSettings.json

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

EnvelopeGenerator.API/appsettings.Development.json

@@ -1,10 +1,21 @@
 {
-  "Logging": {
+"Logging": {
-    "LogLevel": {
+  "LogLevel": {
-      "Default": "Information",
+    "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+    "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": true,
+  "UseDbMigration": false,
   "DiPMode": true,
   "Logging": {
     "LogLevel": {
@@ -174,6 +174,14 @@
     "Receiver": [],
     "EmailTemplate": [ "TBSIG_EMAIL_TEMPLATE_AFT_UPD" ]
   },
+  "Cache": {
+    "SignatureCacheExpiration": null,
+    "SqlServer": {
+      "ConnectionString": null,
+      "SchemaName": "dbo",
+      "TableName": "TBDD_CACHE"
+    }
+  },
   "MainPageTitle": null,
   "AnnotationParams": {
     "Background": {

EnvelopeGenerator.API/yarp.json

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

EnvelopeGenerator.Application/Common/Commands/CreateCommandHandler.cs

@@ -0,0 +1,36 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Common.Commands;
+
+/// <summary>
+/// 
+/// </summary>
+/// <typeparam name="TCommand"></typeparam>
+/// <typeparam name="TEntity"></typeparam>
+public class CreateCommandHandler<TCommand, TEntity> : IRequestHandler<TCommand, TEntity>
+    where TCommand : class, IRequest<TEntity>
+    where TEntity : class
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    protected readonly IRepository<TEntity> Repository;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repository"></param>
+    public CreateCommandHandler(IRepository<TEntity> repository)
+    {
+        Repository = repository;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public Task<TEntity> Handle(TCommand request, CancellationToken cancel) => Repository.CreateAsync(request, cancel);
+}

EnvelopeGenerator.Application/Common/Commands/UpdateCommand.cs

@@ -0,0 +1,59 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using MediatR;
+using System.Linq.Expressions;
+
+namespace EnvelopeGenerator.Application.Common.Commands;
+
+/// <summary>
+/// 
+/// </summary>
+/// <typeparam name="TUpdateDto"></typeparam>
+/// <typeparam name="TEntity"></typeparam>
+public abstract record UpdateCommand<TUpdateDto, TEntity> : IRequest where TUpdateDto : class where TEntity : class
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public TUpdateDto Update { get; init; } = null!;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    public abstract Expression<Func<TEntity, bool>> BuildQueryExpression();
+}
+
+/// <summary>
+/// 
+/// </summary>
+/// <typeparam name="TCommand"></typeparam>
+/// <typeparam name="TUpdateDto"></typeparam>
+/// <typeparam name="TEntity"></typeparam>
+public class UpdateCommandHandler<TCommand, TUpdateDto, TEntity> : IRequestHandler<TCommand>
+    where TUpdateDto : class
+    where TEntity : class
+    where TCommand : UpdateCommand<TUpdateDto, TEntity>
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    protected readonly IRepository<TEntity> Repository;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repository"></param>
+    public UpdateCommandHandler(IRepository<TEntity> repository)
+    {
+        Repository = repository;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public Task Handle(TCommand request, CancellationToken cancel)
+        => Repository.UpdateAsync(request.Update, request.BuildQueryExpression(), cancel);
+}

EnvelopeGenerator.Application/Common/Dto/AnnotationDto.cs

@@ -8,42 +8,77 @@ public record AnnotationCreateDto
     /// <summary>
     /// 
     /// </summary>
-    public int ElementId { get; init; }
+    public long Id { get; set; }
 
     /// <summary>
     /// 
     /// </summary>
-    public string Name { get; init; } = null!;
+    [Obsolete("Not required for DevExpress")]
+    public int ElementId { get; init; } = -1;
 
     /// <summary>
     /// 
     /// </summary>
-    public string Value { get; init; } = null!;
+    [Obsolete("Not required for DevExpress")]
+    public string Name { get; init; } = string.Empty;
 
     /// <summary>
     /// 
     /// </summary>
-    public string Type { get; init; } = null!;
+    [Obsolete("Not required for DevExpress")]
+    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/ConfigDto.cs

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

EnvelopeGenerator.Application/Common/Dto/DocReceiverElementDto.cs

@@ -1,13 +1,12 @@
-using EnvelopeGenerator.Domain.Interfaces;
+using EnvelopeGenerator.Domain.Constants;
-using Microsoft.AspNetCore.Mvc;
+using EnvelopeGenerator.Domain.Interfaces;
 
 namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// 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.
@@ -93,4 +92,34 @@ public class SignatureDto : ISignature
     /// 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/Dto/DocumentDto.cs

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

EnvelopeGenerator.Application/Common/Dto/DocumentStatusDto.cs

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

EnvelopeGenerator.Application/Common/Dto/EmailTemplateDto.cs

@@ -13,25 +13,30 @@ public record EmailTemplateDto
     /// <summary>
     /// 
     /// </summary>
-    public required string Name { get; init; }
+    public string Name { get; set; } = null!;
 
     /// <summary>
     /// Das Datum und die Uhrzeit, wann die Vorlage hinzugefügt wurde.
     /// </summary>
-    public DateTime AddedWhen { get; init; }
+    public DateTime AddedWhen { get; set; }
 
     /// <summary>
     /// Der Inhalt (Body) der E-Mail-Vorlage. Kann null sein.
     /// </summary>
-    public string? Body { get; init; }
+    public string? Body { get; set; }
 
     /// <summary>
     /// Der Betreff der E-Mail-Vorlage. Kann null sein.
     /// </summary>
-    public string? Subject { get; init; }
+    public string? Subject { get; set; }
+
+    /// <summary>
+    /// Der Sprachcode der E-Mail-Vorlage.
+    /// </summary>
+    public string LangCode { get; set; } = null!;
 
     /// <summary>
     /// Das Datum und die Uhrzeit, wann die Vorlage zuletzt geändert wurde. Kann null sein.
     /// </summary>
-    public DateTime? ChangedWhen { get; init; }
+    public DateTime? ChangedWhen { get; set; }
 };

EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs

@@ -1,16 +1,15 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
 using DigitalData.UserManager.Application.DTOs.User;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
-using Microsoft.AspNetCore.Mvc;
+using EnvelopeGenerator.Domain.Interfaces;
-
 namespace EnvelopeGenerator.Application.Common.Dto;
 
 /// <summary>
 /// 
 /// </summary>
-[ApiExplorerSettings(IgnoreApi = true)]
+public record EnvelopeDto : IEnvelope
-public record EnvelopeDto
 {
 	/// <summary>
 	/// 
@@ -74,10 +73,12 @@ public record EnvelopeDto
     /// </summary>
     public int? EnvelopeTypeId { get; set; }
 
+    // TODO: use ReadAndConfirm property name
     /// <summary>
     /// 
     /// </summary>
-    public bool ReadOnly => EnvelopeTypeId == 2;
+    [Obsolete("Use EnvelopeExtensions.IsReadAndConfirm extension metot instead.")]
+    public bool ReadOnly => this.IsReadAndConfirm();
 
     /// <summary>
     /// 
@@ -123,4 +124,9 @@ public record EnvelopeDto
     /// 
     /// </summary>
     public IEnumerable<DocumentDto>? Documents { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public IEnumerable<EnvelopeReceiverDto>? EnvelopeReceivers { get; set; }
 }

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

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

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

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

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

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

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

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

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

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

EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDto.cs

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

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

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

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

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

EnvelopeGenerator.Application/Common/Dto/PsPdfKitAnnotation.cs

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

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

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

EnvelopeGenerator.Application/Common/Dto/Signature.cs

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

EnvelopeGenerator.Application/Common/Extensions/AutoMapperAuditingExtensions.cs

@@ -0,0 +1,42 @@
+using AutoMapper;
+using EnvelopeGenerator.Domain.Interfaces.Auditing;
+using System;
+
+namespace EnvelopeGenerator.Application.Common.Extensions;
+
+/// <summary>
+/// Extension methods for applying auditing timestamps during AutoMapper mappings.
+/// </summary>
+public static class AutoMapperAuditingExtensions
+{
+    /// <summary>
+    /// Maps <see cref="IHasAddedWhen.AddedWhen"/> to the current UTC time.
+    /// </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));
+
+    /// <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));
+
+    /// <summary>
+    /// Converts a base64 data URL string to a byte array.
+    /// Handles data URLs in the format: "data:image/png;base64,iVBORw0KG..."
+    /// </summary>
+    /// <param name="dataUrl">The base64 data URL string from Canvas.toDataURL()</param>
+    /// <returns>The decoded byte array, or null if the input is null or empty</returns>
+    public static byte[]? MapDataUrlToRequiredBytes(this string dataUrl)
+    {
+        // Remove data URL prefix (e.g., "data:image/png;base64,")
+        var base64Index = dataUrl.IndexOf(',', StringComparison.Ordinal);
+        if (base64Index == -1)
+            throw new ArgumentException("Invalid data URL format. Unable to extract base64 data.", nameof(dataUrl));
+
+        var base64Data = dataUrl[(base64Index + 1)..];
+        return Convert.FromBase64String(base64Data);
+    }
+}

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

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

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

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

EnvelopeGenerator.Application/Common/MappingProfile.cs

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

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

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

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

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

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

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

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

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

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

@@ -3,6 +3,7 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
 using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.Extensions.Options;
+using EnvelopeGenerator.Domain.Interfaces;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 
@@ -30,7 +31,7 @@ public class SendSignedMailHandler : SendMailHandler<DocSignedNotification>
     protected override void ConfigureEmailOut(DocSignedNotification notification, EmailOut emailOut)
     {
         emailOut.ReferenceString = notification.EmailAddress;
-        emailOut.ReferenceId = notification.ReceiverId;
+        emailOut.ReferenceId = notification.EnvelopeReceiver.ReceiverId;
     }
 
     /// <summary>
@@ -41,10 +42,29 @@ public class SendSignedMailHandler : SendMailHandler<DocSignedNotification>
     {
         var placeHolders = new Dictionary<string, string>()
         {
-            { "[NAME_RECEIVER]", notification.Name ?? string.Empty },
+            { "[NAME_RECEIVER]", notification.EnvelopeReceiver.Name ?? string.Empty },
-            { "[DOCUMENT_TITLE]", notification.Envelope?.Title ?? string.Empty },
+            { "[DOCUMENT_TITLE]", notification.EnvelopeReceiver.Envelope?.Title ?? string.Empty },
         };
 
+        if (notification.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;
     }
 }

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.UtcNow,
+            AddedWhen = DateTime.Now,
             AddedWho = DispatcherParams.AddedWho,
             SendingProfile = DispatcherParams.SendingProfile,
             ReminderTypeId = DispatcherParams.ReminderTypeId,

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -7,6 +7,9 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using QRCoder;
 using System.Reflection;
+using MediatR;
+using EnvelopeGenerator.Application.DocReceiverElements.Commands;
+using EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
 
 namespace EnvelopeGenerator.Application;
 
@@ -48,14 +51,30 @@ public static class DependencyInjection
         services.Configure<TotpSmsParams>(config.GetSection(nameof(TotpSmsParams)));
 
         services.AddHttpClientService<GtxMessagingParams>(config.GetSection(nameof(GtxMessagingParams)));
-        services.TryAddSingleton<ISmsSender, GTXSmsSender>();
+        services.TryAddScoped<ISmsSender, GTXSmsSender>();          // Changed: Singleton → Scoped
-        services.TryAddSingleton<IEnvelopeSmsHandler, EnvelopeSmsHandler>();
+        services.TryAddScoped<IEnvelopeSmsHandler, EnvelopeSmsHandler>(); // Changed: Singleton → Scoped
         services.TryAddSingleton<IAuthenticator, Authenticator>();
         services.TryAddSingleton<QRCodeGenerator>();
 
         services.AddMediatR(cfg =>
         {
             cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly());
+            
+            // Register SignCommand pipeline behaviors in execution order
+            // 0. EnvelopeReceiverResolutionBehavior - Resolves EnvelopeReceiver from query parameters (executes FIRST)
+            cfg.AddBehavior<IPipelineBehavior<SigningCommand, Unit>, EnvelopeReceiverResolutionBehavior>();
+            
+            // 1. AnnotationBehavior - Saves annotations (executes second)
+            cfg.AddBehavior<IPipelineBehavior<SigningCommand, Unit>, AnnotationBehavior>();
+            
+            // 2. DocStatusBehavior - Creates document status (executes third)
+            cfg.AddBehavior<IPipelineBehavior<SigningCommand, Unit>, DocStatusBehavior>();
+
+            // 3. HistoryBehavior - Records history (executes fourth)
+            cfg.AddBehavior<IPipelineBehavior<SigningCommand, Unit>, HistoryBehavior>();
+            
+            // 4. SendSignedMailBehavior - Sends notification email (executes LAST, only if all previous succeed)
+            cfg.AddBehavior<IPipelineBehavior<SigningCommand, Unit>, SendSignedMailBehavior>();
         });
 
         return services;

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/AnnotationBehavior.cs

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

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/DocStatusBehavior.cs

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

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/EnvelopeReceiverResolutionBehavior.cs

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

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/HistoryBehavior.cs

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

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/SaveSignatureBehavior.cs

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

EnvelopeGenerator.Application/DocReceiverElements/Behaviors/SendSignedMailBehavior.cs

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

EnvelopeGenerator.Application/DocReceiverElements/Commands/SigningCommand.cs

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

EnvelopeGenerator.Application/DocReceiverElements/Queries/ReadDocReceiverElementQuery.cs

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

EnvelopeGenerator.Application/DocStatus/Commands/CreateDocStatusCommand.cs

@@ -1,12 +1,41 @@
-namespace EnvelopeGenerator.Application.DocStatus.Commands;
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Common.Commands;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.DocStatus.Commands;
 
 /// <summary>
 /// 
 /// </summary>
-public record CreateDocStatusCommand : ModifyDocStatusCommandBase
+public record CreateDocStatusCommand : IRequest<DocumentStatus>
 {
     /// <summary>
-    /// Gets timestamp when this record was added. Returns the StatusChangedWhen value.
+    /// 
     /// </summary>
-    public DateTime AddedWhen => StatusChangedWhen;
+    public int EnvelopeId { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int ReceiverId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the display value associated with the status.
+    /// </summary>
+    public string? Value { get; set; }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public class CreateDocStatusCommandHandler : CreateCommandHandler<CreateDocStatusCommand, DocumentStatus>
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repository"></param>
+    public CreateDocStatusCommandHandler(IRepository<DocumentStatus> repository) : base(repository)
+    {
+    }
 }

EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs

@@ -1,54 +0,0 @@
-using EnvelopeGenerator.Application.Common.Query;
-using EnvelopeGenerator.Domain.Constants;
-
-namespace EnvelopeGenerator.Application.DocStatus.Commands;
-
-/// <summary>
-/// 
-/// </summary>
-public record ModifyDocStatusCommandBase : EnvelopeReceiverQueryBase
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public int? EnvelopeId => Envelope.Id;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int? ReceiverId => Receiver.Id;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public override ReceiverQueryBase Receiver { get => base.Receiver; set => base.Receiver = value; }
-
-    /// <summary>
-    /// Gets the current status code.
-    /// </summary>
-    public DocumentStatus Status => Value is null ? DocumentStatus.Created : DocumentStatus.Signed;
-
-    /// <summary>
-    /// Gets or sets the display value associated with the status.
-    /// </summary>
-    public string? Value { get; set; }
-
-    /// <summary>
-    /// Gets timestamp when this record was added.
-    /// </summary>
-    public DateTime StatusChangedWhen { get; } = DateTime.Now;
-
-    /// <summary>
-    /// Maps the current command to a new instance of the specified type.
-    /// </summary>
-    /// <typeparam name="TDest"></typeparam>
-    /// <returns></returns>
-    public TDest To<TDest>() where TDest : ModifyDocStatusCommandBase, new()
-        => new()
-        {
-            Key = Key,
-            Envelope = Envelope,
-            Receiver = Receiver,
-            Value = Value
-        };
-}

EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs

@@ -1,77 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-using AutoMapper;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Common.Extensions;
-
-namespace EnvelopeGenerator.Application.DocStatus.Commands;
-
-/// <summary>
-/// Represents a command to save the status of a document, either by creating a new status or updating an existing one based on the provided envelope and receiver identifiers.
-/// It returns the identifier of the saved document status.
-/// </summary>
-public record SaveDocStatusCommand : ModifyDocStatusCommandBase, IRequest<DocumentStatusDto?>;
-
-/// <summary>
-/// 
-/// </summary>
-public class SaveDocStatusCommandHandler : IRequestHandler<SaveDocStatusCommand, DocumentStatusDto?>
-{
-    private readonly IMapper _mapper;
-
-    private readonly IRepository<DocumentStatus> _repo;
-
-    private readonly IRepository<Envelope> _envRepo;
-
-    private readonly IRepository<Receiver> _rcvRepo;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="mapper"></param>
-    /// <param name="repo"></param>
-    /// <param name="rcvRepo"></param>
-    /// <param name="envRepo"></param>
-    public SaveDocStatusCommandHandler(IMapper mapper, IRepository<DocumentStatus> repo, IRepository<Receiver> rcvRepo, IRepository<Envelope> envRepo)
-    {
-        _mapper = mapper;
-        _repo = repo;
-        _rcvRepo = rcvRepo;
-        _envRepo = envRepo;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public async Task<DocumentStatusDto?> Handle(SaveDocStatusCommand request, CancellationToken cancel)
-    {
-        // ceck if exists
-        bool isExists = await _repo.ReadOnly().Where(request).AnyAsync(cancel);
-
-        var env = await _envRepo.ReadOnly().Where(request.Envelope).FirstAsync(cancel);
-        var rcv = await _rcvRepo.ReadOnly().Where(request.Receiver).FirstAsync(cancel);
-
-        request.Envelope.Id = env.Id;
-        request.Receiver.Id = rcv.Id;
-
-        if (isExists)
-        {
-            var uReq = request.To<UpdateDocStatusCommand>();
-            await _repo.UpdateAsync(uReq, q => q.Where(request), cancel);
-        }
-        else
-        {
-            var cReq = request.To<CreateDocStatusCommand>();
-            await _repo.CreateAsync(cReq, cancel);
-        }
-
-        var docStatus = await _repo.ReadOnly().Where(request).SingleOrDefaultAsync(cancel);
-        
-        return _mapper.Map<DocumentStatusDto>(docStatus);
-    }
-}

EnvelopeGenerator.Application/DocStatus/Commands/UpdateDocStatusCommand.cs

@@ -1,14 +1,41 @@
-using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Application.Common.Commands;
+using EnvelopeGenerator.Domain.Entities;
+using System.Linq.Expressions;
 
 namespace EnvelopeGenerator.Application.DocStatus.Commands;
 
 /// <summary>
 /// 
 /// </summary>
-public record UpdateDocStatusCommand : ModifyDocStatusCommandBase
+/// <param name="Value"></param>
+public record DocStatusUpdateDto(string? Value);
+
+/// <summary>
+/// 
+/// </summary>
+public record UpdateDocStatusCommand : UpdateCommand<DocStatusUpdateDto, DocumentStatus>
 {
     /// <summary>
-    /// Gets timestamp when this record was added. Returns the StatusChangedWhen value.
+    /// 
     /// </summary>
-    public DateTime? ChangedWhen => StatusChangedWhen;
+    public int EnvelopeId { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int ReceiverId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the display value associated with the status.
+    /// </summary>
+    public string? Value { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    public override Expression<Func<DocumentStatus, bool>> BuildQueryExpression()
+    {
+        return ds => ds.EnvelopeId == EnvelopeId && ds.ReceiverId == ReceiverId;
+    }
 }

EnvelopeGenerator.Application/DocStatus/MappingProfile.cs

@@ -1,4 +1,5 @@
 using AutoMapper;
+using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.DocStatus.Commands;
 using EnvelopeGenerator.Domain.Entities;
 
@@ -16,10 +17,17 @@ public class MappingProfile : Profile
     {
         CreateMap<CreateDocStatusCommand, DocumentStatus>()
         .ForMember(dest => dest.Envelope, opt => opt.Ignore())
-        .ForMember(dest => dest.Receiver, opt => opt.Ignore());
+        .ForMember(dest => dest.Receiver, opt => opt.Ignore())
+        .ForMember(dest => dest.Status, opt => opt.MapFrom(
+            src => src.Value == null 
+                ? Domain.Constants.DocumentStatus.Created 
+                : Domain.Constants.DocumentStatus.Signed))
+        .MapAddedWhen();
 
         CreateMap<UpdateDocStatusCommand, DocumentStatus>()
         .ForMember(dest => dest.Envelope, opt => opt.Ignore())
-        .ForMember(dest => dest.Receiver, opt => opt.Ignore());
+        .ForMember(dest => dest.Receiver, opt => opt.Ignore())
+        .ForMember(dest => dest.StatusChangedWhen, opt => opt.MapFrom(src => DateTime.Now))
+        .MapChangedWhen();
     }
 }

EnvelopeGenerator.Application/Documents/Queries/ReadDocumentQuery.cs

@@ -53,14 +53,17 @@ 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 _repo.Query.Where(d => d.Id == query.Id).FirstOrDefaultAsync(cancel);
+            var doc = await docQuery.Where(d => d.Id == query.Id).FirstOrDefaultAsync(cancel);
+            
             return _mapper.Map<DocumentDto>(doc);
         }            
         else if (query.EnvelopeId is not null)
         {
-            var doc = await _repo.Query.Where(d => d.EnvelopeId == query.EnvelopeId).FirstOrDefaultAsync(cancel);
+            var doc = await docQuery.Where(d => d.EnvelopeId == query.EnvelopeId).FirstOrDefaultAsync(cancel);
             return _mapper.Map<DocumentDto>(doc);
         }
 

EnvelopeGenerator.Application/EmailTemplates/Commands/Reset/ResetEmailTemplateCommand.cs

@@ -1,41 +0,0 @@
-using EnvelopeGenerator.Domain;
-using EnvelopeGenerator.Domain.Constants;
-using MediatR;
-
-namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
-
-/// <summary>
-/// Ein Befehl zum Zurücksetzen einer E-Mail-Vorlage auf die Standardwerte.
-/// Erbt von <see cref="EmailTemplateQueryBase"/> und ermöglicht die Angabe einer optionalen ID und eines Typs der E-Mail-Vorlage.<br/><br/>
-/// Beispiele:<br/>
-/// 0 - DocumentReceived: Benachrichtigung über den Empfang eines Dokuments.<br/>
-/// 1 - DocumentSigned: Benachrichtigung über die Unterzeichnung eines Dokuments.<br/>
-/// 2 - DocumentDeleted: Benachrichtigung über das Löschen eines Dokuments.<br/>
-/// 3 - DocumentCompleted: Benachrichtigung über den Abschluss eines Dokuments.<br/>
-/// 4 - DocumentAccessCodeReceived: Benachrichtigung über den Erhalt eines Zugangscodes.<br/>
-/// 5 - DocumentShared: Benachrichtigung über das Teilen eines Dokuments.<br/>
-/// 6 - TotpSecret: Benachrichtigung über ein TOTP-Geheimnis.<br/>
-/// 7 - DocumentRejected_ADM (Für den Absender): Mail an den Absender, wenn das Dokument abgelehnt wird.<br/>
-/// 8 - DocumentRejected_REC (Für den ablehnenden Empfänger): Mail an den ablehnenden Empfänger, wenn das Dokument abgelehnt wird.<br/>
-/// 9 - DocumentRejected_REC_2 (Für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.<br/>
-/// </summary>
-public record ResetEmailTemplateCommand : EmailTemplateQueryBase, IRequest
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="orginal"></param>
-    public ResetEmailTemplateCommand(EmailTemplateQueryBase? orginal = null) : base(orginal ?? new())
-    {
-
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="Id">Die optionale ID der E-Mail-Vorlage, die zurückgesetzt werden soll.</param>
-    /// <param name="Type">Der Typ der E-Mail-Vorlage, z. B. <see cref="EmailTemplateType"/> (optional).</param>
-    public ResetEmailTemplateCommand(int? Id = null, EmailTemplateType? Type = null) : base(Id, Type)
-    {
-    }
-};

EnvelopeGenerator.Application/EmailTemplates/Commands/ResetEmailTemplateCommand.cs

@@ -1,11 +1,38 @@
 using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Constants;
+using MediatR;
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
-using MediatR;
 using Microsoft.EntityFrameworkCore;
-using System.Linq;
 
-namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
+namespace EnvelopeGenerator.Application.EmailTemplates.Commands;
+
+/// <summary>
+/// Ein Befehl zum Zurücksetzen einer E-Mail-Vorlage auf die Standardwerte.
+/// Erbt von <see cref="IEmailTemplateQuery"/> und ermöglicht die Angabe einer optionalen ID und eines Typs der E-Mail-Vorlage.<br/><br/>
+/// </summary>
+public record ResetEmailTemplateCommand : IEmailTemplateQuery, IRequest
+{
+    /// <summary>
+    /// Die eindeutige Kennung der E-Mail-Vorlage (optional).
+    /// </summary>
+    public int? Id { get; set; }
+
+    /// <summary>
+    /// Der Typ der E-Mail-Vorlage, z. B. <see cref="EmailTemplateType"/> (optional). Beispiele:<br/>
+    /// 0 - DocumentReceived: Benachrichtigung über den Empfang eines Dokuments.<br/>
+    /// 1 - DocumentSigned: Benachrichtigung über die Unterzeichnung eines Dokuments.<br/>
+    /// 2 - DocumentDeleted: Benachrichtigung über das Löschen eines Dokuments.<br/>
+    /// 3 - DocumentCompleted: Benachrichtigung über den Abschluss eines Dokuments.<br/>
+    /// 4 - DocumentAccessCodeReceived: Benachrichtigung über den Erhalt eines Zugangscodes.<br/>
+    /// 5 - DocumentShared: Benachrichtigung über das Teilen eines Dokuments.<br/>
+    /// 6 - TotpSecret: Benachrichtigung über ein TOTP-Geheimnis.<br/>
+    /// 7 - DocumentRejected_ADM (für den Absender): Mail an den Absender, wenn das Dokument abgelehnt wird.<br/>
+    /// 8 - DocumentRejected_REC (für den ablehnenden Empfänger): Mail an den ablehnenden Empfänger, wenn das Dokument abgelehnt wird.<br/>
+    /// 9 - DocumentRejected_REC_2 (für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.
+    /// </summary>
+    public EmailTemplateType? Type { get; set; }
+}
 
 /// <summary>
 /// 
@@ -41,7 +68,7 @@ public class ResetEmailTemplateCommandHandler : IRequestHandler<ResetEmailTempla
         foreach (var temp in temps)
         {
             var def = Defaults.Where(t => t.Name == temp.Name).FirstOrDefault();
-            if(def is not null)
+            if (def is not null)
                 await _repository.UpdateAsync(def, t => t.Id == temp.Id, cancel);
         }
     }
@@ -113,4 +140,4 @@ public class ResetEmailTemplateCommandHandler : IRequestHandler<ResetEmailTempla
         }
     };
 
-}
+}

EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommand.cs

@@ -1,29 +0,0 @@
-using MediatR;
-using System.Text.Json.Serialization;
-
-namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Update;
-
-
-/// <summary>
-/// Befehl zum Aktualisieren einer E-Mail-Vorlage.
-/// </summary>
-/// <param name="Body">
-/// (Optional)Der neue Inhalt des E-Mail-Textkörpers. Wenn null, bleibt der vorhandene Inhalt unverändert.
-/// </param>
-/// <param name="Subject">
-/// (Optional) Der neue Betreff der E-Mail. Wenn null, bleibt der vorhandene Betreff unverändert.
-/// </param>
-public record UpdateEmailTemplateCommand(string? Body = null, string? Subject = null) : IRequest
-{
-    /// <param>
-    /// Die Abfrage, die die E-Mail-Vorlage darstellt, die aktualisiert werden soll.
-    /// </param>
-    [JsonIgnore]
-    public EmailTemplateQueryBase? EmailTemplateQuery { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    [JsonIgnore]
-    public DateTime ChangedWhen { get; init; } = DateTime.Now;
-}

EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommandHandler.cs

@@ -1,67 +0,0 @@
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Application.Common.Dto;
-
-namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Update;
-
-/// <summary>
-/// 
-/// </summary>
-public class UpdateEmailTemplateCommandHandler : IRequestHandler<UpdateEmailTemplateCommand>
-{
-    private readonly IRepository<EmailTemplate> _repository;
-    
-    private readonly IMapper _mapper;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    /// <param name="mapper"></param>
-    public UpdateEmailTemplateCommandHandler(IRepository<EmailTemplate> repository, IMapper mapper)
-    {
-        _repository = repository;
-        _mapper = mapper;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    /// <exception cref="InvalidOperationException"></exception>
-    /// <exception cref="NotFoundException"></exception>
-    [Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-    public async Task Handle(UpdateEmailTemplateCommand request, CancellationToken cancel)
-    {
-        EmailTemplateDto? tempDto;
-
-        if (request.EmailTemplateQuery?.Id is int id)
-        {
-            var temp = await _repository.ReadOnly().Where(t => t.Id == id).FirstOrDefaultAsync(cancel);
-            tempDto = _mapper.Map<EmailTemplateDto>(temp);
-        }
-        else if (request!.EmailTemplateQuery!.Type is EmailTemplateType type)
-        {
-            var temp = await _repository.ReadOnly().Where(t => t.Name == type.ToString()).FirstOrDefaultAsync(cancel);
-            tempDto = _mapper.Map<EmailTemplateDto>(temp);
-        }
-        else
-        {
-            throw new InvalidOperationException("Both id and type is null. Id: " + request.EmailTemplateQuery.Id +". Type: " + request.EmailTemplateQuery.Type.ToString());
-        }
-
-        if (tempDto == null)
-        {
-            throw new NotFoundException();
-        }
-
-        await _repository.UpdateAsync(tempDto, t => t.Id == tempDto.Id, cancel);
-    }
-}

EnvelopeGenerator.Application/EmailTemplates/Commands/UpdateEmailTemplateCommand.cs

@@ -0,0 +1,63 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Common.Commands;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using System.Linq.Expressions;
+
+namespace EnvelopeGenerator.Application.EmailTemplates.Commands;
+
+/// <summary>
+/// 
+/// </summary>
+/// <param name="Body"></param>
+/// <param name="Subject"></param>
+public record EmailTemplateUpdateDto(string Body, string Subject);
+
+/// <summary>
+/// Befehl zum Aktualisieren einer E-Mail-Vorlage.
+/// </summary>
+public record UpdateEmailTemplateCommand : UpdateCommand<EmailTemplateUpdateDto, EmailTemplate>, IEmailTemplateQuery
+{
+    /// <summary>
+    /// Die eindeutige Kennung der E-Mail-Vorlage (optional).
+    /// </summary>
+    public int? Id { get; set; }
+
+    /// <summary>
+    /// Der Typ der E-Mail-Vorlage, z. B. <see cref="EmailTemplateType"/> (optional). Beispiele:<br/>
+    /// 0 - DocumentReceived: Benachrichtigung über den Empfang eines Dokuments.<br/>
+    /// 1 - DocumentSigned: Benachrichtigung über die Unterzeichnung eines Dokuments.<br/>
+    /// 2 - DocumentDeleted: Benachrichtigung über das Löschen eines Dokuments.<br/>
+    /// 3 - DocumentCompleted: Benachrichtigung über den Abschluss eines Dokuments.<br/>
+    /// 4 - DocumentAccessCodeReceived: Benachrichtigung über den Erhalt eines Zugangscodes.<br/>
+    /// 5 - DocumentShared: Benachrichtigung über das Teilen eines Dokuments.<br/>
+    /// 6 - TotpSecret: Benachrichtigung über ein TOTP-Geheimnis.<br/>
+    /// 7 - DocumentRejected_ADM (für den Absender): Mail an den Absender, wenn das Dokument abgelehnt wird.<br/>
+    /// 8 - DocumentRejected_REC (für den ablehnenden Empfänger): Mail an den ablehnenden Empfänger, wenn das Dokument abgelehnt wird.<br/>
+    /// 9 - DocumentRejected_REC_2 (für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.
+    /// </summary>
+    public EmailTemplateType? Type { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    public override Expression<Func<EmailTemplate, bool>> BuildQueryExpression()
+        => Id is int id
+            ? temp => temp.Id == id
+            : temp => temp!.Name == Type.ToString();
+}
+
+/// <summary>
+/// 
+/// </summary>
+public class UpdateEmailTemplateCommandHandler : UpdateCommandHandler<UpdateEmailTemplateCommand, EmailTemplateUpdateDto, EmailTemplate>
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repository"></param>
+    public UpdateEmailTemplateCommandHandler(IRepository<EmailTemplate> repository) : base(repository)
+    {
+    }
+}

EnvelopeGenerator.Application/EmailTemplates/EmailTemplateQueryBase.cs

@@ -1,24 +0,0 @@
-using EnvelopeGenerator.Domain.Constants;
-
-namespace EnvelopeGenerator.Application.EmailTemplates;
-
-/// <summary>
-/// Repräsentiert eine Abfrage für E-Mail-Vorlagen, die für Absender und Empfänger von Umschlägen verwendet werden.
-/// Die Standardkultur ist "de-DE".
-/// </summary>
-/// <param name="Id">Die eindeutige Kennung der E-Mail-Vorlage (optional).</param>
-/// <param name="Type">Der Typ der E-Mail-Vorlage, z. B. <see cref="EmailTemplateType"/> (optional). Beispiele:
-/// 0 - DocumentReceived: Benachrichtigung über den Empfang eines Dokuments.
-/// 1 - DocumentSigned: Benachrichtigung über die Unterzeichnung eines Dokuments.
-/// 2 - DocumentDeleted: Benachrichtigung über das Löschen eines Dokuments.
-/// 3 - DocumentCompleted: Benachrichtigung über den Abschluss eines Dokuments.
-/// 4 - DocumentAccessCodeReceived: Benachrichtigung über den Erhalt eines Zugangscodes.
-/// 5 - DocumentShared: Benachrichtigung über das Teilen eines Dokuments.
-/// 6 - TotpSecret: Benachrichtigung über ein TOTP-Geheimnis.
-/// 7 - DocumentRejected_ADM (Für den Absender): Mail an den Absender, wenn das Dokument abgelehnt wird.
-/// 8 - DocumentRejected_REC (Für den ablehnenden Empfänger): Mail an den ablehnenden Empfänger, wenn das Dokument abgelehnt wird.
-/// 9 - DocumentRejected_REC_2 (Für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.
-/// </param>
-public record EmailTemplateQueryBase(int? Id = null, EmailTemplateType? Type = null)
-{
-}

EnvelopeGenerator.Application/EmailTemplates/IEmailTemplateQuery.cs

@@ -0,0 +1,30 @@
+using EnvelopeGenerator.Domain.Constants;
+
+namespace EnvelopeGenerator.Application.EmailTemplates;
+
+/// <summary>
+/// Stellt eine Schnittstelle für Abfragen von E-Mail-Vorlagen dar, die für Absender und Empfänger von Umschlägen verwendet werden.
+/// Die Standardkultur ist "de-DE".
+/// </summary>
+public interface IEmailTemplateQuery
+{
+    /// <summary>
+    /// Die eindeutige Kennung der E-Mail-Vorlage (optional).
+    /// </summary>
+    int? Id { get; set; }
+
+    /// <summary>
+    /// Der Typ der E-Mail-Vorlage, z. B. <see cref="EmailTemplateType"/> (optional). Beispiele:<br/>
+    /// 0 - DocumentReceived: Benachrichtigung über den Empfang eines Dokuments.<br/>
+    /// 1 - DocumentSigned: Benachrichtigung über die Unterzeichnung eines Dokuments.<br/>
+    /// 2 - DocumentDeleted: Benachrichtigung über das Löschen eines Dokuments.<br/>
+    /// 3 - DocumentCompleted: Benachrichtigung über den Abschluss eines Dokuments.<br/>
+    /// 4 - DocumentAccessCodeReceived: Benachrichtigung über den Erhalt eines Zugangscodes.<br/>
+    /// 5 - DocumentShared: Benachrichtigung über das Teilen eines Dokuments.<br/>
+    /// 6 - TotpSecret: Benachrichtigung über ein TOTP-Geheimnis.<br/>
+    /// 7 - DocumentRejected_ADM (für den Absender): Mail an den Absender, wenn das Dokument abgelehnt wird.<br/>
+    /// 8 - DocumentRejected_REC (für den ablehnenden Empfänger): Mail an den ablehnenden Empfänger, wenn das Dokument abgelehnt wird.<br/>
+    /// 9 - DocumentRejected_REC_2 (für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.
+    /// </summary>
+    EmailTemplateType? Type { get; set; }
+}

EnvelopeGenerator.Application/EmailTemplates/MappingProfile.cs

@@ -0,0 +1,24 @@
+using AutoMapper;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.EmailTemplates.Commands;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.EmailTemplates;
+
+/// <summary>
+///
+/// </summary>
+public class MappingProfile : Profile
+{
+    /// <summary>
+    ///
+    /// </summary>
+    public MappingProfile()
+    {
+        CreateMap<EmailTemplate, EmailTemplateDto>();
+
+        CreateMap<EmailTemplateUpdateDto, EmailTemplate>()
+            .MapChangedWhen();
+    }
+}

EnvelopeGenerator.Application/EmailTemplates/Queries/ReadEmailTemplateQuery.cs

@@ -4,21 +4,82 @@ using EnvelopeGenerator.Application.Common.Dto;
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
+using EnvelopeGenerator.Domain.Constants;
+using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Common.Extensions;
 
-namespace EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
+namespace EnvelopeGenerator.Application.EmailTemplates.Queries;
 
 /// <summary>
 /// Stellt eine Abfrage dar, um eine E-Mail-Vorlage zu lesen.
-/// Diese Klasse erbt von <see cref="EmailTemplateQueryBase"/>.
+/// Diese Klasse erbt von <see cref="IEmailTemplateQuery"/>.
 /// </summary>
-public record ReadEmailTemplateQuery : EmailTemplateQueryBase, IRequest<EmailTemplateDto?>
+public record ReadEmailTemplateQuery : IEmailTemplateQuery, IRequest<IEnumerable<EmailTemplateDto>>
 {
+    /// <summary>
+    /// Die eindeutige Kennung der E-Mail-Vorlage (optional).
+    /// </summary>
+    public int? Id { get; set; }
+
+    /// <summary>
+    /// Der Typ der E-Mail-Vorlage, z. B. <see cref="EmailTemplateType"/> (optional). Beispiele:<br/>
+    /// 0 - DocumentReceived: Benachrichtigung über den Empfang eines Dokuments.<br/>
+    /// 1 - DocumentSigned: Benachrichtigung über die Unterzeichnung eines Dokuments.<br/>
+    /// 2 - DocumentDeleted: Benachrichtigung über das Löschen eines Dokuments.<br/>
+    /// 3 - DocumentCompleted: Benachrichtigung über den Abschluss eines Dokuments.<br/>
+    /// 4 - DocumentAccessCodeReceived: Benachrichtigung über den Erhalt eines Zugangscodes.<br/>
+    /// 5 - DocumentShared: Benachrichtigung über das Teilen eines Dokuments.<br/>
+    /// 6 - TotpSecret: Benachrichtigung über ein TOTP-Geheimnis.<br/>
+    /// 7 - DocumentRejected_ADM (für den Absender): Mail an den Absender, wenn das Dokument abgelehnt wird.<br/>
+    /// 8 - DocumentRejected_REC (für den ablehnenden Empfänger): Mail an den ablehnenden Empfänger, wenn das Dokument abgelehnt wird.<br/>
+    /// 9 - DocumentRejected_REC_2 (für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.
+    /// </summary>
+    public EmailTemplateType? Type { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? LangCode { get; set; }
 }
 
 /// <summary>
 /// 
 /// </summary>
-public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQuery, EmailTemplateDto?>
+public static class ReadEmailTemplateQueryExtensions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="id"></param>
+    /// <param name="langCode"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public static async Task<EmailTemplateDto?> ReadEmailTemplateAsync(this ISender sender, int id, string langCode, CancellationToken cancel = default)
+    {
+        var result = await sender.Send(new ReadEmailTemplateQuery { Id = id, LangCode = langCode }, cancel);
+        return result.FirstOrDefault();
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="type"></param>
+    /// <param name="langCode"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public static async Task<EmailTemplateDto?> ReadEmailTemplateAsync(this ISender sender, EmailTemplateType type, string langCode, CancellationToken cancel = default)
+    {
+        var result = await sender.Send(new ReadEmailTemplateQuery { Type = type, LangCode = langCode }, cancel);
+        return result.FirstOrDefault();
+    }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQuery, IEnumerable<EmailTemplateDto>>
 {
     private readonly IMapper _mapper;
 
@@ -44,12 +105,21 @@ public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQu
     /// <param name="cancel"></param>
     /// <returns></returns>
     /// <exception cref="InvalidOperationException"></exception>
-    public async Task<EmailTemplateDto?> Handle(ReadEmailTemplateQuery request, CancellationToken cancel)
+    public async Task<IEnumerable<EmailTemplateDto>> Handle(ReadEmailTemplateQuery request, CancellationToken cancel)
     {
-        var query = request.Id is int id
+        var query = _repo.Query;
-            ? _repo.Query.Where(temp => temp.Id == id)
-            : _repo.Query.Where(temp => temp.Name == request.Type!.ToString());
 
-        return _mapper.Map<EmailTemplateDto>(await query.FirstOrDefaultAsync(cancel));
+        if (request.Id is int id)
+            query = query.Where(temp => temp.Id == id);
+
+        if (request.Type is EmailTemplateType type)
+            query = query.Where(temp => temp.Name == type.ToString());
+
+        if (request.LangCode is string langCode)
+            query = query.Where(temp => temp.LangCode == langCode);
+
+        var entity = await query.ToListAsync(cancel);
+
+        return _mapper.Map<IEnumerable<EmailTemplateDto>>(entity);
     }
 }

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -7,7 +7,7 @@
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
 	</PropertyGroup>
-
+	
 	<ItemGroup>
 		<None Remove="Resources\Model.Designer.vb" />
 	</ItemGroup>
@@ -19,12 +19,15 @@
 		<PackageReference Include="DigitalData.Core.Client" Version="2.1.0" />
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
-		<PackageReference Include="HtmlSanitizer" Version="8.0.865" />
+		<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
 		<PackageReference Include="MediatR" Version="12.5.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.18" />
+		<PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
 		<PackageReference Include="Otp.NET" Version="1.4.0" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
 		<PackageReference Include="QRCoder-ImageSharp" Version="0.10.0" />
+		<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" />
 		<PackageReference Include="UserManager" Version="1.1.3" />
 	</ItemGroup>
 
@@ -33,7 +36,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
@@ -63,6 +66,9 @@
 			<LastGenOutput>Model.Designer.cs</LastGenOutput>
 			<Generator>PublicResXFileCodeGenerator</Generator>
 		</EmbeddedResource>
+		<EmbeddedResource Update="Resources\Resource.fr-FR.resx">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</EmbeddedResource>
 		<EmbeddedResource Update="Resources\Resource.de-DE.resx">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</EmbeddedResource>
@@ -72,27 +78,25 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-	  <PackageReference Include="AutoMapper" Version="13.0.1" />
+		<PackageReference Include="AutoMapper" Version="13.0.1" />
-	  <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.3" />
+		<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
-	  <PackageReference Include="CommandDotNet">
+		<PackageReference Include="CommandDotNet">
 		<Version>7.0.5</Version>
-	  </PackageReference>
+		</PackageReference>
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-	  <PackageReference Include="AutoMapper" Version="14.0.0" />
+		<PackageReference Include="AutoMapper" Version="14.0.0" />
-	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
+		<PackageReference Include="CommandDotNet">
-	  <PackageReference Include="CommandDotNet">
+		<Version>8.1.1</Version>
-	    <Version>8.1.1</Version>
+		</PackageReference>
-	  </PackageReference>
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-	  <PackageReference Include="AutoMapper" Version="14.0.0" />
+		<PackageReference Include="AutoMapper" Version="14.0.0" />
-	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
+		<PackageReference Include="CommandDotNet">
-	  <PackageReference Include="CommandDotNet">
+		<Version>8.1.1</Version>
-	    <Version>8.1.1</Version>
+		</PackageReference>
-	  </PackageReference>
 	</ItemGroup>
 
 </Project>

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverCommand.cs

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

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverSecretQuery.cs

@@ -0,0 +1,127 @@
+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 bool Authorize(int userId)
+    public CreateEnvelopeCommand WithAuth(int userId)
     {
         UserId = userId;
-        return true;
+        return this;
     }
 
     /// <summary>

EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs

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

EnvelopeGenerator.Application/Histories/MappingProfile.cs

@@ -1,4 +1,5 @@
 using AutoMapper;
+using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Domain.Entities;
 
@@ -17,6 +18,7 @@ public class MappingProfile: Profile
         CreateMap<CreateHistoryCommand, History>()
             .ForMember(dest => dest.Envelope, opt => opt.Ignore())
             .ForMember(dest => dest.Sender, opt => opt.Ignore())
-            .ForMember(dest => dest.Receiver, opt => opt.Ignore());
+            .ForMember(dest => dest.Receiver, opt => opt.Ignore())
+            .MapAddedWhen();
     }
 }

EnvelopeGenerator.Application/Receivers/Commands/CreateReceiverCommand.cs

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

EnvelopeGenerator.Application/Receivers/Commands/UpdateReceiverCommand.cs

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

EnvelopeGenerator.Application/Resources/Resource.cs

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

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

@@ -123,6 +123,9 @@
   <data name="Back" xml:space="preserve">
     <value>Zurück</value>
   </data>
+  <data name="AuthenticatorSetup_Prefix" xml:space="preserve">
+    <value>Klicken Sie auf den</value>
+  </data>
   <data name="Complete" xml:space="preserve">
     <value>Abschließen</value>
   </data>
@@ -144,6 +147,9 @@
   <data name="DocSigned" xml:space="preserve">
     <value>Dokument unterschrieben</value>
   </data>
+  <data name="DocumentSharingPeriodExpired" xml:space="preserve">
+    <value>Der Zeitraum für die gemeinsame Nutzung von Dokumenten ist abgelaufen.</value>
+  </data>
   <data name="en-US" xml:space="preserve">
     <value>Englisch</value>
   </data>
@@ -153,6 +159,9 @@
   <data name="EnvelopeInfo2" xml:space="preserve">
     <value>Erstellt am {0} von {1}. Sie können den Absender über &lt;span class="highlight highlight-envelope-info-2"&gt;&lt;a class="mail-link" href="mailto:{2}?subject={3}&amp;body=Sehr%20geehrter%20{4}%20{5},%0A%0A%0A"&gt;{6}&lt;/a&gt;&lt;/span&gt; kontaktieren.</value>
   </data>
+  <data name="Expired" xml:space="preserve">
+    <value>Abgelaufen</value>
+  </data>
   <data name="FiClass" xml:space="preserve">
     <value>fi-de</value>
   </data>
@@ -165,6 +174,9 @@
   <data name="HomePageDescription" xml:space="preserve">
     <value>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.</value>
   </data>
+  <data name="AuthenticatorSetup_Link" xml:space="preserve">
+    <value>Link</value>
+  </data>
   <data name="LocationWarning" xml:space="preserve">
     <value>Bitte überprüfen Sie die Standortinformationen. Wenn sie falsch sind, korrigieren Sie diese bitte.</value>
   </data>
@@ -238,7 +250,7 @@
     <value>Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
   </data>
   <data name="RejectionInfo2_ext" xml:space="preserve">
-    <value>Das Vorgang wurde von einer der beteiligten Parteien abgelehnt. Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
+    <value>Der Vorgang wurde von einer der beteiligten Parteien abgelehnt. Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
   </data>
   <data name="RejectionReasonQ" xml:space="preserve">
     <value>Bitte geben Sie einen Grund an:</value>
@@ -264,4 +276,379 @@
   <data name="WrongAccessCode" xml:space="preserve">
     <value>Ungültiger Zugangscode.</value>
   </data>
+  <data name="AuthenticatorSetup_Suffix" xml:space="preserve">
+    <value>um Ihre Authenticator-App einzurichten.</value>
+  </data>
+  <data name="DocumentSuccessfullySigned" xml:space="preserve">
+    <value>Dokument erfolgreich signiert!</value>
+  </data>
+  <data name="DocumentSignedConfirmationMessage" xml:space="preserve">
+    <value>Sie haben das Dokument signiert. Im Anschluss erhalten Sie eine schriftliche Bestätigung.</value>
+  </data>
+  <data name="Signatures" xml:space="preserve">
+    <value>Unterschriften</value>
+  </data>
+  <data name="EnterRecipientToShareDocument" xml:space="preserve">
+    <value>Geben Sie hier den Empfänger ein, mit welchem Sie das Dokument teilen wollen</value>
+  </data>
+  <data name="Email" xml:space="preserve">
+    <value>E-Mail</value>
+  </data>
+  <data name="ValidUntil" xml:space="preserve">
+    <value>Gültig bis</value>
+  </data>
+  <data name="ShrEnvInvalidEmailTitle" xml:space="preserve">
+    <value>Falsche Email</value>
+  </data>
+  <data name="ShrEnvInvalidEmailText" xml:space="preserve">
+    <value>Die E-Mail-Adresse ist ungültig. Bitte verwenden Sie das richtige Format, z. B.: user@mail.com.</value>
+  </data>
+  <data name="ShrEnvSentTitle" xml:space="preserve">
+    <value>Gesendet</value>
+  </data>
+  <data name="ShrEnvErrorTitle" xml:space="preserve">
+    <value>Fehler</value>
+  </data>
+  <data name="InvalidDateTitle" xml:space="preserve">
+    <value>Falsches Datum</value>
+  </data>
+  <data name="ShrEnvInvalidDateText" xml:space="preserve">
+    <value>Die E-Mail-Adresse ist ungültig. Bitte verwenden Sie das richtige Format, z. B.: user@mail.com.</value>
+  </data>
+  <data name="UnexpectedErrorTitle" xml:space="preserve">
+    <value>Unerwarteter Fehler</value>
+  </data>
+  <data name="ShrEnvOperationFailedText" xml:space="preserve">
+    <value>Der Vorgang ist fehlgeschlagen. Bitte wenden Sie sich an das IT-Team.</value>
+  </data>
+  <data name="PrivacyNotice" xml:space="preserve">
+    <value>Datenschutzhinweis</value>
+  </data>
+  <data name="CookieConsentMessage" xml:space="preserve">
+    <value>Wir verwenden technisch notwendige Session Cookies. Diese Cookies sind für den ordnungsgemäßen Betrieb dieser Webseite von nöten und können aus diesm Grund nicht abgewählt werden. Es findet keine Übermittlung an Dritte statt.</value>
+  </data>
+  <data name="Accept" xml:space="preserve">
+    <value>Akzeptieren</value>
+  </data>
+  <data name="ConnectionValidityExpired" xml:space="preserve">
+    <value>Die Gültigkeitsdauer der Verbindung ist abgelaufen.</value>
+  </data>
+  <data name="Creator" xml:space="preserve">
+    <value>Ersteller</value>
+  </data>
+  <data name="Date" xml:space="preserve">
+    <value>Datum</value>
+  </data>
+  <data name="DocumentProtected" xml:space="preserve">
+    <value>Dokument geschützt</value>
+  </data>
+  <data name="Password" xml:space="preserve">
+    <value>Passwort</value>
+  </data>
+  <data name="Open" xml:space="preserve">
+    <value>Öffnen</value>
+  </data>
+  <data name="TfaRegistration" xml:space="preserve">
+    <value>2FA Registrierung</value>
+  </data>
+  <data name="Registration" xml:space="preserve">
+    <value>Registrierung</value>
+  </data>
+  <data name="PageVisibleUntil" xml:space="preserve">
+    <value>Diese Seite ist bis {0} sichtbar.</value>
+  </data>
+  <data name="Step1Download2faApplication" xml:space="preserve">
+    <value>Schritt 1 -  Download einer 2FA Applikation</value>
+  </data>
+  <data name="Download2faAppInstruction" xml:space="preserve">
+    <value>Bitte nehmen Sie Ihr Smartphone zur Hand und laden eine Applikation herunter, die zur Zwei-Faktor-Authentifizierung (2FA) benutzt werden kann.</value>
+  </data>
+  <data name="Recommended2faApplications" xml:space="preserve">
+    <value>Folgende Applikationen empfehlen wir</value>
+  </data>
+  <data name="Step2ScanQrCode" xml:space="preserve">
+    <value>Schritt 2 -  Scannen des QR-Codes</value>
+  </data>
+  <data name="ScanQrCodeInstruction" xml:space="preserve">
+    <value>Sobald Sie eine Zwei-Faktor-Authentifizierung App installiert haben, können Sie fortfahren und innerhalb der Applikation die Option zum Scannen eines QR-Codes suchen und bestätigen. Im Anschluss, sobald die Kamera freigegeben wurde, können Sie den QR-Code von uns scannen.</value>
+  </data>
+  <data name="Step3VerifyTheCode" xml:space="preserve">
+    <value>Schritt 3 - Verifizierung des Codes</value>
+  </data>
+  <data name="VerifyCodeInstructionMain" xml:space="preserve">
+    <value>Sie können nun in der Zwei-Faktor-Authentifizierung App einen Zahlencode zur Verifizierung des Vorganges ablesen. Bitte tragen Sie diesen Code in das unten aufgeführte Eingabefeld ein und Klicken auf</value>
+  </data>
+  <data name="VerifyCodeInstructionSubmit" xml:space="preserve">
+    <value>Senden</value>
+  </data>
+  <data name="CopyLink" xml:space="preserve">
+    <value>Link kopieren</value>
+  </data>
+  <data name="CityFormatInvalid" xml:space="preserve">
+    <value>Bitte überprüfen Sie die eingegebene Ortsangabe "{0}" auf korrekte Formatierung. Beispiele für richtige Formate sind: München, Île-de-France, Sauðárkrókur, San Francisco, St. Catharines usw.</value>
+  </data>
+  <data name="CopyLinkSuccess" xml:space="preserve">
+    <value>Kopiert</value>
+  </data>
+  <data name="Logout" xml:space="preserve">
+    <value>Abmelden</value>
+  </data>
+  <data name="ViewAllPages" xml:space="preserve">
+    <value>Bitte sehen Sie sich alle Seiten an.</value>
+  </data>
+  <data name="Reset" xml:space="preserve">
+    <value>Zurücksetzen</value>
+  </data>
+  <data name="ViewRemainingPages" xml:space="preserve">
+    <value>Bitte sehen Sie sich die folgenden Seiten an: {0}</value>
+  </data>
+  <data name="City" xml:space="preserve">
+    <value>Ort</value>
+  </data>
+  <data name="EnvelopeRejectedRedirect" xml:space="preserve">
+    <value>Dokument wurde von einem Empfänger abgelehnt. Sie werden weitergeleitet...</value>
+  </data>
+  <data name="MissingSignatures" xml:space="preserve">
+    <value>Es wurden nicht alle Signaturfelder ausgefüllt!</value>
+  </data>
+  <data name="ResetConfirmText" xml:space="preserve">
+    <value>Wollen Sie das Dokument und alle erstellten Signaturen zurücksetzen?</value>
+  </data>
+  <data name="EnvelopeSignError" xml:space="preserve">
+    <value>Umschlag konnte nicht signiert werden!</value>
+  </data>
+  <data name="SignedBy" xml:space="preserve">
+    <value>Signiert von</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Warnung</value>
+  </data>
+  <data name="Position" xml:space="preserve">
+    <value>Position</value>
+  </data>
+  <data name="Share" xml:space="preserve">
+    <value>Teilen</value>
+  </data>
+  <data name="CopyLinkFailure" xml:space="preserve">
+    <value>Unerwarteter Fehler</value>
+  </data>
+  <data name="LocationFieldsRequired" xml:space="preserve">
+    <value>Bitte füllen Sie alle Standortinformationen vollständig aus!</value>
+  </data>
+  <data name="ResetConfirmTitle" xml:space="preserve">
+    <value>Sind Sie sicher?</value>
+  </data>
+  <data name="EnvelopeUnavailable" xml:space="preserve">
+    <value>Umschlag ist nicht mehr verfügbar.</value>
+  </data>
+  <data name="Success" xml:space="preserve">
+    <value>Erfolg</value>
+  </data>
+  <data name="DocumentReset" xml:space="preserve">
+    <value>Dokument wurde zurückgesetzt.</value>
+  </data>
+  <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
+    <value>Dokument erfolgreich gelesen und bestätigt!</value>
+  </data>
+  <data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
+    <value>Sie haben das Dokument gelesen und bestätigt. Im Anschluss erhalten Sie eine schriftliche Bestätigung.</value>
+  </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>Bestätigen</value>
+  </data>
+  <data name="RejectionInfo1Confirmation" xml:space="preserve">
+    <value>Dieser Bestätigungsvorgang wurde abgelehnt!</value>
+  </data>
+  <data name="ConfirmDoc" xml:space="preserve">
+    <value>Dokument bestätigen</value>
+  </data>
+  <data name="DocConfirmed" xml:space="preserve">
+    <value>Dokument bestätigt</value>
+  </data>
+  <data name="ConfirmAgree" xml:space="preserve">
+    <value>Durch Klick auf Abschließen bestätige ich, das Dokument gelesen und zur Kenntnis genommen zu haben.</value>
+  </data>
+  <data name="ConfirmedBy" xml:space="preserve">
+    <value>Bestätigt von</value>
+  </data>
+  <data name="ConfirmationProcessTitle" xml:space="preserve">
+    <value>Titel des Lesebetätigungs-Vorgangs</value>
+  </data>
+  <data name="Confirmations" xml:space="preserve">
+    <value>Bestätigungen</value>
+  </data>
+  <data name="NewEnvelope" xml:space="preserve">
+    <value>Neuer Umschlag</value>
+  </data>
+  <data name="LoadEnvelope" xml:space="preserve">
+    <value>Umschlag laden</value>
+  </data>
+  <data name="DeleteEnvelope" xml:space="preserve">
+    <value>Umschlag zurückrufen/löschen</value>
+  </data>
+  <data name="RefreshData" xml:space="preserve">
+    <value>Daten Aktualisieren</value>
+  </data>
+  <data name="RefreshedAt" xml:space="preserve">
+    <value>Aktualisiert: {0}</value>
+  </data>
+  <data name="ShowDocument" xml:space="preserve">
+    <value>Dokument anzeigen</value>
+  </data>
+  <data name="ContactReceiver" xml:space="preserve">
+    <value>Empfänger kontaktieren</value>
+  </data>
+  <data name="EnvelopeId" xml:space="preserve">
+    <value>Umschlag-ID: {0}</value>
+  </data>
+  <data name="OpenLogDirectory" xml:space="preserve">
+    <value>Öffne Log Verzeichnis</value>
+  </data>
+  <data name="ShowResultsReport" xml:space="preserve">
+    <value>Ergebnisbericht anzeigen</value>
+  </data>
+  <data name="SupportMail" xml:space="preserve">
+    <value>Support Mail</value>
+  </data>
+  <data name="ResendInvitation" xml:space="preserve">
+    <value>Einladung manuell versenden</value>
+  </data>
+  <data name="Export" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="Receivers" xml:space="preserve">
+    <value>Empfänger</value>
+  </data>
+  <data name="EmailSalutation" xml:space="preserve">
+    <value>Email Anrede</value>
+  </data>
+  <data name="SignedWhen" xml:space="preserve">
+    <value>Unterschrieben wann</value>
+  </data>
+  <data name="AccessCode" xml:space="preserve">
+    <value>Zugangscode</value>
+  </data>
+  <data name="User" xml:space="preserve">
+    <value>Benutzer</value>
+  </data>
+  <data name="Type" xml:space="preserve">
+    <value>Typ</value>
+  </data>
+  <data name="Title" xml:space="preserve">
+    <value>Titel</value>
+  </data>
+  <data name="CreatedOn" xml:space="preserve">
+    <value>Erstellt am</value>
+  </data>
+  <data name="LastModified" xml:space="preserve">
+    <value>Zuletzt geändert am</value>
+  </data>
+  <data name="OpenEnvelopes" xml:space="preserve">
+    <value>Offene Umschläge</value>
+  </data>
+  <data name="CompletedEnvelopes" xml:space="preserve">
+    <value>Abgeschlossene Umschläge</value>
+  </data>
+  <data name="SendAccessCode" xml:space="preserve">
+    <value>Zugangscode senden</value>
+  </data>
+  <data name="TwoFactorProperties" xml:space="preserve">
+    <value>2-Faktor Eigenschaften</value>
+  </data>
+  <data name="Name" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="PhoneNumber" xml:space="preserve">
+    <value>Telefonnummer</value>
+  </data>
+  <data name="AddReceiver" xml:space="preserve">
+    <value>Empfänger hinzufügen</value>
+  </data>
+  <data name="DeleteReceiver" xml:space="preserve">
+    <value>Empfänger löschen</value>
+  </data>
+  <data name="AddFile" xml:space="preserve">
+    <value>Datei hinzufügen</value>
+  </data>
+  <data name="MergeFiles" xml:space="preserve">
+    <value>Dateien zusammenführen</value>
+  </data>
+  <data name="DeleteFile" xml:space="preserve">
+    <value>Datei löschen</value>
+  </data>
+  <data name="ShowFile" xml:space="preserve">
+    <value>Datei anzeigen</value>
+  </data>
+  <data name="EditFields" xml:space="preserve">
+    <value>Felder bearbeiten</value>
+  </data>
+  <data name="EditData" xml:space="preserve">
+    <value>Daten bearbeiten</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Speichern</value>
+  </data>
+  <data name="SendEnvelope" xml:space="preserve">
+    <value>Umschlag versenden</value>
+  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Abbrechen</value>
+  </data>
+  <data name="AddSignature" xml:space="preserve">
+    <value>Signatur hinzufügen</value>
+  </data>
+  <data name="DeleteSignature" xml:space="preserve">
+    <value>Signatur löschen</value>
+  </data>
+  <data name="Language" xml:space="preserve">
+    <value>Sprache</value>
+  </data>
+  <data name="UseAccessCode" xml:space="preserve">
+    <value>Zugangscode verwenden</value>
+  </data>
+  <data name="TwoFactorEnabled" xml:space="preserve">
+    <value>2-Faktor-Authentifizierung aktiviert</value>
+  </data>
+  <data name="CertificationType" xml:space="preserve">
+    <value>Zertifizierungstyp</value>
+  </data>
+  <data name="FinalEmailToCreator" xml:space="preserve">
+    <value>Finale E-Mail an Ersteller</value>
+  </data>
+  <data name="FinalEmailToReceivers" xml:space="preserve">
+    <value>Finale E-Mail an Empfänger</value>
+  </data>
+  <data name="SendReminderEmails" xml:space="preserve">
+    <value>Erinnerungs-E-Mails senden</value>
+  </data>
+  <data name="FirstReminderDays" xml:space="preserve">
+    <value>Erste Erinnerung (Tage)</value>
+  </data>
+  <data name="ReminderIntervalDays" xml:space="preserve">
+    <value>Erinnerungsintervall (Tage)</value>
+  </data>
+  <data name="ExpiresWhenDays" xml:space="preserve">
+    <value>Läuft ab nach (Tage)</value>
+  </data>
+  <data name="ExpiresWarningDays" xml:space="preserve">
+    <value>Ablaufwarnung (Tage)</value>
+  </data>
+  <data name="Message" xml:space="preserve">
+    <value>Nachricht</value>
+  </data>
+  <data name="EnvelopeType" xml:space="preserve">
+    <value>Umschlagtyp</value>
+  </data>
+  <data name="AllOptions" xml:space="preserve">
+    <value>Alle Optionen</value>
+  </data>
+  <data name="DeleteReason" xml:space="preserve">
+    <value>Grund für Löschung</value>
+  </data>
+  <data name="PleaseProvideReason" xml:space="preserve">
+    <value>Bitte geben Sie einen Grund an</value>
+  </data>
+  <data name="Status" xml:space="preserve">
+    <value>Status</value>
+  </data>
 </root>

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

@@ -123,6 +123,9 @@
   <data name="Back" xml:space="preserve">
     <value>Back</value>
   </data>
+  <data name="AuthenticatorSetup_Prefix" xml:space="preserve">
+    <value>Click the</value>
+  </data>
   <data name="Complete" xml:space="preserve">
     <value>Complete</value>
   </data>
@@ -144,6 +147,9 @@
   <data name="DocSigned" xml:space="preserve">
     <value>Document signed</value>
   </data>
+  <data name="DocumentSharingPeriodExpired" xml:space="preserve">
+    <value>The period for sharing documents has expired.</value>
+  </data>
   <data name="en-US" xml:space="preserve">
     <value>English</value>
   </data>
@@ -153,6 +159,9 @@
   <data name="EnvelopeInfo2" xml:space="preserve">
     <value>Created on {0} by {1}. You can contact the sender via &lt;span class="highlight highlight-envelope-info-2"&gt;&lt;a class="mail-link" href="mailto:{2}?subject={3}&amp;body=Dear%20{4}%20{5},%0A%0A%0A"&gt;{6}&lt;/a&gt;&lt;/span&gt;.</value>
   </data>
+  <data name="Expired" xml:space="preserve">
+    <value>Expired</value>
+  </data>
   <data name="FiClass" xml:space="preserve">
     <value>fi-us</value>
   </data>
@@ -165,6 +174,9 @@
   <data name="HomePageDescription" xml:space="preserve">
     <value>The Digital Signature Portal is a platform developed for securely signing and managing your documents. With its user-friendly interface, you can quickly upload your documents, track the signing processes, and easily carry out your digital signature applications. This portal accelerates your workflow with legally valid signatures while enhancing the security of your documents.</value>
   </data>
+  <data name="AuthenticatorSetup_Link" xml:space="preserve">
+    <value>link</value>
+  </data>
   <data name="LocationWarning" xml:space="preserve">
     <value>Please review the location information. If it is incorrect, kindly make the necessary corrections.</value>
   </data>
@@ -264,4 +276,379 @@
   <data name="WrongAccessCode" xml:space="preserve">
     <value>Invalid access code.</value>
   </data>
+  <data name="AuthenticatorSetup_Suffix" xml:space="preserve">
+    <value>to set up your authenticator app.</value>
+  </data>
+  <data name="DocumentSuccessfullySigned" xml:space="preserve">
+    <value>Document successfully signed!</value>
+  </data>
+  <data name="DocumentSignedConfirmationMessage" xml:space="preserve">
+    <value>You have signed the document. Afterwards, you will receive a written confirmation.</value>
+  </data>
+  <data name="Signatures" xml:space="preserve">
+    <value>Signatures</value>
+  </data>
+  <data name="EnterRecipientToShareDocument" xml:space="preserve">
+    <value>Enter the recipient you want to share the document with</value>
+  </data>
+  <data name="Email" xml:space="preserve">
+    <value>E-mail</value>
+  </data>
+  <data name="ValidUntil" xml:space="preserve">
+    <value>Valid until</value>
+  </data>
+  <data name="ShrEnvInvalidEmailTitle" xml:space="preserve">
+    <value>Invalid email</value>
+  </data>
+  <data name="ShrEnvInvalidEmailText" xml:space="preserve">
+    <value>The email address is invalid. Please use the correct format, e.g., user@mail.com.</value>
+  </data>
+  <data name="ShrEnvSentTitle" xml:space="preserve">
+    <value>Sent</value>
+  </data>
+  <data name="ShrEnvErrorTitle" xml:space="preserve">
+    <value>Error</value>
+  </data>
+  <data name="InvalidDateTitle" xml:space="preserve">
+    <value>Invalid date</value>
+  </data>
+  <data name="ShrEnvInvalidDateText" xml:space="preserve">
+    <value>The email address is invalid. Please use the correct format, e.g., user@mail.com.</value>
+  </data>
+  <data name="UnexpectedErrorTitle" xml:space="preserve">
+    <value>Unexpected error</value>
+  </data>
+  <data name="ShrEnvOperationFailedText" xml:space="preserve">
+    <value>The operation failed. Please contact the IT team.</value>
+  </data>
+  <data name="PrivacyNotice" xml:space="preserve">
+    <value>Privacy notice</value>
+  </data>
+  <data name="CookieConsentMessage" xml:space="preserve">
+    <value>We use technically necessary session cookies. These cookies are required for the proper operation of this website and therefore cannot be deselected. No data is transmitted to third parties.</value>
+  </data>
+  <data name="Accept" xml:space="preserve">
+    <value>Accept</value>
+  </data>
+  <data name="ConnectionValidityExpired" xml:space="preserve">
+    <value>The session has expired.</value>
+  </data>
+  <data name="Creator" xml:space="preserve">
+    <value>Creator</value>
+  </data>
+  <data name="Date" xml:space="preserve">
+    <value>Date</value>
+  </data>
+  <data name="DocumentProtected" xml:space="preserve">
+    <value>Document protected</value>
+  </data>
+  <data name="Password" xml:space="preserve">
+    <value>Password</value>
+  </data>
+  <data name="Open" xml:space="preserve">
+    <value>Open</value>
+  </data>
+  <data name="TfaRegistration" xml:space="preserve">
+    <value>2FA Registration</value>
+  </data>
+  <data name="Registration" xml:space="preserve">
+    <value>Registration</value>
+  </data>
+  <data name="PageVisibleUntil" xml:space="preserve">
+    <value>This page is visible until {0}.</value>
+  </data>
+  <data name="Step1Download2faApplication" xml:space="preserve">
+    <value>Step 1 – Download a 2FA application</value>
+  </data>
+  <data name="Download2faAppInstruction" xml:space="preserve">
+    <value>Please take your smartphone and download an application that can be used for two-factor authentication (2FA).</value>
+  </data>
+  <data name="Recommended2faApplications" xml:space="preserve">
+    <value>We recommend the following applications</value>
+  </data>
+  <data name="Step2ScanQrCode" xml:space="preserve">
+    <value>Step 2 – Scan the QR code</value>
+  </data>
+  <data name="ScanQrCodeInstruction" xml:space="preserve">
+    <value>Once you have installed a two-factor authentication app, you can proceed and look for the option to scan a QR code within the application and confirm it. Then, once the camera is enabled, you can scan the QR code provided by us.</value>
+  </data>
+  <data name="Step3VerifyTheCode" xml:space="preserve">
+    <value>Step 3 – Verify the code</value>
+  </data>
+  <data name="VerifyCodeInstructionMain" xml:space="preserve">
+    <value>You can now read a numeric code in the two-factor authentication app to verify the process. Please enter this code in the input field below and click</value>
+  </data>
+  <data name="VerifyCodeInstructionSubmit" xml:space="preserve">
+    <value>Submit</value>
+  </data>
+  <data name="CopyLink" xml:space="preserve">
+    <value>Copy link</value>
+  </data>
+  <data name="CityFormatInvalid" xml:space="preserve">
+    <value>Please check the entered location "{0}" for proper formatting. Examples: Munich, Île-de-France, Sauðárkrókur, San Francisco, St. Catharines, etc.</value>
+  </data>
+  <data name="CopyLinkSuccess" xml:space="preserve">
+    <value>Copied</value>
+  </data>
+  <data name="Logout" xml:space="preserve">
+    <value>Logout</value>
+  </data>
+  <data name="ViewAllPages" xml:space="preserve">
+    <value>Please view all pages.</value>
+  </data>
+  <data name="Reset" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="ViewRemainingPages" xml:space="preserve">
+    <value>Please view the following pages: {0}</value>
+  </data>
+  <data name="City" xml:space="preserve">
+    <value>City</value>
+  </data>
+  <data name="EnvelopeRejectedRedirect" xml:space="preserve">
+    <value>The document was rejected by a recipient. You will be redirected...</value>
+  </data>
+  <data name="MissingSignatures" xml:space="preserve">
+    <value>Not all signature fields have been completed!</value>
+  </data>
+  <data name="ResetConfirmText" xml:space="preserve">
+    <value>Do you want to reset the document and all created signatures?</value>
+  </data>
+  <data name="EnvelopeSignError" xml:space="preserve">
+    <value>The envelope could not be signed!</value>
+  </data>
+  <data name="SignedBy" xml:space="preserve">
+    <value>Signed by</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Warning</value>
+  </data>
+  <data name="Position" xml:space="preserve">
+    <value>Position</value>
+  </data>
+  <data name="Share" xml:space="preserve">
+    <value>Share</value>
+  </data>
+  <data name="CopyLinkFailure" xml:space="preserve">
+    <value>Unexpected error</value>
+  </data>
+  <data name="LocationFieldsRequired" xml:space="preserve">
+    <value>Please complete all location information.</value>
+  </data>
+  <data name="ResetConfirmTitle" xml:space="preserve">
+    <value>Are you sure?</value>
+  </data>
+  <data name="EnvelopeUnavailable" xml:space="preserve">
+    <value>The envelope is no longer available.</value>
+  </data>
+  <data name="Success" xml:space="preserve">
+    <value>Success</value>
+  </data>
+  <data name="DocumentReset" xml:space="preserve">
+    <value>Document has been reset.</value>
+  </data>
+  <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
+    <value>Document successfully read 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>
+  </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>Confirm</value>
+  </data>
+  <data name="RejectionInfo1Confirmation" xml:space="preserve">
+    <value>This confirmation process has been rejected!</value>
+  </data>
+  <data name="ConfirmDoc" xml:space="preserve">
+    <value>Confirm Document</value>
+  </data>
+  <data name="DocConfirmed" xml:space="preserve">
+    <value>Document confirmed</value>
+  </data>
+  <data name="ConfirmAgree" xml:space="preserve">
+    <value>By clicking on “Complete”, I confirm that I have read and taken note of the document.</value>
+  </data>
+  <data name="ConfirmedBy" xml:space="preserve">
+    <value>Confirmed by</value>
+  </data>
+  <data name="ConfirmationProcessTitle" xml:space="preserve">
+    <value>Title of the read confirmation process</value>
+  </data>
+  <data name="Confirmations" xml:space="preserve">
+    <value>Confirmations</value>
+  </data>
+  <data name="NewEnvelope" xml:space="preserve">
+    <value>New Envelope</value>
+  </data>
+  <data name="LoadEnvelope" xml:space="preserve">
+    <value>Load Envelope</value>
+  </data>
+  <data name="DeleteEnvelope" xml:space="preserve">
+    <value>Delete Envelope</value>
+  </data>
+  <data name="RefreshData" xml:space="preserve">
+    <value>Reload Data</value>
+  </data>
+  <data name="RefreshedAt" xml:space="preserve">
+    <value>Refreshed: {0}</value>
+  </data>
+  <data name="ShowDocument" xml:space="preserve">
+    <value>Show Document</value>
+  </data>
+  <data name="ContactReceiver" xml:space="preserve">
+    <value>Contact Receiver</value>
+  </data>
+  <data name="EnvelopeId" xml:space="preserve">
+    <value>Envelope-ID: {0}</value>
+  </data>
+  <data name="OpenLogDirectory" xml:space="preserve">
+    <value>Open Log Directory</value>
+  </data>
+  <data name="ShowResultsReport" xml:space="preserve">
+    <value>Show Results Report</value>
+  </data>
+  <data name="SupportMail" xml:space="preserve">
+    <value>Support Mail</value>
+  </data>
+  <data name="ResendInvitation" xml:space="preserve">
+    <value>Send Invitation Again</value>
+  </data>
+  <data name="Export" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="Receivers" xml:space="preserve">
+    <value>Receivers</value>
+  </data>
+  <data name="EmailSalutation" xml:space="preserve">
+    <value>Email Salutation</value>
+  </data>
+  <data name="SignedWhen" xml:space="preserve">
+    <value>Signed When</value>
+  </data>
+  <data name="AccessCode" xml:space="preserve">
+    <value>Access Code</value>
+  </data>
+  <data name="User" xml:space="preserve">
+    <value>User</value>
+  </data>
+  <data name="Type" xml:space="preserve">
+    <value>Type</value>
+  </data>
+  <data name="Title" xml:space="preserve">
+    <value>Title</value>
+  </data>
+  <data name="CreatedOn" xml:space="preserve">
+    <value>Created On</value>
+  </data>
+  <data name="LastModified" xml:space="preserve">
+    <value>Last Modified</value>
+  </data>
+  <data name="OpenEnvelopes" xml:space="preserve">
+    <value>Open Envelopes</value>
+  </data>
+  <data name="CompletedEnvelopes" xml:space="preserve">
+    <value>Completed Envelopes</value>
+  </data>
+  <data name="SendAccessCode" xml:space="preserve">
+    <value>Send Access Code</value>
+  </data>
+  <data name="TwoFactorProperties" xml:space="preserve">
+    <value>2-Factor Properties</value>
+  </data>
+  <data name="Name" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="PhoneNumber" xml:space="preserve">
+    <value>Phone Number</value>
+  </data>
+  <data name="AddReceiver" xml:space="preserve">
+    <value>Add Receiver</value>
+  </data>
+  <data name="DeleteReceiver" xml:space="preserve">
+    <value>Delete Receiver</value>
+  </data>
+  <data name="AddFile" xml:space="preserve">
+    <value>Add File</value>
+  </data>
+  <data name="MergeFiles" xml:space="preserve">
+    <value>Merge Files</value>
+  </data>
+  <data name="DeleteFile" xml:space="preserve">
+    <value>Delete File</value>
+  </data>
+  <data name="ShowFile" xml:space="preserve">
+    <value>Show File</value>
+  </data>
+  <data name="EditFields" xml:space="preserve">
+    <value>Edit Fields</value>
+  </data>
+  <data name="EditData" xml:space="preserve">
+    <value>Edit Data</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="SendEnvelope" xml:space="preserve">
+    <value>Send Envelope</value>
+  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="AddSignature" xml:space="preserve">
+    <value>Add Signature</value>
+  </data>
+  <data name="DeleteSignature" xml:space="preserve">
+    <value>Delete Signature</value>
+  </data>
+  <data name="Language" xml:space="preserve">
+    <value>Language</value>
+  </data>
+  <data name="UseAccessCode" xml:space="preserve">
+    <value>Use Access Code</value>
+  </data>
+  <data name="TwoFactorEnabled" xml:space="preserve">
+    <value>2-Factor Authentication Enabled</value>
+  </data>
+  <data name="CertificationType" xml:space="preserve">
+    <value>Certification Type</value>
+  </data>
+  <data name="FinalEmailToCreator" xml:space="preserve">
+    <value>Final Email to Creator</value>
+  </data>
+  <data name="FinalEmailToReceivers" xml:space="preserve">
+    <value>Final Email to Receivers</value>
+  </data>
+  <data name="SendReminderEmails" xml:space="preserve">
+    <value>Send Reminder Emails</value>
+  </data>
+  <data name="FirstReminderDays" xml:space="preserve">
+    <value>First Reminder (Days)</value>
+  </data>
+  <data name="ReminderIntervalDays" xml:space="preserve">
+    <value>Reminder Interval (Days)</value>
+  </data>
+  <data name="ExpiresWhenDays" xml:space="preserve">
+    <value>Expires After (Days)</value>
+  </data>
+  <data name="ExpiresWarningDays" xml:space="preserve">
+    <value>Expiry Warning (Days)</value>
+  </data>
+  <data name="Message" xml:space="preserve">
+    <value>Message</value>
+  </data>
+  <data name="EnvelopeType" xml:space="preserve">
+    <value>Envelope Type</value>
+  </data>
+  <data name="AllOptions" xml:space="preserve">
+    <value>All Options</value>
+  </data>
+  <data name="DeleteReason" xml:space="preserve">
+    <value>Deletion Reason</value>
+  </data>
+  <data name="PleaseProvideReason" xml:space="preserve">
+    <value>Please provide a reason</value>
+  </data>
+  <data name="Status" xml:space="preserve">
+    <value>Status</value>
+  </data>
 </root>

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

@@ -0,0 +1,654 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="and" xml:space="preserve">
+    <value>et</value>
+  </data>
+  <data name="Back" xml:space="preserve">
+    <value>Retour</value>
+  </data>
+  <data name="AuthenticatorSetup_Prefix" xml:space="preserve">
+    <value>Cliquez sur</value>
+  </data>
+  <data name="Complete" xml:space="preserve">
+    <value>Terminer</value>
+  </data>
+  <data name="Confirmation" xml:space="preserve">
+    <value>Confirmation</value>
+  </data>
+  <data name="Culture" xml:space="preserve">
+    <value>fr-FR</value>
+  </data>
+  <data name="de-DE" xml:space="preserve">
+    <value>Allemand</value>
+  </data>
+  <data name="DocProtected" xml:space="preserve">
+    <value>Document protégé</value>
+  </data>
+  <data name="DocRejected" xml:space="preserve">
+    <value>Document rejeté</value>
+  </data>
+  <data name="DocSigned" xml:space="preserve">
+    <value>Document signé</value>
+  </data>
+  <data name="DocumentSharingPeriodExpired" xml:space="preserve">
+    <value>La période de partage des documents a expiré.</value>
+  </data>
+  <data name="en-US" xml:space="preserve">
+    <value>Anglais</value>
+  </data>
+  <data name="EnvelopeInfo1" xml:space="preserve">
+    <value>Vous devez signer le processus {0}. &lt;span class="highlight highlight-envelope-info-1"&gt;Veuillez vérifier la page {1}&lt;/span&gt;.</value>
+  </data>
+  <data name="EnvelopeInfo2" xml:space="preserve">
+    <value>Créé le {0} par {1}. Vous pouvez contacter l’expéditeur via &lt;span class="highlight highlight-envelope-info-2"&gt;&lt;a class="mail-link" href="mailto:{2}?subject={3}&amp;body=Cher%20{4}%20{5},%0A%0A%0A"&gt;{6}&lt;/a&gt;&lt;/span&gt;.</value>
+  </data>
+  <data name="Expired" xml:space="preserve">
+    <value>Expiré</value>
+  </data>
+  <data name="FiClass" xml:space="preserve">
+    <value>fi-fr</value>
+  </data>
+  <data name="Finalize" xml:space="preserve">
+    <value>Finaliser</value>
+  </data>
+  <data name="Hello" xml:space="preserve">
+    <value>Bonjour</value>
+  </data>
+  <data name="HomePageDescription" xml:space="preserve">
+    <value>Le Portail de Signature Numérique est une plateforme développée pour signer et gérer vos documents en toute sécurité. Grâce à son interface conviviale, vous pouvez rapidement téléverser vos documents, suivre les processus de signature et effectuer facilement vos démarches de signature numérique. Ce portail accélère votre flux de travail avec des signatures juridiquement valides tout en renforçant la sécurité de vos documents.</value>
+  </data>
+  <data name="AuthenticatorSetup_Link" xml:space="preserve">
+    <value>lien</value>
+  </data>
+  <data name="LocationWarning" xml:space="preserve">
+    <value>Veuillez vérifier les informations de localisation. Si elles sont incorrectes, veuillez effectuer les corrections nécessaires.</value>
+  </data>
+  <data name="LockedBodyAccess" xml:space="preserve">
+    <value>Nous allons maintenant vous envoyer un code d’accès à votre adresse e-mail enregistrée. Cela peut prendre quelques minutes !</value>
+  </data>
+  <data name="LockedBodyAuthenticator" xml:space="preserve">
+    <value>Veuillez saisir le TOTP fourni dans votre application Authenticator.</value>
+  </data>
+  <data name="LockedBodyAuthenticatorNew" xml:space="preserve">
+    <value>Nous avons envoyé le code QR à votre adresse e-mail. Votre code QR est valide jusqu’au {0}. Vous pouvez l’utiliser pour toutes les enveloppes reçues à cette adresse e-mail.</value>
+  </data>
+  <data name="LockedBodySms" xml:space="preserve">
+    <value>Nous venons d’envoyer le code d’accès par SMS au numéro de téléphone que vous avez fourni.</value>
+  </data>
+  <data name="LockedCodeLabelAccess" xml:space="preserve">
+    <value>Code d’accès</value>
+  </data>
+  <data name="LockedCodeLabelAuthenticator" xml:space="preserve">
+    <value>TOTP</value>
+  </data>
+  <data name="LockedCodeLabelSms" xml:space="preserve">
+    <value>Code SMS</value>
+  </data>
+  <data name="LockedFooterBodyAccess" xml:space="preserve">
+    <value>Veuillez vérifier votre boîte de réception, y compris le dossier spam. Vous pouvez également demander à l’expéditeur &lt;a class="mail-link" href="mailto:{0}?subject={1}&amp;body={2}" target="_blank"&gt;{0}&lt;/a&gt; de vous envoyer le code par un autre moyen.</value>
+  </data>
+  <data name="LockedFooterBodyAuthenticator" xml:space="preserve">
+    <value>Le nouveau code QR n’est envoyé qu’une seule fois pour une période donnée et est enregistré dans votre application Authenticator une fois scanné. Il peut être utilisé pour toutes les enveloppes reçues à la même adresse e-mail jusqu’à son expiration. Si vous ne recevez pas l’e-mail contenant le code QR ou si vous le supprimez à la fois de l’e-mail et de l’application Authenticator, veuillez contacter l’expéditeur.</value>
+  </data>
+  <data name="LockedFooterBodySms" xml:space="preserve">
+    <value>Vous pouvez demander à l’expéditeur de vérifier votre numéro de téléphone. Le numéro de téléphone doit être saisi avec l’indicatif. Sinon, vous pouvez demander la suppression de la protection à deux facteurs.</value>
+  </data>
+  <data name="LockedFooterTitleAccess" xml:space="preserve">
+    <value>Vous n’avez pas reçu de code d’accès ?</value>
+  </data>
+  <data name="LockedFooterTitleAuthenticator" xml:space="preserve">
+    <value>Vous n’avez pas reçu de code QR ?</value>
+  </data>
+  <data name="LockedFooterTitleSms" xml:space="preserve">
+    <value>Vous n’avez pas reçu de SMS ?</value>
+  </data>
+  <data name="LockedTitleAccess" xml:space="preserve">
+    <value>Le document nécessite un code d’accès</value>
+  </data>
+  <data name="LockedTitleAuthenticator" xml:space="preserve">
+    <value>Authentification à 2 facteurs</value>
+  </data>
+  <data name="LockedTitleSms" xml:space="preserve">
+    <value>Authentification à 2 facteurs</value>
+  </data>
+  <data name="Privacy" xml:space="preserve">
+    <value>Confidentialité</value>
+  </data>
+  <data name="ReadOnlyMessage" xml:space="preserve">
+    <value>Transféré par {0}. Valable jusqu’au {1}.</value>
+  </data>
+  <data name="Reject" xml:space="preserve">
+    <value>Rejeter</value>
+  </data>
+  <data name="Rejection" xml:space="preserve">
+    <value>Rejet</value>
+  </data>
+  <data name="RejectionInfo1" xml:space="preserve">
+    <value>Ce processus de signature a été rejeté !</value>
+  </data>
+  <data name="RejectionInfo1_ext" xml:space="preserve">
+    <value>Processus annulé !</value>
+  </data>
+  <data name="RejectionInfo2" xml:space="preserve">
+    <value>Vous pouvez contacter {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Cher%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; si nécessaire.</value>
+  </data>
+  <data name="RejectionInfo2_ext" xml:space="preserve">
+    <value>Le processus a été rejeté par l’une des parties concernées. Vous pouvez contacter {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Cher%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; si nécessaire.</value>
+  </data>
+  <data name="RejectionReasonQ" xml:space="preserve">
+    <value>Veuillez indiquer une raison :</value>
+  </data>
+  <data name="SigAgree" xml:space="preserve">
+    <value>En cliquant sur Finaliser, j’accepte que la signature affichée et soumise soit une représentation électronique de ma signature dans les cas où je l’utilise sur des documents, y compris des contrats juridiquement contraignants.</value>
+  </data>
+  <data name="SignDoc" xml:space="preserve">
+    <value>Signer le document</value>
+  </data>
+  <data name="SigningProcessTitle" xml:space="preserve">
+    <value>Titre du processus de signature</value>
+  </data>
+  <data name="UnexpectedError" xml:space="preserve">
+    <value>Une erreur inattendue s’est produite.</value>
+  </data>
+  <data name="ViewDoc" xml:space="preserve">
+    <value>Afficher le document</value>
+  </data>
+  <data name="WelcomeToTheESignPortal" xml:space="preserve">
+    <value>Bienvenue sur le portail eSign</value>
+  </data>
+  <data name="WrongAccessCode" xml:space="preserve">
+    <value>Code d’accès invalide.</value>
+  </data>
+  <data name="AuthenticatorSetup_Suffix" xml:space="preserve">
+    <value>pour configurer votre application d'authentification.</value>
+  </data>
+  <data name="DocumentSuccessfullySigned" xml:space="preserve">
+    <value>Document signé avec succès !</value>
+  </data>
+  <data name="DocumentSignedConfirmationMessage" xml:space="preserve">
+    <value>Vous avez signé le document. Vous recevrez ensuite une confirmation écrite.</value>
+  </data>
+  <data name="Signatures" xml:space="preserve">
+    <value>Signatures</value>
+  </data>
+  <data name="EnterRecipientToShareDocument" xml:space="preserve">
+    <value>Saisissez ici le destinataire avec lequel vous souhaitez partager le document</value>
+  </data>
+  <data name="Email" xml:space="preserve">
+    <value>E-mail</value>
+  </data>
+  <data name="ValidUntil" xml:space="preserve">
+    <value>Valable jusqu'au</value>
+  </data>
+  <data name="ShrEnvInvalidEmailTitle" xml:space="preserve">
+    <value>E-mail incorrect</value>
+  </data>
+  <data name="ShrEnvInvalidEmailText" xml:space="preserve">
+    <value>L'adresse e-mail est invalide. Veuillez utiliser le format correct, par ex. : user@mail.com.</value>
+  </data>
+  <data name="ShrEnvSentTitle" xml:space="preserve">
+    <value>Envoyé</value>
+  </data>
+  <data name="ShrEnvErrorTitle" xml:space="preserve">
+    <value>Erreur</value>
+  </data>
+  <data name="InvalidDateTitle" xml:space="preserve">
+    <value>Date invalide</value>
+  </data>
+  <data name="ShrEnvInvalidDateText" xml:space="preserve">
+    <value>L'adresse e-mail est invalide. Veuillez utiliser le format correct, par ex. : user@mail.com.</value>
+  </data>
+  <data name="UnexpectedErrorTitle" xml:space="preserve">
+    <value>Erreur inattendue</value>
+  </data>
+  <data name="ShrEnvOperationFailedText" xml:space="preserve">
+    <value>L'opération a échoué. Veuillez contacter l'équipe informatique.</value>
+  </data>
+  <data name="PrivacyNotice" xml:space="preserve">
+    <value>Avis de confidentialité</value>
+  </data>
+  <data name="CookieConsentMessage" xml:space="preserve">
+    <value>Nous utilisons des cookies de session strictement nécessaires. Ces cookies sont indispensables au bon fonctionnement de ce site et ne peuvent donc pas être désactivés. Aucune donnée n'est transmise à des tiers.</value>
+  </data>
+  <data name="Accept" xml:space="preserve">
+    <value>Accepter</value>
+  </data>
+  <data name="ConnectionValidityExpired" xml:space="preserve">
+    <value>La durée de validité de la connexion est expirée.</value>
+  </data>
+  <data name="Creator" xml:space="preserve">
+    <value>Créateur</value>
+  </data>
+  <data name="Date" xml:space="preserve">
+    <value>Date</value>
+  </data>
+  <data name="DocumentProtected" xml:space="preserve">
+    <value>Document protégé</value>
+  </data>
+  <data name="Password" xml:space="preserve">
+    <value>Mot de passe</value>
+  </data>
+  <data name="Open" xml:space="preserve">
+    <value>Ouvrir</value>
+  </data>
+  <data name="TfaRegistration" xml:space="preserve">
+    <value>Enregistrement 2FA</value>
+  </data>
+  <data name="Registration" xml:space="preserve">
+    <value>Inscription</value>
+  </data>
+  <data name="PageVisibleUntil" xml:space="preserve">
+    <value>Cette page est visible jusqu'au {0}.</value>
+  </data>
+  <data name="Step1Download2faApplication" xml:space="preserve">
+    <value>Étape 1 – Téléchargez une application 2FA</value>
+  </data>
+  <data name="Download2faAppInstruction" xml:space="preserve">
+    <value>Veuillez prendre votre smartphone et télécharger une application pouvant être utilisée pour l’authentification à deux facteurs (2FA).</value>
+  </data>
+  <data name="Recommended2faApplications" xml:space="preserve">
+    <value>Nous recommandons les applications suivantes</value>
+  </data>
+  <data name="Step2ScanQrCode" xml:space="preserve">
+    <value>Étape 2 – Scannez le code QR</value>
+  </data>
+  <data name="ScanQrCodeInstruction" xml:space="preserve">
+    <value>Une fois que vous avez installé une application d’authentification à deux facteurs, vous pouvez continuer et chercher dans l’application l’option pour scanner un code QR et la confirmer. Ensuite, une fois la caméra activée, vous pourrez scanner le code QR fourni par nos soins.</value>
+  </data>
+  <data name="Step3VerifyTheCode" xml:space="preserve">
+    <value>Étape 3 – Vérification du code</value>
+  </data>
+  <data name="VerifyCodeInstructionMain" xml:space="preserve">
+    <value>Vous pouvez maintenant lire un code numérique dans l’application d’authentification à deux facteurs pour vérifier l’opération. Veuillez saisir ce code dans le champ ci-dessous et cliquer sur</value>
+  </data>
+  <data name="VerifyCodeInstructionSubmit" xml:space="preserve">
+    <value>Envoyer</value>
+  </data>
+  <data name="CopyLink" xml:space="preserve">
+    <value>Copier le lien</value>
+  </data>
+  <data name="CityFormatInvalid" xml:space="preserve">
+    <value>Veuillez vérifier le lieu saisi "{0}" pour un format correct. Exemples : Munich, Île-de-France, Sauðárkrókur, San Francisco, St. Catharines, etc.</value>
+  </data>
+  <data name="CopyLinkSuccess" xml:space="preserve">
+    <value>Copié</value>
+  </data>
+  <data name="Logout" xml:space="preserve">
+    <value>Déconnexion</value>
+  </data>
+  <data name="ViewAllPages" xml:space="preserve">
+    <value>Veuillez consulter toutes les pages.</value>
+  </data>
+  <data name="Reset" xml:space="preserve">
+    <value>Réinitialiser</value>
+  </data>
+  <data name="ViewRemainingPages" xml:space="preserve">
+    <value>Veuillez consulter les pages suivantes : {0}</value>
+  </data>
+  <data name="City" xml:space="preserve">
+    <value>Ville</value>
+  </data>
+  <data name="EnvelopeRejectedRedirect" xml:space="preserve">
+    <value>Le document a été refusé par un destinataire. Vous allez être redirigé...</value>
+  </data>
+  <data name="MissingSignatures" xml:space="preserve">
+    <value>Tous les champs de signature n'ont pas été remplis !</value>
+  </data>
+  <data name="ResetConfirmText" xml:space="preserve">
+    <value>Voulez-vous réinitialiser le document et toutes les signatures créées ?</value>
+  </data>
+  <data name="EnvelopeSignError" xml:space="preserve">
+    <value>Le pli n'a pas pu être signé !</value>
+  </data>
+  <data name="SignedBy" xml:space="preserve">
+    <value>Signé par</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Avertissement</value>
+  </data>
+  <data name="Position" xml:space="preserve">
+    <value>Position</value>
+  </data>
+  <data name="Share" xml:space="preserve">
+    <value>Partager</value>
+  </data>
+  <data name="CopyLinkFailure" xml:space="preserve">
+    <value>Erreur inattendue</value>
+  </data>
+  <data name="LocationFieldsRequired" xml:space="preserve">
+    <value>Veuillez compléter toutes les informations de localisation.</value>
+  </data>
+  <data name="ResetConfirmTitle" xml:space="preserve">
+    <value>Êtes-vous sûr ?</value>
+  </data>
+  <data name="EnvelopeUnavailable" xml:space="preserve">
+    <value>Le pli n'est plus disponible.</value>
+  </data>
+  <data name="Success" xml:space="preserve">
+    <value>Succès</value>
+  </data>
+  <data name="DocumentReset" xml:space="preserve">
+    <value>Le document a été réinitialisé.</value>
+  </data>
+  <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
+    <value>Document lu et confirmé avec succès !</value>
+  </data>
+  <data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
+    <value>Vous avez lu et confirmé le document. Vous recevrez une confirmation écrite par la suite.</value>
+  </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>Confirmer</value>
+  </data>
+  <data name="RejectionInfo1Confirmation" xml:space="preserve">
+    <value>Cette procédure de confirmation a été rejetée !</value>
+  </data>
+  <data name="ConfirmDoc" xml:space="preserve">
+    <value>Confirmer le document</value>
+  </data>
+  <data name="DocConfirmed" xml:space="preserve">
+    <value>Document confirmé</value>
+  </data>
+  <data name="ConfirmAgree" xml:space="preserve">
+    <value>En cliquant sur « Terminer », je confirme avoir lu et pris connaissance du document.</value>
+  </data>
+  <data name="ConfirmedBy" xml:space="preserve">
+    <value>Confirmé par</value>
+  </data>
+  <data name="ConfirmationProcessTitle" xml:space="preserve">
+    <value>Titre de la procédure de confirmation de lecture</value>
+  </data>
+  <data name="Confirmations" xml:space="preserve">
+    <value>Confirmations</value>
+  </data>
+  <data name="NewEnvelope" xml:space="preserve">
+    <value>Nouvelle enveloppe</value>
+  </data>
+  <data name="LoadEnvelope" xml:space="preserve">
+    <value>Charger l'enveloppe</value>
+  </data>
+  <data name="DeleteEnvelope" xml:space="preserve">
+    <value>Supprimer l'enveloppe</value>
+  </data>
+  <data name="RefreshData" xml:space="preserve">
+    <value>Actualiser les données</value>
+  </data>
+  <data name="RefreshedAt" xml:space="preserve">
+    <value>Actualisé : {0}</value>
+  </data>
+  <data name="ShowDocument" xml:space="preserve">
+    <value>Afficher le document</value>
+  </data>
+  <data name="ContactReceiver" xml:space="preserve">
+    <value>Contacter le destinataire</value>
+  </data>
+  <data name="EnvelopeId" xml:space="preserve">
+    <value>ID d'enveloppe : {0}</value>
+  </data>
+  <data name="OpenLogDirectory" xml:space="preserve">
+    <value>Ouvrir le répertoire des logs</value>
+  </data>
+  <data name="ShowResultsReport" xml:space="preserve">
+    <value>Afficher le rapport de résultats</value>
+  </data>
+  <data name="SupportMail" xml:space="preserve">
+    <value>E-mail de support</value>
+  </data>
+  <data name="ResendInvitation" xml:space="preserve">
+    <value>Renvoyer l'invitation</value>
+  </data>
+  <data name="Export" xml:space="preserve">
+    <value>Exporter</value>
+  </data>
+  <data name="Receivers" xml:space="preserve">
+    <value>Destinataires</value>
+  </data>
+  <data name="EmailSalutation" xml:space="preserve">
+    <value>Formule de politesse</value>
+  </data>
+  <data name="SignedWhen" xml:space="preserve">
+    <value>Signé quand</value>
+  </data>
+  <data name="AccessCode" xml:space="preserve">
+    <value>Code d'accès</value>
+  </data>
+  <data name="User" xml:space="preserve">
+    <value>Utilisateur</value>
+  </data>
+  <data name="Type" xml:space="preserve">
+    <value>Type</value>
+  </data>
+  <data name="Title" xml:space="preserve">
+    <value>Titre</value>
+  </data>
+  <data name="CreatedOn" xml:space="preserve">
+    <value>Créé le</value>
+  </data>
+  <data name="LastModified" xml:space="preserve">
+    <value>Dernière modification</value>
+  </data>
+  <data name="OpenEnvelopes" xml:space="preserve">
+    <value>Enveloppes ouvertes</value>
+  </data>
+  <data name="CompletedEnvelopes" xml:space="preserve">
+    <value>Enveloppes terminées</value>
+  </data>
+  <data name="SendAccessCode" xml:space="preserve">
+    <value>Envoyer le code d'accès</value>
+  </data>
+  <data name="TwoFactorProperties" xml:space="preserve">
+    <value>Propriétés 2-facteurs</value>
+  </data>
+  <data name="Name" xml:space="preserve">
+    <value>Nom</value>
+  </data>
+  <data name="PhoneNumber" xml:space="preserve">
+    <value>Numéro de téléphone</value>
+  </data>
+  <data name="AddReceiver" xml:space="preserve">
+    <value>Ajouter un destinataire</value>
+  </data>
+  <data name="DeleteReceiver" xml:space="preserve">
+    <value>Supprimer le destinataire</value>
+  </data>
+  <data name="AddFile" xml:space="preserve">
+    <value>Ajouter un fichier</value>
+  </data>
+  <data name="MergeFiles" xml:space="preserve">
+    <value>Fusionner les fichiers</value>
+  </data>
+  <data name="DeleteFile" xml:space="preserve">
+    <value>Supprimer le fichier</value>
+  </data>
+  <data name="ShowFile" xml:space="preserve">
+    <value>Afficher le fichier</value>
+  </data>
+  <data name="EditFields" xml:space="preserve">
+    <value>Modifier les champs</value>
+  </data>
+  <data name="EditData" xml:space="preserve">
+    <value>Modifier les données</value>
+  </data>
+  <data name="Save" xml:space="preserve">
+    <value>Enregistrer</value>
+  </data>
+  <data name="SendEnvelope" xml:space="preserve">
+    <value>Envoyer l'enveloppe</value>
+  </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Annuler</value>
+  </data>
+  <data name="AddSignature" xml:space="preserve">
+    <value>Ajouter une signature</value>
+  </data>
+  <data name="DeleteSignature" xml:space="preserve">
+    <value>Supprimer la signature</value>
+  </data>
+  <data name="Language" xml:space="preserve">
+    <value>Langue</value>
+  </data>
+  <data name="UseAccessCode" xml:space="preserve">
+    <value>Utiliser un code d'accès</value>
+  </data>
+  <data name="TwoFactorEnabled" xml:space="preserve">
+    <value>Authentification à 2 facteurs activée</value>
+  </data>
+  <data name="CertificationType" xml:space="preserve">
+    <value>Type de certification</value>
+  </data>
+  <data name="FinalEmailToCreator" xml:space="preserve">
+    <value>E-mail final au créateur</value>
+  </data>
+  <data name="FinalEmailToReceivers" xml:space="preserve">
+    <value>E-mail final aux destinataires</value>
+  </data>
+  <data name="SendReminderEmails" xml:space="preserve">
+    <value>Envoyer des e-mails de rappel</value>
+  </data>
+  <data name="FirstReminderDays" xml:space="preserve">
+    <value>Premier rappel (jours)</value>
+  </data>
+  <data name="ReminderIntervalDays" xml:space="preserve">
+    <value>Intervalle de rappel (jours)</value>
+  </data>
+  <data name="ExpiresWhenDays" xml:space="preserve">
+    <value>Expire après (jours)</value>
+  </data>
+  <data name="ExpiresWarningDays" xml:space="preserve">
+    <value>Avertissement d'expiration (jours)</value>
+  </data>
+  <data name="Message" xml:space="preserve">
+    <value>Message</value>
+  </data>
+  <data name="EnvelopeType" xml:space="preserve">
+    <value>Type d'enveloppe</value>
+  </data>
+  <data name="AllOptions" xml:space="preserve">
+    <value>Toutes les options</value>
+  </data>
+  <data name="DeleteReason" xml:space="preserve">
+    <value>Motif de suppression</value>
+  </data>
+  <data name="PleaseProvideReason" xml:space="preserve">
+    <value>Veuillez indiquer une raison</value>
+  </data>
+  <data name="Status" xml:space="preserve">
+    <value>Statut</value>
+  </data>
+</root>

EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs

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

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -4,7 +4,6 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Services;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Configurations;
@@ -12,6 +11,8 @@ using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Common.Interfaces.Services;
+using MediatR;
+using EnvelopeGenerator.Domain.Interfaces;
 
 namespace EnvelopeGenerator.Application.Services;
 
@@ -21,170 +22,190 @@ namespace EnvelopeGenerator.Application.Services;
 [Obsolete("Use MediatR")]
 public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
 {
-private readonly IEmailTemplateService _tempService;
+	private readonly IEmailTemplateService _tempService;
-private readonly IEnvelopeReceiverService _envRcvService;
+	private readonly IEnvelopeReceiverService _envRcvService;
-private readonly DispatcherParams _dConfig;
+	private readonly DispatcherParams _dConfig;
-private readonly IConfigService _configService;
+	private readonly IConfigService _configService;
-private readonly Dictionary<string, string> _placeholders;
+	private readonly Dictionary<string, string> _placeholders;
-private readonly IAuthenticator _authenticator;
+    private readonly ISender _sender;
 
-/// <summary>
+	/// <summary>
-/// 
+	/// 
-/// </summary>
+	/// </summary>
-/// <param name="repository"></param>
+	/// <param name="repository"></param>
-/// <param name="mapper"></param>
+	/// <param name="mapper"></param>
-/// <param name="tempService"></param>
+	/// <param name="tempService"></param>
-/// <param name="envelopeReceiverService"></param>
+	/// <param name="envelopeReceiverService"></param>
-/// <param name="dispatcherConfigOptions"></param>
+	/// <param name="dispatcherConfigOptions"></param>
-/// <param name="configService"></param>
+	/// <param name="configService"></param>
-/// <param name="mailConfig"></param>
+	/// <param name="mailConfig"></param>
-/// <param name="authenticator"></param>
+	/// <param name="sender"></param>
-    public EnvelopeMailService(IEmailOutRepository repository, IMapper mapper, IEmailTemplateService tempService, IEnvelopeReceiverService envelopeReceiverService, IOptions<DispatcherParams> dispatcherConfigOptions, IConfigService configService, IOptions<MailParams> mailConfig, IAuthenticator authenticator) : base(repository, mapper)
+    public EnvelopeMailService(IEmailOutRepository repository, IMapper mapper, IEmailTemplateService tempService, IEnvelopeReceiverService envelopeReceiverService, IOptions<DispatcherParams> dispatcherConfigOptions, IConfigService configService, IOptions<MailParams> mailConfig, ISender sender) : base(repository, mapper)
-    {
+	{
-        _tempService = tempService;
+		_tempService = tempService;
-	    _envRcvService = envelopeReceiverService;
+		_envRcvService = envelopeReceiverService;
-	    _dConfig = dispatcherConfigOptions.Value;
+		_dConfig = dispatcherConfigOptions.Value;
-	    _configService = configService;
+		_configService = configService;
-	    _placeholders = new Dictionary<string, string>(mailConfig.Value.Placeholders);
+		_placeholders = new Dictionary<string, string>(mailConfig.Value.Placeholders);
-        _authenticator = authenticator;
+		_sender = sender;
     }
 
-private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? envelopeReceiverDto = null)
+	private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? er = null)
-{
-	if (accessCode is not null)
-            _placeholders["[DOCUMENT_ACCESS_CODE]"] = accessCode;
-
-	if(envelopeReceiverDto?.Envelope is not null && envelopeReceiverDto.Receiver is not null)
 	{
-		var erId = (envelopeReceiverDto.Envelope.Uuid, envelopeReceiverDto.Receiver.Signature).ToEnvelopeKey();
+		if (er!.Envelope.IsReadAndConfirm())
-		var sigHost = await _configService.ReadDefaultSignatureHost();
+		{
-		var linkToDoc = $"{sigHost}/EnvelopeKey/{erId}";
+			_placeholders["[SIGNATURE_TYPE]"] = "Lesen und bestätigen";
-		_placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
+			_placeholders["[DOCUMENT_PROCESS]"] = string.Empty;
-		_placeholders["[LINK_TO_DOCUMENT_TEXT]"] = linkToDoc[..Math.Min(40, linkToDoc.Length)] + "..";
+            _placeholders["[FINAL_STATUS]"] = "Lesebestätigung";
-	}
+            _placeholders["[FINAL_ACTION]"] = "Empfänger bestätigt";
-
+            _placeholders["[REJECTED_BY_OTHERS]"] = "anderen Empfänger abgelehnt!";
-	return _placeholders;
+            _placeholders["[RECEIVER_ACTION]"] = "bestätigt";
-}
+        }
-
+		else
-    private async Task<Dictionary<string, string>> CreatePlaceholders(EnvelopeReceiverReadOnlyDto? readOnlyDto = null)
-    {
-        if (readOnlyDto?.Envelope is not null && readOnlyDto.Receiver is not null)
         {
-            _placeholders["[NAME_RECEIVER]"] = await _envRcvService.ReadLastUsedReceiverNameByMailAsync(readOnlyDto.AddedWho).ThenAsync(res => res, (msg, ntc) => string.Empty) ?? string.Empty;
+            _placeholders["[SIGNATURE_TYPE]"] = "Signieren";
-            var erReadOnlyId = (readOnlyDto.Id).ToEnvelopeKey();
+            _placeholders["[DOCUMENT_PROCESS]"] = " und elektronisch unterschreiben";
-            var sigHost = await _configService.ReadDefaultSignatureHost();
+            _placeholders["[FINAL_STATUS]"] = "Signatur";
-            var linkToDoc = $"{sigHost}/EnvelopeKey/{erReadOnlyId}";
+            _placeholders["[FINAL_ACTION]"] = "Vertragspartner unterzeichnet";
-            _placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
+            _placeholders["[REJECTED_BY_OTHERS]"] = "anderen Vertragspartner abgelehnt! Ihre notwendige Unterzeichnung wurde verworfen.";
-            _placeholders["[LINK_TO_DOCUMENT_TEXT]"] = linkToDoc[..Math.Min(40, linkToDoc.Length)] + "..";
+            _placeholders["[RECEIVER_ACTION]"] = "unterschrieben";
         }
 
-        return _placeholders;
+		if (accessCode is not null)
-    }
+			_placeholders["[DOCUMENT_ACCESS_CODE]"] = accessCode;
-	
-/// <summary>
-/// 
-/// </summary>
-/// <param name="dto"></param>
-/// <param name="tempType"></param>
-/// <param name="optionalPlaceholders"></param>
-/// <returns></returns>
-    public async Task<DataResult<int>> SendAsync(EnvelopeReceiverDto dto, EmailTemplateType tempType, Dictionary<string, object>? optionalPlaceholders = null)
-    {
-	var tempSerResult = await _tempService.ReadByNameAsync(tempType);
-	if (tempSerResult.IsFailed)
-		return tempSerResult.ToFail<int>().Notice(LogLevel.Error, DigitalData.Core.Abstraction.Application.DTO.Flag.DataIntegrityIssue, $"The email cannot send because '{tempType}' template cannot found.");
-	var temp = tempSerResult.Data;
 
-	var mail = new EmailOutCreateDto()
+		if (er?.Envelope is not null && er.Receiver is not null)
+		{
+			var erId = (er.Envelope.Uuid, er.Receiver.Signature).ToEnvelopeKey();
+			var sigHost = await _configService.ReadDefaultSignatureHost();
+			var linkToDoc = $"{sigHost}/EnvelopeKey/{erId}";
+			_placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
+			_placeholders["[LINK_TO_DOCUMENT_TEXT]"] = linkToDoc[..Math.Min(40, linkToDoc.Length)] + "..";
+		}
+
+		return _placeholders;
+	}
+
+    // TODO: merge the two CreatePlaceholders methods by using a common parameter object containing all the required information to create the place holders.
+    private async Task<Dictionary<string, string>> CreatePlaceholders(EnvelopeReceiverReadOnlyDto? readOnlyDto = null)
 	{
-		EmailAddress = dto.Receiver!.EmailAddress,
+		if (readOnlyDto?.Envelope is not null && readOnlyDto.Receiver is not null)
-		EmailSubj = temp.Subject,
+		{
-		EmailBody = temp.Body,
+			_placeholders["[NAME_RECEIVER]"] = await _envRcvService.ReadLastUsedReceiverNameByMailAsync(readOnlyDto.AddedWho).ThenAsync(res => res, (msg, ntc) => string.Empty) ?? string.Empty;
-		//email_type = envelope_status,
+			var erReadOnlyId = (readOnlyDto.Id).ToEnvelopeKey();
-		//message = envelope_message,
+			var sigHost = await _configService.ReadDefaultSignatureHost();
-		ReferenceId = dto.EnvelopeId,               //REFERENCE_ID = ENVELOPE_ID
+			var linkToDoc = $"{sigHost}/EnvelopeKey/{erReadOnlyId}";
-		ReferenceString = dto!.Envelope!.Uuid,		//REFERENCE_STRING = ENVELOPE_UUID
+			_placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
-		//receiver_name = receiver.name,
+			_placeholders["[LINK_TO_DOCUMENT_TEXT]"] = linkToDoc[..Math.Min(40, linkToDoc.Length)] + "..";
-		//receiver_access_code = receiver.access_code,
+		}
-		//sender_adress = envelope.user.email,
-		//sender_name = envelope.user.full_name,
-		//envelope_title = envelope.title,
-		ReminderTypeId = _dConfig.ReminderTypeId,
-		SendingProfile = _dConfig.SendingProfile,
-		EntityId = null,
-		WfId = (int) EnvelopeStatus.MessageAccessCodeSent,
-		WfReference = null,
-		AddedWho = _dConfig.AddedWho,
-		EmailAttmt1 = _dConfig.EmailAttmt1
-	};
 
-	//get acccess code
+		return _placeholders;
-	var acResult = await _envRcvService.ReadAccessCodeByIdAsync(envelopeId: dto.EnvelopeId, receiverId: dto.ReceiverId);
+	}
-	if (acResult.IsFailed)
-		return acResult.ToFail<int>().Notice(LogLevel.Error, "Therefore, access code cannot be sent");
-	var accessCode = acResult.Data;
-		
-	var placeholders = await CreatePlaceholders(accessCode: accessCode, envelopeReceiverDto: dto);
 
-	// Add optional place holders.
+	/// <summary>
-	if (optionalPlaceholders is not null)
+	/// 
-		foreach (var oph in optionalPlaceholders)
+	/// </summary>
-			placeholders[oph.Key] = oph.Value.ToString() ?? "NULL";
+	/// <param name="dto"></param>
+	/// <param name="tempType"></param>
+	/// <param name="optionalPlaceholders"></param>
+	/// <returns></returns>
+	public async Task<DataResult<int>> SendAsync(EnvelopeReceiverDto dto, EmailTemplateType tempType, Dictionary<string, object>? optionalPlaceholders = null)
+	{
+		var tempSerResult = await _tempService.ReadByNameAsync(tempType);
+		if (tempSerResult.IsFailed)
+			return tempSerResult.ToFail<int>().Notice(LogLevel.Error, Flag.DataIntegrityIssue, $"The email cannot send because '{tempType}' template cannot found.");
+		var temp = tempSerResult.Data;
 
-	//TODO: remove the requirement to add the models using reflections
+		var mail = new EmailOutCreateDto()
-	return await CreateWithTemplateAsync(createDto: mail,placeholders: placeholders,
+		{
-		dto, dto.Envelope.User!, dto.Envelope);
+			EmailAddress = dto.Receiver!.EmailAddress,
-}
+			EmailSubj = temp.Subject,
+			EmailBody = temp.Body,
+			//email_type = envelope_status,
+			//message = envelope_message,
+			ReferenceId = dto.EnvelopeId,               //REFERENCE_ID = ENVELOPE_ID
+			ReferenceString = dto!.Envelope!.Uuid,      //REFERENCE_STRING = ENVELOPE_UUID
+														//receiver_name = receiver.name,
+														//receiver_access_code = receiver.access_code,
+														//sender_adress = envelope.user.email,
+														//sender_name = envelope.user.full_name,
+														//envelope_title = envelope.title,
+			ReminderTypeId = _dConfig.ReminderTypeId,
+			SendingProfile = _dConfig.SendingProfile,
+			EntityId = null,
+			WfId = (int)EnvelopeStatus.MessageAccessCodeSent,
+			WfReference = null,
+			AddedWho = _dConfig.AddedWho,
+			EmailAttmt1 = _dConfig.EmailAttmt1
+		};
 
-/// <summary>
+		//get acccess code
-/// 
+		var acResult = await _envRcvService.ReadAccessCodeByIdAsync(envelopeId: dto.EnvelopeId, receiverId: dto.ReceiverId);
-/// </summary>
+		if (acResult.IsFailed)
-/// <param name="dto"></param>
+			return acResult.ToFail<int>().Notice(LogLevel.Error, "Therefore, access code cannot be sent");
-/// <param name="optionalPlaceholders"></param>
+		var accessCode = acResult.Data;
-/// <returns></returns>
-public async Task<DataResult<int>> SendAsync(EnvelopeReceiverReadOnlyDto dto, Dictionary<string, object>? optionalPlaceholders = null)
-{
-        var tempSerResult = await _tempService.ReadByNameAsync(EmailTemplateType.DocumentShared);
-        if (tempSerResult.IsFailed)
-            return tempSerResult.ToFail<int>().Notice(LogLevel.Error, Flag.DataIntegrityIssue, $"The email cannot send because '{EmailTemplateType.DocumentShared}' template cannot found.");
-        var temp = tempSerResult.Data;
 
-        var mail = new EmailOutCreateDto()
+		var placeholders = await CreatePlaceholders(accessCode: accessCode, er: dto);
-        {
-            EmailAddress = dto.ReceiverMail,
-            EmailSubj = temp.Subject,
-            EmailBody = temp.Body,
-		//TODO: remove int casting when all 
-            ReferenceId = (int) dto.EnvelopeId,			//REFERENCE_ID = ENVELOPE_ID
-            ReferenceString = dto.Envelope!.Uuid,		//REFERENCE_STRING = ENVELOPE_UUID
-                                                        //receiver_name = receiver.name,
-                                                        //receiver_access_code = receiver.access_code,
-                                                        //sender_adress = envelope.user.email,
-                                                        //sender_name = envelope.user.full_name,
-                                                        //envelope_title = envelope.title,
-            ReminderTypeId = _dConfig.ReminderTypeId,
-            SendingProfile = _dConfig.SendingProfile,
-            EntityId = null,
-            WfId = (int)EnvelopeStatus.EnvelopeShared,
-            WfReference = null,
-            AddedWho = _dConfig.AddedWho,
-            EmailAttmt1 = _dConfig.EmailAttmt1
-        };
 
-        var placeholders = await CreatePlaceholders(readOnlyDto: dto);
+		// Add optional place holders.
+		if (optionalPlaceholders is not null)
+			foreach (var oph in optionalPlaceholders)
+				placeholders[oph.Key] = oph.Value.ToString() ?? "NULL";
 
-        // Add optional place holders.
+		//TODO: remove the requirement to add the models using reflections
-        if (optionalPlaceholders is not null)
+		return await CreateWithTemplateAsync(createDto: mail, placeholders: placeholders,
-            foreach (var oph in optionalPlaceholders)
+			dto, dto.Envelope.User!, dto.Envelope);
-            placeholders[oph.Key] = oph.Value.ToString() ?? "NULL";
+	}
 
-        return await CreateWithTemplateAsync(createDto: mail, placeholders: placeholders, dto.Envelope);
+	/// <summary>
-    }
+	/// 
+	/// </summary>
+	/// <param name="dto"></param>
+	/// <param name="optionalPlaceholders"></param>
+	/// <returns></returns>
+	public async Task<DataResult<int>> SendAsync(EnvelopeReceiverReadOnlyDto dto, Dictionary<string, object>? optionalPlaceholders = null)
+	{
+		var tempSerResult = await _tempService.ReadByNameAsync(EmailTemplateType.DocumentShared);
+		if (tempSerResult.IsFailed)
+			return tempSerResult.ToFail<int>().Notice(LogLevel.Error, Flag.DataIntegrityIssue, $"The email cannot send because '{EmailTemplateType.DocumentShared}' template cannot found.");
+		var temp = tempSerResult.Data;
+
+		var mail = new EmailOutCreateDto()
+		{
+			EmailAddress = dto.ReceiverMail,
+			EmailSubj = temp.Subject,
+			EmailBody = temp.Body,
+			//TODO: remove int casting when all 
+			ReferenceId = (int)dto.EnvelopeId,          //REFERENCE_ID = ENVELOPE_ID
+			ReferenceString = dto.Envelope!.Uuid,       //REFERENCE_STRING = ENVELOPE_UUID
+														//receiver_name = receiver.name,
+														//receiver_access_code = receiver.access_code,
+														//sender_adress = envelope.user.email,
+														//sender_name = envelope.user.full_name,
+														//envelope_title = envelope.title,
+			ReminderTypeId = _dConfig.ReminderTypeId,
+			SendingProfile = _dConfig.SendingProfile,
+			EntityId = null,
+			WfId = (int)EnvelopeStatus.EnvelopeShared,
+			WfReference = null,
+			AddedWho = _dConfig.AddedWho,
+			EmailAttmt1 = _dConfig.EmailAttmt1
+		};
+
+		var placeholders = await CreatePlaceholders(readOnlyDto: dto);
+
+		// Add optional place holders.
+		if (optionalPlaceholders is not null)
+			foreach (var oph in optionalPlaceholders)
+				placeholders[oph.Key] = oph.Value.ToString() ?? "NULL";
+
+		return await CreateWithTemplateAsync(createDto: mail, placeholders: placeholders, dto.Envelope);
+	}
 
 	/// <summary>
 	/// 
 	/// </summary>
 	/// <param name="dto"></param>
 	/// <returns></returns>
-    public async Task<DataResult<int>> SendAccessCodeAsync(EnvelopeReceiverDto dto) => await SendAsync(dto: dto, tempType: EmailTemplateType.DocumentAccessCodeReceived);
+	public async Task<DataResult<int>> SendAccessCodeAsync(EnvelopeReceiverDto dto) => await SendAsync(dto: dto, tempType: EmailTemplateType.DocumentAccessCodeReceived);
 }

EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj

@@ -48,8 +48,14 @@
     <Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>
     </Reference>
+    <Reference Include="Azure.Core, Version=1.50.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Azure.Core.1.50.0\lib\net462\Azure.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Azure.Identity, Version=1.17.1.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Azure.Identity.1.17.1\lib\netstandard2.0\Azure.Identity.dll</HintPath>
+    </Reference>
     <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
-      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.6.2\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.BonusSkins.v21.2" />
     <Reference Include="DevExpress.Data.v21.2" />
@@ -185,8 +191,8 @@
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Data.SqlClient, Version=1.13.20136.2, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Data.SqlClient, Version=6.0.0.0, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Data.SqlClient.1.1.3\lib\net46\Microsoft.Data.SqlClient.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Data.SqlClient.6.1.4\lib\net462\Microsoft.Data.SqlClient.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.EntityFrameworkCore.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
@@ -200,11 +206,11 @@
     <Reference Include="Microsoft.EntityFrameworkCore.SqlServer, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.EntityFrameworkCore.SqlServer.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Caching.Memory.7.0.0\lib\net462\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.Caching.Memory.8.0.1\lib\net462\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Configuration.7.0.0\lib\net462\Microsoft.Extensions.Configuration.dll</HintPath>
@@ -218,8 +224,8 @@
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Localization.Abstractions, Version=7.0.16.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Localization.Abstractions.7.0.16\lib\net462\Microsoft.Extensions.Localization.Abstractions.dll</HintPath>
@@ -227,38 +233,41 @@
     <Reference Include="Microsoft.Extensions.Logging, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Logging.7.0.0\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.3, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.3\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Options, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.Options, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Options.7.0.0\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.Options.8.0.2\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.7.0.0\lib\net462\Microsoft.Extensions.Options.ConfigurationExtensions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Primitives.7.0.0\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.Primitives.8.0.0\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Identity.Client, Version=4.77.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Identity.Client, Version=4.82.1.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Identity.Client.4.77.0\lib\net462\Microsoft.Identity.Client.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Identity.Client.4.82.1\lib\net462\Microsoft.Identity.Client.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Identity.Client.Extensions.Msal, Version=4.78.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Identity.Client.Extensions.Msal.4.78.0\lib\netstandard2.0\Microsoft.Identity.Client.Extensions.Msal.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Abstractions, Version=8.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.8.14.0\lib\net462\Microsoft.IdentityModel.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=7.7.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.JsonWebTokens.7.5.1\lib\net462\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
+      <HintPath>..\packages\Microsoft.IdentityModel.JsonWebTokens.7.7.1\lib\net462\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Logging, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.IdentityModel.Logging, Version=7.7.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Logging.7.5.1\lib\net462\Microsoft.IdentityModel.Logging.dll</HintPath>
+      <HintPath>..\packages\Microsoft.IdentityModel.Logging.7.7.1\lib\net462\Microsoft.IdentityModel.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Protocols, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.IdentityModel.Protocols, Version=7.7.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Protocols.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.dll</HintPath>
+      <HintPath>..\packages\Microsoft.IdentityModel.Protocols.7.7.1\lib\net462\Microsoft.IdentityModel.Protocols.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect, Version=7.7.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
+      <HintPath>..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.7.7.1\lib\net462\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Tokens, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.IdentityModel.Tokens, Version=7.7.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Tokens.7.5.1\lib\net462\Microsoft.IdentityModel.Tokens.dll</HintPath>
+      <HintPath>..\packages\Microsoft.IdentityModel.Tokens.7.7.1\lib\net462\Microsoft.IdentityModel.Tokens.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -285,8 +294,11 @@
       <HintPath>..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+      <HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ClientModel, Version=1.8.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ClientModel.1.8.0\lib\netstandard2.0\System.ClientModel.dll</HintPath>
     </Reference>
     <Reference Include="System.CodeDom, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.CodeDom.9.0.0\lib\net462\System.CodeDom.dll</HintPath>
@@ -308,18 +320,21 @@
     <Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
     </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.7.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.DirectoryServices.AccountManagement" />
-    <Reference Include="System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Formats.Asn1, Version=10.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll</HintPath>
+      <HintPath>..\packages\System.Formats.Asn1.10.0.3\lib\net462\System.Formats.Asn1.dll</HintPath>
     </Reference>
     <Reference Include="System.IdentityModel" />
-    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=7.7.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.7.5.1\lib\net462\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+      <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.7.7.1\lib\net462\System.IdentityModel.Tokens.Jwt.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.FileSystem.AccessControl, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.AccessControl.5.0.0\lib\net461\System.IO.FileSystem.AccessControl.dll</HintPath>
+    </Reference>
     <Reference Include="System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
     </Reference>
@@ -327,21 +342,27 @@
       <HintPath>..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
-    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
+      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Memory.Data, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.Data.8.0.1\lib\net462\System.Memory.Data.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Security" />
+    <Reference Include="System.Security.AccessControl, Version=6.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll</HintPath>
+    </Reference>
     <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
       <Private>True</Private>
@@ -358,6 +379,9 @@
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Security.Cryptography.ProtectedData, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.ProtectedData.4.5.0\lib\net461\System.Security.Cryptography.ProtectedData.dll</HintPath>
+    </Reference>
     <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
     </Reference>
@@ -367,12 +391,12 @@
     <Reference Include="System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Json.9.0.0\lib\net462\System.Text.Json.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.ValueTuple, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+      <HintPath>..\packages\System.ValueTuple.4.6.1\lib\net462\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -463,10 +487,6 @@
       <Project>{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}</Project>
       <Name>EnvelopeGenerator.CommonServices</Name>
     </ProjectReference>
-    <ProjectReference Include="..\EnvelopeGenerator.CommonServices\EnvelopeGenerator.CommonServices.vbproj">
-      <Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
-      <Name>EnvelopeGenerator.CommonServices</Name>
-    </ProjectReference>
     <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj">
       <Project>{4f32a98d-e6f0-4a09-bd97-1cf26107e837}</Project>
       <Name>EnvelopeGenerator.Domain</Name>
@@ -508,10 +528,10 @@
     <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.props'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets'))" />
   </Target>
   <Import Project="..\packages\EntityFramework.6.5.1\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.targets')" />
-  <Import Project="..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets')" />
+  <Import Project="..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

EnvelopeGenerator.BBTests/app.config

@@ -65,15 +65,15 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -81,7 +81,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -109,11 +109,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Identity.Client" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.77.0.0" newVersion="4.77.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.82.1.0" newVersion="4.82.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.IdentityModel.Abstractions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -129,15 +129,15 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.3" newVersion="8.0.0.3" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -153,11 +153,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -179,6 +179,30 @@
         <assemblyIdentity name="Microsoft.IdentityModel.JsonWebTokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Formats.Asn1" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.3" newVersion="10.0.0.3" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.SqlClient" publicKeyToken="23ec7fc2d6eaa4a5" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.AccessControl" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <entityFramework>

EnvelopeGenerator.BBTests/frmFinalizePDF.Designer.vb

@@ -27,6 +27,7 @@ Partial Class frmFinalizePDF
         Me.Label2 = New System.Windows.Forms.Label()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.Button2 = New System.Windows.Forms.Button()
+        Me.Button3 = New System.Windows.Forms.Button()
         Me.txtResult = New System.Windows.Forms.TextBox()
         Me.txtEnvelope = New System.Windows.Forms.TextBox()
         Me.SuspendLayout()
@@ -75,6 +76,15 @@ Partial Class frmFinalizePDF
         Me.Button2.Text = "Merge Json"
         Me.Button2.UseVisualStyleBackColor = True
         '
+        'Button3
+        '
+        Me.Button3.Location = New System.Drawing.Point(15, 160)
+        Me.Button3.Name = "Button3"
+        Me.Button3.Size = New System.Drawing.Size(166, 23)
+        Me.Button3.TabIndex = 5
+        Me.Button3.Text = "Full Finalize Test"
+        Me.Button3.UseVisualStyleBackColor = True
+        '
         'txtResult
         '
         Me.txtResult.Location = New System.Drawing.Point(333, 12)
@@ -97,6 +107,7 @@ Partial Class frmFinalizePDF
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(800, 450)
         Me.Controls.Add(Me.txtResult)
+        Me.Controls.Add(Me.Button3)
         Me.Controls.Add(Me.Button2)
         Me.Controls.Add(Me.Button1)
         Me.Controls.Add(Me.Label2)
@@ -116,5 +127,6 @@ Partial Class frmFinalizePDF
     Friend WithEvents Label2 As Label
     Friend WithEvents Button1 As Button
     Friend WithEvents Button2 As Button
+    Friend WithEvents Button3 As Button
     Friend WithEvents txtResult As TextBox
 End Class

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -7,11 +7,12 @@ Imports GdPicture14
 Imports Newtonsoft.Json.Linq
 Imports EnvelopeGenerator.Infrastructure
 Imports Microsoft.EntityFrameworkCore
-Imports System.Text
 Imports DigitalData.Core.Abstractions
+Imports DigitalData.Core.Abstraction.Application.Repository
+Imports EnvelopeGenerator.Domain.Entities
 
 Public Class frmFinalizePDF
-    Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;"
+    Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;" + "Encrypt=True;TrustServerCertificate=True;"
 
     Private Database As MSSQLServer
     Private LogConfig As LogConfig
@@ -93,56 +94,118 @@ Public Class frmFinalizePDF
     End Function
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        Try
+        Dim oTable = LoadAnnotationDataForEnvelope()
+        Dim oJsonList = oTable.Rows.
+            Cast(Of DataRow).
+            Select(Function(r As DataRow) r.Item("VALUE").ToString()).
+            ToList()
 
-            Dim oTable = LoadAnnotationDataForEnvelope()
+        Dim envelopeId As Integer = CInt(txtEnvelope.Text)
-            Dim oJsonList = oTable.Rows.
+        Dim oBuffer As Byte() = ReadEnvelope(envelopeId)
-                Cast(Of DataRow).
+        Dim oNewBuffer = PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, envelopeId)
-                Select(Function(r As DataRow) r.Item("VALUE").ToString()).
+        Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
-                ToList()
+        Dim oNewPath = Path.Combine(desktopPath, $"E{txtEnvelope.Text}R{txtReceiver.Text}.burned.pdf")
 
-            Dim envelopeId As Integer = CInt(txtEnvelope.Text)
+        File.WriteAllBytes(oNewPath, oNewBuffer)
-            Dim oBuffer As Byte() = ReadEnvelope(envelopeId)
-            Dim oNewBuffer = PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, envelopeId)
-            Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
-            Dim oNewPath = Path.Combine(desktopPath, $"E{txtEnvelope.Text}R{txtReceiver.Text}.burned.pdf")
-
-            File.WriteAllBytes(oNewPath, oNewBuffer)
-
-            Process.Start(oNewPath)
-        Catch ex As Exception
-            Dim exMsg As StringBuilder = New StringBuilder(ex.Message).AppendLine()
-
-            Dim innerEx = ex.InnerException
-            While (innerEx IsNot Nothing)
-                exMsg.AppendLine(innerEx.Message)
-                innerEx = innerEx.InnerException
-            End While
-
-            MsgBox(exMsg.ToString(), MsgBoxStyle.Critical)
-        End Try
 
+        Process.Start(oNewPath)
     End Sub
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        Dim oTable = LoadAnnotationDataForEnvelope()
+        Dim oJsonList = oTable.Rows.
+            Cast(Of DataRow).
+            Select(Function(r As DataRow) r.Item("VALUE").ToString()).
+            Select(Function(s As String) JObject.Parse(s)).
+            ToList()
+
+        Dim oJObject1 = oJsonList.First()
+        Dim oJObject2 = oJsonList.ElementAt(1)
+
+        oJObject1.Merge(oJObject2)
+
+        txtResult.Text = oJObject1.ToString()
+    End Sub
+
+    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
         Try
+            Dim envelopeId As Integer = CInt(txtEnvelope.Text)
+            Dim log As New System.Text.StringBuilder()
+
+            ' 1. Load annotation JSON data (same as Service)
             Dim oTable = LoadAnnotationDataForEnvelope()
             Dim oJsonList = oTable.Rows.
                 Cast(Of DataRow).
                 Select(Function(r As DataRow) r.Item("VALUE").ToString()).
-                Select(Function(s As String) JObject.Parse(s)).
                 ToList()
+            log.AppendLine($"Annotation JSON count: {oJsonList.Count}")
 
-            Dim oJObject1 = oJsonList.First()
+            ' 2. Load document bytes (same as Service)
-            Dim oJObject2 = oJsonList.ElementAt(1)
+            Dim oBuffer As Byte() = ReadEnvelope(envelopeId)
+            log.AppendLine($"Document bytes: {oBuffer.Length}")
 
-            oJObject1.Merge(oJObject2)
+            ' 3. Check what BurnAnnotsToPDF will do internally
+            Using scope = Factory.Shared.ScopeFactory.CreateScope()
+                Dim envRepo = scope.ServiceProvider.Repository(Of Envelope)()
+                Dim envelope = envRepo.Where(Function(env) env.Id = envelopeId).FirstOrDefault()
 
-            txtResult.Text = oJObject1.ToString()
+                If envelope Is Nothing Then
+                    log.AppendLine("ERROR: Envelope not found in EF Core!")
+                    txtResult.Text = log.ToString()
+                    Return
+                End If
 
+                log.AppendLine($"Envelope found: Id={envelope.Id}, EnvelopeTypeId={envelope.EnvelopeTypeId}")
+                log.AppendLine($"ReadOnly (IsReadAndConfirm): {envelope.ReadOnly}")
+
+                If envelope.ReadOnly Then
+                    log.AppendLine(">>> EARLY RETURN: ReadOnly=True, original PDF returned without burning")
+                    txtResult.Text = log.ToString()
+                    Return
+                End If
+
+                Dim sigRepo = scope.ServiceProvider.Repository(Of DocReceiverElement)()
+                Dim elements = sigRepo _
+                    .Where(Function(sig) sig.Document.EnvelopeId = envelopeId) _
+                    .Include(Function(sig) sig.Annotations) _
+                    .ToList()
+
+                log.AppendLine($"Elements (Signature) count: {elements.Count}")
+
+                If elements.Any() Then
+                    log.AppendLine(">>> PATH: BurnElementAnnotsToPDF (new element-based path)")
+                    For Each elem In elements
+                        Dim annotCount = If(elem.Annotations IsNot Nothing, elem.Annotations.Count(), 0)
+                        log.AppendLine($"  Element Id={elem.Id}, Page={elem.Page}, X={elem.X}, Y={elem.Y}, W={elem.Width}, H={elem.Height}, Annotations={annotCount}")
+                        If elem.Annotations IsNot Nothing Then
+                            For Each annot In elem.Annotations
+                                log.AppendLine($"    Annot: Name={annot.Name}, Type={annot.Type}, X={annot.X}, Y={annot.Y}, W={annot.Width}, H={annot.Height}")
+                            Next
+                        End If
+                    Next
+                Else
+                    log.AppendLine(">>> PATH: BurnInstantJSONAnnotsToPDF (old JSON-based path)")
+                End If
+            End Using
+
+            ' 4. Actually call BurnAnnotsToPDF (same as Service)
+            log.AppendLine("")
+            log.AppendLine("Calling BurnAnnotsToPDF...")
+            Dim oNewBuffer = PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, envelopeId)
+            log.AppendLine($"Result bytes: {oNewBuffer.Length}")
+            log.AppendLine($"Same as input: {oBuffer.Length = oNewBuffer.Length AndAlso oBuffer.SequenceEqual(oNewBuffer)}")
+
+            ' 5. Write output
+            Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
+            Dim oNewPath = Path.Combine(desktopPath, $"E{txtEnvelope.Text}_FullTest.burned.pdf")
+            File.WriteAllBytes(oNewPath, oNewBuffer)
+            log.AppendLine($"Output: {oNewPath}")
+
+            txtResult.Text = log.ToString()
+            Process.Start(oNewPath)
 
         Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Critical)
+            txtResult.Text = $"ERROR: {ex.Message}{vbCrLf}{vbCrLf}{ex.ToString()}"
         End Try
     End Sub
 End Class

EnvelopeGenerator.BBTests/packages.config

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="10.1.1" targetFramework="net462" />
-  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
+  <package id="Azure.Core" version="1.50.0" targetFramework="net462" />
+  <package id="Azure.Identity" version="1.17.1" targetFramework="net462" />
+  <package id="BouncyCastle.Cryptography" version="2.6.2" targetFramework="net462" />
   <package id="DigitalData.Controls.DocumentViewer" version="1.9.8" targetFramework="net462" />
   <package id="DigitalData.Core.Abstraction.Application" version="1.6.0" targetFramework="net462" />
   <package id="DigitalData.Core.Abstractions" version="4.3.0" targetFramework="net462" />
@@ -13,43 +15,44 @@
   <package id="DigitalData.Modules.Messaging" version="1.9.8" targetFramework="net462" />
   <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
   <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
-  <package id="EntityFramework" version="6.5.1" targetFramework="net462" />
+  <package id="EntityFramework" version="6.4.4" targetFramework="net462" />
   <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" />
   <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net462" />
   <package id="GdPicture" version="14.3.3" targetFramework="net462" />
   <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
   <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
   <package id="Microsoft.Bcl.Cryptography" version="9.0.0" targetFramework="net462" />
   <package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net462" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
-  <package id="Microsoft.Data.SqlClient" version="1.1.3" targetFramework="net462" />
+  <package id="Microsoft.Data.SqlClient" version="6.1.4" targetFramework="net462" />
-  <package id="Microsoft.Data.SqlClient.SNI" version="1.1.0" targetFramework="net462" />
+  <package id="Microsoft.Data.SqlClient.SNI" version="6.0.2" targetFramework="net462" />
   <package id="Microsoft.EntityFrameworkCore" version="3.1.32" targetFramework="net462" />
   <package id="Microsoft.EntityFrameworkCore.Abstractions" version="3.1.32" targetFramework="net462" />
   <package id="Microsoft.EntityFrameworkCore.Analyzers" version="3.1.32" targetFramework="net462" />
   <package id="Microsoft.EntityFrameworkCore.Relational" version="3.1.32" targetFramework="net462" />
   <package id="Microsoft.EntityFrameworkCore.SqlServer" version="3.1.32" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Caching.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Caching.Abstractions" version="8.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="8.0.1" targetFramework="net462" />
   <package id="Microsoft.Extensions.Configuration" version="7.0.0" targetFramework="net462" />
   <package id="Microsoft.Extensions.Configuration.Abstractions" version="7.0.0" targetFramework="net462" />
   <package id="Microsoft.Extensions.Configuration.Binder" version="7.0.0" targetFramework="net462" />
   <package id="Microsoft.Extensions.DependencyInjection" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.2" targetFramework="net462" />
   <package id="Microsoft.Extensions.Localization.Abstractions" version="7.0.16" targetFramework="net462" />
   <package id="Microsoft.Extensions.Logging" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.3" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Options" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Options" version="8.0.2" targetFramework="net462" />
   <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Primitives" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Primitives" version="8.0.0" targetFramework="net462" />
-  <package id="Microsoft.Identity.Client" version="4.77.0" targetFramework="net462" />
+  <package id="Microsoft.Identity.Client" version="4.82.1" targetFramework="net462" />
+  <package id="Microsoft.Identity.Client.Extensions.Msal" version="4.78.0" targetFramework="net462" />
   <package id="Microsoft.IdentityModel.Abstractions" version="8.14.0" targetFramework="net462" />
-  <package id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.JsonWebTokens" version="7.7.1" targetFramework="net462" />
-  <package id="Microsoft.IdentityModel.Logging" version="7.5.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Logging" version="7.7.1" targetFramework="net462" />
-  <package id="Microsoft.IdentityModel.Protocols" version="5.5.0" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Protocols" version="7.7.1" targetFramework="net462" />
-  <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.5.0" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" targetFramework="net462" />
-  <package id="Microsoft.IdentityModel.Tokens" version="7.5.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Tokens" version="7.7.1" targetFramework="net462" />
   <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
   <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
@@ -60,28 +63,34 @@
   <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
   <package id="S22.Imap" version="3.6.0.0" targetFramework="net462" />
   <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
-  <package id="System.CodeDom" version="9.0.0" targetFramework="net462" />
+  <package id="System.ClientModel" version="1.8.0" targetFramework="net462" />
-  <package id="System.Collections.Immutable" version="9.0.0" targetFramework="net462" />
+  <package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
+  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
   <package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net462" />
   <package id="System.Data.Common" version="4.3.0" targetFramework="net462" />
   <package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
-  <package id="System.Diagnostics.DiagnosticSource" version="7.0.0" targetFramework="net462" />
+  <package id="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net462" />
   <package id="System.DirectoryServices.AccountManagement" version="7.0.1" targetFramework="net462" />
-  <package id="System.Formats.Asn1" version="9.0.0" targetFramework="net462" />
+  <package id="System.Formats.Asn1" version="10.0.3" targetFramework="net462" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="7.5.1" targetFramework="net462" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="7.7.1" targetFramework="net462" />
-  <package id="System.IO.Packaging" version="9.0.0" targetFramework="net462" />
+  <package id="System.IO.FileSystem.AccessControl" version="5.0.0" targetFramework="net462" />
+  <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
   <package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" />
-  <package id="System.Management" version="9.0.0" targetFramework="net462" />
+  <package id="System.Management" version="8.0.0" targetFramework="net462" />
   <package id="System.Memory" version="4.6.0" targetFramework="net462" />
+  <package id="System.Memory.Data" version="8.0.1" targetFramework="net462" />
   <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
+  <package id="System.Security.AccessControl" version="6.0.1" targetFramework="net462" />
   <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
   <package id="System.Security.Cryptography.Cng" version="5.0.0" targetFramework="net462" />
-  <package id="System.Security.Cryptography.Pkcs" version="9.0.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.ProtectedData" version="4.5.0" targetFramework="net462" />
   <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net462" />
-  <package id="System.Text.Encodings.Web" version="9.0.0" targetFramework="net462" />
+  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
-  <package id="System.Text.Json" version="9.0.0" targetFramework="net462" />
+  <package id="System.Text.Json" version="8.0.6" targetFramework="net462" />
+  <package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
 </packages>

EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj

@@ -51,8 +51,14 @@
     <Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>
     </Reference>
+    <Reference Include="Azure.Core, Version=1.50.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Azure.Core.1.50.0\lib\net462\Azure.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Azure.Identity, Version=1.17.1.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Azure.Identity.1.17.1\lib\netstandard2.0\Azure.Identity.dll</HintPath>
+    </Reference>
     <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
-      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.6.2\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -186,8 +192,8 @@
       <HintPath>..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Data.SqlClient, Version=1.13.20136.2, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Data.SqlClient, Version=6.0.0.0, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Data.SqlClient.1.1.3\lib\net46\Microsoft.Data.SqlClient.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Data.SqlClient.6.1.4\lib\net462\Microsoft.Data.SqlClient.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.EntityFrameworkCore.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
@@ -201,11 +207,11 @@
     <Reference Include="Microsoft.EntityFrameworkCore.SqlServer, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.EntityFrameworkCore.SqlServer.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Caching.Memory.7.0.0\lib\net462\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.Caching.Memory.8.0.1\lib\net462\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Configuration.7.0.0\lib\net462\Microsoft.Extensions.Configuration.dll</HintPath>
@@ -219,8 +225,8 @@
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Localization.Abstractions, Version=7.0.16.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Localization.Abstractions.7.0.16\lib\net462\Microsoft.Extensions.Localization.Abstractions.dll</HintPath>
@@ -228,38 +234,41 @@
     <Reference Include="Microsoft.Extensions.Logging, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Logging.7.0.0\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.3, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.3\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Options, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.Options, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Options.7.0.0\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.Options.8.0.2\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.7.0.0\lib\net462\Microsoft.Extensions.Options.ConfigurationExtensions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Primitives.7.0.0\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.Primitives.8.0.0\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Identity.Client, Version=3.0.8.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Identity.Client, Version=4.82.1.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Identity.Client.3.0.8\lib\net45\Microsoft.Identity.Client.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Identity.Client.4.82.1\lib\net462\Microsoft.Identity.Client.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Identity.Client.Extensions.Msal, Version=4.78.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.7.5.1\lib\net462\Microsoft.IdentityModel.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Identity.Client.Extensions.Msal.4.78.0\lib\netstandard2.0\Microsoft.Identity.Client.Extensions.Msal.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=8.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.JsonWebTokens.7.5.1\lib\net462\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
+      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.8.14.0\lib\net462\Microsoft.IdentityModel.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Logging, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=7.7.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Logging.7.5.1\lib\net462\Microsoft.IdentityModel.Logging.dll</HintPath>
+      <HintPath>..\packages\Microsoft.IdentityModel.JsonWebTokens.7.7.1\lib\net462\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Protocols, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.IdentityModel.Logging, Version=7.7.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Protocols.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.dll</HintPath>
+      <HintPath>..\packages\Microsoft.IdentityModel.Logging.7.7.1\lib\net462\Microsoft.IdentityModel.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.IdentityModel.Protocols, Version=7.7.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
+      <HintPath>..\packages\Microsoft.IdentityModel.Protocols.7.7.1\lib\net462\Microsoft.IdentityModel.Protocols.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Tokens, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect, Version=7.7.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Tokens.7.5.1\lib\net462\Microsoft.IdentityModel.Tokens.dll</HintPath>
+      <HintPath>..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.7.7.1\lib\net462\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Tokens, Version=7.7.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Tokens.7.7.1\lib\net462\Microsoft.IdentityModel.Tokens.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -286,8 +295,11 @@
       <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+      <HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ClientModel, Version=1.8.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ClientModel.1.8.0\lib\netstandard2.0\System.ClientModel.dll</HintPath>
     </Reference>
     <Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
@@ -309,39 +321,51 @@
     <Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
     </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.7.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.DirectoryServices.AccountManagement" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing.Common, Version=4.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Drawing.Common.4.7.3\lib\net461\System.Drawing.Common.dll</HintPath>
     </Reference>
+    <Reference Include="System.Formats.Asn1, Version=10.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Formats.Asn1.10.0.3\lib\net462\System.Formats.Asn1.dll</HintPath>
+    </Reference>
     <Reference Include="System.IdentityModel" />
-    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=7.7.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.7.5.1\lib\net462\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+      <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.7.7.1\lib\net462\System.IdentityModel.Tokens.Jwt.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.FileSystem.AccessControl, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.AccessControl.5.0.0\lib\net461\System.IO.FileSystem.AccessControl.dll</HintPath>
+    </Reference>
     <Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
-    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
+      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Memory.Data, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.Data.8.0.1\lib\net462\System.Memory.Data.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
+    <Reference Include="System.Security.AccessControl, Version=6.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll</HintPath>
+    </Reference>
     <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
       <Private>True</Private>
@@ -358,6 +382,9 @@
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Security.Cryptography.ProtectedData, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.ProtectedData.4.5.0\lib\net461\System.Security.Cryptography.ProtectedData.dll</HintPath>
+    </Reference>
     <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
     </Reference>
@@ -365,15 +392,15 @@
     <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
     </Reference>
-    <Reference Include="System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Text.Json, Version=8.0.0.6, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
+      <HintPath>..\packages\System.Text.Json.8.0.6\lib\net462\System.Text.Json.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.ValueTuple, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+      <HintPath>..\packages\System.ValueTuple.4.6.1\lib\net462\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
@@ -577,9 +604,9 @@
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
     <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets'))" />
   </Target>
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
   <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
-  <Import Project="..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets')" />
+  <Import Project="..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets')" />
 </Project>

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -15,6 +15,7 @@ Imports DigitalData.Core.Abstraction.Application
 Imports EnvelopeGenerator.Infrastructure
 Imports Microsoft.EntityFrameworkCore
 Imports DigitalData.Core.Abstractions
+Imports EnvelopeGenerator.Domain.Interfaces
 
 Namespace Jobs
     Public Class FinalizeDocumentJob
@@ -230,6 +231,29 @@ Namespace Jobs
 
             Return Task.FromResult(True)
         End Function
+
+#Region "From BBTests"
+        Private Function ReadEnvelope(pEnvID As Integer) As Byte()
+            Dim strSql As String = "Select [BYTE_DATA] from [TBSIG_ENVELOPE_DOCUMENT] WHERE ENVELOPE_ID = " & pEnvID
+            Dim obyteDB = Database.GetScalarValue(strSql)
+            If Not IsDBNull(obyteDB) Then
+                Dim fileData As Byte() = DirectCast(Database.GetScalarValue(strSql), Byte())
+                If fileData IsNot Nothing Then
+                    Return fileData
+                End If
+            End If
+
+            Throw New InvalidOperationException($"Byte data is null. Envelope ID: {pEnvID}")
+
+        End Function
+
+        Private Function LoadAnnotationDataForEnvelope(pEnvID As Integer) As DataTable
+            Dim oSql = $"SELECT VALUE FROM [TBSIG_DOCUMENT_STATUS] WHERE ENVELOPE_ID = {pEnvID}"
+            Return Database.GetDatatable(oSql)
+
+        End Function
+#End Region
+
         Private Sub Update_File_DB(pFilePath As String, pEnvelopeID As Long)
             Dim SqlCom As SqlCommand
             Dim imageData As Byte()
@@ -327,7 +351,7 @@ Namespace Jobs
                 Logger.Warn($"No SendFinalEmailToCreator - oMailToCreator [{oMailToCreator}] <> [{FinalEmailType.No}] ")
             End If
 
-            If oMailToReceivers <> FinalEmailType.No Then
+            If oMailToReceivers <> FinalEmailType.No And pEnvelope.IsReadAndSign() Then
                 Logger.Debug("Sending emails to receivers..")
                 SendFinalEmailToReceivers(pEnvelope) ', pAttachment
             Else
@@ -418,7 +442,18 @@ Namespace Jobs
                 End Try
             End If
 
-            Return PDFBurner.BurnAnnotsToPDF(oInputDocumentBuffer, oAnnotations, pEnvelopeData.EnvelopeId)
+#Region "From BBTests"
+            Dim oTable = LoadAnnotationDataForEnvelope(pEnvelopeId)
+            Dim oJsonList = oTable.Rows.
+            Cast(Of DataRow).
+            Select(Function(r As DataRow) r.Item("VALUE").ToString()).
+            ToList()
+
+            Dim oBuffer As Byte() = ReadEnvelope(pEnvelopeId)
+
+#End Region
+
+            Return PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, pEnvelopeId)
         End Function
 
         Private Function GetEnvelopeData(pEnvelopeId As Integer) As EnvelopeData