refactor: convert markdown parsing to IIFE and preserve indentation

- Configure marked with async, breaks, and GFM options
- Update markdown processing to use textContent and async marked.parse
- Replace synchronous innerHTML parsing with awaited async parsing

EnvelopeGenerator.Application/Common/Configurations/DbTriggerParams.cs

@@ -1,8 +0,0 @@
-namespace EnvelopeGenerator.Application.Common.Configurations;
-
-/// <summary>
-/// 
-/// </summary>
-public class DbTriggerParams : Dictionary<string, ICollection<string>>
-{
-}

EnvelopeGenerator.Application/Common/Dto/AnnotationDto.cs

@@ -0,0 +1,73 @@
+namespace EnvelopeGenerator.Application.Common.Dto;
+
+/// <summary>
+/// 
+/// </summary>
+public record AnnotationCreateDto
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public int ElementId { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string Name { get; init; } = null!;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string Value { get; init; } = null!;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string Type { get; init; } = null!;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public double? X { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public double? Y { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public double? Width { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public double? Height { get; init; }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public record AnnotationDto : AnnotationCreateDto
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public long Id { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime AddedWhen { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime? ChangedWhen { get; init; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? ChangedWho { get; init; }
+}

EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs

@@ -82,7 +82,7 @@ public record EnvelopeDto
     /// <summary>
     /// 
     /// </summary>
-    public bool? UseAccessCode { get; set; }
+    public bool UseAccessCode { get; set; } = true;
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs

@@ -35,6 +35,7 @@ public class MappingProfile : Profile
         CreateMap<EnvelopeType, EnvelopeTypeDto>();
         CreateMap<Domain.Entities.Receiver, ReceiverDto>();
         CreateMap<Domain.Entities.EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
+        CreateMap<ElementAnnotation, AnnotationDto>();
 
         // DTO to Entity mappings
         CreateMap<ConfigDto, Config>();
@@ -50,6 +51,8 @@ public class MappingProfile : Profile
         CreateMap<ReceiverDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
         CreateMap<EnvelopeReceiverReadOnlyCreateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
         CreateMap<EnvelopeReceiverReadOnlyUpdateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
+        CreateMap<AnnotationCreateDto, ElementAnnotation>()
+            .ForMember(dest => dest.AddedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));
 
         // Messaging mappings
         // for GTX messaging

EnvelopeGenerator.Application/Common/Dto/SignatureDto.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using EnvelopeGenerator.Domain.Interfaces;
+using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.Common.Dto;
 
@@ -6,7 +7,7 @@ namespace EnvelopeGenerator.Application.Common.Dto;
 /// Data Transfer Object representing a positioned element assigned to a document receiver.
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public class SignatureDto
+public class SignatureDto : ISignature
 {
     /// <summary>
     /// Gets or sets the unique identifier of the element.

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

@@ -1,12 +1,20 @@
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Notifications.RemoveSignature;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
-using Newtonsoft.Json;
 using System.Dynamic;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned;
 
+/// <summary>
+/// 
+/// </summary>
+/// <param name="Instant"></param>
+/// <param name="Structured"></param>
+public record PsPdfKitAnnotation(ExpandoObject Instant, IEnumerable<AnnotationCreateDto> Structured);
+
 /// <summary>
 /// 
 /// </summary>
@@ -16,7 +24,7 @@ public record DocSignedNotification(EnvelopeReceiverDto Original) : EnvelopeRece
     /// <summary>
     /// 
     /// </summary>
-    public required ExpandoObject Annotations { get; init; }
+    public PsPdfKitAnnotation PsPdfKitAnnotation { get; init; } = null!;
 
     /// <summary>
     /// 
@@ -40,17 +48,41 @@ public static class DocSignedNotificationExtensions
     /// Converts an <see cref="EnvelopeReceiverDto"/> to a <see cref="DocSignedNotification"/>.
     /// </summary>
     /// <param name="dto">The DTO to convert.</param>
-    /// <param name="annotations"></param>
+    /// <param name="psPdfKitAnnotation"></param>
     /// <returns>A new <see cref="DocSignedNotification"/> instance.</returns>
-    public static DocSignedNotification ToDocSignedNotification(this EnvelopeReceiverDto dto, ExpandoObject annotations)
+    public static DocSignedNotification ToDocSignedNotification(this EnvelopeReceiverDto dto, PsPdfKitAnnotation psPdfKitAnnotation)
-        => new(dto) { Annotations = annotations };
+        => new(dto) { PsPdfKitAnnotation = psPdfKitAnnotation };
 
     /// <summary>
-    /// Asynchronously converts a <see cref="Task{EnvelopeReceiverDto}"/> to a <see cref="DocSignedNotification"/>.
+    /// 
     /// </summary>
-    /// <param name="dtoTask">The task that returns the DTO to convert.</param>
+    /// <param name="dtoTask"></param>
-    /// <param name="annotations"></param>
+    /// <param name="psPdfKitAnnotation"></param>
-    /// <returns>A task that represents the asynchronous conversion operation.</returns>
+    /// <returns></returns>
-    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, ExpandoObject annotations)
+    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, PsPdfKitAnnotation psPdfKitAnnotation)
-        => await dtoTask is EnvelopeReceiverDto dto ? new(dto) { Annotations = annotations } : null;
+        => await dtoTask is EnvelopeReceiverDto dto ? new(dto) { PsPdfKitAnnotation = psPdfKitAnnotation } : null;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="publisher"></param>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public static async Task PublishSafely(this IPublisher publisher, DocSignedNotification notification, CancellationToken cancel = default)
+    {
+        try
+        {
+            await publisher.Publish(notification, cancel);
+        }
+        catch (Exception)
+        {
+            await publisher.Publish(new RemoveSignatureNotification()
+            {
+                EnvelopeId = notification.EnvelopeId,
+                ReceiverId = notification.ReceiverId
+            }, cancel);
+            throw;
+        }
+    }
 }

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

@@ -1,7 +1,6 @@
-using EnvelopeGenerator.Application.DocStatus.Commands;
+using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
 using MediatR;
-using System.Text.Json;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 
@@ -10,15 +9,18 @@ namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 /// </summary>
 public class AnnotationHandler : INotificationHandler<DocSignedNotification>
 {
-    private readonly ISender _sender;
+    /// <summary>
+    /// 
+    /// </summary>
+    private readonly IRepository<ElementAnnotation> _repo;
 
     /// <summary>
     /// 
     /// </summary>
-    /// <param name="sender"></param>
+    /// <param name="repository"></param>
-    public AnnotationHandler(ISender sender)
+    public AnnotationHandler(IRepository<ElementAnnotation> repository)
     {
-        _sender = sender;
+        _repo = repository;
     }
 
     /// <summary>
@@ -27,13 +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);
-        await _sender.Send(new SaveDocStatusCommand()
-        {
-            Envelope = new() { Id = notification.EnvelopeId },
-            Receiver = new() { Id = notification.ReceiverId},
-            Value = JsonSerializer.Serialize(notification.Annotations, Format.Json.ForAnnotations)
-        }, cancel);
-    }
 }

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

@@ -0,0 +1,39 @@
+using EnvelopeGenerator.Application.DocStatus.Commands;
+using EnvelopeGenerator.Domain.Constants;
+using MediatR;
+using System.Text.Json;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
+
+/// <summary>
+/// 
+/// </summary>
+public class DocStatusHandler : INotificationHandler<DocSignedNotification>
+{
+    private readonly ISender _sender;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    public DocStatusHandler(ISender sender)
+    {
+        _sender = sender;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
+    {
+        await _sender.Send(new SaveDocStatusCommand()
+        {
+            Envelope = new() { Id = notification.EnvelopeId },
+            Receiver = new() { Id = notification.ReceiverId},
+            Value = JsonSerializer.Serialize(notification.PsPdfKitAnnotation.Instant, Format.Json.ForAnnotations)
+        }, cancel);
+    }
+}

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

@@ -2,7 +2,6 @@
 using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
-using Newtonsoft.Json;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 

EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveAnnotationHandler.cs

@@ -0,0 +1,53 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.RemoveSignature.Handlers;
+
+/// <summary>
+/// 
+/// </summary>
+public class RemoveAnnotationHandler : INotificationHandler<RemoveSignatureNotification>
+{
+    private readonly IRepository<ElementAnnotation> _repo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repository"></param>
+    public RemoveAnnotationHandler(IRepository<ElementAnnotation> repository)
+    {
+        _repo = repository;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public Task Handle(RemoveSignatureNotification notification, CancellationToken cancel)
+    {
+        notification.ThrowIfHasNoFilter();
+        return _repo.DeleteAsync(annots =>
+        {
+            // envelope ID filter
+            if (notification.EnvelopeId is int envelopeId)
+                annots = annots.Where(annot => annot.Element!.Document.EnvelopeId == envelopeId);
+
+            // envelope UUID filter
+            if (notification.EnvelopeUuid is string envelopeUuid)
+                annots = annots.Where(annot => annot.Element!.Document.Envelope!.Uuid == envelopeUuid);
+
+            // receiver ID
+            if (notification.ReceiverId is int receiverId)
+                annots = annots.Where(annot => annot.Element!.ReceiverId == receiverId);
+
+            // receiver signature
+            if (notification.ReceiverSignature is string receiverSignature)
+                annots = annots.Where(annot => annot.Element!.Receiver!.Signature == receiverSignature);
+
+            return annots;
+        }, cancel);
+    }
+}

EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveDocStatusHandler.cs

@@ -0,0 +1,53 @@
+using AngleSharp.Html;
+using DigitalData.Core.Abstraction.Application.Repository;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.RemoveSignature.Handlers;
+
+/// <summary>
+/// 
+/// </summary>
+public class RemoveDocStatusHandler : INotificationHandler<RemoveSignatureNotification>
+{
+    private readonly IRepository<Domain.Entities.DocumentStatus> _repo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repository"></param>
+    public RemoveDocStatusHandler(IRepository<Domain.Entities.DocumentStatus> repository)
+    {
+        _repo = repository;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public Task Handle(RemoveSignatureNotification notification, CancellationToken cancel)
+    {
+        notification.ThrowIfHasNoFilter();
+        return _repo.DeleteAsync(statuses =>
+        {
+            // envelope ID filter
+            if (notification.EnvelopeId is int envelopeId)
+                statuses = statuses.Where(status => status.EnvelopeId == envelopeId);
+
+            // envelope UUID filter
+            if (notification.EnvelopeUuid is string envelopeUuid)
+                statuses = statuses.Where(status => status.Envelope!.Uuid == envelopeUuid);
+
+            // receiver Id filter
+            if (notification.ReceiverId is int receiverId)
+                statuses = statuses.Where(status => status.ReceiverId == receiverId);
+
+            // receiver signature filter
+            if (notification.ReceiverSignature is string receiverSignature)
+                statuses = statuses.Where(status => status.Receiver!.Signature == receiverSignature);
+
+            return statuses;
+        }, cancel);
+    }
+}

EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveHistoryHandler.cs

@@ -0,0 +1,56 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Domain.Constants;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.RemoveSignature.Handlers;
+
+/// <summary>
+/// 
+/// </summary>
+public class RemoveHistoryHandler : INotificationHandler<RemoveSignatureNotification>
+{
+    private readonly IRepository<Domain.Entities.History> _repo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repository"></param>
+    public RemoveHistoryHandler(IRepository<Domain.Entities.History> repository)
+    {
+        _repo = repository;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public Task Handle(RemoveSignatureNotification notification, CancellationToken cancel)
+    {
+        notification.ThrowIfHasNoFilter();
+        return _repo.DeleteAsync(hists =>
+        {
+            hists = hists.Where(hist => hist.Status == EnvelopeStatus.DocumentSigned);
+
+            // envelope ID filter
+            if (notification.EnvelopeId is int envelopeId)
+                hists = hists.Where(hist => hist.EnvelopeId == envelopeId);
+
+            // envelope UUID filter
+            if (notification.EnvelopeUuid is string envelopeUuid)
+                hists = hists.Where(hist => hist.Envelope!.Uuid == envelopeUuid);
+
+            // receiver ID filter
+            if (notification.ReceiverId is int receiverId)
+                hists = hists.Where(hist => hist.Receiver!.Id == receiverId);
+
+            // receiver signature filter
+            if (notification.ReceiverSignature is string receiverSignature)
+                hists = hists.Where(hist => hist.Receiver!.Signature == receiverSignature);
+
+            return hists;
+        }, cancel);
+    }
+}

EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/RemoveSignatureNotification.cs

@@ -0,0 +1,37 @@
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Common.Notifications.RemoveSignature;
+
+/// <summary>
+/// 
+/// </summary>
+/// <param name="EnvelopeId"></param>
+/// <param name="ReceiverId"></param>
+/// <param name="EnvelopeUuid"></param>
+/// <param name="ReceiverSignature"></param>
+public record RemoveSignatureNotification(
+    int? EnvelopeId = null,
+    int? ReceiverId = null,
+    string? EnvelopeUuid = null,
+    string? ReceiverSignature = null
+    ) : INotification
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool HasFilter => 
+        EnvelopeId is not null 
+        || ReceiverId is not null 
+        || EnvelopeUuid is not null 
+        || ReceiverSignature is not null;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <exception cref="InvalidOperationException"></exception>
+    public void ThrowIfHasNoFilter()
+    {
+        if (!HasFilter)
+            throw new InvalidOperationException("At least one filter parameter must be provided.");
+    }
+}

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -46,7 +46,6 @@ public static class DependencyInjection
         services.Configure<MailParams>(config.GetSection(nameof(MailParams)));
         services.Configure<AuthenticatorParams>(config.GetSection(nameof(AuthenticatorParams)));
         services.Configure<TotpSmsParams>(config.GetSection(nameof(TotpSmsParams)));
-        services.Configure<DbTriggerParams>(config.GetSection(nameof(DbTriggerParams)));
 
         services.AddHttpClientService<GtxMessagingParams>(config.GetSection(nameof(GtxMessagingParams)));
         services.TryAddSingleton<ISmsSender, GTXSmsSender>();

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.3.1" />
+		<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" />

EnvelopeGenerator.Application/Histories/Queries/CountHistoryQuery.cs

@@ -0,0 +1,101 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace EnvelopeGenerator.Application.Histories.Queries;
+
+//TODO: Add sender query
+/// <summary>
+/// Repräsentiert eine Abfrage für die Verlaufshistorie eines Umschlags.
+/// </summary>
+public record CountHistoryQuery : HistoryQueryBase, IRequest<int>;
+
+/// <summary>
+/// 
+/// </summary>
+public static class CountHistoryQueryExtensions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="uuid"></param>
+    /// <param name="statuses"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public static async Task<bool> AnyHistoryAsync(this ISender sender, string uuid, IEnumerable<EnvelopeStatus> statuses, CancellationToken cancel = default)
+    {
+        var count = await sender.Send(new CountHistoryQuery
+        {
+            Envelope = new() { Uuid = uuid },
+            Statuses = new() { Include = statuses }
+        }, cancel);
+        return count > 0;
+    }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public class CountHistoryQueryHandler : IRequestHandler<CountHistoryQuery, int>
+{
+    private readonly IRepository<History> _repo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repo"></param>
+    public CountHistoryQueryHandler(IRepository<History> repo)
+    {
+        _repo = repo;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    /// <exception cref="NotFoundException"></exception>
+    public Task<int> Handle(CountHistoryQuery request, CancellationToken cancel = default)
+    {
+        var query = _repo.Query;
+
+        if (request.Envelope.Id is int envId)
+            query = query.Where(e => e.Id == envId);
+        else if (request.Envelope.Uuid is string uuid)
+            query = query.Where(e => e.Envelope!.Uuid == uuid);
+#pragma warning disable CS0618 // Type or member is obsolete
+        else if (request.EnvelopeId is not null)
+            query = query.Where(h => h.EnvelopeId == request.EnvelopeId);
+#pragma warning restore CS0618 // Type or member is obsolete
+        else
+            throw new BadRequestException("Invalid request: An Envelope object or a valid EnvelopeId/UUID must be supplied.");
+
+#pragma warning disable CS0618 // Type or member is obsolete
+        if (request.Status is not null)
+            query = query.Where(h => h.Status == request.Status);
+#pragma warning restore CS0618 // Type or member is obsolete
+
+        if (request.Statuses is not null)
+        {
+            var status = request.Statuses;
+            if (status.Min is not null)
+                query = query.Where(er => er.Envelope!.Status >= status.Min);
+
+            if (status.Max is not null)
+                query = query.Where(er => er.Envelope!.Status <= status.Max);
+
+            if (status.Include?.Count() > 0)
+                query = query.Where(er => status.Include.Contains(er.Envelope!.Status));
+
+            if (status.Ignore is not null)
+                query = query.Where(er => !status.Ignore.Contains(er.Envelope!.Status));
+        }
+
+        return query.CountAsync(cancel);
+    }
+}

EnvelopeGenerator.Application/Histories/Queries/HistoryQueryBase.cs

@@ -0,0 +1,60 @@
+using EnvelopeGenerator.Application.Common.Query;
+using EnvelopeGenerator.Domain.Constants;
+using System.ComponentModel.DataAnnotations;
+
+namespace EnvelopeGenerator.Application.Histories.Queries;
+
+//TODO: Add sender query
+/// <summary>
+/// 
+/// </summary>
+public record HistoryQueryBase
+{
+    /// <summary>
+    /// Die eindeutige Kennung des Umschlags.
+    /// </summary>
+    [Obsolete("Use Envelope property")]
+    public int? EnvelopeId { get; set; }
+
+    /// <summary>
+    /// Der Include des Umschlags, der abgefragt werden soll. Kann optional angegeben werden, um die Ergebnisse zu filtern.
+    /// </summary>
+    [Obsolete("Use statuses")]
+    public EnvelopeStatus? Status { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public EnvelopeStatusQuery Statuses { get; set; } = new();
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public EnvelopeQueryBase Envelope { get; set; } = new EnvelopeQueryBase();
+}
+
+/// <summary>
+/// 
+/// </summary>
+public record EnvelopeStatusQuery
+{
+    /// <summary>
+    /// Der minimale Statuswert, der berücksichtigt werden.
+    /// </summary>
+    public EnvelopeStatus? Min { get; init; }
+
+    /// <summary>
+    /// Der maximale Statuswert, der berücksichtigt werden.
+    /// </summary>
+    public EnvelopeStatus? Max { get; init; }
+
+    /// <summary>
+    /// Eine Liste von Statuswerten, die einbezogen werden.
+    /// </summary>
+    public IEnumerable<EnvelopeStatus>? Include { get; init; }
+
+    /// <summary>
+    /// Eine Liste von Statuswerten, die ignoriert werden werden.
+    /// </summary>
+    public IEnumerable<EnvelopeStatus>? Ignore { get; init; }
+}

EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQuery.cs

@@ -1,7 +1,10 @@
-using EnvelopeGenerator.Application.Common.Dto.History;
+using AutoMapper;
-using EnvelopeGenerator.Domain.Constants;
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Common.Dto.History;
 using MediatR;
-using System.ComponentModel.DataAnnotations;
+using EnvelopeGenerator.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Application.Histories.Queries;
 
@@ -9,21 +12,81 @@ namespace EnvelopeGenerator.Application.Histories.Queries;
 /// <summary>
 /// Repräsentiert eine Abfrage für die Verlaufshistorie eines Umschlags.
 /// </summary>
-public record ReadHistoryQuery : IRequest<IEnumerable<HistoryDto>>
+public record ReadHistoryQuery : HistoryQueryBase, IRequest<IEnumerable<HistoryDto>>
 {
-    /// <summary>
-    /// Die eindeutige Kennung des Umschlags.
-    /// </summary>
-    [Required]
-    public int EnvelopeId { get; init; }
-
-    /// <summary>
-    /// Der Include des Umschlags, der abgefragt werden soll. Kann optional angegeben werden, um die Ergebnisse zu filtern.
-    /// </summary>
-    public EnvelopeStatus? Status { get; init; }
-
     /// <summary>
     /// Abfrage zur Steuerung, ob nur der aktuelle Include oder der gesamte Datensatz zurückgegeben wird.
     /// </summary>
-    public bool? OnlyLast { get; init; } = true;
+    public bool OnlyLast { get; init; } = true;
+}
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadHistoryQueryHandler : IRequestHandler<ReadHistoryQuery, IEnumerable<HistoryDto>>
+{
+    private readonly IRepository<History> _repo;
+
+    private readonly IMapper _mapper;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repo"></param>
+    /// <param name="mapper"></param>
+    public ReadHistoryQueryHandler(IRepository<History> repo, IMapper mapper)
+    {
+        _repo = repo;
+        _mapper = mapper;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    /// <exception cref="NotFoundException"></exception>
+    public async Task<IEnumerable<HistoryDto>> Handle(ReadHistoryQuery request, CancellationToken cancel = default)
+    {
+        var query = _repo.Query;
+
+        if (request.Envelope.Id is int envId)
+            query = query.Where(e => e.Id == envId);
+        else if (request.Envelope.Uuid is string uuid)
+            query = query.Where(e => e.Envelope!.Uuid == uuid);
+#pragma warning disable CS0618 // Type or member is obsolete
+        else if (request.EnvelopeId is not null)
+            query = query.Where(h => h.EnvelopeId == request.EnvelopeId);
+#pragma warning restore CS0618 // Type or member is obsolete
+        else
+            throw new BadRequestException("Invalid request: An Envelope object or a valid EnvelopeId/UUID must be supplied.");
+
+#pragma warning disable CS0618 // Type or member is obsolete
+        if (request.Status is not null)
+            query = query.Where(h => h.Status == request.Status);
+#pragma warning restore CS0618 // Type or member is obsolete
+
+        if (request.Statuses is not null)
+        {
+            var status = request.Statuses;
+            if (status.Min is not null)
+                query = query.Where(er => er.Envelope!.Status >= status.Min);
+
+            if (status.Max is not null)
+                query = query.Where(er => er.Envelope!.Status <= status.Max);
+
+            if (status.Include?.Count() > 0)
+                query = query.Where(er => status.Include.Contains(er.Envelope!.Status));
+
+            if (status.Ignore is not null)
+                query = query.Where(er => !status.Ignore.Contains(er.Envelope!.Status));
+        }
+
+        if (request.OnlyLast)
+            query = query.OrderByDescending(x => x.AddedWhen);
+
+        var hists = await query.ToListAsync(cancel);
+        return _mapper.Map<List<HistoryDto>>(hists);
+    }
 }

EnvelopeGenerator.Application/Histories/Queries/ReadHistoryQueryHandler.cs

@@ -1,47 +0,0 @@
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common.Dto.History;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-
-namespace EnvelopeGenerator.Application.Histories.Queries;
-
-/// <summary>
-/// 
-/// </summary>
-public class ReadHistoryQueryHandler : IRequestHandler<ReadHistoryQuery, IEnumerable<HistoryDto>>
-{
-    private readonly IRepository<History> _repo;
-
-    private readonly IMapper _mapper;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repo"></param>
-    /// <param name="mapper"></param>
-    public ReadHistoryQueryHandler(IRepository<History> repo, IMapper mapper)
-    {
-        _repo = repo;
-        _mapper = mapper;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    /// <exception cref="NotFoundException"></exception>
-    public async Task<IEnumerable<HistoryDto>> Handle(ReadHistoryQuery request, CancellationToken cancel = default)
-    {
-        var query = _repo.ReadOnly().Where(h => h.EnvelopeId == request.EnvelopeId);
-        if (request.Status is not null)
-            query = query.Where(h => h.Status == request.Status);
-
-        var hists = await query.ToListAsync(cancel);
-        return _mapper.Map<List<HistoryDto>>(hists);
-    }
-}

EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj

@@ -45,6 +45,9 @@
     <StartupObject>EnvelopeGenerator.My.MyApplication</StartupObject>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>
+    </Reference>
     <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
       <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
@@ -67,6 +70,12 @@
     <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.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <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>
+    </Reference>
     <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
@@ -176,12 +185,84 @@
     <Reference Include="Microsoft.Bcl.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Data.SqlClient, Version=1.13.20136.2, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.SqlClient.1.1.3\lib\net46\Microsoft.Data.SqlClient.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.EntityFrameworkCore.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.EntityFrameworkCore.Relational, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.EntityFrameworkCore.Relational.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.EntityFrameworkCore.SqlServer, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.EntityFrameworkCore.SqlServer.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Caching.Memory.7.0.0\lib\net462\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Configuration.7.0.0\lib\net462\Microsoft.Extensions.Configuration.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Configuration.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Configuration.Binder.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Localization.Abstractions, Version=7.0.16.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Localization.Abstractions.7.0.16\lib\net462\Microsoft.Extensions.Localization.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.7.0.0\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Options, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Options.7.0.0\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.7.0.0\lib\net462\Microsoft.Extensions.Options.ConfigurationExtensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Primitives.7.0.0\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Identity.Client, Version=4.77.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Identity.Client.4.77.0\lib\net462\Microsoft.Identity.Client.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Abstractions, Version=8.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.8.14.0\lib\net462\Microsoft.IdentityModel.Abstractions.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.JsonWebTokens.7.5.1\lib\net462\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Logging, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Logging.7.5.1\lib\net462\Microsoft.IdentityModel.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Protocols, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Protocols.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Tokens, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Tokens.7.5.1\lib\net462\Microsoft.IdentityModel.Tokens.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -216,19 +297,31 @@
     <Reference Include="System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
     </Reference>
+    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data.Common, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
     </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.6.0.1\lib\net461\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.7.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
+    <Reference Include="System.DirectoryServices.AccountManagement" />
     <Reference Include="System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll</HintPath>
     </Reference>
     <Reference Include="System.IdentityModel" />
+    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.7.5.1\lib\net462\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+    </Reference>
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
@@ -252,9 +345,25 @@
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Cng, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Cng.5.0.0\lib\net462\System.Security.Cryptography.Cng.dll</HintPath>
+    </Reference>
     <Reference Include="System.Security.Cryptography.Pkcs, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.Pkcs.9.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
     </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
+    </Reference>
     <Reference Include="System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Encodings.Web.9.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
     </Reference>
@@ -361,6 +470,10 @@
       <Project>{4F32A98D-E6F0-4A09-BD97-1CF26107E837}</Project>
       <Name>EnvelopeGenerator.Domain</Name>
     </ProjectReference>
+    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj">
+      <Project>{63e32615-0eca-42dc-96e3-91037324b7c7}</Project>
+      <Name>EnvelopeGenerator.Infrastructure</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="GdPicture.NET.14.barcode.1d.reader.64.dll" />
@@ -391,8 +504,10 @@
     <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.props'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets'))" />
   </Target>
   <Import Project="..\packages\EntityFramework.6.5.1\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.targets')" />
+  <Import Project="..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

EnvelopeGenerator.BBTests/app.config

@@ -107,6 +107,78 @@
         <assemblyIdentity name="GdPicture.NET.14.Imaging" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Identity.Client" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.77.0.0" newVersion="4.77.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Abstractions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.14.0.0" newVersion="8.14.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.JsonWebTokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <entityFramework>

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -1,10 +1,14 @@
-Imports DigitalData.Modules.Database
+Imports System.IO
+Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
+Imports EnvelopeGenerator.CommonServices.Jobs
+Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument
 Imports GdPicture14
 Imports Newtonsoft.Json.Linq
-Imports EnvelopeGenerator.CommonServices.Jobs
+Imports EnvelopeGenerator.Infrastructure
-Imports System.IO
+Imports Microsoft.EntityFrameworkCore
-Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument
+Imports System.Text
+Imports DigitalData.Core.Abstractions
 
 Public Class frmFinalizePDF
     Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;"
@@ -20,10 +24,35 @@ Public Class frmFinalizePDF
 
     Private Sub frmFinalizePDF_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Application.StartupPath)
-        Database = New MSSQLServer(LogConfig, MSSQLServer.DecryptConnectionString(CONNECTIONSTRING))
 
+        Dim dCnnStr As String = MSSQLServer.DecryptConnectionString(CONNECTIONSTRING)
 
-        PDFBurner = New FinalizeDocument.PDFBurner(LogConfig, pGDPictureLicenseKey, _pdfBurnerParams)
+        Database = New MSSQLServer(LogConfig, dCnnStr)
+
+#Disable Warning BC40000 ' Type or member is obsolete
+        Factory.Shared _
+            .BehaveOnPostBuild(PostBuildBehavior.Ignore) _
+            .AddEnvelopeGeneratorInfrastructureServices(
+                Sub(opt)
+                    opt.AddDbTriggerParams(
+                        Sub(triggers)
+                            triggers("Envelope") = New List(Of String) From {"TBSIG_ENVELOPE_AFT_INS"}
+                            triggers("History") = New List(Of String) From {"TBSIG_ENVELOPE_HISTORY_AFT_INS"}
+                            triggers("EmailOut") = New List(Of String) From {"TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD"}
+                            triggers("EnvelopeReceiverReadOnly") = New List(Of String) From {"TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD"}
+                            triggers("Receiver") = New List(Of String)() ' no tigger
+                            triggers("EmailTemplate") = New List(Of String) From {"TBSIG_EMAIL_TEMPLATE_AFT_UPD"}
+                        End Sub)
+                    opt.AddDbContext(
+                        Sub(options)
+                            options.UseSqlServer(dCnnStr) _
+                                   .EnableSensitiveDataLogging() _
+                                   .EnableDetailedErrors()
+                        End Sub)
+                End Sub)
+#Enable Warning BC40000 ' Type or member is obsolete
+
+        PDFBurner = New PDFBurner(LogConfig, pGDPictureLicenseKey, _pdfBurnerParams)
 
         Viewer = New GdViewer()
         Manager = New AnnotationManager()
@@ -72,8 +101,9 @@ Public Class frmFinalizePDF
                 Select(Function(r As DataRow) r.Item("VALUE").ToString()).
                 ToList()
 
-            Dim oBuffer As Byte() = ReadEnvelope(CInt(txtEnvelope.Text))
+            Dim envelopeId As Integer = CInt(txtEnvelope.Text)
-            Dim oNewBuffer = PDFBurner.BurnInstantJSONAnnotationsToPDF(oBuffer, oJsonList)
+            Dim oBuffer As Byte() = ReadEnvelope(envelopeId)
+            Dim oNewBuffer = PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, envelopeId)
             Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
             Dim oNewPath = Path.Combine(desktopPath, $"E{txtEnvelope.Text}R{txtReceiver.Text}.burned.pdf")
 
@@ -81,7 +111,15 @@ Public Class frmFinalizePDF
 
             Process.Start(oNewPath)
         Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Critical)
+            Dim exMsg As StringBuilder = New StringBuilder(ex.Message).AppendLine()
+
+            Dim innerEx = ex.InnerException
+            While (innerEx IsNot Nothing)
+                exMsg.AppendLine(innerEx.Message)
+                innerEx = innerEx.InnerException
+            End While
+
+            MsgBox(exMsg.ToString(), MsgBoxStyle.Critical)
         End Try
 
     End Sub

EnvelopeGenerator.BBTests/packages.config

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AutoMapper" version="10.1.1" targetFramework="net462" />
   <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
   <package id="DigitalData.Controls.DocumentViewer" version="1.9.8" 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" />
   <package id="DigitalData.Modules.Database" version="2.3.5.4" targetFramework="net462" />
@@ -18,9 +21,35 @@
   <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
   <package id="Microsoft.Bcl.Cryptography" version="9.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net462" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
+  <package id="Microsoft.Data.SqlClient" version="1.1.3" targetFramework="net462" />
+  <package id="Microsoft.Data.SqlClient.SNI" version="1.1.0" targetFramework="net462" />
+  <package id="Microsoft.EntityFrameworkCore" version="3.1.32" targetFramework="net462" />
+  <package id="Microsoft.EntityFrameworkCore.Abstractions" version="3.1.32" targetFramework="net462" />
+  <package id="Microsoft.EntityFrameworkCore.Analyzers" version="3.1.32" targetFramework="net462" />
+  <package id="Microsoft.EntityFrameworkCore.Relational" version="3.1.32" targetFramework="net462" />
+  <package id="Microsoft.EntityFrameworkCore.SqlServer" version="3.1.32" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Caching.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Configuration" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Configuration.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Configuration.Binder" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Localization.Abstractions" version="7.0.16" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Logging" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Options" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Primitives" version="7.0.0" targetFramework="net462" />
   <package id="Microsoft.Identity.Client" version="4.77.0" targetFramework="net462" />
   <package id="Microsoft.IdentityModel.Abstractions" version="8.14.0" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Logging" version="7.5.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Protocols" version="5.5.0" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.5.0" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Tokens" version="7.5.1" targetFramework="net462" />
   <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
   <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
@@ -33,15 +62,24 @@
   <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
   <package id="System.CodeDom" version="9.0.0" targetFramework="net462" />
   <package id="System.Collections.Immutable" version="9.0.0" targetFramework="net462" />
+  <package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net462" />
+  <package id="System.Data.Common" version="4.3.0" targetFramework="net462" />
   <package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
+  <package id="System.Diagnostics.DiagnosticSource" version="7.0.0" targetFramework="net462" />
+  <package id="System.DirectoryServices.AccountManagement" version="7.0.1" targetFramework="net462" />
   <package id="System.Formats.Asn1" version="9.0.0" targetFramework="net462" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="7.5.1" targetFramework="net462" />
   <package id="System.IO.Packaging" version="9.0.0" targetFramework="net462" />
   <package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" />
   <package id="System.Management" version="9.0.0" targetFramework="net462" />
   <package id="System.Memory" version="4.6.0" targetFramework="net462" />
   <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Cng" version="5.0.0" targetFramework="net462" />
   <package id="System.Security.Cryptography.Pkcs" version="9.0.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net462" />
   <package id="System.Text.Encodings.Web" version="9.0.0" targetFramework="net462" />
   <package id="System.Text.Json" version="9.0.0" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />

EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj

@@ -48,6 +48,9 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>
+    </Reference>
     <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
       <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
@@ -69,6 +72,13 @@
     <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.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <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>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
@@ -172,9 +182,84 @@
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Data.SqlClient, Version=1.13.20136.2, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Data.SqlClient.1.1.3\lib\net46\Microsoft.Data.SqlClient.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.EntityFrameworkCore.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.EntityFrameworkCore.Relational, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.EntityFrameworkCore.Relational.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.EntityFrameworkCore.SqlServer, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.EntityFrameworkCore.SqlServer.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Caching.Memory.7.0.0\lib\net462\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Configuration.7.0.0\lib\net462\Microsoft.Extensions.Configuration.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Configuration.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Configuration.Binder.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Localization.Abstractions, Version=7.0.16.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Localization.Abstractions.7.0.16\lib\net462\Microsoft.Extensions.Localization.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.7.0.0\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Options, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Options.7.0.0\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.7.0.0\lib\net462\Microsoft.Extensions.Options.ConfigurationExtensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Primitives.7.0.0\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Identity.Client, Version=3.0.8.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Identity.Client.3.0.8\lib\net45\Microsoft.Identity.Client.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.7.5.1\lib\net462\Microsoft.IdentityModel.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.JsonWebTokens.7.5.1\lib\net462\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Logging, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Logging.7.5.1\lib\net462\Microsoft.IdentityModel.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Protocols, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Protocols.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Tokens, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Tokens.7.5.1\lib\net462\Microsoft.IdentityModel.Tokens.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -216,13 +301,26 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.Common, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
     </Reference>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.7.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.DirectoryServices.AccountManagement" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing.Common, Version=4.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Drawing.Common.4.7.3\lib\net461\System.Drawing.Common.dll</HintPath>
     </Reference>
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=7.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.7.5.1\lib\net462\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+    </Reference>
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
@@ -244,9 +342,25 @@
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Cng, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Cng.5.0.0\lib\net462\System.Security.Cryptography.Cng.dll</HintPath>
+    </Reference>
     <Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
     </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
+    </Reference>
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
@@ -446,6 +560,14 @@
       <Project>{4f32a98d-e6f0-4a09-bd97-1cf26107e837}</Project>
       <Name>EnvelopeGenerator.Domain</Name>
     </ProjectReference>
+    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj">
+      <Project>{63e32615-0eca-42dc-96e3-91037324b7c7}</Project>
+      <Name>EnvelopeGenerator.Infrastructure</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj">
+      <Project>{211619f5-ae25-4ba5-a552-bacafe0632d3}</Project>
+      <Name>EnvelopeGenerator.PdfEditor</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -455,7 +577,9 @@
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
     <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets'))" />
   </Target>
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
   <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Import Project="..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets')" />
 </Project>

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -11,6 +11,10 @@ Imports EnvelopeGenerator.Domain.Constants
 Imports DevExpress.DataProcessing
 Imports System.Data.SqlClient
 Imports EnvelopeGenerator.Domain.Entities
+Imports DigitalData.Core.Abstraction.Application
+Imports EnvelopeGenerator.Infrastructure
+Imports Microsoft.EntityFrameworkCore
+Imports DigitalData.Core.Abstractions
 
 Namespace Jobs
     Public Class FinalizeDocumentJob
@@ -62,7 +66,31 @@ Namespace Jobs
                 LicenseManager.RegisterKEY(oGdPictureKey)
 
                 Logger.Debug("Loading Database..")
-                Database = GetDatabase(pContext, LogConfig)
+                Dim oConnectionString As String = pContext.MergedJobDataMap.Item(Value.DATABASE)
+                Database = New MSSQLServer(LogConfig, MSSQLServer.DecryptConnectionString(oConnectionString))
+
+#Disable Warning BC40000 ' Type or member is obsolete
+                Factory.Shared _
+                .BehaveOnPostBuild(PostBuildBehavior.Ignore) _
+                .AddEnvelopeGeneratorInfrastructureServices(
+                Sub(opt)
+                    opt.AddDbTriggerParams(
+                        Sub(triggers)
+                            triggers("Envelope") = New List(Of String) From {"TBSIG_ENVELOPE_AFT_INS"}
+                            triggers("History") = New List(Of String) From {"TBSIG_ENVELOPE_HISTORY_AFT_INS"}
+                            triggers("EmailOut") = New List(Of String) From {"TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD"}
+                            triggers("EnvelopeReceiverReadOnly") = New List(Of String) From {"TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD"}
+                            triggers("Receiver") = New List(Of String)() ' no tigger
+                            triggers("EmailTemplate") = New List(Of String) From {"TBSIG_EMAIL_TEMPLATE_AFT_UPD"}
+                        End Sub)
+                    opt.AddDbContext(
+                        Sub(options)
+                            options.UseSqlServer(oConnectionString) _
+                                   .EnableSensitiveDataLogging() _
+                                   .EnableDetailedErrors()
+                        End Sub)
+                End Sub)
+#Enable Warning BC40000 ' Type or member is obsolete
 
                 Logger.Debug("Loading Models & Services")
                 Dim oState = GetState()
@@ -378,7 +406,6 @@ Namespace Jobs
                 ParentFolderUID = pEnvelopeData.EnvelopeUUID
             End If
 
-
             Logger.Info("ParentFolderUID: [{0}]", ParentFolderUID)
             Dim oInputDocumentBuffer As Byte()
             If Not IsNothing(pEnvelopeData.DocAsByte) Then
@@ -391,7 +418,7 @@ Namespace Jobs
                 End Try
             End If
 
-            Return PDFBurner.BurnInstantJSONAnnotationsToPDF(oInputDocumentBuffer, oAnnotations)
+            Return PDFBurner.BurnAnnotsToPDF(oInputDocumentBuffer, oAnnotations, pEnvelopeData.EnvelopeId)
         End Function
 
         Private Function GetEnvelopeData(pEnvelopeId As Integer) As EnvelopeData
@@ -439,13 +466,6 @@ Namespace Jobs
             ReportModel = New ReportModel(pState)
         End Sub
 
-        Private Function GetDatabase(pContext As IJobExecutionContext, pLogConfig As LogConfig) As MSSQLServer
-            Dim oConnectionString As String = pContext.MergedJobDataMap.Item(Value.DATABASE)
-            Dim Database = New MSSQLServer(pLogConfig, MSSQLServer.DecryptConnectionString(oConnectionString))
-
-            Return Database
-        End Function
-
         Private Function GetState() As State
             Return New State With {
                 .LogConfig = LogConfig,

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurner.vb

@@ -1,10 +1,17 @@
-Imports System.Drawing
+Imports System.Collections.Immutable
+Imports System.Drawing
 Imports System.IO
+Imports DevExpress.DataProcessing
+Imports DigitalData.Core.Abstraction.Application.Repository
+Imports DigitalData.Core.Abstractions
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
-Imports GdPicture14
-Imports Newtonsoft.Json
 Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument.FinalizeDocumentExceptions
+Imports EnvelopeGenerator.Domain.Entities
+Imports EnvelopeGenerator.PdfEditor
+Imports GdPicture14
+Imports Microsoft.EntityFrameworkCore
+Imports Newtonsoft.Json
 
 Namespace Jobs.FinalizeDocument
     Public Class PDFBurner
@@ -13,9 +20,6 @@ Namespace Jobs.FinalizeDocument
         Private ReadOnly Manager As AnnotationManager
         Private ReadOnly LicenseManager As LicenseManager
 
-        Private Const ANNOTATION_TYPE_IMAGE = "pspdfkit/image"
-        Private Const ANNOTATION_TYPE_INK = "pspdfkit/ink"
-        Private Const ANNOTATION_TYPE_WIDGET = "pspdfkit/widget"
         Private Property _pdfBurnerParams As PDFBurnerParams
 
         Public Sub New(pLogConfig As LogConfig, pGDPictureLicenseKey As String, pdfBurnerParams As PDFBurnerParams)
@@ -29,7 +33,94 @@ Namespace Jobs.FinalizeDocument
             _pdfBurnerParams = pdfBurnerParams
         End Sub
 
-        Public Function BurnInstantJSONAnnotationsToPDF(pSourceBuffer As Byte(), pInstantJSONList As List(Of String)) As Byte()
+#Region "Burn PDF"
+        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 sigRepo = scope.ServiceProvider.Repository(Of Signature)()
+                Dim elements = sigRepo _
+                    .Where(Function(sig) sig.Document.EnvelopeId = envelopeId) _
+                    .Include(Function(sig) sig.Annotations) _
+                    .ToList()
+
+                Return If(elements.Any(),
+                       BurnElementAnnotsToPDF(pSourceBuffer, elements),
+                       BurnInstantJSONAnnotsToPDF(pSourceBuffer, pInstantJSONList))
+            End Using
+        End Function
+
+        Public Function BurnElementAnnotsToPDF(pSourceBuffer As Byte(), elements As List(Of Signature)) As Byte()
+            ' Add background
+            Using doc As Pdf(Of MemoryStream, MemoryStream) = Pdf.FromMemory(pSourceBuffer)
+                'TODO: take the length from the largest y
+                pSourceBuffer = doc.Background(elements, 1.9500000000000002 * 0.93, 2.52 * 0.67).ExportStream().ToArray()
+
+                Dim oResult As GdPictureStatus
+                Using oSourceStream As New MemoryStream(pSourceBuffer)
+                    ' Open PDF
+                    oResult = Manager.InitFromStream(oSourceStream)
+                    If oResult <> GdPictureStatus.OK Then
+                        Throw New BurnAnnotationException($"Could not open document for burning: [{oResult}]")
+                    End If
+
+                    ' Imported from background (add to configuration)
+                    Dim margin As Double = 0.2
+                    Dim inchFactor As Double = 72
+
+                    ' Y offset of form fields
+                    Dim keys = {"position", "city", "date"} ' add to configuration
+                    Dim unitYOffsets = 0.2
+                    Dim yOffsetsOfFF = keys.
+                        Select(Function(k, i) New With {Key .Key = k, Key .Value = unitYOffsets * i + 1}).
+                        ToDictionary(Function(x) x.Key, Function(x) x.Value)
+
+                    'Add annotations
+                    For Each element In elements
+
+                        Dim frameX = (element.Left - 0.7 - margin)
+
+                        Dim frame = element.Annotations.FirstOrDefault(Function(a) a.Name = "frame")
+                        Dim frameY = element.Top - 0.5 - margin
+                        Dim frameYShift = frame.Y - frameY * inchFactor
+                        Dim frameXShift = frame.X - frameX * inchFactor
+
+                        For Each annot In element.Annotations
+                            Dim yOffsetofFF As Double = If(yOffsetsOfFF.TryGetValue(annot.Name, yOffsetofFF), yOffsetofFF, 0)
+                            Dim y = frameY + yOffsetofFF
+
+                            If annot.Type = AnnotationType.FormField Then
+                                AddFormFieldValue(annot.X / inchFactor, y, annot.Width / inchFactor, annot.Height / inchFactor, element.Page, annot.Value)
+                            ElseIf annot.Type = AnnotationType.Image Then
+                                AddImageAnnotation(
+                                    annot.X / inchFactor,
+                                    If(annot.Name = "signature", (annot.Y - frameYShift) / inchFactor, y),
+                                    annot.Width / inchFactor,
+                                    annot.Height / inchFactor,
+                                    element.Page,
+                                    annot.Value
+                                )
+                            ElseIf annot.Type = AnnotationType.Ink Then
+                                AddInkAnnotation(element.Page, annot.Value)
+                            End If
+                        Next
+                    Next
+
+                    'Save PDF
+                    Using oNewStream As New MemoryStream()
+                        oResult = Manager.SaveDocumentToPDF(oNewStream)
+                        If oResult <> GdPictureStatus.OK Then
+                            Throw New BurnAnnotationException($"Could not save document to stream: [{oResult}]")
+                        End If
+
+                        Manager.Close()
+
+                        Return oNewStream.ToArray()
+                    End Using
+                End Using
+            End Using
+        End Function
+
+        Public Function BurnInstantJSONAnnotsToPDF(pSourceBuffer As Byte(), pInstantJSONList As List(Of String)) As Byte()
             Dim oResult As GdPictureStatus
             Using oSourceStream As New MemoryStream(pSourceBuffer)
                 ' Open PDF
@@ -40,11 +131,13 @@ Namespace Jobs.FinalizeDocument
 
                 ' Add annotation to PDF
                 For Each oJSON In pInstantJSONList
-                    If AddInstantJSONAnnotationToPDF(oJSON) = False Then
+                    Try
+                        AddInstantJSONAnnotationToPDF(oJSON)
+                    Catch ex As Exception
                         Logger.Warn($"Error in AddInstantJSONAnnotationToPDF - oJson: ")
                         Logger.Warn(oJSON)
-                        Throw New BurnAnnotationException($"Adding Annotation failed")
+                        Throw New BurnAnnotationException($"Adding Annotation failed", ex)
-                    End If
+                    End Try
                 Next
                 oResult = Manager.BurnAnnotationsToPage(RemoveInitialAnnots:=True, VectorMode:=True)
                 If oResult <> GdPictureStatus.OK Then
@@ -64,128 +157,125 @@ Namespace Jobs.FinalizeDocument
                 End Using
             End Using
         End Function
+#End Region
 
-        Private Function AddInstantJSONAnnotationToPDF(pInstantJSON As String) As Boolean
+#Region "Add Value"
-            Try
+        Private Sub AddInstantJSONAnnotationToPDF(pInstantJSON As String)
-                Dim oAnnotationData = JsonConvert.DeserializeObject(Of AnnotationData)(pInstantJSON)
+            Dim oAnnotationData = JsonConvert.DeserializeObject(Of AnnotationData)(pInstantJSON)
-                oAnnotationData.annotations.Reverse()
 
-                Dim sigAnnotType = oAnnotationData.annotations.ElementAt(1).type
+            oAnnotationData.annotations.Reverse()
-                Dim yPosOfSigAnnot = oAnnotationData.annotations.ElementAt(2).bbox.ElementAt(1) - 71.84002685546875 + 7
-                Dim isSeal = True   'First element is signature seal
 
-                Dim formFieldIndex = 0
+            For Each oAnnotation In oAnnotationData.annotations
-                For Each oAnnotation In oAnnotationData.annotations
+                Logger.Debug("Adding AnnotationID: " + oAnnotation.id)
-                    Logger.Debug("Adding AnnotationID: " + oAnnotation.id)
 
-                    Select Case oAnnotation.type
+                Select Case oAnnotation.type
-                        Case ANNOTATION_TYPE_IMAGE
+                    Case AnnotationType.Image
+                        AddImageAnnotation(oAnnotation, oAnnotationData.attachments)
+                        Exit Select
+                    Case AnnotationType.Ink
+                        AddInkAnnotation(oAnnotation)
+                        Exit Select
+                    Case AnnotationType.Widget
+                        'Add form field values
+                        Dim formFieldValue = oAnnotationData.formFieldValues.FirstOrDefault(Function(fv) fv.name = oAnnotation.id)
+                        If formFieldValue IsNot Nothing AndAlso Not _pdfBurnerParams.IgnoredLabels.Contains(formFieldValue.value) Then
+                            AddFormFieldValue(oAnnotation, formFieldValue)
+                        End If
+                        Exit Select
+                End Select
+            Next
 
-                            If (isSeal) Then
+        End Sub
-                                oAnnotation.bbox.Item(1) = yPosOfSigAnnot
-                            End If
 
-                            AddImageAnnotation(oAnnotation, oAnnotationData.attachments)
+        Private Sub AddImageAnnotation(x As Double, y As Double, width As Double, height As Double, page As Integer, base64 As String)
+            Manager.SelectPage(page)
+            Manager.AddEmbeddedImageAnnotFromBase64(base64, x, y, width, height)
+        End Sub
 
-                        Case ANNOTATION_TYPE_INK
+        Private Sub AddImageAnnotation(pAnnotation As Annotation, pAttachments As Dictionary(Of String, Attachment))
-                            AddInkAnnotation(oAnnotation)
+            Dim oAttachment = pAttachments.Where(Function(a) a.Key = pAnnotation.imageAttachmentId).
+                    SingleOrDefault()
 
-                        Case ANNOTATION_TYPE_WIDGET
+            ' Convert pixels to Inches
-                            'Add form field values
+            Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
-                            Dim formFieldValue = oAnnotationData.formFieldValues.FirstOrDefault(Function(fv) fv.name = oAnnotation.id)
-                            If formFieldValue IsNot Nothing AndAlso Not _pdfBurnerParams.IgnoredLabels.Contains(formFieldValue.value) Then
-                                AddFormFieldValue(oAnnotation, formFieldValue, formFieldIndex)
-                                formFieldIndex += 1
-                            End If
-                    End Select
 
-                    isSeal = False
+            Dim oX = oBounds.Item(0)
-                Next
+            Dim oY = oBounds.Item(1)
+            Dim oWidth = oBounds.Item(2)
+            Dim oHeight = oBounds.Item(3)
 
-                Return True
+            Manager.SelectPage(pAnnotation.pageIndex + 1)
-            Catch ex As Exception
+            Manager.AddEmbeddedImageAnnotFromBase64(oAttachment.Value.binary, oX, oY, oWidth, oHeight)
-                Logger.Warn("Could not create annotation from InstantJSON")
+        End Sub
-                Logger.Error(ex)
-                Return False
-            End Try
-        End Function
 
-        Private Function AddImageAnnotation(pAnnotation As Annotation, pAttachments As Dictionary(Of String, Attachment), Optional yOffset As Double = 0) As Boolean
+        Private Sub AddInkAnnotation(page As Integer, value As String)
-            Try
-                Dim oAttachment = pAttachments.Where(Function(a) a.Key = pAnnotation.imageAttachmentId).
-                        SingleOrDefault()
 
-                ' Convert pixels to Inches
+            Dim ink = JsonConvert.DeserializeObject(Of Ink)(value)
-                Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
 
-                Dim oX = oBounds.Item(0)
+            Dim oSegments = ink.lines.points
-                Dim oY = oBounds.Item(1) + yOffset
+            Dim oColor = ColorTranslator.FromHtml(ink.strokeColor)
-                Dim oWidth = oBounds.Item(2)
+            Manager.SelectPage(page)
-                Dim oHeight = oBounds.Item(3)
 
-                Manager.SelectPage(pAnnotation.pageIndex + 1)
+            For Each oSegment As List(Of List(Of Single)) In oSegments
-                Manager.AddEmbeddedImageAnnotFromBase64(oAttachment.Value.binary, oX, oY, oWidth, oHeight)
+                Dim oPoints = oSegment.
+                Select(AddressOf ToPointF).
+                ToArray()
 
-                Return True
+                Manager.AddFreeHandAnnot(oColor, oPoints)
-            Catch ex As Exception
+            Next
-                Logger.Warn("Could not add image annotation!")
+        End Sub
-                Logger.Error(ex)
 
-                Return False
+        Private Sub AddInkAnnotation(pAnnotation As Annotation)
-            End Try
+            Dim oSegments = pAnnotation.lines.points
-        End Function
+            Dim oColor = ColorTranslator.FromHtml(pAnnotation.strokeColor)
+            Manager.SelectPage(pAnnotation.pageIndex + 1)
 
-        Private Function AddInkAnnotation(pAnnotation As Annotation) As Boolean
+            For Each oSegment As List(Of List(Of Single)) In oSegments
-            Try
+                Dim oPoints = oSegment.
-                Dim oSegments = pAnnotation.lines.points
+                Select(AddressOf ToPointF).
-                Dim oColor = ColorTranslator.FromHtml(pAnnotation.strokeColor)
+                ToArray()
-                Manager.SelectPage(pAnnotation.pageIndex + 1)
 
-                For Each oSegment As List(Of List(Of Single)) In oSegments
+                Manager.AddFreeHandAnnot(oColor, oPoints)
-                    Dim oPoints = oSegment.
+            Next
-                    Select(AddressOf ToPointF).
+        End Sub
-                    ToArray()
 
-                    Manager.AddFreeHandAnnot(oColor, oPoints)
+        Private Sub AddFormFieldValue(x As Double, y As Double, width As Double, height As Double, page As Integer, value As String)
-                Next
+            Manager.SelectPage(page)
 
-                Return True
+            ' Add the text annotation
-            Catch ex As Exception
+            Dim ant = Manager.AddTextAnnot(x, y, width, height, value)
-                Logger.Warn("Could not add image annotation!")
-                Logger.Error(ex)
 
-                Return False
+            ' Set the font properties
-            End Try
+            ant.FontName = _pdfBurnerParams.FontName
+            ant.FontSize = _pdfBurnerParams.FontSize
+            ant.FontStyle = _pdfBurnerParams.FontStyle
+            Manager.SaveAnnotationsToPage()
+        End Sub
 
-        End Function
+        Private Sub AddFormFieldValue(pAnnotation As Annotation, formFieldValue As FormFieldValue)
+            Dim ffIndex As Integer = EGName.Index(pAnnotation.egName)
 
-        Private Function AddFormFieldValue(pAnnotation As Annotation, formFieldValue As FormFieldValue, index As Integer) As Boolean
+            ' Convert pixels to Inches
-            Try
+            Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
-                ' Convert pixels to Inches
-                Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
 
-                Dim oX = oBounds.Item(0)
+            Dim oX = oBounds.Item(0)
-                Dim oY = oBounds.Item(1) + _pdfBurnerParams.YOffset * index + _pdfBurnerParams.TopMargin
+            Dim oY = oBounds.Item(1) + _pdfBurnerParams.YOffset * ffIndex + _pdfBurnerParams.TopMargin
-                Dim oWidth = oBounds.Item(2)
+            Dim oWidth = oBounds.Item(2)
-                Dim oHeight = oBounds.Item(3)
+            Dim oHeight = oBounds.Item(3)
 
-                Manager.SelectPage(pAnnotation.pageIndex + 1)
+            Manager.SelectPage(pAnnotation.pageIndex + 1)
-                ' Add the text annotation
+            ' Add the text annotation
-                Dim ant = Manager.AddTextAnnot(oX, oY, oWidth, oHeight, formFieldValue.value)
+            Dim ant = Manager.AddTextAnnot(oX, oY, oWidth, oHeight, formFieldValue.value)
 
-                ' Set the font properties
+            ' Set the font properties
-                ant.FontName = _pdfBurnerParams.FontName
+            ant.FontName = _pdfBurnerParams.FontName
-                ant.FontSize = _pdfBurnerParams.FontSize
+            ant.FontSize = _pdfBurnerParams.FontSize
-                ant.FontStyle = _pdfBurnerParams.FontStyle
+            ant.FontStyle = _pdfBurnerParams.FontStyle
-                Manager.SaveAnnotationsToPage()
+            Manager.SaveAnnotationsToPage()
-                Return True
+        End Sub
-            Catch ex As Exception
+#End Region
-                Logger.Warn("Could not add image annotation!")
-                Logger.Error(ex)
-                Return False
-            End Try
-        End Function
 
+#Region "Helpers"
         Private Function ToPointF(pPoints As List(Of Single)) As PointF
             Dim oPoints = pPoints.Select(AddressOf ToInches).ToList()
             Return New PointF(oPoints.Item(0), oPoints.Item(1))
@@ -198,24 +288,138 @@ Namespace Jobs.FinalizeDocument
         Private Function ToInches(pValue As Single) As Single
             Return pValue / 72
         End Function
+#End Region
+
+#Region "Model"
+        Friend Class AnnotationType
+            Public Const Image As String = "pspdfkit/image"
+            Public Const Ink As String = "pspdfkit/ink"
+            Public Const Widget As String = "pspdfkit/widget"
+            Public Const FormField As String = "pspdfkit/form-field-value"
+        End Class
 
         Friend Class AnnotationData
             Public Property annotations As List(Of Annotation)
+
+            Public ReadOnly Property AnnotationsByReceiver As IEnumerable(Of List(Of Annotation))
+                Get
+                    Return annotations _
+                        .Where(Function(annot) annot.hasStructuredID).ToList() _
+                        .GroupBy(Function(a) a.receiverId) _
+                        .Select(Function(g) g.ToList())
+                End Get
+            End Property
+
+            Public ReadOnly Property UnstructuredAnnotations As IEnumerable(Of List(Of Annotation))
+                Get
+                    Return annotations _
+                        .Where(Function(annot) Not annot.hasStructuredID).ToList() _
+                        .GroupBy(Function(a) a.receiverId) _
+                        .Select(Function(g) g.ToList())
+                End Get
+            End Property
+
             Public Property attachments As Dictionary(Of String, Attachment)
             Public Property formFieldValues As List(Of FormFieldValue)
         End Class
 
         Friend Class Annotation
+
+            Private _id As String = Nothing
+
+            Public envelopeId As Integer = Nothing
+
+            Public receiverId As Integer = Nothing
+
+            Public index As Integer = Nothing
+
+            Public egName As String = PDFBurner.EGName.NoName
+
+            Public hasStructuredID As Boolean = False
+
+            Public ReadOnly Property isLabel As Boolean
+                Get
+                    If String.IsNullOrEmpty(egName) Then
+                        Return False
+                    End If
+
+                    Dim parts As String() = egName.Split("_"c)
+                    Return parts.Length > 1 AndAlso parts(1) = "label"
+                End Get
+            End Property
+
             Public Property id As String
+                Get
+                    Return _id
+                End Get
+                Set(value As String)
+                    _id = value
+
+                    If String.IsNullOrWhiteSpace(_id) Then
+                        Throw New BurnAnnotationException("The identifier of annotation is null or empty.")
+                    End If
+
+                    Dim parts As String() = value.Split("#"c)
+
+                    If (parts.Length <> 4) Then
+                        Return
+                        'Throw New BurnAnnotationException($"The identifier of annotation has more or less than 4 sub-part. Id: {_id}")
+                    End If
+
+                    If Not Integer.TryParse(parts(0), envelopeId) Then
+                        Throw New BurnAnnotationException($"The envelope ID of annotation is not integer. Id: {_id}")
+                    End If
+
+                    If Not Integer.TryParse(parts(1), receiverId) Then
+                        Throw New BurnAnnotationException($"The receiver ID of annotation is not integer. Id: {_id}")
+                    End If
+
+                    If Not Integer.TryParse(parts(2), index) Then
+                        Throw New BurnAnnotationException($"The index of annotation is not integer. Id: {_id}")
+                    End If
+
+                    egName = parts(3)
+
+                    hasStructuredID = True
+                End Set
+            End Property
+
             Public Property bbox As List(Of Double)
+
             Public Property type As String
+
             Public Property isSignature As Boolean
+
             Public Property imageAttachmentId As String
+
             Public Property lines As Lines
+
             Public Property pageIndex As Integer
+
             Public Property strokeColor As String
         End Class
 
+        Friend Class Ink
+            Public Property lines As Lines
+
+            Public Property strokeColor As String
+        End Class
+
+        Public Class EGName
+            Public Shared ReadOnly NoName As String = Guid.NewGuid().ToString()
+
+            Public Shared ReadOnly Seal As String = "signature"
+
+            Public Shared ReadOnly Index As ImmutableDictionary(Of String, Integer) =
+                New Dictionary(Of String, Integer) From {
+                    {NoName, 0},
+                    {Seal, 0},
+                    {"position", 1},
+                    {"city", 2},
+                    {"date", 3}
+                }.ToImmutableDictionary()
+        End Class
+
         Friend Class Lines
             Public Property points As List(Of List(Of List(Of Single)))
         End Class
@@ -229,5 +433,6 @@ Namespace Jobs.FinalizeDocument
             Public Property name As String
             Public Property value As String
         End Class
+#End Region
     End Class
 End Namespace

EnvelopeGenerator.CommonServices/app.config

@@ -77,6 +77,70 @@
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.JsonWebTokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

EnvelopeGenerator.CommonServices/packages.config

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AutoMapper" version="10.1.1" targetFramework="net462" />
   <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
+  <package id="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" />
   <package id="DigitalData.Modules.Database" version="2.3.5.4" targetFramework="net462" />
@@ -15,8 +18,35 @@
   <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
   <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net462" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net462" />
+  <package id="Microsoft.Data.SqlClient" version="1.1.3" targetFramework="net462" />
+  <package id="Microsoft.Data.SqlClient.SNI" version="1.1.0" targetFramework="net462" />
+  <package id="Microsoft.EntityFrameworkCore" version="3.1.32" targetFramework="net462" />
+  <package id="Microsoft.EntityFrameworkCore.Abstractions" version="3.1.32" targetFramework="net462" />
+  <package id="Microsoft.EntityFrameworkCore.Analyzers" version="3.1.32" targetFramework="net462" />
+  <package id="Microsoft.EntityFrameworkCore.Relational" version="3.1.32" targetFramework="net462" />
+  <package id="Microsoft.EntityFrameworkCore.SqlServer" version="3.1.32" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Caching.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Configuration" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Configuration.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Configuration.Binder" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Localization.Abstractions" version="7.0.16" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Logging" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Options" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Primitives" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Identity.Client" version="3.0.8" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Abstractions" version="7.5.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Logging" version="7.5.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Protocols" version="5.5.0" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.5.0" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Tokens" version="7.5.1" targetFramework="net462" />
   <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
   <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
@@ -31,14 +61,22 @@
   <package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
   <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
   <package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net462" />
+  <package id="System.Data.Common" version="4.3.0" targetFramework="net462" />
   <package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
+  <package id="System.Diagnostics.DiagnosticSource" version="7.0.0" targetFramework="net462" />
+  <package id="System.DirectoryServices.AccountManagement" version="7.0.1" targetFramework="net462" />
   <package id="System.Drawing.Common" version="4.7.3" targetFramework="net462" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="7.5.1" targetFramework="net462" />
   <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
   <package id="System.Management" version="8.0.0" targetFramework="net462" />
   <package id="System.Memory" version="4.6.0" targetFramework="net462" />
   <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Cng" version="5.0.0" targetFramework="net462" />
   <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net462" />
   <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
   <package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />

EnvelopeGenerator.Domain/Entities/Document.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using EnvelopeGenerator.Domain.Interfaces;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 #if NETFRAMEWORK
 using System.Drawing;
@@ -14,7 +15,7 @@ namespace EnvelopeGenerator.Domain.Entities
 #endif
 
 [Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")]
-public class Document
+public class Document : IHasEnvelope
 {
     public Document()
     {
@@ -30,27 +31,50 @@ public class Document
 
     [Required]
     [Column("ENVELOPE_ID")]
-    public int EnvelopeId { get; set; } = 0;
+    public int EnvelopeId { get; set; }
+#if NETFRAMEWORK
+        = 0;
+#endif
 
     [Column("BYTE_DATA", TypeName = "varbinary(max)")]
-    public byte[] ByteData { get; set; }
+    public byte[]
+#if NET
+        ?
+#endif
+        ByteData { get; set; }
 
-    public List<Signature> Elements { get; set; }
+    #region File
+    [Column("FILENAME", TypeName = "nvarchar(256)")]
+    public string Filename { get; set; }
 
-    // TODO: * Check the Form App and remove the default value
+    [Column("FILEPATH", TypeName = "nvarchar(256)")]
-    [NotMapped]
     public string Filepath { get; set; }
 
+    [Column("FILENAME_ORIGINAL", TypeName = "nvarchar(256)")]
+    public string
+#if NET
+        ?
+#endif
+        FileNameOriginal { get; set; }
+    #endregion
+
+    public virtual List<Signature>
+#if NET
+        ?
+#endif
+        Elements { get; set; }
+
+    [ForeignKey("EnvelopeId")]
+    public virtual Envelope
+#if NET
+        ?
+#endif
+        Envelope { get; set; }
+
 #if NETFRAMEWORK
-    [NotMapped]
-    public string FileNameOriginal { get; set; }
-
     [NotMapped]
     public bool IsTempFile { get; set; }
 
-    [NotMapped]
-    public string Filename { get; set; }
-
     [NotMapped]
     public Bitmap Thumbnail { get; set; }
 

EnvelopeGenerator.Domain/Entities/DocumentStatus.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using DigitalData.Core.Abstractions.Interfaces;
 using EnvelopeGenerator.Domain.Interfaces;
 
 #if NETFRAMEWORK
@@ -14,7 +15,7 @@ namespace EnvelopeGenerator.Domain.Entities
 #endif
 
 [Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")]
-public class DocumentStatus : IHasEnvelope, IHasReceiver
+public class DocumentStatus : IHasEnvelope, IHasReceiver, IEntity
 {
     public DocumentStatus()
     {

EnvelopeGenerator.Domain/Entities/ElementAnnotation.cs

@@ -0,0 +1,92 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+#if NETFRAMEWORK
+using System;
+#endif
+
+namespace EnvelopeGenerator.Domain.Entities
+#if NET
+    ;
+#elif NETFRAMEWORK
+    {
+#endif
+
+[Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT_ANNOTATION")]
+public class ElementAnnotation
+{
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID", TypeName = "bigint")]
+    public long Id { get; set; }
+
+    [Required]
+    [Column("ELEMENT_ID", TypeName = "int")]
+    public int ElementId { get; set; }
+
+    [Required]
+    [Column("NAME", TypeName = "nvarchar(100)")]
+    [StringLength(100)]
+    public string Name { get; set; }
+
+    [Required]
+    [Column("VALUE", TypeName = "nvarchar(max)")]
+    public string Value { get; set; }
+
+    [Required]
+    [Column("TYPE", TypeName = "nvarchar(50)")]
+    public string Type { get; set; }
+
+    [Column("POSITION_X", TypeName = "float")]
+    public double
+#if NET
+        ?
+#endif
+        X { get; set; }
+
+    [Column("POSITION_Y", TypeName = "float")]
+    public double
+#if NET
+        ?
+#endif
+        Y { get; set; }
+
+    [Column("WIDTH", TypeName = "float")]
+    public double
+#if NET
+        ?
+#endif
+        Width { get; set; }
+
+    [Column("HEIGHT", TypeName = "float")]
+    public double
+#if NET
+        ?
+#endif
+        Height { get; set; }
+
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    public DateTime AddedWhen { get; set; }
+
+    [Column("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime? ChangedWhen { get; set; }
+
+    [Column("CHANGED_WHO", TypeName = "nvarchar(100)")]
+    [StringLength(100)]
+    public string
+#if NET
+        ?
+#endif
+        ChangedWho { get; set; }
+
+    [ForeignKey("ElementId")]
+    public virtual Signature
+#if NET
+        ?
+#endif
+        Element { get; set; }
+}
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Domain/Entities/EnvelopeReceiverReadOnly.cs

@@ -42,13 +42,21 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [Column("ADDED_WHEN")]
         [Required]
-        public DateTime AddedWhen { get; set; }
+        public DateTime
+#if NET
+            ?
+#endif
+            AddedWhen { get; set; }
 
         [Column("CHANGED_WHO")]
         [StringLength(100)]
-        public string ChangedWho { get; set; }
+        public string
+#if NET
+            ?
+#endif
+            ChangedWho { get; set; }
 
         [Column("CHANGED_WHEN")]
-        public DateTime ChangedWhen { get; set; }
+        public DateTime? ChangedWhen { get; set; }
     }
 }

EnvelopeGenerator.Domain/Entities/History.cs

@@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using EnvelopeGenerator.Domain.Interfaces;
 using EnvelopeGenerator.Domain.Constants;
+using DigitalData.Core.Abstractions.Interfaces;
 
 
 #if NETFRAMEWORK
@@ -17,7 +18,7 @@ namespace EnvelopeGenerator.Domain.Entities
 #endif
 
 [Table("TBSIG_ENVELOPE_HISTORY", Schema = "dbo")]
-public class History : IHasEnvelope, IHasReceiver
+public class History : IHasEnvelope, IHasReceiver, IEntity
 {
     [Key]
     [DatabaseGenerated(DatabaseGeneratedOption.Identity)]

EnvelopeGenerator.Domain/Entities/Signature.cs

@@ -1,8 +1,10 @@
-using System.ComponentModel;
+using EnvelopeGenerator.Domain.Interfaces;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 #if NETFRAMEWORK
 using System;
+using System.Collections.Generic;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
@@ -13,7 +15,7 @@ namespace EnvelopeGenerator.Domain.Entities
 #endif
 
 [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
-public class Signature
+public class Signature : ISignature, IHasReceiver
 {
     public Signature()
     {
@@ -106,7 +108,17 @@ public class Signature
     public virtual Document Document { get; set; }
 
     [ForeignKey("ReceiverId")]
-    public virtual Receiver Receiver { get; set; }
+    public virtual Receiver
+#if NET
+        ?
+#endif
+        Receiver { get; set; }
+
+    public virtual IEnumerable<ElementAnnotation>
+#if NET
+        ?
+#endif
+        Annotations { get; set; }
 
 #if NETFRAMEWORK
     [NotMapped]

EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj

@@ -37,7 +37,7 @@
     <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction.Attributes" Version="1.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="UserManager.Domain" Version="3.2.3" />
-	<PackageReference Include="DigitalData.Core.Abstractions" Version="4.1.1" />
+	<PackageReference Include="DigitalData.Core.Abstractions" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>

EnvelopeGenerator.Domain/Interfaces/ISignature.cs

@@ -0,0 +1,11 @@
+namespace EnvelopeGenerator.Domain.Interfaces
+{
+    public interface ISignature
+    {
+        int Page { get; set; }
+
+        double X { get; set; }
+
+        double Y { get; set; }
+    }
+}

EnvelopeGenerator.Form/app.config

@@ -101,7 +101,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -121,20 +121,92 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Abstractions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.22.0.0" newVersion="6.22.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Identity.Client" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.8.0" newVersion="3.0.8.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.JsonWebTokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <entityFramework>

EnvelopeGenerator.GeneratorAPI/Program.cs

@@ -185,7 +185,19 @@ try
     // Envelope generator serives
 #pragma warning disable CS0618 // Type or member is obsolete
     builder.Services
-        .AddEnvelopeGeneratorInfrastructureServices(sqlExecutorConfigureOptions: executor => executor.ConnectionString = connStr)
+        .AddEnvelopeGeneratorInfrastructureServices(opt =>
+        {
+            opt.AddDbTriggerParams(config);
+            opt.AddDbContext((provider, options) =>
+            {
+                var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
+                options.UseSqlServer(connStr)
+                        .LogTo(log => logger.LogInformation("{log}", log), Microsoft.Extensions.Logging.LogLevel.Trace)
+                        .EnableSensitiveDataLogging()
+                        .EnableDetailedErrors();
+            });
+            opt.AddSQLExecutor(executor => executor.ConnectionString = connStr);
+        })
         .AddEnvelopeGeneratorServices(config);
 #pragma warning restore CS0618 // Type or member is obsolete
 

EnvelopeGenerator.Infrastructure/DbTriggerParams.cs

@@ -0,0 +1,18 @@
+#if NETFRAMEWORK
+using System.Collections.Generic;
+#endif
+
+namespace EnvelopeGenerator.Infrastructure
+#if NET
+    ;
+#elif NETFRAMEWORK
+{
+#endif
+
+public class DbTriggerParams : Dictionary<string, ICollection<string>>
+{
+}
+
+#if NETFRAMEWORK
+}
+#endif

EnvelopeGenerator.Infrastructure/DependencyExtensions.cs

@@ -1,157 +0,0 @@
-using EnvelopeGenerator.Infrastructure.Repositories;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.EntityFrameworkCore;
-using DigitalData.Core.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.Extensions.Configuration;
-using EnvelopeGenerator.Infrastructure.Executor;
-using Dapper;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Reflection;
-using DigitalData.UserManager.Domain.Entities;
-using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
-using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
-using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
-
-namespace EnvelopeGenerator.Infrastructure;
-
-public static class DIExtensions
-{
-    /// <summary>
-    /// Registers the required repositories for the Envelope Generator service to the given <see cref="IServiceCollection"/>.
-    /// This method adds the repositories for various envelope-related entities, such as configuration, document receivers, envelopes, and users,
-    /// as scoped services to the dependency injection container. Optionally, it can also configure the <see cref="EGDbContext"/> 
-    /// with the provided database context options if specified.
-    /// </summary>
-    /// <param name="services">The <see cref="IServiceCollection"/> to which the services are added.</param>
-    /// <param name="dbContextOptions">An optional action to configure the <see cref="DbContextOptionsBuilder"/> for the <see cref="EGDbContext"/>. 
-    /// If not provided, the <see cref="EGDbContext"/> will not be configured.</param>
-    /// <returns>The updated <see cref="IServiceCollection"/> with the added repository services.</returns>
-    /// <remarks>
-    /// This method ensures that the repositories are registered as scoped services, meaning that a new instance of each repository 
-    /// will be created per HTTP request (or per scope) within the dependency injection container.
-    /// </remarks>
-    [Obsolete("Use IRepository")]
-    public static IServiceCollection AddEnvelopeGeneratorInfrastructureServices(this IServiceCollection services,
-        Action<IServiceProvider, DbContextOptionsBuilder>? dbContextOptions = null,
-        IConfiguration? sqlExecutorConfiguration = null,
-        Action<SQLExecutorParams>? sqlExecutorConfigureOptions = null)
-    {
-        if(dbContextOptions is not null)
-            services.AddDbContext<EGDbContext>(dbContextOptions);
-
-        services.TryAddScoped<IConfigRepository, ConfigRepository>();
-        services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
-        services.TryAddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
-        services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
-        services.TryAddScoped<IDocumentStatusRepository, DocumentStatusRepository>();
-        services.TryAddScoped<IEmailTemplateRepository, EmailTemplateRepository>();
-        services.TryAddScoped<IEnvelopeRepository, EnvelopeRepository>();
-        services.TryAddScoped<IEnvelopeHistoryRepository, EnvelopeHistoryRepository>();
-        services.TryAddScoped<IEnvelopeReceiverRepository, EnvelopeReceiverRepository>();
-        services.TryAddScoped<IEnvelopeTypeRepository, EnvelopeTypeRepository>();
-        services.TryAddScoped<IReceiverRepository, ReceiverRepository>();
-        services.TryAddScoped<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyRepository>();
-
-        services.AddDbRepository(opt =>
-        {
-            // scan EnvelopeGenerator
-            opt.RegisterFromAssembly<EGDbContext>(typeof(Config).Assembly);
-
-            // scan UserManager
-            opt.RegisterFromAssembly<EGDbContext>(typeof(User).Assembly);
-
-            // scan EmailProfilerDispatcher
-            opt.RegisterFromAssembly<EGDbContext>(typeof(EmailOut).Assembly);
-        });
-
-        services.AddSQLExecutor<Envelope>();
-        services.AddSQLExecutor<Receiver>();
-        services.AddSQLExecutor<Document>();
-        services.AddSQLExecutor<Signature>();
-        services.AddSQLExecutor<DocumentStatus>();
-
-        SetDapperTypeMap<Envelope>();
-        SetDapperTypeMap<User>();
-        SetDapperTypeMap<Receiver>();
-        SetDapperTypeMap<Document>();
-        SetDapperTypeMap<Signature>();
-        SetDapperTypeMap<DocumentStatus>();
-
-        services.AddScoped<IEnvelopeExecutor, EnvelopeExecutor>();
-        services.AddScoped<IEnvelopeReceiverExecutor, EnvelopeReceiverExecutor>();
-        services.AddScoped<IDocumentExecutor, DocumentExecutor>();
-
-        if (sqlExecutorConfiguration is not null || sqlExecutorConfigureOptions is not null)
-            services.AddSQLExecutor(sqlExecutorConfiguration, sqlExecutorConfigureOptions);
-
-        return services;
-    }
-
-    public static IServiceCollection AddSQLExecutor(this IServiceCollection services, IConfiguration? configuration = null, Action<SQLExecutorParams>? configureOptions = null)
-    {
-        if(configuration is not null && configureOptions is not null)
-            throw new InvalidOperationException("Cannot use both 'configuration' and 'configureOptions'. Only one should be provided.");
-
-        if (configuration is not null)
-            services.Configure<SQLExecutorParams>(configuration);
-
-        if(configureOptions is not null)
-            services.Configure(configureOptions);
-
-        return services.AddSingleton<ISQLExecutor, SQLExecutor>();
-    }
-
-    private static void SetDapperTypeMap<TModel>()
-    {
-        Dapper.SqlMapper.SetTypeMap(typeof(TModel), new CustomPropertyTypeMap(
-            typeof(TModel),
-            (type, columnName) =>
-            {
-                return type.GetProperties().FirstOrDefault(prop =>
-                {
-                    var attr = prop.GetCustomAttribute<ColumnAttribute>();
-                    return attr != null && string.Equals(attr.Name, columnName, StringComparison.OrdinalIgnoreCase)
-                        || string.Equals(prop.Name, columnName, StringComparison.OrdinalIgnoreCase);
-                })!;
-            }
-        ));
-    }
-
-    public static IServiceCollection AddSQLExecutor<T>(this IServiceCollection services, IConfiguration? configuration = null, Action<SQLExecutorParams>? configureOptions = null) where T : class
-    {
-        if (configuration is not null && configureOptions is not null)
-            throw new InvalidOperationException("Cannot use both 'configuration' and 'configureOptions'. Only one should be provided.");
-
-        if (configuration is not null)
-            services.Configure<SQLExecutorParams>(configuration);
-
-        services.AddScoped<ISQLExecutor<T>, SQLExecutor<T>>();
-
-        var interfaceType = typeof(ISQL<>);
-        var targetGenericType = interfaceType.MakeGenericType(typeof(T));
-
-        var implementations = AppDomain.CurrentDomain.GetAssemblies()
-            .SelectMany(a =>
-            {
-                try { return a.GetTypes(); }
-                catch { return Array.Empty<Type>(); }
-            })
-            .Where(t =>
-                t is { IsClass: true, IsAbstract: false } &&
-                t.GetInterfaces().Any(i =>
-                    i.IsGenericType &&
-                    i.GetGenericTypeDefinition() == interfaceType &&
-                    i.GenericTypeArguments[0] == typeof(T)
-                )
-            );
-
-        foreach (var impl in implementations)
-        {
-            services.AddSingleton(impl);
-        }
-
-        return services;
-    }
-}

EnvelopeGenerator.Infrastructure/DependencyInjection.cs

@@ -0,0 +1,213 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.EntityFrameworkCore;
+using DigitalData.Core.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+using Microsoft.Extensions.Configuration;
+using Dapper;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Reflection;
+using DigitalData.UserManager.Domain.Entities;
+#if NET
+using CommandDotNet.Execution;
+using EnvelopeGenerator.Infrastructure.Repositories;
+using EnvelopeGenerator.Infrastructure.Executor;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
+#elif NETFRAMEWORK
+using System;
+#endif
+
+namespace EnvelopeGenerator.Infrastructure
+{
+    public static class DependencyInjection
+    {
+        /// <summary>
+        /// Registers the required repositories for the Envelope Generator service to the given <see cref="IServiceCollection"/>.
+        /// This method adds the repositories for various envelope-related entities, such as configuration, document receivers, envelopes, and users,
+        /// as scoped services to the dependency injection container. Optionally, it can also configure the <see cref="EGDbContext"/> 
+        /// with the provided database context options if specified.
+        /// </summary>
+        /// <param name="services">The <see cref="IServiceCollection"/> to which the services are added.</param>
+        /// <param name="dbContextOptions">An optional action to configure the <see cref="DbContextOptionsBuilder"/> for the <see cref="EGDbContext"/>. 
+        /// If not provided, the <see cref="EGDbContext"/> will not be configured.</param>
+        /// <returns>The updated <see cref="IServiceCollection"/> with the added repository services.</returns>
+        /// <remarks>
+        /// This method ensures that the repositories are registered as scoped services, meaning that a new instance of each repository 
+        /// will be created per HTTP request (or per scope) within the dependency injection container.
+        /// </remarks>
+        [Obsolete("Use IRepository")]
+        public static IServiceCollection AddEnvelopeGeneratorInfrastructureServices(this IServiceCollection services, Action<Config> options)
+        {
+            // configure custom options
+            options(new Config(services));
+#if NET
+            services.TryAddScoped<IConfigRepository, ConfigRepository>();
+            services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
+            services.TryAddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
+            services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
+            services.TryAddScoped<IDocumentStatusRepository, DocumentStatusRepository>();
+            services.TryAddScoped<IEmailTemplateRepository, EmailTemplateRepository>();
+            services.TryAddScoped<IEnvelopeRepository, EnvelopeRepository>();
+            services.TryAddScoped<IEnvelopeHistoryRepository, EnvelopeHistoryRepository>();
+            services.TryAddScoped<IEnvelopeReceiverRepository, EnvelopeReceiverRepository>();
+            services.TryAddScoped<IEnvelopeTypeRepository, EnvelopeTypeRepository>();
+            services.TryAddScoped<IReceiverRepository, ReceiverRepository>();
+            services.TryAddScoped<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyRepository>();
+#endif
+
+            services.AddDbRepository(opt =>
+            {
+                // scan EnvelopeGenerator
+                opt.RegisterFromAssembly<EGDbContext>(typeof(EnvelopeReceiver).Assembly);
+
+                // scan UserManager
+                opt.RegisterFromAssembly<EGDbContext>(typeof(User).Assembly);
+#if NET
+                // scan EmailProfilerDispatcher
+                opt.RegisterFromAssembly<EGDbContext>(typeof(EmailOut).Assembly);
+#endif
+            });
+
+#if NET
+            services.AddSQLExecutor<Envelope>();
+            services.AddSQLExecutor<Receiver>();
+            services.AddSQLExecutor<Document>();
+            services.AddSQLExecutor<Signature>();
+            services.AddSQLExecutor<DocumentStatus>();
+
+            SetDapperTypeMap<Envelope>();
+            SetDapperTypeMap<User>();
+            SetDapperTypeMap<Receiver>();
+            SetDapperTypeMap<Document>();
+            SetDapperTypeMap<Signature>();
+            SetDapperTypeMap<DocumentStatus>();
+
+            services.AddScoped<IEnvelopeExecutor, EnvelopeExecutor>();
+            services.AddScoped<IEnvelopeReceiverExecutor, EnvelopeReceiverExecutor>();
+            services.AddScoped<IDocumentExecutor, DocumentExecutor>();
+#endif
+
+            return services;
+        }
+
+#if NET
+        public static IServiceCollection AddSQLExecutor(this IServiceCollection services, IConfiguration? configuration = null, Action<SQLExecutorParams>? configureOptions = null)
+        {
+            if (configuration is not null && configureOptions is not null)
+                throw new InvalidOperationException("Cannot use both 'configuration' and 'configureOptions'. Only one should be provided.");
+
+            if (configuration is not null)
+                services.Configure<SQLExecutorParams>(configuration);
+
+            if (configureOptions is not null)
+                services.Configure(configureOptions);
+
+            return services.AddSingleton<ISQLExecutor, SQLExecutor>();
+        }
+
+        private static void SetDapperTypeMap<TModel>()
+        {
+            Dapper.SqlMapper.SetTypeMap(typeof(TModel), new CustomPropertyTypeMap(
+                typeof(TModel),
+                (type, columnName) =>
+                {
+                    return type.GetProperties().FirstOrDefault(prop =>
+                    {
+                        var attr = prop.GetCustomAttribute<ColumnAttribute>();
+                        return attr != null && string.Equals(attr.Name, columnName, StringComparison.OrdinalIgnoreCase)
+                            || string.Equals(prop.Name, columnName, StringComparison.OrdinalIgnoreCase);
+                    })!;
+                }
+            ));
+        }
+
+        public static IServiceCollection AddSQLExecutor<T>(this IServiceCollection services, IConfiguration? configuration = null, Action<SQLExecutorParams>? configureOptions = null) where T : class
+        {
+            if (configuration is not null && configureOptions is not null)
+                throw new InvalidOperationException("Cannot use both 'configuration' and 'configureOptions'. Only one should be provided.");
+
+            if (configuration is not null)
+                services.Configure<SQLExecutorParams>(configuration);
+
+            services.AddScoped<ISQLExecutor<T>, SQLExecutor<T>>();
+
+            var interfaceType = typeof(ISQL<>);
+            var targetGenericType = interfaceType.MakeGenericType(typeof(T));
+
+            var implementations = AppDomain.CurrentDomain.GetAssemblies()
+                .SelectMany(a =>
+                {
+                    try { return a.GetTypes(); }
+                    catch { return Array.Empty<Type>(); }
+                })
+                .Where(t =>
+                    t is { IsClass: true, IsAbstract: false } &&
+                    t.GetInterfaces().Any(i =>
+                        i.IsGenericType &&
+                        i.GetGenericTypeDefinition() == interfaceType &&
+                        i.GenericTypeArguments[0] == typeof(T)
+                    )
+                );
+
+            foreach (var impl in implementations)
+            {
+                services.AddSingleton(impl);
+            }
+
+            return services;
+        }
+#endif
+
+        public class Config
+        {
+            private readonly IServiceCollection _services;
+
+            internal Config(IServiceCollection services)
+            {
+                _services = services;
+            }
+
+            public void AddDbTriggerParams(IConfiguration configuration)
+            {
+                _services.Configure<DbTriggerParams>(configuration.GetSection(nameof(DbTriggerParams)));
+            }
+
+            public void AddDbTriggerParams(Action<DbTriggerParams> configureOptions)
+            {
+                _services.Configure(configureOptions);
+            }
+
+            public void AddDbContext(Action<DbContextOptionsBuilder> dbContextOptions)
+            {
+                _services.AddDbContext<EGDbContext>(dbContextOptions);
+            }
+
+            public void AddDbContext(Action<IServiceProvider, DbContextOptionsBuilder> dbContextOptions)
+            {
+                _services.AddDbContext<EGDbContext>(dbContextOptions);
+            }
+
+#if NET
+            public void AddSQLExecutor(IConfiguration configuration)
+            {
+                _services.Configure<SQLExecutorParams>(configuration);
+
+                _services.AddSingleton<ISQLExecutor, SQLExecutor>();
+
+                _services.AddSQLExecutor(configuration, null);
+            }
+
+            public void AddSQLExecutor(Action<SQLExecutorParams> options)
+            {
+                _services.Configure(options);
+
+                _services.AddSingleton<ISQLExecutor, SQLExecutor>();
+
+                _services.AddSQLExecutor(null, options);
+            }
+#endif
+        }
+    }
+}

EnvelopeGenerator.Infrastructure/EGDbContext.cs

@@ -1,28 +1,43 @@
-using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
+using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure;
-using DigitalData.UserManager.Infrastructure.Contracts;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Group = DigitalData.UserManager.Domain.Entities.Group;
 using Module = DigitalData.UserManager.Domain.Entities.Module;
-using DigitalData.EmailProfilerDispatcher;
 using Microsoft.Extensions.Options;
-using DigitalData.Core.Client;
 using Microsoft.Extensions.Logging;
-using EnvelopeGenerator.Application.Common.Configurations;
+#if NET
+using DigitalData.EmailProfilerDispatcher;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
+using DigitalData.UserManager.Infrastructure;
+using DigitalData.UserManager.Infrastructure.Contracts;
+using DigitalData.Core.Client;
+#elif NETFRAMEWORK
+using System.Linq;
+#endif
 
-namespace EnvelopeGenerator.Infrastructure;
+namespace EnvelopeGenerator.Infrastructure
+#if NET
+    ;
+#elif NETFRAMEWORK
+{
+#endif
 
 public class EGDbContext : EGDbContextBase
 {
-    public EGDbContext(DbContextOptions<EGDbContext> options, IOptions<DbTriggerParams> triggerParamOptions, ILogger<EGDbContext>? logger = null) : base(options, triggerParamOptions, logger)
+    public EGDbContext(DbContextOptions<EGDbContext> options, IOptions<DbTriggerParams> triggerParamOptions, ILogger<EGDbContext>
+#if NET
+        ?
+#endif
+        logger = null) : base(options, triggerParamOptions, logger)
     {
     }
 }
 
 //TODO: Adding EmailOut instead of EmailOut.Abst is not correct for the arch. Re-design EmailPut consedering this. IMailDbContext shoud move to Abstraction layer (hint: in this case using DBSet in abst. will be problem because entity framework will have to be added.
-public abstract class EGDbContextBase : DbContext, IUserManagerDbContext, IMailDbContext
+public abstract class EGDbContextBase : DbContext
+#if NET
+    , IUserManagerDbContext, IMailDbContext
+#endif
 {
     public DbSet<Config> Configs { get; set; }
 
@@ -56,7 +71,9 @@ public abstract class EGDbContextBase : DbContext, IUserManagerDbContext, IMailD
 
     public DbSet<UserRep> UserReps { get; set; }
 
+#if NET
     public DbSet<EmailOut> EMailOuts { get; set; }
+#endif
 
     public DbSet<EnvelopeReceiverReadOnly> EnvelopeReceiverReadOnlys { get; set; }
 
@@ -64,33 +81,22 @@ public abstract class EGDbContextBase : DbContext, IUserManagerDbContext, IMailD
 
     private readonly DbTriggerParams _triggers;
 
-    private readonly ILogger? _logger;
+    private readonly ILogger
+#if NET
+        ?
+#endif
+        _logger;
 
     public bool IsMigration { get; set; } = false;
 
-    public EGDbContextBase(DbContextOptions options, IOptions<DbTriggerParams> triggerParamOptions, ILogger? logger = null) : base(options)
+    public EGDbContextBase(DbContextOptions options, IOptions<DbTriggerParams> triggerParamOptions, ILogger
+#if NET
+        ?
+#endif
+        logger = null) : base(options)
     {
         _triggers = triggerParamOptions.Value;
         _logger = logger;
-
-        Configs = Set<Config>();
-        EnvelopeReceivers = Set<EnvelopeReceiver>();
-        Envelopes = Set<Envelope>();
-        DocumentReceiverElements = Set<Signature>();
-        DocumentStatus = Set<DocumentStatus>();
-        EnvelopeDocument = Set<Document>();
-        EnvelopeHistories = Set<History>();
-        EnvelopeTypes = Set<EnvelopeType>();
-        Receivers = Set<Receiver>();
-
-        GroupOfUsers = Set<GroupOfUser>();
-        Groups = Set<Group>();
-        ModuleOfUsers = Set<ModuleOfUser>();
-        Modules = Set<Module>();
-        Users = Set<User>();
-        UserReps = Set<UserRep>();
-        EMailOuts = Set<EmailOut>();
-        EnvelopeReceiverReadOnlys = Set<EnvelopeReceiverReadOnly>();
     }
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
@@ -119,7 +125,7 @@ public abstract class EGDbContextBase : DbContext, IUserManagerDbContext, IMailD
 
         modelBuilder.Entity<Envelope>()
             .HasMany(e => e.Documents)
-            .WithOne()
+            .WithOne(d => d.Envelope)
             .HasForeignKey(ed => ed.EnvelopeId);
 
         modelBuilder.Entity<Envelope>()
@@ -187,6 +193,13 @@ public abstract class EGDbContextBase : DbContext, IUserManagerDbContext, IMailD
             .HasForeignKey(ds => ds.ReceiverId);
         #endregion DocumentStatus
 
+        #region Annotation
+        modelBuilder.Entity<Signature>()
+            .HasMany(signature => signature.Annotations)
+            .WithOne(annot => annot.Element)
+            .HasForeignKey(annot => annot.ElementId);
+        #endregion
+
         #region Trigger
         // Configure entities to handle database triggers
         void AddTrigger<T>() where T : class => _triggers
@@ -194,7 +207,9 @@ public abstract class EGDbContextBase : DbContext, IUserManagerDbContext, IMailD
             .SelectMany(t => t.Value)
             .ForEach(tName =>
             {
+#if NET
                 modelBuilder.Entity<T>().ToTable(tb => tb.HasTrigger(tName));
+#endif
                 _logger?.LogInformation("Trigger '{triggerName}' has been added to the '{entityName}' entity.", tName, typeof(T).Name);
             });
 
@@ -210,12 +225,20 @@ public abstract class EGDbContextBase : DbContext, IUserManagerDbContext, IMailD
         AddTrigger<EnvelopeReceiverReadOnly>();
         AddTrigger<EnvelopeType>();
         AddTrigger<Receiver>();
+#if NET
         AddTrigger<EmailOut>();
+#endif
         #endregion Trigger
 
         //configure model builder for user manager tables
+#if NET
         modelBuilder.ConfigureUserManager();
+#endif
 
         base.OnModelCreating(modelBuilder);
     }
 }
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Infrastructure/EGDbContextFactory.cs

@@ -1,4 +1,5 @@
-using EnvelopeGenerator.Application.Common.Configurations;
+#if NET
+using EnvelopeGenerator.Application.Common.Configurations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.Extensions.Configuration;
@@ -22,10 +23,10 @@ namespace EnvelopeGenerator.Infrastructure
             // create DbTriggerParams
             var triggerLists = config.GetSection("DbTriggerParams").Get<Dictionary<string, List<string>>>();
             var dbTriggerParams = new DbTriggerParams();
-            if(triggerLists is not null)
+            if (triggerLists is not null)
                 foreach (var triggerList in triggerLists)
                 {
-                    if(triggerList.Value.Count == 0)
+                    if (triggerList.Value.Count == 0)
                         continue; // Skip empty trigger lists
 
                     var tableName = triggerList.Key;
@@ -44,3 +45,4 @@ namespace EnvelopeGenerator.Infrastructure
         }
     }
 }
+#endif

EnvelopeGenerator.Infrastructure/EnumerableExtensions.cs

@@ -0,0 +1,20 @@
+#if NETFRAMEWORK
+using System.Collections.Generic;
+using System;
+#endif
+
+namespace EnvelopeGenerator.Infrastructure
+{
+    public static class EnumerableExtensions
+    {
+#if NETFRAMEWORK
+        public static void ForEach<T>(this IEnumerable<T> values, Action<T> action)
+        {
+            foreach (T value in values)
+            {
+                action(value);
+            }
+        }
+#endif
+    }
+}

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

@@ -1,25 +1,52 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net462;net7.0;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <!-- disable for net462 -->
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
+	<Nullable>disable</Nullable>
+	<ImplicitUsings>disable</ImplicitUsings>
+	<LangVersion>7.3</LangVersion>
+  </PropertyGroup>
+
+  <!-- enable for net7 and more -->
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
+	<Nullable>enable</Nullable>
+	<ImplicitUsings>enable</ImplicitUsings>
+	<LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.1.66" />
-    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.3.1" />
+    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.4.0" />
-    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.4.1" />
+    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.4.5" />
-    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
     <PackageReference Include="QuestPDF" Version="2025.7.1" />
-	<PackageReference Include="UserManager" Version="1.1.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
     <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
   </ItemGroup>
 
+	<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
+    <ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
+    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
+	<PackageReference Include="UserManager" Version="1.1.3" />
+  </ItemGroup>
+	
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.32" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.32" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.32">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.32" />
+  </ItemGroup>
+	
   <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.20" />

EnvelopeGenerator.Infrastructure/Executor/DocumentExecutor.cs

@@ -1,4 +1,5 @@
-using Dapper;
+#if NET
+using Dapper;
 using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Application.Common.SQL;
 using EnvelopeGenerator.Domain.Entities;
@@ -27,3 +28,4 @@ public class DocumentExecutor : SQLExecutor, IDocumentExecutor
             $"base64={base64}, envelope_uuid='{envelope_uuid}'.");
     }
 }
+#endif

EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs

@@ -1,4 +1,5 @@
-using Dapper;
+#if NET
+using Dapper;
 using DigitalData.UserManager.Application.Contracts.Repositories;
 using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Application.Common.SQL;
@@ -37,3 +38,4 @@ public class EnvelopeExecutor : SQLExecutor, IEnvelopeExecutor
         return envelope;
     }
 }
+#endif

EnvelopeGenerator.Infrastructure/Executor/EnvelopeReceiverExecutor.cs

@@ -1,4 +1,5 @@
-using Dapper;
+#if NET
+using Dapper;
 using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Application.Common.SQL;
@@ -9,7 +10,7 @@ using Microsoft.Extensions.Options;
 
 namespace EnvelopeGenerator.Infrastructure.Executor;
 
-public class EnvelopeReceiverExecutor: SQLExecutor, IEnvelopeReceiverExecutor
+public class EnvelopeReceiverExecutor : SQLExecutor, IEnvelopeReceiverExecutor
 {
     private readonly IEnvelopeReceiverRepository _erRepository;
 
@@ -33,3 +34,4 @@ public class EnvelopeReceiverExecutor: SQLExecutor, IEnvelopeReceiverExecutor
         return await _erRepository.ReadByIdAsync(envelopeId: er.EnvelopeId, receiverId: er.ReceiverId);
     }
 }
+#endif

EnvelopeGenerator.Infrastructure/Executor/Query.cs

@@ -1,4 +1,5 @@
-using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
+#if NET
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Infrastructure.Executor;
@@ -39,3 +40,4 @@ public sealed record Query<TEntity> : IQuery<TEntity>
 
     public async Task<IEnumerable<TEntity>> ToListAsync() => await _query.ToListAsync();
 }
+#endif

EnvelopeGenerator.Infrastructure/Executor/QueryExtension.cs

@@ -1,4 +1,5 @@
-namespace EnvelopeGenerator.Infrastructure.Executor;
+#if NET
+namespace EnvelopeGenerator.Infrastructure.Executor;
 
 public static class QueryExtension
 {
@@ -7,3 +8,4 @@ public static class QueryExtension
         return new Query<TEntity>(queryable);
     }
 }
+#endif

EnvelopeGenerator.Infrastructure/Executor/SQLExecutor.cs

@@ -1,4 +1,5 @@
-using Dapper;
+#if NET
+using Dapper;
 using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.DependencyInjection;
@@ -31,3 +32,4 @@ public class SQLExecutor : ISQLExecutor
         return Execute<TEntity>(sql.Raw, parameters, cancellation);
     }
 }
+#endif

EnvelopeGenerator.Infrastructure/Executor/SQLExecutorBaseEntity.cs

@@ -1,4 +1,5 @@
-using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
+#if NET
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -29,3 +30,5 @@ public sealed class SQLExecutor<T> : SQLExecutor, ISQLExecutor<T> where T : clas
         return Execute(sql.Raw);
     }
 }
+
+#endif

EnvelopeGenerator.Infrastructure/Executor/SQLExecutorParams.cs

@@ -1,6 +1,9 @@
-namespace EnvelopeGenerator.Infrastructure.Executor;
+#if NET
+namespace EnvelopeGenerator.Infrastructure.Executor;
 
 public class SQLExecutorParams
 {
     public string? ConnectionString { get; set; }
 }
+
+#endif

EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.cs

@@ -1,4 +1,5 @@
-using System;
+#if NET
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
@@ -809,3 +810,4 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
         }
     }
 }
+#endif

EnvelopeGenerator.Infrastructure/Repositories/ConfigRepository.cs

@@ -1,20 +1,21 @@
-using DigitalData.Core.Infrastructure;
+#if NET
-using EnvelopeGenerator.Domain.Entities;
+using DigitalData.Core.Infrastructure;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
 [Obsolete("Use IRepository")]
-public class ConfigRepository : CRUDRepository<Config, int, EGDbContext>, IConfigRepository
+public class ConfigRepository : CRUDRepository<Domain.Entities.Config, int, EGDbContext>, IConfigRepository
 {
     public ConfigRepository(EGDbContext dbContext) : base(dbContext, dbContext.Configs)
     {
     }
 
-    public async Task<Config?> ReadFirstAsync()
+    public async Task<Domain.Entities.Config?> ReadFirstAsync()
     {
         var configs = await _dbSet.ToListAsync();
         return configs.Count > 0 ? configs[0] : default;
     }
 }
+#endif

EnvelopeGenerator.Infrastructure/Repositories/DocumentReceiverElementRepository.cs

@@ -1,4 +1,5 @@
-using DigitalData.Core.Infrastructure;
+#if NET
+using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
@@ -11,3 +12,4 @@ public class DocumentReceiverElementRepository : CRUDRepository<Signature, int,
     {
     }
 }
+#endif

EnvelopeGenerator.Infrastructure/Repositories/DocumentStatusRepository.cs

@@ -1,4 +1,5 @@
-using DigitalData.Core.Infrastructure;
+#if NET
+using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
@@ -11,3 +12,4 @@ public class DocumentStatusRepository : CRUDRepository<DocumentStatus, int, EGDb
     {
     }
 }
+#endif

EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs

@@ -1,4 +1,5 @@
-using DigitalData.Core.Infrastructure;
+#if NET
+using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
@@ -9,26 +10,27 @@ namespace EnvelopeGenerator.Infrastructure.Repositories;
 
 [Obsolete("Use TempRepo")]
 public class EmailTemplateRepository : CRUDRepository<EmailTemplate, int, EGDbContext>, IEmailTemplateRepository
+{
+    private readonly IMemoryCache _cache;
+
+    public EmailTemplateRepository(EGDbContext dbContext, IMemoryCache cache) : base(dbContext, dbContext.EmailTemplate)
     {
-        private readonly IMemoryCache _cache;
+        _cache = cache;
-
-	public EmailTemplateRepository(EGDbContext dbContext, IMemoryCache cache) : base(dbContext, dbContext.EmailTemplate)
-        {
-            _cache = cache;
-        }
-
-        private readonly Guid key_guid = Guid.NewGuid();
-
-	/// <summary>
-	/// Retrieves an email template based on its name. 
-	/// Utilizes in-memory caching to improve performance for the limited number of email templates available.
-	/// If the template is not found in the cache, it queries the database and stores the result in the cache.
-	/// </summary>
-	/// <param name="type">The type of the email template, which corresponds to its name.</param>
-	/// <returns>
-	/// A task that represents the asynchronous operation. The task result contains the email template 
-	/// if found, otherwise null.
-	/// </returns>
-	public async Task<EmailTemplate?> ReadByNameAsync(EmailTemplateType type) => await _cache.GetOrCreateAsync($"{type}{key_guid}", async _
-            => await _dbSet.Where(t => t.Name == type.ToString()).FirstOrDefaultAsync());
     }
+
+    private readonly Guid key_guid = Guid.NewGuid();
+
+    /// <summary>
+    /// Retrieves an email template based on its name. 
+    /// Utilizes in-memory caching to improve performance for the limited number of email templates available.
+    /// If the template is not found in the cache, it queries the database and stores the result in the cache.
+    /// </summary>
+    /// <param name="type">The type of the email template, which corresponds to its name.</param>
+    /// <returns>
+    /// A task that represents the asynchronous operation. The task result contains the email template 
+    /// if found, otherwise null.
+    /// </returns>
+    public async Task<EmailTemplate?> ReadByNameAsync(EmailTemplateType type) => await _cache.GetOrCreateAsync($"{type}{key_guid}", async _
+            => await _dbSet.Where(t => t.Name == type.ToString()).FirstOrDefaultAsync());
+}
+#endif

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeDocumentRepository.cs

@@ -1,4 +1,5 @@
-using DigitalData.Core.Infrastructure;
+#if NET
+using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
@@ -11,3 +12,4 @@ public class EnvelopeDocumentRepository : CRUDRepository<Document, int, EGDbCont
     {
     }
 }
+#endif

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs

@@ -1,4 +1,5 @@
-using DigitalData.Core.Infrastructure;
+#if NET
+using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Domain.Constants;
@@ -48,3 +49,4 @@ public class EnvelopeHistoryRepository : CRUDRepository<History, long, EGDbConte
         withSender: withSender,
         withReceiver: withReceiver).ToListAsync();
 }
+#endif

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeReceiverReadOnlyRepository.cs

@@ -1,4 +1,5 @@
-using DigitalData.Core.Infrastructure;
+#if NET
+using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
@@ -52,7 +53,7 @@ public class EnvelopeReceiverReadOnlyRepository : CRUDRepository<EnvelopeReceive
     private async Task<IEnumerable<EnvelopeReceiverReadOnly>> IncludeEnvelope(params EnvelopeReceiverReadOnly[] erros)
     {
         foreach (var erro in erros)
-            erro.Envelope = await _envRepo.ReadByIdAsync((int) erro.EnvelopeId);
+            erro.Envelope = await _envRepo.ReadByIdAsync((int)erro.EnvelopeId);
 
         return erros;
     }
@@ -68,3 +69,4 @@ public class EnvelopeReceiverReadOnlyRepository : CRUDRepository<EnvelopeReceive
         return erros;
     }
 }
+#endif

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs

@@ -1,7 +1,7 @@
-using DigitalData.Core.Infrastructure;
+#if NET
+using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
-using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
@@ -65,3 +65,4 @@ public class EnvelopeRepository : CRUDRepository<Envelope, int, EGDbContext>, IE
         return await query.ToListAsync();
     }
 }
+#endif

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeTypeRepository.cs

@@ -1,4 +1,5 @@
-using DigitalData.Core.Infrastructure;
+#if NET
+using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
@@ -11,3 +12,4 @@ public class EnvelopeTypeRepository : CRUDRepository<EnvelopeType, int, EGDbCont
     {
     }
 }
+#endif

EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs

@@ -1,8 +1,8 @@
-using DigitalData.Core.Infrastructure;
+#if NET
+using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
@@ -108,7 +108,7 @@ public class EnvelopeReceiverRepository : CRUDRepository<EnvelopeReceiver, (int
 
         var query = _dbSet.AsNoTracking();
 
-        if(email is not null)
+        if (email is not null)
             query = query.Where(er => er.Receiver!.EmailAddress == email);
 
         if (id is not null)
@@ -120,3 +120,4 @@ public class EnvelopeReceiverRepository : CRUDRepository<EnvelopeReceiver, (int
         return await query.OrderBy(er => er.EnvelopeId).LastOrDefaultAsync();
     }
 }
+#endif

EnvelopeGenerator.Infrastructure/Repositories/ReceiverRepository.cs

@@ -1,4 +1,5 @@
-using DigitalData.Core.Infrastructure;
+#if NET
+using DigitalData.Core.Infrastructure;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
@@ -16,10 +17,10 @@ public class ReceiverRepository : CRUDRepository<Receiver, int, EGDbContext>, IR
     {
         IQueryable<Receiver> query = _dbSet.AsNoTracking();
 
-        if(emailAddress is not null)
+        if (emailAddress is not null)
             query = query.Where(r => r.EmailAddress == emailAddress);
 
-        if(signature is not null)
+        if (signature is not null)
             query = query.Where(r => r.Signature == signature);
 
         // envelope receivers are ignored (with '[JsonIgnore]' attribute). The reson to add them is to get the las used receiver name
@@ -35,3 +36,4 @@ public class ReceiverRepository : CRUDRepository<Receiver, int, EGDbContext>, IR
 
     public async override Task<IEnumerable<Receiver>> ReadAllAsync() => await ReadBy().ToListAsync();
 }
+#endif

EnvelopeGenerator.PdfEditor/EnvelopeGenerator.PdfEditor.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net462;net7.0;net8.0;net9.0</TargetFrameworks>
+  </PropertyGroup>
+	
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
+	<ImplicitUsings>disable</ImplicitUsings>
+	<LangVersion>7.3</LangVersion>
+    <Nullable>disable</Nullable>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' != 'net462'">
+	<ImplicitUsings>enable</ImplicitUsings>
+	<LangVersion>latest</LangVersion>	  
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+	
+  <ItemGroup>
+	<PackageReference Include="itext" Version="8.0.5" />
+	<PackageReference Include="itext.bouncy-castle-adapter" Version="8.0.5" />
+  </ItemGroup>
+	
+  <ItemGroup>
+    <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
+  </ItemGroup>
+	
+</Project>

EnvelopeGenerator.PdfEditor/Extensions.cs

@@ -0,0 +1,17 @@
+#if NETFRAMEWORK
+using System.IO;
+#endif
+
+namespace EnvelopeGenerator.PdfEditor
+{
+    public static class Extensions
+    {
+        /// <summary>
+        /// Writes the stream contents to a byte array, regardless of the System.IO.MemoryStream.Position property.
+        /// </summary>
+        /// <typeparam name="TPdf"></typeparam>
+        /// <param name="pdf"></param>
+        /// <returns>A new byte array</returns>
+        public static byte[] ExportAsBytes<TPdf>(this TPdf pdf) where TPdf : Pdf<MemoryStream, MemoryStream> => pdf.ExportStream().ToArray();
+    }
+}

EnvelopeGenerator.PdfEditor/Pdf.cs

@@ -0,0 +1,208 @@
+using iText.Kernel.Pdf;
+using iText.Kernel.Pdf.Canvas;
+using EnvelopeGenerator.Domain.Interfaces;
+using iText.Kernel.Colors;
+using DigitalData.Core.Abstractions.Interfaces;
+
+#if NETFRAMEWORK
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+#endif
+
+namespace EnvelopeGenerator.PdfEditor
+{
+    public static class Pdf
+    {
+        public static Pdf<MemoryStream, MemoryStream> FromMemory(byte[] documentBytes)
+        {
+            return new Pdf<MemoryStream, MemoryStream>(new MemoryStream(documentBytes), new MemoryStream());
+        }
+
+        public static Pdf<MemoryStream, MemoryStream> FromMemory(MemoryStream stream, MemoryStream
+#if NET
+            ?
+#endif
+            outputStream = null)
+        {
+            return new Pdf<MemoryStream, MemoryStream>(stream, outputStream ?? new MemoryStream(), disposeInputStream: false, disposeOutputStream: outputStream is null);
+        }
+    }
+
+    public class Pdf<TInputStream, TOutputStream> : IDisposable, IAsyncDisposable
+        where TInputStream : Stream
+        where TOutputStream : Stream
+    {
+        private readonly PdfDocument _doc;
+        private readonly TInputStream _inputStream;
+        private readonly TOutputStream _outputStream;
+        private readonly PdfReader _reader;
+        private readonly PdfWriter _writer;
+
+        private readonly bool _disposeInputStream;
+        private readonly bool _disposeOutputStream;
+
+        public Pdf(TInputStream inputStream, TOutputStream outputStream, bool disposeInputStream = true, bool disposeOutputStream = true)
+        {
+            _inputStream = inputStream;
+            _outputStream = outputStream;
+            _reader = new PdfReader(inputStream);
+            _writer = new PdfWriter(outputStream);
+            _doc = new PdfDocument(_reader, _writer);
+            _disposeInputStream = disposeInputStream;
+            _disposeOutputStream = disposeOutputStream;
+        }
+
+        /// <summary>
+        /// Gets the output stream containing the edited PDF document.
+        /// </summary>
+        /// <remarks>
+        /// Accessing this property will close the underlying <see cref="PdfDocument"/> to ensure
+        /// all changes are flushed to the stream. After accessing this property, the PDF document
+        /// can no longer be modified using this <see cref="Pdf{TInputStream, TOutputStream}"/> instance.
+        /// </remarks>
+        /// <returns>
+        /// The <typeparamref name="TOutputStream"/> instance that contains the updated PDF bytes.
+        /// </returns>
+        public TOutputStream ExportStream()
+        {
+            _doc.Close();
+            return _outputStream;
+        }
+
+        #region Edit methods
+        public Pdf<TInputStream, TOutputStream> Document(Action<PdfDocument> edit)
+        {
+            edit(_doc);
+            return this;
+        }
+
+        public Pdf<TInputStream, TOutputStream> Page(int pageIndex, Action<PdfPage> design)
+            => Document(doc =>
+            {
+                var page = doc.GetPage(pageIndex);
+                design(doc.GetPage(pageIndex));
+            });
+
+        public Pdf<TInputStream, TOutputStream> Page(Action<PdfPage> design)
+        {
+            for (int i = 1; i <= _doc.GetNumberOfPages(); i++)
+                Page(i, design);
+
+            return this;
+        }
+
+        public Pdf<TInputStream, TOutputStream> Design(int pageIndex, Action<PdfCanvas> design)
+            => Document(doc =>
+            {
+                var page = doc.GetPage(pageIndex);
+                var canvas = new PdfCanvas(page);
+                design(canvas);
+            });
+        #endregion
+
+        public Pdf<TInputStream, TOutputStream> Background<TSignature>(IEnumerable<TSignature> signatures, double widthPx = 1.9500000000000002, double heightPx = 2.52)
+            where TSignature : ISignature
+        {
+            // once per page
+            Page(page =>
+            {
+                var canvas = new PdfCanvas(page);
+                canvas.ConcatMatrix(1, 0, 0, -1, 0, page.GetPageSize().GetHeight());
+            });
+
+            foreach (var signature in signatures)
+                Page(signature.Page, page =>
+                {
+                    var canvas = new PdfCanvas(page);
+                    double inchFactor = 72;
+                    double magin = .2;
+                    double x = (signature.X - .7 - magin) * inchFactor;
+                    double y = (signature.Y - .5 - magin) * inchFactor;
+                    double width = widthPx * inchFactor;
+                    double height = heightPx * inchFactor;
+
+                    double bottomLineLength = 2.5;
+
+                    // draw background
+                    canvas.SetFillColor(new DeviceRgb(222, 220, 215))
+                        .Rectangle(x, y, width, height)
+                        .Fill();
+
+                    // draw bottom line
+                    canvas.SetFillColor(new DeviceRgb(204, 202, 198))
+                        .Rectangle(x, y + height - bottomLineLength, width, bottomLineLength)
+                        .Fill();
+                });
+
+            return this;
+        }
+
+        #region Finalizer
+        private bool _disposed = false;
+
+        ~Pdf()
+        {
+            // If Dispose is not called, clean up unmanaged resources
+            Dispose(false);
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (_disposed)
+                return;
+
+            if (disposing)
+            {
+                // Managed resources
+                _doc?.Close();
+                if (_disposeInputStream) _inputStream?.Dispose();
+                if(_disposeOutputStream) _outputStream?.Dispose();
+            }
+            else
+            {
+                // When called by the finalizer, clean up only unmanaged resources
+                // Unmanaged resources such as PdfDocument, PdfReader, and PdfWriter are already IDisposable; we close them here
+                try { _doc?.Close(); } catch { }
+                try { if(_disposeInputStream) _inputStream?.Dispose(); } catch { }
+                try { if (_disposeOutputStream) _outputStream?.Dispose(); } catch { }
+            }
+
+            _disposed = true;
+        }
+
+        public async ValueTask DisposeAsync()
+        {
+            if (_disposed)
+                return;
+
+            _doc?.Close();
+            if (_disposeInputStream)
+            {
+                if (_inputStream is IAsyncDisposable asyncInput)
+                    await asyncInput.DisposeAsync();
+                else
+                    _inputStream.Dispose();
+            }
+
+            if (_disposeOutputStream)
+            {
+                if (_outputStream is IAsyncDisposable asyncOutput)
+                    await asyncOutput.DisposeAsync();
+                else
+                    _outputStream?.Dispose();
+            }
+
+            _disposed = true;
+            GC.SuppressFinalize(this);
+        }
+        #endregion
+    }
+}

EnvelopeGenerator.Service/App.config

@@ -53,6 +53,70 @@
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.JsonWebTokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <entityFramework>

EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj

@@ -17,6 +17,21 @@
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -54,6 +69,9 @@
     <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
       <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </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>
+    </Reference>
     <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
@@ -160,8 +178,14 @@
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -335,6 +359,18 @@
       <Name>EnvelopeGenerator.Domain</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.2 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </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">

EnvelopeGenerator.Service/UserConfig.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<Config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <ConnectionString>Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;TrustServerCertificate=True;</ConnectionString>
+  <Debug>true</Debug>
+  <IntervalInMin>1</IntervalInMin>
+  <IgnoredLabels>
+    <Label>Date</Label>
+    <Label>Datum</Label>
+    <Label>ZIP</Label>
+    <Label>PLZ</Label>
+    <Label>Place</Label>
+    <Label>Ort</Label>
+    <Label>Position</Label>
+    <Label>Stellung</Label>
+  </IgnoredLabels>
+</Config>

EnvelopeGenerator.Service/packages.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net48" />
+  <package id="DigitalData.Core.Abstractions" version="4.3.0" targetFramework="net462" />
   <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net48" />
   <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net48" />
   <package id="EntityFramework" version="6.4.4" targetFramework="net48" />
@@ -11,7 +12,9 @@
   <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net48" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net48" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net462" />
   <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net48" />

EnvelopeGenerator.Tests.Application/EnvelopeGenerator.Tests.Application.csproj

@@ -20,8 +20,8 @@
   <ItemGroup>
     <PackageReference Include="Bogus" Version="35.6.3" />
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.3.1" />
+    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.4.0" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="4.1.1" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="4.3.0" />
     <PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
     <PackageReference Include="DigitalData.Core.Application" Version="3.4.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />

EnvelopeGenerator.Web/Controllers/AnnotationController.cs

@@ -4,6 +4,7 @@ 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.Web.Extensions;
 using MediatR;
@@ -11,7 +12,6 @@ using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using System.Dynamic;
 
 namespace EnvelopeGenerator.Web.Controllers;
 
@@ -44,7 +44,7 @@ public class AnnotationController : ControllerBase
 
     [Authorize(Roles = ReceiverRole.FullyAuth)]
     [HttpPost]
-    public async Task<IActionResult> CreateOrUpdate([FromBody] ExpandoObject annotations, CancellationToken cancel = default)
+    public async Task<IActionResult> CreateOrUpdate([FromBody] PsPdfKitAnnotation psPdfKitAnnotation, CancellationToken cancel = default)
     {
         // get claims
         var signature = User.GetAuthReceiverSignature();
@@ -58,14 +58,16 @@ public class AnnotationController : ControllerBase
 
         // Again check if receiver has already signed
         if (await _mediator.IsSignedAsync(uuid, signature, cancel))
-            return Problem(statusCode: 403);
+            return Problem(statusCode: 409);
+        else if (await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
+            return Problem(statusCode: 423);
 
         var docSignedNotification = await _mediator
             .ReadEnvelopeReceiverAsync(uuid, signature, cancel)
-            .ToDocSignedNotification(annotations)
+            .ToDocSignedNotification(psPdfKitAnnotation)
             ?? throw new NotFoundException("Envelope receiver is not found.");
 
-        await _mediator.Publish(docSignedNotification, cancel);
+        await _mediator.PublishSafely(docSignedNotification, cancel);
 
         await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
 

EnvelopeGenerator.Web/Controllers/EnvelopeController.cs

@@ -0,0 +1,425 @@
+using DigitalData.Core.Abstraction.Application.DTO;
+using DigitalData.Core.API;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
+using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
+using EnvelopeGenerator.Application.Resources;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.PdfEditor;
+using EnvelopeGenerator.Web.Extensions;
+using EnvelopeGenerator.Web.Models;
+using MediatR;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Localization;
+using Newtonsoft.Json;
+using OtpNet;
+
+namespace EnvelopeGenerator.Web.Controllers;
+
+[Route("Envelope")]
+public class EnvelopeController : ViewControllerBase
+{
+    [Obsolete("Use MediatR")]
+    private readonly IEnvelopeReceiverService _envRcvService;
+    [Obsolete("Use MediatR")]
+    private readonly IEnvelopeHistoryService _historyService;
+    private readonly IConfiguration _configuration;
+    [Obsolete("Use MediatR")]
+    private readonly IEnvelopeMailService _mailService;
+    [Obsolete("Use MediatR")]
+    private readonly IEnvelopeReceiverReadOnlyService _readOnlyService;
+    private readonly IAuthenticator _authenticator;
+    [Obsolete("Use MediatR")]
+    private readonly IReceiverService _rcvService;
+    private readonly IEnvelopeSmsHandler _envSmsHandler;
+
+    private readonly IMediator _mediator;
+
+    [Obsolete("Use MediatR")]
+    public EnvelopeController(ILogger<EnvelopeController> logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer<Resource> localizer, IConfiguration configuration, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, IAuthenticator authenticator, IReceiverService receiverService, IEnvelopeSmsHandler envelopeSmsService, IMediator mediator) : base(logger, cultures, localizer)
+    {
+        _envRcvService = envelopeReceiverService;
+        _historyService = historyService;
+        _configuration = configuration;
+        _mailService = envelopeMailService;
+        _readOnlyService = readOnlyService;
+        _authenticator = authenticator;
+        _rcvService = receiverService;
+        _envSmsHandler = envelopeSmsService;
+        _mediator = mediator;
+    }
+
+    [HttpGet("{envelopeReceiverId}")]
+    [Obsolete("Use MediatR")]
+    public async Task<IActionResult> Main([FromRoute] string envelopeReceiverId, CancellationToken cancel)
+    {
+        try
+        {
+            ViewData["EnvelopeKey"] = envelopeReceiverId;
+
+            if (!envelopeReceiverId.TryDecode(out var decoded))
+            {
+                Response.StatusCode = StatusCodes.Status401Unauthorized;
+                return this.ViewDocumentNotFound();
+            }
+
+            #region Read Only
+            if (decoded.GetEncodeType() == EncodeType.EnvelopeReceiverReadOnly)
+                return await EnvelopeReceiverReadOnly(decoded.ParseReadOnlyId());
+            #endregion
+
+            var er = await _mediator.ReadEnvelopeReceiverAsync(envelopeReceiverId, cancel);
+
+            if (er is null)
+                return this.ViewEnvelopeNotFound();
+
+            #region Rejected or Signed
+            //check rejection
+            var rejRcvrs = await _historyService.ReadRejectingReceivers(er.Envelope!.Id);
+            if (rejRcvrs.Any())
+            {
+                await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+                ViewBag.IsExt = !rejRcvrs.Contains(er.Receiver);    //external if the current user is not rejected
+                return View("EnvelopeRejected", er);
+            }
+
+            //check if it has already signed
+            if (await _historyService.IsSigned(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress))
+            {
+                await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+                return View("EnvelopeSigned");
+            }
+            #endregion
+
+            #region UseAccessCode
+            if (!er.Envelope!.UseAccessCode)
+            {
+                (string? uuid, string? signature) = decoded.ParseEnvelopeReceiverId();
+                var er_secret_res = await _envRcvService.ReadWithSecretByUuidSignatureAsync(uuid: uuid!, signature: signature!);
+
+                if (er_secret_res.IsFailed)
+                {
+                    _logger.LogNotice(er_secret_res.Notices);
+                    return this.ViewEnvelopeNotFound();
+                }
+                var er_secret = er_secret_res.Data;
+                await HttpContext.SignInEnvelopeAsync(er_secret, ReceiverRole.FullyAuth);
+                return await CreateShowEnvelopeView(er_secret);
+            }
+            #endregion UseAccessCode
+
+            #region Send Access Code
+            bool accessCodeAlreadyRequested = await _historyService.AccessCodeAlreadyRequested(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress);
+            if (!accessCodeAlreadyRequested)
+            {
+                await _historyService.RecordAsync(er.EnvelopeId, er.Receiver.EmailAddress, EnvelopeStatus.AccessCodeRequested);
+
+                var mailRes = await _mailService.SendAccessCodeAsync(envelopeReceiverDto: er);
+                if (mailRes.IsFailed)
+                {
+                    _logger.LogNotice(mailRes);
+                    return this.ViewAccessCodeNotSent();
+                }
+            }
+            #endregion
+
+            return await CreateEnvelopeLockedView(er, cancel);
+        }
+        catch(Exception ex)
+        {
+            _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, exception:ex, message: _localizer.UnexpectedError());
+            return this.ViewInnerServiceError();
+        }
+    }
+
+    [HttpPost("{envelopeReceiverId}")]
+    [Obsolete("Use MediatR")]
+    public async Task<IActionResult> LogInEnvelope([FromRoute] string envelopeReceiverId, [FromForm] Auth auth, CancellationToken cancel)
+    {
+        try
+        {
+            ViewData["EnvelopeKey"] = envelopeReceiverId;
+            (string? uuid, string? signature) = envelopeReceiverId.DecodeEnvelopeReceiverId();
+
+            if (uuid is null || signature is null)
+            {
+                _logger.LogEnvelopeError(uuid: uuid, signature: signature, message: _localizer.WrongEnvelopeReceiverId());
+                return Unauthorized();
+            }
+
+            _logger.LogInformation("Envelope UUID: [{uuid}]\nReceiver Signature: [{signature}]", uuid, signature);
+
+            var er_secret_res = await _envRcvService.ReadWithSecretByUuidSignatureAsync(uuid: uuid, signature: signature);
+
+            if (er_secret_res.IsFailed)
+            {
+                _logger.LogNotice(er_secret_res.Notices);
+                return this.ViewEnvelopeNotFound();
+            }
+            var er_secret = er_secret_res.Data;
+
+            //check rejection
+            var rejRcvrs = await _historyService.ReadRejectingReceivers(er_secret.Envelope!.Id);
+            if (rejRcvrs.Any())
+            {
+                await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+                ViewBag.IsExt = !rejRcvrs.Contains(er_secret.Receiver);    //external if the current user is not rejected
+                return View("EnvelopeRejected", er_secret);
+            }
+
+            // show envelope if already logged in
+            if (User.IsInRole(ReceiverRole.FullyAuth))
+                return await CreateShowEnvelopeView(er_secret);
+
+            if (auth.HasMulti)
+            {
+                return Unauthorized();
+            }
+            else if (auth.HasAccessCode)
+            {
+                if (await HandleAccessCodeAsync(auth, er_secret, envelopeReceiverId) is IActionResult acView)
+                    return acView;
+            }
+            else if (auth.HasSmsCode)
+            {
+                if (await HandleSmsAsync(auth, er_secret, envelopeReceiverId) is IActionResult smsView)
+                    return smsView;
+            }
+            else if (auth.HasAuthenticatorCode)
+            {
+                if (await HandleAuthenticatorAsync(auth, er_secret, envelopeReceiverId) is IActionResult aView)
+                    return aView;
+            }
+            else
+            {
+                Response.StatusCode = StatusCodes.Status401Unauthorized;
+                return View("EnvelopeLocked")
+                        .WithData("EnvelopeKey", envelopeReceiverId)
+                        .WithData("TFAEnabled", er_secret.Envelope!.TFAEnabled)
+                        .WithData("HasPhoneNumber", er_secret.HasPhoneNumber)
+                        .WithData("SenderEmail", er_secret.Envelope.User!.Email)
+                        .WithData("EnvelopeTitle", er_secret.Envelope.Title)
+                        .WithData("ErrorMessage", _localizer.WrongEnvelopeReceiverId());
+            }
+
+            await HttpContext.SignInEnvelopeAsync(er_secret, ReceiverRole.FullyAuth);
+
+            return await CreateShowEnvelopeView(er_secret);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, exception: ex);
+            return this.ViewInnerServiceError();
+        }
+    }
+    
+    private async Task<IActionResult> CreateEnvelopeLockedView(EnvelopeReceiverDto er, CancellationToken cancel)
+    {
+        var uuidClaim = User.GetAuthEnvelopeUuid();
+        var signatureClaim = User.GetAuthReceiverSignature();
+        if (uuidClaim is not null
+            && uuidClaim == er.Envelope?.Uuid
+            && signatureClaim is not null
+            && signatureClaim == er.Receiver?.Signature
+            && User.IsInRole(ReceiverRole.FullyAuth))
+        {
+            await HttpContext.SignInEnvelopeAsync(er, ReceiverRole.FullyAuth);
+
+            //add PSPDFKit licence key
+            ViewData["PSPDFKitLicenseKey"] = _configuration["PSPDFKitLicenseKey"];
+
+            return await CreateShowEnvelopeView(er);
+        }
+        else
+        {
+            ViewData["TFAEnabled"] = er.Envelope!.TFAEnabled;
+            ViewData["HasPhoneNumber"] = er.HasPhoneNumber;
+            ViewData["SenderEmail"] = er.Envelope.User!.Email;
+            ViewData["EnvelopeTitle"] = er.Envelope.Title;
+            return View("EnvelopeLocked");
+        }
+    }
+
+    private async Task<IActionResult> CreateShowEnvelopeView(EnvelopeReceiverDto er)
+    {
+        if (er.Envelope!.Documents?.FirstOrDefault() is DocumentDto doc && doc.ByteData is not null)
+        {
+            using var pdf = Pdf.FromMemory(doc.ByteData).Background(doc.Elements!);
+
+            doc.ByteData = pdf.ExportAsBytes();
+
+            ViewData["DocumentBytes"] = doc.ByteData;
+        }
+        else
+        {
+            _logger.LogEnvelopeError(er.Envelope.Uuid, er.Receiver?.Signature, message: "No document byte-data was found in ENVELOPE_DOCUMENT table.");
+            return this.ViewDocumentNotFound();
+        }
+
+        await HttpContext.SignInEnvelopeAsync(er, ReceiverRole.FullyAuth);
+
+        //add PSPDFKit licence key
+        ViewData["PSPDFKitLicenseKey"] = _configuration["PSPDFKitLicenseKey"];
+
+        return View("ShowEnvelope", er);
+    }
+
+    #region TFA Views
+    [NonAction]
+    private async Task<IActionResult> TFAViewAsync(bool viaSms, EnvelopeReceiverSecretDto er_secret, string envelopeReceiverId)
+    {
+        if (viaSms)
+        {
+            var (smsRes, expiration) = await _envSmsHandler.SendTotpAsync(er_secret);
+
+            ViewData["EnvelopeKey"] = envelopeReceiverId;
+            ViewData["TFAEnabled"] = er_secret.Envelope!.TFAEnabled;
+            ViewData["HasPhoneNumber"] = er_secret.HasPhoneNumber;
+            ViewData["SenderEmail"] = er_secret.Envelope.User!.Email;
+            ViewData["EnvelopeTitle"] = er_secret.Envelope.Title;
+
+            if (smsRes?.Failed ?? false)
+            {
+                var res_json = JsonConvert.SerializeObject(smsRes);
+                _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, message: $"An unexpected error occurred while sending an SMS code. Response: ${res_json}");
+                return this.ViewInnerServiceError();
+            }
+
+            return View("EnvelopeLocked").WithData("CodeType", "smsCode").WithData("SmsExpiration", expiration);
+        }
+        else
+        {
+            return View("EnvelopeLocked")
+                .WithData("CodeType", "authenticatorCode")
+                .WithData("TfaRegDeadline", er_secret.Receiver?.TfaRegDeadline);
+        }
+    }
+
+    [Obsolete("Use MediatR")]
+    [NonAction]
+    private async Task<IActionResult?> HandleAccessCodeAsync(Auth auth, EnvelopeReceiverSecretDto er_secret, string envelopeReceiverId)
+    {
+        //check the access code verification
+        if (er_secret.AccessCode != auth.AccessCode)
+        {
+            //EnvelopeStatusQuery.AccessCodeIncorrect
+            await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, EnvelopeStatus.AccessCodeIncorrect);
+            Response.StatusCode = StatusCodes.Status401Unauthorized;
+            return View("EnvelopeLocked")
+                    .WithData("EnvelopeKey", envelopeReceiverId)
+                    .WithData("TFAEnabled", er_secret.Envelope!.TFAEnabled)
+                    .WithData("HasPhoneNumber", er_secret.HasPhoneNumber)
+                    .WithData("SenderEmail", er_secret.Envelope.User!.Email)
+                    .WithData("EnvelopeTitle", er_secret.Envelope.Title)
+                    .WithData("ErrorMessage", _localizer.WrongAccessCode());
+        }
+
+        await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, EnvelopeStatus.AccessCodeCorrect);
+
+        //check if the user has phone is added
+        if (er_secret.Envelope!.TFAEnabled)
+        {
+            var rcv = er_secret.Receiver;
+            if (rcv.TotpSecretkey is null)
+            {
+                rcv.TotpSecretkey = _authenticator.GenerateTotpSecretKey();
+                await _rcvService.UpdateAsync(rcv);
+            }
+
+            await HttpContext.SignInEnvelopeAsync(er_secret, ReceiverRole.PreAuth);
+
+            return await TFAViewAsync(auth.UserSelectSMS, er_secret, envelopeReceiverId);
+        }
+
+        return null;
+    }
+
+    [NonAction]
+    private async Task<IActionResult?> HandleSmsAsync(Auth auth, EnvelopeReceiverSecretDto er_secret, string envelopeReceiverId)
+    {
+        if (er_secret.Receiver!.TotpSecretkey is null)
+            throw new InvalidOperationException($"TotpSecretkey of DTO cannot validate without TotpSecretkey. Dto: {JsonConvert.SerializeObject(er_secret)}");
+        
+        if (!User.IsInRole(ReceiverRole.PreAuth) || !_envSmsHandler.VerifyTotp(auth.SmsCode!, er_secret.Receiver.TotpSecretkey))
+        {
+            Response.StatusCode = StatusCodes.Status401Unauthorized;
+            ViewData["ErrorMessage"] = _localizer.WrongAccessCode();
+            return await TFAViewAsync(viaSms: true, er_secret, envelopeReceiverId);
+        }
+
+        return null;
+    }
+
+    [NonAction]
+    private async Task<IActionResult?> HandleAuthenticatorAsync(Auth auth, EnvelopeReceiverSecretDto er_secret, string envelopeReceiverId)
+    {
+        if (er_secret.Receiver!.TotpSecretkey is null)
+            throw new InvalidOperationException($"TotpSecretkey of DTO cannot validate without TotpSecretkey. Dto: {JsonConvert.SerializeObject(er_secret)}");
+
+        if (!User.IsInRole(ReceiverRole.PreAuth) || !_authenticator.VerifyTotp(auth.AuthenticatorCode!, er_secret.Receiver.TotpSecretkey, window: VerificationWindow.RfcSpecifiedNetworkDelay))
+        {
+            Response.StatusCode = StatusCodes.Status401Unauthorized;
+            ViewData["ErrorMessage"] = _localizer.WrongAccessCode();
+            return await TFAViewAsync(viaSms: false, er_secret, envelopeReceiverId);
+        }
+
+        return null;
+    }
+    #endregion
+
+    [NonAction]
+    [Obsolete("Use MediatR")]
+    public async Task<IActionResult> EnvelopeReceiverReadOnly([FromRoute] long readOnlyId)
+    {
+        var erro_res = await _readOnlyService.ReadByIdAsync(readOnlyId);
+        if (erro_res.IsFailed)
+        {
+            _logger.LogNotice(erro_res.Notices);
+            return this.ViewInnerServiceError();
+        }
+
+        var erro = erro_res.Data;
+
+        if (DateTime.Now > erro.DateValid)
+            return View("EnvelopeExpired");
+
+        var erRes = await _envRcvService.ReadByUuidSignatureAsync(uuid: erro.Envelope!.Uuid, erro.Receiver!.Signature);
+        if (erRes.IsFailed)
+        {
+            _logger.LogNotice(erRes.Notices);
+            return this.ViewEnvelopeNotFound();
+        }
+        var er = erRes.Data;
+
+        var envelopeKey = (er.Envelope!.Uuid, er.Receiver!.Signature).ToEnvelopeKey();
+
+        //TODO: implement multi-threading to history process (Task)
+        var hist_res = await _historyService.RecordAsync((int)erro.EnvelopeId, erro.AddedWho, EnvelopeStatus.EnvelopeViewed);
+        if (hist_res.IsFailed)
+        {
+            _logger.LogError(
+                "Although the envelope was sent as read-only, the EnvelopeShared hisotry could not be saved. ReadOnly-Id: {readOnlyKey}\nEnvelope Receiver:\n{envelopeReceiver}",
+                readOnlyId, JsonConvert.SerializeObject(er));
+            _logger.LogNotice(hist_res.Notices);
+        }
+
+        if (er.Envelope.Documents?.FirstOrDefault() is DocumentDto doc && doc.ByteData is not null)
+        {
+            ViewData["DocumentBytes"] = doc.ByteData;
+            ViewData["EnvelopeKey"] = envelopeKey;
+            ViewData["IsReadOnly"] = true;
+            ViewData["ReadOnly"] = erro;
+            ViewData["PSPDFKitLicenseKey"] = _configuration["PSPDFKitLicenseKey"];
+            return View("ShowEnvelope", er);
+        }
+        else
+        {
+            _logger.LogEnvelopeError(envelopeReceiverId: envelopeKey, message: "No document byte-data was found in ENVELOPE_DOCUMENT table.");
+            return this.ViewDocumentNotFound();
+        }
+    }
+}

EnvelopeGenerator.Web/Controllers/HomeController.cs

@@ -1,60 +1,22 @@
-using DigitalData.Core.Abstraction.Application.DTO;
+using EnvelopeGenerator.Application.Resources;
-using DigitalData.Core.API;
-using DigitalData.Core.Client;
-using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
-using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Web.Extensions;
 using EnvelopeGenerator.Web.Models;
-using MediatR;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Localization;
-using Newtonsoft.Json;
-using OtpNet;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Web.Controllers;
 
-[Route("Envelope")]
+[Route("/")]
 public class HomeController : ViewControllerBase
 {
-    [Obsolete("Use MediatR")]
-    private readonly IEnvelopeReceiverService _envRcvService;
-    [Obsolete("Use MediatR")]
-    private readonly IEnvelopeHistoryService _historyService;
     private readonly IConfiguration _configuration;
-    [Obsolete("Use MediatR")]
-    private readonly IEnvelopeMailService _mailService;
-    [Obsolete("Use MediatR")]
-    private readonly IEnvelopeReceiverReadOnlyService _readOnlyService;
-    private readonly IAuthenticator _authenticator;
-    [Obsolete("Use MediatR")]
-    private readonly IReceiverService _rcvService;
-    private readonly IEnvelopeSmsHandler _envSmsHandler;
 
-    private readonly IMediator _mediator;
+    public HomeController(IConfiguration configuration, ILogger<HomeController> logger, Cultures cultures, IStringLocalizer<Resource> localizer) : base(logger, cultures, localizer)
-
-    [Obsolete("Use MediatR")]
-    public HomeController(ILogger<HomeController> logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer<Resource> localizer, IConfiguration configuration, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, IAuthenticator authenticator, IReceiverService receiverService, IEnvelopeSmsHandler envelopeSmsService, IMediator mediator) : base(logger, cultures, localizer)
     {
-        _envRcvService = envelopeReceiverService;
-        _historyService = historyService;
         _configuration = configuration;
-        _mailService = envelopeMailService;
-        _readOnlyService = readOnlyService;
-        _authenticator = authenticator;
-        _rcvService = receiverService;
-        _envSmsHandler = envelopeSmsService;
-        _mediator = mediator;
     }
 
-    [HttpGet("/")]
+    [HttpGet]
     public IActionResult Main()
     {
         return View(new MainViewModel()
@@ -63,442 +25,6 @@ public class HomeController : ViewControllerBase
         });
     }
 
-    [HttpGet("{envelopeReceiverId}")]
-    [Obsolete("Use MediatR")]
-    public async Task<IActionResult> MainAsync([FromRoute] string envelopeReceiverId)
-    {
-        try
-        {
-            if (!envelopeReceiverId.TryDecode(out var decoded))
-            {
-                Response.StatusCode = StatusCodes.Status401Unauthorized;
-                return this.ViewDocumentNotFound();
-            }
-
-            if(decoded.GetEncodeType() == EncodeType.EnvelopeReceiverReadOnly)
-                return Redirect($"{envelopeReceiverId}/ReadOnly");
-
-            ViewData["EnvelopeKey"] = envelopeReceiverId;
-
-            var er = await _mediator.ReadEnvelopeReceiverAsync(envelopeReceiverId);
-
-            if (er is null)
-                return this.ViewEnvelopeNotFound();
-
-            bool accessCodeAlreadyRequested = await _historyService.AccessCodeAlreadyRequested(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress);
-            if (!accessCodeAlreadyRequested)
-            {
-                await _historyService.RecordAsync(er.EnvelopeId, er.Receiver.EmailAddress, EnvelopeStatus.AccessCodeRequested);
-
-                var mailRes = await _mailService.SendAccessCodeAsync(envelopeReceiverDto: er);
-                if (mailRes.IsFailed)
-                {
-                    _logger.LogNotice(mailRes);
-                    return this.ViewAccessCodeNotSent();
-                }
-            }
-
-            return Redirect($"{envelopeReceiverId}/Locked");
-        }
-        catch(Exception ex)
-        {
-            _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, exception:ex, message: _localizer.UnexpectedError());
-            return this.ViewInnerServiceError();
-        }
-    }
-
-    [HttpGet("{envelopeReceiverId}/Locked")]
-    [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
-    public async Task<IActionResult> EnvelopeLocked([FromRoute] string envelopeReceiverId, CancellationToken cancel)
-    {
-        try
-        {
-            var er = await _mediator.ReadEnvelopeReceiverAsync(envelopeReceiverId, cancel);
-
-            if (er is null)
-            {
-                Response.StatusCode = StatusCodes.Status401Unauthorized;
-                return this.ViewEnvelopeNotFound();
-            }
-
-            if (User.IsInRole(ReceiverRole.FullyAuth))
-                return await CreateShowEnvelopeView(envelopeReceiverId, er);
-            else
-            {
-                ViewData["EnvelopeKey"] = envelopeReceiverId;
-                ViewData["TFAEnabled"] = er.Envelope!.TFAEnabled;
-                ViewData["HasPhoneNumber"] = er.HasPhoneNumber;
-                ViewData["SenderEmail"] = er.Envelope.User!.Email;
-                ViewData["EnvelopeTitle"] = er.Envelope.Title;
-                return View();
-            }
-        }
-        catch(Exception ex)
-        {
-            _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, exception: ex);
-            return this.ViewInnerServiceError();
-        }
-    }
-
-    [Obsolete("Use MediatR")]
-    private async Task<IActionResult> CreateShowEnvelopeView(string envelopeReceiverId, EnvelopeReceiverDto er)
-    {
-        try
-        {
-            ViewData["EnvelopeKey"] = envelopeReceiverId;
-            (string? uuid, string? signature) = envelopeReceiverId.DecodeEnvelopeReceiverId();
-
-            if (uuid is null || signature is null)
-            {
-                _logger.LogEnvelopeError(uuid: uuid, signature: signature, message: _localizer.WrongEnvelopeReceiverId());
-                return Unauthorized();
-            }
-
-            _logger.LogInformation("Envelope UUID: [{uuid}]\nReceiver Signature: [{signature}]", uuid, signature);
-
-            //check rejection
-            var rejRcvrs = await _historyService.ReadRejectingReceivers(er.Envelope!.Id);
-            if (rejRcvrs.Any())
-            {
-                ViewBag.IsExt = !rejRcvrs.Contains(er.Receiver);    //external if the current user is not rejected
-                return View("EnvelopeRejected", er);
-            }
-
-            //check if it has already signed
-            if (await _historyService.IsSigned(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress))
-                return View("EnvelopeSigned");
-
-            if (er.Envelope.Documents?.FirstOrDefault() is DocumentDto doc && doc.ByteData is not null)
-            {
-                ViewData["DocumentBytes"] = doc.ByteData;
-            }
-            else
-            {
-                _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, message: "No document byte-data was found in ENVELOPE_DOCUMENT table.");
-                return this.ViewDocumentNotFound();
-            }
-
-            await HttpContext.SignInEnvelopeAsync(er, ReceiverRole.FullyAuth);
-
-            //add PSPDFKit licence key
-            ViewData["PSPDFKitLicenseKey"] = _configuration["PSPDFKitLicenseKey"];
-
-            return View("ShowEnvelope", er);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, exception: ex);
-            return this.ViewInnerServiceError();
-        }
-    }
-
-    #region TFA Views
-    [NonAction]
-    private async Task<IActionResult> TFAViewAsync(bool viaSms, EnvelopeReceiverSecretDto er_secret, string envelopeReceiverId)
-    {
-        if (viaSms)
-        {
-            var (smsRes, expiration) = await _envSmsHandler.SendTotpAsync(er_secret);
-
-            ViewData["EnvelopeKey"] = envelopeReceiverId;
-            ViewData["TFAEnabled"] = er_secret.Envelope!.TFAEnabled;
-            ViewData["HasPhoneNumber"] = er_secret.HasPhoneNumber;
-            ViewData["SenderEmail"] = er_secret.Envelope.User!.Email;
-            ViewData["EnvelopeTitle"] = er_secret.Envelope.Title;
-
-            if (smsRes?.Failed ?? false)
-            {
-                var res_json = JsonConvert.SerializeObject(smsRes);
-                _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, message: $"An unexpected error occurred while sending an SMS code. Response: ${res_json}");
-                return this.ViewInnerServiceError();
-            }
-
-            return View("EnvelopeLocked").WithData("CodeType", "smsCode").WithData("SmsExpiration", expiration);
-        }
-        else
-        {
-            return View("EnvelopeLocked")
-                .WithData("CodeType", "authenticatorCode")
-                .WithData("TfaRegDeadline", er_secret.Receiver?.TfaRegDeadline);
-        }
-    }
-
-    [Obsolete("Use MediatR")]
-    [NonAction]
-    private async Task<IActionResult?> HandleAccessCodeAsync(Auth auth, EnvelopeReceiverSecretDto er_secret, string envelopeReceiverId)
-    {
-        //check the access code verification
-        if (er_secret.AccessCode != auth.AccessCode)
-        {
-            //EnvelopeStatusQuery.AccessCodeIncorrect
-            await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, EnvelopeStatus.AccessCodeIncorrect);
-            Response.StatusCode = StatusCodes.Status401Unauthorized;
-            return View("EnvelopeLocked")
-                    .WithData("EnvelopeKey", envelopeReceiverId)
-                    .WithData("TFAEnabled", er_secret.Envelope!.TFAEnabled)
-                    .WithData("HasPhoneNumber", er_secret.HasPhoneNumber)
-                    .WithData("SenderEmail", er_secret.Envelope.User!.Email)
-                    .WithData("EnvelopeTitle", er_secret.Envelope.Title)
-                    .WithData("ErrorMessage", _localizer.WrongAccessCode());
-        }
-
-        await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, EnvelopeStatus.AccessCodeCorrect);
-
-        //check if the user has phone is added
-        if (er_secret.Envelope!.TFAEnabled)
-        {
-            var rcv = er_secret.Receiver;
-            if (rcv.TotpSecretkey is null)
-            {
-                rcv.TotpSecretkey = _authenticator.GenerateTotpSecretKey();
-                await _rcvService.UpdateAsync(rcv);
-            }
-
-            await HttpContext.SignInEnvelopeAsync(er_secret, ReceiverRole.PreAuth);
-
-            return await TFAViewAsync(auth.UserSelectSMS, er_secret, envelopeReceiverId);
-        }
-
-        return null;
-    }
-
-    [NonAction]
-    private async Task<IActionResult?> HandleSmsAsync(Auth auth, EnvelopeReceiverSecretDto er_secret, string envelopeReceiverId)
-    {
-        if (er_secret.Receiver!.TotpSecretkey is null)
-            throw new InvalidOperationException($"TotpSecretkey of DTO cannot validate without TotpSecretkey. Dto: {JsonConvert.SerializeObject(er_secret)}");
-        
-        if (!User.IsInRole(ReceiverRole.PreAuth) || !_envSmsHandler.VerifyTotp(auth.SmsCode!, er_secret.Receiver.TotpSecretkey))
-        {
-            Response.StatusCode = StatusCodes.Status401Unauthorized;
-            ViewData["ErrorMessage"] = _localizer.WrongAccessCode();
-            return await TFAViewAsync(viaSms: true, er_secret, envelopeReceiverId);
-        }
-
-        return null;
-    }
-
-    [NonAction]
-    private async Task<IActionResult?> HandleAuthenticatorAsync(Auth auth, EnvelopeReceiverSecretDto er_secret, string envelopeReceiverId)
-    {
-        if (er_secret.Receiver!.TotpSecretkey is null)
-            throw new InvalidOperationException($"TotpSecretkey of DTO cannot validate without TotpSecretkey. Dto: {JsonConvert.SerializeObject(er_secret)}");
-
-        if (!User.IsInRole(ReceiverRole.PreAuth) || !_authenticator.VerifyTotp(auth.AuthenticatorCode!, er_secret.Receiver.TotpSecretkey, window: VerificationWindow.RfcSpecifiedNetworkDelay))
-        {
-            Response.StatusCode = StatusCodes.Status401Unauthorized;
-            ViewData["ErrorMessage"] = _localizer.WrongAccessCode();
-            return await TFAViewAsync(viaSms: false, er_secret, envelopeReceiverId);
-        }
-
-        return null;
-    }
-    #endregion
-
-    [HttpPost("{envelopeReceiverId}/Locked")]
-    [Obsolete("Use MediatR")]
-    public async Task<IActionResult> LogInEnvelope([FromRoute] string envelopeReceiverId, [FromForm] Auth auth)
-    {
-        try
-        {
-            ViewData["EnvelopeKey"] = envelopeReceiverId;
-            (string? uuid, string? signature) = envelopeReceiverId.DecodeEnvelopeReceiverId();
-
-            if (uuid is null || signature is null)
-            {
-                _logger.LogEnvelopeError(uuid: uuid, signature: signature, message: _localizer.WrongEnvelopeReceiverId());
-                return Unauthorized();
-            }
-
-            _logger.LogInformation("Envelope UUID: [{uuid}]\nReceiver Signature: [{signature}]", uuid, signature);
-
-            var er_secret_res = await _envRcvService.ReadWithSecretByUuidSignatureAsync(uuid: uuid, signature: signature);
-
-            if (er_secret_res.IsFailed)
-            {
-                _logger.LogNotice(er_secret_res.Notices);
-                return this.ViewEnvelopeNotFound();
-            }
-            var er_secret = er_secret_res.Data;
-
-            // show envelope if already logged in
-            if (User.IsInRole(ReceiverRole.FullyAuth))
-                return await CreateShowEnvelopeView(envelopeReceiverId, er_secret);
-
-            if (auth.HasMulti)
-            {
-                return Unauthorized();
-            }
-            else if (auth.HasAccessCode)
-            {
-                if (await HandleAccessCodeAsync(auth, er_secret, envelopeReceiverId) is IActionResult acView)
-                    return acView;
-            }
-            else if (auth.HasSmsCode)
-            {
-                if (await HandleSmsAsync(auth, er_secret, envelopeReceiverId) is IActionResult smsView)
-                    return smsView;
-            }
-            else if (auth.HasAuthenticatorCode)
-            {
-                if(await HandleAuthenticatorAsync(auth, er_secret, envelopeReceiverId) is IActionResult aView)
-                    return aView;
-            }
-            else
-            {
-                Response.StatusCode = StatusCodes.Status401Unauthorized;
-                return View("EnvelopeLocked")
-                        .WithData("EnvelopeKey", envelopeReceiverId)
-                        .WithData("TFAEnabled", er_secret.Envelope!.TFAEnabled)
-                        .WithData("HasPhoneNumber", er_secret.HasPhoneNumber)
-                        .WithData("SenderEmail", er_secret.Envelope.User!.Email)
-                        .WithData("EnvelopeTitle", er_secret.Envelope.Title)
-                        .WithData("ErrorMessage", _localizer.WrongEnvelopeReceiverId());
-            }
-            
-            await HttpContext.SignInEnvelopeAsync(er_secret, ReceiverRole.FullyAuth);
-
-            return await CreateShowEnvelopeView(envelopeReceiverId, er_secret);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, exception: ex);
-            return this.ViewInnerServiceError();
-        }
-    }    
-
-    [Authorize(Roles = ReceiverRole.FullyAuth)]
-    [HttpGet("{envelopeReceiverId}/Success")]
-    [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
-    public async Task<IActionResult> EnvelopeSigned([FromRoute] string envelopeReceiverId, CancellationToken cancel)
-    {
-        try
-        {
-            return await _envRcvService.IsExisting(envelopeReceiverId: envelopeReceiverId).ThenAsync(
-                SuccessAsync: (Func<bool, Task<IActionResult>>)(async isExisting =>
-                {
-                    if(!isExisting)
-                        return this.ViewEnvelopeNotFound();
-
-                    var signed = await _mediator.IsSignedAsync(envelopeReceiverId, cancel);
-                    if (signed)
-                        return base.Redirect($"/Envelope/{envelopeReceiverId}/Locked");
-
-                    await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-                    ViewData["EnvelopeKey"] = envelopeReceiverId;
-                    return base.View();
-                }),
-                Fail: IActionResult (messages, notices) =>
-                {
-                    _logger.LogNotice(notices);
-                    return this.ViewEnvelopeNotFound();
-                });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, exception: ex);
-            return this.ViewInnerServiceError();
-        }
-    }
-
-    [Authorize(Roles = ReceiverRole.FullyAuth)]
-    [HttpGet("{envelopeReceiverId}/Rejected")]
-    [Obsolete("Use MediatR")]
-    public async Task<IActionResult> EnvelopeRejected([FromRoute] string envelopeReceiverId)
-    {
-        try
-        {
-            await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-            return await _envRcvService.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId).ThenAsync(
-                SuccessAsync: async (er) =>
-                {
-                    return await _historyService.IsRejected(envelopeId: er.EnvelopeId)
-                        ? View(er)
-                        : Redirect($"/Envelope/{envelopeReceiverId}/Locked");
-
-                },
-                Fail: IActionResult (messages, notices) =>
-                {
-                    _logger.LogNotice(notices);
-                    return this.ViewEnvelopeNotFound();
-                });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, exception: ex);
-            return this.ViewInnerServiceError();
-        }
-    }
-
-    [HttpGet("{readOnlyKey}/ReadOnly")]
-    [Obsolete("Use MediatR")]
-    public async Task<IActionResult> EnvelopeReceiverReadOnly([FromRoute] string readOnlyKey)
-    {
-        try
-        {
-            // check if the readOnlyId is valid
-            if (!readOnlyKey.TryDecode(out var decodedKeys) || decodedKeys.GetEncodeType() != EncodeType.EnvelopeReceiverReadOnly)
-            {
-                Response.StatusCode = StatusCodes.Status401Unauthorized;
-                return this.ViewDocumentNotFound();
-            }
-
-            var readOnlyId = decodedKeys.ParseReadOnlyId();
-            var erro_res = await _readOnlyService.ReadByIdAsync(readOnlyId);
-            if (erro_res.IsFailed)
-            {
-                _logger.LogNotice(erro_res.Notices);
-                return this.ViewInnerServiceError();
-            }
-
-            var erro = erro_res.Data;
-
-            if (DateTime.Now > erro.DateValid)
-                return View("EnvelopeExpired");
-
-            return await _envRcvService.ReadByUuidSignatureAsync(uuid: erro.Envelope!.Uuid, erro.Receiver!.Signature).ThenAsync(
-            SuccessAsync: async er =>
-            {
-                var envelopeKey = (er.Envelope!.Uuid, er.Receiver!.Signature).ToEnvelopeKey();
-
-                //TODO: implement multi-threading to history process (Task)
-                var hist_res = await _historyService.RecordAsync((int)erro.EnvelopeId, erro.AddedWho, EnvelopeStatus.EnvelopeViewed);
-                if (hist_res.IsFailed)
-                {
-                    _logger.LogError(
-                        "Although the envelope was sent as read-only, the EnvelopeShared hisotry could not be saved. ReadOnly-key: {readOnlyKey}\nEnvelope Receiver:\n{envelopeReceiver}",
-                        readOnlyKey, JsonConvert.SerializeObject(er));
-                    _logger.LogNotice(hist_res.Notices);
-                }
-
-                if (er.Envelope.Documents?.FirstOrDefault() is DocumentDto doc && doc.ByteData is not null)
-                {
-                    ViewData["DocumentBytes"] = doc.ByteData;
-                    ViewData["EnvelopeKey"] = envelopeKey;
-                    ViewData["IsReadOnly"] = true;
-                    ViewData["ReadOnly"] = erro;
-                    ViewData["PSPDFKitLicenseKey"] = _configuration["PSPDFKitLicenseKey"];
-                    return View("ShowEnvelope", er);
-                }
-                else
-                {
-                    _logger.LogEnvelopeError(envelopeReceiverId: envelopeKey, message: "No document byte-data was found in ENVELOPE_DOCUMENT table.");
-                    return this.ViewDocumentNotFound();
-                }
-            },
-            Fail: (messages, notices) =>
-            {
-                _logger.LogNotice(notices);
-                return this.ViewEnvelopeNotFound();
-            });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "An unexpected error occurred while displaying a read-only envelope. Read-only key is {readOnlyKey}. {message}", readOnlyKey, ex.Message);
-            return this.ViewInnerServiceError();
-        }
-    }
-
     [HttpGet("Error404")]
     public IActionResult Error404() => this.ViewError404();
 }

EnvelopeGenerator.Web/Controllers/Test/TestAnnotationController.cs

@@ -0,0 +1,35 @@
+using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Notifications.RemoveSignature;
+using MediatR;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.Web.Controllers.Test;
+
+[Route("api/[controller]")]
+[ApiController]
+public class TestAnnotationController : ControllerBase
+{
+    private readonly IMediator _mediator;
+
+    public TestAnnotationController(IMediator mediator)
+    {
+        _mediator = mediator;
+    }
+
+    [HttpDelete("{envelopeKey}")]
+    public async Task<IActionResult> Delete([FromRoute] string envelopeKey)
+    {
+        if (envelopeKey.GetEnvelopeUuid() is not string uuid)
+            return BadRequest();
+
+        if (envelopeKey.GetReceiverSignature() is not string signature)
+            return BadRequest();
+
+        await _mediator.Publish(new RemoveSignatureNotification()
+        {
+            EnvelopeUuid = uuid,
+            ReceiverSignature = signature
+        });
+        return Ok();
+    }
+}

EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<PackageId>EnvelopeGenerator.Web</PackageId>
@@ -12,9 +12,9 @@
 		<PackageTags>digital data envelope generator web</PackageTags>
 		<Description>EnvelopeGenerator.Web is an ASP.NET MVC application developed to manage signing processes. It uses Entity Framework Core (EF Core) for database operations. The user interface for signing processes is developed with Razor View Engine (.cshtml files) and JavaScript under wwwroot, integrated with PSPDFKit. This integration allows users to view and sign documents seamlessly.</Description>
 		<ApplicationIcon>Assets\icon.ico</ApplicationIcon>
-		<Version>3.2.3</Version>
+		<Version>3.7.0</Version>
-		<AssemblyVersion>3.2.3</AssemblyVersion>
+		<AssemblyVersion>3.7.0</AssemblyVersion>
-		<FileVersion>3.2.3</FileVersion>
+		<FileVersion>3.7.0</FileVersion>
 		<Copyright>Copyright © 2025 Digital Data GmbH. All rights reserved.</Copyright>
 	</PropertyGroup>
 
@@ -2094,20 +2094,13 @@
 		<None Include="wwwroot\lib\bootstrap-icons\icons\zoom-out.svg" />
 	</ItemGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-		<PackageReference Include="AutoMapper" Version="13.0.1" />
 		<PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
 		<PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
 		<PackageReference Include="HtmlSanitizer" Version="8.0.865" />
 		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
 		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="NLog" Version="5.2.5" />
@@ -2126,12 +2119,84 @@
 		<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
 	</ItemGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-		<ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
+		<PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
-		<ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
+		<PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
+		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
+		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
+		<PackageReference Include="HtmlSanitizer" Version="8.0.865" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
+		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="NLog" Version="5.2.5" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
+		<PackageReference Include="Quartz" Version="3.8.0" />
+		<PackageReference Include="Quartz.AspNetCore" Version="3.8.0" />
+		<PackageReference Include="Quartz.Plugins" Version="3.8.0" />
+		<PackageReference Include="Quartz.Serialization.Json" Version="3.8.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
+		<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
+		<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
+		<PackageReference Include="System.DirectoryServices" Version="8.0.0" />
+		<PackageReference Include="System.DirectoryServices.AccountManagement" Version="8.0.1" />
+		<PackageReference Include="System.DirectoryServices.Protocols" Version="8.0.1" />
+		<PackageReference Include="System.Drawing.Common" Version="8.0.16" />
+		<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+		<PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
+		<PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
+		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
+		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
+		<PackageReference Include="HtmlSanitizer" Version="8.0.865" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
+		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="NLog" Version="5.2.5" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
+		<PackageReference Include="Quartz" Version="3.8.0" />
+		<PackageReference Include="Quartz.AspNetCore" Version="3.8.0" />
+		<PackageReference Include="Quartz.Plugins" Version="3.8.0" />
+		<PackageReference Include="Quartz.Serialization.Json" Version="3.8.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
+		<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.11" />
+		<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
+		<PackageReference Include="System.DirectoryServices" Version="9.0.4" />
+		<PackageReference Include="System.DirectoryServices.AccountManagement" Version="9.0.4" />
+		<PackageReference Include="System.DirectoryServices.Protocols" Version="9.0.4" />
+		<PackageReference Include="System.Drawing.Common" Version="9.0.5" />
+		<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
+		<ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
+		<ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
+		<ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Content Update="appsettings.Logging.json">
+		  <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+		</Content>
+		<Content Update="appsettings.GSM.json">
+		  <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+		</Content>
+		<Content Update="appsettings.Security.json">
+		  <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+		</Content>
+		<Content Update="appsettings.UI.json">
+		  <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+		</Content>
+		<Content Update="appsettings.Database.json">
+		  <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+		</Content>
+		<Content Update="appsettings.Mail.json">
+		  <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+		</Content>
+		<Content Update="appsettings.PSPDFKitLicense.json">
+		  <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+		</Content>
 		<Content Update="appsettings.json">
 			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
 		</Content>

EnvelopeGenerator.Web/Program.cs

@@ -34,6 +34,13 @@ try
 
     var config = builder.Configuration;
 
+    Directory
+        .GetFiles(builder.Environment.ContentRootPath, "appsettings.*.json", SearchOption.TopDirectoryOnly)
+        .Where(file => Path.GetFileName(file) != $"appsettings.Development.json")
+        .Where(file => Path.GetFileName(file) != $"appsettings.migration.json")
+        .ToList()
+        .ForEach(file => config.AddJsonFile(file, true, true));
+
     var allowedOrigins = config.GetSection("AllowedOrigins").Get<string[]>() ??
         throw new InvalidOperationException("AllowedOrigins section is missing in the configuration.");
 
@@ -96,14 +103,19 @@ try
 
     // Add envelope generator services
 #pragma warning disable CS0618 // Type or member is obsolete
-    builder.Services.AddEnvelopeGeneratorInfrastructureServices((provider, options) =>
+    builder.Services.AddEnvelopeGeneratorInfrastructureServices(
-    {
+        opt =>
-        var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
+        {
-        options.UseSqlServer(connStr)
+            opt.AddDbTriggerParams(config);
-               .LogTo(log => logger.LogInformation("{log}", log), Microsoft.Extensions.Logging.LogLevel.Trace)
+            opt.AddDbContext((provider, options) =>
-               .EnableSensitiveDataLogging()
+            {
-               .EnableDetailedErrors();
+                var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
-    });
+                options.UseSqlServer(connStr)
+                        .LogTo(log => logger.LogInformation("{log}", log), Microsoft.Extensions.Logging.LogLevel.Trace)
+                        .EnableSensitiveDataLogging()
+                        .EnableDetailedErrors();
+            });
+        });
 #pragma warning restore CS0618 // Type or member is obsolete
 
 #pragma warning disable CS0618 // Type or member is obsolete
@@ -136,7 +148,7 @@ try
             {
                 // Dynamically calculate the redirection path, for example:
                 var envelopeReceiverId = context.HttpContext.Request.RouteValues["envelopeReceiverId"];
-                context.RedirectUri = $"/EnvelopeKey/{envelopeReceiverId}/Locked";
+                context.RedirectUri = $"/EnvelopeKey/{envelopeReceiverId}";
 
                 context.Response.Redirect(context.RedirectUri);
                 return Task.CompletedTask;
@@ -145,7 +157,7 @@ try
             {
                 // Apply a similar redirection logic for logout
                 var envelopeReceiverId = context.HttpContext.Request.RouteValues["envelopeReceiverId"];
-                context.RedirectUri = $"/EnvelopeKey/{envelopeReceiverId}/Success";
+                context.RedirectUri = $"/EnvelopeKey/{envelopeReceiverId}";
 
                 context.Response.Redirect(context.RedirectUri);
                 return Task.CompletedTask;

EnvelopeGenerator.Web/Properties/PublishProfiles/IISProfileNet8.pubxml

@@ -11,12 +11,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
     <ExcludeApp_Data>false</ExcludeApp_Data>
     <ProjectGuid>5e0e17c0-ff5a-4246-bf87-1add85376a27</ProjectGuid>
-    <DesktopBuildPackageLocation>P:\Install .Net\0 DD - Smart UP\signFLOW\Web\net9\win64\$(Version)\EnvelopeGenerator.Web.zip</DesktopBuildPackageLocation>
+    <DesktopBuildPackageLocation>P:\Install .Net\0 DD - Smart UP\signFLOW\Web\net8\$(Version)\EnvelopeGenerator.Web.zip</DesktopBuildPackageLocation>
     <PackageAsSingleFile>true</PackageAsSingleFile>
     <DeployIisAppPath>EnvelopeGenerator</DeployIisAppPath>
     <_TargetId>IISWebDeployPackage</_TargetId>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
   </PropertyGroup>
 </Project>

EnvelopeGenerator.Web/Views/Envelope/EnvelopeLocked.cshtml

@@ -96,6 +96,8 @@
         </details>
     </section>
 </div>
+@if (smsExpiration is not null)
+{
 <script nonce="@nonce">
     var expiration = new Date(@Html.Raw(JsonConvert.SerializeObject(smsExpiration)));
 
@@ -122,3 +124,4 @@
         element.textContent = remainingTime;
     }, 1000);
 </script>    
+}

EnvelopeGenerator.Web/Views/Envelope/ShowEnvelope.cshtml

@@ -79,7 +79,7 @@
                 }
                 else
                 {
-                <h6>@($"{@envelope?.Message}")</h6>
+                <div class="markdown">@(envelope?.Message)</div>
                 }
                 <p>
                     <small class="text-body-secondary">

EnvelopeGenerator.Web/Views/Shared/_Layout.cshtml

@@ -20,9 +20,8 @@
     <link rel="stylesheet" href="~/css/card.min.css" asp-append-version="true" />
     <link rel="stylesheet" href="~/EnvelopeGenerator.Web.styles.css" asp-append-version="true" />
     <link rel="stylesheet" href="~/lib/flag-icons-main/css/flag-icons.min.css" asp-append-version="true" />
+    <link rel="stylesheet" href="~/css/google-font.css" asp-append-version="true" />
     <link rel="stylesheet" href="~/lib/alertifyjs/css/alertify.min.css" />
-    <link href="https://fonts.googleapis.com/icon?family=Material+Symbols+Outlined" rel="stylesheet">
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@24,400,0,0" />
     <link rel="stylesheet" href="~/lib/bootstrap-icons/font/bootstrap-icons.min.css">
 </head>
 <body>
@@ -50,13 +49,14 @@
     <script src="~/lib/bootstrap/dist/js/bootstrap.min.js"></script>
     <script src="~/lib/sweetalert2/sweetalert2.min.js"></script>
     <script src="~/lib/alertifyjs/alertify.min.js"></script>
+    <script src="~/lib/marked/marked.umd.min.js"></script>
+    <script src="~/js/lazy.min.js" asp-append-version="true"></script>
     <script src="~/js/ui.min.js" asp-append-version="true"></script>
     <script src="~/js/annotation.js" asp-append-version="true"></script>
-    <script src="~/js/network.min.js" asp-append-version="true"></script>
     <script src="~/js/app.min.js" asp-append-version="true"></script>
     <script src="~/lib/pspdfkit/dist-2024.3.2/pspdfkit.js"></script>
     <script src="~/js/util.min.js" asp-append-version="true"></script>
-    <script src="~/js/api-service.min.js" asp-append-version="true"></script>
+    <script src="~/js/envelope-api.min.js" asp-append-version="true"></script>
     <script src="~/lib/typed.js@2.1.0/dist/typed.umd.js"></script>
     @await RenderSectionAsync("Scripts", required: false)
     @{
@@ -96,5 +96,6 @@
         </div>
         <a href="/privacy-policy.@(_localizer.Culture()).html" target="_blank">@_localizer.Privacy()</a>
     </footer>
+    <script src="~/js/markdown.min.js" asp-append-version="true"></script>
 </body>
 </html>

EnvelopeGenerator.Web/appsettings.Database.json

@@ -0,0 +1,15 @@
+{
+  "UseDbMigration": false,
+  "ConnectionStrings": {
+    "Default": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;",
+    "DbMigrationTest": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM_DATA_MIGR_TEST;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;"
+  },
+  "DbTriggerParams": {
+    "Envelope": [ "TBSIG_ENVELOPE_AFT_INS" ],
+    "History": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
+    "EmailOut": [ "TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD" ],
+    "EnvelopeReceiverReadOnly": [ "TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD" ],
+    "Receiver": [],
+    "EmailTemplate": [ "TBSIG_EMAIL_TEMPLATE_AFT_UPD" ]
+  }
+}

EnvelopeGenerator.Web/appsettings.GSM.json

@@ -0,0 +1,10 @@
+{
+  "GtxMessagingParams": {
+    "Uri": "https://rest.gtx-messaging.net",
+    "Path": "smsc/sendsms/f566f7e5-bdf2-4a9a-bf52-ed88215a432e/json",
+    "Headers": {},
+    "QueryParams": {
+      "from": "signFlow"
+    }
+  }
+}

EnvelopeGenerator.Web/appsettings.Logging.json

@@ -0,0 +1,61 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Warning",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information",
+      "Microsoft.AspNetCore.Hosting.Diagnostics": "Warning"
+    }
+  },
+  "NLog": {
+    "throwConfigExceptions": true,
+    "variables": {
+      "logDirectory": "E:\\LogFiles\\Digital Data\\signFlow",
+      "logFileNamePrefix": "${shortdate}-ECM.EnvelopeGenerator.Web"
+    },
+    "targets": {
+      "infoLogs": {
+        "type": "File",
+        "fileName": "${logDirectory}\\${logFileNamePrefix}-Info.log",
+        "maxArchiveDays": 30
+      },
+      "warningLogs": {
+        "type": "File",
+        "fileName": "${logDirectory}\\${logFileNamePrefix}-Warning.log",
+        "maxArchiveDays": 30
+      },
+      "errorLogs": {
+        "type": "File",
+        "fileName": "${logDirectory}\\${logFileNamePrefix}-Error.log",
+        "maxArchiveDays": 30
+      },
+      "criticalLogs": {
+        "type": "File",
+        "fileName": "${logDirectory}\\${logFileNamePrefix}-Critical.log",
+        "maxArchiveDays": 30
+      }
+    },
+    "rules": [
+      {
+        "logger": "*",
+        "level": "Info",
+        "writeTo": "infoLogs"
+      },
+      {
+        "logger": "*",
+        "level": "Warn",
+        "writeTo": "warningLogs"
+      },
+      {
+        "logger": "*",
+        "level": "Error",
+        "writeTo": "errorLogs"
+      },
+      {
+        "logger": "*",
+        "level": "Fatal",
+        "writeTo": "criticalLogs"
+      }
+    ]
+  }
+}

EnvelopeGenerator.Web/appsettings.Mail.json

@@ -0,0 +1,15 @@
+{
+  "DispatcherParams": {
+    "SendingProfile": 1,
+    "AddedWho": "DDEnvelopGenerator",
+    "ReminderTypeId": 202377,
+    "EmailAttmt1": null
+  },
+  "MailParams": {
+    "Placeholders": {
+      "[NAME_PORTAL]": "signFlow",
+      "[SIGNATURE_TYPE]": "signieren",
+      "[REASON]": ""
+    }
+  }
+}

EnvelopeGenerator.Web/appsettings.PSPDFKitLicense.json

@@ -0,0 +1,3 @@
+{
+  "PSPDFKitLicenseKey": "SXCtGGY9XA-31OGUXQK-r7c6AkdLGPm2ljuyDr1qu0kkhLvydg-Do-fxpNUF4Rq3fS_xAnZRNFRHbXpE6sQ2BMcCSVTcXVJO6tPviexjpiT-HnrDEySlUERJnnvh-tmeOWprxS6BySPnSILkmaVQtUfOIUS-cUbvvEYHTvQBKbSF8di4XHQFyfv49ihr51axm3NVV3AXwh2EiKL5C5XdqBZ4sQ4O7vXBjM2zvxdPxlxdcNYmiU83uAzw7B83O_jubPzya4CdUHh_YH7Nlp2gP56MeG1Sw2JhMtfG3Rj14Sg4ctaeL9p6AEWca5dDjJ2li5tFIV2fQSsw6A_cowLu0gtMm5i8IfJXeIcQbMC2-0wGv1oe9hZYJvFMdzhTM_FiejM0agemxt3lJyzuyP8zbBSOgp7Si6A85krLWPZptyZBTG7pp7IHboUHfPMxCXqi-zMsqewOJtQBE2mjntU-lPryKnssOpMPfswwQX7QSkJYV5EMqNmEhQX6mEkp2wcqFzMC7bJQew1aO4pOpvChUaMvb1vgRek0HxLag0nwQYX2YrYGh7F_xXJs-8HNwJe8H0-eW4x4faayCgM5rB5772CCCsD9ThZcvXFrjNHHLGJ8WuBUFm6LArvSfFQdii_7j-_sqHMpeKZt26NFgivj1A=="
+}

EnvelopeGenerator.Web/appsettings.Security.json

@@ -0,0 +1,17 @@
+{
+  "Content-Security-Policy": [ // The first format parameter {0} will be replaced by the nonce value.
+    "default-src 'self'",
+    "script-src 'self' 'nonce-{0}' 'unsafe-eval'",
+    "style-src 'self' 'unsafe-inline' https://fonts.googleapis.com:*",
+    "img-src 'self' data: https: blob:",
+    "font-src 'self' https://fonts.gstatic.com:*",
+    "connect-src 'self' https://nominatim.openstreetmap.org:* http://localhost:* https://localhost:* ws://localhost:* wss://localhost:* blob:",
+    "frame-src 'self'",
+    "media-src 'self'",
+    "object-src 'self'"
+  ],
+  "AllowedOrigins": [ "https://localhost:7202", "https://digitale.unterschrift.wisag.de/" ],
+  "TFARegParams": {
+    "TimeLimit": "90.00:00:00"
+  }
+}

EnvelopeGenerator.Web/appsettings.UI.json

@@ -0,0 +1,121 @@
+{
+  "AnnotationParams": {
+    "Background": {
+      "Margin": 0.20,
+      "BackgroundColor": {
+        "R": 222,
+        "G": 220,
+        "B": 215
+      },
+      "BorderColor": {
+        "R": 204,
+        "G": 202,
+        "B": 198
+      },
+      "BorderStyle": "underline",
+      "BorderWidth": 4
+    },
+    "DefaultAnnotation": {
+      "Width": 1,
+      "Height": 0.5,
+      "MarginTop": 1
+    },
+    "Annotations": [
+      {
+        "Name": "Signature",
+        "MarginTop": 0
+      },
+      {
+        "Name": "PositionLabel",
+        "VerBoundAnnotName": "Signature",
+        "WidthRatio": 1.2,
+        "HeightRatio": 0.5,
+        "MarginTopRatio": 0.22
+      },
+      {
+        "Name": "Position",
+        "VerBoundAnnotName": "PositionLabel",
+        "WidthRatio": 1.2,
+        "HeightRatio": 0.5,
+        "MarginTopRatio": -0.05
+      },
+      {
+        "Name": "CityLabel",
+        "VerBoundAnnotName": "Position",
+        "WidthRatio": 1.2,
+        "HeightRatio": 0.5,
+        "MarginTopRatio": 0.05
+      },
+      {
+        "Name": "City",
+        "VerBoundAnnotName": "CityLabel",
+        "WidthRatio": 1.2,
+        "HeightRatio": 0.5,
+        "MarginTopRatio": -0.05
+      },
+      {
+        "Name": "DateLabel",
+        "VerBoundAnnotName": "City",
+        "WidthRatio": 1.55,
+        "HeightRatio": 0.5,
+        "MarginTopRatio": 0.05
+      },
+      {
+        "Name": "Date",
+        "VerBoundAnnotName": "DateLabel",
+        "WidthRatio": 1.55,
+        "HeightRatio": 0.5,
+        "MarginTopRatio": -0.1
+      }
+    ]
+  },
+  "ContactLink": {
+    "Label": "Kontakt",
+    "Href": "https://digitaldata.works/",
+    "HrefLang": "de",
+    "Target": "_blank",
+    "Title": "Digital Data GmbH"
+  },
+  /* Resx naming format is -> Resource.language.resx (eg: Resource.de_DE.resx). 
+     To add a new language, first you should write the required resx file.
+     first is the default culture name. */
+  "Cultures": [
+    {
+      "Language": "de-DE",
+      "FIClass": "fi-de"
+    },
+    {
+      "Language": "en-US",
+      "FIClass": "fi-us"
+    }
+  ],
+  "DisableMultiLanguage": false,
+  "Regexes": [
+    {
+      "Pattern": "/^\\p{L}+(?:([\\ \\-\\']|(\\.\\ ))\\p{L}+)*$/u",
+      "Name": "City",
+      "Platforms": [ ".NET" ]
+    },
+    {
+      "Pattern": "/^[a-zA-Z\\u0080-\\u024F]+(?:([\\ \\-\\']|(\\.\\ ))[a-zA-Z\\u0080-\\u024F]+)*$/",
+      "Name": "City",
+      "Platforms": [ "javascript" ]
+    }
+  ],
+  "CustomImages": {
+    "App": {
+      "Src": "/img/DD_signFLOW_LOGO.png",
+      "Classes": {
+        "Main": "signFlow-logo"
+      }
+    },
+    "Company": {
+      "Src": "/img/digital_data.svg",
+      "Classes": {
+        "Show": "dd-show-logo",
+        "Locked": "dd-locked-logo"
+      }
+    }
+  },
+  "MainPageTitle": null
+}

EnvelopeGenerator.Web/appsettings.json

@@ -1,234 +1,6 @@
 {
   "DiPMode": false, //Please be careful when enabling Development in Production (DiP) mode. It allows Swagger and test controllers to be enabled in a production environment.
   "EnableSwagger": true,
-  "UseDbMigration": false,
   "EnableTestControllers": true,
-  "DetailedErrors": true,
+  "DetailedErrors": true
-  "Logging": {
-    "LogLevel": {
-      "Default": "Warning",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information",
-      "Microsoft.AspNetCore.Hosting.Diagnostics": "Warning"
-    }
-  },
-  "ConnectionStrings": {
-    "Default": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;",
-    "DbMigrationTest": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM_DATA_MIGR_TEST;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;"
-  },
-  "PSPDFKitLicenseKey": "SXCtGGY9XA-31OGUXQK-r7c6AkdLGPm2ljuyDr1qu0kkhLvydg-Do-fxpNUF4Rq3fS_xAnZRNFRHbXpE6sQ2BMcCSVTcXVJO6tPviexjpiT-HnrDEySlUERJnnvh-tmeOWprxS6BySPnSILkmaVQtUfOIUS-cUbvvEYHTvQBKbSF8di4XHQFyfv49ihr51axm3NVV3AXwh2EiKL5C5XdqBZ4sQ4O7vXBjM2zvxdPxlxdcNYmiU83uAzw7B83O_jubPzya4CdUHh_YH7Nlp2gP56MeG1Sw2JhMtfG3Rj14Sg4ctaeL9p6AEWca5dDjJ2li5tFIV2fQSsw6A_cowLu0gtMm5i8IfJXeIcQbMC2-0wGv1oe9hZYJvFMdzhTM_FiejM0agemxt3lJyzuyP8zbBSOgp7Si6A85krLWPZptyZBTG7pp7IHboUHfPMxCXqi-zMsqewOJtQBE2mjntU-lPryKnssOpMPfswwQX7QSkJYV5EMqNmEhQX6mEkp2wcqFzMC7bJQew1aO4pOpvChUaMvb1vgRek0HxLag0nwQYX2YrYGh7F_xXJs-8HNwJe8H0-eW4x4faayCgM5rB5772CCCsD9ThZcvXFrjNHHLGJ8WuBUFm6LArvSfFQdii_7j-_sqHMpeKZt26NFgivj1A==",
-  "Content-Security-Policy": [ // The first format parameter {0} will be replaced by the nonce value.
-    "default-src 'self'",
-    "script-src 'self' 'nonce-{0}' 'unsafe-eval'",
-    "style-src 'self' 'unsafe-inline' https://fonts.googleapis.com:*",
-    "img-src 'self' data: https: blob:",
-    "font-src 'self' https://fonts.gstatic.com:*",
-    "connect-src 'self' https://nominatim.openstreetmap.org:* http://localhost:* https://localhost:* ws://localhost:* wss://localhost:* blob:",
-    "frame-src 'self'",
-    "media-src 'self'",
-    "object-src 'self'"
-  ],
-  "AllowedOrigins": [ "https://localhost:7202", "https://digitale.unterschrift.wisag.de/" ],
-  "NLog": {
-    "throwConfigExceptions": true,
-    "variables": {
-      "logDirectory": "E:\\LogFiles\\Digital Data\\signFlow",
-      "logFileNamePrefix": "${shortdate}-ECM.EnvelopeGenerator.Web"
-    },
-    "targets": {
-      "infoLogs": {
-        "type": "File",
-        "fileName": "${logDirectory}\\${logFileNamePrefix}-Info.log",
-        "maxArchiveDays": 30
-      },
-      "warningLogs": {
-        "type": "File",
-        "fileName": "${logDirectory}\\${logFileNamePrefix}-Warning.log",
-        "maxArchiveDays": 30
-      },
-      "errorLogs": {
-        "type": "File",
-        "fileName": "${logDirectory}\\${logFileNamePrefix}-Error.log",
-        "maxArchiveDays": 30
-      },
-      "criticalLogs": {
-        "type": "File",
-        "fileName": "${logDirectory}\\${logFileNamePrefix}-Critical.log",
-        "maxArchiveDays": 30
-      }
-    },
-    "rules": [
-      {
-        "logger": "*",
-        "level": "Info",
-        "writeTo": "infoLogs"
-      },
-      {
-        "logger": "*",
-        "level": "Warn",
-        "writeTo": "warningLogs"
-      },
-      {
-        "logger": "*",
-        "level": "Error",
-        "writeTo": "errorLogs"
-      },
-      {
-        "logger": "*",
-        "level": "Fatal",
-        "writeTo": "criticalLogs"
-      }
-    ]
-  },
-  "ContactLink": {
-    "Label": "Kontakt",
-    "Href": "https://digitaldata.works/",
-    "HrefLang": "de",
-    "Target": "_blank",
-    "Title": "Digital Data GmbH"
-  },
-  /* Resx naming format is -> Resource.language.resx (eg: Resource.de_DE.resx). 
-     To add a new language, first you should write the required resx file.
-     first is the default culture name. */
-  "Cultures": [
-    {
-      "Language": "de-DE",
-      "FIClass": "fi-de"
-    },
-    {
-      "Language": "en-US",
-      "FIClass": "fi-us"
-    }
-  ],
-  "DisableMultiLanguage": false,
-  "Regexes": [
-    {
-      "Pattern": "/^\\p{L}+(?:([\\ \\-\\']|(\\.\\ ))\\p{L}+)*$/u",
-      "Name": "City",
-      "Platforms": [ ".NET" ]
-    },
-    {
-      "Pattern": "/^[a-zA-Z\\u0080-\\u024F]+(?:([\\ \\-\\']|(\\.\\ ))[a-zA-Z\\u0080-\\u024F]+)*$/",
-      "Name": "City",
-      "Platforms": [ "javascript" ]
-    }
-  ],
-  "CustomImages": {
-    "App": {
-      "Src": "/img/DD_signFLOW_LOGO.png",
-      "Classes": {
-        "Main": "signFlow-logo"
-      }
-    },
-    "Company": {
-      "Src": "/img/digital_data.svg",
-      "Classes": {
-        "Show": "dd-show-logo",
-        "Locked": "dd-locked-logo"
-      }
-    }
-  },
-  "DispatcherParams": {
-    "SendingProfile": 1,
-    "AddedWho": "DDEnvelopGenerator",
-    "ReminderTypeId": 202377,
-    "EmailAttmt1": null
-  },
-  "MailParams": {
-    "Placeholders": {
-      "[NAME_PORTAL]": "signFlow",
-      "[SIGNATURE_TYPE]": "signieren",
-      "[REASON]": ""
-    }
-  },
-  "GtxMessagingParams": {
-    "Uri": "https://rest.gtx-messaging.net",
-    "Path": "smsc/sendsms/f566f7e5-bdf2-4a9a-bf52-ed88215a432e/json",
-    "Headers": {},
-    "QueryParams": {
-      "from": "signFlow"
-    }
-  },
-  "TFARegParams": {
-    "TimeLimit": "90.00:00:00"
-  },
-  "DbTriggerParams": {
-    "Envelope": [ "TBSIG_ENVELOPE_AFT_INS" ],
-    "History": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
-    "EmailOut": [ "TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD" ],
-    "EnvelopeReceiverReadOnly": [ "TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD" ],
-    "Receiver": [],
-    "EmailTemplate": [ "TBSIG_EMAIL_TEMPLATE_AFT_UPD" ]
-  },
-  "MainPageTitle": null,
-  "AnnotationParams": {
-    "Background": {
-      "Margin": 0.20,
-      "BackgroundColor": {
-        "R": 222,
-        "G": 220,
-        "B": 215
-      },
-      "BorderColor": {
-        "R": 204,
-        "G": 202,
-        "B": 198
-      },
-      "BorderStyle": "underline",
-      "BorderWidth": 4
-    },
-    "DefaultAnnotation": {
-      "Width": 1,
-      "Height": 0.5,
-      "MarginTop": 1
-    },
-    "Annotations": [
-      {
-        "Name": "Signature",
-        "MarginTop": 0
-      },
-      {
-        "Name": "PositionLabel",
-        "VerBoundAnnotName": "Signature",
-        "WidthRatio": 1.2,
-        "HeightRatio": 0.5,
-        "MarginTopRatio": 0.22
-      },
-      {
-        "Name": "Position",
-        "VerBoundAnnotName": "PositionLabel",
-        "WidthRatio": 1.2,
-        "HeightRatio": 0.5,
-        "MarginTopRatio": -0.05
-      },
-      {
-        "Name": "CityLabel",
-        "VerBoundAnnotName": "Position",
-        "WidthRatio": 1.2,
-        "HeightRatio": 0.5,
-        "MarginTopRatio": 0.05
-      },
-      {
-        "Name": "City",
-        "VerBoundAnnotName": "CityLabel",
-        "WidthRatio": 1.2,
-        "HeightRatio": 0.5,
-        "MarginTopRatio": -0.05
-      },
-      {
-        "Name": "DateLabel",
-        "VerBoundAnnotName": "City",
-        "WidthRatio": 1.55,
-        "HeightRatio": 0.5,
-        "MarginTopRatio": 0.05
-      },
-      {
-        "Name": "Date",
-        "VerBoundAnnotName": "DateLabel",
-        "WidthRatio": 1.55,
-        "HeightRatio": 0.5,
-        "MarginTopRatio": -0.1
-      }
-    ]
-  }
 }

EnvelopeGenerator.Web/bundleconfig.json

@@ -6,9 +6,15 @@
     ]
   },
   {
-    "outputFileName": "wwwroot/js/api-service.min.js",
+    "outputFileName": "wwwroot/js/lazy.min.js",
     "inputFiles": [
-      "wwwroot/js/api-service.js"
+      "wwwroot/js/lazy.js"
+    ]
+  },
+  {
+    "outputFileName": "wwwroot/js/envelope-api.min.js",
+    "inputFiles": [
+      "wwwroot/js/envelope-api.js"
     ]
   },
   {
@@ -23,12 +29,6 @@
       "wwwroot/js/event-binder.js"
     ]
   },
-  {
-    "outputFileName": "wwwroot/js/network.min.js",
-    "inputFiles": [
-      "wwwroot/js/network.js"
-    ]
-  },
   {
     "outputFileName": "wwwroot/js/ui.min.js",
     "inputFiles": [
@@ -41,6 +41,12 @@
       "wwwroot/js/util.js"
     ]
   },
+  {
+    "outputFileName": "wwwroot/js/markdown.min.js",
+    "inputFiles": [
+      "wwwroot/js/markdown.js"
+    ]
+  },
   {
     "outputFileName": "wwwroot/css/error-space.min.css",
     "inputFiles": [

EnvelopeGenerator.Web/wwwroot/css/google-font.css

@@ -0,0 +1,23 @@
+/* fallback */
+@font-face {
+  font-family: 'Material Symbols Outlined';
+  font-style: normal;
+  font-weight: 400;
+  src: url('/css/fonts/kJF1BvYX7BgnkSrUwT8OhrdQw4oELdPIeeII9v6oDMzByHX9rA6RzaxHMPdY43zj-jCxv3fzvRNU22ZXGJpEpjC_1v-p_4MrImHCIJIZrDCvHOej.woff2') format('woff2');
+}
+
+.material-symbols-outlined {
+  font-family: 'Material Symbols Outlined';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;
+  line-height: 1;
+  letter-spacing: normal;
+  text-transform: none;
+  display: inline-block;
+  white-space: nowrap;
+  word-wrap: normal;
+  direction: ltr;
+  -webkit-font-feature-settings: 'liga';
+  -webkit-font-smoothing: antialiased;
+}

EnvelopeGenerator.Web/wwwroot/js/annotation.js

@@ -1,41 +1,16 @@
-
+function generateId(envelopeId, receiverId, elementId, annotationType) {
-async function createAnnotations(document, instance) {
+    return `${envelopeId}#${receiverId}#${elementId}#${annotationType}`;
+}
+
+async function createAnnotations(document, envelopeId, receiverId) {
     const signatures = [];
 
-    for(var element of document.elements) {
+    for (let element of document.elements) {
         const annotParams = await getAnnotationParams(element.left, element.top);
         const page = element.page - 1
 
-        //background
+        //#region signatures
-        if(annotParams.background){
+        const id = generateId(envelopeId, receiverId, element.id, 'signature');
-            let background = annotParams.background;
-            const id_background = PSPDFKit.generateInstantId();
-            const annotation_background = new PSPDFKit.Annotations.WidgetAnnotation({
-                id: id_background,
-                pageIndex: page,
-                formFieldName: id_background,
-                backgroundColor: background?.backgroundColor ? new PSPDFKit.Color(background.backgroundColor) : null,
-                blendMode: 'normal',
-                boundingBox: new PSPDFKit.Geometry.Rect(background),
-                fontSize: 8,
-                borderStyle: background.borderStyle,
-                borderWidth: background.borderWidth,
-                borderColor: background?.borderColor ? new PSPDFKit.Color(background.borderColor) : null
-            });
-    
-            const formFieldBackground = new PSPDFKit.FormFields.ButtonFormField({
-                name: id_background,
-                annotationIds: PSPDFKit.Immutable.List([annotation_background.id]),
-                value: "",
-                readOnly: false
-            });
-
-            signatures.push(annotation_background)
-            signatures.push(formFieldBackground)
-        }
-
-        //signatures
-        const id = PSPDFKit.generateInstantId()
         const annotation = new PSPDFKit.Annotations.WidgetAnnotation({
             id: id,
             pageIndex: page,
@@ -49,9 +24,10 @@ async function createAnnotations(document, instance) {
             name: id,
             annotationIds: PSPDFKit.Immutable.List([annotation.id]),
         })
+        //#endregion
 
-        //position
+        //#region position
-        const id_position = PSPDFKit.generateInstantId()
+        const id_position = generateId(envelopeId, receiverId, element.id, 'position');
         const annotation_position = new PSPDFKit.Annotations.WidgetAnnotation({
             id: id_position,
             pageIndex: page,
@@ -68,9 +44,10 @@ async function createAnnotations(document, instance) {
             value: "",
             readOnly: false
         })
+        //#endregion
 
-        //city
+        //#region city
-        const id_city = PSPDFKit.generateInstantId()
+        const id_city = generateId(envelopeId, receiverId, element.id, 'city');
         const annotation_city = new PSPDFKit.Annotations.WidgetAnnotation({
             id: id_city,
             pageIndex: page,
@@ -87,9 +64,10 @@ async function createAnnotations(document, instance) {
             value: "",
             readOnly: false
         })
+        //#endregion
 
-        //date
+        //#region date
-        const id_date = PSPDFKit.generateInstantId()
+        const id_date = generateId(envelopeId, receiverId, element.id, 'date');
         const annotation_date = new PSPDFKit.Annotations.WidgetAnnotation({
             id: id_date,
             pageIndex: page,
@@ -110,17 +88,14 @@ async function createAnnotations(document, instance) {
             value: detailedCurrentDate(),
             readOnly: true
         })
+        //#endregion
 
         this.markFieldAsRequired(formFieldCity);
 
         this.markFieldAsCity(formFieldCity);
 
-        /**
+        //#region date label
-         * Date, post code and place label part
+        const id_date_label = generateId(envelopeId, receiverId, element.id, 'date_label');
-         */
-
-        //date label
-        const id_date_label = PSPDFKit.generateInstantId()
         const annotation_date_label = new PSPDFKit.Annotations.WidgetAnnotation({
             id: id_date_label,
             pageIndex: page,
@@ -140,9 +115,10 @@ async function createAnnotations(document, instance) {
             value: "Date",
             readOnly: true
         })
+        //#endregion
 
-        //city label
+        //#region city label
-        const id_city_label = PSPDFKit.generateInstantId()
+        const id_city_label = generateId(envelopeId, receiverId, element.id, 'city_label');
         const annotation_city_label = new PSPDFKit.Annotations.WidgetAnnotation({
             id: id_city_label,
             pageIndex: page,
@@ -162,9 +138,10 @@ async function createAnnotations(document, instance) {
             readOnly: true,
             color: PSPDFKit.Color.BLACK
         })
+        //#endregion
 
-        //position label
+        //#region position label
-        const id_position_label = PSPDFKit.generateInstantId()
+        const id_position_label = generateId(envelopeId, receiverId, element.id, 'position_label');
         const annotation_position_label = new PSPDFKit.Annotations.WidgetAnnotation({
             id: id_position_label,
             pageIndex: page,
@@ -183,6 +160,7 @@ async function createAnnotations(document, instance) {
             value: "Position",
             readOnly: true
         })
+        //#endregion
 
         signatures.push(annotation)
         signatures.push(formField)
@@ -203,7 +181,7 @@ async function createAnnotations(document, instance) {
         signatures.push(formFieldPositionLabel)
     }
 
-    await instance.create(signatures);
+    return signatures;
 }
 
 async function getAnnotations(instance) {
@@ -239,8 +217,9 @@ function isSignature(annotation) {
     return !!annotation.isSignature || annotation.description == 'FRAME'
 }
 
-function createImageAnnotation(boundingBox, pageIndex, imageAttachmentId) {
+function createImageAnnotation(boundingBox, pageIndex, imageAttachmentId, id) {
     const frameAnnotation = new PSPDFKit.Annotations.ImageAnnotation({
+        id: id,
         pageIndex: pageIndex,
         isSignature: false,
         readOnly: true,
@@ -329,3 +308,80 @@ function markFieldAsCity(formField) {
 function isCityField(formField) {
     return cityFieldNames.includes(formField.name)
 }
+
+function fixBase64(escapedBase64) {
+    return escapedBase64
+        .replace(/\\u002B/g, "+")
+        .replace(/\\u002F/g, "/")
+        .replace(/\\u003D/g, "=");
+}
+
+function mapSignature(iJSON) {
+    return [
+        // formFields
+        ...iJSON.formFieldValues.filter(field => !field.name.includes("label")).map((field) => {
+            const nameParts = field.name.split('#');
+            const [x, y, width, height] = iJSON.annotations.find(iAnnot => iAnnot.id === field.name).bbox;
+            return {
+                elementId: Number(nameParts[2]),
+                name: nameParts[3],
+                value: field.value,
+                type: field.type,
+                x: x,
+                y: y,
+                width: width,
+                height: height
+            };
+        }),
+
+        // frames
+        ...iJSON.annotations.filter(annot => annot.description === 'FRAME').map((annot) => {
+            const preElement = findNearest(annot, e => e.bbox[0], e => e.bbox[1], iJSON.annotations.filter(
+                field => field.id.includes("signature") && field.pageIndex === annot.pageIndex
+            ));
+            const idPartsOfPre = preElement.id.split('#');
+            const [x, y, width, height] = annot.bbox;
+            return {
+                elementId: Number(idPartsOfPre[2]),
+                name: 'frame',
+                value: fixBase64(iJSON.attachments[annot.imageAttachmentId]?.binary),
+                type: annot.type,
+                x: x,
+                y: y,
+                width: width,
+                height: height
+            };
+        }),
+
+        // signatures
+        ...iJSON.annotations.filter(annot => annot.isSignature).map(annot => {
+            const preElement = findNearest(annot, e => e.bbox[0], e => e.bbox[1], iJSON.annotations.filter(
+                field => field.id.includes("signature") && field.pageIndex === annot.pageIndex
+            ));
+            const idPartsOfPre = preElement.id.split('#');
+
+            let value;
+            if (annot.imageAttachmentId)
+                value = iJSON.attachments[annot.imageAttachmentId]?.binary;
+            else if (annot.lines && annot.strokeColor)
+                value = JSON.stringify({
+                    lines: annot.lines,
+                    strokeColor: annot.strokeColor
+                });
+            else
+                throw new Error("Signature mapping failed: The data structure from the third-party library is incompatible or missing required fields.");
+
+            const [x, y, width, height] = annot.bbox;
+            return {
+                elementId: Number(idPartsOfPre[2]),
+                name: 'signature',
+                value,
+                type: annot.type,
+                x: x,
+                y: y,
+                width: width,
+                height: height
+            };
+        })
+    ];
+}