Remove BaseModel and BaseService from Jobs namespace

Deleted BaseModel and BaseService classes, along with their
associated using statements and members. This removes the
abstraction layers for database, logging, and state management
from EnvelopeGenerator.ServiceHost.Jobs.

EnvelopeGenerator.API/Controllers/AnnotationController.cs

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

EnvelopeGenerator.API/Controllers/ReceiverAuthController.cs

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

EnvelopeGenerator.API/Models/BlazorSignaturePayload.cs

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

EnvelopeGenerator.API/Models/ReceiverAuthResponse.cs

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

EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs

@@ -2,7 +2,6 @@
 using DigitalData.UserManager.Application.DTOs.User;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Domain.Interfaces;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.Common.Dto;
@@ -11,7 +10,7 @@ namespace EnvelopeGenerator.Application.Common.Dto;
 /// 
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public record EnvelopeDto : IEnvelope
+public record EnvelopeDto
 {
 	/// <summary>
 	/// 
@@ -75,12 +74,10 @@ public record EnvelopeDto : IEnvelope
     /// </summary>
     public int? EnvelopeTypeId { get; set; }
 
-    // TODO: use ReadAndConfirm property name
     /// <summary>
     /// 
     /// </summary>
-    [Obsolete("Use EnvelopeExtensions.IsReadAndConfirm extension metot instead.")]
-    public bool ReadOnly => this.IsReadAndConfirm();
+    public bool ReadOnly => EnvelopeTypeId == 2;
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Common/Extensions/AutoMapperAuditingExtensions.cs

@@ -13,12 +13,12 @@ public static class AutoMapperAuditingExtensions
     /// </summary>
     public static IMappingExpression<TSource, TDestination> MapAddedWhen<TSource, TDestination>(this IMappingExpression<TSource, TDestination> expression)
         where TDestination : IHasAddedWhen
-        => expression.ForMember(dest => dest.AddedWhen, opt => opt.MapFrom(_ => DateTime.Now));
+        => expression.ForMember(dest => dest.AddedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));
 
     /// <summary>
     /// Maps <see cref="IHasChangedWhen.ChangedWhen"/> to the current UTC time.
     /// </summary>
     public static IMappingExpression<TSource, TDestination> MapChangedWhen<TSource, TDestination>(this IMappingExpression<TSource, TDestination> expression)
         where TDestination : IHasChangedWhen
-        => expression.ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(_ => DateTime.Now));
+        => expression.ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));
 }

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

@@ -29,12 +29,15 @@ public class DocStatusHandler : INotificationHandler<DocSignedNotification>
     /// <param name="notification"></param>
     /// <param name="cancel"></param>
     /// <returns></returns>
-    public Task Handle(DocSignedNotification notification, CancellationToken cancel) => _sender.Send(new CreateDocStatusCommand()
+    public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
     {
-        EnvelopeId = notification.EnvelopeId,
-        ReceiverId = notification.ReceiverId,
-        Value = notification.PsPdfKitAnnotation is PsPdfKitAnnotation annot
-                    ? JsonSerializer.Serialize(annot.Instant, Format.Json.ForAnnotations)
+        await _sender.Send(new SaveDocStatusCommand()
+        {
+            Envelope = new() { Id = notification.EnvelopeId },
+            Receiver = new() { Id = notification.ReceiverId},
+            Value = notification.PsPdfKitAnnotation is PsPdfKitAnnotation annot 
+                    ? JsonSerializer.Serialize(annot.Instant, Format.Json.ForAnnotations) 
                     : BlankAnnotationJson
-    }, cancel);
+        }, cancel);
+    }
 }

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

@@ -3,7 +3,6 @@ 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;
 
@@ -46,25 +45,6 @@ public class SendSignedMailHandler : SendMailHandler<DocSignedNotification>
             { "[DOCUMENT_TITLE]", notification.Envelope?.Title ?? string.Empty },
         };
 
-        if (notification.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.Now,
+            AddedWhen = DateTime.UtcNow,
             AddedWho = DispatcherParams.AddedWho,
             SendingProfile = DispatcherParams.SendingProfile,
             ReminderTypeId = DispatcherParams.ReminderTypeId,

EnvelopeGenerator.Application/DocStatus/Commands/CreateDocStatusCommand.cs

@@ -8,22 +8,12 @@ namespace EnvelopeGenerator.Application.DocStatus.Commands;
 /// <summary>
 /// 
 /// </summary>
-public record CreateDocStatusCommand : IRequest<DocumentStatus>
+public record CreateDocStatusCommand : ModifyDocStatusCommandBase, IRequest<DocumentStatus>
 {
     /// <summary>
-    /// 
+    /// Gets timestamp when this record was added. Returns the StatusChangedWhen value.
     /// </summary>
-    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; }
+    public DateTime AddedWhen => StatusChangedWhen;
 }
 
 /// <summary>

EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs

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

@@ -0,0 +1,77 @@
+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,41 +1,14 @@
-using EnvelopeGenerator.Application.Common.Commands;
-using EnvelopeGenerator.Domain.Entities;
-using System.Linq.Expressions;
+using EnvelopeGenerator.Domain;
 
 namespace EnvelopeGenerator.Application.DocStatus.Commands;
 
 /// <summary>
 /// 
 /// </summary>
-/// <param name="Value"></param>
-public record DocStatusUpdateDto(string? Value);
-
-/// <summary>
-/// 
-/// </summary>
-public record UpdateDocStatusCommand : UpdateCommand<DocStatusUpdateDto, DocumentStatus>
+public record UpdateDocStatusCommand : ModifyDocStatusCommandBase
 {
     /// <summary>
-    /// 
+    /// Gets timestamp when this record was added. Returns the StatusChangedWhen value.
     /// </summary>
-    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;
-    }
+    public DateTime? ChangedWhen => StatusChangedWhen;
 }

EnvelopeGenerator.Application/DocStatus/MappingProfile.cs

@@ -18,16 +18,11 @@ public class MappingProfile : Profile
         CreateMap<CreateDocStatusCommand, DocumentStatus>()
         .ForMember(dest => dest.Envelope, 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.StatusChangedWhen, opt => opt.MapFrom(src => DateTime.Now))
         .MapChangedWhen();
     }
 }

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -37,7 +37,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
@@ -80,7 +80,7 @@
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
 	  <PackageReference Include="AutoMapper" Version="13.0.1" />
-	  <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
 	  <PackageReference Include="CommandDotNet">
 		<Version>7.0.5</Version>
 	  </PackageReference>
@@ -88,6 +88,7 @@
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 	  <PackageReference Include="AutoMapper" Version="14.0.0" />
+	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
 	  <PackageReference Include="CommandDotNet">
 	    <Version>8.1.1</Version>
 	  </PackageReference>
@@ -95,6 +96,7 @@
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
 	  <PackageReference Include="AutoMapper" Version="14.0.0" />
+	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
 	  <PackageReference Include="CommandDotNet">
 	    <Version>8.1.1</Version>
 	  </PackageReference>

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverLightQuery.cs

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

EnvelopeGenerator.Application/Histories/MappingProfile.cs

@@ -1,5 +1,4 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Domain.Entities;
 
@@ -18,7 +17,6 @@ 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())
-            .MapAddedWhen();
+            .ForMember(dest => dest.Receiver, opt => opt.Ignore());
     }
 }

EnvelopeGenerator.Application/Resources/Resource.cs

@@ -190,13 +190,6 @@ 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>
@@ -211,13 +204,6 @@ 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>
@@ -253,13 +239,6 @@ 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>
@@ -288,13 +267,6 @@ 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>
@@ -323,13 +295,6 @@ 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>

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

@@ -250,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>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>
+    <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>
   </data>
   <data name="RejectionReasonQ" xml:space="preserve">
     <value>Bitte geben Sie einen Grund an:</value>
@@ -447,34 +447,4 @@
   <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>
 </root>

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

@@ -447,34 +447,4 @@
   <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>
 </root>

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

@@ -447,34 +447,4 @@
   <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>
 </root>

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -12,7 +12,6 @@ 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;
 
@@ -50,33 +49,14 @@ public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
 		_sender = sender;
     }
 
-	private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? er = null)
+	private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? envelopeReceiverDto = null)
 	{
-		if (er!.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";
-        }
-
 		if (accessCode is not null)
 			_placeholders["[DOCUMENT_ACCESS_CODE]"] = accessCode;
 
-		if (er?.Envelope is not null && er.Receiver is not null)
+		if (envelopeReceiverDto?.Envelope is not null && envelopeReceiverDto.Receiver is not null)
 		{
-			var erId = (er.Envelope.Uuid, er.Receiver.Signature).ToEnvelopeKey();
+			var erId = (envelopeReceiverDto.Envelope.Uuid, envelopeReceiverDto.Receiver.Signature).ToEnvelopeKey();
 			var sigHost = await _configService.ReadDefaultSignatureHost();
 			var linkToDoc = $"{sigHost}/EnvelopeKey/{erId}";
 			_placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
@@ -86,8 +66,7 @@ public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
 		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)
+	private async Task<Dictionary<string, string>> CreatePlaceholders(EnvelopeReceiverReadOnlyDto? readOnlyDto = null)
 	{
 		if (readOnlyDto?.Envelope is not null && readOnlyDto.Receiver is not null)
 		{
@@ -145,7 +124,7 @@ public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
 			return acResult.ToFail<int>().Notice(LogLevel.Error, "Therefore, access code cannot be sent");
 		var accessCode = acResult.Data;
 
-		var placeholders = await CreatePlaceholders(accessCode: accessCode, er: dto);
+		var placeholders = await CreatePlaceholders(accessCode: accessCode, envelopeReceiverDto: dto);
 
 		// Add optional place holders.
 		if (optionalPlaceholders is not null)

EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj

@@ -487,6 +487,10 @@
       <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>

EnvelopeGenerator.BBTests/frmFinalizePDF.Designer.vb

@@ -27,7 +27,6 @@ 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()
@@ -76,15 +75,6 @@ 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)
@@ -107,7 +97,6 @@ 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)
@@ -127,6 +116,5 @@ 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

@@ -8,8 +8,6 @@ Imports Newtonsoft.Json.Linq
 Imports EnvelopeGenerator.Infrastructure
 Imports Microsoft.EntityFrameworkCore
 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=;" + "Encrypt=True;TrustServerCertificate=True;"
@@ -126,86 +124,4 @@ Public Class frmFinalizePDF
 
         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()).
-                ToList()
-            log.AppendLine($"Annotation JSON count: {oJsonList.Count}")
-
-            ' 2. Load document bytes (same as Service)
-            Dim oBuffer As Byte() = ReadEnvelope(envelopeId)
-            log.AppendLine($"Document bytes: {oBuffer.Length}")
-
-            ' 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()
-
-                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 Signature)()
-                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
-            txtResult.Text = $"ERROR: {ex.Message}{vbCrLf}{vbCrLf}{ex.ToString()}"
-        End Try
-    End Sub
 End Class

EnvelopeGenerator.BBTests/packages.config

@@ -15,13 +15,13 @@
   <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.4.4" targetFramework="net462" />
+  <package id="EntityFramework" version="6.5.1" 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="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.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" />
@@ -62,10 +62,10 @@
   <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
   <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.Buffers" version="4.6.1" targetFramework="net462" />
   <package id="System.ClientModel" version="1.8.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.CodeDom" version="9.0.0" targetFramework="net462" />
+  <package id="System.Collections.Immutable" version="9.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" />
@@ -74,23 +74,23 @@
   <package id="System.Formats.Asn1" version="10.0.3" targetFramework="net462" />
   <package id="System.IdentityModel.Tokens.Jwt" version="7.7.1" 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.Packaging" version="9.0.0" targetFramework="net462" />
   <package id="System.IO.Pipelines" 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.Management" version="9.0.0" targetFramework="net462" />
+  <package id="System.Memory" version="4.6.3" 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.Numerics.Vectors" version="4.6.1" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" 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="8.0.1" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Pkcs" version="9.0.0" 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="8.0.0" targetFramework="net462" />
-  <package id="System.Text.Json" version="8.0.6" targetFramework="net462" />
+  <package id="System.Text.Encodings.Web" version="9.0.0" targetFramework="net462" />
+  <package id="System.Text.Json" version="9.0.0" 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" />
+  <package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.6.1" targetFramework="net462" />
 </packages>

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -15,7 +15,6 @@ Imports DigitalData.Core.Abstraction.Application
 Imports EnvelopeGenerator.Infrastructure
 Imports Microsoft.EntityFrameworkCore
 Imports DigitalData.Core.Abstractions
-Imports EnvelopeGenerator.Domain.Interfaces
 
 Namespace Jobs
     Public Class FinalizeDocumentJob
@@ -231,29 +230,6 @@ 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()
@@ -351,7 +327,7 @@ Namespace Jobs
                 Logger.Warn($"No SendFinalEmailToCreator - oMailToCreator [{oMailToCreator}] <> [{FinalEmailType.No}] ")
             End If
 
-            If oMailToReceivers <> FinalEmailType.No And pEnvelope.IsReadAndSign() Then
+            If oMailToReceivers <> FinalEmailType.No Then
                 Logger.Debug("Sending emails to receivers..")
                 SendFinalEmailToReceivers(pEnvelope) ', pAttachment
             Else
@@ -442,18 +418,7 @@ Namespace Jobs
                 End Try
             End If
 
-#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)
+            Return PDFBurner.BurnAnnotsToPDF(oInputDocumentBuffer, oAnnotations, pEnvelopeData.EnvelopeId)
         End Function
 
         Private Function GetEnvelopeData(pEnvelopeId As Integer) As EnvelopeData

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurner.vb

@@ -85,37 +85,16 @@ Namespace Jobs.FinalizeDocument
 
                     'Add annotations
                     For Each element In elements
-                        If element Is Nothing Then
-                            Continue For
-                        End If
-
-                        Dim elementAnnotations = If(element.Annotations, Enumerable.Empty(Of ElementAnnotation)())
-                        If Not elementAnnotations.Any() Then
-                            Continue For
-                        End If
 
                         Dim frameX = (element.Left - 0.7 - margin)
 
-                        Dim frame = elementAnnotations.FirstOrDefault(Function(a) a.Name = "frame")
+                        Dim frame = element.Annotations.FirstOrDefault(Function(a) a.Name = "frame")
                         Dim frameY = element.Top - 0.5 - margin
-                        Dim frameYShift As Double = 0
-                        Dim frameXShift As Double = 0
-
-                        If frame IsNot Nothing Then
-                            frameYShift = frame.Y - frameY * inchFactor
-                            frameXShift = frame.X - frameX * inchFactor
-                        End If
-
-                        For Each annot In elementAnnotations
-                            If annot Is Nothing Then
-                                Continue For
-                            End If
-
-                            Dim yOffsetofFF As Double = 0
-                            If Not String.IsNullOrEmpty(annot.Name) Then
-                                yOffsetsOfFF.TryGetValue(annot.Name, yOffsetofFF)
-                            End If
+                        Dim frameYShift = frame.Y - frameY * inchFactor
+                        Dim frameXShift = frame.X - frameX * inchFactor
 
+                        For Each annot In element.Annotations
+                            Dim yOffsetofFF As Double = If(yOffsetsOfFF.TryGetValue(annot.Name, yOffsetofFF), yOffsetofFF, 0)
                             Dim y = frameY + yOffsetofFF
 
                             If annot.Type = AnnotationType.FormField Then

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFMerger.vb

@@ -56,7 +56,7 @@ Public Class PDFMerger
 
                             ' Convert to PDF/A
                             oMergedPDF.ConvertToPDFA(oFinalStream, PDFAConformanceLevel, ALLOW_VECTORIZATION, ALLOW_RASTERIZATION)
-                            oStatus = oMergedPDF.GetStat()
+                            oStatus = oDocumentPDF.GetStat()
                             If oStatus <> GdPictureStatus.OK Then
                                 Throw New MergeDocumentException($"Document could not be converted to PDF/A: {oStatus}")
                             End If

EnvelopeGenerator.CommonServices/Models/ReceiverModel.vb

@@ -270,26 +270,12 @@ Public Class ReceiverModel
     Private Function GetSignedDate(pEmailAddress As String, pEnvelopeId As Integer) As Date
         Try
             Dim oStatusInt As Integer = EnvelopeStatus.DocumentSigned
-            Dim value = Database.GetScalarValue($"SELECT ACTION_DATE FROM [DD_ECM].[dbo].[TBSIG_ENVELOPE_HISTORY] WHERE ENVELOPE_ID = {pEnvelopeId}
+            Return Database.GetScalarValue($"SELECT ACTION_DATE FROM [DD_ECM].[dbo].[TBSIG_ENVELOPE_HISTORY] WHERE ENVELOPE_ID = {pEnvelopeId}
                                                 And USER_REFERENCE = '{pEmailAddress}' AND [STATUS] = {oStatusInt}")
 
-            If value Is Nothing OrElse value Is DBNull.Value Then
-                Return DateTime.MinValue
-            End If
-
-            If TypeOf value Is DateTime Then
-                Return DirectCast(value, DateTime)
-            End If
-
-            Dim parsedDate As DateTime
-            If DateTime.TryParse(value.ToString(), parsedDate) Then
-                Return parsedDate
-            End If
-
-            Return DateTime.MinValue
         Catch ex As Exception
             Logger.Error(ex)
-            Return DateTime.MinValue
+            Return Nothing
         End Try
     End Function
 

EnvelopeGenerator.CommonServices/Strings/Model.Designer.vb

@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.42000
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
 '
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -15,12 +15,12 @@ Imports System
 
 Namespace My.Resources
     
-    'This class was auto-generated by the StronglyTypedResourceBuilder
-    'class via a tool like ResGen or Visual Studio.
-    'To add or remove a member, edit your .ResX file then rerun ResGen
-    'with the /str option, or rebuild your VS project.
+    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
     '''<summary>
-    '''  A strongly-typed resource class, for looking up localized strings, etc.
+    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
     <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -37,7 +37,7 @@ Namespace My.Resources
         End Sub
         
         '''<summary>
-        '''  Returns the cached ResourceManager instance used by this class.
+        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
         '''</summary>
         <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
         Public Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
@@ -51,8 +51,8 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Overrides the current thread's CurrentUICulture property for all
-        '''  resource lookups using this strongly typed resource class.
+        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
         '''</summary>
         <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
         Public Shared Property Culture() As Global.System.Globalization.CultureInfo
@@ -65,7 +65,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Zugriffscode korrekt eingegeben.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Zugriffscode korrekt eingegeben ähnelt.
         '''</summary>
         Public Shared ReadOnly Property AccessCodeCorrect() As String
             Get
@@ -74,7 +74,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Zugriffscode falsch eingegeben.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Zugriffscode falsch eingegeben ähnelt.
         '''</summary>
         Public Shared ReadOnly Property AccessCodeIncorrect() As String
             Get
@@ -83,7 +83,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Zugriffscode angefordert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Zugriffscode angefordert ähnelt.
         '''</summary>
         Public Shared ReadOnly Property AccessCodeRequested() As String
             Get
@@ -92,7 +92,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Fortgeschrittene Elektronische Signatur.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Fortgeschrittene Elektronische Signatur ähnelt.
         '''</summary>
         Public Shared ReadOnly Property AdvancedElectronicSignature() As String
             Get
@@ -101,7 +101,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Abgeschlossen.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Abgeschlossen ähnelt.
         '''</summary>
         Public Shared ReadOnly Property Completed() As String
             Get
@@ -110,16 +110,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Vollständig bestätigt.
-        '''</summary>
-        Public Shared ReadOnly Property CompletelyConfirmed() As String
-            Get
-                Return ResourceManager.GetString("CompletelyConfirmed", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Vollständig signiert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Vollständig Signiert ähnelt.
         '''</summary>
         Public Shared ReadOnly Property CompletelySigned() As String
             Get
@@ -128,25 +119,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Lesebestätigung.
-        '''</summary>
-        Public Shared ReadOnly Property Confirmation() As String
-            Get
-                Return ResourceManager.GetString("Confirmation", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Gelesen und Bestätigt.
-        '''</summary>
-        Public Shared ReadOnly Property Confirmed() As String
-            Get
-                Return ResourceManager.GetString("Confirmed", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Vertrag.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Vertrag ähnelt.
         '''</summary>
         Public Shared ReadOnly Property Contract() As String
             Get
@@ -155,7 +128,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Erstellt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Erstellt ähnelt.
         '''</summary>
         Public Shared ReadOnly Property Created() As String
             Get
@@ -164,16 +137,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Dokument gelesen und bestätigt.
-        '''</summary>
-        Public Shared ReadOnly Property DocumentConfirmed() As String
-            Get
-                Return ResourceManager.GetString("DocumentConfirmed", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Dokument Rotation geändert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Dokument Rotation geändert ähnelt.
         '''</summary>
         Public Shared ReadOnly Property DocumentMod_Rotation() As String
             Get
@@ -182,7 +146,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Dokument geöffnet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Dokument geöffnet ähnelt.
         '''</summary>
         Public Shared ReadOnly Property DocumentOpened() As String
             Get
@@ -191,7 +155,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Unterzeichnung abgelehnt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Unterzeichnung abgelehnt ähnelt.
         '''</summary>
         Public Shared ReadOnly Property DocumentRejected() As String
             Get
@@ -200,16 +164,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Lesebestätigung abgelehnt.
-        '''</summary>
-        Public Shared ReadOnly Property DocumentRejectedRaC() As String
-            Get
-                Return ResourceManager.GetString("DocumentRejectedRaC", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Dokument unterzeichnet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Dokument unterzeichnet ähnelt.
         '''</summary>
         Public Shared ReadOnly Property DocumentSigned() As String
             Get
@@ -218,7 +173,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Entwurf.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Entwurf ähnelt.
         '''</summary>
         Public Shared ReadOnly Property Draft() As String
             Get
@@ -227,7 +182,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Archiviert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Archiviert ähnelt.
         '''</summary>
         Public Shared ReadOnly Property EnvelopeArchived() As String
             Get
@@ -236,16 +191,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Vollständig bestätigt.
-        '''</summary>
-        Public Shared ReadOnly Property EnvelopeCompletelyConfirmed() As String
-            Get
-                Return ResourceManager.GetString("EnvelopeCompletelyConfirmed", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Vollständig signiert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Vollständig signiert ähnelt.
         '''</summary>
         Public Shared ReadOnly Property EnvelopeCompletelySigned() As String
             Get
@@ -254,7 +200,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Umschlag Erstellt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Umschlag Erstellt ähnelt.
         '''</summary>
         Public Shared ReadOnly Property EnvelopeCreated() As String
             Get
@@ -263,7 +209,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Umschlag Gelöscht.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Umschlag Gelöscht ähnelt.
         '''</summary>
         Public Shared ReadOnly Property EnvelopeDeleted() As String
             Get
@@ -272,16 +218,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Teil-Bestätigt.
-        '''</summary>
-        Public Shared ReadOnly Property EnvelopePartlyConfirmed() As String
-            Get
-                Return ResourceManager.GetString("EnvelopePartlyConfirmed", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Teil-Signiert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt.
         '''</summary>
         Public Shared ReadOnly Property EnvelopePartlySigned() As String
             Get
@@ -290,7 +227,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Umschlag in Queue.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Umschlag in Queue ähnelt.
         '''</summary>
         Public Shared ReadOnly Property EnvelopeQueued() As String
             Get
@@ -299,7 +236,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Umschlag abgelehnt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Umschlag abgelehnt ähnelt.
         '''</summary>
         Public Shared ReadOnly Property EnvelopeRejected() As String
             Get
@@ -308,7 +245,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Signierungszertifikat erstellt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Signierungszertifikat erstellt ähnelt.
         '''</summary>
         Public Shared ReadOnly Property EnvelopeReportCreated() As String
             Get
@@ -317,16 +254,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Lesebestätigungszertifikat erstellt.
-        '''</summary>
-        Public Shared ReadOnly Property EnvelopeReportCreatedRaC() As String
-            Get
-                Return ResourceManager.GetString("EnvelopeReportCreatedRaC", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Gespeichert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Gespeichert ähnelt.
         '''</summary>
         Public Shared ReadOnly Property EnvelopeSaved() As String
             Get
@@ -335,7 +263,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Gesendet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Gesendet ähnelt.
         '''</summary>
         Public Shared ReadOnly Property EnvelopeSent() As String
             Get
@@ -344,7 +272,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Umschlag zurückgezogen.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Umschlag zurückgezogen ähnelt.
         '''</summary>
         Public Shared ReadOnly Property EnvelopeWithdrawn() As String
             Get
@@ -353,7 +281,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Zugriffscode versendet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Zugriffscode versendet ähnelt.
         '''</summary>
         Public Shared ReadOnly Property MessageAccessCodeSent() As String
             Get
@@ -362,7 +290,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Abschlussemail versendet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Abschlussemail versendet ähnelt.
         '''</summary>
         Public Shared ReadOnly Property MessageCompletionSent() As String
             Get
@@ -371,7 +299,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Signaturbestätigung versendet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Signaturbestätigung versendet ähnelt.
         '''</summary>
         Public Shared ReadOnly Property MessageConfirmationSent() As String
             Get
@@ -380,16 +308,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Lesebestätigung versendet.
-        '''</summary>
-        Public Shared ReadOnly Property MessageConfirmationSentRaC() As String
-            Get
-                Return ResourceManager.GetString("MessageConfirmationSentRaC", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Löschinformation versendet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Löschinformation versendet ähnelt.
         '''</summary>
         Public Shared ReadOnly Property MessageDeletionSent() As String
             Get
@@ -398,7 +317,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Dokumentenlink versendet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Dokumentenlink versendet ähnelt.
         '''</summary>
         Public Shared ReadOnly Property MessageInvitationSent() As String
             Get
@@ -407,7 +326,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Nein.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Nein ähnelt.
         '''</summary>
         Public Shared ReadOnly Property No() As String
             Get
@@ -416,16 +335,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Teil-Bestätigt.
-        '''</summary>
-        Public Shared ReadOnly Property PartlyConfirmed() As String
-            Get
-                Return ResourceManager.GetString("PartlyConfirmed", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Teil-Signiert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt.
         '''</summary>
         Public Shared ReadOnly Property PartlySigned() As String
             Get
@@ -434,7 +344,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Qualifizierte Signatur.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Qualifizierte Signatur ähnelt.
         '''</summary>
         Public Shared ReadOnly Property QualifiedSignature() As String
             Get
@@ -443,7 +353,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Lesebestätigung.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Arbeitsanweisung ähnelt.
         '''</summary>
         Public Shared ReadOnly Property ReadAndSign() As String
             Get
@@ -452,7 +362,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren!.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren! ähnelt.
         '''</summary>
         Public Shared ReadOnly Property ResetTOTPUser() As String
             Get
@@ -461,7 +371,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Gespeichert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Gespeichert ähnelt.
         '''</summary>
         Public Shared ReadOnly Property Saved() As String
             Get
@@ -470,7 +380,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Gesendet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Gesendet ähnelt.
         '''</summary>
         Public Shared ReadOnly Property Sent() As String
             Get
@@ -479,7 +389,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Signatur.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Signatur ähnelt.
         '''</summary>
         Public Shared ReadOnly Property Signature() As String
             Get
@@ -488,7 +398,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Abschluss bestätigt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Signatur bestätigt ähnelt.
         '''</summary>
         Public Shared ReadOnly Property SignatureConfirmed() As String
             Get
@@ -497,7 +407,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Signiert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Signiert ähnelt.
         '''</summary>
         Public Shared ReadOnly Property Signed() As String
             Get
@@ -506,7 +416,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Erfolgreich! Dialog wird geschlossen..
+        '''  Sucht eine lokalisierte Zeichenfolge, die Erfolgreich! Dialog wird geschlossen. ähnelt.
         '''</summary>
         Public Shared ReadOnly Property Success_FormClose() As String
             Get
@@ -515,7 +425,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Unsigniert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Unsigniert ähnelt.
         '''</summary>
         Public Shared ReadOnly Property Unsigned() As String
             Get
@@ -524,7 +434,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Ja.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Ja ähnelt.
         '''</summary>
         Public Shared ReadOnly Property Yes() As String
             Get
@@ -533,7 +443,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Ja, mit Anhang.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Ja, mit Anhang ähnelt.
         '''</summary>
         Public Shared ReadOnly Property YesWithAttachment() As String
             Get

EnvelopeGenerator.CommonServices/Strings/Model.en.resx

@@ -132,27 +132,12 @@
   <data name="Completed" xml:space="preserve">
     <value>Completed</value>
   </data>
-  <data name="CompletelyConfirmed" xml:space="preserve">
-    <value>Completely confirmed</value>
-  </data>
-  <data name="CompletelySigned" xml:space="preserve">
-    <value>Completely signed</value>
-  </data>
-  <data name="Confirmation" xml:space="preserve">
-    <value>Read Confirmation</value>
-  </data>
-  <data name="Confirmed" xml:space="preserve">
-    <value>Read and signed</value>
-  </data>
   <data name="Contract" xml:space="preserve">
     <value>Contract</value>
   </data>
   <data name="Created" xml:space="preserve">
     <value>Created</value>
   </data>
-  <data name="DocumentConfirmed" xml:space="preserve">
-    <value>Document read and confirmed</value>
-  </data>
   <data name="DocumentMod_Rotation" xml:space="preserve">
     <value>Document rotation adapted</value>
   </data>
@@ -162,9 +147,6 @@
   <data name="DocumentRejected" xml:space="preserve">
     <value>Signing rejected</value>
   </data>
-  <data name="DocumentRejectedRaC" xml:space="preserve">
-    <value>Read confirmation rejected</value>
-  </data>
   <data name="DocumentSigned" xml:space="preserve">
     <value>Document signed</value>
   </data>
@@ -174,9 +156,6 @@
   <data name="EnvelopeArchived" xml:space="preserve">
     <value>Archived</value>
   </data>
-  <data name="EnvelopeCompletelyConfirmed" xml:space="preserve">
-    <value>Completely confirmed</value>
-  </data>
   <data name="EnvelopeCompletelySigned" xml:space="preserve">
     <value>Completely signed</value>
   </data>
@@ -186,11 +165,8 @@
   <data name="EnvelopeDeleted" xml:space="preserve">
     <value>Envelope Deleted</value>
   </data>
-  <data name="EnvelopePartlyConfirmed" xml:space="preserve">
-    <value>Partially confirmed</value>
-  </data>
   <data name="EnvelopePartlySigned" xml:space="preserve">
-    <value>Partially signed</value>
+    <value>Partly signed</value>
   </data>
   <data name="EnvelopeQueued" xml:space="preserve">
     <value>Envelope Queued</value>
@@ -201,9 +177,6 @@
   <data name="EnvelopeReportCreated" xml:space="preserve">
     <value>Signature certificate created</value>
   </data>
-  <data name="EnvelopeReportCreatedRaC" xml:space="preserve">
-    <value>Read Confirmation Certificate Created</value>
-  </data>
   <data name="EnvelopeSaved" xml:space="preserve">
     <value>Saved</value>
   </data>
@@ -222,9 +195,6 @@
   <data name="MessageConfirmationSent" xml:space="preserve">
     <value>Confirmation Sent</value>
   </data>
-  <data name="MessageConfirmationSentRaC" xml:space="preserve">
-    <value>Read Confirmation Sent</value>
-  </data>
   <data name="MessageDeletionSent" xml:space="preserve">
     <value>Deletion Notice Sent</value>
   </data>
@@ -234,12 +204,6 @@
   <data name="No" xml:space="preserve">
     <value>No</value>
   </data>
-  <data name="PartlyConfirmed" xml:space="preserve">
-    <value>Partially confirmed</value>
-  </data>
-  <data name="PartlySigned" xml:space="preserve">
-    <value>Partially signed</value>
-  </data>
   <data name="QualifiedSignature" xml:space="preserve">
     <value>Qualified Signature</value>
   </data>
@@ -259,7 +223,7 @@
     <value>Signature</value>
   </data>
   <data name="SignatureConfirmed" xml:space="preserve">
-    <value>Finalization confirmed</value>
+    <value>Signature confirmed</value>
   </data>
   <data name="Signed" xml:space="preserve">
     <value>Signed</value>

EnvelopeGenerator.CommonServices/Strings/Model.resx

@@ -132,17 +132,8 @@
   <data name="Completed" xml:space="preserve">
     <value>Abgeschlossen</value>
   </data>
-  <data name="CompletelyConfirmed" xml:space="preserve">
-    <value>Vollständig bestätigt</value>
-  </data>
   <data name="CompletelySigned" xml:space="preserve">
-    <value>Vollständig signiert</value>
-  </data>
-  <data name="Confirmation" xml:space="preserve">
-    <value>Lesebestätigung</value>
-  </data>
-  <data name="Confirmed" xml:space="preserve">
-    <value>Gelesen und Bestätigt</value>
+    <value>Vollständig Signiert</value>
   </data>
   <data name="Contract" xml:space="preserve">
     <value>Vertrag</value>
@@ -150,9 +141,6 @@
   <data name="Created" xml:space="preserve">
     <value>Erstellt</value>
   </data>
-  <data name="DocumentConfirmed" xml:space="preserve">
-    <value>Dokument gelesen und bestätigt</value>
-  </data>
   <data name="DocumentMod_Rotation" xml:space="preserve">
     <value>Dokument Rotation geändert</value>
   </data>
@@ -162,9 +150,6 @@
   <data name="DocumentRejected" xml:space="preserve">
     <value>Unterzeichnung abgelehnt</value>
   </data>
-  <data name="DocumentRejectedRaC" xml:space="preserve">
-    <value>Lesebestätigung abgelehnt</value>
-  </data>
   <data name="DocumentSigned" xml:space="preserve">
     <value>Dokument unterzeichnet</value>
   </data>
@@ -174,9 +159,6 @@
   <data name="EnvelopeArchived" xml:space="preserve">
     <value>Archiviert</value>
   </data>
-  <data name="EnvelopeCompletelyConfirmed" xml:space="preserve">
-    <value>Vollständig bestätigt</value>
-  </data>
   <data name="EnvelopeCompletelySigned" xml:space="preserve">
     <value>Vollständig signiert</value>
   </data>
@@ -186,9 +168,6 @@
   <data name="EnvelopeDeleted" xml:space="preserve">
     <value>Umschlag Gelöscht</value>
   </data>
-  <data name="EnvelopePartlyConfirmed" xml:space="preserve">
-    <value>Teil-Bestätigt</value>
-  </data>
   <data name="EnvelopePartlySigned" xml:space="preserve">
     <value>Teil-Signiert</value>
   </data>
@@ -201,9 +180,6 @@
   <data name="EnvelopeReportCreated" xml:space="preserve">
     <value>Signierungszertifikat erstellt</value>
   </data>
-  <data name="EnvelopeReportCreatedRaC" xml:space="preserve">
-    <value>Lesebestätigungszertifikat erstellt</value>
-  </data>
   <data name="EnvelopeSaved" xml:space="preserve">
     <value>Gespeichert</value>
   </data>
@@ -222,9 +198,6 @@
   <data name="MessageConfirmationSent" xml:space="preserve">
     <value>Signaturbestätigung versendet</value>
   </data>
-  <data name="MessageConfirmationSentRaC" xml:space="preserve">
-    <value>Lesebestätigung versendet</value>
-  </data>
   <data name="MessageDeletionSent" xml:space="preserve">
     <value>Löschinformation versendet</value>
   </data>
@@ -234,9 +207,6 @@
   <data name="No" xml:space="preserve">
     <value>Nein</value>
   </data>
-  <data name="PartlyConfirmed" xml:space="preserve">
-    <value>Teil-Bestätigt</value>
-  </data>
   <data name="PartlySigned" xml:space="preserve">
     <value>Teil-Signiert</value>
   </data>
@@ -244,7 +214,7 @@
     <value>Qualifizierte Signatur</value>
   </data>
   <data name="ReadAndSign" xml:space="preserve">
-    <value>Lesebestätigung</value>
+    <value>Arbeitsanweisung</value>
   </data>
   <data name="ResetTOTPUser" xml:space="preserve">
     <value>Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren!</value>
@@ -259,7 +229,7 @@
     <value>Signatur</value>
   </data>
   <data name="SignatureConfirmed" xml:space="preserve">
-    <value>Abschluss bestätigt</value>
+    <value>Signatur bestätigt</value>
   </data>
   <data name="Signed" xml:space="preserve">
     <value>Signiert</value>

EnvelopeGenerator.Domain/Entities/DocumentStatus.cs

@@ -35,9 +35,6 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("STATUS")]
         public Constants.DocumentStatus Status { get; set; }
 
-        [Column("STATUS_CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime? StatusChangedWhen { get; set; }
-
         [Required]
         [Column("ADDED_WHEN", TypeName = "datetime")]
         public DateTime AddedWhen { get; set; }

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -5,7 +5,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 using EnvelopeGenerator.Domain.Constants;
 using Newtonsoft.Json;
 using EnvelopeGenerator.Domain.Interfaces.Auditing;
-using EnvelopeGenerator.Domain.Interfaces;
 #if NETFRAMEWORK
 using System.Collections.Generic;
 using System.Linq;
@@ -14,7 +13,7 @@ using System.Linq;
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_ENVELOPE", Schema = "dbo")]
-    public class Envelope : IHasAddedWhen, IHasChangedWhen, IEnvelope
+    public class Envelope : IHasAddedWhen, IHasChangedWhen
     {
         public Envelope()
         {
@@ -107,8 +106,7 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [JsonIgnore]
         [NotMapped]
-        [Obsolete("Use EnvelopeGenerator.Domain.Interfaces.EnvelopeExtensions.IsReadAndConfirm extension method instead.")]
-        public bool ReadOnly => this.IsReadAndConfirm();
+        public bool ReadOnly => EnvelopeTypeId == 2;
 
         [Column("CERTIFICATION_TYPE")]
         public int? CertificationType { get; set; }

EnvelopeGenerator.Domain/Entities/History.cs

@@ -37,7 +37,6 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("ACTION_DATE", TypeName = "datetime")]
         public DateTime? ActionDate { get; set; }
 
-        [NotMapped]
         public DateTime? ChangedWhen { get => ActionDate; set => ActionDate = value; }
 
         [Column("COMMENT", TypeName = "nvarchar(max)")]

EnvelopeGenerator.Domain/Entities/Signature.cs

@@ -4,6 +4,9 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using EnvelopeGenerator.Domain.Interfaces.Auditing;
+#if NET
+using System.Text.Json.Serialization;
+#endif
 #if NETFRAMEWORK
 using System.Collections.Generic;
 #endif
@@ -109,22 +112,25 @@ namespace EnvelopeGenerator.Domain.Entities
 #if nullable
         ?
 #endif
-            Receiver
-        { get; set; }
+            Receiver { get; set; }
 
         public virtual IEnumerable<ElementAnnotation>
 #if nullable
         ?
 #endif
-            Annotations
-        { get; set; }
+            Annotations { get; set; }
 
-#if NETFRAMEWORK
+#if NET
+        [JsonIgnore]
+#endif
         [NotMapped]
         public double Top => Math.Round(Y, 5);
 
+
+#if NET
+        [JsonIgnore]
+#endif
         [NotMapped]
         public double Left => Math.Round(X, 5);
-#endif
     }
 }

EnvelopeGenerator.Domain/Interfaces/IEnvelope.cs

@@ -1,20 +0,0 @@
-namespace EnvelopeGenerator.Domain.Interfaces
-{
-    public interface IEnvelope
-    {
-        int? EnvelopeTypeId { get; set; }
-    }
-
-    public static class EnvelopeExtensions
-    {
-        public static bool IsReadAndConfirm(this IEnvelope envelope)
-        {
-            return envelope.EnvelopeTypeId == 2;
-        }
-
-        public static bool IsReadAndSign(this IEnvelope envelope)
-        {
-            return envelope.EnvelopeTypeId != 2;
-        }
-    }
-}

EnvelopeGenerator.Domain/Resources/Model.Designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -13,12 +13,12 @@ namespace My.Resources {
     
     
     /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -33,7 +33,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         public static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         public static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Zugriffscode korrekt eingegeben.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Zugriffscode korrekt eingegeben ähnelt.
         /// </summary>
         public static string AccessCodeCorrect {
             get {
@@ -70,7 +70,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Zugriffscode falsch eingegeben.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Zugriffscode falsch eingegeben ähnelt.
         /// </summary>
         public static string AccessCodeIncorrect {
             get {
@@ -79,7 +79,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Zugriffscode angefordert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Zugriffscode angefordert ähnelt.
         /// </summary>
         public static string AccessCodeRequested {
             get {
@@ -88,7 +88,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Fortgeschrittene Elektronische Signatur.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Fortgeschrittene Elektronische Signatur ähnelt.
         /// </summary>
         public static string AdvancedElectronicSignature {
             get {
@@ -97,7 +97,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Abgeschlossen.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Abgeschlossen ähnelt.
         /// </summary>
         public static string Completed {
             get {
@@ -106,16 +106,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Vollständig bestätigt.
-        /// </summary>
-        public static string CompletelyConfirmed {
-            get {
-                return ResourceManager.GetString("CompletelyConfirmed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Vollständig signiert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Vollständig Signiert ähnelt.
         /// </summary>
         public static string CompletelySigned {
             get {
@@ -124,25 +115,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lesebestätigung.
-        /// </summary>
-        public static string Confirmation {
-            get {
-                return ResourceManager.GetString("Confirmation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Gelesen und bestätigt.
-        /// </summary>
-        public static string Confirmed {
-            get {
-                return ResourceManager.GetString("Confirmed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Vertrag.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Vertrag ähnelt.
         /// </summary>
         public static string Contract {
             get {
@@ -151,7 +124,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Erstellt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Erstellt ähnelt.
         /// </summary>
         public static string Created {
             get {
@@ -160,16 +133,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Dokument gelesen und bestätigt.
-        /// </summary>
-        public static string DocumentConfirmed {
-            get {
-                return ResourceManager.GetString("DocumentConfirmed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Dokument Rotation geändert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Dokument Rotation geändert ähnelt.
         /// </summary>
         public static string DocumentMod_Rotation {
             get {
@@ -178,7 +142,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Dokument geöffnet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Dokument geöffnet ähnelt.
         /// </summary>
         public static string DocumentOpened {
             get {
@@ -187,7 +151,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unterzeichnung abgelehnt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Unterzeichnung abgelehnt ähnelt.
         /// </summary>
         public static string DocumentRejected {
             get {
@@ -196,16 +160,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lesebestätigung abgelehnt.
-        /// </summary>
-        public static string DocumentRejectedRaC {
-            get {
-                return ResourceManager.GetString("DocumentRejectedRaC", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Dokument unterzeichnet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Dokument unterzeichnet ähnelt.
         /// </summary>
         public static string DocumentSigned {
             get {
@@ -214,7 +169,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Entwurf.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Entwurf ähnelt.
         /// </summary>
         public static string Draft {
             get {
@@ -223,7 +178,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Archiviert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Archiviert ähnelt.
         /// </summary>
         public static string EnvelopeArchived {
             get {
@@ -232,16 +187,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Vollständig gelesen und bestätigt.
-        /// </summary>
-        public static string EnvelopeCompletelyConfirmed {
-            get {
-                return ResourceManager.GetString("EnvelopeCompletelyConfirmed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Vollständig signiert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Vollständig signiert ähnelt.
         /// </summary>
         public static string EnvelopeCompletelySigned {
             get {
@@ -250,7 +196,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Umschlag Erstellt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Umschlag Erstellt ähnelt.
         /// </summary>
         public static string EnvelopeCreated {
             get {
@@ -259,7 +205,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Umschlag Gelöscht.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Umschlag Gelöscht ähnelt.
         /// </summary>
         public static string EnvelopeDeleted {
             get {
@@ -268,16 +214,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Teil-Bestätigt.
-        /// </summary>
-        public static string EnvelopePartlyConfirmed {
-            get {
-                return ResourceManager.GetString("EnvelopePartlyConfirmed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Teil-Signiert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt.
         /// </summary>
         public static string EnvelopePartlySigned {
             get {
@@ -286,7 +223,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Umschlag in Queue.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Umschlag in Queue ähnelt.
         /// </summary>
         public static string EnvelopeQueued {
             get {
@@ -295,7 +232,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Umschlag abgelehnt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Umschlag abgelehnt ähnelt.
         /// </summary>
         public static string EnvelopeRejected {
             get {
@@ -304,7 +241,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Signierungszertifikat erstellt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Signierungszertifikat erstellt ähnelt.
         /// </summary>
         public static string EnvelopeReportCreated {
             get {
@@ -313,16 +250,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lesebestätigungszertifikat erstellt.
-        /// </summary>
-        public static string EnvelopeReportCreatedRaC {
-            get {
-                return ResourceManager.GetString("EnvelopeReportCreatedRaC", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Gespeichert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Gespeichert ähnelt.
         /// </summary>
         public static string EnvelopeSaved {
             get {
@@ -331,7 +259,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Gesendet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Gesendet ähnelt.
         /// </summary>
         public static string EnvelopeSent {
             get {
@@ -340,7 +268,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Umschlag zurückgezogen.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Umschlag zurückgezogen ähnelt.
         /// </summary>
         public static string EnvelopeWithdrawn {
             get {
@@ -349,7 +277,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Zugriffscode versendet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Zugriffscode versendet ähnelt.
         /// </summary>
         public static string MessageAccessCodeSent {
             get {
@@ -358,7 +286,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Abschlussemail versendet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Abschlussemail versendet ähnelt.
         /// </summary>
         public static string MessageCompletionSent {
             get {
@@ -367,7 +295,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Abschlussbestätigung versendet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Signaturbestätigung versendet ähnelt.
         /// </summary>
         public static string MessageConfirmationSent {
             get {
@@ -376,7 +304,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Löschinformation versendet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Löschinformation versendet ähnelt.
         /// </summary>
         public static string MessageDeletionSent {
             get {
@@ -385,7 +313,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Dokumentenlink versendet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Dokumentenlink versendet ähnelt.
         /// </summary>
         public static string MessageInvitationSent {
             get {
@@ -394,7 +322,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Nein.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Nein ähnelt.
         /// </summary>
         public static string No {
             get {
@@ -403,16 +331,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Teil-Bestätigt.
-        /// </summary>
-        public static string PartlyConfirmed {
-            get {
-                return ResourceManager.GetString("PartlyConfirmed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Teil-Signiert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt.
         /// </summary>
         public static string PartlySigned {
             get {
@@ -421,7 +340,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Qualifizierte Signatur.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Qualifizierte Signatur ähnelt.
         /// </summary>
         public static string QualifiedSignature {
             get {
@@ -430,7 +349,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lesebestätigung.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Arbeitsanweisung ähnelt.
         /// </summary>
         public static string ReadAndSign {
             get {
@@ -439,7 +358,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren!.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren! ähnelt.
         /// </summary>
         public static string ResetTOTPUser {
             get {
@@ -448,7 +367,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Gespeichert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Gespeichert ähnelt.
         /// </summary>
         public static string Saved {
             get {
@@ -457,7 +376,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Gesendet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Gesendet ähnelt.
         /// </summary>
         public static string Sent {
             get {
@@ -466,7 +385,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Signatur.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Signatur ähnelt.
         /// </summary>
         public static string Signature {
             get {
@@ -475,7 +394,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Abschluss bestätigt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Signatur bestätigt ähnelt.
         /// </summary>
         public static string SignatureConfirmed {
             get {
@@ -484,7 +403,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Signiert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Signiert ähnelt.
         /// </summary>
         public static string Signed {
             get {
@@ -493,7 +412,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Erfolgreich! Dialog wird geschlossen..
+        ///   Sucht eine lokalisierte Zeichenfolge, die Erfolgreich! Dialog wird geschlossen. ähnelt.
         /// </summary>
         public static string Success_FormClose {
             get {
@@ -502,16 +421,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unbestätigt.
-        /// </summary>
-        public static string Unconfirmed {
-            get {
-                return ResourceManager.GetString("Unconfirmed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unsigniert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Unsigniert ähnelt.
         /// </summary>
         public static string Unsigned {
             get {
@@ -520,7 +430,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Ja.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Ja ähnelt.
         /// </summary>
         public static string Yes {
             get {
@@ -529,7 +439,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Ja, mit Anhang.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Ja, mit Anhang ähnelt.
         /// </summary>
         public static string YesWithAttachment {
             get {

EnvelopeGenerator.Domain/Resources/Model.en.resx

@@ -132,27 +132,15 @@
   <data name="Completed" xml:space="preserve">
     <value>Completed</value>
   </data>
-  <data name="CompletelyConfirmed" xml:space="preserve">
-    <value>Completely confirmed</value>
-  </data>
   <data name="CompletelySigned" xml:space="preserve">
     <value>Completely signed</value>
   </data>
-  <data name="Confirmation" xml:space="preserve">
-    <value>Read Confirmation</value>
-  </data>
-  <data name="Confirmed" xml:space="preserve">
-    <value>Read and signed</value>
-  </data>
   <data name="Contract" xml:space="preserve">
     <value>Contract</value>
   </data>
   <data name="Created" xml:space="preserve">
     <value>Created</value>
   </data>
-  <data name="DocumentConfirmed" xml:space="preserve">
-    <value>Document read and signed</value>
-  </data>
   <data name="DocumentMod_Rotation" xml:space="preserve">
     <value>Document rotation adapted</value>
   </data>
@@ -162,9 +150,6 @@
   <data name="DocumentRejected" xml:space="preserve">
     <value>Signing rejected</value>
   </data>
-  <data name="DocumentRejectedRaC" xml:space="preserve">
-    <value>Read confirmation rejected</value>
-  </data>
   <data name="DocumentSigned" xml:space="preserve">
     <value>Document signed</value>
   </data>
@@ -174,9 +159,6 @@
   <data name="EnvelopeArchived" xml:space="preserve">
     <value>Archived</value>
   </data>
-  <data name="EnvelopeCompletelyConfirmed" xml:space="preserve">
-    <value>Completely confirmed</value>
-  </data>
   <data name="EnvelopeCompletelySigned" xml:space="preserve">
     <value>Completely signed</value>
   </data>
@@ -186,11 +168,8 @@
   <data name="EnvelopeDeleted" xml:space="preserve">
     <value>Envelope Deleted</value>
   </data>
-  <data name="EnvelopePartlyConfirmed" xml:space="preserve">
-    <value>Partially confirmed</value>
-  </data>
   <data name="EnvelopePartlySigned" xml:space="preserve">
-    <value>Partially signed</value>
+    <value>Partly signed</value>
   </data>
   <data name="EnvelopeQueued" xml:space="preserve">
     <value>Envelope Queued</value>
@@ -201,9 +180,6 @@
   <data name="EnvelopeReportCreated" xml:space="preserve">
     <value>Signature certificate created</value>
   </data>
-  <data name="EnvelopeReportCreatedRaC" xml:space="preserve">
-    <value>Read confirmartion certificate created</value>
-  </data>
   <data name="EnvelopeSaved" xml:space="preserve">
     <value>Saved</value>
   </data>
@@ -220,7 +196,7 @@
     <value>Final email sent</value>
   </data>
   <data name="MessageConfirmationSent" xml:space="preserve">
-    <value>Finalization Confirmation Sent</value>
+    <value>Confirmation Sent</value>
   </data>
   <data name="MessageDeletionSent" xml:space="preserve">
     <value>Deletion Notice Sent</value>
@@ -231,12 +207,6 @@
   <data name="No" xml:space="preserve">
     <value>No</value>
   </data>
-  <data name="PartlyConfirmed" xml:space="preserve">
-    <value>Partially confirmed</value>
-  </data>
-  <data name="PartlySigned" xml:space="preserve">
-    <value>Partially signed</value>
-  </data>
   <data name="QualifiedSignature" xml:space="preserve">
     <value>Qualified Signature</value>
   </data>
@@ -256,7 +226,7 @@
     <value>Signature</value>
   </data>
   <data name="SignatureConfirmed" xml:space="preserve">
-    <value>Finalization confirmed</value>
+    <value>Signature confirmed</value>
   </data>
   <data name="Signed" xml:space="preserve">
     <value>Signed</value>
@@ -264,9 +234,6 @@
   <data name="Success_FormClose" xml:space="preserve">
     <value>Successful! Dialog is closed.successful! Dialog is closed.</value>
   </data>
-  <data name="Unconfirmed" xml:space="preserve">
-    <value>Unconfirmed</value>
-  </data>
   <data name="Unsigned" xml:space="preserve">
     <value>Unsigned</value>
   </data>

EnvelopeGenerator.Domain/Resources/Model.resx

@@ -132,17 +132,8 @@
   <data name="Completed" xml:space="preserve">
     <value>Abgeschlossen</value>
   </data>
-  <data name="CompletelyConfirmed" xml:space="preserve">
-    <value>Vollständig bestätigt</value>
-  </data>
   <data name="CompletelySigned" xml:space="preserve">
-    <value>Vollständig signiert</value>
-  </data>
-  <data name="Confirmation" xml:space="preserve">
-    <value>Lesebestätigung</value>
-  </data>
-  <data name="Confirmed" xml:space="preserve">
-    <value>Gelesen und bestätigt</value>
+    <value>Vollständig Signiert</value>
   </data>
   <data name="Contract" xml:space="preserve">
     <value>Vertrag</value>
@@ -150,9 +141,6 @@
   <data name="Created" xml:space="preserve">
     <value>Erstellt</value>
   </data>
-  <data name="DocumentConfirmed" xml:space="preserve">
-    <value>Dokument gelesen und bestätigt</value>
-  </data>
   <data name="DocumentMod_Rotation" xml:space="preserve">
     <value>Dokument Rotation geändert</value>
   </data>
@@ -162,9 +150,6 @@
   <data name="DocumentRejected" xml:space="preserve">
     <value>Unterzeichnung abgelehnt</value>
   </data>
-  <data name="DocumentRejectedRaC" xml:space="preserve">
-    <value>Lesebestätigung abgelehnt</value>
-  </data>
   <data name="DocumentSigned" xml:space="preserve">
     <value>Dokument unterzeichnet</value>
   </data>
@@ -174,9 +159,6 @@
   <data name="EnvelopeArchived" xml:space="preserve">
     <value>Archiviert</value>
   </data>
-  <data name="EnvelopeCompletelyConfirmed" xml:space="preserve">
-    <value>Vollständig gelesen und bestätigt</value>
-  </data>
   <data name="EnvelopeCompletelySigned" xml:space="preserve">
     <value>Vollständig signiert</value>
   </data>
@@ -186,9 +168,6 @@
   <data name="EnvelopeDeleted" xml:space="preserve">
     <value>Umschlag Gelöscht</value>
   </data>
-  <data name="EnvelopePartlyConfirmed" xml:space="preserve">
-    <value>Teil-Bestätigt</value>
-  </data>
   <data name="EnvelopePartlySigned" xml:space="preserve">
     <value>Teil-Signiert</value>
   </data>
@@ -201,9 +180,6 @@
   <data name="EnvelopeReportCreated" xml:space="preserve">
     <value>Signierungszertifikat erstellt</value>
   </data>
-  <data name="EnvelopeReportCreatedRaC" xml:space="preserve">
-    <value>Lesebestätigungszertifikat erstellt</value>
-  </data>
   <data name="EnvelopeSaved" xml:space="preserve">
     <value>Gespeichert</value>
   </data>
@@ -220,7 +196,7 @@
     <value>Abschlussemail versendet</value>
   </data>
   <data name="MessageConfirmationSent" xml:space="preserve">
-    <value>Abschlussbestätigung versendet</value>
+    <value>Signaturbestätigung versendet</value>
   </data>
   <data name="MessageDeletionSent" xml:space="preserve">
     <value>Löschinformation versendet</value>
@@ -231,9 +207,6 @@
   <data name="No" xml:space="preserve">
     <value>Nein</value>
   </data>
-  <data name="PartlyConfirmed" xml:space="preserve">
-    <value>Teil-Bestätigt</value>
-  </data>
   <data name="PartlySigned" xml:space="preserve">
     <value>Teil-Signiert</value>
   </data>
@@ -241,7 +214,7 @@
     <value>Qualifizierte Signatur</value>
   </data>
   <data name="ReadAndSign" xml:space="preserve">
-    <value>Lesebestätigung</value>
+    <value>Arbeitsanweisung</value>
   </data>
   <data name="ResetTOTPUser" xml:space="preserve">
     <value>Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren!</value>
@@ -256,7 +229,7 @@
     <value>Signatur</value>
   </data>
   <data name="SignatureConfirmed" xml:space="preserve">
-    <value>Abschluss bestätigt</value>
+    <value>Signatur bestätigt</value>
   </data>
   <data name="Signed" xml:space="preserve">
     <value>Signiert</value>
@@ -264,9 +237,6 @@
   <data name="Success_FormClose" xml:space="preserve">
     <value>Erfolgreich! Dialog wird geschlossen.</value>
   </data>
-  <data name="Unconfirmed" xml:space="preserve">
-    <value>Unbestätigt</value>
-  </data>
   <data name="Unsigned" xml:space="preserve">
     <value>Unsigniert</value>
   </data>

EnvelopeGenerator.Infrastructure/EGDbContext.cs

@@ -47,8 +47,6 @@ public abstract class EGDbContextBase : DbContext
 
     public DbSet<Signature> DocumentReceiverElements { get; set; }
 
-    public DbSet<ElementAnnotation> DocumentReceiverElementAnnotations { get; set; }
-
     public DbSet<DocumentStatus> DocumentStatus { get; set; }
 
     public DbSet<EmailTemplate> EmailTemplate { get; set; }

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

@@ -25,7 +25,7 @@
     <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.6.0" />
     <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.6.1" />
     <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
     <PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
     <PackageReference Include="QuestPDF" Version="2025.7.1" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />

EnvelopeGenerator.PdfEditor/Pdf.cs

@@ -105,13 +105,17 @@ namespace EnvelopeGenerator.PdfEditor
         public Pdf<TInputStream, TOutputStream> Background<TSignature>(IEnumerable<TSignature> signatures, double widthPx = 1.9500000000000002, double heightPx = 2.52)
             where TSignature : ISignature
         {
+            // once per page
+            Page(page =>
+            {
+                var canvas = new PdfCanvas(page);
+                canvas.ConcatMatrix(1, 0, 0, -1, 0, page.GetPageSize().GetHeight());
+            });
+
             foreach (var signature in signatures)
                 Page(signature.Page, page =>
                 {
                     var canvas = new PdfCanvas(page);
-                    canvas.SaveState();
-                    canvas.ConcatMatrix(1, 0, 0, -1, 0, page.GetPageSize().GetHeight());
-
                     double inchFactor = 72;
                     double magin = .2;
                     double x = (signature.X - .7 - magin) * inchFactor;
@@ -130,8 +134,6 @@ namespace EnvelopeGenerator.PdfEditor
                     canvas.SetFillColor(new DeviceRgb(204, 202, 198))
                         .Rectangle(x, y + height - bottomLineLength, width, bottomLineLength)
                         .Fill();
-
-                    canvas.RestoreState();
                 });
 
             return this;

EnvelopeGenerator.Service/App.config

@@ -15,7 +15,7 @@
       </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" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
@@ -23,15 +23,15 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -39,7 +39,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -51,7 +51,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -59,7 +59,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.3" newVersion="8.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -67,7 +67,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -135,7 +135,7 @@
       </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" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Formats.Asn1" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -17,8 +17,7 @@
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>P:\Install .Net\0 DD - Smart UP\signFLOW\Finalization\%24%28Version%29\</PublishUrl>
+    <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -28,11 +27,10 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <AutorunEnabled>true</AutorunEnabled>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
-    <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -67,18 +65,6 @@
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
-  <PropertyGroup>
-    <ManifestCertificateThumbprint>905CDA07C40CC715F90A2F2A0C5C0E5BAACE138B</ManifestCertificateThumbprint>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ManifestKeyFile>EnvelopeGenerator.Service_TemporaryKey.pfx</ManifestKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignManifests>true</SignManifests>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
       <HintPath>..\packages\BouncyCastle.Cryptography.2.6.2\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
@@ -195,11 +181,11 @@
     <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=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.3, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.3\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.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>
@@ -226,8 +212,8 @@
       <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
+    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.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>
@@ -235,9 +221,6 @@
     <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
     </Reference>
-    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
-    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Configuration.Install" />
@@ -251,18 +234,18 @@
       <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.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.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.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <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.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Runtime.Serialization" />
@@ -275,15 +258,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.6, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.8.0.6\lib\net462\System.Text.Json.dll</HintPath>
+    <Reference Include="System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
-    <Reference Include="System.ValueTuple, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.6.1\lib\net462\System.ValueTuple.dll</HintPath>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
@@ -291,63 +274,6 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Net.Http" />
     <Reference Include="WindowsBase" />
-    <Reference Include="Microsoft.Data.SqlClient, Version=6.0.0.0, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Data.SqlClient.6.1.4\lib\net462\Microsoft.Data.SqlClient.dll</HintPath>
-    </Reference>
-    <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="DigitalData.Core.Abstraction.Application, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.6.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
-    </Reference>
-    <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.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>
-    </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore.Relational, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.EntityFrameworkCore.Relational.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
-    </Reference>
-    <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=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <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=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <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>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Configuration.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Configuration.Binder.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
-    </Reference>
-    <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.Options, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <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=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Primitives.8.0.0\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.Common, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Import Include="Microsoft.VisualBasic" />
@@ -411,7 +337,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="EnvelopeGenerator.Service_TemporaryKey.pfx" />
     <None Include="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
       <LastGenOutput>Application.Designer.vb</LastGenOutput>
@@ -455,8 +380,6 @@
     <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.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\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\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.Service/packages.config

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="10.1.1" targetFramework="net462" />
   <package id="BouncyCastle.Cryptography" version="2.6.2" 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" />
   <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net48" />
   <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net48" />
@@ -13,26 +11,11 @@
   <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net48" />
   <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net48" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net48" />
-  <package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net462" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
-  <package id="Microsoft.Data.SqlClient" version="6.1.4" 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.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="8.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="8.0.2" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Logging" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.3" 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="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net48" />
   <package id="NLog" version="5.0.5" targetFramework="net461" />
@@ -41,20 +24,18 @@
   <package id="protobuf-net.Core" version="3.2.46" targetFramework="net48" />
   <package id="Quartz" version="3.15.0" targetFramework="net462" />
   <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net48" />
-  <package id="System.Buffers" version="4.6.1" targetFramework="net462" />
+  <package id="System.Buffers" version="4.6.0" targetFramework="net48" />
   <package id="System.CodeDom" version="8.0.0" targetFramework="net48" />
   <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net48" />
-  <package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net48" />
   <package id="System.Data.Odbc" version="6.0.1" targetFramework="net48" />
-  <package id="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net462" />
   <package id="System.IO.Packaging" version="8.0.1" targetFramework="net48" />
   <package id="System.Management" version="8.0.0" targetFramework="net48" />
-  <package id="System.Memory" version="4.6.3" targetFramework="net462" />
-  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net462" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net462" />
+  <package id="System.Memory" version="4.6.0" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net48" />
   <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net48" />
   <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net48" />
-  <package id="System.Text.Json" version="8.0.6" targetFramework="net48" />
-  <package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net462" />
-  <package id="System.ValueTuple" version="4.6.1" targetFramework="net462" />
+  <package id="System.Text.Json" version="8.0.5" targetFramework="net48" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" requireReinstallation="true" />
 </packages>

EnvelopeGenerator.ServiceHost/EnvelopeGenerator.ServiceHost.csproj

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+    <PackageReference Include="GdPicture" Version="14.3.3" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.17" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.17" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Quartz" Version="3.8.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.16" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
+    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
+    <ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Controllers\" />
+  </ItemGroup>
+
+</Project>

EnvelopeGenerator.ServiceHost/Exceptions/BurnAnnotationException.cs

@@ -0,0 +1,12 @@
+namespace EnvelopeGenerator.ServiceHost.Exceptions;
+
+public class BurnAnnotationException : ApplicationException
+{
+    public BurnAnnotationException(string message) : base(message)
+    {
+    }
+
+    public BurnAnnotationException(string message, Exception innerException) : base(message, innerException)
+    {
+    }
+}

EnvelopeGenerator.ServiceHost/Exceptions/CreateReportException.cs

@@ -0,0 +1,12 @@
+namespace EnvelopeGenerator.ServiceHost.Exceptions;
+
+public class CreateReportException : ApplicationException
+{
+    public CreateReportException(string message) : base(message)
+    {
+    }
+
+    public CreateReportException(string message, Exception innerException) : base(message, innerException)
+    {
+    }
+}

EnvelopeGenerator.ServiceHost/Exceptions/ExportDocumentException.cs

@@ -0,0 +1,12 @@
+namespace EnvelopeGenerator.ServiceHost.Exceptions;
+
+public class ExportDocumentException : ApplicationException
+{
+    public ExportDocumentException(string message) : base(message)
+    {
+    }
+
+    public ExportDocumentException(string message, Exception innerException) : base(message, innerException)
+    {
+    }
+}

EnvelopeGenerator.ServiceHost/Exceptions/MergeDocumentException.cs

@@ -0,0 +1,12 @@
+namespace EnvelopeGenerator.ServiceHost.Exceptions;
+
+public class MergeDocumentException : ApplicationException
+{
+    public MergeDocumentException(string message) : base(message)
+    {
+    }
+
+    public MergeDocumentException(string message, Exception innerException) : base(message, innerException)
+    {
+    }
+}

EnvelopeGenerator.ServiceHost/Extensions/DataRowExtensions.cs

@@ -0,0 +1,27 @@
+using System.Data;
+
+namespace EnvelopeGenerator.ServiceHost.Extensions;
+
+public static class DataRowExtensions
+{
+    public static T ItemEx<T>(this DataRow row, string columnName, T defaultValue)
+    {
+        if (!row.Table.Columns.Contains(columnName))
+        {
+            return defaultValue;
+        }
+
+        var value = row[columnName];
+        if (value is DBNull or null)
+        {
+            return defaultValue;
+        }
+
+        return (T)Convert.ChangeType(value, typeof(T));
+    }
+
+    public static string ItemEx(this DataRow row, string columnName, string defaultValue)
+    {
+        return row.ItemEx<string>(columnName, defaultValue);
+    }
+}

EnvelopeGenerator.ServiceHost/Extensions/DependencyInjection.cs

@@ -0,0 +1,38 @@
+using DigitalData.Modules.Database;
+using EnvelopeGenerator.ServiceHost.Jobs;
+using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
+using GdPicture14;
+using Microsoft.Extensions.Options;
+
+namespace EnvelopeGenerator.ServiceHost.Extensions;
+
+public static class DependencyInjection
+{
+    [Obsolete("Check obsoleted services")]
+    public static IServiceCollection AddFinalizeDocumentJob(this IServiceCollection services, IConfiguration configuration)
+    {
+        services.Configure<WorkerOptions>(configuration.GetSection(nameof(WorkerOptions)));
+        services.AddSingleton<FinalizeDocumentJob>();
+        services.AddScoped<ActionService>();
+        services.AddSingleton<TempFiles>();
+        services.AddScoped<PDFBurner>();
+        services.AddScoped<PDFMerger>();
+        services.AddScoped<ReportModel>();
+        services.AddSingleton<State>();
+        services.AddScoped<MSSQLServer>();
+
+        //TODO: Check lifetime of services. They might be singleton or scoped.
+        services.AddTransient<GdViewer>();
+        // Add LicenseManager
+        services.AddTransient(provider =>
+        {
+            var options = provider.GetRequiredService<IOptions<WorkerOptions>>().Value;
+            var licenseManager = new LicenseManager();
+            licenseManager.RegisterKEY(options.GdPictureLicenseKey);
+            return licenseManager;
+        });
+        services.AddTransient<AnnotationManager>();
+
+        return services;
+    }
+}

EnvelopeGenerator.ServiceHost/Extensions/LoggerExtensions.cs

@@ -0,0 +1,11 @@
+using EnvelopeGenerator.ServiceHost.Extensions;
+
+namespace EnvelopeGenerator.ServiceHost.Extensions;
+
+public static class LoggerExtensions
+{
+    public static void LogError(this ILogger logger, Exception exception)
+    {
+        logger.LogError(exception, "{message}", exception.Message);
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/ActionService.cs

@@ -0,0 +1,31 @@
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs;
+
+[Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
+public class ActionService
+{
+    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
+    public bool CreateReport(Envelope envelope)
+    {
+        throw new NotImplementedException();
+    }
+
+    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
+    public bool FinalizeEnvelope(Envelope envelope)
+    {
+        throw new NotImplementedException();
+    }
+
+    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
+    public bool CompleteEnvelope(Envelope envelope)
+    {
+        throw new NotImplementedException();
+    }
+
+    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
+    public bool CompleteEnvelope(Envelope envelope, Receiver receiver)
+    {
+        throw new NotImplementedException();
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/ConfigModel.cs

@@ -0,0 +1,34 @@
+using DigitalData.Modules.Database;
+using EnvelopeGenerator.ServiceHost.Extensions;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs;
+
+public class ConfigModel(MSSQLServer Database, ILogger Logger)
+{
+    public DbConfig LoadConfiguration()
+    {
+        try
+        {
+            const string sql = "SELECT TOP 1 * FROM TBSIG_CONFIG";
+            var table = Database.GetDatatable(sql);
+            var row = table.Rows[0];
+
+            return new DbConfig
+            {
+                DocumentPath = row.ItemEx("DOCUMENT_PATH", string.Empty),
+                DocumentPathOrigin = row.ItemEx("DOCUMENT_PATH", string.Empty),
+                ExportPath = row.ItemEx("EXPORT_PATH", string.Empty),
+                SendingProfile = row.ItemEx("SENDING_PROFILE", 0),
+                SignatureHost = row.ItemEx("SIGNATURE_HOST", string.Empty),
+                ExternalProgramName = row.ItemEx("EXTERNAL_PROGRAM_NAME", string.Empty),
+                Default_Tfa_Enabled = row.ItemEx("DEF_TFA_ENABLED", false),
+                Default_Tfa_WithPhone = row.ItemEx("DEF_TFA_WITH_PHONE", false)
+            };
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex);
+            return new DbConfig();
+        }
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/DbConfig.cs

@@ -0,0 +1,13 @@
+namespace EnvelopeGenerator.ServiceHost.Jobs;
+
+public class DbConfig
+{
+    public string ExternalProgramName { get; set; } = "signFLOW";
+    public string DocumentPathOrigin { get; set; } = string.Empty;
+    public string DocumentPath { get; set; } = string.Empty;
+    public string ExportPath { get; set; } = string.Empty;
+    public int SendingProfile { get; set; }
+    public string SignatureHost { get; set; } = string.Empty;
+    public bool Default_Tfa_Enabled { get; set; }
+    public bool Default_Tfa_WithPhone { get; set; }
+}

EnvelopeGenerator.ServiceHost/Jobs/EnvelopeModel.cs

@@ -0,0 +1,38 @@
+using DigitalData.Modules.Database;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.ServiceHost.Extensions;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs;
+
+public class EnvelopeModel(MSSQLServer Database, ILogger Logger)
+{
+    public Envelope? GetById(int envelopeId)
+    {
+        try
+        {
+            var sql = $"SELECT * FROM [dbo].[TBSIG_ENVELOPE] WHERE GUID = {envelopeId}";
+            var table = Database.GetDatatable(sql);
+            var row = table.Rows.Cast<System.Data.DataRow>().SingleOrDefault();
+            if (row is null)
+            {
+                return null;
+            }
+
+            return new Envelope
+            {
+                Id = row.ItemEx("GUID", 0),
+                Uuid = row.ItemEx("ENVELOPE_UUID", string.Empty),
+                FinalEmailToCreator = row.ItemEx("FINAL_EMAIL_TO_CREATOR", 0),
+                FinalEmailToReceivers = row.ItemEx("FINAL_EMAIL_TO_RECEIVERS", 0),
+                UserId = row.ItemEx("USER_ID", 0),
+                User = null!,
+                EnvelopeReceivers = new List<EnvelopeReceiver>()
+            };
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex);
+            return null;
+        }
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFBurner.cs

@@ -0,0 +1,430 @@
+using System.Collections.Immutable;
+using System.Drawing;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Infrastructure;
+using EnvelopeGenerator.PdfEditor;
+using EnvelopeGenerator.ServiceHost.Exceptions;
+using GdPicture14;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
+
+//TODO: check if licence manager is needed as a dependency to 
+/// <summary>
+/// 
+/// </summary>
+/// <param name="workerOptions"></param>
+/// <param name="context2"></param>
+/// <param name="logger2"></param>
+/// <param name="licenseManager"></param>
+/// <param name="annotationManager2"></param>
+public class PDFBurner(IOptions<WorkerOptions> workerOptions, EGDbContext context, ILogger<PDFBurner> logger, LicenseManager licenseManager, AnnotationManager manager)
+{
+    private readonly WorkerOptions.PDFBurnerOptions _options = workerOptions.Value.PdfBurner;
+    
+    public byte[] BurnAnnotsToPDF(byte[] sourceBuffer, List<string> instantJsonList, int envelopeId)
+    {
+        var envelope = context.Envelopes.FirstOrDefault(env => env.Id == envelopeId);
+        if (envelope is null)
+        {
+            throw new BurnAnnotationException($"Envelope with Id {envelopeId} not found.");
+        }
+
+        if (envelope.ReadOnly)
+        {
+            return sourceBuffer;
+        }
+
+        var elements = context.DocumentReceiverElements
+            .Where(sig => sig.Document.EnvelopeId == envelopeId)
+            .Include(sig => sig.Annotations)
+            .ToList();
+
+        return elements.Any()
+            ? BurnElementAnnotsToPDF(sourceBuffer, elements)
+            : BurnInstantJSONAnnotsToPDF(sourceBuffer, instantJsonList);
+    }
+
+    public byte[] BurnElementAnnotsToPDF(byte[] sourceBuffer, List<Signature> elements)
+    {
+        using (var doc = Pdf.FromMemory(sourceBuffer))
+        {
+            sourceBuffer = doc.Background(elements, 1.9500000000000002 * 0.93, 2.52 * 0.67).ExportStream().ToArray();
+
+            using var sourceStream = new MemoryStream(sourceBuffer);
+            var result = manager.InitFromStream(sourceStream);
+            if (result != GdPictureStatus.OK)
+            {
+                throw new BurnAnnotationException($"Could not open document for burning: [{result}]");
+            }
+
+            var margin = 0.2;
+            var inchFactor = 72d;
+
+            var keys = new[] { "position", "city", "date" };
+            var unitYOffsets = 0.2;
+            var yOffsetsOfFF = keys
+                .Select((k, i) => new { Key = k, Value = unitYOffsets * i + 1 })
+                .ToDictionary(x => x.Key, x => x.Value);
+
+            foreach (var element in elements)
+            {
+                var frameX = element.Left - 0.7 - margin;
+
+                var frame = element.Annotations.FirstOrDefault(a => a.Name == "frame");
+                var frameY = element.Top - 0.5 - margin;
+                var frameYShift = (frame?.Y ?? 0) - frameY * inchFactor;
+                var frameXShift = (frame?.X ?? 0) - frameX * inchFactor;
+
+                foreach (var annot in element.Annotations)
+                {
+                    var yOffsetOfFF = yOffsetsOfFF.TryGetValue(annot.Name, out var offset) ? offset : 0;
+                    var y = frameY + yOffsetOfFF;
+
+                    if (annot.Type == AnnotationType.FormField)
+                    {
+                        AddFormFieldValue(annot.X / inchFactor, y, annot.Width / inchFactor, annot.Height / inchFactor, element.Page, annot.Value);
+                    }
+                    else if (annot.Type == AnnotationType.Image)
+                    {
+                        AddImageAnnotation(
+                            annot.X / inchFactor,
+                            annot.Name == "signature" ? (annot.Y - frameYShift) / inchFactor : y,
+                            annot.Width / inchFactor,
+                            annot.Height / inchFactor,
+                            element.Page,
+                            annot.Value);
+                    }
+                    else if (annot.Type == AnnotationType.Ink)
+                    {
+                        AddInkAnnotation(element.Page, annot.Value);
+                    }
+                }
+            }
+
+            using var newStream = new MemoryStream();
+            result = manager.SaveDocumentToPDF(newStream);
+            if (result != GdPictureStatus.OK)
+            {
+                throw new BurnAnnotationException($"Could not save document to stream: [{result}]");
+            }
+
+            manager.Close();
+
+            return newStream.ToArray();
+        }
+    }
+
+    public byte[] BurnInstantJSONAnnotsToPDF(byte[] sourceBuffer, List<string> instantJsonList)
+    {
+        using var sourceStream = new MemoryStream(sourceBuffer);
+        var result = manager.InitFromStream(sourceStream);
+        if (result != GdPictureStatus.OK)
+        {
+            throw new BurnAnnotationException($"Could not open document for burning: [{result}]");
+        }
+
+        foreach (var json in instantJsonList)
+        {
+            try
+            {
+                AddInstantJSONAnnotationToPDF(json);
+            }
+            catch (Exception ex)
+            {
+                logger.LogWarning("Error in AddInstantJSONAnnotationToPDF - oJson: ");
+                logger.LogWarning(json);
+                throw new BurnAnnotationException("Adding Annotation failed", ex);
+            }
+        }
+
+        result = manager.BurnAnnotationsToPage(RemoveInitialAnnots: true, VectorMode: true);
+        if (result != GdPictureStatus.OK)
+        {
+            throw new BurnAnnotationException($"Could not burn annotations to file: [{result}]");
+        }
+
+        using var newStream = new MemoryStream();
+        result = manager.SaveDocumentToPDF(newStream);
+        if (result != GdPictureStatus.OK)
+        {
+            throw new BurnAnnotationException($"Could not save document to stream: [{result}]");
+        }
+
+        manager.Close();
+
+        return newStream.ToArray();
+    }
+
+    private void AddInstantJSONAnnotationToPDF(string instantJson)
+    {
+        var annotationData = JsonConvert.DeserializeObject<AnnotationData>(instantJson);
+        if (annotationData is null)
+        {
+            return;
+        }
+
+        annotationData.annotations.Reverse();
+
+        foreach (var annotation in annotationData.annotations)
+        {
+            logger.LogDebug("Adding AnnotationID: " + annotation.id);
+
+            switch (annotation.type)
+            {
+                case AnnotationType.Image:
+                    AddImageAnnotation(annotation, annotationData.attachments);
+                    break;
+                case AnnotationType.Ink:
+                    AddInkAnnotation(annotation);
+                    break;
+                case AnnotationType.Widget:
+                    var formFieldValue = annotationData.formFieldValues.FirstOrDefault(fv => fv.name == annotation.id);
+                    if (formFieldValue is not null && !_options.IgnoredLabels.Contains(formFieldValue.value))
+                    {
+                        AddFormFieldValue(annotation, formFieldValue);
+                    }
+                    break;
+            }
+        }
+    }
+
+    private void AddImageAnnotation(double x, double y, double width, double height, int page, string base64)
+    {
+        manager.SelectPage(page);
+        manager.AddEmbeddedImageAnnotFromBase64(base64, (float) x, (float) y, (float) width, (float) height);
+    }
+
+    private void AddImageAnnotation(Annotation annotation, Dictionary<string, Attachment> attachments)
+    {
+        var attachment = attachments.Where(a => a.Key == annotation.imageAttachmentId).SingleOrDefault();
+
+        var bounds = annotation.bbox.Select(ToInches).ToList();
+
+        var x = bounds[0];
+        var y = bounds[1];
+        var width = bounds[2];
+        var height = bounds[3];
+
+        manager.SelectPage(annotation.pageIndex + 1);
+        manager.AddEmbeddedImageAnnotFromBase64(attachment.Value.binary, (float) x, (float) y, (float) width, (float) height);
+    }
+
+    private void AddInkAnnotation(int page, string value)
+    {
+        var ink = JsonConvert.DeserializeObject<Ink>(value);
+        if (ink is null)
+        {
+            return;
+        }
+
+        var segments = ink.lines.points;
+        var color = ColorTranslator.FromHtml(ink.strokeColor);
+        manager.SelectPage(page);
+
+        foreach (var segment in segments)
+        {
+            var points = segment.Select(ToPointF).ToArray();
+            manager.AddFreeHandAnnot(color, points);
+        }
+    }
+
+    private void AddInkAnnotation(Annotation annotation)
+    {
+        var segments = annotation.lines.points;
+        var color = ColorTranslator.FromHtml(annotation.strokeColor);
+        manager.SelectPage(annotation.pageIndex + 1);
+
+        foreach (var segment in segments)
+        {
+            var points = segment.Select(ToPointF).ToArray();
+            manager.AddFreeHandAnnot(color, points);
+        }
+    }
+
+    private void AddFormFieldValue(double x, double y, double width, double height, int page, string value)
+    {
+        manager.SelectPage(page);
+
+        var annot = manager.AddTextAnnot((float) x, (float) y, (float) width, (float) height, value);
+        annot.FontName = _options.FontName;
+        annot.FontSize = _options.FontSize;
+        annot.FontStyle = _options.FontStyle;
+        manager.SaveAnnotationsToPage();
+    }
+
+    private void AddFormFieldValue(Annotation annotation, FormFieldValue formFieldValue)
+    {
+        var ffIndex = EGName.Index[annotation.egName];
+
+        var bounds = annotation.bbox.Select(ToInches).ToList();
+
+        var x = bounds[0];
+        var y = bounds[1] + _options.YOffset * ffIndex + _options.TopMargin;
+        var width = bounds[2];
+        var height = bounds[3];
+
+        manager.SelectPage(annotation.pageIndex + 1);
+        var annot = manager.AddTextAnnot((float) x, (float) y, (float) width, (float) height, formFieldValue.value);
+        annot.FontName = _options.FontName;
+        annot.FontSize = _options.FontSize;
+        annot.FontStyle = _options.FontStyle;
+        manager.SaveAnnotationsToPage();
+    }
+
+    private static PointF ToPointF(List<float> points)
+    {
+        var convertedPoints = points.Select(ToInches).ToList();
+        return new PointF(convertedPoints[0], convertedPoints[1]);
+    }
+
+    private static double ToInches(double value) => value / 72;
+
+    private static float ToInches(float value) => value / 72;
+
+    internal static class AnnotationType
+    {
+        public const string Image = "pspdfkit/image";
+        public const string Ink = "pspdfkit/ink";
+        public const string Widget = "pspdfkit/widget";
+        public const string FormField = "pspdfkit/form-field-value";
+    }
+
+    internal class AnnotationData
+    {
+        public List<Annotation> annotations { get; set; } = new();
+
+        public IEnumerable<List<Annotation>> AnnotationsByReceiver => annotations
+            .Where(annot => annot.hasStructuredID)
+            .GroupBy(a => a.receiverId)
+            .Select(g => g.ToList());
+
+        public IEnumerable<List<Annotation>> UnstructuredAnnotations => annotations
+            .Where(annot => !annot.hasStructuredID)
+            .GroupBy(a => a.receiverId)
+            .Select(g => g.ToList());
+
+        public Dictionary<string, Attachment> attachments { get; set; } = new();
+        public List<FormFieldValue> formFieldValues { get; set; } = new();
+    }
+
+    internal class Annotation
+    {
+        private string? _id;
+
+        public int envelopeId;
+        public int receiverId;
+        public int index;
+        public string egName = EGName.NoName;
+        public bool hasStructuredID;
+
+        public bool isLabel
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(egName))
+                {
+                    return false;
+                }
+
+                var parts = egName.Split('_');
+                return parts.Length > 1 && parts[1] == "label";
+            }
+        }
+
+        public string id
+        {
+            get => _id ?? string.Empty;
+            set
+            {
+                _id = value;
+
+                if (string.IsNullOrWhiteSpace(_id))
+                {
+                    throw new BurnAnnotationException("The identifier of annotation is null or empty.");
+                }
+
+                var parts = value.Split('#');
+
+                if (parts.Length != 4)
+                {
+                    return;
+                }
+
+                if (!int.TryParse(parts[0], out envelopeId))
+                {
+                    throw new BurnAnnotationException($"The envelope ID of annotation is not integer. Id: {_id}");
+                }
+
+                if (!int.TryParse(parts[1], out receiverId))
+                {
+                    throw new BurnAnnotationException($"The receiver ID of annotation is not integer. Id: {_id}");
+                }
+
+                if (!int.TryParse(parts[2], out index))
+                {
+                    throw new BurnAnnotationException($"The index of annotation is not integer. Id: {_id}");
+                }
+
+                egName = parts[3];
+
+                hasStructuredID = true;
+            }
+        }
+
+        public List<double> bbox { get; set; } = new();
+
+        public string type { get; set; } = string.Empty;
+
+        public bool isSignature { get; set; }
+
+        public string imageAttachmentId { get; set; } = string.Empty;
+
+        public Lines lines { get; set; } = new();
+
+        public int pageIndex { get; set; }
+
+        public string strokeColor { get; set; } = string.Empty;
+    }
+
+    internal class Ink
+    {
+        public Lines lines { get; set; } = new();
+
+        public string strokeColor { get; set; } = string.Empty;
+    }
+
+    public class EGName
+    {
+        public static readonly string NoName = Guid.NewGuid().ToString();
+        public static readonly string Seal = "signature";
+
+        public static readonly ImmutableDictionary<string, int> Index = new Dictionary<string, int>
+        {
+            { NoName, 0 },
+            { Seal, 0 },
+            { "position", 1 },
+            { "city", 2 },
+            { "date", 3 }
+        }.ToImmutableDictionary();
+    }
+
+    internal class Lines
+    {
+        public List<List<List<float>>> points { get; set; } = new();
+    }
+
+    internal class Attachment
+    {
+        public string binary { get; set; } = string.Empty;
+        public string contentType { get; set; } = string.Empty;
+    }
+
+    internal class FormFieldValue
+    {
+        public string name { get; set; } = string.Empty;
+        public string value { get; set; } = string.Empty;
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFMerger.cs

@@ -0,0 +1,61 @@
+using EnvelopeGenerator.ServiceHost.Exceptions;
+using GdPicture14;
+using Microsoft.Extensions.Options;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
+
+public class PDFMerger
+{
+    private readonly AnnotationManager _manager;
+    private readonly LicenseManager _licenseManager;
+
+    private const bool AllowRasterization = true;
+    private const bool AllowVectorization = true;
+
+    private readonly PdfConversionConformance _pdfaConformanceLevel = PdfConversionConformance.PDF_A_1b;
+
+    public PDFMerger(LicenseManager licenseManager, AnnotationManager annotationManager)
+    {
+        _licenseManager = licenseManager;
+        _manager = annotationManager;
+    }
+
+    public byte[] MergeDocuments(byte[] document, byte[] report)
+    {
+        using var documentStream = new MemoryStream(document);
+        using var reportStream = new MemoryStream(report);
+        using var finalStream = new MemoryStream();
+        using var documentPdf = new GdPicturePDF();
+        using var reportPdf = new GdPicturePDF();
+
+        documentPdf.LoadFromStream(documentStream, true);
+        var status = documentPdf.GetStat();
+        if (status != GdPictureStatus.OK)
+        {
+            throw new MergeDocumentException($"Document could not be loaded: {status}");
+        }
+
+        reportPdf.LoadFromStream(reportStream, true);
+        status = reportPdf.GetStat();
+        if (status != GdPictureStatus.OK)
+        {
+            throw new MergeDocumentException($"Report could not be loaded: {status}");
+        }
+
+        var mergedPdf = documentPdf.Merge2Documents(documentPdf, reportPdf);
+        status = mergedPdf.GetStat();
+        if (status != GdPictureStatus.OK)
+        {
+            throw new MergeDocumentException($"Documents could not be merged: {status}");
+        }
+
+        mergedPdf.ConvertToPDFA(finalStream, _pdfaConformanceLevel, AllowVectorization, AllowRasterization);
+        status = documentPdf.GetStat();
+        if (status != GdPictureStatus.OK)
+        {
+            throw new MergeDocumentException($"Document could not be converted to PDF/A: {status}");
+        }
+
+        return finalStream.ToArray();
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportCreator.cs

@@ -0,0 +1,102 @@
+using System.Data;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.ServiceHost.Exceptions;
+using EnvelopeGenerator.ServiceHost.Extensions;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
+
+[Obsolete("Instead of ReportModel create and use EnvelopeReport mediator queries")]
+public class ReportCreator(ReportModel ReportModel, ILogger<ReportCreator> Logger)
+{
+    [Obsolete("Solve the spaghetti...")]
+    private Envelope? _envelope;
+
+    [Obsolete("Instead of ReportModel create and use EnvelopeReport mediator queries and solve this spaghetti...")]
+    public byte[] CreateReport(Envelope envelope)
+    {
+        try
+        {
+            Logger.LogDebug("Loading report data..");
+            var table = ReportModel.List(envelope.Id);
+            var items = GetReportSource(table);
+
+            _envelope = envelope;
+
+            if (items.Count == 0)
+            {
+                throw new CreateReportException("No report data found!");
+            }
+
+            Logger.LogDebug("Creating report with [{count}] items..", items.Count);
+            var buffer = DoCreateReport(items);
+            Logger.LogDebug("Report created!");
+
+            return buffer;
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex);
+            throw new CreateReportException("Could not prepare report data!", ex);
+        }
+    }
+
+    private List<ReportItem> GetReportSource(DataTable dataTable)
+    {
+        Logger.LogDebug("Preparing report data");
+        return dataTable.Rows
+            .Cast<DataRow>()
+            .Select(ToReportItem)
+            .OrderByDescending(r => r.ItemDate)
+            .ToList();
+    }
+
+    private byte[] DoCreateReport(List<ReportItem> reportItems)
+    {
+        var items = reportItems.Select(MergeEnvelope).ToList();
+        var source = new ReportSource { Items = items };
+        var report = new rptEnvelopeHistory { DataSource = source, DataMember = "Items" };
+
+        Logger.LogDebug("Creating report in memory..");
+        report.CreateDocument();
+
+        Logger.LogDebug("Exporting report to stream..");
+        using var stream = new MemoryStream();
+        report.ExportToPdf(stream);
+
+        Logger.LogDebug("Writing report to buffer..");
+        return stream.ToArray();
+    }
+
+    [Obsolete("Solve this spaghetti...")]
+    private ReportItem MergeEnvelope(ReportItem item)
+    {
+        if (item.Envelope is null)
+        {
+            item.Envelope = _envelope;
+        }
+
+        return item;
+    }
+
+    private ReportItem ToReportItem(DataRow row)
+    {
+        try
+        {
+            return new ReportItem
+            {
+                EnvelopeId = row.ItemEx("ENVELOPE_ID", 0),
+                EnvelopeTitle = row.ItemEx("HEAD_TITLE", string.Empty),
+                EnvelopeSubject = row.ItemEx("HEAD_SUBJECT", string.Empty),
+                ItemDate = row.ItemEx("POS_WHEN", DateTime.MinValue),
+                ItemStatus = (EnvelopeStatus)row.ItemEx("POS_STATUS", 0),
+                ItemUserReference = row.ItemEx("POS_WHO", string.Empty)
+            };
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex);
+            throw new CreateReportException("Could not read data from database!", ex);
+        }
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportItem.cs

@@ -0,0 +1,19 @@
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
+
+public class ReportItem
+{
+    public Envelope? Envelope { get; set; }
+    public int EnvelopeId { get; set; }
+    public string EnvelopeTitle { get; set; } = string.Empty;
+    public string EnvelopeSubject { get; set; } = string.Empty;
+
+    public EnvelopeStatus ItemStatus { get; set; }
+
+    public string ItemStatusTranslated => ItemStatus.ToString();
+
+    public string ItemUserReference { get; set; } = string.Empty;
+    public DateTime ItemDate { get; set; }
+}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportSource.cs

@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
+
+public class ReportSource
+{
+    public List<ReportItem> Items { get; set; } = new();
+}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/rptEnvelopeHistory.cs

@@ -0,0 +1,18 @@
+using System.IO;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
+
+public class rptEnvelopeHistory
+{
+    public object? DataSource { get; set; }
+    public string? DataMember { get; set; }
+
+    public void CreateDocument()
+    {
+    }
+
+    public void ExportToPdf(Stream stream)
+    {
+        stream.Write(Array.Empty<byte>(), 0, 0);
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocumentJob.cs

@@ -0,0 +1,360 @@
+using System.Data;
+using DigitalData.Modules.Database;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.ServiceHost.Exceptions;
+using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
+using GdPicture14;
+using Microsoft.Data.SqlClient;
+using Microsoft.Extensions.Options;
+using EnvelopeGenerator.ServiceHost.Extensions;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs;
+
+[Obsolete("ActionService is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
+public class FinalizeDocumentJob(IOptions<WorkerOptions> options, IConfiguration config, ILogger<FinalizeDocumentJob> logger, TempFiles tempFiles, ActionService actionService, PDFBurner pdfBurner, PDFMerger pdfMerger, ReportCreator reportCreator, ConfigModel _configModel, EnvelopeModel _envelopeModel, ReportModel _reportModel, MSSQLServer _database, GdViewer? _gdViewer, LicenseManager licenseManager)
+{
+    private readonly WorkerOptions _options = options.Value;
+
+    private DbConfig? _config;
+    
+    private const int CompleteWaitTime = 1;
+    private string _parentFolderUid = string.Empty;
+
+    private sealed class EnvelopeData
+    {
+        public int EnvelopeId { get; set; }
+        public string EnvelopeUuid { get; set; } = string.Empty;
+        public string DocumentPath { get; set; } = string.Empty;
+        public List<string> AnnotationData { get; set; } = new();
+        public byte[]? DocAsByte { get; set; }
+    }
+
+    public Task ExecuteAsync(CancellationToken cancellationToken = default)
+    {
+        var gdPictureKey = _options.GdPictureLicenseKey;
+        tempFiles.Create();
+        var jobId = typeof(FinalizeDocumentJob).FullName;
+        logger.LogDebug("Starting job {jobId}", jobId);
+
+        try
+        {
+            logger.LogDebug("Loading Configuration..");
+            _config = _configModel?.LoadConfiguration() ?? throw new InvalidOperationException("Configuration could not be loaded because there is no record");
+
+            logger.LogDebug("DocumentPath: [{documentPath}]", _config.DocumentPath);
+            logger.LogDebug("ExportPath: [{exportPath}]", _config.ExportPath);
+
+            var completeStatus = EnvelopeStatus.EnvelopeCompletelySigned;
+            var sql = $"SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = {completeStatus} AND DATEDIFF(minute, CHANGED_WHEN, GETDATE()) >= {CompleteWaitTime} ORDER BY GUID";
+            var table = _database.GetDatatable(sql);
+
+            var envelopeIds = table.Rows.Cast<DataRow>()
+                .Select(r => r.Field<int>("GUID"))
+                .ToList();
+
+            if (envelopeIds.Count > 0)
+            {
+                logger.LogInformation("Found [{count}] completed envelopes.", envelopeIds.Count);
+            }
+
+            var total = envelopeIds.Count;
+            var current = 1;
+
+            foreach (var id in envelopeIds)
+            {
+                logger.LogInformation("Finalizing Envelope [{id}] ({current}/{total})", id, current, total);
+                try
+                {
+                    var envelope = _envelopeModel?.GetById(id);
+                    if (envelope is null)
+                    {
+                        logger.LogWarning("Envelope could not be loaded for Id [{id}]!", id);
+                        throw new ArgumentNullException(nameof(EnvelopeData));
+                    }
+
+                    logger.LogDebug("Loading Envelope Data..");
+                    var envelopeData = GetEnvelopeData(id);
+
+                    if (envelopeData is null)
+                    {
+                        logger.LogWarning("EnvelopeData could not be loaded for Id [{id}]!", id);
+                        throw new ArgumentNullException(nameof(EnvelopeData));
+                    }
+
+                    logger.LogDebug("Burning Annotations to pdf ...");
+                    var burnedDocument = BurnAnnotationsToPdf(envelopeData);
+                    if (burnedDocument is null)
+                    {
+                        logger.LogWarning("Document could not be finalized!");
+                        throw new ApplicationException("Document could not be finalized");
+                    }
+
+                    if (actionService?.CreateReport(envelope) == false)
+                    {
+                        logger.LogWarning("Document Report could not be created!");
+                        throw new ApplicationException("Document Report could not be created");
+                    }
+
+                    logger.LogDebug("Creating report..");
+                    var report = reportCreator!.CreateReport(envelope);
+                    logger.LogDebug("Report created!");
+
+                    logger.LogDebug("Merging documents ...");
+                    var mergedDocument = pdfMerger!.MergeDocuments(burnedDocument, report);
+                    logger.LogDebug("Documents merged!");
+
+                    var outputDirectoryPath = Path.Combine(_config.ExportPath, _parentFolderUid);
+                    logger.LogDebug("oOutputDirectoryPath is {outputDirectoryPath}", outputDirectoryPath);
+                    if (!Directory.Exists(outputDirectoryPath))
+                    {
+                        logger.LogDebug("Directory not existing. Creating ... ");
+                        Directory.CreateDirectory(outputDirectoryPath);
+                    }
+
+                    var outputFilePath = Path.Combine(outputDirectoryPath, $"{envelope.Uuid}.pdf");
+                    logger.LogDebug("Writing finalized Pdf to disk..");
+                    logger.LogInformation("Output path is [{outputFilePath}]", outputFilePath);
+
+                    try
+                    {
+                        File.WriteAllBytes(outputFilePath, mergedDocument);
+                    }
+                    catch (Exception ex)
+                    {
+                        logger.LogWarning("Could not export final document to disk!");
+                        throw new ExportDocumentException("Could not export final document to disk!", ex);
+                    }
+
+                    logger.LogDebug("Writing EB-bytes to database...");
+                    UpdateFileDb(outputFilePath, envelope.Id);
+
+                    if (!SendFinalEmails(envelope))
+                    {
+                        throw new ApplicationException("Final emails could not be sent!");
+                    }
+
+                    logger.LogInformation("Report-mails successfully sent!");
+
+                    logger.LogDebug("Setting envelope status..");
+                    if (actionService?.FinalizeEnvelope(envelope) == false)
+                    {
+                        logger.LogWarning("Envelope could not be finalized!");
+                        throw new ApplicationException("Envelope could not be finalized");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    logger.LogError(ex);
+                    logger.LogWarning(ex, "Unhandled exception while working envelope [{id}]", id);
+                }
+
+                current += 1;
+                logger.LogInformation("Envelope [{id}] finalized!", id);
+            }
+
+            logger.LogDebug("Completed job {jobId} successfully!", jobId);
+        }
+        catch (MergeDocumentException ex)
+        {
+            logger.LogWarning("Certificate Document job failed at step: Merging documents!");
+            logger.LogError(ex);
+        }
+        catch (ExportDocumentException ex)
+        {
+            logger.LogWarning("Certificate Document job failed at step: Exporting document!");
+            logger.LogError(ex);
+        }
+        catch (Exception ex)
+        {
+            logger.LogWarning("Certificate Document job failed!");
+            logger.LogError(ex);
+        }
+        finally
+        {
+            logger.LogDebug("Job execution for [{jobId}] ended", jobId);
+        }
+
+        return Task.FromResult(true);
+    }
+
+    private void UpdateFileDb(string filePath, long envelopeId)
+    {
+        try
+        {
+            var imageData = ReadFile(filePath);
+            if (imageData is null)
+            {
+                return;
+            }
+
+            var query = $"UPDATE TBSIG_ENVELOPE SET DOC_RESULT = @ImageData WHERE GUID = {envelopeId}";
+            using var command = new SqlCommand(query, _database!.GetConnection);
+            command.Parameters.Add(new SqlParameter("@ImageData", imageData));
+            command.ExecuteNonQuery();
+        }
+        catch (Exception ex)
+        {
+            logger?.LogError(ex);
+        }
+    }
+
+    private static byte[]? ReadFile(string path)
+    {
+        var fileInfo = new FileInfo(path);
+        var numBytes = fileInfo.Length;
+        using var stream = new FileStream(path, FileMode.Open, FileAccess.Read);
+        using var reader = new BinaryReader(stream);
+        return reader.ReadBytes((int)numBytes);
+    }
+
+    private bool SendFinalEmails(Envelope envelope)
+    {
+        var mailToCreator = (FinalEmailType)(envelope.FinalEmailToCreator ?? 0);
+        var mailToReceivers = (FinalEmailType)(envelope.FinalEmailToReceivers ?? 0);
+
+        if (mailToCreator != FinalEmailType.No)
+        {
+            logger?.LogDebug("Sending email to creator ...");
+            SendFinalEmailToCreator(envelope, mailToCreator);
+        }
+        else
+        {
+            logger?.LogWarning("No SendFinalEmailToCreator - oMailToCreator [{0}] <> [{1}] ", mailToCreator, FinalEmailType.No);
+        }
+
+        if (mailToReceivers != FinalEmailType.No)
+        {
+            logger?.LogDebug("Sending emails to receivers..");
+            SendFinalEmailToReceivers(envelope, mailToReceivers);
+        }
+        else
+        {
+            logger?.LogWarning("No SendFinalEmailToReceivers - oMailToCreator [{0}] <> [{1}] ", mailToReceivers, FinalEmailType.No);
+        }
+
+        return true;
+    }
+
+    private bool SendFinalEmailToCreator(Envelope envelope, FinalEmailType mailToCreator)
+    {
+        var includeAttachment = SendFinalEmailWithAttachment(mailToCreator);
+        logger?.LogDebug("Attachment included: [{0}]", includeAttachment);
+
+        if (actionService?.CompleteEnvelope(envelope) == false)
+        {
+            logger?.LogError(new Exception("CompleteEnvelope failed"), "Envelope could not be completed for receiver [{0}]", envelope.User?.Email);
+            return false;
+        }
+
+        return true;
+    }
+
+    private bool SendFinalEmailToReceivers(Envelope envelope, FinalEmailType mailToReceivers)
+    {
+        var includeAttachment = SendFinalEmailWithAttachment(mailToReceivers);
+        logger?.LogDebug("Attachment included: [{0}]", includeAttachment);
+
+        foreach (var receiver in envelope.EnvelopeReceivers ?? Enumerable.Empty<EnvelopeReceiver>())
+        {
+            if (actionService?.CompleteEnvelope(envelope, receiver.Receiver) == false)
+            {
+                logger?.LogError(new Exception("CompleteEnvelope failed"), "Envelope could not be completed for receiver [{0}]", receiver.Receiver?.EmailAddress);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private static bool SendFinalEmailWithAttachment(FinalEmailType type)
+    {
+        return type == FinalEmailType.YesWithAttachment;
+    }
+
+    private byte[] BurnAnnotationsToPdf(EnvelopeData envelopeData)
+    {
+        var envelopeId = envelopeData.EnvelopeId;
+
+        logger?.LogInformation("Burning [{0}] signatures", envelopeData.AnnotationData.Count);
+        var annotations = envelopeData.AnnotationData;
+        var inputPath = string.Empty;
+        if (envelopeData.DocAsByte is null)
+        {
+            inputPath = envelopeData.DocumentPath;
+            logger?.LogInformation("Input path: [{0}]", inputPath);
+        }
+        else
+        {
+            logger?.LogDebug("we got bytes..");
+            inputPath = _config!.DocumentPathOrigin;
+            logger?.LogDebug("oInputPath: {0}", _config.DocumentPathOrigin);
+        }
+
+        if (envelopeData.DocAsByte is null)
+        {
+            var directorySource = Path.GetDirectoryName(inputPath) ?? string.Empty;
+            var split = directorySource.Split('\\');
+            _parentFolderUid = split[^1];
+        }
+        else
+        {
+            _parentFolderUid = envelopeData.EnvelopeUuid;
+        }
+
+        logger?.LogInformation("ParentFolderUID: [{0}]", _parentFolderUid);
+        byte[] inputDocumentBuffer;
+        if (envelopeData.DocAsByte is not null)
+        {
+            inputDocumentBuffer = envelopeData.DocAsByte;
+        }
+        else
+        {
+            try
+            {
+                inputDocumentBuffer = File.ReadAllBytes(inputPath);
+            }
+            catch (Exception ex)
+            {
+                throw new BurnAnnotationException("Source document could not be read from disk!", ex);
+            }
+        }
+
+        return pdfBurner!.BurnAnnotsToPDF(inputDocumentBuffer, annotations, envelopeId);
+    }
+
+    private EnvelopeData? GetEnvelopeData(int envelopeId)
+    {
+        var sql = $"SELECT T.GUID, T.ENVELOPE_UUID, T.ENVELOPE_TYPE, T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T\n                JOIN TBSIG_ENVELOPE_DOCUMENT T2 ON T.GUID = T2.ENVELOPE_ID\n                WHERE T.GUID = {envelopeId}";
+        var table = _database!.GetDatatable(sql);
+        var row = table.Rows.Cast<DataRow>().SingleOrDefault();
+        if (row is null)
+        {
+            return null;
+        }
+
+        var annotationData = GetAnnotationData(envelopeId);
+        var data = new EnvelopeData
+        {
+            EnvelopeId = envelopeId,
+            DocumentPath = row.ItemEx("FILEPATH", string.Empty),
+            AnnotationData = annotationData,
+            DocAsByte = row.Field<byte[]?>("BYTE_DATA"),
+            EnvelopeUuid = row.ItemEx("ENVELOPE_UUID", string.Empty)
+        };
+
+        logger?.LogDebug("Document path: [{0}]", data.DocumentPath);
+
+        return data;
+    }
+
+    private List<string> GetAnnotationData(int envelopeId)
+    {
+        var sql = $"SELECT VALUE FROM TBSIG_DOCUMENT_STATUS WHERE ENVELOPE_ID = {envelopeId}";
+        var table = _database!.GetDatatable(sql);
+
+        return table.Rows.Cast<DataRow>()
+            .Select(r => r.ItemEx("VALUE", string.Empty))
+            .ToList();
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/Infrastructure/Database.cs

@@ -0,0 +1,60 @@
+using System.Data;
+using Microsoft.Data.SqlClient;
+
+namespace DigitalData.Modules.Database;
+
+public class MSSQLServer(IConfiguration configuration)
+{
+    private readonly string _connectionString = configuration.GetConnectionString("Default") 
+        ?? throw new InvalidOperationException("Connection string 'Default' not found.");
+
+    public static string DecryptConnectionString(string connectionString) => connectionString;
+
+    public SqlConnection GetConnection
+    {
+        get
+        {
+            var connection = new SqlConnection(_connectionString);
+            if (connection.State != ConnectionState.Open)
+            {
+                connection.Open();
+            }
+
+            return connection;
+        }
+    }
+
+    public DataTable GetDatatable(string sql)
+    {
+        using var connection = new SqlConnection(_connectionString);
+        using var command = new SqlCommand(sql, connection);
+        using var adapter = new SqlDataAdapter(command);
+        var table = new DataTable();
+        adapter.Fill(table);
+        return table;
+    }
+
+    public object? GetScalarValue(string sql)
+    {
+        using var connection = new SqlConnection(_connectionString);
+        using var command = new SqlCommand(sql, connection);
+        connection.Open();
+        return command.ExecuteScalar();
+    }
+
+    public bool ExecuteNonQuery(string sql)
+    {
+        using var connection = new SqlConnection(_connectionString);
+        using var command = new SqlCommand(sql, connection);
+        connection.Open();
+        return command.ExecuteNonQuery() > 0;
+    }
+
+    public bool ExecuteNonQuery(SqlCommand command)
+    {
+        using var connection = new SqlConnection(_connectionString);
+        command.Connection = connection;
+        connection.Open();
+        return command.ExecuteNonQuery() > 0;
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/ReportModel.cs

@@ -0,0 +1,15 @@
+using DigitalData.Modules.Database;
+using System.Data;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs;
+
+[Obsolete("Create and use EnvelopeReport mediator queries")]
+public class ReportModel(MSSQLServer Database)
+{
+    [Obsolete("Create and use EnvelopeReport mediator queries")]
+    public DataTable List(int envelopeId)
+    {
+        var sql = $"SELECT * FROM VWSIG_ENVELOPE_REPORT WHERE ENVELOPE_ID = {envelopeId}";
+        return Database.GetDatatable(sql);
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/State.cs

@@ -0,0 +1,14 @@
+using DigitalData.Modules.Database;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs;
+
+[Obsolete("Use DbContext")]
+public class State
+{
+    public int UserId { get; set; }
+    public FormUser? User { get; set; }
+    public Config? Config { get; set; }
+    public DbConfig? DbConfig { get; set; }
+    public MSSQLServer? Database { get; set; }
+}

EnvelopeGenerator.ServiceHost/Jobs/TempFiles.cs

@@ -0,0 +1,73 @@
+using EnvelopeGenerator.ServiceHost.Extensions;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs;
+
+public class TempFiles
+{
+    public string TempPath { get; }
+
+    private readonly ILogger<TempFiles> _logger;
+
+    public TempFiles(ILogger<TempFiles> logger)
+    {
+        _logger = logger;
+        var tempDirectoryPath = Path.GetTempPath();
+        TempPath = Path.Combine(tempDirectoryPath, "EnvelopeGenerator");
+    }
+
+    public bool Create()
+    {
+        try
+        {
+            if (!Directory.Exists(TempPath))
+            {
+                Directory.CreateDirectory(TempPath);
+            }
+            else
+            {
+                CleanUpFiles();
+            }
+
+            return true;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex);
+            return false;
+        }
+    }
+
+    private bool CleanUpFiles()
+    {
+        try
+        {
+            foreach (var fileItem in Directory.GetFiles(TempPath))
+            {
+                _logger.LogDebug("Deleting tempPath-file: {fileItem} ...", fileItem);
+                File.Delete(fileItem);
+            }
+
+            return true;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex);
+            return false;
+        }
+    }
+
+    public bool CleanUp()
+    {
+        try
+        {
+            _logger.LogDebug("Deleting tempPath-Data: {TempPath} ...", TempPath);
+            Directory.Delete(TempPath, true);
+            return true;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex);
+            return false;
+        }
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/WorkerOptions.cs

@@ -0,0 +1,29 @@
+using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
+using System.Drawing;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs;
+
+public class WorkerOptions
+{
+    public string GdPictureLicenseKey { get; set; } = null!;
+
+    [Obsolete("Use ILogger.")]
+    public bool Debug { get; set; }
+
+    public PDFBurnerOptions PdfBurner { get; set; } = new();
+
+    public record PDFBurnerOptions
+    {
+        public List<string> IgnoredLabels { get; set; } = ["Date", "Datum", "ZIP", "PLZ", "Place", "Ort", "Position", "Stellung"];
+
+        public double TopMargin { get; set; } = 0.1;
+
+        public double YOffset { get; set; } = -0.3;
+
+        public string FontName { get; set; } = "Arial";
+
+        public int FontSize { get; set; } = 8;
+
+        public FontStyle FontStyle { get; set; } = FontStyle.Italic;
+    }
+}

EnvelopeGenerator.ServiceHost/Program.cs

@@ -0,0 +1,31 @@
+using EnvelopeGenerator.ServiceHost;
+using EnvelopeGenerator.ServiceHost.Extensions;
+
+var builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+
+builder.Services.AddControllers();
+builder.Services.AddFinalizeDocumentJob(builder.Configuration);
+builder.Services.AddHostedService<Worker>();
+
+// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
+
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseSwagger();
+    app.UseSwaggerUI();
+}
+
+app.UseHttpsRedirection();
+
+app.UseAuthorization();
+
+app.MapControllers();
+
+app.Run();

EnvelopeGenerator.ServiceHost/Properties/launchSettings.json

@@ -0,0 +1,41 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:27420",
+      "sslPort": 44372
+    }
+  },
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5088",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "https://localhost:7234;http://localhost:5088",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

EnvelopeGenerator.ServiceHost/Worker.cs

@@ -0,0 +1,31 @@
+using EnvelopeGenerator.ServiceHost.Jobs;
+
+namespace EnvelopeGenerator.ServiceHost;
+
+public class Worker : BackgroundService
+{
+    private readonly ILogger<Worker> _logger;
+    private readonly int _delayMilliseconds;
+    private readonly FinalizeDocumentJob _finalizeDocumentJob;
+
+    public Worker(ILogger<Worker> logger, IConfiguration configuration, FinalizeDocumentJob finalizeDocumentJob)
+    {
+        _logger = logger;
+        _delayMilliseconds = Math.Max(1, configuration.GetValue("Worker:DelayMilliseconds", 1000));
+        _finalizeDocumentJob = finalizeDocumentJob;
+    }
+
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        while (!stoppingToken.IsCancellationRequested)
+        {
+            if (_logger.IsEnabled(LogLevel.Information))
+            {
+                _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
+            }
+
+            await _finalizeDocumentJob.ExecuteAsync(stoppingToken);
+            await Task.Delay(_delayMilliseconds, stoppingToken);
+        }
+    }
+}

EnvelopeGenerator.ServiceHost/appsettings.json

@@ -4,5 +4,9 @@
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
-  }
+  },
+  "Worker": {
+    "DelayMilliseconds": 1000
+  },
+  "AllowedHosts": "*"
 }

EnvelopeGenerator.Tests/Application/Fake.cs

@@ -215,7 +215,7 @@ public static class Extensions
         Title = faker.Lorem.Paragraph(faker.Random.Number(1, 2)),
         Message = faker.Lorem.Paragraph(faker.Random.Number(2, 5)),
         TfaEnabled = tfaEnabled,
-        AddedWhen = DateTime.Now,
+        AddedWhen = DateTime.UtcNow,
         CertificationType = (int)CertificationType.AdvancedElectronicSignature,
         UseAccessCode = false,
         ContractType = (int)ContractType.Contract,
@@ -273,9 +273,9 @@ public static class Extensions
         EnvelopeId = envelopeId,
         ReceiverId = receiverId,
         Status = ReceiverStatus.Unsigned,
-        AddedWhen = DateTime.Now,
+        AddedWhen = DateTime.UtcNow,
         AccessCode = faker.Random.Number(1000, 9999).ToString(),
-        ChangedWhen = DateTime.Now,
+        ChangedWhen = DateTime.UtcNow,
         CompanyName = faker.Company.CompanyName(),
         JobTitle = faker.Name.JobTitle(),
         Name = faker.Name.FullName(),

EnvelopeGenerator.Web/Controllers/AnnotationController.cs

@@ -6,7 +6,6 @@ using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 using EnvelopeGenerator.Application.Histories.Queries;
 using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Domain.Interfaces;
 using EnvelopeGenerator.Web.Extensions;
 using MediatR;
 using Microsoft.AspNetCore.Authentication;
@@ -66,7 +65,7 @@ public class AnnotationController : ControllerBase
         // Again check if receiver has already signed
         if (await _mediator.IsSignedAsync(uuid, signature, cancel))
             return Problem(statusCode: 409);
-        else if (er.Envelope.IsReadAndSign() && await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
+        else if (await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
             return Problem(statusCode: 423);
 
         var docSignedNotification = await _mediator
@@ -81,7 +80,6 @@ public class AnnotationController : ControllerBase
         return Ok();
     }
     
-    //TODO: add logic to check if it is already rejected or signed
     [Authorize(Roles = Role.ReceiverFull)]
     [HttpPost("reject")]
     [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
@@ -102,7 +100,7 @@ public class AnnotationController : ControllerBase
         if (envRcvRes.IsFailed)
         {
             _logger.LogNotice(envRcvRes.Notices);
-            return Unauthorized();
+            return Unauthorized("you are not authirized");
         }
 
         var histRes = await _histService.RecordAsync(envRcvRes.Data.EnvelopeId, userReference: mail, EnvelopeStatus.DocumentRejected, comment: reason);

EnvelopeGenerator.Web/Controllers/EnvelopeController.cs

@@ -7,7 +7,6 @@ using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Domain.Interfaces;
 using EnvelopeGenerator.PdfEditor;
 using EnvelopeGenerator.Web.Extensions;
 using EnvelopeGenerator.Web.Models;
@@ -79,25 +78,20 @@ public class EnvelopeController : ViewControllerBase
                 return this.ViewEnvelopeNotFound();
 
             #region Rejected or Signed
+            //check rejection
             var rejRcvrs = await _historyService.ReadRejectingReceivers(er.Envelope!.Id);
             if (rejRcvrs.Any())
             {
                 await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-                var isExt = !rejRcvrs.Where(rcv => rcv.Id == er.Receiver!.Id).Any();    //external if the current user is not rejected
-
-                if (er.Envelope.IsReadAndSign() || !isExt)
-                {
-                    //TODO: Normally assigned to the isExt variable. However, since the relevant keys are not defined in the resx files, it was assigned false. Fix this.
-                    ViewBag.IsExt = true;
-                    return View("EnvelopeRejected", er);
-                }
+                ViewBag.IsExt = !rejRcvrs.Contains(er.Receiver);    //external if the current user is not rejected
+                return View("EnvelopeRejected", er);
             }
 
             //check if it has already signed
             if (await _historyService.IsSigned(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress))
             {
                 await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-                return View("EnvelopeSigned", er);
+                return View("EnvelopeSigned");
             }
             #endregion
 
@@ -168,19 +162,13 @@ public class EnvelopeController : ViewControllerBase
             }
             var er_secret = er_secret_res.Data;
 
+            //check rejection
             var rejRcvrs = await _historyService.ReadRejectingReceivers(er_secret.Envelope!.Id);
             if (rejRcvrs.Any())
             {
                 await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-                var isExt = !rejRcvrs.Where(rcv => rcv.Id == er_secret.Receiver!.Id).Any();    //external if the current user is not rejected
-
-                //check rejection if the envelope is read-and-sign or non-external (internal)
-                if (er_secret.Envelope.IsReadAndSign() || !isExt)
-                {
-                    //TODO: Normally assigned to the isExt variable. However, since the relevant keys are not defined in the resx files, it was assigned false. Fix this.
-                    ViewBag.IsExt = true;
-                    return View("EnvelopeRejected", er_secret);
-                }
+                ViewBag.IsExt = !rejRcvrs.Contains(er_secret.Receiver);    //external if the current user is not rejected
+                return View("EnvelopeRejected", er_secret);
             }
 
             // show envelope if already logged in

EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj

@@ -12,9 +12,9 @@
 		<PackageTags>digital data envelope generator web</PackageTags>
 		<Description>EnvelopeGenerator.Web is an ASP.NET MVC application developed to manage signing processes. It uses Entity Framework Core (EF Core) for database operations. The user interface for signing processes is developed with Razor View Engine (.cshtml files) and JavaScript under wwwroot, integrated with PSPDFKit. This integration allows users to view and sign documents seamlessly.</Description>
 		<ApplicationIcon>Assets\icon.ico</ApplicationIcon>
-		<Version>3.12.3</Version>						<!-- NuGet package version -->
-		<AssemblyVersion>3.12.3.0</AssemblyVersion>		<!-- Assembly version for API compatibility -->
-		<FileVersion>3.12.3.0</FileVersion>				<!-- Windows file version -->
+		<Version>3.10.0</Version>						<!-- NuGet package version -->
+		<AssemblyVersion>3.10.0.0</AssemblyVersion>		<!-- Assembly version for API compatibility -->
+		<FileVersion>3.10.0.0</FileVersion>				<!-- Windows file version -->
 		<Copyright>Copyright © 2025 Digital Data GmbH. All rights reserved.</Copyright>
 	</PropertyGroup>
 
@@ -626,6 +626,7 @@
 		<None Include="wwwroot\lib\bootstrap-icons\icons\clipboard2-pulse.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\clipboard2-x-fill.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\clipboard2-x.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\clipboard2.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\clock-fill.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\clock-history.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\clock.svg" />
@@ -2093,22 +2094,22 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-		<PackageReference Include="BuildBundlerMinifier2022" Version="2.9.11" />
+		<PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
 		<PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
 		<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.20" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
 		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="NLog" Version="5.2.8" />
-		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.4" />
-		<PackageReference Include="Quartz" Version="3.7.0" />
-		<PackageReference Include="Quartz.AspNetCore" Version="3.7.0" />
-		<PackageReference Include="Quartz.Plugins" Version="3.7.0" />
-		<PackageReference Include="Quartz.Serialization.Json" Version="3.7.0" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-		<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
+		<PackageReference Include="NLog" Version="5.2.5" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
+		<PackageReference Include="Quartz" Version="3.8.0" />
+		<PackageReference Include="Quartz.AspNetCore" Version="3.8.0" />
+		<PackageReference Include="Quartz.Plugins" Version="3.8.0" />
+		<PackageReference Include="Quartz.Serialization.Json" Version="3.8.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+		<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
 		<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
 		<PackageReference Include="System.DirectoryServices" Version="7.0.1" />
 		<PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
@@ -2123,8 +2124,8 @@
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
 		<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.17" />
-		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.17" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
+		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="NLog" Version="5.2.5" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
@@ -2148,8 +2149,8 @@
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
 		<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6" />
-		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="9.0.6" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
+		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="NLog" Version="5.2.5" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />

EnvelopeGenerator.Web/Views/Envelope/EnvelopeRejected.cshtml

@@ -9,14 +9,12 @@
 @using EnvelopeGenerator.Web.Extensions
 @using Newtonsoft.Json
 @using Newtonsoft.Json.Serialization
-@using EnvelopeGenerator.Domain.Interfaces;
 @model EnvelopeReceiverDto;
 @{
 	var envelope = Model.Envelope;
 	var document = Model.Envelope?.Documents?.FirstOrDefault();
 	var sender = Model.Envelope?.User;
 	var isExt = ViewBag.IsExt ?? false;
-	bool IsReadAndConfirm = Model!.Envelope!.IsReadAndConfirm();
 }
 <div class="page container p-5">
     <header class="text-center">
@@ -56,11 +54,7 @@
 				c-5.791,5.79-15.176,5.79-20.969,0l-30.32-30.322l-11.676,11.676l30.32,30.32c5.79,5.79,5.79,15.178,0,20.969L299.11,404.045z"/>
 			</svg>
         </div>
-		<h1>@(isExt
-			? _localizer.RejectionInfo1Ext()
-			: IsReadAndConfirm
-				? _localizer.RejectionInfo1ForConfirmation()
-				: _localizer.RejectionInfo1())</h1>
+		<h1>@(isExt ? _localizer.RejectionInfo1Ext() : _localizer.RejectionInfo1())</h1>
     </header>
     <section class="text-center">
 		<div class="card-body p-0 m-0 ms-4">

EnvelopeGenerator.Web/Views/Envelope/EnvelopeSigned.cshtml

@@ -1,11 +1,5 @@
 @{
-    @using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-    @using EnvelopeGenerator.Domain.Interfaces;
-    @model EnvelopeReceiverDto;
-    bool IsReadAndConfirm = Model!.Envelope!.IsReadAndConfirm();
-    ViewData["Title"] = IsReadAndConfirm
-        ? _localizer.DocConfirmed()
-        : _localizer.DocSigned();
+    ViewData["Title"] = _localizer.DocSigned();
 }
 <div class="page container p-5">
     <header class="text-center">
@@ -15,13 +9,9 @@
                 <path d="M15.354 3.354a.5.5 0 0 0-.708-.708L8 9.293 5.354 6.646a.5.5 0 1 0-.708.708l3 3a.5.5 0 0 0 .708 0l7-7z" />
             </svg>
         </div>
-        <h1>@(IsReadAndConfirm
-            ? _localizer["DocumentSuccessfullyConfirmed"]
-            : _localizer["DocumentSuccessfullySigned"])</h1>
+        <h1>@_localizer["DocumentSuccessfullySigned"]</h1>
     </header>
     <section class="text-center">
-        <p>@(IsReadAndConfirm
-            ? _localizer["DocumentConfirmedConfirmationMessage"]
-            : _localizer["DocumentSignedConfirmationMessage"])</p>
+        <p>@_localizer["DocumentSignedConfirmationMessage"]</p>
     </section>   
 </div>

EnvelopeGenerator.Web/Views/Envelope/ShowEnvelope.cshtml

@@ -9,7 +9,6 @@
 @using EnvelopeGenerator.Web.Extensions
 @using Newtonsoft.Json
 @using Newtonsoft.Json.Serialization
-@using EnvelopeGenerator.Domain.Interfaces
 @model EnvelopeReceiverDto;
 @{
     var userCulture = ViewData["UserCulture"] as Culture;
@@ -25,13 +24,7 @@
     if (ViewData["IsReadOnly"] is bool isReadOnly_bool)
         isReadOnly = isReadOnly_bool;
 
-    var isReadAndConfirm = envelope.IsReadAndConfirm();
-
-    ViewData["Title"] = isReadOnly
-        ? _localizer.ViewDoc()
-        : isReadAndConfirm
-            ? _localizer.ConfirmDoc()
-            : _localizer.SignDoc();
+    ViewData["Title"] = isReadOnly ? _localizer.ViewDoc() : _localizer.SignDoc();
 }
 <div class="envelope-view">
     @if (!isReadOnly)
@@ -69,9 +62,7 @@
                 <div class="progress-container">
                     <div id="signed-count-bar" class="progress"></div>
                     <span class="progress-text">
-                        <span id="signed-count">0</span>/<span id="signature-count">@signatureCount</span> @(isReadAndConfirm 
-                            ? _localizer["Confirmations"] 
-                            : _localizer["Signatures"])
+                        <span id="signed-count">0</span>/<span id="signature-count">@signatureCount</span> @_localizer["Signatures"]
                     </span>
                 </div>
                 }

EnvelopeGenerator.Web/appsettings.Mail.json

@@ -8,6 +8,7 @@
   "MailParams": {
     "Placeholders": {
       "[NAME_PORTAL]": "signFlow",
+      "[SIGNATURE_TYPE]": "signieren",
       "[REASON]": ""
     }
   }

EnvelopeGenerator.Web/wwwroot/js/annotation.js

@@ -275,7 +275,7 @@ async function createAnnotationFrameBlob(receiverName, receiverSignature, timest
 
     ctx.fillStyle = 'black'
     ctx.font = `${fontSize * scale}px sans-serif`
-    ctx.fillText((READ_AND_CONFIRM ? localized.confirmedBy : localized.signedBy) ?? 'Signed by', 15 * scale, 10 * scale)
+    ctx.fillText(localized.signedBy ?? 'Signed by', 15 * scale, 10 * scale)
     ctx.fillText(receiverName, 15 * scale, 60 * scale)
     ctx.fillText(signatureString, 15 * scale, 70 * scale)
 

EnvelopeGenerator.Web/wwwroot/js/app.js

@@ -255,7 +255,7 @@ class App {
 
         return Swal.fire({
             title: localized.confirmation,
-            html: `<div class="text-start fs-6 p-0 m-0">${READ_AND_CONFIRM ? localized.confirmAgree : localized.sigAgree}</div>`,
+            html: `<div class="text-start fs-6 p-0 m-0">${localized.sigAgree}</div>`,
             icon: "question",
             showCancelButton: true,
             confirmButtonColor: "#3085d6",

EnvelopeGenerator.Web/wwwroot/js/app.min.js

@@ -1,3 +1,3 @@
 const formatLocalized=(n,...t)=>typeof n=="string"?n.replace(/\{(\d+)\}/g,(n,i)=>t[i]??""):"";class App{constructor(n,t,i,r,u,f){this.container=f??`#${this.constructor.name.toLowerCase()}`;this.envelopeKey=n;this.pdfKit=null;this.currentDocument=t.envelope.documents[0];this.currentReceiver=t.receiver;this.signatureCount=t.envelope.documents[0].elements.length;this.envelopeReceiver=t;this.documentBytes=i;this.licenseKey=r;this.locale=u}async init(){if(this.pdfKit=await loadPSPDFKit(this.documentBytes,this.container,this.licenseKey,this.locale),addToolbarItems(this.pdfKit,this.handleClick.bind(this)),this.pdfKit.addEventListener("annotations.load",this.handleAnnotationsLoad.bind(this)),this.pdfKit.addEventListener("annotations.change",this.handleAnnotationsChange.bind(this)),this.pdfKit.addEventListener("annotations.create",this.handleAnnotationsCreate.bind(this)),this.pdfKit.addEventListener("annotations.willChange",()=>{Comp.ActPanel.Toggle()}),!READ_AND_CONFIRM)try{let n=await createAnnotations(this.currentDocument,this.envelopeReceiver.envelopeId,this.envelopeReceiver.receiverId);await this.pdfKit.create(n)}catch(n){console.error("Error loading annotations:",n)}READ_AND_CONFIRM||[...document.getElementsByClassName("btn_refresh")].forEach(n=>n.addEventListener("click",()=>this.handleClick("RESET")));[...document.getElementsByClassName("btn_complete")].forEach(n=>n.addEventListener("click",()=>this.handleClick("FINISH")));[...document.getElementsByClassName("btn_reject")].forEach(n=>n.addEventListener("click",()=>this.handleClick("REJECT")))}handleAnnotationsLoad(n){n.toJS()}handleAnnotationsChange(){}async handleAnnotationsCreate(n){const t=n.toJS()[0],i=!!t.formFieldName,r=!!t.isSignature;if(i===!1&&r===!0){const r=t.boundingBox.left-20,u=t.boundingBox.top-20,n=150,i=75,f=new Date,e=await createAnnotationFrameBlob(this.envelopeReceiver.name,this.currentReceiver.signature,f,n,i),o=await fetch(e),s=await o.blob(),h=await this.pdfKit.createAttachment(s),c=createImageAnnotation(new PSPDFKit.Geometry.Rect({left:r,top:u,width:n,height:i}),t.pageIndex,h,generateId(this.envelopeReceiver.envelopeId,this.envelopeReceiver.receiverId,this.fakeElementId--,"signed"));this.pdfKit.create(c)}}async handleClick(n){let t=!1;switch(n){case"RESET":t=await this.handleReset(null);Comp.SignatureProgress.SignedCount=0;t.isConfirmed&&Swal.fire({title:localized.success,text:localized.documentReset,icon:"info"});break;case"FINISH":t=await this.handleFinish(null);t==!0&&(window.location.href=`/Envelope/${this.envelopeKey}`);break;case"REJECT":Swal.fire({title:localized.rejection,html:`<div class="text-start fs-6 p-0 m-0">${localized.rejectionReasonQ}</div>`,icon:"question",input:"text",inputAttributes:{autocapitalize:"off"},showCancelButton:!0,confirmButtonColor:"#3085d6",cancelButtonColor:"#d33",confirmButtonText:localized.complete,cancelButtonText:localized.back,showLoaderOnConfirm:!0,preConfirm:async n=>{try{return await rejectEnvelope(n)}catch(t){Swal.showValidationMessage(`
                           Request failed: ${t}
-                        `)}},allowOutsideClick:()=>!Swal.isLoading()}).then(n=>{if(n.isConfirmed){const t=n.value;t.ok?reload():Swal.showValidationMessage(`Request failed: ${t.message}`)}});break;case"COPY_URL":const n=window.location.href.replace(/\/readonly/gi,"");navigator.clipboard.writeText(n).then(function(){bsNotify(localized.copyLinkSuccess,{alert_type:"success",delay:4,icon_name:"check_circle"})}).catch(function(){bsNotify(localized.copyLinkFailure??localized.unexpectedErrorTitle,{alert_type:"danger",delay:4,icon_name:"error"})});break;case"SHARE":Comp.ShareBackdrop.show();break;case"LOGOUT":await logout()}}async handleFinish(){let n=undefined;if(READ_AND_CONFIRM){const n=JSON.parse(sessionStorage.getItem("pspdf_all_pages_rendered")||"false")===!0;if(!n){const n=JSON.parse(sessionStorage.getItem("pspdf_unviewed_pages")||"[]"),t=n.length?formatLocalized(localized.viewRemainingPages,n.join(", ")):localized.viewAllPages;return await Swal.fire({title:localized.warning,text:t,icon:"warning"}),!1}}else{const i=await this.pdfKit.exportInstantJSON(),r=i.formFieldValues,u=r.filter(n=>isFieldRequired(n)),f=u.some(n=>n.value===undefined||n.value===null||n.value==="");if(f)return Swal.fire({title:localized.warning,text:localized.locationFieldsRequired,icon:"warning"}),!1;const e=new RegExp("^[a-zA-Z\\u0080-\\u024F]+(?:([\\ \\-\\']|(\\.\\ ))[a-zA-Z\\u0080-\\u024F]+)*$"),o=r.filter(n=>isCityField(n));for(var t of o)if(!IS_MOBILE_DEVICE&&!e.test(t.value))return Swal.fire({title:localized.warning,text:formatLocalized(localized.cityFormatInvalid,t.value),icon:"warning"}),!1;const s=await this.validateAnnotations(this.signatureCount);if(s===!1)return Swal.fire({title:localized.warning,text:localized.missingSignatures,icon:"warning"}),!1;n={instant:i,structured:mapSignature(i)}}return Swal.fire({title:localized.confirmation,html:`<div class="text-start fs-6 p-0 m-0">${READ_AND_CONFIRM?localized.confirmAgree:localized.sigAgree}</div>`,icon:"question",showCancelButton:!0,confirmButtonColor:"#3085d6",cancelButtonColor:"#d33",confirmButtonText:localized.finalize,cancelButtonText:localized.back}).then(async t=>{if(t.isConfirmed){try{await this.pdfKit.save()}catch(i){return Swal.fire({title:localized.warning,text:localized.envelopeSignError,icon:"error"}),!1}try{const t=READ_AND_CONFIRM?await signEnvelope():await signEnvelope(n);if(t.ok)return!0;if(t.status===409)return Swal.fire({title:localized.warning,text:localized.envelopeUnavailable,icon:"warning"}),!1;if(t.status===423)Swal.fire({title:localized.info??localized.warning,text:localized.envelopeRejectedRedirect,icon:"info",timer:2e3,showConfirmButton:!1}).then(()=>{location.reload()});else throw new Error;}catch(i){return Swal.fire({title:localized.warning,text:localized.envelopeSignError,icon:"error"}),!1}}else return!1})}async validateAnnotations(n){const t=await getAnnotations(this.pdfKit),i=t.map(n=>n.toJS()).filter(n=>n.isSignature);return n<=i.length}async handleReset(){const n=Swal.fire({title:localized.resetConfirmTitle,text:localized.resetConfirmText,icon:"question",showCancelButton:!0});if(n.isConfirmed){const n=await deleteAnnotations(this.pdfKit)}return n}fakeElementId=0;}
+                        `)}},allowOutsideClick:()=>!Swal.isLoading()}).then(n=>{if(n.isConfirmed){const t=n.value;t.ok?reload():Swal.showValidationMessage(`Request failed: ${t.message}`)}});break;case"COPY_URL":const n=window.location.href.replace(/\/readonly/gi,"");navigator.clipboard.writeText(n).then(function(){bsNotify(localized.copyLinkSuccess,{alert_type:"success",delay:4,icon_name:"check_circle"})}).catch(function(){bsNotify(localized.copyLinkFailure??localized.unexpectedErrorTitle,{alert_type:"danger",delay:4,icon_name:"error"})});break;case"SHARE":Comp.ShareBackdrop.show();break;case"LOGOUT":await logout()}}async handleFinish(){let n=undefined;if(READ_AND_CONFIRM){const n=JSON.parse(sessionStorage.getItem("pspdf_all_pages_rendered")||"false")===!0;if(!n){const n=JSON.parse(sessionStorage.getItem("pspdf_unviewed_pages")||"[]"),t=n.length?formatLocalized(localized.viewRemainingPages,n.join(", ")):localized.viewAllPages;return await Swal.fire({title:localized.warning,text:t,icon:"warning"}),!1}}else{const i=await this.pdfKit.exportInstantJSON(),r=i.formFieldValues,u=r.filter(n=>isFieldRequired(n)),f=u.some(n=>n.value===undefined||n.value===null||n.value==="");if(f)return Swal.fire({title:localized.warning,text:localized.locationFieldsRequired,icon:"warning"}),!1;const e=new RegExp("^[a-zA-Z\\u0080-\\u024F]+(?:([\\ \\-\\']|(\\.\\ ))[a-zA-Z\\u0080-\\u024F]+)*$"),o=r.filter(n=>isCityField(n));for(var t of o)if(!IS_MOBILE_DEVICE&&!e.test(t.value))return Swal.fire({title:localized.warning,text:formatLocalized(localized.cityFormatInvalid,t.value),icon:"warning"}),!1;const s=await this.validateAnnotations(this.signatureCount);if(s===!1)return Swal.fire({title:localized.warning,text:localized.missingSignatures,icon:"warning"}),!1;n={instant:i,structured:mapSignature(i)}}return Swal.fire({title:localized.confirmation,html:`<div class="text-start fs-6 p-0 m-0">${localized.sigAgree}</div>`,icon:"question",showCancelButton:!0,confirmButtonColor:"#3085d6",cancelButtonColor:"#d33",confirmButtonText:localized.finalize,cancelButtonText:localized.back}).then(async t=>{if(t.isConfirmed){try{await this.pdfKit.save()}catch(i){return Swal.fire({title:localized.warning,text:localized.envelopeSignError,icon:"error"}),!1}try{const t=READ_AND_CONFIRM?await signEnvelope():await signEnvelope(n);if(t.ok)return!0;if(t.status===409)return Swal.fire({title:localized.warning,text:localized.envelopeUnavailable,icon:"warning"}),!1;if(t.status===423)Swal.fire({title:localized.info??localized.warning,text:localized.envelopeRejectedRedirect,icon:"info",timer:2e3,showConfirmButton:!1}).then(()=>{location.reload()});else throw new Error;}catch(i){return Swal.fire({title:localized.warning,text:localized.envelopeSignError,icon:"error"}),!1}}else return!1})}async validateAnnotations(n){const t=await getAnnotations(this.pdfKit),i=t.map(n=>n.toJS()).filter(n=>n.isSignature);return n<=i.length}async handleReset(){const n=Swal.fire({title:localized.resetConfirmTitle,text:localized.resetConfirmText,icon:"question",showCancelButton:!0});if(n.isConfirmed){const n=await deleteAnnotations(this.pdfKit)}return n}fakeElementId=0;}

EnvelopeGenerator.sln

@@ -35,11 +35,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Tests", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.API", "EnvelopeGenerator.API\EnvelopeGenerator.API.csproj", "{EC768913-6270-14F4-1DD3-69C87A659462}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "receiverUI", "receiverUI", "{73D8F466-90AA-4F95-9BD1-7CDBB8565162}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.ReceiverUI.Web", "receiverUI\EnvelopeGenerator.ReceiverUI.Web\EnvelopeGenerator.ReceiverUI.Web\EnvelopeGenerator.ReceiverUI.Web.csproj", "{AAD4720E-D175-44B5-B431-DB0BA636CD20}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.ReceiverUI.Web.Client", "receiverUI\EnvelopeGenerator.ReceiverUI.Web\EnvelopeGenerator.ReceiverUI.Web.Client\EnvelopeGenerator.ReceiverUI.Web.Client.csproj", "{5D97B2C2-E19B-4958-81E1-38864EC88FEB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.ServiceHost", "EnvelopeGenerator.ServiceHost\EnvelopeGenerator.ServiceHost.csproj", "{5DD82482-E560-405F-BF55-04D647B05BEF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -59,8 +55,8 @@ Global
 		{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.Build.0 = Release|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{4F32A98D-E6F0-4A09-BD97-1CF26107E837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -91,14 +87,10 @@ Global
 		{EC768913-6270-14F4-1DD3-69C87A659462}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EC768913-6270-14F4-1DD3-69C87A659462}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EC768913-6270-14F4-1DD3-69C87A659462}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AAD4720E-D175-44B5-B431-DB0BA636CD20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAD4720E-D175-44B5-B431-DB0BA636CD20}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAD4720E-D175-44B5-B431-DB0BA636CD20}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AAD4720E-D175-44B5-B431-DB0BA636CD20}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D97B2C2-E19B-4958-81E1-38864EC88FEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D97B2C2-E19B-4958-81E1-38864EC88FEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D97B2C2-E19B-4958-81E1-38864EC88FEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D97B2C2-E19B-4958-81E1-38864EC88FEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5DD82482-E560-405F-BF55-04D647B05BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DD82482-E560-405F-BF55-04D647B05BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DD82482-E560-405F-BF55-04D647B05BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5DD82482-E560-405F-BF55-04D647B05BEF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -118,9 +110,7 @@ Global
 		{211619F5-AE25-4BA5-A552-BACAFE0632D3} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB}
 		{224C4845-1CDE-22B7-F3A9-1FF9297F70E8} = {0CBC2432-A561-4440-89BC-671B66A24146}
 		{EC768913-6270-14F4-1DD3-69C87A659462} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
-		{73D8F466-90AA-4F95-9BD1-7CDBB8565162} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
-		{AAD4720E-D175-44B5-B431-DB0BA636CD20} = {73D8F466-90AA-4F95-9BD1-7CDBB8565162}
-		{5D97B2C2-E19B-4958-81E1-38864EC88FEB} = {73D8F466-90AA-4F95-9BD1-7CDBB8565162}
+		{5DD82482-E560-405F-BF55-04D647B05BEF} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {73E60370-756D-45AD-A19A-C40A02DACCC7}

receiverUI/.github/copilot-instructions.md

@@ -1,22 +0,0 @@
----
-description: 'Answer questions about DevExpress UI Components and their APIs using the dxdocs server'
----
-
-You are a .NET programmer and DevExpress products expert.
-
-You are tasked with answering questions about DevExpress components and their APIs using dxdocs MCP server tools.
-
-For **ANY** question about DevExpress components, use the dxdocs server to construct your answer.
-
-## Workflow:
-1. **Call devexpress_docs_search** to obtain help topics related to the user question
-2. **Call devexpress_docs_get_content** to fetch and read most relevant help topics
-3. **Reflect on obtained content** and how it relates to the question
-4. **Provide a comprehensive answer** based solely on retrieved information
-
-## Constraints:
-- **Use devexpress_docs_search only once per question** to avoid redundant queries
-- When answering questions, **use only information obtained from MCP server tools**
-- **Include code examples** when available in the documentation
-- **Reference specific DevExpress controls and properties** mentioned in the documentation
-- **Invoke version-specific MCP tools** (for example, dxdocs25_1) if a user specifies a version (for example, v25.1)

receiverUI/.mcp.json

@@ -1,12 +0,0 @@
-{
-  "servers": {
-    "dxdocs": {
-      "url": "https://api.devexpress.com/mcp/docs",
-      "type": "http"
-    },
-    "dxdocs25_1": {
-      "url": "https://api.devexpress.com/mcp/docs?v=25.1",
-      "type": "http"
-    }
-  }
-}

receiverUI/EnvelopeGenerator.ReceiverUI.Web/EnvelopeGenerator.ReceiverUI.Web.Client/Api/Models/EnvelopeDtos.cs

@@ -1,126 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Web.Client.Api.Models;
-
-/// <summary>
-/// Client-side DTOs for envelope display. These mirror the server-side
-/// EnvelopeReceiverDto / EnvelopeDto / DocumentDto used by the existing
-/// API endpoints, but expose only the fields the receiver UI actually needs.
-/// JSON serialization is camelCase by default (System.Text.Json).
-/// </summary>
-public class EnvelopeReceiverDto
-{
-    public long EnvelopeId { get; set; }
-    public long ReceiverId { get; set; }
-    public string? Name { get; set; }
-    public bool HasPhoneNumber { get; set; }
-    public EnvelopeDto? Envelope { get; set; }
-    public ReceiverDto? Receiver { get; set; }
-}
-
-public class EnvelopeDto
-{
-    public long Id { get; set; }
-    public string? Uuid { get; set; }
-    public string? Title { get; set; }
-    public string? Message { get; set; }
-    public bool ReadOnly { get; set; }
-    public bool UseAccessCode { get; set; }
-    public bool TFAEnabled { get; set; }
-    public DateTime AddedWhen { get; set; }
-    public SenderUserDto? User { get; set; }
-    public List<DocumentDto>? Documents { get; set; }
-}
-
-public class SenderUserDto
-{
-    public string? Email { get; set; }
-    public string? Prename { get; set; }
-    public string? Name { get; set; }
-}
-
-public class ReceiverDto
-{
-    public long Id { get; set; }
-    public string? EmailAddress { get; set; }
-    public string? Signature { get; set; }
-    public string? Prename { get; set; }
-    public string? Name { get; set; }
-}
-
-public class DocumentDto
-{
-    public long Id { get; set; }
-    public string? Name { get; set; }
-    public List<DocumentElementDto>? Elements { get; set; }
-}
-
-/// <summary>
-/// Signature placement on a PDF document. Pixel/inch units follow the same
-/// convention as the legacy PSPDFKit pipeline.
-/// </summary>
-public class DocumentElementDto
-{
-    public int Id { get; set; }
-    public int Page { get; set; }
-    public double Left { get; set; }
-    public double Top { get; set; }
-}
-
-/// <summary>
-/// Body for <c>POST /api/readonly</c> (share read-only link with another e-mail).
-/// </summary>
-public class ReadOnlyShareRequest
-{
-    public string ReceiverMail { get; set; } = string.Empty;
-    public DateTime DateValid { get; set; }
-}
-
-/// <summary>
-/// Returned by <c>GET /api/annotation/elements</c>. Each item describes a
-/// signature placeholder the authenticated receiver must sign on the
-/// current envelope. Coordinates are in PDF points relative to the page.
-/// </summary>
-public class SignatureElementDto
-{
-    public int Id { get; set; }
-    public int Page { get; set; }
-    public double X { get; set; }
-    public double Y { get; set; }
-    public double Width { get; set; }
-    public double Height { get; set; }
-    public bool Required { get; set; }
-    public string? Tooltip { get; set; }
-}
-
-/// <summary>
-/// Body of <c>POST /api/annotation/blazor</c> — mirrors the API-side
-/// <c>BlazorSignaturePayload</c>.
-/// </summary>
-public class BlazorSignaturePayload
-{
-    public List<BlazorSignatureEntry> Signatures { get; set; } = new();
-}
-
-public class BlazorSignatureEntry
-{
-    public int ElementId { get; set; }
-    /// <summary>Image as data URL (e.g. <c>data:image/png;base64,...</c>).</summary>
-    public string SignatureDataUrl { get; set; } = string.Empty;
-    public string? Position { get; set; }
-    public string? City { get; set; }
-    public DateTime SignedAt { get; set; }
-}
-
-/// <summary>
-/// Response of <c>GET /api/tfa/{envelopeReceiverId}</c>. The API serializes
-/// the anonymous type in <c>TfaRegistrationController.RegisterAsync</c>; the
-/// shape mirrored here is the camelCased JSON that crosses the wire.
-/// </summary>
-public class TfaRegistrationResponse
-{
-    public int EnvelopeId { get; set; }
-    public string? Uuid { get; set; }
-    public string? Signature { get; set; }
-    public DateTime? TfaRegDeadline { get; set; }
-    /// <summary>Base64-encoded PNG suitable for <c>data:image/png;base64,...</c>.</summary>
-    public string? TotpQR64 { get; set; }
-}

receiverUI/EnvelopeGenerator.ReceiverUI.Web/EnvelopeGenerator.ReceiverUI.Web.Client/Api/Models/ReceiverAuthDtos.cs

@@ -1,53 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Web.Client.Api.Models;
-
-/// <summary>
-/// Mirrors <c>EnvelopeGenerator.API.Models.ReceiverAuthResponse</c>.
-/// The Status string determines which fields are relevant.
-/// Possible values:
-/// requires_access_code, requires_tfa, show_document,
-/// already_signed, rejected, not_found, expired, error.
-/// </summary>
-public class ReceiverAuthResponse
-{
-    public string Status { get; set; } = string.Empty;
-    public string? Title { get; set; }
-    public string? Message { get; set; }
-    public string? SenderEmail { get; set; }
-    public string? ReceiverName { get; set; }
-    public bool TfaEnabled { get; set; }
-    public bool HasPhoneNumber { get; set; }
-    public bool ReadOnly { get; set; }
-
-    /// <summary>"sms" or "authenticator" when Status == "requires_tfa".</summary>
-    public string? TfaType { get; set; }
-    public DateTime? TfaExpiration { get; set; }
-    public string? ErrorMessage { get; set; }
-}
-
-public class AccessCodeRequest
-{
-    public string AccessCode { get; set; } = string.Empty;
-    public bool PreferSms { get; set; }
-}
-
-public class TfaCodeRequest
-{
-    public string Code { get; set; } = string.Empty;
-    /// <summary>"sms" or "authenticator".</summary>
-    public string Type { get; set; } = "authenticator";
-}
-
-/// <summary>
-/// Status strings returned by <see cref="ReceiverAuthResponse.Status"/>.
-/// </summary>
-public static class ReceiverAuthStatus
-{
-    public const string RequiresAccessCode = "requires_access_code";
-    public const string RequiresTfa = "requires_tfa";
-    public const string ShowDocument = "show_document";
-    public const string AlreadySigned = "already_signed";
-    public const string Rejected = "rejected";
-    public const string NotFound = "not_found";
-    public const string Expired = "expired";
-    public const string Error = "error";
-}

receiverUI/EnvelopeGenerator.ReceiverUI.Web/EnvelopeGenerator.ReceiverUI.Web.Client/Api/ReceiverApiClient.cs

@@ -1,214 +0,0 @@
-using System.Net;
-using System.Net.Http.Json;
-using EnvelopeGenerator.ReceiverUI.Web.Client.Api.Models;
-
-namespace EnvelopeGenerator.ReceiverUI.Web.Client.Api;
-
-/// <summary>
-/// Typed HTTP client for the EnvelopeGenerator receiver API.
-/// All endpoints are routed through the BFF (same origin), so the
-/// authentication cookie set by the API is automatically attached
-/// by the browser to every request issued by the injected HttpClient.
-/// </summary>
-public class ReceiverApiClient
-{
-    private readonly HttpClient _http;
-    private readonly ILogger<ReceiverApiClient> _logger;
-
-    public ReceiverApiClient(HttpClient http, ILogger<ReceiverApiClient> logger)
-    {
-        _http = http;
-        _logger = logger;
-    }
-
-    // ?? Receiver Auth ????????????????????????????????????????????????
-
-    public Task<ReceiverAuthResponse?> GetStatusAsync(string envelopeKey, CancellationToken ct = default)
-        => GetAuthAsync($"api/receiverauth/{Uri.EscapeDataString(envelopeKey)}/status", ct);
-
-    public Task<ReceiverAuthResponse?> SubmitAccessCodeAsync(string envelopeKey, AccessCodeRequest req, CancellationToken ct = default)
-        => PostAuthAsync($"api/receiverauth/{Uri.EscapeDataString(envelopeKey)}/access-code", req, ct);
-
-    public Task<ReceiverAuthResponse?> SubmitTfaCodeAsync(string envelopeKey, TfaCodeRequest req, CancellationToken ct = default)
-        => PostAuthAsync($"api/receiverauth/{Uri.EscapeDataString(envelopeKey)}/tfa", req, ct);
-
-    // ?? Envelope Receiver ????????????????????????????????????????????
-
-    public async Task<EnvelopeReceiverDto?> GetEnvelopeReceiverAsync(string envelopeKey, CancellationToken ct = default)
-    {
-        var res = await _http.GetAsync($"api/envelopereceiver/{Uri.EscapeDataString(envelopeKey)}", ct);
-        if (!res.IsSuccessStatusCode)
-            return null;
-        return await res.Content.ReadFromJsonAsync<EnvelopeReceiverDto>(cancellationToken: ct);
-    }
-
-    /// <summary>Downloads the document bytes for the receiver to display in a PDF viewer.</summary>
-    public async Task<byte[]?> GetDocumentAsync(string envelopeKey, CancellationToken ct = default)
-    {
-        var res = await _http.GetAsync($"api/document/{Uri.EscapeDataString(envelopeKey)}", ct);
-        if (!res.IsSuccessStatusCode)
-            return null;
-        return await res.Content.ReadAsByteArrayAsync(ct);
-    }
-
-    // ?? Annotation / Sign / Reject ???????????????????????????????????
-
-    /// <summary>
-    /// Returns the signature placeholders the authenticated receiver must sign.
-    /// </summary>
-    public async Task<List<SignatureElementDto>> GetSignatureElementsAsync(CancellationToken ct = default)
-    {
-        try
-        {
-            return await _http.GetFromJsonAsync<List<SignatureElementDto>>("api/annotation/elements", ct)
-                   ?? new List<SignatureElementDto>();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "Failed to fetch signature elements.");
-            return new List<SignatureElementDto>();
-        }
-    }
-
-    /// <summary>
-    /// Submits the signed envelope using the Blazor-friendly endpoint.
-    /// </summary>
-    public async Task<HttpStatusCode> SignBlazorAsync(BlazorSignaturePayload payload, CancellationToken ct = default)
-    {
-        var res = await _http.PostAsJsonAsync("api/annotation/blazor", payload, ct);
-        return res.StatusCode;
-    }
-
-    /// <summary>
-    /// Fetches the TOTP QR code + registration deadline for the given
-    /// envelope-receiver key (encoded uuid+signature). The API generates
-    /// a fresh secret on first call and persists it server-side.
-    /// </summary>
-    public async Task<(TfaRegistrationResponse? Data, HttpStatusCode Status)> GetTfaRegistrationAsync(string envelopeReceiverId, CancellationToken ct = default)
-    {
-        try
-        {
-            var res = await _http.GetAsync($"api/tfa/{Uri.EscapeDataString(envelopeReceiverId)}", ct);
-            if (!res.IsSuccessStatusCode)
-                return (null, res.StatusCode);
-            var data = await res.Content.ReadFromJsonAsync<TfaRegistrationResponse>(cancellationToken: ct);
-            return (data, res.StatusCode);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "Failed to fetch TFA registration for {Key}", envelopeReceiverId);
-            return (null, HttpStatusCode.InternalServerError);
-        }
-    }
-
-    /// <summary>Submits the signed annotations payload. Returns the HTTP status code.</summary>
-    public async Task<HttpStatusCode> SignAsync<TPayload>(TPayload? payload, CancellationToken ct = default)
-    {
-        var res = payload is null
-            ? await _http.PostAsync("api/annotation", content: null, ct)
-            : await _http.PostAsJsonAsync("api/annotation", payload, ct);
-        return res.StatusCode;
-    }
-
-    public async Task<bool> RejectAsync(string reason, CancellationToken ct = default)
-    {
-        var res = await _http.PostAsJsonAsync("api/annotation/reject", reason, ct);
-        return res.IsSuccessStatusCode;
-    }
-
-    // ?? Read-only share ??????????????????????????????????????????????
-
-    public async Task<bool> ShareReadOnlyAsync(ReadOnlyShareRequest req, CancellationToken ct = default)
-    {
-        var res = await _http.PostAsJsonAsync("api/readonly", req, ct);
-        return res.IsSuccessStatusCode;
-    }
-
-    // ?? Auth (logout) ????????????????????????????????????????????????
-
-    public async Task<bool> LogoutAsync(CancellationToken ct = default)
-    {
-        var res = await _http.PostAsync("auth/logout", content: null, ct);
-        return res.IsSuccessStatusCode;
-    }
-
-    // ?? Localization ?????????????????????????????????????????????????
-
-    public async Task<Dictionary<string, string>?> GetLocalizationStringsAsync(CancellationToken ct = default)
-    {
-        try
-        {
-            return await _http.GetFromJsonAsync<Dictionary<string, string>>("api/Localization", ct);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "Failed to fetch localization strings.");
-            return null;
-        }
-    }
-
-    public async Task SetLanguageAsync(string language, CancellationToken ct = default)
-    {
-        try
-        {
-            await _http.PostAsync($"api/Localization/lang?language={Uri.EscapeDataString(language)}", content: null, ct);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "Failed to set language to {Lang}.", language);
-        }
-    }
-
-    /// <summary>
-    /// Returns the currently selected language code (e.g. "de", "en"), or
-    /// <c>null</c> if no language cookie has been set yet (the API answers
-    /// with HTTP 404 in that case).
-    /// </summary>
-    public async Task<string?> GetLanguageAsync(CancellationToken ct = default)
-    {
-        try
-        {
-            var res = await _http.GetAsync("api/Localization/lang", ct);
-            if (!res.IsSuccessStatusCode)
-                return null;
-            return (await res.Content.ReadAsStringAsync(ct))?.Trim('"');
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "Failed to read current language.");
-            return null;
-        }
-    }
-
-    // ?? Helpers ??????????????????????????????????????????????????????
-
-    private async Task<ReceiverAuthResponse?> GetAuthAsync(string url, CancellationToken ct)
-    {
-        var res = await _http.GetAsync(url, ct);
-        return await ReadAuthAsync(res, ct);
-    }
-
-    private async Task<ReceiverAuthResponse?> PostAuthAsync<TReq>(string url, TReq body, CancellationToken ct)
-    {
-        var res = await _http.PostAsJsonAsync(url, body, ct);
-        return await ReadAuthAsync(res, ct);
-    }
-
-    private static async Task<ReceiverAuthResponse?> ReadAuthAsync(HttpResponseMessage res, CancellationToken ct)
-    {
-        // ReceiverAuthController returns a ReceiverAuthResponse body for both
-        // 2xx and known error statuses (401/404/500). We always try to deserialize.
-        try
-        {
-            return await res.Content.ReadFromJsonAsync<ReceiverAuthResponse>(cancellationToken: ct);
-        }
-        catch
-        {
-            return new ReceiverAuthResponse
-            {
-                Status = ReceiverAuthStatus.Error,
-                ErrorMessage = $"Unexpected response ({(int)res.StatusCode})."
-            };
-        }
-    }
-}

receiverUI/EnvelopeGenerator.ReceiverUI.Web/EnvelopeGenerator.ReceiverUI.Web.Client/EnvelopeGenerator.ReceiverUI.Web.Client.csproj

@@ -1,37 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
-    <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
-    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessage);WASM0001</MSBuildWarningsAsMessages>
-    <!-- Required so that native assets (libSkiaSharp, libHarfBuzzSharp) from
-         SkiaSharp.NativeAssets.WebAssembly / HarfBuzzSharp.NativeAssets.WebAssembly
-         are statically linked into the WASM runtime. Without this the
-         DevExpress PDF SkiaRenderer throws DllNotFoundException: libSkiaSharp.
-         Requires the "wasm-tools" workload: dotnet workload install wasm-tools -->
-    <!--<WasmBuildNative>false</WasmBuildNative>-->
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DevExpress.Blazor" Version="25.2.*" />
-    <PackageReference Include="DevExpress.Blazor.PdfViewer" Version="25.2.*" />
-    <PackageReference Include="DevExpress.Pdf.SkiaRenderer" Version="25.2.*" />
-    <PackageReference Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="8.3.1.2" />
-    <PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.119.1" />
-    <PackageReference Include="DevExpress.AIIntegration.Blazor" Version="25.2.*" />
-    <PackageReference Include="DevExpress.AIIntegration.OpenAI" Version="25.2.*" />
-
-    <PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.5" />
-    <PackageReference Include="Microsoft.Extensions.AI" Version="9.7.1" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.7.1-preview.1.25365.4" />
-
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.20" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Documents\Invoice.pdf" />
-  </ItemGroup>
-</Project>

receiverUI/EnvelopeGenerator.ReceiverUI.Web/EnvelopeGenerator.ReceiverUI.Web.Client/Layout/Drawer.razor

@@ -1,38 +0,0 @@
-@inherits DrawerStateComponentBase
-
-<div class="drawer-container">
-    <DxDrawer PanelWidth="@PanelWidth"
-              CssClass="@(CssClass + " mobile")"
-              Mode="DrawerMode.Overlap"
-              IsOpen="@ToggledDrawer"
-              BodyTemplate="BodyTemplate"
-              HeaderTemplate="HeaderTemplate"
-              FooterTemplate="FooterTemplate"
-              ApplyBackgroundShading="false"
-              ClosedCssClass="panel-closed">
-        <TargetContent>
-            <DxDrawer PanelWidth="@PanelWidth"
-                      CssClass="@CssClass"
-                      Mode="DrawerMode.Shrink"
-                      IsOpen="@(!ToggledDrawer)"
-                      BodyTemplate="BodyTemplate"
-                      HeaderTemplate="HeaderTemplate"
-                      FooterTemplate="FooterTemplate"
-                      OpenCssClass="panel-open">
-                <TargetContent>
-                    <div class="navigation-drawer-shading"></div>
-                    @TargetContent
-                </TargetContent>
-            </DxDrawer>
-        </TargetContent>
-    </DxDrawer>
-</div>
-
-@code {
-    [Parameter] public string? CssClass { get; set; }
-    [Parameter] public string? PanelWidth { get; set; }
-    [Parameter] public RenderFragment? TargetContent { get; set; }
-    [Parameter] public RenderFragment? BodyTemplate { get; set; }
-    [Parameter] public RenderFragment? HeaderTemplate { get; set; }
-    [Parameter] public RenderFragment? FooterTemplate { get; set; }
-}

receiverUI/EnvelopeGenerator.ReceiverUI.Web/EnvelopeGenerator.ReceiverUI.Web.Client/Layout/Drawer.razor.css

@@ -1,53 +0,0 @@
-.drawer-container {
-    height: 100%;
-}
-
-.navigation-drawer-shading {
-    height: 100%;
-    position: absolute;
-    transition: ease 300ms;
-    transition-property: opacity, visibility;
-    visibility: visible;
-    width: 100%;
-    z-index: 99;
-    background-color: var(--dxds-color-surface-backdrop-default-rest);
-}
-
-.navigation-drawer.mobile.panel-closed .navigation-drawer-shading {
-    opacity: 0;
-    visibility: hidden;
-}
-
-::deep .navigation-drawer > .dxbl-drawer-panel {
-    display: flex;
-}
-
-::deep .navigation-drawer.mobile > .dxbl-drawer-panel {
-    display: none;
-}
-
-.navigation-drawer-shading {
-    display: none;
-}
-
-::deep .panel-open:not(.mobile) .nav-buttons-container .menu-button {
-    display: none;
-}
-
-@media (max-width: 768px) {
-    ::deep .navigation-drawer > .dxbl-drawer-panel {
-        display: none;
-    }
-
-    ::deep .navigation-drawer.mobile > .dxbl-drawer-panel {
-        display: flex;
-    }
-
-    .navigation-drawer-shading {
-        display: block;
-    }
-
-    ::deep .panel-open:not(.mobile) .nav-buttons-container .menu-button {
-        display: flex;
-    }
-}

receiverUI/EnvelopeGenerator.ReceiverUI.Web/EnvelopeGenerator.ReceiverUI.Web.Client/Layout/MainLayout.razor

@@ -1,53 +0,0 @@
-@inherits DrawerStateLayoutComponentBase
-@inject NavigationManager NavigationManager
-
-<div class="page">
-    <Drawer CssClass="navigation-drawer" PanelWidth="240px">
-        <HeaderTemplate>
-            <div class="navigation-drawer-header">
-                <NavLink href="@AddDrawerStateToUrl("/")">
-                    <img class="logo" src="images/logo.svg" alt="DevExpress logo" />
-                </NavLink>
-                <NavLink aria-label="Close menu" href="@AddDrawerStateToUrlToggled(LocalPath)">
-                    <DxButton aria-label="Close menu" RenderStyle="ButtonRenderStyle.Light" RenderStyleMode="ButtonRenderStyleMode.Text" CssClass="btn-icon-only" IconCssClass="@(ToggledDrawer ? "icon icon-close" : "icon icon-menu")"></DxButton>
-                </NavLink>
-            </div>
-        </HeaderTemplate>
-        <BodyTemplate>
-            <div class="w-100">
-                <NavMenu></NavMenu>
-            </div>
-        </BodyTemplate>
-        <FooterTemplate>
-            <div class="navigation-drawer-footer">
-                <NavLink href="https://docs.devexpress.com/Blazor/400725/blazor-components" class="button-link">
-                    <DxButton Text="Docs" RenderStyle="ButtonRenderStyle.Light" RenderStyleMode="ButtonRenderStyleMode.Text" IconCssClass="icon icon-docs"></DxButton>
-                </NavLink>
-                <NavLink href="https://demos.devexpress.com/blazor/" class="button-link">
-                    <DxButton Text="Demos" RenderStyle="ButtonRenderStyle.Light" RenderStyleMode="ButtonRenderStyleMode.Text" IconCssClass="icon icon-demos"></DxButton>
-                </NavLink>
-            </div>
-        </FooterTemplate>
-        <TargetContent>
-            <div class="drawer-content">
-                <div class="nav-buttons-container">
-                    <NavLink aria-label="Open menu" href="@AddDrawerStateToUrlToggled(LocalPath)" class="menu-button">
-                        <DxButton aria-label="Open menu" RenderStyle="ButtonRenderStyle.Secondary" RenderStyleMode="ButtonRenderStyleMode.Text" CssClass="btn-icon-only" IconCssClass="icon icon-menu"></DxButton>
-                    </NavLink>
-                    @if (LocalPath != "/") {
-                        <NavLink href="@AddDrawerStateToUrl("/")" class="button-link">
-                            <DxButton Text="Back to Home" RenderStyle="ButtonRenderStyle.Secondary" RenderStyleMode="ButtonRenderStyleMode.Text" CssClass="back-button" IconCssClass="icon icon-back"></DxButton>
-                        </NavLink>
-                    }
-                </div>
-                <div class="page-content-container">
-                    @Body
-                </div>
-            </div>
-        </TargetContent>
-    </Drawer>
-</div>
-
-@code {
-    string LocalPath => new Uri(NavigationManager.Uri).LocalPath;
-}

receiverUI/EnvelopeGenerator.ReceiverUI.Web/EnvelopeGenerator.ReceiverUI.Web.Client/Layout/MainLayout.razor.css

@@ -1,67 +0,0 @@
-.page {
-    height: 100%;
-    min-height: 0;
-}
-
-::deep .navigation-drawer {
-    --dxbl-drawer-panel-body-padding-x: 0;
-    --dxbl-drawer-panel-body-padding-y: 1rem;
-    --dxbl-drawer-panel-footer-bg: none;
-    --dxbl-drawer-panel-header-bg: none;
-    --dxbl-drawer-separator-border-width: 0;
-}
-
-::deep .navigation-drawer > .dxbl-drawer-panel {
-    background-image: linear-gradient(180deg, var(--dxds-color-surface-primary-default-rest) 0%, var(--dxds-primary-170) 150%);
-}
-
-.navigation-drawer-header {
-    align-items: center;
-    display: flex;
-    justify-content: space-between;
-    padding: 1.375rem 0.375rem;
-    width: 100%;
-}
-
-.navigation-drawer-header .logo {
-    height: 1.5rem;
-    width: 9rem;
-}
-
-.navigation-drawer-footer {
-    display: flex;
-    justify-content: space-evenly;
-    padding-bottom: 0.875rem;
-    width: 100%;
-}
-
-.drawer-content {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    overflow: auto;
-    padding: 2rem 1.5rem 1.5rem 1.5rem;
-}
-
-.nav-buttons-container {
-    align-items: center;
-    display: flex;
-    gap: 0.625rem;
-    min-height: 2rem;
-}
-
-::deep .nav-buttons-container > a {
-    color: inherit;
-}
-
-::deep .nav-buttons-container .back-button {
-    padding-left: 0;
-    padding-right: 0.25rem;
-}
-
-.page-content-container {
-    display: flex;
-    flex-direction: column;
-    flex-grow: 1;
-    min-height: 0;
-}

receiverUI/EnvelopeGenerator.ReceiverUI.Web/EnvelopeGenerator.ReceiverUI.Web.Client/Layout/NavMenu.razor

@@ -1,35 +0,0 @@
-@inject NavigationManager NavigationManager
-@implements IDisposable
-
-<div>
-    <DxMenu Orientation="@Orientation.Vertical" CssClass="menu">
-        <Items>
-            <DxMenuItem NavigateUrl="/samples" Text="Samples" CssClass="@MenuItemCssClass("/samples")" IconCssClass="icon icon-home"></DxMenuItem>
-            <DxMenuItem NavigateUrl="/counter" Text="Counter" CssClass="@MenuItemCssClass("/counter")" IconCssClass="icon icon-counter"></DxMenuItem>
-            <DxMenuItem NavigateUrl="/weather" Text="Weather" CssClass="@MenuItemCssClass("/weather")" IconCssClass="icon icon-weather"></DxMenuItem>
-            <DxMenuItem NavigateUrl="/pdfviewer" Text="PDF Viewer" CssClass="@MenuItemCssClass("/pdfviewer")" IconCssClass="icon icon-pdf-viewer"></DxMenuItem>
-        </Items>
-    </DxMenu>
-</div>
-
-@code {
-    private string? currentLocalPath;
-
-    protected override void OnInitialized() {
-        currentLocalPath = new Uri(NavigationManager.Uri).LocalPath;
-        NavigationManager.LocationChanged += OnLocationChanged;
-    }
-
-    private void OnLocationChanged(object? sender, LocationChangedEventArgs e) {
-        currentLocalPath = new Uri(NavigationManager.Uri).LocalPath;
-        InvokeAsync(StateHasChanged);
-    }
-
-    private string? MenuItemCssClass(string itemPath) {
-        return string.Equals(currentLocalPath, itemPath, StringComparison.OrdinalIgnoreCase) ? "menu-item-active" : null;
-    }
-
-    public void Dispose() {
-        NavigationManager.LocationChanged -= OnLocationChanged;
-    }
-}