Merge branch 'feat/receiver-ui' of http://git.dd:3000/AppStd/EnvelopeGenerator into feat/receiver-ui

Improve canvas mouse position accuracy; add settings.json
Refactored mouse event handling in pdfInterop.js to use a new getPos helper, ensuring accurate coordinate mapping on scaled or resized canvases. Updated start and move functions to use this helper. Added an empty settings.json file.
2025-12-10 11:16:27 +01:00 · 2025-12-10 11:16:13 +01:00 · 2025-12-10 09:55:32 +01:00 · 2025-12-10 09:55:24 +01:00 · 2025-12-09 10:58:53 +01:00 · 2025-12-09 10:42:11 +01:00
290 changed files with 15409 additions and 3438 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -0,0 +1 @@
 {}
--- a/EnvelopeGenerator.API/Controllers/AnnotationController.cs
+++ b/EnvelopeGenerator.API/Controllers/AnnotationController.cs
@@ -1,118 +0,0 @@
 using DigitalData.Core.Abstraction.Application.DTO;
 using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 using EnvelopeGenerator.Application.Histories.Queries;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.API.Extensions;
 using MediatR;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 namespace EnvelopeGenerator.API.Controllers;
 /// <summary>
 /// Manages annotations and signature lifecycle for envelopes.
 /// </summary>
 [Authorize(Roles = Role.Receiver.FullyAuth)]
 [ApiController]
 [Route("api/[controller]")]
 public class AnnotationController : ControllerBase
 {
    [Obsolete("Use MediatR")]
    private readonly IEnvelopeHistoryService _historyService;
    [Obsolete("Use MediatR")]
    private readonly IEnvelopeReceiverService _envelopeReceiverService;
    private readonly IMediator _mediator;
    private readonly ILogger<AnnotationController> _logger;
    /// <summary>
    /// Initializes a new instance of <see cref="AnnotationController"/>.
    /// </summary>
    [Obsolete("Use MediatR")]
    public AnnotationController(
        ILogger<AnnotationController> logger,
        IEnvelopeHistoryService envelopeHistoryService,
        IEnvelopeReceiverService envelopeReceiverService,
        IMediator mediator)
    {
        _historyService = envelopeHistoryService;
        _envelopeReceiverService = envelopeReceiverService;
        _mediator = mediator;
        _logger = logger;
    }
    /// <summary>
    /// Creates or updates annotations for the authenticated envelope receiver.
    /// </summary>
    /// <param name="psPdfKitAnnotation">Annotation payload.</param>
    /// <param name="cancel">Cancellation token.</param>
    [Authorize(Roles = Role.Receiver.FullyAuth)]
    [HttpPost]
    [Obsolete("PSPDF Kit will no longer be used.")]
    public async Task<IActionResult> CreateOrUpdate([FromBody] PsPdfKitAnnotation? psPdfKitAnnotation = null, CancellationToken cancel = default)
    {
        var signature = User.GetReceiverSignatureOfReceiver();
        var uuid = User.GetEnvelopeUuidOfReceiver();
        var envelopeReceiver = await _mediator.ReadEnvelopeReceiverAsync(uuid, signature, cancel).ThrowIfNull(Exceptions.NotFound);
        if (!envelopeReceiver.Envelope!.ReadOnly && psPdfKitAnnotation is null)
            return BadRequest();
        if (await _mediator.IsSignedAsync(uuid, signature, cancel))
            return Problem(statusCode: StatusCodes.Status409Conflict);
        else if (await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
            return Problem(statusCode: StatusCodes.Status423Locked);
        var docSignedNotification = await _mediator
            .ReadEnvelopeReceiverAsync(uuid, signature, cancel)
            .ToDocSignedNotification(psPdfKitAnnotation)
            ?? throw new NotFoundException("Envelope receiver is not found.");
        await _mediator.PublishSafely(docSignedNotification, cancel);
        await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
        return Ok();
    }
    /// <summary>
    /// Rejects the document for the current receiver.
    /// </summary>
    /// <param name="reason">Optional rejection reason.</param>
    [Authorize(Roles = Role.Receiver.FullyAuth)]
    [HttpPost("reject")]
    [Obsolete("Use MediatR")]
    public async Task<IActionResult> Reject([FromBody] string? reason = null)
    {
        var signature = User.GetReceiverSignatureOfReceiver();
        var uuid = User.GetEnvelopeUuidOfReceiver();
        var mail = User.GetReceiverMailOfReceiver();
        var envRcvRes = await _envelopeReceiverService.ReadByUuidSignatureAsync(uuid: uuid, signature: signature);
        if (envRcvRes.IsFailed)
        {
            _logger.LogNotice(envRcvRes.Notices);
            return Unauthorized("you are not authorized");
        }
        var histRes = await _historyService.RecordAsync(envRcvRes.Data.EnvelopeId, userReference: mail, EnvelopeStatus.DocumentRejected, comment: reason);
        if (histRes.IsSuccess)
        {
            await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
            return NoContent();
        }
        _logger.LogEnvelopeError(uuid: uuid, signature: signature, message: "Unexpected error happened in api/envelope/reject");
        _logger.LogNotice(histRes.Notices);
        return StatusCode(500, histRes.Messages);
    }
 }
--- a/EnvelopeGenerator.API/Controllers/AuthController.cs
+++ b/EnvelopeGenerator.API/Controllers/AuthController.cs
@@ -1,59 +0,0 @@
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
 using EnvelopeGenerator.API.Models;
 namespace EnvelopeGenerator.API.Controllers;
 /// <summary>
 /// Controller verantwortlich für die Benutzer-Authentifizierung, einschließlich Anmelden, Abmelden und Überprüfung des Authentifizierungsstatus.
 /// </summary>
 /// <param name="logger"></param>
 [Route("api/[controller]")]
 [ApiController]
 public partial class AuthController(ILogger<AuthController> logger) : ControllerBase
 {
    /// <summary>
    /// Entfernt das Authentifizierungs-Cookie des Benutzers (AuthCookie)
    /// </summary>
    /// <returns>
    /// Gibt eine HTTP 200 oder 401.
    /// </returns>
    /// <remarks>
    /// Sample request:
    ///
    ///     POST /api/auth/logout
    ///
    /// </remarks>
    /// <response code="200">Erfolgreich gelöscht, wenn der Benutzer ein berechtigtes Cookie hat.</response>
    /// <response code="401">Wenn es kein zugelassenes Cookie gibt, wird „nicht zugelassen“ zurückgegeben.</response>
    [ProducesResponseType(typeof(string), StatusCodes.Status200OK, "text/javascript")]
    [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
    [Authorize]
    [HttpPost("logout")]
    public async Task<IActionResult> Logout()
    {
        await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
        return Ok();
    }
    /// <summary>
    /// Prüft, ob der Benutzer ein autorisiertes Token hat.
    /// </summary>
    /// <returns>Wenn ein autorisiertes Token vorhanden ist HTTP 200 asynchron 401</returns>
    /// <remarks>
    /// Sample request:
    ///
    ///     GET /api/auth
    ///
    /// </remarks>
    /// <response code="200">Wenn es einen autorisierten Cookie gibt.</response>
    /// <response code="401">Wenn kein Cookie vorhanden ist oder nicht autorisierte.</response>
    [ProducesResponseType(typeof(string), StatusCodes.Status200OK, "text/javascript")]
    [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
    [Authorize]
    [HttpGet]
    public IActionResult IsAuthenticated() => Ok();
 }
--- a/EnvelopeGenerator.API/Controllers/ConfigController.cs
+++ b/EnvelopeGenerator.API/Controllers/ConfigController.cs
@@ -1,30 +0,0 @@
 using EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 namespace EnvelopeGenerator.API.Controllers;
 /// <summary>
 /// Exposes configuration data required by the client applications.
 /// </summary>
 /// <remarks>
 /// Initializes a new instance of <see cref="ConfigController"/>.
 /// </remarks>
 [Route("api/[controller]")]
 [ApiController]
 [Authorize]
 public class ConfigController(IOptionsMonitor<AnnotationParams> annotationParamsOptions) : ControllerBase
 {
    private readonly AnnotationParams _annotationParams = annotationParamsOptions.CurrentValue;
    /// <summary>
    /// Returns annotation configuration that was previously rendered by MVC.
    /// </summary>
    [HttpGet("Annotations")]
    [Obsolete("PSPDF Kit will no longer be used.")]
    public IActionResult GetAnnotationParams()
    {
        return Ok(_annotationParams.AnnotationJSObject);
    }
 }
--- a/EnvelopeGenerator.API/Controllers/DocumentController.cs
+++ b/EnvelopeGenerator.API/Controllers/DocumentController.cs
@@ -1,57 +0,0 @@
 using EnvelopeGenerator.API.Extensions;
 using EnvelopeGenerator.Application.Documents.Queries;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 namespace EnvelopeGenerator.API.Controllers;
 /// <summary>
 /// Provides access to envelope documents for authenticated receivers.
 /// </summary>
 /// <remarks>
 /// Initializes a new instance of the <see cref="DocumentController"/> class.
 /// </remarks>
 [Authorize]
 [ApiController]
 [Route("api/[controller]")]
 public class DocumentController(IMediator mediator, ILogger<DocumentController> logger) : ControllerBase
 {
    /// <summary>
    /// Returns the document bytes receiver.
    /// </summary>
    /// <param name="query">Encoded envelope key.</param>
    /// <param name="cancel">Cancellation token.</param>
    [HttpGet]
    [Authorize(Roles = $"{Role.Sender},{Role.Receiver.FullyAuth}")]
    public async Task<IActionResult> GetDocument(CancellationToken cancel, [FromQuery] ReadDocumentQuery? query = null)
    {
        // Sender: expects query with envelope key
        if (User.IsInRole(Role.Sender))
        {
            if (query is null)
                return BadRequest("Missing document query.");
            var senderDoc = await mediator.Send(query, cancel);
            return senderDoc.ByteData is byte[] senderDocByte
                ? File(senderDocByte, "application/octet-stream")
                : NotFound("Document is empty.");
        }
        // Receiver: resolve envelope id from claims
        if (User.IsInRole(Role.Receiver.FullyAuth))
        {           
            if (query is not null)
                return BadRequest("Query parameters are not allowed for receiver role.");
            var envelopeId = User.GetEnvelopeIdOfReceiver();
            var receiverDoc = await mediator.Send(new ReadDocumentQuery { EnvelopeId = envelopeId }, cancel);
            return receiverDoc.ByteData is byte[] receiverDocByte
                ? File(receiverDocByte, "application/octet-stream")
                : NotFound("Document is empty.");
        }
        return Unauthorized();
    }
 }
--- a/EnvelopeGenerator.API/Controllers/EnvelopeController.cs
+++ b/EnvelopeGenerator.API/Controllers/EnvelopeController.cs
@@ -1,111 +0,0 @@
 using EnvelopeGenerator.API.Extensions;
 using EnvelopeGenerator.Application.Envelopes.Commands;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 namespace EnvelopeGenerator.API.Controllers;
 /// <summary>
 /// Dieser Controller stellt Endpunkte für die Verwaltung von Umschlägen bereit.
 /// </summary>
 /// <remarks>
 /// Die API ermöglicht das Abrufen und Verwalten von Umschlägen basierend auf Benutzerinformationen und Statusfiltern.
 /// 
 /// Mögliche Antworten:
 /// - 200 OK: Die Anfrage war erfolgreich, und die angeforderten Daten werden zurückgegeben.
 /// - 400 Bad Request: Die Anfrage war fehlerhaft oder unvollständig.
 /// - 401 Unauthorized: Der Benutzer ist nicht authentifiziert.
 /// - 403 Forbidden: Der Benutzer hat keine Berechtigung, auf die Ressource zuzugreifen.
 /// - 404 Not Found: Die angeforderte Ressource wurde nicht gefunden.
 /// - 500 Internal Server Error: Ein unerwarteter Fehler ist aufgetreten.
 /// </remarks>
 [Route("api/[controller]")]
 [ApiController]
 [Authorize]
 public class EnvelopeController : ControllerBase
 {
    private readonly ILogger<EnvelopeController> _logger;
    private readonly IMediator _mediator;
    /// <summary>
    /// Erstellt eine neue Instanz des EnvelopeControllers.
    /// </summary>
    /// <param name="logger">Der Logger, der für das Protokollieren von Informationen verwendet wird.</param>
    /// <param name="mediator"></param>
    public EnvelopeController(ILogger<EnvelopeController> logger, IMediator mediator)
    {
        _logger = logger;
        _mediator = mediator;
    }
    /// <summary>
    /// Ruft eine Liste von Umschlägen basierend auf dem Benutzer und den angegebenen Statusfiltern ab.
    /// </summary>
    /// <param name="envelope"></param>
    /// <returns>Eine IActionResult-Instanz, die die abgerufenen Umschläge oder einen Fehlerstatus enthält.</returns>
    /// <response code="200">Die Anfrage war erfolgreich, und die Umschläge werden zurückgegeben.</response>
    /// <response code="400">Die Anfrage war fehlerhaft oder unvollständig.</response>
    /// <response code="401">Der Benutzer ist nicht authentifiziert.</response>
    /// <response code="403">Der Benutzer hat keine Berechtigung, auf die Ressource zuzugreifen.</response>
    /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
    [Authorize]
    [HttpGet]
    public async Task<IActionResult> GetAsync([FromQuery] ReadEnvelopeQuery envelope)
    {
        var result = await _mediator.Send(envelope.Authorize(User.GetId()));
        return result.Any() ? Ok(result) : NotFound();
    }
    /// <summary>
    /// Ruft das Ergebnis eines Dokuments basierend auf der ID ab.
    /// </summary>
    /// <param name="query"></param>
    /// <param name="view">Gibt an, ob das Dokument inline angezeigt werden soll (true) oder als Download bereitgestellt wird (false).</param>
    /// <returns>Eine IActionResult-Instanz, die das Dokument oder einen Fehlerstatus enthält.</returns>
    /// <response code="200">Das Dokument wurde erfolgreich abgerufen.</response>
    /// <response code="404">Das Dokument wurde nicht gefunden oder ist nicht verfügbar.</response>
    /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
    [HttpGet("doc-result")]
    public async Task<IActionResult> GetDocResultAsync([FromQuery] ReadEnvelopeQuery query, [FromQuery] bool view = false)
    {
        var envelopes = await _mediator.Send(query.Authorize(User.GetId()));
        var envelope = envelopes.FirstOrDefault();
        if (envelope is null)
            return NotFound("Envelope not available.");
        if (envelope.DocResult is null)
            return NotFound("The document has not been fully signed or the result has not yet been released.");
        if (view)
        {
            Response.Headers.Append("Content-Disposition", "inline; filename=\"" + envelope.Uuid + ".pdf\"");
            return File(envelope.DocResult, "application/pdf");
        }
        return File(envelope.DocResult, "application/pdf", $"{envelope.Uuid}.pdf");
    }
    /// <summary>
    /// 
    /// </summary>
    /// <param name="command"></param>
    /// <returns></returns>
    [NonAction]
    [Authorize]
    [HttpPost]
    public async Task<IActionResult> CreateAsync([FromBody] CreateEnvelopeCommand command)
    {
        var res = await _mediator.Send(command.Authorize(User.GetId()));
        if (res is null)
        {
            _logger.LogError("Failed to create envelope. Envelope details: {EnvelopeDetails}", JsonConvert.SerializeObject(command));
            return StatusCode(StatusCodes.Status500InternalServerError);
        }
        else
            return Ok(res);
    }
 }
--- a/EnvelopeGenerator.API/Controllers/EnvelopeTypeController.cs
+++ b/EnvelopeGenerator.API/Controllers/EnvelopeTypeController.cs
@@ -1,39 +0,0 @@
 using MediatR;
 using EnvelopeGenerator.Application.EnvelopeTypes.Queries;
 using Microsoft.AspNetCore.Mvc;
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 /// <summary>
 /// 
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
 [Route("api/[controller]")]
 [ApiController]
 public class EnvelopeTypeController : ControllerBase
 {
    private readonly ILogger<EnvelopeTypeController> _logger;
    private readonly IMediator _mediator;
    /// <summary>
    /// 
    /// </summary>
    /// <param name="logger"></param>
    /// <param name="mediator"></param>
    public EnvelopeTypeController(ILogger<EnvelopeTypeController> logger, IMediator mediator)
    {
        _logger = logger;
        _mediator = mediator;
    }
    /// <summary>
    /// 
    /// </summary>
    /// <returns></returns>
    [HttpGet]
    public async Task<IActionResult> GetAllAsync()
    {
        var result = await _mediator.Send(new ReadEnvelopeTypesQuery());
        return Ok(result);
    }
 }
--- a/EnvelopeGenerator.API/Controllers/ReadOnlyController.cs
+++ b/EnvelopeGenerator.API/Controllers/ReadOnlyController.cs
@@ -1,90 +0,0 @@
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.API.Extensions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 namespace EnvelopeGenerator.API.Controllers;
 /// <summary>
 /// Manages read-only envelope sharing flows.
 /// </summary>
 [Route("api/[controller]")]
 [ApiController]
 public class ReadOnlyController : ControllerBase
 {
    private readonly ILogger<ReadOnlyController> _logger;
    private readonly IEnvelopeReceiverReadOnlyService _readOnlyService;
    private readonly IEnvelopeMailService _mailService;
    private readonly IEnvelopeHistoryService _historyService;
    /// <summary>
    /// Initializes a new instance of the <see cref="ReadOnlyController"/> class.
    /// </summary>
    public ReadOnlyController(ILogger<ReadOnlyController> logger, IEnvelopeReceiverReadOnlyService readOnlyService, IEnvelopeMailService mailService, IEnvelopeHistoryService historyService)
    {
        _logger = logger;
        _readOnlyService = readOnlyService;
        _mailService = mailService;
        _historyService = historyService;
    }
    /// <summary>
    /// Creates a new read-only receiver for the current envelope.
    /// </summary>
    /// <param name="createDto">Creation payload.</param>
    [HttpPost]
    [Authorize(Roles = Role.Receiver.FullyAuth)]
    public async Task<IActionResult> CreateAsync([FromBody] EnvelopeReceiverReadOnlyCreateDto createDto)
    {
        var authReceiverMail = User.GetReceiverMailOfReceiver();
        if (authReceiverMail is null)
        {
            _logger.LogError("EmailAddress claim is not found in envelope-receiver-read-only creation process. Create DTO is:\n {dto}", JsonConvert.SerializeObject(createDto));
            return Unauthorized();
        }
        var envelopeId = User.GetEnvelopeIdOfReceiver();
        createDto.AddedWho = authReceiverMail;
        createDto.EnvelopeId = envelopeId;
        var creationRes = await _readOnlyService.CreateAsync(createDto: createDto);
        if (creationRes.IsFailed)
        {
            _logger.LogNotice(creationRes);
            return StatusCode(StatusCodes.Status500InternalServerError);
        }
        var readRes = await _readOnlyService.ReadByIdAsync(creationRes.Data.Id);
        if (readRes.IsFailed)
        {
            _logger.LogNotice(creationRes);
            return StatusCode(StatusCodes.Status500InternalServerError);
        }
        var newReadOnly = readRes.Data;
        return await _mailService.SendAsync(newReadOnly).ThenAsync<int, IActionResult>(SuccessAsync: async _ =>
        {
            var histRes = await _historyService.RecordAsync((int)createDto.EnvelopeId, createDto.AddedWho, EnvelopeStatus.EnvelopeShared);
            if (histRes.IsFailed)
            {
                _logger.LogError("Although the envelope was sent as read-only, the EnvelopeShared history could not be saved. Create DTO:\n{createDto}", JsonConvert.SerializeObject(createDto));
                _logger.LogNotice(histRes.Notices);
            }
            return Ok();
        },
        Fail: (msg, ntc) =>
        {
            _logger.LogNotice(ntc);
            return StatusCode(StatusCodes.Status500InternalServerError);
        });
    }
 }
--- a/EnvelopeGenerator.API/Controllers/ReceiverController.cs
+++ b/EnvelopeGenerator.API/Controllers/ReceiverController.cs
@@ -1,47 +0,0 @@
 using MediatR;
 using EnvelopeGenerator.Application.Receivers.Queries;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 /// <summary>
 /// Controller für die Verwaltung von Empfängern.
 /// </summary>
 /// <remarks>
 /// Dieser Controller bietet Endpunkte für das Abrufen von Empfängern basierend auf E-Mail-Adresse oder Signatur.
 /// </remarks>
 [Route("api/[controller]")]
 [ApiController]
 [Authorize]
 public class ReceiverController : ControllerBase
 {
    private readonly IMediator _mediator;
    /// <summary>
    /// Initialisiert eine neue Instanz des <see cref="ReceiverController"/>-Controllers.
    /// </summary>
    /// <param name="mediator">Mediator für Anfragen.</param>
    public ReceiverController(IMediator mediator)
    {
        _mediator = mediator;
    }
    /// <summary>
    /// Ruft eine Liste von Empfängern ab, basierend auf den angegebenen Abfrageparametern.
    /// </summary>
    /// <param name="receiver">Die Abfrageparameter, einschließlich E-Mail-Adresse und Signatur.</param>
    /// <returns>Eine Liste von Empfängern oder ein Fehlerstatus.</returns>
    [HttpGet]
    public async Task<IActionResult> Get([FromQuery] ReadReceiverQuery receiver)
    {
        if (!receiver.HasAnyCriteria)
        {
            var all = await _mediator.Send(new ReadReceiverQuery());
            return Ok(all);
        }
        var result = await _mediator.Send(receiver);
        return result is null ? NotFound() : Ok(result);
    }
 }
--- a/EnvelopeGenerator.API/Controllers/TfaRegistrationController.cs
+++ b/EnvelopeGenerator.API/Controllers/TfaRegistrationController.cs
@@ -1,129 +0,0 @@
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.API.Models;
 using Ganss.Xss;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 namespace EnvelopeGenerator.API.Controllers;
 /// <summary>
 /// Exposes endpoints for registering and managing two-factor authentication for envelope receivers.
 /// </summary>
 [ApiController]
 [Route("api/tfa")]
 public class TfaRegistrationController : ControllerBase
 {
    private readonly ILogger<TfaRegistrationController> _logger;
    private readonly IEnvelopeReceiverService _envelopeReceiverService;
    private readonly IAuthenticator _authenticator;
    private readonly IReceiverService _receiverService;
    private readonly TFARegParams _parameters;
    private readonly IStringLocalizer<Resource> _localizer;
    /// <summary>
    /// Initializes a new instance of the <see cref="TfaRegistrationController"/> class.
    /// </summary>
    public TfaRegistrationController(
        ILogger<TfaRegistrationController> logger,
        IEnvelopeReceiverService envelopeReceiverService,
        IAuthenticator authenticator,
        IReceiverService receiverService,
        IOptions<TFARegParams> tfaRegParamsOptions,
        IStringLocalizer<Resource> localizer)
    {
        _logger = logger;
        _envelopeReceiverService = envelopeReceiverService;
        _authenticator = authenticator;
        _receiverService = receiverService;
        _parameters = tfaRegParamsOptions.Value;
        _localizer = localizer;
    }
    /// <summary>
    /// Generates registration metadata (QR code and deadline) for a receiver.
    /// </summary>
    /// <param name="envelopeReceiverId">Encoded envelope receiver id.</param>
    [Authorize]
    [HttpGet("{envelopeReceiverId}")]
    public async Task<IActionResult> RegisterAsync(string envelopeReceiverId)
    {
        try
        {
            var (uuid, signature) = envelopeReceiverId.DecodeEnvelopeReceiverId();
            if (uuid is null || signature is null)
            {
                _logger.LogEnvelopeError(uuid: uuid, signature: signature, message: _localizer.WrongEnvelopeReceiverId());
                return Unauthorized(new { message = _localizer.WrongEnvelopeReceiverId() });
            }
            var secretResult = await _envelopeReceiverService.ReadWithSecretByUuidSignatureAsync(uuid: uuid, signature: signature);
            if (secretResult.IsFailed)
            {
                _logger.LogNotice(secretResult.Notices);
                return NotFound(new { message = _localizer.WrongEnvelopeReceiverId() });
            }
            var envelopeReceiver = secretResult.Data;
            if (!envelopeReceiver.Envelope!.TFAEnabled)
                return Unauthorized(new { message = _localizer.WrongAccessCode() });
            var receiver = envelopeReceiver.Receiver;
            receiver!.TotpSecretkey = _authenticator.GenerateTotpSecretKey();
            await _receiverService.UpdateAsync(receiver);
            var totpQr64 = _authenticator.GenerateTotpQrCode(userEmail: receiver.EmailAddress, secretKey: receiver.TotpSecretkey).ToBase64String();
            if (receiver.TfaRegDeadline is null)
            {
                receiver.TfaRegDeadline = _parameters.Deadline;
                await _receiverService.UpdateAsync(receiver);
            }
            else if (receiver.TfaRegDeadline <= DateTime.Now)
            {
                return StatusCode(StatusCodes.Status410Gone, new { message = _localizer.WrongAccessCode() });
            }
            return Ok(new
            {
                envelopeReceiver.EnvelopeId,
                envelopeReceiver.Envelope!.Uuid,
                envelopeReceiver.Receiver!.Signature,
                receiver.TfaRegDeadline,
                TotpQR64 = totpQr64
            });
        }
        catch (Exception ex)
        {
            _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, exception: ex, message: _localizer.WrongEnvelopeReceiverId());
            return StatusCode(StatusCodes.Status500InternalServerError, new { message = _localizer.UnexpectedError() });
        }
    }
    /// <summary>
    /// Logs out the envelope receiver from cookie authentication.
    /// </summary>
    [Authorize(Roles = Role.FullyAuth)]
    [HttpPost("auth/logout")]
    public async Task<IActionResult> LogOutAsync()
    {
        try
        {
            await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
            return Ok();
        }
        catch (Exception ex)
        {
            _logger.LogError(ex, "{message}", ex.Message);
            return StatusCode(StatusCodes.Status500InternalServerError, new { message = _localizer.UnexpectedError() });
        }
    }
 }
--- a/EnvelopeGenerator.API/Documentation/AuthProxyDocumentFilter.cs
+++ b/EnvelopeGenerator.API/Documentation/AuthProxyDocumentFilter.cs
@@ -1,70 +0,0 @@
 using EnvelopeGenerator.API.Models;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 namespace EnvelopeGenerator.API.Documentation;
 /// <summary>
 /// 
 /// </summary>
 public sealed class AuthProxyDocumentFilter : IDocumentFilter
 {
    /// <summary>
    /// 
    /// </summary>
    /// <param name="swaggerDoc"></param>
    /// <param name="context"></param>
    public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
    {
        const string path = "/api/auth";
        var loginSchema = context.SchemaGenerator.GenerateSchema(typeof(Login), context.SchemaRepository);
        var loginExample = new OpenApiObject
        {
            ["password"] = new OpenApiString(""),
            ["username"] = new OpenApiString("")
        };
        var operation = new OpenApiOperation
        {
            Summary = "Proxy login (auth-hub)",
            Description = "Proxies the request to the auth service. Add query parameter `cookie=true|false`.",
            Tags = [new() { Name = "Auth" }],
            Parameters =
            {
                new OpenApiParameter
                {
                    Name = "cookie",
                    In = ParameterLocation.Query,
                    Required = false,
                    Schema = new OpenApiSchema { Type = "boolean", Default = new OpenApiBoolean(true) },
                    Example = new OpenApiBoolean(true),
                    Description = "If true, auth service sets the auth cookie."
                }
            },
            RequestBody = new OpenApiRequestBody
            {
                Required = true,
                Content =
                {
                    ["application/json"] = new OpenApiMediaType { Schema = loginSchema, Example = loginExample },
                    ["multipart/form-data"] = new OpenApiMediaType { Schema = loginSchema, Example = loginExample }
                }
            },
            Responses =
            {
                ["200"] = new OpenApiResponse { Description = "OK (proxied response)" },
                ["401"] = new OpenApiResponse { Description = "Unauthorized" }
            }
        };
        swaggerDoc.Paths[path] = new OpenApiPathItem
        {
            Operations =
            {
                [OperationType.Post] = operation
            }
        };
    }
 }
--- a/EnvelopeGenerator.API/EnvelopeClaimTypes.cs
+++ b/EnvelopeGenerator.API/EnvelopeClaimTypes.cs
@@ -1,17 +0,0 @@
 namespace EnvelopeGenerator.API;
 /// <summary>
 /// Provides custom claim types for envelope-related information.
 /// </summary>
 public static class EnvelopeClaimTypes
 {
    /// <summary>
    /// Claim type for the title of an envelope.
    /// </summary>
    public static readonly string Title = $"Envelope{nameof(Title)}";
    /// <summary>
    /// Claim type for the ID of an envelope.
    /// </summary>
    public static readonly string Id = $"Envelope{nameof(Id)}";
 }
--- a/EnvelopeGenerator.API/Extensions/ReceiverClaimExtensions.cs
+++ b/EnvelopeGenerator.API/Extensions/ReceiverClaimExtensions.cs
@@ -1,101 +0,0 @@
 using System.Linq;
 using System.Security.Claims;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 namespace EnvelopeGenerator.API.Extensions;
 /// <summary>
 /// Provides helper methods for working with envelope-specific authentication claims.
 /// </summary>
 public static class ReceiverClaimExtensions
 {
    private static string GetRequiredClaimOfReceiver(this ClaimsPrincipal user, string claimType)
    {
        var value = user.FindFirstValue(claimType);
        if (value is not null)
        {
            return value;
        }
        var identity = user.Identity;
        var principalName = identity?.Name ?? "(anonymous)";
        var authType = identity?.AuthenticationType ?? "(none)";
        var availableClaims = string.Join(", ", user.Claims.Select(c => $"{c.Type}={c.Value}"));
        var message = $"Required claim '{claimType}' is missing for user '{principalName}' (auth: {authType}). Available claims: [{availableClaims}].";
        throw new InvalidOperationException(message);
    }
    /// <summary>
    /// Gets the authenticated envelope UUID from the claims.
    /// </summary>
    public static string GetEnvelopeUuidOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.NameIdentifier);
    /// <summary>
    /// Gets the authenticated receiver signature from the claims.
    /// </summary>
    public static string GetReceiverSignatureOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.Hash);
    /// <summary>
    /// Gets the authenticated receiver display name from the claims.
    /// </summary>
    public static string GetReceiverNameOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.Name);
    /// <summary>
    /// Gets the authenticated receiver email address from the claims.
    /// </summary>
    public static string GetReceiverMailOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(ClaimTypes.Email);
    /// <summary>
    /// Gets the authenticated envelope title from the claims.
    /// </summary>
    public static string GetEnvelopeTitleOfReceiver(this ClaimsPrincipal user) => user.GetRequiredClaimOfReceiver(EnvelopeClaimTypes.Title);
    /// <summary>
    /// Gets the authenticated envelope identifier from the claims.
    /// </summary>
    public static int GetEnvelopeIdOfReceiver(this ClaimsPrincipal user)
    {
        var envIdStr = user.GetRequiredClaimOfReceiver(EnvelopeClaimTypes.Id);
        if (!int.TryParse(envIdStr, out var envId))
        {
            throw new InvalidOperationException($"Claim '{EnvelopeClaimTypes.Id}' is not a valid integer.");
        }
        return envId;
    }
    /// <summary>
    /// Signs in an envelope receiver using cookie authentication and attaches envelope claims.
    /// </summary>
    /// <param name="context">The current HTTP context.</param>
    /// <param name="envelopeReceiver">Envelope receiver DTO to extract claims from.</param>
    /// <param name="receiverRole">Role to attach to the authentication ticket.</param>
    public static async Task SignInEnvelopeAsync(this HttpContext context, EnvelopeReceiverDto envelopeReceiver, string receiverRole)
    {
        var claims = new List<Claim>
        {
            new(ClaimTypes.NameIdentifier, envelopeReceiver.Envelope!.Uuid),
            new(ClaimTypes.Hash, envelopeReceiver.Receiver!.Signature),
            new(ClaimTypes.Name, envelopeReceiver.Name ?? string.Empty),
            new(ClaimTypes.Email, envelopeReceiver.Receiver.EmailAddress),
            new(EnvelopeClaimTypes.Title, envelopeReceiver.Envelope.Title),
            new(EnvelopeClaimTypes.Id, envelopeReceiver.Envelope.Id.ToString()),
            new(ClaimTypes.Role, receiverRole)
        };
        var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
        var authProperties = new AuthenticationProperties
        {
            AllowRefresh = false,
            IsPersistent = false
        };
        await context.SignInAsync(
            CookieAuthenticationDefaults.AuthenticationScheme,
            new ClaimsPrincipal(claimsIdentity),
            authProperties);
    }
 }
--- a/EnvelopeGenerator.API/Extensions/SenderClaimExtensions.cs
+++ b/EnvelopeGenerator.API/Extensions/SenderClaimExtensions.cs
@@ -1,95 +0,0 @@
 using System.Security.Claims;
 namespace EnvelopeGenerator.API.Extensions
 {
    /// <summary>
    /// Provides extension methods for extracting user information from a <see cref="ClaimsPrincipal"/>.
    /// </summary>
    public static class SenderClaimExtensions
    {
        private static string GetRequiredClaimOfSender(this ClaimsPrincipal user, string claimType)
        {
            var value = user.FindFirstValue(claimType);
            if (value is not null)
            {
                return value;
            }
            var identity = user.Identity;
            var principalName = identity?.Name ?? "(anonymous)";
            var authType = identity?.AuthenticationType ?? "(none)";
            var availableClaims = string.Join(", ", user.Claims.Select(c => $"{c.Type}={c.Value}"));
            var message = $"Required claim '{claimType}' is missing for user '{principalName}' (auth: {authType}). Available claims: [{availableClaims}].";
            throw new InvalidOperationException(message);
        }
        private static string GetRequiredClaimOfSender(this ClaimsPrincipal user, params string[] claimTypes)
        {
            string? value = null;
            foreach (var claimType in claimTypes)
            {
                value = user.FindFirstValue(claimType);
                if (value is not null)
                    return value;
            }
            var identity = user.Identity;
            var principalName = identity?.Name ?? "(anonymous)";
            var authType = identity?.AuthenticationType ?? "(none)";
            var availableClaims = string.Join(", ", user.Claims.Select(c => $"{c.Type}={c.Value}"));
            var message = $"Required claim among [{string.Join(", ", claimTypes)}] is missing for user '{principalName}' (auth: {authType}). Available claims: [{availableClaims}].";
            throw new InvalidOperationException(message);
        }
        /// <summary>
        /// Retrieves the user's ID from the claims. Throws an exception if the ID is missing or invalid.
        /// </summary>
        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
        /// <returns>The user's ID as an integer.</returns>
        /// <exception cref="InvalidOperationException">Thrown if the user ID claim is missing or invalid.</exception>
        public static int GetId(this ClaimsPrincipal user)
        {
            var idValue = user.GetRequiredClaimOfSender(ClaimTypes.NameIdentifier, "sub");
            if (!int.TryParse(idValue, out var result))
            {
                throw new InvalidOperationException("User ID claim is missing or invalid. This may indicate a misconfigured or forged JWT token.");
            }
            return result;
        }
        /// <summary>
        /// Retrieves the username from the claims.
        /// </summary>
        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
        /// <returns>The username as a string.</returns>
        public static string GetUsername(this ClaimsPrincipal user)
            => user.GetRequiredClaimOfSender(ClaimTypes.Name);
        /// <summary>
        /// Retrieves the user's surname (last name) from the claims.
        /// </summary>
        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
        /// <returns>The surname as a string.</returns>
        public static string GetName(this ClaimsPrincipal user)
            => user.GetRequiredClaimOfSender(ClaimTypes.Surname);
        /// <summary>
        /// Retrieves the user's given name (first name) from the claims.
        /// </summary>
        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
        /// <returns>The given name as a string.</returns>
        public static string GetPrename(this ClaimsPrincipal user)
            => user.GetRequiredClaimOfSender(ClaimTypes.GivenName);
        /// <summary>
        /// Retrieves the user's email address from the claims.
        /// </summary>
        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
        /// <returns>The email address as a string.</returns>
        public static string GetEmail(this ClaimsPrincipal user)
            => user.GetRequiredClaimOfSender(ClaimTypes.Email);
    }
 }
--- a/EnvelopeGenerator.API/Models/Auth.cs
+++ b/EnvelopeGenerator.API/Models/Auth.cs
@@ -1,14 +0,0 @@
 namespace EnvelopeGenerator.API.Models;
 public record Auth(string? AccessCode = null, string? SmsCode = null, string? AuthenticatorCode = null, bool UserSelectSMS = default)
 {
    public bool HasAccessCode => AccessCode is not null;
    public bool HasSmsCode => SmsCode is not null;
    public bool HasAuthenticatorCode => AuthenticatorCode is not null;
    public bool HasMulti => new[] { HasAccessCode, HasSmsCode, HasAuthenticatorCode }.Count(state => state) > 1;
    public bool HasNone => !(HasAccessCode || HasSmsCode || HasAuthenticatorCode);
 }
--- a/EnvelopeGenerator.API/Models/ContactLink.cs
+++ b/EnvelopeGenerator.API/Models/ContactLink.cs
@@ -1,60 +0,0 @@
 namespace EnvelopeGenerator.API.Models
 {
    /// <summary>
    /// Represents a hyperlink for contact purposes with various HTML attributes.
    /// </summary>
    public class ContactLink
    {
        /// <summary>
        /// Gets or sets the label of the hyperlink.
        /// </summary>
        public string Label { get; init; } = "Contact";
        /// <summary>
        /// Gets or sets the URL that the hyperlink points to.
        /// </summary>
        public string Href { get; set; } = string.Empty;
        /// <summary>
        /// Gets or sets the target where the hyperlink should open.
        /// Commonly used values are "_blank", "_self", "_parent", "_top".
        /// </summary>
        public string Target { get; set; } = "_blank";
        /// <summary>
        /// Gets or sets the relationship of the linked URL as space-separated link types.
        /// Examples include "nofollow", "noopener", "noreferrer".
        /// </summary>
        public string Rel { get; set; } = string.Empty;
        /// <summary>
        /// Gets or sets the filename that should be downloaded when clicking the hyperlink.
        /// This attribute will only have an effect if the href attribute is set.
        /// </summary>
        public string Download { get; set; } = string.Empty;
        /// <summary>
        /// Gets or sets the language of the linked resource. Useful when linking to
        /// content in another language.
        /// </summary>
        public string HrefLang { get; set; } = "en";
        /// <summary>
        /// Gets or sets the MIME type of the linked URL. Helps browsers to handle
        /// the type correctly when the link is clicked.
        /// </summary>
        public string Type { get; set; } = string.Empty;
        /// <summary>
        /// Gets or sets additional information about the hyperlink, typically viewed
        /// as a tooltip when the mouse hovers over the link.
        /// </summary>
        public string Title { get; set; } = string.Empty;
        /// <summary>
        /// Gets or sets an identifier for the hyperlink, unique within the HTML document.
        /// </summary>
        public string Id { get; set; } = string.Empty;
    }
 }
--- a/EnvelopeGenerator.API/Models/Culture.cs
+++ b/EnvelopeGenerator.API/Models/Culture.cs
@@ -1,17 +0,0 @@
 using System.Globalization;
 namespace EnvelopeGenerator.API.Models;
 public class Culture
 {
    private string _language = string.Empty;
    public string Language { get => _language;
        init {
            _language = value;
            Info = new(value);
        } 
    }
    public string FIClass { get; init; } = string.Empty;
    public CultureInfo? Info { get; init; }
 }
--- a/EnvelopeGenerator.API/Models/Cultures.cs
+++ b/EnvelopeGenerator.API/Models/Cultures.cs
@@ -1,12 +0,0 @@
 namespace EnvelopeGenerator.API.Models;
 public class Cultures : List<Culture>
 {
    public IEnumerable<string> Languages => this.Select(c => c.Language);
    public IEnumerable<string> FIClasses => this.Select(c => c.FIClass);
    public Culture Default => this.First();
    public Culture? this[string? language] => language is null ? null : this.Where(c => c.Language == language).FirstOrDefault();
 }
--- a/EnvelopeGenerator.API/Models/CustomImages.cs
+++ b/EnvelopeGenerator.API/Models/CustomImages.cs
@@ -1,6 +0,0 @@
 namespace EnvelopeGenerator.API.Models;
 public class CustomImages : Dictionary<string, Image>
 {
    public new Image this[string key] => TryGetValue(key, out var img) && img is not null ? img : new();
 }
--- a/EnvelopeGenerator.API/Models/ErrorViewModel.cs
+++ b/EnvelopeGenerator.API/Models/ErrorViewModel.cs
@@ -1,10 +0,0 @@
 namespace EnvelopeGenerator.API.Models;
 public class ErrorViewModel
 {
    public string Title { get; init; } = "404";
    public string Subtitle { get; init; } = "Hmmm...";
    public string Body { get; init; } = "It looks like one of the developers fell asleep";
 }
--- a/EnvelopeGenerator.API/Models/Image.cs
+++ b/EnvelopeGenerator.API/Models/Image.cs
@@ -1,10 +0,0 @@
 namespace EnvelopeGenerator.API.Models;
 public class Image
 {
    public string Src { get; init; } = string.Empty;
    public Dictionary<string, string> Classes { get; init; } = new();
    public string GetClassIn(string page) => Classes.TryGetValue(page, out var cls) && cls is not null ? cls : string.Empty;
 }
--- a/EnvelopeGenerator.API/Models/MainViewModel.cs
+++ b/EnvelopeGenerator.API/Models/MainViewModel.cs
@@ -1,6 +0,0 @@
 namespace EnvelopeGenerator.API.Models;
 public class MainViewModel
 {
    public string? Title { get; init; }
 }
--- a/EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Annotation.cs
+++ b/EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Annotation.cs
@@ -1,93 +0,0 @@
 using EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
 using System.Text.Json.Serialization;
 namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
 public record Annotation : IAnnotation
 {
    public required string Name { get; init; }
    #region Bound Annotation
    [JsonIgnore]
    public string? HorBoundAnnotName { get; init; }
    [JsonIgnore]
    public string? VerBoundAnnotName { get; init; }
    #endregion
    #region Layout
    [JsonIgnore]
    public double? MarginLeft { get; set; }
    [JsonIgnore]
    public double MarginLeftRatio { get; init; } = 1;
    [JsonIgnore]
    public double? MarginTop { get; set; }
    [JsonIgnore]
    public double MarginTopRatio { get; init; } = 1;
    public double? Width { get; set; }
    [JsonIgnore]
    public double WidthRatio { get; init; } = 1;
    public double? Height { get; set; }
    [JsonIgnore]
    public double HeightRatio { get; init; } = 1;
    #endregion
    #region Position
    public double Left => (MarginLeft ?? 0) + (HorBoundAnnot?.HorBoundary ?? 0);
    public double Top => (MarginTop ?? 0) + (VerBoundAnnot?.VerBoundary ?? 0);
    #endregion
    #region Boundary
    [JsonIgnore]
    public double HorBoundary => Left + (Width ?? 0);
    [JsonIgnore]
    public double VerBoundary => Top + (Height ?? 0);
    #endregion
    #region BoundAnnot
    [JsonIgnore]
    public Annotation? HorBoundAnnot { get; set; }
    [JsonIgnore]
    public Annotation? VerBoundAnnot { get; set; }
    #endregion
    public Color? BackgroundColor { get; init; }
    #region Border
    public Color? BorderColor { get; init; }
    public string? BorderStyle { get; init; }
    public int? BorderWidth { get; set; }
    #endregion
    [JsonIgnore]
    internal Annotation Default 
    { 
        set 
        {
            // To set null value, annotation must have null (0) value but null must has non-null value
            if (MarginLeft == null && value.MarginLeft != null)
                MarginLeft = value.MarginLeft * MarginLeftRatio;
            if (MarginTop == null && value.MarginTop != null)
                MarginTop = value.MarginTop * MarginTopRatio;
            if (Width == null && value.Width != null)
                Width = value.Width * WidthRatio;
            if (Height == null && value.Height != null)
                Height = value.Height * HeightRatio;
        }
    }
 };
--- a/EnvelopeGenerator.API/Models/PsPdfKitAnnotation/AnnotationParams.cs
+++ b/EnvelopeGenerator.API/Models/PsPdfKitAnnotation/AnnotationParams.cs
@@ -1,80 +0,0 @@
 using EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
 using System.Text.Json.Serialization;
 namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
 public class AnnotationParams
 {
    public AnnotationParams()
    {
        _AnnotationJSObjectInitor = new(CreateAnnotationJSObject);
    }
    public Background? Background { get; init; }
    #region Annotation
    [JsonIgnore]
    public Annotation? DefaultAnnotation { get; init; }
    private readonly List<Annotation> _annots = new List<Annotation>();
    public bool TryGet(string name, out Annotation annotation)
    {
 #pragma warning disable CS8601 // Possible null reference assignment.
        annotation = _annots.FirstOrDefault(a => a.Name == name);
 #pragma warning restore CS8601 // Possible null reference assignment.
        return annotation is not null;
    }
    public required IEnumerable<Annotation> Annotations
    {
        get => _annots;
        init
        {
            _annots = value.ToList();
            if (DefaultAnnotation is not null)
                foreach (var annot in _annots)
                    annot.Default = DefaultAnnotation;
            for (int i = 0; i < _annots.Count; i++)
            {
                #region set bound annotations
                // horizontal
                if (_annots[i].HorBoundAnnotName is string horBoundAnnotName)
                    if (TryGet(horBoundAnnotName, out var horBoundAnnot))
                        _annots[i].HorBoundAnnot = horBoundAnnot;
                    else
                        throw new InvalidOperationException($"{horBoundAnnotName} added as bound anotation. However, it is not defined.");
                // vertical
                if (_annots[i].VerBoundAnnotName is string verBoundAnnotName)
                    if (TryGet(verBoundAnnotName, out var verBoundAnnot))
                        _annots[i].VerBoundAnnot = verBoundAnnot;
                    else
                        throw new InvalidOperationException($"{verBoundAnnotName} added as bound anotation. However, it is not defined.");
                #endregion
            }
        }
    }
    #endregion
    #region AnnotationJSObject
    private Dictionary<string, IAnnotation> CreateAnnotationJSObject()
    {
        var dict = _annots.ToDictionary(a => a.Name.ToLower(), a => a as IAnnotation);
        if (Background is not null)
        {
            Background.Locate(_annots);
            dict.Add(Background.Name.ToLower(), Background);
        }            
        return dict;
    }
    private readonly Lazy<Dictionary<string, IAnnotation>> _AnnotationJSObjectInitor;
    public Dictionary<string, IAnnotation> AnnotationJSObject => _AnnotationJSObjectInitor.Value;
    #endregion
 }
--- a/EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Background.cs
+++ b/EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Background.cs
@@ -1,58 +0,0 @@
 using System.Text.Json.Serialization;
 namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
 /// <summary>
 /// The Background is an annotation for the PSPDF Kit. However, it has no function.
 /// It is only the first annotation as a background for other annotations.
 /// </summary>
 public record Background : IAnnotation
 {
    [JsonIgnore]
    public double Margin { get; init; }
    public string Name { get; } = "Background";
    public double? Width { get; set; }
    public double? Height { get; set; }
    public double Left { get; set; }
    public double Top { get; set; }
    public Color? BackgroundColor { get; init; }
    #region Border
    public Color? BorderColor { get; init; }
    public string? BorderStyle { get; init; }
    public int? BorderWidth { get; set; }
    #endregion
    public void Locate(IEnumerable<IAnnotation> annotations)
    {
        // set Top
        if (annotations.MinBy(a => a.Top)?.Top is double minTop)
            Top = minTop;
        // set Left
        if (annotations.MinBy(a => a.Left)?.Left is double minLeft)
            Left = minLeft;
        // set Width
        if(annotations.MaxBy(a => a.GetRight())?.GetRight() is double maxRight)
            Width = maxRight - Left;
        // set Height
        if (annotations.MaxBy(a => a.GetBottom())?.GetBottom() is double maxBottom)
            Height = maxBottom - Top;
        // add margins
        Top -= Margin;
        Left -= Margin;
        Width += Margin * 2;
        Height += Margin * 2;
    }
 }
--- a/EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Color.cs
+++ b/EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Color.cs
@@ -1,10 +0,0 @@
 namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
 public record Color
 {
    public int R { get; init; } = 0;
    public int G { get; init; } = 0;
    public int B { get; init; } = 0;
 }
--- a/EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Extensions.cs
+++ b/EnvelopeGenerator.API/Models/PsPdfKitAnnotation/Extensions.cs
@@ -1,8 +0,0 @@
 namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
 public static class Extensions
 {
    public static double GetRight(this IAnnotation annotation) => annotation.Left + annotation?.Width ?? 0;
    public static double GetBottom(this IAnnotation annotation) => annotation.Top + annotation?.Height ?? 0;
 }
--- a/EnvelopeGenerator.API/Models/PsPdfKitAnnotation/IAnnotation.cs
+++ b/EnvelopeGenerator.API/Models/PsPdfKitAnnotation/IAnnotation.cs
@@ -1,22 +0,0 @@
 namespace EnvelopeGenerator.API.Models.PsPdfKitAnnotation;
 public interface IAnnotation
 {
    string Name { get; }
    double? Width { get; }
    double? Height { get; }
    double Left { get; }
    double Top { get; }
    Color? BackgroundColor { get; }
    Color? BorderColor { get; }
    string? BorderStyle { get; }
    int? BorderWidth { get; }
 }
--- a/EnvelopeGenerator.API/Models/TFARegParams.cs
+++ b/EnvelopeGenerator.API/Models/TFARegParams.cs
@@ -1,17 +0,0 @@
 namespace EnvelopeGenerator.API.Models;
 /// <summary>
 /// Represents the parameters for two-factor authentication (2FA) registration.
 /// </summary>
 public class TFARegParams
 {
    /// <summary>
    /// The maximum allowed time for completing the registration process.
    /// </summary>
    public TimeSpan TimeLimit { get; init; } = new(0, 30, 0);
    /// <summary>
    /// The deadline for registration, calculated as the current time plus the <see cref="TimeLimit"/>.
    /// </summary>
    public DateTime Deadline => DateTime.Now.AddTicks(TimeLimit.Ticks);
 }
--- a/EnvelopeGenerator.API/yarp.json
+++ b/EnvelopeGenerator.API/yarp.json
@@ -1,25 +0,0 @@
 {
  "ReverseProxy": {
    "Routes": {
      "auth-login": {
        "ClusterId": "auth-hub",
        "Match": {
          "Path": "/api/auth",
          "Methods": [ "POST" ]
        },
        "Transforms": [
          { "PathSet": "/api/auth/sign-flow" }
        ]
      }
    },
    "Clusters": {
      "auth-hub": {
        "Destinations": {
          "primary": {
            "Address": "http://172.24.12.39:9090"
          }
        }
      }
    }
  }
 }
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs
@@ -74,11 +74,6 @@ public record EnvelopeDto
    /// </summary>
    public int? EnvelopeTypeId { get; set; }
    /// <summary>
    /// 
    /// </summary>
    public bool ReadOnly => EnvelopeTypeId == 2;
    /// <summary>
    /// 
    /// </summary>
--- a/EnvelopeGenerator.Application/Common/Extensions/LoggerExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/LoggerExtensions.cs
@@ -3,19 +3,8 @@ using System.Text;
 namespace EnvelopeGenerator.Application.Common.Extensions
 {
    /// <summary>
    /// 
    /// </summary>
    public static class LoggerExtensions
    {
        /// <summary>
        /// 
        /// </summary>
        /// <param name="logger"></param>
        /// <param name="envelopeReceiverId"></param>
        /// <param name="exception"></param>
        /// <param name="message"></param>
        /// <param name="args"></param>
        public static void LogEnvelopeError(this ILogger logger, string envelopeReceiverId, Exception? exception = null, string? message = null, params object?[] args)
        {
            var sb = new StringBuilder().AppendLine(envelopeReceiverId.DecodeEnvelopeReceiverId().ToTitle());
@@ -29,15 +18,6 @@ namespace EnvelopeGenerator.Application.Common.Extensions
                logger.Log(LogLevel.Error, exception, sb.AppendLine(exception.Message).ToString(), args);
        }
        /// <summary>
        /// 
        /// </summary>
        /// <param name="logger"></param>
        /// <param name="uuid"></param>
        /// <param name="signature"></param>
        /// <param name="exception"></param>
        /// <param name="message"></param>
        /// <param name="args"></param>
        public static void LogEnvelopeError(this ILogger logger, string? uuid, string? signature = null, Exception? exception = null, string? message = null, params object?[] args)
        {
            var sb = new StringBuilder($"Envelope Uuid: {uuid}");
@@ -54,11 +34,6 @@ namespace EnvelopeGenerator.Application.Common.Extensions
                logger.Log(LogLevel.Error, exception, sb.ToString(), args);
        }
        /// <summary>
        /// 
        /// </summary>
        /// <param name="envelopeReceiverTuple"></param>
        /// <returns></returns>
        public static string ToTitle(this (string? UUID, string? Signature) envelopeReceiverTuple)
        {
            return $"UUID is {envelopeReceiverTuple.UUID} and signature is {envelopeReceiverTuple.Signature}";
--- a/EnvelopeGenerator.Application/Common/Extensions/TaskExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/TaskExtensions.cs
@@ -5,7 +5,6 @@ namespace EnvelopeGenerator.Application.Common.Extensions;
 /// <summary>
 /// Extension methods for tasks
 /// </summary>
 [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
 public static class TaskExtensions
 {
    /// <summary>
@@ -18,7 +17,6 @@ public static class TaskExtensions
    /// <param name="factory">Exception provider</param>
    /// <returns>The awaited result if not <c>null</c>.</returns>
    /// <exception>Thrown if the result is <c>null</c>.</exception>
    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
    public static async Task<T> ThrowIfNull<T, TException>(this Task<T?> task, Func<TException> factory) where TException : Exception
    {
        var result = await task;
@@ -35,7 +33,6 @@ public static class TaskExtensions
    /// <param name="factory">Exception provider</param>
    /// <returns>The awaited collection if it is not <c>null</c> or empty.</returns>
    /// <exception cref="NotFoundException">Thrown if the result is <c>null</c> or empty.</exception>
    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
    public static async Task<IEnumerable<T>> ThrowIfEmpty<T, TException>(this Task<IEnumerable<T>> task, Func<TException> factory) where TException : Exception
    {
        var result = await task;
@@ -50,33 +47,11 @@ public static class TaskExtensions
    /// <param name="task"></param>
    /// <param name="act"></param>
    /// <returns></returns>
    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
    public static async Task<I> Then<T, I>(this Task<T> task, Func<T, I> act)
    {
        var res = await task;
        return act(res);
    }
    /// <summary>
    /// 
    /// </summary>
    /// <typeparam name="T"></typeparam>
    /// <param name="task"></param>
    /// <returns></returns>
    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
    public static Task<T?> FirstOrDefaultAsync<T>(this Task<IEnumerable<T>> task) => task.Then(t => t.FirstOrDefault());
    /// <summary>
    /// 
    /// </summary>
    /// <typeparam name="T"></typeparam>
    /// <typeparam name="TException"></typeparam>
    /// <param name="task"></param>
    /// <param name="factory"></param>
    /// <returns></returns>
    public static Task<T> FirstAsync<T, TException>(this Task<IEnumerable<T>> task, Func<TException> factory) 
        where TException : Exception 
        => task.Then(t => t.FirstOrDefault() ?? throw factory());
 }
 /// <summary>
@@ -93,13 +68,11 @@ public static class Exceptions
    /// 
    /// </summary>
    /// <returns></returns>
    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
    public static BadRequestException BadRequest() => new();
    /// <summary>
    /// 
    /// </summary>
    /// <returns></returns>
    [Obsolete("Implement Mediator behaviors in the Osolete .NET project.")]
    public static ForbiddenException Forbidden() => new();
 }
--- a/EnvelopeGenerator.Application/Common/Extensions/XSSExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/XSSExtensions.cs
@@ -2,42 +2,16 @@
 using Microsoft.Extensions.Localization;
 using System.Text.Encodings.Web;
-namespace EnvelopeGenerator.Application.Common.Extensions;
+namespace EnvelopeGenerator.Application.Common.Extensions
 /// <summary>
 /// 
 /// </summary>
 public static class XSSExtensions
 {
-    /// <summary>
+    public static class XSSExtensions
-    /// 
+    {
-    /// </summary>
+        public static string? TryEncode(this string? value, UrlEncoder encoder) => value is null ? value : encoder.Encode(value);
    /// <param name="value"></param>
    /// <param name="encoder"></param>
    /// <returns></returns>
    public static string? TryEncode(this string? value, UrlEncoder encoder) => value is null ? value : encoder.Encode(value);
-    /// <summary>
+        public static string? TryEncode(this LocalizedString? value, UrlEncoder encoder) => value is null ? null : encoder.Encode(value);
    /// 
    /// </summary>
    /// <param name="value"></param>
    /// <param name="encoder"></param>
    /// <returns></returns>
    public static string? TryEncode(this LocalizedString? value, UrlEncoder encoder) => value is null ? null : encoder.Encode(value);
-    /// <summary>
+        public static string? TrySanitize(this string? html, HtmlSanitizer sanitizer) => html is null ? html : sanitizer.Sanitize(html);
    /// 
    /// </summary>
    /// <param name="html"></param>
    /// <param name="sanitizer"></param>
    /// <returns></returns>
    public static string? TrySanitize(this string? html, HtmlSanitizer sanitizer) => html is null ? html : sanitizer.Sanitize(html);
-    /// <summary>
+        public static string? TrySanitize(this LocalizedString? html, HtmlSanitizer sanitizer) => html is null ? null : sanitizer.Sanitize(html);
-    /// 
+    }
    /// </summary>
    /// <param name="html"></param>
    /// <param name="sanitizer"></param>
    /// <returns></returns>
    public static string? TrySanitize(this LocalizedString? html, HtmlSanitizer sanitizer) => html is null ? null : sanitizer.Sanitize(html);
 }
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/DocSignedNotification.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/DocSignedNotification.cs
@@ -24,7 +24,7 @@ public record DocSignedNotification(EnvelopeReceiverDto Original) : EnvelopeRece
    /// <summary>
    /// 
    /// </summary>
-    public PsPdfKitAnnotation? PsPdfKitAnnotation { get; init; }
+    public PsPdfKitAnnotation PsPdfKitAnnotation { get; init; } = null!;
    /// <summary>
    /// 
@@ -59,7 +59,7 @@ public static class DocSignedNotificationExtensions
    /// <param name="dtoTask"></param>
    /// <param name="psPdfKitAnnotation"></param>
    /// <returns></returns>
-    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, PsPdfKitAnnotation? psPdfKitAnnotation)
+    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, PsPdfKitAnnotation psPdfKitAnnotation)
        => await dtoTask is EnvelopeReceiverDto dto ? new(dto) { PsPdfKitAnnotation = psPdfKitAnnotation } : null;
    /// <summary>
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/AnnotationHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/AnnotationHandler.cs
@@ -29,9 +29,6 @@ public class AnnotationHandler : INotificationHandler<DocSignedNotification>
    /// <param name="notification"></param>
    /// <param name="cancel"></param>
    /// <returns></returns>
-    public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
+    public Task Handle(DocSignedNotification notification, CancellationToken cancel)
-    {
+        => _repo.CreateAsync(notification.PsPdfKitAnnotation.Structured, cancel);
        if (notification.PsPdfKitAnnotation is PsPdfKitAnnotation annot)
            await _repo.CreateAsync(annot.Structured, cancel);
    }
 }
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/DocStatusHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/DocStatusHandler.cs
@@ -10,8 +10,6 @@ namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 /// </summary>
 public class DocStatusHandler : INotificationHandler<DocSignedNotification>
 {
    private const string BlankAnnotationJson = "{}";
    private readonly ISender _sender;
    /// <summary>
@@ -35,9 +33,7 @@ public class DocStatusHandler : INotificationHandler<DocSignedNotification>
        {
            Envelope = new() { Id = notification.EnvelopeId },
            Receiver = new() { Id = notification.ReceiverId},
-            Value = notification.PsPdfKitAnnotation is PsPdfKitAnnotation annot 
+            Value = JsonSerializer.Serialize(notification.PsPdfKitAnnotation.Instant, Format.Json.ForAnnotations)
                    ? JsonSerializer.Serialize(annot.Instant, Format.Json.ForAnnotations) 
                    : BlankAnnotationJson
        }, cancel);
    }
 }
--- a/EnvelopeGenerator.Application/Documents/Queries/ReadDocumentQuery.cs
+++ b/EnvelopeGenerator.Application/Documents/Queries/ReadDocumentQuery.cs
@@ -4,7 +4,6 @@ using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using AutoMapper;
 using EnvelopeGenerator.Application.Common.Dto;
 using DigitalData.Core.Exceptions;
 namespace EnvelopeGenerator.Application.Documents.Queries;
@@ -13,14 +12,14 @@ namespace EnvelopeGenerator.Application.Documents.Queries;
 /// </summary>
 /// <param name="Id">The unique identifier of the document. Optional.</param>
 /// <param name="EnvelopeId">The identifier of the envelope associated with the document. Optional.</param>
-public record ReadDocumentQuery(int? Id = null, int? EnvelopeId = null) : IRequest<DocumentDto>
+public record ReadDocumentQuery(int? Id = null, int? EnvelopeId = null) : IRequest<DocumentDto?>
 {
 }
 /// <summary>
 /// Handles queries for reading <see cref="Document"/> data based on either the document ID or the envelope ID.
 /// </summary>
-public class ReadDocumentQueryHandler : IRequestHandler<ReadDocumentQuery, DocumentDto>
+public class ReadDocumentQueryHandler : IRequestHandler<ReadDocumentQuery, DocumentDto?>
 {
    /// <summary>
    /// TempRepo for accessing <see cref="Document"/> entities.
@@ -51,19 +50,20 @@ public class ReadDocumentQueryHandler : IRequestHandler<ReadDocumentQuery, Docum
    /// <exception cref="InvalidOperationException">
    /// Thrown when neither <see cref="ReadDocumentQuery.Id"/> nor <see cref="ReadDocumentQuery.EnvelopeId"/> is provided.
    /// </exception>
-    public async Task<DocumentDto> Handle(ReadDocumentQuery query, CancellationToken cancel)
+    public async Task<DocumentDto?> Handle(ReadDocumentQuery query, CancellationToken cancel)
    {
        if (query.Id is not null)
        {
-            var doc = await _repo.Query.Where(d => d.Id == query.Id).FirstOrDefaultAsync(cancel);
+            var doc = await _repo.ReadOnly().Where(d => d.Id == query.Id).FirstOrDefaultAsync(cancel);
            return _mapper.Map<DocumentDto>(doc);
        }            
        else if (query.EnvelopeId is not null)
        {
-            var doc = await _repo.Query.Where(d => d.EnvelopeId == query.EnvelopeId).FirstOrDefaultAsync(cancel);
+            var doc = await _repo.ReadOnly().Where(d => d.EnvelopeId == query.EnvelopeId).FirstOrDefaultAsync(cancel);
            return _mapper.Map<DocumentDto>(doc);
        }
-        throw new NotFoundException();
+        throw new InvalidOperationException(
            $"Invalid {nameof(ReadDocumentQuery)}: either {nameof(query.Id)} or {nameof(query.EnvelopeId)} must be provided.");
    }
 }
--- a/EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommandHandler.cs
+++ b/EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommandHandler.cs
@@ -22,7 +22,6 @@ public class UpdateEmailTemplateCommandHandler : IRequestHandler<UpdateEmailTemp
    /// 
    /// </summary>
    /// <param name="repository"></param>
    /// <param name="mapper"></param>
    public UpdateEmailTemplateCommandHandler(IRepository<EmailTemplate> repository, IMapper mapper)
    {
        _repository = repository;
--- a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj
+++ b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj
@@ -14,7 +14,7 @@
 	<ItemGroup>
 		<PackageReference Include="Dapper" Version="2.1.66" />
-		<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.6.0" />
+		<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.4.0" />
 		<PackageReference Include="DigitalData.Core.Application" Version="3.4.0" />
 		<PackageReference Include="DigitalData.Core.Client" Version="2.1.0" />
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
@@ -1,4 +1,4 @@
-using AutoMapper;
+using AutoMapper;
 using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Application.Envelopes.Queries;
@@ -47,13 +47,7 @@ namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 /// Die Antwort enthält Details wie den Include, die Zuordnung zwischen Umschlag und Empfänger 
 /// sowie zusätzliche Metadaten.
 /// </remarks>
-public record ReadEnvelopeReceiverQuery : EnvelopeReceiverQueryBase<ReadEnvelopeQuery, ReadReceiverQuery>, IRequest<IEnumerable<EnvelopeReceiverDto>>
+public record ReadEnvelopeReceiverQuery : EnvelopeReceiverQueryBase<ReadEnvelopeQuery, ReadReceiverQuery>, IRequest<IEnumerable<EnvelopeReceiverDto>>;
 {
    /// <summary>
    /// Optionaler Benutzernamefilter, um Ergebnisse auf Umschläge eines bestimmten Besitzers einzuschränken.
    /// </summary>
    public string? Username { get; init; }
 }
 /// <summary>
 /// 
@@ -67,11 +61,10 @@ public static class Extensions
    /// <param name="key"></param>
    /// <param name="cancel"></param>
    /// <returns></returns>
-    public static async Task<EnvelopeReceiverDto?> ReadEnvelopeReceiverAsync(this IMediator mediator, string key, CancellationToken cancel = default)
+    public static Task<EnvelopeReceiverDto?> ReadEnvelopeReceiverAsync(this IMediator mediator, string key, CancellationToken cancel = default)
    {
        var q = new ReadEnvelopeReceiverQuery() { Key = key };
-        var envRcvs = await mediator.Send(q, cancel);
+        return mediator.Send(q, cancel).Then(envRcvs => envRcvs.FirstOrDefault());
        return envRcvs.FirstOrDefault();
    }
    /// <summary>
@@ -82,82 +75,80 @@ public static class Extensions
    /// <param name="signature"></param>
    /// <param name="cancel"></param>
    /// <returns></returns>
-    public static async Task<EnvelopeReceiverDto?> ReadEnvelopeReceiverAsync(this IMediator mediator, string uuid, string signature, CancellationToken cancel = default)
+    public static Task<EnvelopeReceiverDto?> ReadEnvelopeReceiverAsync(this IMediator mediator, string uuid, string signature, CancellationToken cancel = default)
    {
        var q = new ReadEnvelopeReceiverQuery();
        q.Envelope.Uuid = uuid;
        q.Receiver.Signature = signature;
-        var envRcvs = await mediator.Send(q, cancel);
+        return mediator.Send(q, cancel).Then(envRcvs => envRcvs.FirstOrDefault());
        return envRcvs.FirstOrDefault();
    }
 }
 /// <summary>
 /// 
 /// </summary>
 public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeReceiverQuery, IEnumerable<EnvelopeReceiverDto>>
 {
    private readonly IRepository<EnvelopeReceiver> _repo;
    private readonly IRepository<Receiver> _rcvRepo;
    private readonly IMapper _mapper;
    /// <summary>
-    /// Verarbeitet <see cref="ReadEnvelopeReceiverQuery"/> und liefert passende <see cref="EnvelopeReceiverDto"/>-Ergebnisse.
+    /// 
    /// </summary>
-    public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeReceiverQuery, IEnumerable<EnvelopeReceiverDto>>
+    /// <param name="envelopeReceiver"></param>
    /// <param name="mapper"></param>
    public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IRepository<Receiver> rcvRepo, IMapper mapper)
    {
-        private readonly IRepository<EnvelopeReceiver> _repo;
+        _repo = envelopeReceiver;
-        private readonly IRepository<Receiver> _rcvRepo;
+        _mapper = mapper;
-        private readonly IMapper _mapper;
+        _rcvRepo = rcvRepo;
        /// <summary>
        /// 
        /// </summary>
        /// <param name="envelopeReceiver"></param>
        /// <param name="rcvRepo"></param>
        /// <param name="mapper"></param>
        public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IRepository<Receiver> rcvRepo, IMapper mapper)
        {
            _repo = envelopeReceiver;
            _mapper = mapper;
            _rcvRepo = rcvRepo;
        }
        /// <summary>
        /// 
        /// </summary>
        /// <param name="request"></param>
        /// <param name="cancel"></param>
        /// <returns></returns>
        /// <exception cref="BadRequestException"></exception>
        public async Task<IEnumerable<EnvelopeReceiverDto>> Handle(ReadEnvelopeReceiverQuery request, CancellationToken cancel)
        {
            var q = _repo.Query.Where(request, notnull: false);
            if (request.Username is string username)
                q = q.Where(er => er.Envelope!.User.Username == username);
            if (request.Envelope.Status is not null)
            {
                var status = request.Envelope.Status;
                if (status.Min is not null)
                    q = q.Where(er => er.Envelope!.Status >= status.Min);
                if (status.Max is not null)
                    q = q.Where(er => er.Envelope!.Status <= status.Max);
                if (status.Include?.Length > 0)
                    q = q.Where(er => status.Include.Contains(er.Envelope!.Status));
                if (status.Ignore is not null)
                    q = q.Where(er => !status.Ignore.Contains(er.Envelope!.Status));
            }
            var envRcvs = await q
                            .Include(er => er.Envelope).ThenInclude(e => e!.Documents!).ThenInclude(d => d.Elements)
                            .Include(er => er.Envelope).ThenInclude(e => e!.Histories)
                            .Include(er => er.Envelope).ThenInclude(e => e!.User)
                            .Include(er => er.Receiver)
                            .ToListAsync(cancel);
            if (request.Receiver.HasAnyCriteria && envRcvs.Count != 0)
            {
                var receiver = await _rcvRepo.Query.Where(request.Receiver).FirstAsync(cancel);
                foreach (var envRcv in envRcvs)
                    envRcv.Envelope?.Documents?.FirstOrDefault()?.Elements?.RemoveAll(s => s.ReceiverId != receiver.Id);
            }
            return _mapper.Map<List<EnvelopeReceiverDto>>(envRcvs);
        }
    }
-}
+
    /// <summary>
    /// 
    /// </summary>
    /// <param name="request"></param>
    /// <param name="cancel"></param>
    /// <returns></returns>
    /// <exception cref="BadRequestException"></exception>
    public async Task<IEnumerable<EnvelopeReceiverDto>> Handle(ReadEnvelopeReceiverQuery request, CancellationToken cancel)
    {
        var q = _repo.ReadOnly().Where(request, notnull: false);
        if (request.Envelope.Status is not null)
        {
            var status = request.Envelope.Status;
            if (status.Min is not null)
                q = q.Where(er => er.Envelope!.Status >= status.Min);
            if (status.Max is not null)
                q = q.Where(er => er.Envelope!.Status <= status.Max);
            if (status.Include?.Length > 0)
                q = q.Where(er => status.Include.Contains(er.Envelope!.Status));
            if (status.Ignore is not null)
                q = q.Where(er => !status.Ignore.Contains(er.Envelope!.Status));
        }
        var envRcvs = await q
                        .Include(er => er.Envelope).ThenInclude(e => e!.Documents!).ThenInclude(d => d.Elements)
                        .Include(er => er.Envelope).ThenInclude(e => e!.Histories)
                        .Include(er => er.Envelope).ThenInclude(e => e!.User)
                        .Include(er => er.Receiver)
                        .ToListAsync(cancel);
        if (request.Receiver.HasAnyCriteria && envRcvs.Any())
        {
            var receiver = await _rcvRepo.ReadOnly().Where(request.Receiver).FirstAsync(cancel);
            foreach (var envRcv in envRcvs)
                envRcv.Envelope?.Documents?.First().Elements.RemoveAll(s => s.ReceiverId != receiver.Id);
        }
        return _mapper.Map<List<EnvelopeReceiverDto>>(envRcvs);
    }
 } 
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
@@ -68,6 +68,6 @@ public class ReceiverAlreadySignedQueryHandler : IRequestHandler<ReceiverAlready
    /// <returns></returns>
    public async Task<bool> Handle(ReceiverAlreadySignedQuery request, CancellationToken cancel = default)
    {
-        return await _repo.Query.Where(request).Where(h => h.Status == EnvelopeStatus.DocumentSigned).AnyAsync(cancel);
+        return await _repo.ReadOnly().Where(request).Where(h => h.Status == EnvelopeStatus.DocumentSigned).AnyAsync(cancel);
    }
 }
--- a/EnvelopeGenerator.Application/EnvelopeTypes/Queries/ReadEnvelopeTypesQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeTypes/Queries/ReadEnvelopeTypesQuery.cs
@@ -1,45 +0,0 @@
 using EnvelopeGenerator.Application.Common.Dto;
 using MediatR;
 using AutoMapper;
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 namespace EnvelopeGenerator.Application.EnvelopeTypes.Queries;
 /// <summary>
 /// 
 /// </summary>
 public record ReadEnvelopeTypesQuery : IRequest<IEnumerable<EnvelopeTypeDto>>;
 /// <summary>
 /// 
 /// </summary>
 public class ReadEnvelopeTypesQueryHandler : IRequestHandler<ReadEnvelopeTypesQuery, IEnumerable<EnvelopeTypeDto>>
 {
    private readonly IRepository<EnvelopeType> _repository;
    private readonly IMapper _mapper;
    /// <summary>
    /// 
    /// </summary>
    /// <param name="repository"></param>
    /// <param name="mapper"></param>
    public ReadEnvelopeTypesQueryHandler(IRepository<EnvelopeType> repository, IMapper mapper)
    {
        _repository = repository;
        _mapper = mapper;
    }
    /// <summary>
    /// 
    /// </summary>
    /// <param name="request"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    public async Task<IEnumerable<EnvelopeTypeDto>> Handle(ReadEnvelopeTypesQuery request, CancellationToken cancellationToken)
    {
        var types = await _repository.Query.ToListAsync(cancellationToken);
        return _mapper.Map<IEnumerable<EnvelopeTypeDto>>(types);
    }
 }
--- a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs
+++ b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs
@@ -33,18 +33,7 @@ public record CreateEnvelopeCommand : IRequest<EnvelopeDto?>
    /// <summary>
    /// ID des Absenders
    /// </summary>
-    internal int UserId { get; private set; }
+    public int UserId { get; set; }
    /// <summary>
    /// 
    /// </summary>
    /// <param name="userId"></param>
    /// <returns></returns>
    public bool Authorize(int userId)
    {
        UserId = userId;
        return true;
    }
    /// <summary>
    /// Determines which component is used for envelope processing.
--- a/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs
+++ b/EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs
@@ -1,33 +1,18 @@
 using MediatR;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Query;
 using EnvelopeGenerator.Application.Common.Dto;
 using AutoMapper;
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 namespace EnvelopeGenerator.Application.Envelopes.Queries;
 /// <summary>
 /// Repräsentiert eine Abfrage für Umschläge.
 /// </summary>
-public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest<IEnumerable<EnvelopeDto>>
+public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest
 {
    /// <summary>
    /// Abfrage des Include des Umschlags
    /// </summary>
    public EnvelopeStatusQuery? Status { get; init; }
    /// <summary>
    /// Optionaler Benutzerfilter; wenn gesetzt, werden nur Umschläge des Benutzers geladen.
    /// </summary>
    public int? UserId { get; init; }
    /// <summary>
    /// Setzt den Benutzerkontext für die Abfrage.
    /// </summary>
    public ReadEnvelopeQuery Authorize(int userId) => this with { UserId = userId };
 }
 /// <summary>
@@ -80,62 +65,4 @@ public record EnvelopeStatusQuery
    /// Eine Liste von Statuswerten, die ignoriert werden werden.
    /// </summary>
    public EnvelopeStatus[]? Ignore { get; init; }
 }
 /// <summary>
 /// Verarbeitet <see cref="ReadEnvelopeQuery"/> und liefert passende <see cref="EnvelopeDto"/>-Ergebnisse.
 /// </summary>
 public class ReadEnvelopeQueryHandler : IRequestHandler<ReadEnvelopeQuery, IEnumerable<EnvelopeDto>>
 {
    private readonly IRepository<Envelope> _repository;
    private readonly IMapper _mapper;
    /// <summary>
    /// 
    /// </summary>
    /// <param name="repository"></param>
    /// <param name="mapper"></param>
    public ReadEnvelopeQueryHandler(IRepository<Envelope> repository, IMapper mapper)
    {
        _repository = repository;
        _mapper = mapper;
    }
    /// <summary>
    /// 
    /// </summary>
    /// <param name="request"></param>
    /// <param name="cancel"></param>
    /// <returns></returns>
    public async Task<IEnumerable<EnvelopeDto>> Handle(ReadEnvelopeQuery request, CancellationToken cancel)
    {
        var query = _repository.Query;
        if (request.UserId is int userId)
            query = query.Where(e => e.UserId == userId);
        if (request.Id is int id)
            query = query.Where(e => e.Id == id);
        if (request.Uuid is string uuid)
            query = query.Where(e => e.Uuid == uuid);
        if (request.Status is { } status)
        {
            if (status.Min is not null)
                query = query.Where(e => e.Status >= status.Min);
            if (status.Max is not null)
                query = query.Where(e => e.Status <= status.Max);
            if (status.Include?.Length > 0)
                query = query.Where(e => status.Include.Contains(e.Status));
            if (status.Ignore?.Length > 0)
                query = query.Where(e => !status.Ignore.Contains(e.Status));
        }
        var envelopes = await query
            .Include(e => e.Documents)
            .ToListAsync(cancel);
        return _mapper.Map<IEnumerable<EnvelopeDto>>(envelopes);
    }
 }
--- a/EnvelopeGenerator.Application/Envelopes/Queries/ReadReceiverNameQuery.cs
+++ b/EnvelopeGenerator.Application/Envelopes/Queries/ReadReceiverNameQuery.cs
@@ -1,8 +1,4 @@
-using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Receivers.Queries;
 using EnvelopeGenerator.Application.Common.Query;
 using MediatR;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 namespace EnvelopeGenerator.Application.Envelopes.Queries;
@@ -10,54 +6,6 @@ namespace EnvelopeGenerator.Application.Envelopes.Queries;
 /// Eine Abfrage, um die zuletzt verwendete Anrede eines Empfängers zu ermitteln, 
 /// damit diese für zukünftige Umschläge wiederverwendet werden kann.
 /// </summary>
-public record ReadReceiverNameQuery() : ReceiverQueryBase, IRequest<string?>;
+public record ReadReceiverNameQuery() : ReadReceiverQuery
 /// <summary>
 /// 
 /// </summary>
 public class ReadReceiverNameQueryHandler : IRequestHandler<ReadReceiverNameQuery, string?>
 {
-    private readonly IRepository<EnvelopeReceiver> _envelopeReceiverRepository;
+}
    private readonly IRepository<Receiver> _receiverRepository;
    /// <summary>
    /// 
    /// </summary>
    /// <param name="envelopeReceiverRepository"></param>
    /// <param name="receiverRepository"></param>
    public ReadReceiverNameQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiverRepository, IRepository<Receiver> receiverRepository)
    {
        _envelopeReceiverRepository = envelopeReceiverRepository;
        _receiverRepository = receiverRepository;
    }
    /// <summary>
    /// 
    /// </summary>
    /// <param name="request"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    public async Task<string?> Handle(ReadReceiverNameQuery request, CancellationToken cancellationToken)
    {
        var receiverQuery = _receiverRepository.Query.AsNoTracking();
        if (request.Id is int id)
            receiverQuery = receiverQuery.Where(r => r.Id == id);
        if (request.EmailAddress is string email)
            receiverQuery = receiverQuery.Where(r => r.EmailAddress == email);
        if (request.Signature is string signature)
            receiverQuery = receiverQuery.Where(r => r.Signature == signature);
        var receiver = await receiverQuery.FirstOrDefaultAsync(cancellationToken);
        if (receiver is null)
            return null;
        var erName = await _envelopeReceiverRepository.Query
            .Where(er => er.ReceiverId == receiver.Id)
            .OrderByDescending(er => er.AddedWhen)
            .Select(er => er.Name)
            .FirstOrDefaultAsync(cancellationToken);
        return erName;
    }
 }
--- a/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs
+++ b/EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs
@@ -82,7 +82,7 @@ public class CreateHistoryCommandHandler : IRequestHandler<CreateHistoryCommand,
        if(request.UserReference is null)
        {
            var receivers = await _erRepo
-                .Query
+                .ReadOnly()
                .Where(request)
                .Include(er => er.Receiver)
                .ToListAsync(cancel);
--- a/EnvelopeGenerator.Application/Receivers/Commands/CreateReceiverCommand.cs
+++ b/EnvelopeGenerator.Application/Receivers/Commands/CreateReceiverCommand.cs
@@ -67,7 +67,6 @@ public class CreateReceiverCommandHandler : IRequestHandler<CreateReceiverComman
    /// 
    /// </summary>
    /// <param name="repo"></param>
    /// <param name="mapper"></param>
    public CreateReceiverCommandHandler(IRepository<Receiver> repo, IMapper mapper)
    {
        _repo = repo;
@@ -82,7 +81,7 @@ public class CreateReceiverCommandHandler : IRequestHandler<CreateReceiverComman
    /// <returns></returns>
    public async Task<(ReceiverDto Receiver, bool AlreadyExists)> Handle(CreateReceiverCommand request, CancellationToken cancel)
    {
-        var receiver = await _repo.Query
+        var receiver = await _repo.ReadOnly()
            .Where(r => r.EmailAddress == request.EmailAddress)
            .SingleOrDefaultAsync(cancel);
--- a/EnvelopeGenerator.Application/Receivers/Queries/ReadReceiverQuery.cs
+++ b/EnvelopeGenerator.Application/Receivers/Queries/ReadReceiverQuery.cs
@@ -1,10 +1,4 @@
-using AutoMapper;
+using EnvelopeGenerator.Application.Common.Query;
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Application.Common.Query;
 using MediatR;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 namespace EnvelopeGenerator.Application.Receivers.Queries;
@@ -12,53 +6,4 @@ namespace EnvelopeGenerator.Application.Receivers.Queries;
 /// Stellt eine Abfrage dar, um die Details eines Empfängers zu lesen.
 /// um spezifische Informationen über einen Empfänger abzurufen.
 /// </summary>
-public record ReadReceiverQuery : ReceiverQueryBase, IRequest<IEnumerable<ReceiverDto>>;
+public record ReadReceiverQuery : ReceiverQueryBase;
 /// <summary>
 /// 
 /// </summary>
 public class ReadReceiverQueryHandler : IRequestHandler<ReadReceiverQuery, IEnumerable<ReceiverDto>>
 {
    private readonly IRepository<Receiver> _repository;
    private readonly IMapper _mapper;
    /// <summary>
    /// 
    /// </summary>
    /// <param name="repository"></param>
    /// <param name="mapper"></param>
    public ReadReceiverQueryHandler(IRepository<Receiver> repository, IMapper mapper)
    {
        _repository = repository;
        _mapper = mapper;
    }
    /// <summary>
    /// 
    /// </summary>
    /// <param name="request"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    public async Task<IEnumerable<ReceiverDto>> Handle(ReadReceiverQuery request, CancellationToken cancellationToken)
    {
        var query = _repository.Query;
        if (request.Id is int id)
        {
            query = query.Where(r => r.Id == id);
        }
        if (request.EmailAddress is string email)
        {
            query = query.Where(r => r.EmailAddress == email);
        }
        if (request.Signature is string signature)
        {
            query = query.Where(r => r.Signature == signature);
        }
        var receiver = await query.ToListAsync(cancellationToken);
        return _mapper.Map<IEnumerable<ReceiverDto>>(receiver);
    }
 }
--- a/EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj
+++ b/EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj
@@ -70,8 +70,8 @@
    <Reference Include="DigitalData.Controls.DocumentViewer, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\DigitalData.Controls.DocumentViewer.1.9.8\lib\net462\DigitalData.Controls.DocumentViewer.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.6.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
+      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.4.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Core.Abstractions, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\DigitalData.Core.Abstractions.4.3.0\lib\net462\DigitalData.Core.Abstractions.dll</HintPath>
@@ -109,6 +109,9 @@
    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
      <HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
    </Reference>
    <Reference Include="EnvelopeGenerator.CommonServices">
      <HintPath>..\EnvelopeGenerator.CommonServices\bin\Debug\EnvelopeGenerator.CommonServices.dll</HintPath>
    </Reference>
    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
    </Reference>
@@ -463,12 +466,8 @@
      <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>
+      <Project>{4F32A98D-E6F0-4A09-BD97-1CF26107E837}</Project>
      <Name>EnvelopeGenerator.Domain</Name>
    </ProjectReference>
    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj">
@@ -496,9 +495,6 @@
    <Content Include="MailLicense.xml" />
    <Content Include="README.txt" />
  </ItemGroup>
  <ItemGroup>
    <WCFMetadata Include="Connected Services\" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
--- a/EnvelopeGenerator.BBTests/packages.config
+++ b/EnvelopeGenerator.BBTests/packages.config
@@ -3,7 +3,7 @@
  <package id="AutoMapper" version="10.1.1" targetFramework="net462" />
  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
  <package id="DigitalData.Controls.DocumentViewer" version="1.9.8" targetFramework="net462" />
-  <package id="DigitalData.Core.Abstraction.Application" version="1.6.0" targetFramework="net462" />
+  <package id="DigitalData.Core.Abstraction.Application" version="1.4.0" targetFramework="net462" />
  <package id="DigitalData.Core.Abstractions" version="4.3.0" targetFramework="net462" />
  <package id="DigitalData.Modules.Base" version="1.3.8" targetFramework="net462" />
  <package id="DigitalData.Modules.Config" version="1.3.0" targetFramework="net462" />
--- a/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj
+++ b/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj
@@ -72,8 +72,8 @@
    <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.XtraGauges.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraReports.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.6.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
+      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.4.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Core.Abstractions, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\DigitalData.Core.Abstractions.4.3.0\lib\net462\DigitalData.Core.Abstractions.dll</HintPath>
--- a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
+++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
@@ -422,7 +422,7 @@ Namespace Jobs
        End Function
        Private Function GetEnvelopeData(pEnvelopeId As Integer) As EnvelopeData
-            Dim oSql = $"SELECT T.GUID, T.ENVELOPE_UUID, T.ENVELOPE_TYPE, T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T
+            Dim oSql = $"SELECT T.GUID, T.ENVELOPE_UUID,T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T
                JOIN TBSIG_ENVELOPE_DOCUMENT T2 ON T.GUID = T2.ENVELOPE_ID
                WHERE T.GUID = {pEnvelopeId}"
            Dim oTable As DataTable = Database.GetDatatable(oSql)
--- a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurner.vb
+++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurner.vb
@@ -37,15 +37,6 @@ Namespace Jobs.FinalizeDocument
        Public Function BurnAnnotsToPDF(pSourceBuffer As Byte(), pInstantJSONList As List(Of String), envelopeId As Integer) As Byte()
            'read the elements of envelope with their annotations
            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
                    Throw New BurnAnnotationException($"Envelope with Id {envelopeId} not found.")
                ElseIf envelope.ReadOnly Then
                    Return pSourceBuffer
                End If
                Dim sigRepo = scope.ServiceProvider.Repository(Of Signature)()
                Dim elements = sigRepo _
                    .Where(Function(sig) sig.Document.EnvelopeId = envelopeId) _
--- a/EnvelopeGenerator.CommonServices/packages.config
+++ b/EnvelopeGenerator.CommonServices/packages.config
@@ -2,7 +2,7 @@
 <packages>
  <package id="AutoMapper" version="10.1.1" targetFramework="net462" />
  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
-  <package id="DigitalData.Core.Abstraction.Application" version="1.6.0" targetFramework="net462" />
+  <package id="DigitalData.Core.Abstraction.Application" version="1.4.0" targetFramework="net462" />
  <package id="DigitalData.Core.Abstractions" version="4.3.0" targetFramework="net462" />
  <package id="DigitalData.Modules.Base" version="1.3.8" targetFramework="net462" />
  <package id="DigitalData.Modules.Config" version="1.3.0" targetFramework="net462" />
--- a/EnvelopeGenerator.Domain/Constants/ReceiverRole.cs
+++ b/EnvelopeGenerator.Domain/Constants/ReceiverRole.cs
@@ -0,0 +1,8 @@
 namespace EnvelopeGenerator.Domain.Constants
 {
    public static class ReceiverRole
    {
        public const string PreAuth = "PreAuth";
        public const string FullyAuth = "FullyAuth";
    }
 }
--- a/EnvelopeGenerator.Domain/Constants/Role.cs
+++ b/EnvelopeGenerator.Domain/Constants/Role.cs
@@ -1,23 +0,0 @@
 #if NETFRAMEWORK
 using System;
 #endif
 namespace EnvelopeGenerator.Domain.Constants
 {
    public static class Role
    {
        [Obsolete("Use Receiver.PreAuth or Receiver.FullyAuth")]
        public const string PreAuth = "PreAuth";
        [Obsolete("Use Receiver.PreAuth or Receiver.FullyAuth")]
        public const string FullyAuth = "FullyAuth";
        public static class Receiver
        {
            public const string PreAuth = "PreAuth";
            public const string FullyAuth = "FullyAuth";
        }
        public const string Sender = "Sender";
    }
 }
--- a/EnvelopeGenerator.Domain/Entities/Envelope.cs
+++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs
@@ -2,7 +2,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using EnvelopeGenerator.Domain.Constants;
 using Newtonsoft.Json;
 #if NETFRAMEWORK
 using System;
@@ -108,10 +107,6 @@ public class Envelope
    [Column("ENVELOPE_TYPE")]
    public int? EnvelopeTypeId { get; set; }
    [JsonIgnore]
    [NotMapped]
    public bool ReadOnly => EnvelopeTypeId == 2;
    [Column("CERTIFICATION_TYPE")]
    public int? CertificationType { get; set; }
--- a/EnvelopeGenerator.GeneratorAPI/.config/dotnet-tools.json
+++ b/EnvelopeGenerator.GeneratorAPI/.config/dotnet-tools.json
@@ -0,0 +1,13 @@
 {
  "version": 1,
  "isRoot": true,
  "tools": {
    "dotnet-ef": {
      "version": "9.0.3",
      "commands": [
        "dotnet-ef"
      ],
      "rollForward": false
    }
  }
 }
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/.editorconfig
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/.editorconfig
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/.gitignore
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/.gitignore
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/README.md
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/README.md
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/angular.json
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/angular.json
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/package-lock.json
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/package-lock.json
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/package.json
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/package.json
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/proxy.conf.json
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/proxy.conf.json
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/server.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/server.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.component.html
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.component.html
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.component.scss
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.component.scss
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.component.spec.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.component.spec.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.component.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.component.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.config.server.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.config.server.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.config.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.config.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.routes.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.routes.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/clearable-input/clearable-input.component.html
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/clearable-input/clearable-input.component.html
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/clearable-input/clearable-input.component.scss
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/clearable-input/clearable-input.component.scss
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/clearable-input/clearable-input.component.spec.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/clearable-input/clearable-input.component.spec.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/clearable-input/clearable-input.component.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/clearable-input/clearable-input.component.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/login/login.component.html
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/login/login.component.html
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/login/login.component.scss
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/login/login.component.scss
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/login/login.component.spec.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/login/login.component.spec.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/login/login.component.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/login/login.component.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.html
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.html
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.scss
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.scss
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.spec.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.spec.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/receiver-input/receiver-input.component.html
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/receiver-input/receiver-input.component.html
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/receiver-input/receiver-input.component.scss
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/receiver-input/receiver-input.component.scss
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/receiver-input/receiver-input.component.spec.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/receiver-input/receiver-input.component.spec.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/receiver-input/receiver-input.component.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/receiver-input/receiver-input.component.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/receiver-table/receiver-table.component.html
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/receiver-table/receiver-table.component.html
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/dd-table/dd-table.component.html
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/dd-table/dd-table.component.html
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/dd-table/dd-table.component.scss
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/dd-table/dd-table.component.scss
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/dd-table/dd-table.component.spec.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/dd-table/dd-table.component.spec.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/dd-table/dd-table.component.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/dd-table/dd-table.component.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.html
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.html
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.scss
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.scss
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.spec.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.spec.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.ts
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/envelope-table/envelope-table.component.ts
--- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/history-table/history-table.component.html
+++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/tables/history-table/history-table.component.html
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
OlgunR	e6b41f10c8	Merge branch 'feat/receiver-ui' of http://git.dd:3000/AppStd/EnvelopeGenerator into feat/receiver-ui	2025-12-10 11:16:27 +01:00
OlgunR	dc78ad4a24	Improve canvas mouse position accuracy; add settings.json Refactored mouse event handling in pdfInterop.js to use a new getPos helper, ensuring accurate coordinate mapping on scaled or resized canvases. Updated start and move functions to use this helper. Added an empty settings.json file.	2025-12-10 11:16:13 +01:00
TekH	b282318298	Add launchSettings.json for ReceiverUIBlazor project Configured development launch profile with browser launch, environment variable, and HTTP/HTTPS URLs for EnvelopeGenerator.ReceiverUIBlazor.	2025-12-10 09:55:32 +01:00
TekH	8d68ea8c57	Add IIS publish profile for EnvelopeGenerator.ReceiverUIBlazor Introduced IISProfile.pubxml to enable packaging and deployment of the EnvelopeGenerator.ReceiverUIBlazor project to IIS. The profile configures publish method, build settings, output package location, and IIS app path.	2025-12-10 09:55:24 +01:00
OlgunR	7cb8b02b1d	Revamp UI colors and fonts for warmer, modern look Switched to "Red Hat Text" and "Teko" fonts via Google Fonts. Updated color palette from cool blues to warm reds and yellows, including backgrounds, accents, and error states. Refreshed button, top bar, and card styles for improved visual hierarchy and softer appearance.	2025-12-09 10:58:53 +01:00
OlgunR	cc1d33462c	Add drag-and-drop PDF support to Blazor app Implement drag-and-drop PDF loading via JS interop and DotNetObjectReference. Refactor file loading logic and UI structure for clarity. Add IAsyncDisposable for resource cleanup. Update pdfInterop.js to handle drop events and send PDF data to Blazor.	2025-12-09 10:42:11 +01:00
OlgunR	cd85b4fffc	Improve PDF reset logic and modernize UI styling Refactor PDF reset to restore original document state using a new OriginalPdfBase64 variable and async logic. Redesign app.css with a lighter color palette, CSS variables, and updated styles for buttons, overlays, modals, and inputs for a cleaner, more accessible UI. Adjust signature and text overlay colors in pdfInterop.js for better contrast and consistency.	2025-12-09 10:26:01 +01:00
OlgunR	ab3e7fb4e9	Error while dragging fields fixed	2025-12-09 09:50:10 +01:00
OlgunR	4a7676765c	Fixed error while loading file	2025-12-09 08:57:39 +01:00
OlgunR	562ceb9c3f	First results converting receiver-ui-react into a Blazor Web App	2025-12-08 16:21:10 +01:00
OlgunR	751ea706df	Created EnvelopeGenerator.ReceiverUIBlazor	2025-12-08 16:06:26 +01:00
OlgunR	490ad9f7cf	Created EnvelopeGenerator.ReceiverUIBlazor	2025-12-08 16:04:51 +01:00
TekH	7aeaba7c12	Add EnvelopeGenerator.ReceiverUI project and UI components Introduced a new Razor Components-based web application, `EnvelopeGenerator.ReceiverUI`, to the solution. This includes: - Added `EnvelopeGenerator.ReceiverUI` project to `EnvelopeGenerator.sln` with Debug and Release configurations. - Created `EnvelopeGenerator.ReceiverUI.csproj` targeting `.NET 8.0` with nullable and implicit usings enabled. - Added Razor components (`App.razor`, `Routes.razor`, `MainLayout.razor`, `NavMenu.razor`, `Counter.razor`, `Error.razor`, `Home.razor`, `Weather.razor`) for layout, navigation, and pages. - Included styles (`MainLayout.razor.css`, `NavMenu.razor.css`, `app.css`) and assets (`favicon.png`, `bootstrap.min.css`). - Configured logging and allowed hosts in `appsettings.json` and `appsettings.Development.json`. - Added `Program.cs` to configure and run the application. - Added `launchSettings.json` for development and debugging profiles. These changes enable a modern, interactive web interface with Bootstrap styling and development-friendly configurations.	2025-12-05 09:08:57 +01:00
TekH	2301a81a1c	init receiver ui with react	2025-12-04 18:11:47 +01:00