chore(Web): bump to 3.8.2

Added automatic injection of the envKey query parameter into all request URLs within sendRequest.
Updated URL handling to use the URL API, ensuring consistent parameter merging and preventing missing envKey issues.

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/Extensions/JsonExtensions.cs

@@ -0,0 +1,18 @@
+using System.Text.Json;
+
+namespace EnvelopeGenerator.Application.Common.Extensions;
+
+/// <summary>
+/// 
+/// </summary>
+public static class JsonExtensions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    public static string ToJson(this object obj, JsonSerializerOptions? options = null)
+        => JsonSerializer.Serialize(obj, options);
+}

EnvelopeGenerator.Application/Common/Extensions/StringExtension.cs

@@ -1,14 +1,30 @@
 using OtpNet;
 
-namespace EnvelopeGenerator.Application.Common.Extensions
+namespace EnvelopeGenerator.Application.Common.Extensions;
+
+/// <summary>
+/// 
+/// </summary>
+public static class StringExtension
 {
-    public static class StringExtension
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="totp"></param>
+    /// <param name="secret"></param>
+    /// <returns></returns>
+    public static bool IsValidTotp(this string totp, string secret)
     {
-        public static bool IsValidTotp(this string totp, string secret)
-        {
-            var secret_bytes = Base32Encoding.ToBytes(secret);
-            var secret_totp = new Totp(secret_bytes);
-            return secret_totp.VerifyTotp(totp, out _, VerificationWindow.RfcSpecifiedNetworkDelay);
-        }
+        var secret_bytes = Base32Encoding.ToBytes(secret);
+        var secret_totp = new Totp(secret_bytes);
+        return secret_totp.VerifyTotp(totp, out _, VerificationWindow.RfcSpecifiedNetworkDelay);
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="seperator"></param>
+    /// <param name="values"></param>
+    /// <returns></returns>
+    public static string Join(this IEnumerable<string> values, string seperator) => string.Join(seperator, values);
 }

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

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

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

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 /// <summary>
 /// 
 /// </summary>

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

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

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

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

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

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

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

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

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

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

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

@@ -3,7 +3,7 @@ using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

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

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

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

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

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

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IDocumentExecutor.cs

@@ -1,6 +1,6 @@
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IEnvelopeExecutor.cs

@@ -1,7 +1,7 @@
 using Dapper;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IEnvelopeReceiverExecutor.cs

@@ -1,6 +1,6 @@
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IQuery.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// Provides methods for executing common queries on a given entity type.

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQL.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// Represents a raw SQL query contract.

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQLExecutor.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// Defines methods for executing raw SQL queries or custom SQL query classes and returning query executors for further operations.

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQLExecutorBaseEntity.cs

@@ -1,6 +1,6 @@
 using Dapper;
 
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// 

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

@@ -1,6 +1,6 @@
 using OtpNet;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

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

@@ -3,7 +3,7 @@ using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

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

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

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

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application;
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

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

@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

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

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

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

@@ -5,7 +5,7 @@ using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

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

@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

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

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

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

@@ -10,7 +10,7 @@ using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

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

@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

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

@@ -1,7 +1,7 @@
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

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

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

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

@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Application.Receivers.Commands;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

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

@@ -1,6 +1,6 @@
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 //TODO: move to DigitalData.Core
 /// <summary>

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

@@ -1,11 +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>
@@ -15,7 +24,7 @@ public record DocSignedNotification(EnvelopeReceiverDto Original) : EnvelopeRece
     /// <summary>
     /// 
     /// </summary>
-    public required ExpandoObject Annotations { get; init; }
+    public PsPdfKitAnnotation PsPdfKitAnnotation { get; init; } = null!;
 
     /// <summary>
     /// 
@@ -27,7 +36,7 @@ public record DocSignedNotification(EnvelopeReceiverDto Original) : EnvelopeRece
     /// </summary>
     public string EmailAddress => Receiver?.EmailAddress
         ?? throw new InvalidOperationException($"Receiver is null." +
-            $"DocSignedNotification:\n{JsonConvert.SerializeObject(this, Format.Json.ForDiagnostics)}");
+            $"DocSignedNotification:\n{this.ToJson(Format.Json.ForDiagnostics)}");
 }
 
 /// <summary>
@@ -39,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)
-        => new(dto) { Annotations = annotations };
+    public static DocSignedNotification ToDocSignedNotification(this EnvelopeReceiverDto dto, PsPdfKitAnnotation psPdfKitAnnotation)
+        => 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="annotations"></param>
-    /// <returns>A task that represents the asynchronous conversion operation.</returns>
-    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, ExpandoObject annotations)
-        => await dtoTask is EnvelopeReceiverDto dto ? new(dto) { Annotations = annotations } : null;
+    /// <param name="dtoTask"></param>
+    /// <param name="psPdfKitAnnotation"></param>
+    /// <returns></returns>
+    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, PsPdfKitAnnotation psPdfKitAnnotation)
+        => await dtoTask is EnvelopeReceiverDto dto ? new(dto) { PsPdfKitAnnotation = psPdfKitAnnotation } : null;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="publisher"></param>
+    /// <param name="notification"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public static async Task PublishSafely(this IPublisher publisher, DocSignedNotification notification, CancellationToken cancel = default)
+    {
+        try
+        {
+            await publisher.Publish(notification, cancel);
+        }
+        catch (Exception)
+        {
+            await publisher.Publish(new RemoveSignatureNotification()
+            {
+                EnvelopeId = notification.EnvelopeId,
+                ReceiverId = notification.ReceiverId
+            }, cancel);
+            throw;
+        }
+    }
 }

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

@@ -1,8 +1,6 @@
-using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
-using EnvelopeGenerator.Application.DocStatus.Commands;
-using EnvelopeGenerator.Domain.Constants;
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Entities;
 using MediatR;
-using Newtonsoft.Json;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 
@@ -11,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>
-    public AnnotationHandler(ISender sender)
+    /// <param name="repository"></param>
+    public AnnotationHandler(IRepository<ElementAnnotation> repository)
     {
-        _sender = sender;
+        _repo = repository;
     }
 
     /// <summary>
@@ -28,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)
-    {
-        await _sender.Send(new SaveDocStatusCommand()
-        {
-            Envelope = new() { Id = notification.EnvelopeId },
-            Receiver = new() { Id = notification.ReceiverId},
-            Value = JsonConvert.SerializeObject(notification.Annotations, Format.Json.ForAnnotations)
-        }, cancel);
-    }
+    public Task Handle(DocSignedNotification notification, CancellationToken cancel)
+        => _repo.CreateAsync(notification.PsPdfKitAnnotation.Structured, 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

@@ -1,8 +1,7 @@
-using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
+using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
-using Newtonsoft.Json;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 
@@ -30,16 +29,14 @@ public class HistoryHandler : INotificationHandler<DocSignedNotification>
     /// <returns></returns>
     public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
     {
-        if(notification.Receiver is null)
-            if (notification.Receiver is null)
-                throw new InvalidOperationException($"Receiver information is missing in the notification. DocSignedNotification:\n {JsonConvert.SerializeObject(notification, Format.Json.ForDiagnostics)}");
+        if (notification.Receiver is null)
+            throw new InvalidOperationException($"Receiver information is missing in the notification. DocSignedNotification:\n {notification.ToJson(Format.Json.ForDiagnostics)}");
 
         await _sender.Send(new CreateHistoryCommand()
         {
             EnvelopeId = notification.EnvelopeId,
             UserReference = notification.Receiver.EmailAddress,
             Status = EnvelopeStatus.DocumentSigned,
-            Comment = JsonConvert.SerializeObject(notification.Annotations, Format.Json.ForAnnotations)
         }, cancel);
     }
 }

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/Common/Notifications/SendMailHandler.cs

@@ -1,6 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
 using EnvelopeGenerator.Application.Common.Configurations;
+using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
@@ -98,10 +99,10 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
         var placeHolders = CreatePlaceHolders(notification);
 
         var temp = await TempRepo
-            .ReadOnly()
-            .SingleOrDefaultAsync(x => x.Name == notification.TemplateType.ToString(), cancel)
+            .Where(x => x.Name == notification.TemplateType.ToString())
+            .SingleOrDefaultAsync(cancel)
                 ?? throw new InvalidOperationException($"Receiver information is missing in the notification." +
-                $"{typeof(TNotification)}:\n {JsonConvert.SerializeObject(notification, Format.Json.ForDiagnostics)}");
+                $"{typeof(TNotification)}:\n {notification.ToJson(Format.Json.ForDiagnostics)}");
 
         temp.Subject = ReplacePlaceHolders(temp.Subject, placeHolders, MailParams.Placeholders);
 
@@ -110,7 +111,7 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
         var emailOut = new EmailOut
         {
             EmailAddress = notification.EmailAddress,
-            EmailBody = TextToHtml(temp.Body),
+            EmailBody = temp.Body,
             EmailSubj = temp.Subject,
             AddedWhen = DateTime.UtcNow,
             AddedWho = DispatcherParams.AddedWho,
@@ -131,22 +132,4 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
                 text = text.Replace(ph.Key, ph.Value);
         return text;
     }
-
-    private static string TextToHtml(string input)
-    {
-        if (string.IsNullOrEmpty(input)) return "";
-
-        // HTML encoding special characters
-        string encoded = System.Net.WebUtility.HtmlEncode(input);
-
-        // Convert tabs to &nbsp; (4 non-breaking spaces)
-        encoded = encoded.Replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;");
-
-        // Convert line breaks to <br />
-        encoded = encoded.Replace("\r\n", "<br />"); // Windows
-        encoded = encoded.Replace("\r", "<br />");   // Mac old
-        encoded = encoded.Replace("\n", "<br />");   // Unix/Linux
-
-        return encoded;
-    }
 }

EnvelopeGenerator.Application/Common/Query/ReceiverQueryBase.cs

@@ -20,4 +20,14 @@ public record ReceiverQueryBase
     /// Eindeutige Signatur des Empfängers
     /// </summary>
     public virtual string? Signature { get; set; }
+
+    /// <summary>
+    /// Checks whether any of the specified query criteria have a value.
+    /// </summary>
+    /// <remarks>
+    /// This property returns <c>true</c> if at least one of the fields 
+    /// <see cref="Id"/>, <see cref="EmailAddress"/>, or <see cref="Signature"/> is not null.
+    /// <para>Usage example: The query can be executed only if at least one criterion is specified.</para>
+    /// </remarks>
+    public bool HasAnyCriteria => Id is not null || EmailAddress is not null || Signature is not null;
 }

EnvelopeGenerator.Application/Common/SQL/DocumentCreateReadSQL.cs

@@ -1,7 +1,7 @@
 using Dapper;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 namespace EnvelopeGenerator.Application.Common.SQL;
 

EnvelopeGenerator.Application/Common/SQL/EnvelopeCreateReadSQL.cs

@@ -1,5 +1,5 @@
 using Dapper;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Domain.Entities;
 using System.Data;
 

EnvelopeGenerator.Application/Common/SQL/EnvelopeReceiverAddReadSQL.cs

@@ -1,5 +1,5 @@
 using Dapper;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Common.SQL;

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Client;
 using EnvelopeGenerator.Application.Common.Configurations;
-using EnvelopeGenerator.Application.Interfaces.Services;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using EnvelopeGenerator.Application.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -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/EmailTemplates/Queries/Read/ReadEmailTemplateQueryHandler.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 

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.2.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/EnvelopeReceivers/Commands/CreateEnvelopeReceiverCommandHandler.cs

@@ -1,8 +1,8 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
 

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs

@@ -91,6 +91,8 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
 {
     private readonly IRepository<EnvelopeReceiver> _repo;
 
+    private readonly IRepository<Receiver> _rcvRepo;
+
     private readonly IMapper _mapper;
 
     /// <summary>
@@ -98,10 +100,11 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
     /// </summary>
     /// <param name="envelopeReceiver"></param>
     /// <param name="mapper"></param>
-    public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IMapper mapper)
+    public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IRepository<Receiver> rcvRepo, IMapper mapper)
     {
         _repo = envelopeReceiver;
         _mapper = mapper;
+        _rcvRepo = rcvRepo;
     }
 
     /// <summary>
@@ -138,6 +141,14 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
                         .Include(er => er.Receiver)
                         .ToListAsync(cancel);
 
+        if (request.Receiver.HasAnyCriteria && envRcvs.Any())
+        {
+            var receiver = await _rcvRepo.ReadOnly().Where(request.Receiver).FirstAsync(cancel);
+
+            foreach (var envRcv in envRcvs)
+                envRcv.Envelope?.Documents?.First().Elements.RemoveAll(s => s.ReceiverId != receiver.Id);
+        }
+
         return _mapper.Map<List<EnvelopeReceiverDto>>(envRcvs);
     }
 } 

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using MediatR;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs

@@ -1,10 +1,10 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using MediatR;
 using Microsoft.Extensions.DependencyInjection;
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 namespace EnvelopeGenerator.Application.Envelopes.Commands;
 

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 EnvelopeGenerator.Domain.Constants;
+using AutoMapper;
+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.Application/Services/Authenticator.cs

@@ -1,5 +1,5 @@
 using EnvelopeGenerator.Application.Common.Configurations;
-using EnvelopeGenerator.Application.Interfaces.Services;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using Microsoft.Extensions.Options;
 using OtpNet;
 using QRCoder;

EnvelopeGenerator.Application/Services/ConfigService.cs

@@ -1,12 +1,12 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/DocumentStatusService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EmailTemplateService.cs

@@ -1,12 +1,12 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using DigitalData.Core.Abstraction.Application.DTO;
 using Microsoft.Extensions.Logging;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeDocumentService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs

@@ -1,12 +1,12 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Dto.History;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -5,13 +5,13 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.Services;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeReceiverReadOnlyService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs

@@ -3,17 +3,17 @@ using DigitalData.Core.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Application.Receivers.Queries;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
 using EnvelopeGenerator.Application.Common;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeService.cs

@@ -1,11 +1,11 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeSmsHandler.cs

@@ -1,10 +1,10 @@
-using EnvelopeGenerator.Application.Interfaces.Services;
-using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Options;
 using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
 using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs

@@ -1,12 +1,12 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/GTXSmsSender.cs

@@ -1,10 +1,10 @@
 using AutoMapper;
 using DigitalData.Core.Client.Interface;
 using DigitalData.Core.Client;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using Microsoft.Extensions.Options;
 using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/ReceiverService.cs

@@ -1,11 +1,11 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Receivers.Commands;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj

@@ -1,5 +1,5 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\packages\EntityFramework.6.5.1\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -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>
@@ -92,13 +101,13 @@
       <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.Firebird, Version=6.4.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="EnvelopeGenerator.CommonServices">
       <HintPath>..\EnvelopeGenerator.CommonServices\bin\Debug\EnvelopeGenerator.CommonServices.dll</HintPath>
@@ -176,11 +185,83 @@
     <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.Identity.Client, Version=4.55.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
+    <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.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
+    <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>
@@ -216,16 +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=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.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>
@@ -249,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>
@@ -358,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" />
@@ -386,10 +502,12 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
-    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\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.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+  <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 System.IO
-Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument
+Imports EnvelopeGenerator.Infrastructure
+Imports Microsoft.EntityFrameworkCore
+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 oNewBuffer = PDFBurner.BurnInstantJSONAnnotationsToPDF(oBuffer, oJsonList)
+            Dim envelopeId As Integer = CInt(txtEnvelope.Text)
+            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
@@ -104,7 +142,7 @@ Public Class frmFinalizePDF
 
 
         Catch ex As Exception
-
+            MsgBox(ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
 End Class

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" />
@@ -10,7 +13,7 @@
   <package id="DigitalData.Modules.Messaging" version="1.9.8" targetFramework="net462" />
   <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
   <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
-  <package id="EntityFramework" version="6.4.4" targetFramework="net462" />
+  <package id="EntityFramework" version="6.5.1" targetFramework="net462" />
   <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" />
   <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net462" />
   <package id="GdPicture" version="14.3.3" targetFramework="net462" />
@@ -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.Identity.Client" version="4.55.0" targetFramework="net462" />
-  <package id="Microsoft.IdentityModel.Abstractions" version="6.22.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">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    <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=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()
@@ -217,7 +245,7 @@ Namespace Jobs
                 If Not IsNothing(imageData) Then
                     sFileName = System.IO.Path.GetFileName(pFilePath)
                     'Set insert query 
-                    qry = $"UPDATE TBSIG_ENVELOPE SET DocResult = @ImageData WHERE GUID = {pEnvelopeID}"
+                    qry = $"UPDATE TBSIG_ENVELOPE SET DOC_RESULT = @ImageData WHERE GUID = {pEnvelopeID}"
                     'Initialize SqlCommand object for insert. 
                     SqlCom = New SqlCommand(qry, Database.GetConnection)
                     'We are passing File Name and Image byte data as sql parameters. 
@@ -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")
-                    End If
+                        Throw New BurnAnnotationException($"Adding Annotation failed", ex)
+                    End Try
                 Next
                 oResult = Manager.BurnAnnotationsToPage(RemoveInitialAnnots:=True, VectorMode:=True)
                 If oResult <> GdPictureStatus.OK Then
@@ -64,124 +157,125 @@ Namespace Jobs.FinalizeDocument
                 End Using
             End Using
         End Function
+#End Region
 
-        Private Function AddInstantJSONAnnotationToPDF(pInstantJSON As String) As Boolean
-            Try
-                Dim oAnnotationData = JsonConvert.DeserializeObject(Of AnnotationData)(pInstantJSON)
-                oAnnotationData.annotations.Reverse()
+#Region "Add Value"
+        Private Sub AddInstantJSONAnnotationToPDF(pInstantJSON As String)
+            Dim oAnnotationData = JsonConvert.DeserializeObject(Of AnnotationData)(pInstantJSON)
 
-                Dim sigAnnotType = oAnnotationData.annotations.ElementAt(1).type
-                Dim isSeal = True   'First element is signature seal
+            oAnnotationData.annotations.Reverse()
 
-                Dim formFieldIndex = 0
-                For Each oAnnotation In oAnnotationData.annotations
-                    Logger.Debug("Adding AnnotationID: " + oAnnotation.id)
+            For Each oAnnotation In oAnnotationData.annotations
+                Logger.Debug("Adding AnnotationID: " + oAnnotation.id)
 
-                    Select Case oAnnotation.type
-                        Case ANNOTATION_TYPE_IMAGE
-                            'Add offset to solve the seal position problem in ink signatures
-                            Dim yOffset As Double = If(isSeal And sigAnnotType = ANNOTATION_TYPE_INK, 0.16, 0)
-                            AddImageAnnotation(oAnnotation, oAnnotationData.attachments, yOffset)
+                Select Case oAnnotation.type
+                    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
 
-                        Case ANNOTATION_TYPE_INK
-                            AddInkAnnotation(oAnnotation)
+        End Sub
 
-                        Case ANNOTATION_TYPE_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, formFieldIndex)
-                                formFieldIndex += 1
-                            End If
-                    End Select
+        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
 
-                    isSeal = False
-                Next
+        Private Sub AddImageAnnotation(pAnnotation As Annotation, pAttachments As Dictionary(Of String, Attachment))
+            Dim oAttachment = pAttachments.Where(Function(a) a.Key = pAnnotation.imageAttachmentId).
+                    SingleOrDefault()
 
-                Return True
-            Catch ex As Exception
-                Logger.Warn("Could not create annotation from InstantJSON")
-                Logger.Error(ex)
-                Return False
-            End Try
-        End Function
+            ' Convert pixels to Inches
+            Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
 
-        Private Function AddImageAnnotation(pAnnotation As Annotation, pAttachments As Dictionary(Of String, Attachment), Optional yOffset As Double = 0) As Boolean
-            Try
-                Dim oAttachment = pAttachments.Where(Function(a) a.Key = pAnnotation.imageAttachmentId).
-                        SingleOrDefault()
+            Dim oX = oBounds.Item(0)
+            Dim oY = oBounds.Item(1)
+            Dim oWidth = oBounds.Item(2)
+            Dim oHeight = oBounds.Item(3)
 
-                ' Convert pixels to Inches
-                Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
+            Manager.SelectPage(pAnnotation.pageIndex + 1)
+            Manager.AddEmbeddedImageAnnotFromBase64(oAttachment.Value.binary, oX, oY, oWidth, oHeight)
+        End Sub
 
-                Dim oX = oBounds.Item(0)
-                Dim oY = oBounds.Item(1) + yOffset
-                Dim oWidth = oBounds.Item(2)
-                Dim oHeight = oBounds.Item(3)
+        Private Sub AddInkAnnotation(page As Integer, value As String)
 
-                Manager.SelectPage(pAnnotation.pageIndex + 1)
-                Manager.AddEmbeddedImageAnnotFromBase64(oAttachment.Value.binary, oX, oY, oWidth, oHeight)
+            Dim ink = JsonConvert.DeserializeObject(Of Ink)(value)
 
-                Return True
-            Catch ex As Exception
-                Logger.Warn("Could not add image annotation!")
-                Logger.Error(ex)
+            Dim oSegments = ink.lines.points
+            Dim oColor = ColorTranslator.FromHtml(ink.strokeColor)
+            Manager.SelectPage(page)
 
-                Return False
-            End Try
-        End Function
+            For Each oSegment As List(Of List(Of Single)) In oSegments
+                Dim oPoints = oSegment.
+                Select(AddressOf ToPointF).
+                ToArray()
 
-        Private Function AddInkAnnotation(pAnnotation As Annotation) As Boolean
-            Try
-                Dim oSegments = pAnnotation.lines.points
-                Dim oColor = ColorTranslator.FromHtml(pAnnotation.strokeColor)
-                Manager.SelectPage(pAnnotation.pageIndex + 1)
+                Manager.AddFreeHandAnnot(oColor, oPoints)
+            Next
+        End Sub
 
-                For Each oSegment As List(Of List(Of Single)) In oSegments
-                    Dim oPoints = oSegment.
-                    Select(AddressOf ToPointF).
-                    ToArray()
+        Private Sub AddInkAnnotation(pAnnotation As Annotation)
+            Dim oSegments = pAnnotation.lines.points
+            Dim oColor = ColorTranslator.FromHtml(pAnnotation.strokeColor)
+            Manager.SelectPage(pAnnotation.pageIndex + 1)
 
-                    Manager.AddFreeHandAnnot(oColor, oPoints)
-                Next
+            For Each oSegment As List(Of List(Of Single)) In oSegments
+                Dim oPoints = oSegment.
+                Select(AddressOf ToPointF).
+                ToArray()
 
-                Return True
-            Catch ex As Exception
-                Logger.Warn("Could not add image annotation!")
-                Logger.Error(ex)
+                Manager.AddFreeHandAnnot(oColor, oPoints)
+            Next
+        End Sub
 
-                Return False
-            End Try
+        Private Sub AddFormFieldValue(x As Double, y As Double, width As Double, height As Double, page As Integer, value As String)
+            Manager.SelectPage(page)
 
-        End Function
+            ' Add the text annotation
+            Dim ant = Manager.AddTextAnnot(x, y, width, height, value)
 
-        Private Function AddFormFieldValue(pAnnotation As Annotation, formFieldValue As FormFieldValue, index As Integer) As Boolean
-            Try
-                ' Convert pixels to Inches
-                Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
+            ' Set the font properties
+            ant.FontName = _pdfBurnerParams.FontName
+            ant.FontSize = _pdfBurnerParams.FontSize
+            ant.FontStyle = _pdfBurnerParams.FontStyle
+            Manager.SaveAnnotationsToPage()
+        End Sub
 
-                Dim oX = oBounds.Item(0)
-                Dim oY = oBounds.Item(1) + _pdfBurnerParams.YOffset * index + _pdfBurnerParams.TopMargin
-                Dim oWidth = oBounds.Item(2)
-                Dim oHeight = oBounds.Item(3)
+        Private Sub AddFormFieldValue(pAnnotation As Annotation, formFieldValue As FormFieldValue)
+            Dim ffIndex As Integer = EGName.Index(pAnnotation.egName)
 
-                Manager.SelectPage(pAnnotation.pageIndex + 1)
-                ' Add the text annotation
-                Dim ant = Manager.AddTextAnnot(oX, oY, oWidth, oHeight, formFieldValue.value)
+            ' Convert pixels to Inches
+            Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
 
-                ' Set the font properties
-                ant.FontName = _pdfBurnerParams.FontName
-                ant.FontSize = _pdfBurnerParams.FontSize
-                ant.FontStyle = _pdfBurnerParams.FontStyle
-                Manager.SaveAnnotationsToPage()
-                Return True
-            Catch ex As Exception
-                Logger.Warn("Could not add image annotation!")
-                Logger.Error(ex)
-                Return False
-            End Try
-        End Function
+            Dim oX = oBounds.Item(0)
+            Dim oY = oBounds.Item(1) + _pdfBurnerParams.YOffset * ffIndex + _pdfBurnerParams.TopMargin
+            Dim oWidth = oBounds.Item(2)
+            Dim oHeight = oBounds.Item(3)
 
+            Manager.SelectPage(pAnnotation.pageIndex + 1)
+            ' Add the text annotation
+            Dim ant = Manager.AddTextAnnot(oX, oY, oWidth, oHeight, formFieldValue.value)
+
+            ' Set the font properties
+            ant.FontName = _pdfBurnerParams.FontName
+            ant.FontSize = _pdfBurnerParams.FontSize
+            ant.FontStyle = _pdfBurnerParams.FontStyle
+            Manager.SaveAnnotationsToPage()
+        End Sub
+#End Region
+
+#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))
@@ -194,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
@@ -225,5 +433,6 @@ Namespace Jobs.FinalizeDocument
             Public Property name As String
             Public Property value As String
         End Class
+#End Region
     End Class
-End Namespace
+End Namespace

EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb

@@ -61,7 +61,15 @@ Public Class EnvelopeModel
             oEnvelope.DocResult = Nothing
         End If
         oEnvelope.User = UserModel.SelectUser(oEnvelope.UserId)
-        oEnvelope.EnvelopeReceivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id)
+
+
+        oEnvelope.EnvelopeReceivers = New List(Of EnvelopeReceiver)
+
+        For Each rcv In ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id)
+            oEnvelope.EnvelopeReceivers.Add(rcv)
+        Next
+
+
         oEnvelope.Documents = DocumentModel.List(oEnvelope.Id)
         oEnvelope.Histories = HistoryModel.List(oEnvelope.Id)
         oEnvelope.Type = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId)
@@ -185,7 +193,7 @@ Public Class EnvelopeModel
             oSql += " [SEND_REMINDER_EMAILS] = @SEND_REMINDER_EMAILS, "
             oSql += " [USE_ACCESS_CODE] = @USE_ACCESS_CODE, "
             oSql += " [CHANGED_WHEN] = GETDATE(), "
-            oSql += " [TfaEnabled] = @TfaEnabled"
+            oSql += " [TFA_ENABLED] = @TfaEnabled"
             oSql += " WHERE GUID = @ID AND USER_ID = @USER_ID"
 
 
@@ -210,7 +218,7 @@ Public Class EnvelopeModel
             oCommand.Parameters.Add("REMINDER_INTERVAL_DAYS", SqlDbType.Int).Value = pEnvelope.ReminderIntervalDays
             oCommand.Parameters.Add("SEND_REMINDER_EMAILS", SqlDbType.Bit).Value = pEnvelope.SendReminderEmails
             oCommand.Parameters.Add("USE_ACCESS_CODE", SqlDbType.Bit).Value = pEnvelope.UseAccessCode
-            oCommand.Parameters.Add("TFA_ENABLED", SqlDbType.Bit).Value = pEnvelope.TfaEnabled
+            oCommand.Parameters.Add("TfaEnabled", SqlDbType.Bit).Value = pEnvelope.TfaEnabled
             Return Database.ExecuteNonQuery(oCommand, pTransaction)
 
         Catch ex As Exception

EnvelopeGenerator.CommonServices/Models/ReceiverModel.vb

@@ -23,6 +23,7 @@ Public Class ReceiverModel
             End If
         End If
 
+
         Return New ReceiverVM() With {
             .Id = pRow.ItemEx("GUID", 0),
             .EmailAddress = pRow.ItemEx("EMAIL_ADDRESS", ""),
@@ -162,15 +163,25 @@ Public Class ReceiverModel
             If pReceiversFromGrid.Count = 0 Then
                 Return New List(Of Receiver)
             End If
-
+            Dim oReceiverList As New List(Of ReceiverVM)
             Dim oAddresses = pReceiversFromGrid.Select(Function(r) $"'{r.EmailAddress}'").JoinToString(",")
 
             Dim oSql = $"SELECT * FROM [dbo].[TBSIG_RECEIVER] WHERE EMAIL_ADDRESS IN ({oAddresses})"
             Dim oTable = Database.GetDatatable(oSql)
+            'Dim oIndex = 0
+            'For Each oRow As DataRow In oTable.Rows
+            '    '  oEnvelope.EnvelopeReceivers.Add(rcv)
+            '    Dim oReceiver As ReceiverVM = ToReceiver(oRow)
+            '    oReceiverList.Add(oReceiver)
+            '    oIndex += 
+            'Next
 
-            Return oTable?.Rows.Cast(Of DataRow).
-                Select(AddressOf ToReceiver).
-                ToList()
+            Dim rcvs = New List(Of Receiver)
+            For Each r_vm In pReceiversFromGrid
+                rcvs.Add(r_vm.Receiver)
+            Next
+
+            Return rcvs
 
         Catch ex As Exception
             Logger.Error(ex)

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

@@ -1,5 +1,7 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
+#if NET
+using System.Text.Json;
+using System.Text.Json.Serialization;
+#endif
 
 namespace EnvelopeGenerator.Domain.Constants
 {
@@ -8,18 +10,21 @@ namespace EnvelopeGenerator.Domain.Constants
         #region Json Serializer Settings
         public static class Json
         {
-            public static readonly JsonSerializerSettings ForDiagnostics = new JsonSerializerSettings()
+#if NET
+            public static readonly JsonSerializerOptions ForDiagnostics = new()
             {
-                ContractResolver = new CamelCasePropertyNamesContractResolver(),
-                Formatting = Formatting.Indented,
-                NullValueHandling = NullValueHandling.Include
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                WriteIndented = true,
+                DefaultIgnoreCondition = JsonIgnoreCondition.Never
             };
-            public static readonly JsonSerializerSettings ForAnnotations = new JsonSerializerSettings()
+
+            public static readonly JsonSerializerOptions ForAnnotations = new()
             {
-                ContractResolver = new CamelCasePropertyNamesContractResolver(),
-                Formatting = Formatting.None,                
-                NullValueHandling = NullValueHandling.Ignore
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                WriteIndented = false,
+                DefaultIgnoreCondition = JsonIgnoreCondition.Never,
             };
+#endif
         }
         #endregion
     }

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
-    [NotMapped]
+    [Column("FILEPATH", TypeName = "nvarchar(256)")]
     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/EmailTemplate.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using DigitalData.Core.Abstractions.Interfaces;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 #if NETFRAMEWORK
@@ -13,7 +14,7 @@ namespace EnvelopeGenerator.Domain.Entities
 #endif
 
 [Table("TBSIG_EMAIL_TEMPLATE", Schema = "dbo")]
-public class EmailTemplate
+public class EmailTemplate : IEntity
 {
     [Key]
     [DatabaseGenerated(DatabaseGeneratedOption.Identity)]

EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.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_ENVELOPE_RECEIVER", Schema = "dbo")]
-public class EnvelopeReceiver : IHasEnvelope, IHasReceiver
+public class EnvelopeReceiver : IHasEnvelope, IHasReceiver, IEntity
 {
     public EnvelopeReceiver()
     {

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,6 +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.3.0" />
   </ItemGroup>
 
   <ItemGroup>