Integrate DevExpress Reporting for envelope history

Added DevExpress.Reporting.Core package reference. Refactored rptEnvelopeHistory to inherit from XtraReport and build its layout programmatically using DevExpress bands, tables, and styling. The report now uses A4 paper size, custom margins, and DevExpress UI components for rendering.

EnvelopeGenerator.API/Controllers/EmailTemplateController.cs

@@ -19,20 +19,20 @@ namespace EnvelopeGenerator.API.Controllers;
 /// <remarks>
 /// Initialisiert eine neue Instanz der <see cref="EmailTemplateController"/>-Klasse.
 /// </remarks>
-/// <param name="mapper">
-/// <param name="repository">
-/// Die AutoMapper-Instanz, die zum Zuordnen von Objekten verwendet wird.
+/// <param name="mediator">
+/// Die Mediator-Instanz, die zum Senden von Befehlen und Abfragen verwendet wird.
 /// </param>
 [Route("api/[controller]")]
 [ApiController]
 [Authorize(Policy = AuthPolicy.Sender)]
-public class EmailTemplateController(IMapper mapper, IRepository<EmailTemplate> repository, IMediator mediator) : ControllerBase
+public class EmailTemplateController(IMediator mediator) : ControllerBase
 {
     /// <summary>
     /// Ruft E-Mail-Vorlagen basierend auf der angegebenen Abfrage ab.
     /// Gibt alles zurück, wenn keine Id- oder Typ-Informationen eingegeben wurden.
     /// </summary>
     /// <param name="emailTemplate">Die Abfrageparameter zum Abrufen von E-Mail-Vorlagen.</param>
+    /// <param name="cancel"></param>
     /// <returns>Gibt HTTP-Antwort zurück</returns>
     /// <remarks>
     /// Sample request:
@@ -43,18 +43,10 @@ public class EmailTemplateController(IMapper mapper, IRepository<EmailTemplate>
     /// <response code="401">Wenn der Benutzer nicht authentifiziert ist.</response>
     /// <response code="404">Wenn die gesuchte Abfrage nicht gefunden wird.</response>
     [HttpGet]
-    public async Task<IActionResult> Get([FromQuery] ReadEmailTemplateQuery? emailTemplate = null)
+    public async Task<IActionResult> Get([FromQuery] ReadEmailTemplateQuery emailTemplate, CancellationToken cancel)
     {
-        if (emailTemplate is null || (emailTemplate.Id is null && emailTemplate.Type is null))
-        {
-            var temps = await repository.Query.ToListAsync();
-            return Ok(mapper.Map<IEnumerable<EmailTemplateDto>>(temps));
-        }
-        else
-        {
-            var temp = await mediator.Send(emailTemplate);
-            return temp is null ? NotFound() : Ok(temp);
-        }
+        var result = await mediator.Send(emailTemplate, cancel);
+        return Ok(result);
     }
 
     /// <summary>

EnvelopeGenerator.API/Controllers/ReadOnlyController.cs

@@ -38,6 +38,7 @@ public class ReadOnlyController : ControllerBase
     /// <param name="createDto">Creation payload.</param>
     [HttpPost]
     [Authorize(Policy = AuthPolicy.Receiver)]
+    [Obsolete("Use MediatR")]
     public async Task<IActionResult> CreateAsync([FromBody] EnvelopeReceiverReadOnlyCreateDto createDto)
     {
         var authReceiverMail = User.GetReceiverMailOfReceiver();

EnvelopeGenerator.API/EnvelopeGenerator.API.csproj

@@ -32,11 +32,14 @@
     <PackageReference Include="AspNetCore.Scalar" Version="1.1.8" />
     <PackageReference Include="DigitalData.Auth.Client" Version="1.3.7" />
     <PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
+    <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
     <PackageReference Include="NLog" Version="5.2.5" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
     <PackageReference Include="Scalar.AspNetCore" Version="2.2.1" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="3.2.0" />
     <PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />

EnvelopeGenerator.Application/Common/CacheKey.cs

@@ -0,0 +1,13 @@
+namespace EnvelopeGenerator.Application.Common;
+
+// TODO: merge other cache keys here as well, e.g. for templates, etc.
+/// <summary>
+/// 
+/// </summary>
+public static class CacheKey
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public static readonly Guid DefaultConfig = Guid.NewGuid();
+}

EnvelopeGenerator.Application/Common/Dto/ConfigDto.cs

@@ -8,6 +8,11 @@ namespace EnvelopeGenerator.Application.Common.Dto;
 [ApiExplorerSettings(IgnoreApi = true)]
 public class ConfigDto
 {
+    /// <summary>
+    /// Gets or sets the default document path.
+    /// </summary>
+    public string? DocumentPath { get; set; }
+
     /// <summary>
     /// Gets or sets the sending profile identifier.
     /// </summary>
@@ -26,5 +31,30 @@ public class ConfigDto
     /// <summary>
     /// Gets or sets the path where exports will be saved.
     /// </summary>
-    public string? ExportPath { get; set; }
+    public string ExportPath { get; set; } = null!;
+
+    /// <summary>
+    /// Gets or sets the creation timestamp.
+    /// </summary>
+    public DateTime AddedWhen { get; set; }
+
+    /// <summary>
+    /// Gets or sets the last update timestamp.
+    /// </summary>
+    public DateTime? ChangedWhen { get; set; }
+
+    /// <summary>
+    /// Gets or sets the legacy tinyint GUID field.
+    /// </summary>
+    public byte Guid { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether default TFA is enabled.
+    /// </summary>
+    public bool DefTfaEnabled { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether default TFA uses phone.
+    /// </summary>
+    public bool DefTfaWithPhone { get; set; }
 }

EnvelopeGenerator.Application/Common/Dto/EmailTemplateDto.cs

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

EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs

@@ -2,6 +2,7 @@
 using DigitalData.UserManager.Application.DTOs.User;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Domain.Interfaces;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.Common.Dto;
@@ -10,7 +11,7 @@ namespace EnvelopeGenerator.Application.Common.Dto;
 /// 
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public record EnvelopeDto
+public record EnvelopeDto : IEnvelope
 {
 	/// <summary>
 	/// 
@@ -43,6 +44,16 @@ public record EnvelopeDto
     [TemplatePlaceholder("[MESSAGE]")]
     public string Message { get; set; } = string.Empty;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime? ExpiresWhen { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime? ExpiresWarningWhen { get; set; }
+
     /// <summary>
     /// 
     /// </summary>
@@ -59,6 +70,11 @@ public record EnvelopeDto
     [TemplatePlaceholder("[DOCUMENT_TITLE]")]
     public string Title { get; set; } = string.Empty;
 
+    /// <summary>
+    /// Default value is string.Empty
+    /// </summary>
+    public string? Comment { get; set; }
+
     /// <summary>
     /// 
     /// </summary>
@@ -69,6 +85,21 @@ public record EnvelopeDto
     /// </summary>
     public string Language { get; set; } = "de-DE";
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool SendReminderEmails { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int? FirstReminderDays { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int? ReminderIntervalDays { get; set; }
+
     /// <summary>
     /// 
     /// </summary>
@@ -89,6 +120,26 @@ public record EnvelopeDto
     /// </summary>
     public bool UseAccessCode { get; set; } = true;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public int? FinalEmailToCreator { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int? FinalEmailToReceivers { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int? ExpiresWhenDays { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int? ExpiresWarningWhenDays { get; set; }
+
     /// <summary>
     /// 
     /// </summary>

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

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

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

@@ -3,6 +3,7 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
 using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.Extensions.Options;
+using EnvelopeGenerator.Domain.Interfaces;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 
@@ -45,6 +46,25 @@ public class SendSignedMailHandler : SendMailHandler<DocSignedNotification>
             { "[DOCUMENT_TITLE]", notification.Envelope?.Title ?? string.Empty },
         };
 
+        if (notification.Envelope.IsReadAndConfirm())
+        {
+            placeHolders["[SIGNATURE_TYPE]"] = "Lesen und bestätigen";
+            placeHolders["[DOCUMENT_PROCESS]"] = string.Empty;
+            placeHolders["[FINAL_STATUS]"] = "Lesebestätigung";
+            placeHolders["[FINAL_ACTION]"] = "Empfänger bestätigt";
+            placeHolders["[REJECTED_BY_OTHERS]"] = "anderen Empfänger abgelehnt!";
+            placeHolders["[RECEIVER_ACTION]"] = "bestätigt";
+        }
+        else
+        {
+            placeHolders["[SIGNATURE_TYPE]"] = "Signieren";
+            placeHolders["[DOCUMENT_PROCESS]"] = " und elektronisch unterschreiben";
+            placeHolders["[FINAL_STATUS]"] = "Signatur";
+            placeHolders["[FINAL_ACTION]"] = "Vertragspartner unterzeichnet";
+            placeHolders["[REJECTED_BY_OTHERS]"] = "anderen Vertragspartner abgelehnt! Ihre notwendige Unterzeichnung wurde verworfen.";
+            placeHolders["[RECEIVER_ACTION]"] = "unterschrieben";
+        }
+
         return placeHolders;
     }
 }

EnvelopeGenerator.Application/Configuration/Queries/ReadDefaultConfigQuery.cs

@@ -0,0 +1,69 @@
+using AutoMapper;
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Common;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace EnvelopeGenerator.Application.Configuration.Queries;
+
+/// <summary>
+/// 
+/// </summary>
+public record ReadDefaultConfigQuery : IRequest<ConfigDto>
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool EnforceSingleResult { get; init; }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadDefaultConfigQueryHandler : IRequestHandler<ReadDefaultConfigQuery, ConfigDto>
+{
+    private readonly IRepository<Config> _repo;
+
+    private readonly IMapper _mapper;
+
+    private readonly IMemoryCache _cache;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repo"></param>
+    /// <param name="mapper"></param>
+    /// <param name="cache"></param>
+    public ReadDefaultConfigQueryHandler(IRepository<Config> repo, IMapper mapper, IMemoryCache cache)
+    {
+        _repo = repo;
+        _mapper = mapper;
+        _cache = cache;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    /// <exception cref="InvalidOperationException"></exception>
+    public async Task<ConfigDto> Handle(ReadDefaultConfigQuery request, CancellationToken cancel)
+    {
+        var config = await _cache.GetOrCreateAsync(CacheKey.DefaultConfig, entry =>
+        {
+            entry.AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(30);
+            return request.EnforceSingleResult
+            ? _repo.Query.SingleOrDefaultAsync(cancel)
+            : _repo.Query.FirstOrDefaultAsync(cancel)
+            ?? throw new NotFoundException("Default configuration could not be found. Ensure at least one configuration record exists in the database.");
+        });
+
+        return _mapper.Map<ConfigDto>(config);
+    }
+}

EnvelopeGenerator.Application/DocStatus/Commands/CreateDocStatusCommand.cs

@@ -8,12 +8,22 @@ namespace EnvelopeGenerator.Application.DocStatus.Commands;
 /// <summary>
 /// 
 /// </summary>
-public record CreateDocStatusCommand : ModifyDocStatusCommandBase, IRequest<DocumentStatus>
+public record CreateDocStatusCommand : IRequest<DocumentStatus>
 {
     /// <summary>
-    /// Gets timestamp when this record was added. Returns the StatusChangedWhen value.
+    /// 
     /// </summary>
-    public DateTime AddedWhen => StatusChangedWhen;
+    public int EnvelopeId { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int ReceiverId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the display value associated with the status.
+    /// </summary>
+    public string? Value { get; set; }
 }
 
 /// <summary>

EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs

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

EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs

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

EnvelopeGenerator.Application/DocStatus/Commands/UpdateDocStatusCommand.cs

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

EnvelopeGenerator.Application/DocStatus/MappingProfile.cs

@@ -18,11 +18,16 @@ public class MappingProfile : Profile
         CreateMap<CreateDocStatusCommand, DocumentStatus>()
         .ForMember(dest => dest.Envelope, opt => opt.Ignore())
         .ForMember(dest => dest.Receiver, opt => opt.Ignore())
+        .ForMember(dest => dest.Status, opt => opt.MapFrom(
+            src => src.Value == null 
+                ? Domain.Constants.DocumentStatus.Created 
+                : Domain.Constants.DocumentStatus.Signed))
         .MapAddedWhen();
 
         CreateMap<UpdateDocStatusCommand, DocumentStatus>()
         .ForMember(dest => dest.Envelope, opt => opt.Ignore())
         .ForMember(dest => dest.Receiver, opt => opt.Ignore())
+        .ForMember(dest => dest.StatusChangedWhen, opt => opt.MapFrom(src => DateTime.UtcNow))
         .MapChangedWhen();
     }
 }

EnvelopeGenerator.Application/EmailTemplates/Queries/ReadEmailTemplateQuery.cs

@@ -6,6 +6,7 @@ using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Domain.Constants;
 using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Common.Extensions;
 
 namespace EnvelopeGenerator.Application.EmailTemplates.Queries;
 
@@ -13,7 +14,7 @@ namespace EnvelopeGenerator.Application.EmailTemplates.Queries;
 /// Stellt eine Abfrage dar, um eine E-Mail-Vorlage zu lesen.
 /// Diese Klasse erbt von <see cref="IEmailTemplateQuery"/>.
 /// </summary>
-public record ReadEmailTemplateQuery : IEmailTemplateQuery, IRequest<EmailTemplateDto>
+public record ReadEmailTemplateQuery : IEmailTemplateQuery, IRequest<IEnumerable<EmailTemplateDto>>
 {
     /// <summary>
     /// Die eindeutige Kennung der E-Mail-Vorlage (optional).
@@ -34,12 +35,51 @@ public record ReadEmailTemplateQuery : IEmailTemplateQuery, IRequest<EmailTempla
     /// 9 - DocumentRejected_REC_2 (für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.
     /// </summary>
     public EmailTemplateType? Type { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string? LangCode { get; set; }
 }
 
 /// <summary>
 /// 
 /// </summary>
-public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQuery, EmailTemplateDto>
+public static class ReadEmailTemplateQueryExtensions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="id"></param>
+    /// <param name="langCode"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public static async Task<EmailTemplateDto?> ReadEmailTemplateAsync(this ISender sender, int id, string langCode, CancellationToken cancel = default)
+    {
+        var result = await sender.Send(new ReadEmailTemplateQuery { Id = id, LangCode = langCode }, cancel);
+        return result.FirstOrDefault();
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="type"></param>
+    /// <param name="langCode"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public static async Task<EmailTemplateDto?> ReadEmailTemplateAsync(this ISender sender, EmailTemplateType type, string langCode, CancellationToken cancel = default)
+    {
+        var result = await sender.Send(new ReadEmailTemplateQuery { Type = type, LangCode = langCode }, cancel);
+        return result.FirstOrDefault();
+    }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQuery, IEnumerable<EmailTemplateDto>>
 {
     private readonly IMapper _mapper;
 
@@ -65,14 +105,21 @@ public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQu
     /// <param name="cancel"></param>
     /// <returns></returns>
     /// <exception cref="InvalidOperationException"></exception>
-    public async Task<EmailTemplateDto> Handle(ReadEmailTemplateQuery request, CancellationToken cancel)
+    public async Task<IEnumerable<EmailTemplateDto>> Handle(ReadEmailTemplateQuery request, CancellationToken cancel)
     {
-        var query = request.Id is int id
-            ? _repo.Query.Where(temp => temp.Id == id)
-            : _repo.Query.Where(temp => temp.Name == request.Type!.ToString());
+        var query = _repo.Query;
 
-        var entity = await query.FirstOrDefaultAsync(cancel) ?? throw new NotFoundException();
+        if (request.Id is int id)
+            query = query.Where(temp => temp.Id == id);
 
-        return _mapper.Map<EmailTemplateDto>(entity);
+        if (request.Type is EmailTemplateType type)
+            query = query.Where(temp => temp.Name == type.ToString());
+
+        if (request.LangCode is string langCode)
+            query = query.Where(temp => temp.LangCode == langCode);
+
+        var entity = await query.ToListAsync(cancel);
+
+        return _mapper.Map<IEnumerable<EmailTemplateDto>>(entity);
     }
 }

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -19,12 +19,16 @@
 		<PackageReference Include="DigitalData.Core.Client" Version="2.1.0" />
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
-		<PackageReference Include="HtmlSanitizer" Version="8.0.865" />
+		<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
 		<PackageReference Include="MediatR" Version="12.5.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.18" />
+		<PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
 		<PackageReference Include="Otp.NET" Version="1.4.0" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
 		<PackageReference Include="QRCoder-ImageSharp" Version="0.10.0" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
+		<PackageReference Include="System.Formats.Asn1" Version="10.0.3" />
+		<PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
 		<PackageReference Include="UserManager" Version="1.1.3" />
 	</ItemGroup>
 
@@ -33,7 +37,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
@@ -63,6 +67,9 @@
 			<LastGenOutput>Model.Designer.cs</LastGenOutput>
 			<Generator>PublicResXFileCodeGenerator</Generator>
 		</EmbeddedResource>
+		<EmbeddedResource Update="Resources\Resource.fr-FR.resx">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</EmbeddedResource>
 		<EmbeddedResource Update="Resources\Resource.de-DE.resx">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</EmbeddedResource>
@@ -73,7 +80,7 @@
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
 	  <PackageReference Include="AutoMapper" Version="13.0.1" />
-	  <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.3" />
+	  <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
 	  <PackageReference Include="CommandDotNet">
 		<Version>7.0.5</Version>
 	  </PackageReference>
@@ -81,7 +88,6 @@
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 	  <PackageReference Include="AutoMapper" Version="14.0.0" />
-	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
 	  <PackageReference Include="CommandDotNet">
 	    <Version>8.1.1</Version>
 	  </PackageReference>
@@ -89,7 +95,6 @@
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
 	  <PackageReference Include="AutoMapper" Version="14.0.0" />
-	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
 	  <PackageReference Include="CommandDotNet">
 	    <Version>8.1.1</Version>
 	  </PackageReference>

EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs

@@ -34,7 +34,7 @@ public record CreateHistoryCommand : EnvelopeReceiverQueryBase, IRequest<History
     /// <summary>
     /// 
     /// </summary>
-    public DateTime AddedWhen { get; } = DateTime.Now;
+    public DateTime AddedWhen { get; } = DateTime.UtcNow;
 
     /// <summary>
     /// 

EnvelopeGenerator.Application/Histories/MappingProfile.cs

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

EnvelopeGenerator.Application/Resources/Resource.cs

@@ -190,6 +190,13 @@ public static class Extensions
     /// <returns></returns>
     public static string SignDoc(this IStringLocalizer localizer) => localizer[nameof(SignDoc)].Value;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="localizer"></param>
+    /// <returns></returns>
+    public static string ConfirmDoc(this IStringLocalizer localizer) => localizer[nameof(ConfirmDoc)].Value;
+
     /// <summary>
     /// 
     /// </summary>
@@ -204,6 +211,13 @@ public static class Extensions
     /// <returns></returns>
     public static string DocSigned(this IStringLocalizer localizer) => localizer[nameof(DocSigned)].Value;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="localizer"></param>
+    /// <returns></returns>
+    public static string DocConfirmed(this IStringLocalizer localizer) => localizer[nameof(DocConfirmed)].Value;
+
     /// <summary>
     /// 
     /// </summary>
@@ -239,6 +253,13 @@ public static class Extensions
     /// <returns></returns>
     public static string SigAgree(this IStringLocalizer localizer) => localizer[nameof(SigAgree)].Value;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="localizer"></param>
+    /// <returns></returns>
+    public static string ConfirmAgree(this IStringLocalizer localizer) => localizer[nameof(ConfirmAgree)].Value;
+
     /// <summary>
     /// 
     /// </summary>
@@ -267,6 +288,13 @@ public static class Extensions
     /// <returns></returns>
     public static string RejectionInfo1(this IStringLocalizer localizer) => localizer[nameof(RejectionInfo1)].Value;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="localizer"></param>
+    /// <returns></returns>
+    public static string RejectionInfo1ForConfirmation(this IStringLocalizer localizer) => localizer[nameof(RejectionInfo1ForConfirmation)].Value;
+
     /// <summary>
     /// 
     /// </summary>
@@ -295,6 +323,13 @@ public static class Extensions
     /// <returns></returns>
     public static string SigningProcessTitle(this IStringLocalizer localizer) => localizer[nameof(SigningProcessTitle)].Value;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="localizer"></param>
+    /// <returns></returns>
+    public static string ConfirmationProcessTitle(this IStringLocalizer localizer) => localizer[nameof(ConfirmationProcessTitle)].Value;
+
     /// <summary>
     /// 
     /// </summary>

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

@@ -123,6 +123,9 @@
   <data name="Back" xml:space="preserve">
     <value>Zurück</value>
   </data>
+  <data name="AuthenticatorSetup_Prefix" xml:space="preserve">
+    <value>Klicken Sie auf den</value>
+  </data>
   <data name="Complete" xml:space="preserve">
     <value>Abschließen</value>
   </data>
@@ -144,6 +147,9 @@
   <data name="DocSigned" xml:space="preserve">
     <value>Dokument unterschrieben</value>
   </data>
+  <data name="DocumentSharingPeriodExpired" xml:space="preserve">
+    <value>Der Zeitraum für die gemeinsame Nutzung von Dokumenten ist abgelaufen.</value>
+  </data>
   <data name="en-US" xml:space="preserve">
     <value>Englisch</value>
   </data>
@@ -153,6 +159,9 @@
   <data name="EnvelopeInfo2" xml:space="preserve">
     <value>Erstellt am {0} von {1}. Sie können den Absender über &lt;span class="highlight highlight-envelope-info-2"&gt;&lt;a class="mail-link" href="mailto:{2}?subject={3}&amp;body=Sehr%20geehrter%20{4}%20{5},%0A%0A%0A"&gt;{6}&lt;/a&gt;&lt;/span&gt; kontaktieren.</value>
   </data>
+  <data name="Expired" xml:space="preserve">
+    <value>Abgelaufen</value>
+  </data>
   <data name="FiClass" xml:space="preserve">
     <value>fi-de</value>
   </data>
@@ -165,6 +174,9 @@
   <data name="HomePageDescription" xml:space="preserve">
     <value>Das digitale Unterschriftenportal ist eine Plattform, die entwickelt wurde, um Ihre Dokumente sicher zu unterschreiben und zu verwalten. Mit seiner benutzerfreundlichen Oberfläche können Sie Ihre Dokumente schnell hochladen, die Unterschriftsprozesse verfolgen und Ihre digitalen Unterschriftenanwendungen einfach durchführen. Dieses Portal beschleunigt Ihren Arbeitsablauf mit rechtlich gültigen Unterschriften und erhöht gleichzeitig die Sicherheit Ihrer Dokumente.</value>
   </data>
+  <data name="AuthenticatorSetup_Link" xml:space="preserve">
+    <value>Link</value>
+  </data>
   <data name="LocationWarning" xml:space="preserve">
     <value>Bitte überprüfen Sie die Standortinformationen. Wenn sie falsch sind, korrigieren Sie diese bitte.</value>
   </data>
@@ -238,7 +250,7 @@
     <value>Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
   </data>
   <data name="RejectionInfo2_ext" xml:space="preserve">
-    <value>Das Vorgang wurde von einer der beteiligten Parteien abgelehnt. Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
+    <value>Der Vorgang wurde von einer der beteiligten Parteien abgelehnt. Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
   </data>
   <data name="RejectionReasonQ" xml:space="preserve">
     <value>Bitte geben Sie einen Grund an:</value>
@@ -264,4 +276,205 @@
   <data name="WrongAccessCode" xml:space="preserve">
     <value>Ungültiger Zugangscode.</value>
   </data>
+  <data name="AuthenticatorSetup_Suffix" xml:space="preserve">
+    <value>um Ihre Authenticator-App einzurichten.</value>
+  </data>
+  <data name="DocumentSuccessfullySigned" xml:space="preserve">
+    <value>Dokument erfolgreich signiert!</value>
+  </data>
+  <data name="DocumentSignedConfirmationMessage" xml:space="preserve">
+    <value>Sie haben das Dokument signiert. Im Anschluss erhalten Sie eine schriftliche Bestätigung.</value>
+  </data>
+  <data name="Signatures" xml:space="preserve">
+    <value>Unterschriften</value>
+  </data>
+  <data name="EnterRecipientToShareDocument" xml:space="preserve">
+    <value>Geben Sie hier den Empfänger ein, mit welchem Sie das Dokument teilen wollen</value>
+  </data>
+  <data name="Email" xml:space="preserve">
+    <value>E-Mail</value>
+  </data>
+  <data name="ValidUntil" xml:space="preserve">
+    <value>Gültig bis</value>
+  </data>
+  <data name="ShrEnvInvalidEmailTitle" xml:space="preserve">
+    <value>Falsche Email</value>
+  </data>
+  <data name="ShrEnvInvalidEmailText" xml:space="preserve">
+    <value>Die E-Mail-Adresse ist ungültig. Bitte verwenden Sie das richtige Format, z. B.: user@mail.com.</value>
+  </data>
+  <data name="ShrEnvSentTitle" xml:space="preserve">
+    <value>Gesendet</value>
+  </data>
+  <data name="ShrEnvErrorTitle" xml:space="preserve">
+    <value>Fehler</value>
+  </data>
+  <data name="InvalidDateTitle" xml:space="preserve">
+    <value>Falsches Datum</value>
+  </data>
+  <data name="ShrEnvInvalidDateText" xml:space="preserve">
+    <value>Die E-Mail-Adresse ist ungültig. Bitte verwenden Sie das richtige Format, z. B.: user@mail.com.</value>
+  </data>
+  <data name="UnexpectedErrorTitle" xml:space="preserve">
+    <value>Unerwarteter Fehler</value>
+  </data>
+  <data name="ShrEnvOperationFailedText" xml:space="preserve">
+    <value>Der Vorgang ist fehlgeschlagen. Bitte wenden Sie sich an das IT-Team.</value>
+  </data>
+  <data name="PrivacyNotice" xml:space="preserve">
+    <value>Datenschutzhinweis</value>
+  </data>
+  <data name="CookieConsentMessage" xml:space="preserve">
+    <value>Wir verwenden technisch notwendige Session Cookies. Diese Cookies sind für den ordnungsgemäßen Betrieb dieser Webseite von nöten und können aus diesm Grund nicht abgewählt werden. Es findet keine Übermittlung an Dritte statt.</value>
+  </data>
+  <data name="Accept" xml:space="preserve">
+    <value>Akzeptieren</value>
+  </data>
+  <data name="ConnectionValidityExpired" xml:space="preserve">
+    <value>Die Gültigkeitsdauer der Verbindung ist abgelaufen.</value>
+  </data>
+  <data name="Creator" xml:space="preserve">
+    <value>Ersteller</value>
+  </data>
+  <data name="Date" xml:space="preserve">
+    <value>Datum</value>
+  </data>
+  <data name="DocumentProtected" xml:space="preserve">
+    <value>Dokument geschützt</value>
+  </data>
+  <data name="Password" xml:space="preserve">
+    <value>Passwort</value>
+  </data>
+  <data name="Open" xml:space="preserve">
+    <value>Öffnen</value>
+  </data>
+  <data name="TfaRegistration" xml:space="preserve">
+    <value>2FA Registrierung</value>
+  </data>
+  <data name="Registration" xml:space="preserve">
+    <value>Registrierung</value>
+  </data>
+  <data name="PageVisibleUntil" xml:space="preserve">
+    <value>Diese Seite ist bis {0} sichtbar.</value>
+  </data>
+  <data name="Step1Download2faApplication" xml:space="preserve">
+    <value>Schritt 1 -  Download einer 2FA Applikation</value>
+  </data>
+  <data name="Download2faAppInstruction" xml:space="preserve">
+    <value>Bitte nehmen Sie Ihr Smartphone zur Hand und laden eine Applikation herunter, die zur Zwei-Faktor-Authentifizierung (2FA) benutzt werden kann.</value>
+  </data>
+  <data name="Recommended2faApplications" xml:space="preserve">
+    <value>Folgende Applikationen empfehlen wir</value>
+  </data>
+  <data name="Step2ScanQrCode" xml:space="preserve">
+    <value>Schritt 2 -  Scannen des QR-Codes</value>
+  </data>
+  <data name="ScanQrCodeInstruction" xml:space="preserve">
+    <value>Sobald Sie eine Zwei-Faktor-Authentifizierung App installiert haben, können Sie fortfahren und innerhalb der Applikation die Option zum Scannen eines QR-Codes suchen und bestätigen. Im Anschluss, sobald die Kamera freigegeben wurde, können Sie den QR-Code von uns scannen.</value>
+  </data>
+  <data name="Step3VerifyTheCode" xml:space="preserve">
+    <value>Schritt 3 - Verifizierung des Codes</value>
+  </data>
+  <data name="VerifyCodeInstructionMain" xml:space="preserve">
+    <value>Sie können nun in der Zwei-Faktor-Authentifizierung App einen Zahlencode zur Verifizierung des Vorganges ablesen. Bitte tragen Sie diesen Code in das unten aufgeführte Eingabefeld ein und Klicken auf</value>
+  </data>
+  <data name="VerifyCodeInstructionSubmit" xml:space="preserve">
+    <value>Senden</value>
+  </data>
+  <data name="CopyLink" xml:space="preserve">
+    <value>Link kopieren</value>
+  </data>
+  <data name="CityFormatInvalid" xml:space="preserve">
+    <value>Bitte überprüfen Sie die eingegebene Ortsangabe "{0}" auf korrekte Formatierung. Beispiele für richtige Formate sind: München, Île-de-France, Sauðárkrókur, San Francisco, St. Catharines usw.</value>
+  </data>
+  <data name="CopyLinkSuccess" xml:space="preserve">
+    <value>Kopiert</value>
+  </data>
+  <data name="Logout" xml:space="preserve">
+    <value>Abmelden</value>
+  </data>
+  <data name="ViewAllPages" xml:space="preserve">
+    <value>Bitte sehen Sie sich alle Seiten an.</value>
+  </data>
+  <data name="Reset" xml:space="preserve">
+    <value>Zurücksetzen</value>
+  </data>
+  <data name="ViewRemainingPages" xml:space="preserve">
+    <value>Bitte sehen Sie sich die folgenden Seiten an: {0}</value>
+  </data>
+  <data name="City" xml:space="preserve">
+    <value>Ort</value>
+  </data>
+  <data name="EnvelopeRejectedRedirect" xml:space="preserve">
+    <value>Dokument wurde von einem Empfänger abgelehnt. Sie werden weitergeleitet...</value>
+  </data>
+  <data name="MissingSignatures" xml:space="preserve">
+    <value>Es wurden nicht alle Signaturfelder ausgefüllt!</value>
+  </data>
+  <data name="ResetConfirmText" xml:space="preserve">
+    <value>Wollen Sie das Dokument und alle erstellten Signaturen zurücksetzen?</value>
+  </data>
+  <data name="EnvelopeSignError" xml:space="preserve">
+    <value>Umschlag konnte nicht signiert werden!</value>
+  </data>
+  <data name="SignedBy" xml:space="preserve">
+    <value>Signiert von</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Warnung</value>
+  </data>
+  <data name="Position" xml:space="preserve">
+    <value>Position</value>
+  </data>
+  <data name="Share" xml:space="preserve">
+    <value>Teilen</value>
+  </data>
+  <data name="CopyLinkFailure" xml:space="preserve">
+    <value>Unerwarteter Fehler</value>
+  </data>
+  <data name="LocationFieldsRequired" xml:space="preserve">
+    <value>Bitte füllen Sie alle Standortinformationen vollständig aus!</value>
+  </data>
+  <data name="ResetConfirmTitle" xml:space="preserve">
+    <value>Sind Sie sicher?</value>
+  </data>
+  <data name="EnvelopeUnavailable" xml:space="preserve">
+    <value>Umschlag ist nicht mehr verfügbar.</value>
+  </data>
+  <data name="Success" xml:space="preserve">
+    <value>Erfolg</value>
+  </data>
+  <data name="DocumentReset" xml:space="preserve">
+    <value>Dokument wurde zurückgesetzt.</value>
+  </data>
+  <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
+    <value>Dokument erfolgreich gelesen und bestätigt!</value>
+  </data>
+  <data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
+    <value>Sie haben das Dokument gelesen und bestätigt. Im Anschluss erhalten Sie eine schriftliche Bestätigung.</value>
+  </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>Bestätigen</value>
+  </data>
+  <data name="RejectionInfo1Confirmation" xml:space="preserve">
+    <value>Dieser Bestätigungsvorgang wurde abgelehnt!</value>
+  </data>
+  <data name="ConfirmDoc" xml:space="preserve">
+    <value>Dokument bestätigen</value>
+  </data>
+  <data name="DocConfirmed" xml:space="preserve">
+    <value>Dokument bestätigt</value>
+  </data>
+  <data name="ConfirmAgree" xml:space="preserve">
+    <value>Durch Klick auf Abschließen bestätige ich, das Dokument gelesen und zur Kenntnis genommen zu haben.</value>
+  </data>
+  <data name="ConfirmedBy" xml:space="preserve">
+    <value>Bestätigt von</value>
+  </data>
+  <data name="ConfirmationProcessTitle" xml:space="preserve">
+    <value>Titel des Lesebetätigungs-Vorgangs</value>
+  </data>
+  <data name="Confirmations" xml:space="preserve">
+    <value>Bestätigungen</value>
+  </data>
 </root>

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

@@ -123,6 +123,9 @@
   <data name="Back" xml:space="preserve">
     <value>Back</value>
   </data>
+  <data name="AuthenticatorSetup_Prefix" xml:space="preserve">
+    <value>Click the</value>
+  </data>
   <data name="Complete" xml:space="preserve">
     <value>Complete</value>
   </data>
@@ -144,6 +147,9 @@
   <data name="DocSigned" xml:space="preserve">
     <value>Document signed</value>
   </data>
+  <data name="DocumentSharingPeriodExpired" xml:space="preserve">
+    <value>The period for sharing documents has expired.</value>
+  </data>
   <data name="en-US" xml:space="preserve">
     <value>English</value>
   </data>
@@ -153,6 +159,9 @@
   <data name="EnvelopeInfo2" xml:space="preserve">
     <value>Created on {0} by {1}. You can contact the sender via &lt;span class="highlight highlight-envelope-info-2"&gt;&lt;a class="mail-link" href="mailto:{2}?subject={3}&amp;body=Dear%20{4}%20{5},%0A%0A%0A"&gt;{6}&lt;/a&gt;&lt;/span&gt;.</value>
   </data>
+  <data name="Expired" xml:space="preserve">
+    <value>Expired</value>
+  </data>
   <data name="FiClass" xml:space="preserve">
     <value>fi-us</value>
   </data>
@@ -165,6 +174,9 @@
   <data name="HomePageDescription" xml:space="preserve">
     <value>The Digital Signature Portal is a platform developed for securely signing and managing your documents. With its user-friendly interface, you can quickly upload your documents, track the signing processes, and easily carry out your digital signature applications. This portal accelerates your workflow with legally valid signatures while enhancing the security of your documents.</value>
   </data>
+  <data name="AuthenticatorSetup_Link" xml:space="preserve">
+    <value>link</value>
+  </data>
   <data name="LocationWarning" xml:space="preserve">
     <value>Please review the location information. If it is incorrect, kindly make the necessary corrections.</value>
   </data>
@@ -264,4 +276,205 @@
   <data name="WrongAccessCode" xml:space="preserve">
     <value>Invalid access code.</value>
   </data>
+  <data name="AuthenticatorSetup_Suffix" xml:space="preserve">
+    <value>to set up your authenticator app.</value>
+  </data>
+  <data name="DocumentSuccessfullySigned" xml:space="preserve">
+    <value>Document successfully signed!</value>
+  </data>
+  <data name="DocumentSignedConfirmationMessage" xml:space="preserve">
+    <value>You have signed the document. Afterwards, you will receive a written confirmation.</value>
+  </data>
+  <data name="Signatures" xml:space="preserve">
+    <value>Signatures</value>
+  </data>
+  <data name="EnterRecipientToShareDocument" xml:space="preserve">
+    <value>Enter the recipient you want to share the document with</value>
+  </data>
+  <data name="Email" xml:space="preserve">
+    <value>E-mail</value>
+  </data>
+  <data name="ValidUntil" xml:space="preserve">
+    <value>Valid until</value>
+  </data>
+  <data name="ShrEnvInvalidEmailTitle" xml:space="preserve">
+    <value>Invalid email</value>
+  </data>
+  <data name="ShrEnvInvalidEmailText" xml:space="preserve">
+    <value>The email address is invalid. Please use the correct format, e.g., user@mail.com.</value>
+  </data>
+  <data name="ShrEnvSentTitle" xml:space="preserve">
+    <value>Sent</value>
+  </data>
+  <data name="ShrEnvErrorTitle" xml:space="preserve">
+    <value>Error</value>
+  </data>
+  <data name="InvalidDateTitle" xml:space="preserve">
+    <value>Invalid date</value>
+  </data>
+  <data name="ShrEnvInvalidDateText" xml:space="preserve">
+    <value>The email address is invalid. Please use the correct format, e.g., user@mail.com.</value>
+  </data>
+  <data name="UnexpectedErrorTitle" xml:space="preserve">
+    <value>Unexpected error</value>
+  </data>
+  <data name="ShrEnvOperationFailedText" xml:space="preserve">
+    <value>The operation failed. Please contact the IT team.</value>
+  </data>
+  <data name="PrivacyNotice" xml:space="preserve">
+    <value>Privacy notice</value>
+  </data>
+  <data name="CookieConsentMessage" xml:space="preserve">
+    <value>We use technically necessary session cookies. These cookies are required for the proper operation of this website and therefore cannot be deselected. No data is transmitted to third parties.</value>
+  </data>
+  <data name="Accept" xml:space="preserve">
+    <value>Accept</value>
+  </data>
+  <data name="ConnectionValidityExpired" xml:space="preserve">
+    <value>The session has expired.</value>
+  </data>
+  <data name="Creator" xml:space="preserve">
+    <value>Creator</value>
+  </data>
+  <data name="Date" xml:space="preserve">
+    <value>Date</value>
+  </data>
+  <data name="DocumentProtected" xml:space="preserve">
+    <value>Document protected</value>
+  </data>
+  <data name="Password" xml:space="preserve">
+    <value>Password</value>
+  </data>
+  <data name="Open" xml:space="preserve">
+    <value>Open</value>
+  </data>
+  <data name="TfaRegistration" xml:space="preserve">
+    <value>2FA Registration</value>
+  </data>
+  <data name="Registration" xml:space="preserve">
+    <value>Registration</value>
+  </data>
+  <data name="PageVisibleUntil" xml:space="preserve">
+    <value>This page is visible until {0}.</value>
+  </data>
+  <data name="Step1Download2faApplication" xml:space="preserve">
+    <value>Step 1 – Download a 2FA application</value>
+  </data>
+  <data name="Download2faAppInstruction" xml:space="preserve">
+    <value>Please take your smartphone and download an application that can be used for two-factor authentication (2FA).</value>
+  </data>
+  <data name="Recommended2faApplications" xml:space="preserve">
+    <value>We recommend the following applications</value>
+  </data>
+  <data name="Step2ScanQrCode" xml:space="preserve">
+    <value>Step 2 – Scan the QR code</value>
+  </data>
+  <data name="ScanQrCodeInstruction" xml:space="preserve">
+    <value>Once you have installed a two-factor authentication app, you can proceed and look for the option to scan a QR code within the application and confirm it. Then, once the camera is enabled, you can scan the QR code provided by us.</value>
+  </data>
+  <data name="Step3VerifyTheCode" xml:space="preserve">
+    <value>Step 3 – Verify the code</value>
+  </data>
+  <data name="VerifyCodeInstructionMain" xml:space="preserve">
+    <value>You can now read a numeric code in the two-factor authentication app to verify the process. Please enter this code in the input field below and click</value>
+  </data>
+  <data name="VerifyCodeInstructionSubmit" xml:space="preserve">
+    <value>Submit</value>
+  </data>
+  <data name="CopyLink" xml:space="preserve">
+    <value>Copy link</value>
+  </data>
+  <data name="CityFormatInvalid" xml:space="preserve">
+    <value>Please check the entered location "{0}" for proper formatting. Examples: Munich, Île-de-France, Sauðárkrókur, San Francisco, St. Catharines, etc.</value>
+  </data>
+  <data name="CopyLinkSuccess" xml:space="preserve">
+    <value>Copied</value>
+  </data>
+  <data name="Logout" xml:space="preserve">
+    <value>Logout</value>
+  </data>
+  <data name="ViewAllPages" xml:space="preserve">
+    <value>Please view all pages.</value>
+  </data>
+  <data name="Reset" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="ViewRemainingPages" xml:space="preserve">
+    <value>Please view the following pages: {0}</value>
+  </data>
+  <data name="City" xml:space="preserve">
+    <value>City</value>
+  </data>
+  <data name="EnvelopeRejectedRedirect" xml:space="preserve">
+    <value>The document was rejected by a recipient. You will be redirected...</value>
+  </data>
+  <data name="MissingSignatures" xml:space="preserve">
+    <value>Not all signature fields have been completed!</value>
+  </data>
+  <data name="ResetConfirmText" xml:space="preserve">
+    <value>Do you want to reset the document and all created signatures?</value>
+  </data>
+  <data name="EnvelopeSignError" xml:space="preserve">
+    <value>The envelope could not be signed!</value>
+  </data>
+  <data name="SignedBy" xml:space="preserve">
+    <value>Signed by</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Warning</value>
+  </data>
+  <data name="Position" xml:space="preserve">
+    <value>Position</value>
+  </data>
+  <data name="Share" xml:space="preserve">
+    <value>Share</value>
+  </data>
+  <data name="CopyLinkFailure" xml:space="preserve">
+    <value>Unexpected error</value>
+  </data>
+  <data name="LocationFieldsRequired" xml:space="preserve">
+    <value>Please complete all location information.</value>
+  </data>
+  <data name="ResetConfirmTitle" xml:space="preserve">
+    <value>Are you sure?</value>
+  </data>
+  <data name="EnvelopeUnavailable" xml:space="preserve">
+    <value>The envelope is no longer available.</value>
+  </data>
+  <data name="Success" xml:space="preserve">
+    <value>Success</value>
+  </data>
+  <data name="DocumentReset" xml:space="preserve">
+    <value>Document has been reset.</value>
+  </data>
+  <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
+    <value>Document successfully red and confirmed!</value>
+  </data>
+  <data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
+    <value>You have read and confirmed the document. You will receive a written confirmation afterwards.</value>
+  </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>Confirm</value>
+  </data>
+  <data name="RejectionInfo1Confirmation" xml:space="preserve">
+    <value>This confirmation process has been rejected!</value>
+  </data>
+  <data name="ConfirmDoc" xml:space="preserve">
+    <value>Confirm Document</value>
+  </data>
+  <data name="DocConfirmed" xml:space="preserve">
+    <value>Document confirmed</value>
+  </data>
+  <data name="ConfirmAgree" xml:space="preserve">
+    <value>By clicking on “Complete”, I confirm that I have read and taken note of the document.</value>
+  </data>
+  <data name="ConfirmedBy" xml:space="preserve">
+    <value>Confirmed by</value>
+  </data>
+  <data name="ConfirmationProcessTitle" xml:space="preserve">
+    <value>Title of the read confirmation process</value>
+  </data>
+  <data name="Confirmations" xml:space="preserve">
+    <value>Confirmations</value>
+  </data>
 </root>

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

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

EnvelopeGenerator.Application/Services/ConfigService.cs

@@ -7,6 +7,7 @@ using Microsoft.Extensions.Logging;
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Interfaces.Services;
+using EnvelopeGenerator.Application.Common;
 
 namespace EnvelopeGenerator.Application.Services;
 
@@ -16,8 +17,6 @@ namespace EnvelopeGenerator.Application.Services;
 [Obsolete("Use MediatR")]
 public class ConfigService : ReadService<IConfigRepository, ConfigDto, Config, int>, IConfigService
 {
-	private static readonly Guid DefaultConfigCacheId = Guid.NewGuid();
-
 	private readonly IMemoryCache _cache;
 
     private readonly ILogger<ConfigService> _logger;
@@ -62,7 +61,7 @@ public class ConfigService : ReadService<IConfigRepository, ConfigDto, Config, i
 	/// </exception>
 	public async Task<ConfigDto> ReadDefaultAsync()
     {
-        var config = await _cache.GetOrCreateAsync(DefaultConfigCacheId, _ => ReadFirstAsync().ThenAsync(
+        var config = await _cache.GetOrCreateAsync(CacheKey.DefaultConfig, _ => ReadFirstAsync().ThenAsync(
             Success: config => config,
             Fail: (mssg, ntc) =>
             {

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

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

EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj

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

EnvelopeGenerator.BBTests/app.config

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

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -7,11 +7,10 @@ Imports GdPicture14
 Imports Newtonsoft.Json.Linq
 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=;"
+    Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;" + "Encrypt=True;TrustServerCertificate=True;"
 
     Private Database As MSSQLServer
     Private LogConfig As LogConfig
@@ -93,56 +92,36 @@ Public Class frmFinalizePDF
     End Function
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        Try
+        Dim oTable = LoadAnnotationDataForEnvelope()
+        Dim oJsonList = oTable.Rows.
+            Cast(Of DataRow).
+            Select(Function(r As DataRow) r.Item("VALUE").ToString()).
+            ToList()
 
-            Dim oTable = LoadAnnotationDataForEnvelope()
-            Dim oJsonList = oTable.Rows.
-                Cast(Of DataRow).
-                Select(Function(r As DataRow) r.Item("VALUE").ToString()).
-                ToList()
+        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")
 
-            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")
-
-            File.WriteAllBytes(oNewPath, oNewBuffer)
-
-            Process.Start(oNewPath)
-        Catch ex As Exception
-            Dim exMsg As StringBuilder = New StringBuilder(ex.Message).AppendLine()
-
-            Dim innerEx = ex.InnerException
-            While (innerEx IsNot Nothing)
-                exMsg.AppendLine(innerEx.Message)
-                innerEx = innerEx.InnerException
-            End While
-
-            MsgBox(exMsg.ToString(), MsgBoxStyle.Critical)
-        End Try
+        File.WriteAllBytes(oNewPath, oNewBuffer)
 
+        Process.Start(oNewPath)
     End Sub
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
-        Try
-            Dim oTable = LoadAnnotationDataForEnvelope()
-            Dim oJsonList = oTable.Rows.
-                Cast(Of DataRow).
-                Select(Function(r As DataRow) r.Item("VALUE").ToString()).
-                Select(Function(s As String) JObject.Parse(s)).
-                ToList()
+        Dim oTable = LoadAnnotationDataForEnvelope()
+        Dim oJsonList = oTable.Rows.
+            Cast(Of DataRow).
+            Select(Function(r As DataRow) r.Item("VALUE").ToString()).
+            Select(Function(s As String) JObject.Parse(s)).
+            ToList()
 
-            Dim oJObject1 = oJsonList.First()
-            Dim oJObject2 = oJsonList.ElementAt(1)
+        Dim oJObject1 = oJsonList.First()
+        Dim oJObject2 = oJsonList.ElementAt(1)
 
-            oJObject1.Merge(oJObject2)
+        oJObject1.Merge(oJObject2)
 
-            txtResult.Text = oJObject1.ToString()
-
-
-        Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Critical)
-        End Try
+        txtResult.Text = oJObject1.ToString()
     End Sub
 End Class

EnvelopeGenerator.BBTests/packages.config

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="10.1.1" targetFramework="net462" />
-  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
+  <package id="Azure.Core" version="1.50.0" targetFramework="net462" />
+  <package id="Azure.Identity" version="1.17.1" targetFramework="net462" />
+  <package id="BouncyCastle.Cryptography" version="2.6.2" targetFramework="net462" />
   <package id="DigitalData.Controls.DocumentViewer" version="1.9.8" targetFramework="net462" />
   <package id="DigitalData.Core.Abstraction.Application" version="1.6.0" targetFramework="net462" />
   <package id="DigitalData.Core.Abstractions" version="4.3.0" targetFramework="net462" />
@@ -23,33 +25,34 @@
   <package id="Microsoft.Bcl.Cryptography" version="9.0.0" targetFramework="net462" />
   <package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net462" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
-  <package id="Microsoft.Data.SqlClient" version="1.1.3" targetFramework="net462" />
-  <package id="Microsoft.Data.SqlClient.SNI" version="1.1.0" targetFramework="net462" />
+  <package id="Microsoft.Data.SqlClient" version="6.1.4" targetFramework="net462" />
+  <package id="Microsoft.Data.SqlClient.SNI" version="6.0.2" targetFramework="net462" />
   <package id="Microsoft.EntityFrameworkCore" version="3.1.32" targetFramework="net462" />
   <package id="Microsoft.EntityFrameworkCore.Abstractions" version="3.1.32" targetFramework="net462" />
   <package id="Microsoft.EntityFrameworkCore.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.Caching.Abstractions" version="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="8.0.1" targetFramework="net462" />
   <package id="Microsoft.Extensions.Configuration" version="7.0.0" targetFramework="net462" />
   <package id="Microsoft.Extensions.Configuration.Abstractions" version="7.0.0" targetFramework="net462" />
   <package id="Microsoft.Extensions.Configuration.Binder" version="7.0.0" targetFramework="net462" />
   <package id="Microsoft.Extensions.DependencyInjection" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.2" targetFramework="net462" />
   <package id="Microsoft.Extensions.Localization.Abstractions" version="7.0.16" targetFramework="net462" />
   <package id="Microsoft.Extensions.Logging" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Options" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.3" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Options" version="8.0.2" targetFramework="net462" />
   <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Primitives" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Identity.Client" version="4.77.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Primitives" version="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.Identity.Client" version="4.82.1" targetFramework="net462" />
+  <package id="Microsoft.Identity.Client.Extensions.Msal" version="4.78.0" targetFramework="net462" />
   <package id="Microsoft.IdentityModel.Abstractions" version="8.14.0" targetFramework="net462" />
-  <package id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.1" targetFramework="net462" />
-  <package id="Microsoft.IdentityModel.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.IdentityModel.JsonWebTokens" version="7.7.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Logging" version="7.7.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Protocols" version="7.7.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Tokens" version="7.7.1" targetFramework="net462" />
   <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
   <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
@@ -59,29 +62,35 @@
   <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
   <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
   <package id="S22.Imap" version="3.6.0.0" targetFramework="net462" />
-  <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
+  <package id="System.Buffers" version="4.6.1" targetFramework="net462" />
+  <package id="System.ClientModel" version="1.8.0" targetFramework="net462" />
   <package id="System.CodeDom" version="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.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net462" />
   <package id="System.DirectoryServices.AccountManagement" version="7.0.1" targetFramework="net462" />
-  <package id="System.Formats.Asn1" version="9.0.0" targetFramework="net462" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="7.5.1" targetFramework="net462" />
+  <package id="System.Formats.Asn1" version="10.0.3" targetFramework="net462" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="7.7.1" targetFramework="net462" />
+  <package id="System.IO.FileSystem.AccessControl" version="5.0.0" targetFramework="net462" />
   <package id="System.IO.Packaging" version="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.Memory" version="4.6.3" targetFramework="net462" />
+  <package id="System.Memory.Data" version="8.0.1" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net462" />
+  <package id="System.Security.AccessControl" version="6.0.1" targetFramework="net462" />
   <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
   <package id="System.Security.Cryptography.Cng" version="5.0.0" targetFramework="net462" />
   <package id="System.Security.Cryptography.Pkcs" version="9.0.0" targetFramework="net462" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.ProtectedData" version="4.5.0" targetFramework="net462" />
   <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net462" />
   <package id="System.Text.Encodings.Web" version="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" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
+  <package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.6.1" targetFramework="net462" />
 </packages>

EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj

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

EnvelopeGenerator.CommonServices/app.config

@@ -39,7 +39,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
@@ -47,15 +47,15 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -63,7 +63,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -75,11 +75,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.3" newVersion="8.0.0.3" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -91,11 +91,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -103,7 +103,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -115,11 +115,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -141,6 +141,34 @@
         <assemblyIdentity name="Microsoft.IdentityModel.JsonWebTokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Identity.Client" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.82.1.0" newVersion="4.82.1.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="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.SqlClient" publicKeyToken="23ec7fc2d6eaa4a5" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Formats.Asn1" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.3" newVersion="10.0.0.3" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.AccessControl" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

EnvelopeGenerator.CommonServices/packages.config

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="10.1.1" targetFramework="net462" />
-  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
+  <package id="Azure.Core" version="1.50.0" targetFramework="net462" />
+  <package id="Azure.Identity" version="1.17.1" targetFramework="net462" />
+  <package id="BouncyCastle.Cryptography" version="2.6.2" targetFramework="net462" />
   <package id="DigitalData.Core.Abstraction.Application" version="1.6.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" />
@@ -20,33 +22,34 @@
   <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.Data.SqlClient" version="1.1.3" targetFramework="net462" />
-  <package id="Microsoft.Data.SqlClient.SNI" version="1.1.0" targetFramework="net462" />
+  <package id="Microsoft.Data.SqlClient" version="6.1.4" targetFramework="net462" />
+  <package id="Microsoft.Data.SqlClient.SNI" version="6.0.2" targetFramework="net462" />
   <package id="Microsoft.EntityFrameworkCore" version="3.1.32" targetFramework="net462" />
   <package id="Microsoft.EntityFrameworkCore.Abstractions" version="3.1.32" targetFramework="net462" />
   <package id="Microsoft.EntityFrameworkCore.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.Caching.Abstractions" version="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="8.0.1" targetFramework="net462" />
   <package id="Microsoft.Extensions.Configuration" version="7.0.0" targetFramework="net462" />
   <package id="Microsoft.Extensions.Configuration.Abstractions" version="7.0.0" targetFramework="net462" />
   <package id="Microsoft.Extensions.Configuration.Binder" version="7.0.0" targetFramework="net462" />
   <package id="Microsoft.Extensions.DependencyInjection" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.2" targetFramework="net462" />
   <package id="Microsoft.Extensions.Localization.Abstractions" version="7.0.16" targetFramework="net462" />
   <package id="Microsoft.Extensions.Logging" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Options" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.3" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Options" version="8.0.2" targetFramework="net462" />
   <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Primitives" version="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.Extensions.Primitives" version="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.Identity.Client" version="4.82.1" targetFramework="net462" />
+  <package id="Microsoft.Identity.Client.Extensions.Msal" version="4.78.0" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Abstractions" version="8.14.0" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.JsonWebTokens" version="7.7.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Logging" version="7.7.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Protocols" version="7.7.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.7.1" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Tokens" version="7.7.1" targetFramework="net462" />
   <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
   <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
@@ -57,29 +60,36 @@
   <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
   <package id="Quartz" version="3.8.0" targetFramework="net462" />
   <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
-  <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
+  <package id="System.Buffers" version="4.6.1" targetFramework="net462" />
+  <package id="System.ClientModel" version="1.8.0" targetFramework="net462" />
   <package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
   <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
   <package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net462" />
   <package id="System.Data.Common" version="4.3.0" targetFramework="net462" />
   <package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
-  <package id="System.Diagnostics.DiagnosticSource" version="7.0.0" targetFramework="net462" />
+  <package id="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net462" />
   <package id="System.DirectoryServices.AccountManagement" version="7.0.1" targetFramework="net462" />
   <package id="System.Drawing.Common" version="4.7.3" targetFramework="net462" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="7.5.1" targetFramework="net462" />
+  <package id="System.Formats.Asn1" version="10.0.3" targetFramework="net462" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="7.7.1" targetFramework="net462" />
+  <package id="System.IO.FileSystem.AccessControl" version="5.0.0" targetFramework="net462" />
   <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
   <package id="System.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.Memory" version="4.6.3" targetFramework="net462" />
+  <package id="System.Memory.Data" version="8.0.1" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net462" />
+  <package id="System.Security.AccessControl" version="6.0.1" targetFramework="net462" />
   <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
   <package id="System.Security.Cryptography.Cng" version="5.0.0" targetFramework="net462" />
   <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.ProtectedData" version="4.5.0" targetFramework="net462" />
   <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net462" />
   <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
-  <package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
+  <package id="System.Text.Json" version="8.0.6" targetFramework="net462" />
+  <package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.6.1" targetFramework="net462" />
   <package id="UserManager.Domain" version="3.2.3" targetFramework="net462" />
 </packages>

EnvelopeGenerator.Domain/Entities/Config.cs

@@ -1,11 +1,17 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+#if NETFRAMEWORK
+using System;
+#endif
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_CONFIG", Schema = "dbo")]
     public class Config
     {
+        [Column("DOCUMENT_PATH", TypeName = "nvarchar(256)")]
+        public string DocumentPath { get; set; }
+
         [Column("SENDING_PROFILE", TypeName = "int")]
         [Required]
         public int SendingProfile { get; set; }
@@ -19,5 +25,24 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [Column("EXPORT_PATH", TypeName = "nvarchar(256)")]
         public string ExportPath { get; set; }
+
+        [Column("ADDED_WHEN", TypeName = "datetime")]
+        [Required]
+        public DateTime AddedWhen { get; set; }
+
+        [Column("CHANGED_WHEN", TypeName = "datetime")]
+        public DateTime? ChangedWhen { get; set; }
+
+        [Column("GUID", TypeName = "tinyint")]
+        [Required]
+        public byte Guid { get; set; }
+
+        [Column("DEF_TFA_ENABLED", TypeName = "bit")]
+        [Required]
+        public bool DefTfaEnabled { get; set; }
+
+        [Column("DEF_TFA_WITH_PHONE", TypeName = "bit")]
+        [Required]
+        public bool DefTfaWithPhone { get; set; }
     }
 }

EnvelopeGenerator.Domain/Entities/DocumentStatus.cs

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

EnvelopeGenerator.Domain/Entities/EmailTemplate.cs

@@ -1,9 +1,11 @@
-using System;
-using DigitalData.Core.Abstractions.Interfaces;
+using DigitalData.Core.Abstractions.Interfaces;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using EnvelopeGenerator.Domain.Interfaces.Auditing;
+#if NETFRAMEWORK
+using System;
+#endif
 
 namespace EnvelopeGenerator.Domain.Entities
 {
@@ -24,6 +26,10 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("SUBJECT", TypeName = "nvarchar(512)")]
         public string Subject { get; set; }
 
+        [Required]
+        [Column("LANG_CODE", TypeName = "varchar(5)")]
+        public string LangCode { get; set; }
+
         [Required]
         [Column("ADDED_WHEN", TypeName = "datetime")]
         [DefaultValue("GETDATE()")]

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -5,6 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using EnvelopeGenerator.Domain.Constants;
 using Newtonsoft.Json;
 using EnvelopeGenerator.Domain.Interfaces.Auditing;
+using EnvelopeGenerator.Domain.Interfaces;
 #if NETFRAMEWORK
 using System.Collections.Generic;
 using System.Linq;
@@ -13,7 +14,7 @@ using System.Linq;
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_ENVELOPE", Schema = "dbo")]
-    public class Envelope : IHasAddedWhen, IHasChangedWhen
+    public class Envelope : IHasAddedWhen, IHasChangedWhen, IEnvelope
     {
         public Envelope()
         {
@@ -75,11 +76,14 @@ namespace EnvelopeGenerator.Domain.Entities
 #if nullable
         ?
 #endif
-            Title
-        { get; set; }
+            Title { get; set; }
 
         [Column("COMMENT", TypeName = "nvarchar(128)")]
-        public string Comment { get; set; }
+        public string
+#if nullable
+        ?
+#endif
+            Comment { get; set; }
 
         [Column("CONTRACT_TYPE")]
         public int? ContractType { get; set; }
@@ -106,7 +110,8 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [JsonIgnore]
         [NotMapped]
-        public bool ReadOnly => EnvelopeTypeId == 2;
+        [Obsolete("Use EnvelopeGenerator.Domain.Interfaces.EnvelopeExtensions.IsReadAndConfirm extension method instead.")]
+        public bool ReadOnly => this.IsReadAndConfirm();
 
         [Column("CERTIFICATION_TYPE")]
         public int? CertificationType { get; set; }
@@ -149,8 +154,7 @@ namespace EnvelopeGenerator.Domain.Entities
 #if nullable
         ?
 #endif
-            Type
-        { get; set; }
+            Type { get; set; }
 
 #if NETFRAMEWORK
         [NotMapped]
@@ -164,22 +168,26 @@ namespace EnvelopeGenerator.Domain.Entities
 #if nullable
         ?
 #endif
-            Documents
-        { get; set; }
+            Documents { get; set; }
+
+        [NotMapped]
+        public Document
+#if nullable
+        ?
+#endif
+            DefaultDocument => Documents?.FirstOrDefault();
 
         public List<History>
 #if nullable
         ?
 #endif
-            Histories
-        { get; set; }
+            Histories { get; set; }
 
         public List<EnvelopeReceiver>
 #if nullable
         ?
 #endif
-            EnvelopeReceivers
-        { get; set; }
+            EnvelopeReceivers { get; set; }
 
         //#if NETFRAMEWORK
         /// <summary>

EnvelopeGenerator.Domain/Entities/EnvelopeReport.cs

@@ -0,0 +1,36 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace EnvelopeGenerator.Domain.Entities
+{
+    [Table("VWSIG_ENVELOPE_REPORT", Schema = "dbo")]
+    public class EnvelopeReport
+    {
+        [Column("ENVELOPE_ID", TypeName = "int")]
+        [Required]
+        public int EnvelopeId { get; set; }
+
+        [Column("HEAD_UUID", TypeName = "nvarchar(36)")]
+        [Required]
+        public string HeadUuid { get; set; }
+
+        [Column("HEAD_TITLE", TypeName = "nvarchar(128)")]
+        public string HeadTitle { get; set; }
+
+        [Column("HEAD_MESSAGE", TypeName = "nvarchar(max)")]
+        [Required]
+        public string HeadMessage { get; set; }
+
+        [Column("POS_STATUS", TypeName = "int")]
+        [Required]
+        public int PosStatus { get; set; }
+
+        [Column("POS_WHEN", TypeName = "datetime")]
+        public DateTime? PosWhen { get; set; }
+
+        [Column("POS_WHO", TypeName = "nvarchar(128)")]
+        [Required]
+        public string PosWho { get; set; }
+    }
+}

EnvelopeGenerator.Domain/Entities/History.cs

@@ -35,8 +35,11 @@ namespace EnvelopeGenerator.Domain.Entities
         public DateTime AddedWhen { get; set; }
 
         [Column("ACTION_DATE", TypeName = "datetime")]
-        public DateTime? ChangedWhen { get; set; }
-        
+        public DateTime? ActionDate { get; set; }
+
+        [NotMapped]
+        public DateTime? ChangedWhen { get => ActionDate; set => ActionDate = value; }
+
         [Column("COMMENT", TypeName = "nvarchar(max)")]
         public string
 #if nullable

EnvelopeGenerator.Domain/Entities/Signature.cs

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

EnvelopeGenerator.Domain/Interfaces/IEnvelope.cs

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

EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj

@@ -52,7 +52,7 @@
   <ItemGroup>
     <Reference Include="Accessibility" />
     <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
-      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.6.2\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.BonusSkins.v21.2" />
     <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -200,9 +200,8 @@
     <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>
-    <Reference Include="Microsoft.Identity.Client, Version=4.55.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Identity.Client.4.77.0\lib\net462\Microsoft.Identity.Client.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Identity.Client, Version=4.82.1.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Identity.Client.4.82.1\lib\net462\Microsoft.Identity.Client.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.8.14.0\lib\net462\Microsoft.IdentityModel.Abstractions.dll</HintPath>
@@ -236,8 +235,8 @@
       <HintPath>..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.CodeDom, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.CodeDom.9.0.0\lib\net462\System.CodeDom.dll</HintPath>
@@ -262,8 +261,8 @@
     <Reference Include="System.Drawing.Common, Version=4.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Drawing.Common.4.7.3\lib\net461\System.Drawing.Common.dll</HintPath>
     </Reference>
-    <Reference Include="System.Formats.Asn1, Version=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 Include="System.Formats.Asn1, Version=10.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Formats.Asn1.10.0.3\lib\net462\System.Formats.Asn1.dll</HintPath>
     </Reference>
     <Reference Include="System.IdentityModel" />
     <Reference Include="System.IO.Compression" />
@@ -274,19 +273,19 @@
       <HintPath>..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
-    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Runtime.Serialization" />
@@ -305,8 +304,8 @@
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    <Reference Include="System.ValueTuple, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.6.1\lib\net462\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />

EnvelopeGenerator.Form/app.config

@@ -89,15 +89,15 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -105,7 +105,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
@@ -133,7 +133,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.IdentityModel.Abstractions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -157,11 +157,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -177,11 +177,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -201,12 +201,32 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Identity.Client" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.8.0" newVersion="3.0.8.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.82.1.0" newVersion="4.82.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>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Formats.Asn1" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.3" newVersion="10.0.0.3" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.SqlClient" publicKeyToken="23ec7fc2d6eaa4a5" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.AccessControl" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <entityFramework>

EnvelopeGenerator.Form/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
+  <package id="BouncyCastle.Cryptography" version="2.6.2" targetFramework="net462" />
   <package id="DigitalData.Controls.DocumentViewer" version="1.9.8" targetFramework="net462" />
   <package id="DigitalData.Modules.Base" version="1.3.8" targetFramework="net462" />
   <package id="DigitalData.Modules.Config" version="1.3.0" targetFramework="net462" />
@@ -20,7 +20,7 @@
   <package id="Microsoft.Bcl.Cryptography" version="9.0.0" 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.Identity.Client" version="4.77.0" targetFramework="net462" />
+  <package id="Microsoft.Identity.Client" version="4.82.1" targetFramework="net462" />
   <package id="Microsoft.IdentityModel.Abstractions" version="8.14.0" targetFramework="net462" />
   <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
@@ -32,24 +32,24 @@
   <package id="Quartz" version="3.8.0" targetFramework="net462" />
   <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
   <package id="S22.Imap" version="3.6.0.0" targetFramework="net462" />
-  <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
+  <package id="System.Buffers" version="4.6.1" targetFramework="net462" />
   <package id="System.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.Odbc" version="6.0.1" targetFramework="net462" />
   <package id="System.Diagnostics.DiagnosticSource" version="6.0.1" targetFramework="net462" />
   <package id="System.Drawing.Common" version="4.7.3" targetFramework="net462" />
-  <package id="System.Formats.Asn1" version="9.0.0" targetFramework="net462" />
+  <package id="System.Formats.Asn1" version="10.0.3" targetFramework="net462" />
   <package id="System.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.Memory" version="4.6.3" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net462" />
   <package id="System.Security.Cryptography.Pkcs" version="9.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" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.6.1" targetFramework="net462" />
   <package id="UserManager.Domain" version="3.2.3" targetFramework="net462" />
 </packages>

EnvelopeGenerator.Infrastructure/EGDbContext.cs

@@ -79,6 +79,8 @@ public abstract class EGDbContextBase : DbContext
 
     public DbSet<ClientUser> ClientUsers { get; set; }
 
+    public DbSet<EnvelopeReport> EnvelopeReports { get; set; }
+
     private readonly DbTriggerParams _triggers;
 
     private readonly ILogger

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

@@ -24,7 +24,13 @@
     <PackageReference Include="Dapper" Version="2.1.66" />
     <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.6.0" />
     <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.6.1" />
+    <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
     <PackageReference Include="QuestPDF" Version="2025.7.1" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
+    <PackageReference Include="System.Formats.Asn1" Version="10.0.3" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
   </ItemGroup>
 
   <ItemGroup>

EnvelopeGenerator.Jobs/EnvelopeGenerator.Jobs.csproj

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Quartz" Version="3.9.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
-    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
-    <ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj" />
-  </ItemGroup>
-
-</Project>

EnvelopeGenerator.Jobs/Jobs/APIBackendJobs/APIEnvelopeJob.cs

@@ -1,151 +0,0 @@
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using EnvelopeGenerator.Domain.Constants;
-using Microsoft.Data.SqlClient;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using Quartz;
-
-namespace EnvelopeGenerator.Jobs.APIBackendJobs;
-
-public class APIEnvelopeJob(ILogger<APIEnvelopeJob>? logger = null) : IJob
-{
-    private readonly ILogger<APIEnvelopeJob> _logger = logger ?? NullLogger<APIEnvelopeJob>.Instance;
-
-    public async Task Execute(IJobExecutionContext context)
-    {
-        var jobId = context.JobDetail.Key.ToString();
-        _logger.LogDebug("API Envelopes - Starting job {JobId}", jobId);
-
-        try
-        {
-            var connectionString = context.MergedJobDataMap.GetString(Value.DATABASE);
-            if (string.IsNullOrWhiteSpace(connectionString))
-            {
-                _logger.LogWarning("API Envelopes - Connection string missing");
-                return;
-            }
-
-            await using var connection = new SqlConnection(connectionString);
-            await connection.OpenAsync(context.CancellationToken);
-
-            await ProcessInvitationsAsync(connection, context.CancellationToken);
-            await ProcessWithdrawnAsync(connection, context.CancellationToken);
-
-            _logger.LogDebug("API Envelopes - Completed job {JobId} successfully", jobId);
-        }
-        catch (System.Exception ex)
-        {
-            _logger.LogError(ex, "API Envelopes job failed");
-        }
-        finally
-        {
-            _logger.LogDebug("API Envelopes execution for {JobId} ended", jobId);
-        }
-    }
-
-    private async Task ProcessInvitationsAsync(SqlConnection connection, System.Threading.CancellationToken cancellationToken)
-    {
-        const string sql = "SELECT GUID FROM TBSIG_ENVELOPE WHERE SOURCE = 'API' AND STATUS = 1003 ORDER BY GUID";
-        var envelopeIds = new List<int>();
-
-        await using (var command = new SqlCommand(sql, connection))
-        await using (var reader = await command.ExecuteReaderAsync(cancellationToken))
-        {
-            while (await reader.ReadAsync(cancellationToken))
-            {
-                if (reader[0] is int id)
-                {
-                    envelopeIds.Add(id);
-                }
-            }
-        }
-
-        if (envelopeIds.Count == 0)
-        {
-            _logger.LogDebug("SendInvMail - No envelopes found");
-            return;
-        }
-
-        _logger.LogInformation("SendInvMail - Found {Count} envelopes", envelopeIds.Count);
-        var total = envelopeIds.Count;
-        var current = 1;
-
-        foreach (var id in envelopeIds)
-        {
-            _logger.LogInformation("SendInvMail - Processing Envelope {EnvelopeId} ({Current}/{Total})", id, current, total);
-            try
-            {
-                // Placeholder for invitation email sending logic.
-                _logger.LogDebug("SendInvMail - Marking envelope {EnvelopeId} as queued", id);
-                const string updateSql = "UPDATE TBSIG_ENVELOPE SET CURRENT_WORK_APP = @App WHERE GUID = @Id";
-                await using var updateCommand = new SqlCommand(updateSql, connection);
-                updateCommand.Parameters.AddWithValue("@App", "signFLOW_API_EnvJob_InvMail");
-                updateCommand.Parameters.AddWithValue("@Id", id);
-                await updateCommand.ExecuteNonQueryAsync(cancellationToken);
-            }
-            catch (System.Exception ex)
-            {
-                _logger.LogWarning(ex, "SendInvMail - Unhandled exception while working envelope {EnvelopeId}", id);
-            }
-
-            current++;
-            _logger.LogInformation("SendInvMail - Envelope finalized");
-        }
-    }
-
-    private async Task ProcessWithdrawnAsync(SqlConnection connection, System.Threading.CancellationToken cancellationToken)
-    {
-        const string sql = @"SELECT ENV.GUID, REJ.COMMENT AS REJECTION_REASON FROM 
-                (SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = 1009 AND SOURCE = 'API') ENV INNER JOIN
-                (SELECT MAX(GUID) GUID, ENVELOPE_ID, MAX(ADDED_WHEN) ADDED_WHEN, MAX(ACTION_DATE) ACTION_DATE, COMMENT FROM TBSIG_ENVELOPE_HISTORY WHERE STATUS = 1009 GROUP BY ENVELOPE_ID, COMMENT ) REJ ON ENV.GUID = REJ.ENVELOPE_ID LEFT JOIN
-                (SELECT * FROM TBSIG_ENVELOPE_HISTORY WHERE STATUS = 3004 ) M_Send ON ENV.GUID = M_Send.ENVELOPE_ID
-                WHERE M_Send.GUID IS NULL";
-
-        var withdrawn = new List<(int EnvelopeId, string Reason)>();
-        await using (var command = new SqlCommand(sql, connection))
-        await using (var reader = await command.ExecuteReaderAsync(cancellationToken))
-        {
-            while (await reader.ReadAsync(cancellationToken))
-            {
-                var id = reader.GetInt32(0);
-                var reason = reader.IsDBNull(1) ? string.Empty : reader.GetString(1);
-                withdrawn.Add((id, reason));
-            }
-        }
-
-        if (withdrawn.Count == 0)
-        {
-            _logger.LogDebug("WithdrawnEnv - No envelopes found");
-            return;
-        }
-
-        _logger.LogInformation("WithdrawnEnv - Found {Count} envelopes", withdrawn.Count);
-        var total = withdrawn.Count;
-        var current = 1;
-
-        foreach (var (envelopeId, reason) in withdrawn)
-        {
-            _logger.LogInformation("WithdrawnEnv - Processing Envelope {EnvelopeId} ({Current}/{Total})", envelopeId, current, total);
-            try
-            {
-                // Log withdrawn mail trigger placeholder
-                const string insertHistory = "INSERT INTO TBSIG_ENVELOPE_HISTORY (ENVELOPE_ID, STATUS, USER_REFERENCE, ADDED_WHEN, ACTION_DATE, COMMENT) VALUES (@EnvelopeId, @Status, @UserReference, GETDATE(), GETDATE(), @Comment)";
-                await using var insertCommand = new SqlCommand(insertHistory, connection);
-                insertCommand.Parameters.AddWithValue("@EnvelopeId", envelopeId);
-                insertCommand.Parameters.AddWithValue("@Status", 3004);
-                insertCommand.Parameters.AddWithValue("@UserReference", "API");
-                insertCommand.Parameters.AddWithValue("@Comment", reason ?? string.Empty);
-                await insertCommand.ExecuteNonQueryAsync(cancellationToken);
-            }
-            catch (System.Exception ex)
-            {
-                _logger.LogWarning(ex, "WithdrawnEnv - Unhandled exception while working envelope {EnvelopeId}", envelopeId);
-            }
-
-            current++;
-            _logger.LogInformation("WithdrawnEnv - Envelope finalized");
-        }
-    }
-}

EnvelopeGenerator.Jobs/Jobs/DataRowExtensions.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Data;
-
-namespace EnvelopeGenerator.Jobs;
-
-public static class DataRowExtensions
-{
-    public static T? GetValueOrDefault<T>(this DataRow row, string columnName, T? defaultValue = default)
-    {
-        if (!row.Table.Columns.Contains(columnName))
-        {
-            return defaultValue;
-        }
-
-        var value = row[columnName];
-        if (value == DBNull.Value)
-        {
-            return defaultValue;
-        }
-
-        try
-        {
-            return (T)Convert.ChangeType(value, typeof(T));
-        }
-        catch
-        {
-            return defaultValue;
-        }
-    }
-}

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/FinalizeDocumentExceptions.cs

@@ -1,28 +0,0 @@
-namespace EnvelopeGenerator.Jobs.FinalizeDocument;
-
-public static class FinalizeDocumentExceptions
-{
-    public class MergeDocumentException : ApplicationException
-    {
-        public MergeDocumentException(string message) : base(message) { }
-        public MergeDocumentException(string message, Exception innerException) : base(message, innerException) { }
-    }
-
-    public class BurnAnnotationException : ApplicationException
-    {
-        public BurnAnnotationException(string message) : base(message) { }
-        public BurnAnnotationException(string message, Exception innerException) : base(message, innerException) { }
-    }
-
-    public class CreateReportException : ApplicationException
-    {
-        public CreateReportException(string message) : base(message) { }
-        public CreateReportException(string message, Exception innerException) : base(message, innerException) { }
-    }
-
-    public class ExportDocumentException : ApplicationException
-    {
-        public ExportDocumentException(string message) : base(message) { }
-        public ExportDocumentException(string message, Exception innerException) : base(message, innerException) { }
-    }
-}

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/FinalizeDocumentJob.cs

@@ -1,229 +0,0 @@
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.Data.SqlClient;
-using Microsoft.Extensions.Logging;
-using Quartz;
-using static EnvelopeGenerator.Jobs.FinalizeDocument.FinalizeDocumentExceptions;
-
-namespace EnvelopeGenerator.Jobs.FinalizeDocument;
-
-public class FinalizeDocumentJob : IJob
-{
-    private readonly ILogger<FinalizeDocumentJob> _logger;
-    private readonly PDFBurner _pdfBurner;
-    private readonly PDFMerger _pdfMerger;
-    private readonly ReportCreator _reportCreator;
-
-    private record ConfigSettings(string DocumentPath, string DocumentPathOrigin, string ExportPath);
-
-    public FinalizeDocumentJob(
-        ILogger<FinalizeDocumentJob> logger,
-        PDFBurner pdfBurner,
-        PDFMerger pdfMerger,
-        ReportCreator reportCreator)
-    {
-        _logger = logger;
-        _pdfBurner = pdfBurner;
-        _pdfMerger = pdfMerger;
-        _reportCreator = reportCreator;
-    }
-
-    public async Task Execute(IJobExecutionContext context)
-    {
-        var jobId = context.JobDetail.Key.ToString();
-        _logger.LogDebug("Starting job {JobId}", jobId);
-
-        try
-        {
-            var connectionString = context.MergedJobDataMap.GetString(Value.DATABASE);
-            if (string.IsNullOrWhiteSpace(connectionString))
-            {
-                _logger.LogWarning("FinalizeDocument - Connection string missing");
-                return;
-            }
-
-            await using var connection = new SqlConnection(connectionString);
-            await connection.OpenAsync(context.CancellationToken);
-
-            var config = await LoadConfigurationAsync(connection, context.CancellationToken);
-            var envelopes = await LoadCompletedEnvelopesAsync(connection, context.CancellationToken);
-
-            if (envelopes.Count == 0)
-            {
-                _logger.LogInformation("No completed envelopes found");
-                return;
-            }
-
-            var total = envelopes.Count;
-            var current = 1;
-
-            foreach (var envelopeId in envelopes)
-            {
-                _logger.LogInformation("Finalizing Envelope {EnvelopeId} ({Current}/{Total})", envelopeId, current, total);
-                try
-                {
-                    var envelopeData = await GetEnvelopeDataAsync(connection, envelopeId, context.CancellationToken);
-                    if (envelopeData is null)
-                    {
-                        _logger.LogWarning("Envelope data not found for {EnvelopeId}", envelopeId);
-                        continue;
-                    }
-
-                    var data = envelopeData.Value;
-
-                    var envelope = new Envelope
-                    {
-                        Id = envelopeId,
-                        Uuid = data.EnvelopeUuid ?? string.Empty,
-                        Title = data.Title ?? string.Empty,
-                        FinalEmailToCreator = (int)FinalEmailType.No,
-                        FinalEmailToReceivers = (int)FinalEmailType.No
-                    };
-
-                    var burned = _pdfBurner.BurnAnnotsToPDF(data.DocumentBytes, data.AnnotationData, envelopeId);
-                    var report = _reportCreator.CreateReport(connection, envelope);
-                    var merged = _pdfMerger.MergeDocuments(burned, report);
-
-                    var outputDirectory = Path.Combine(config.ExportPath, data.ParentFolderUid);
-                    Directory.CreateDirectory(outputDirectory);
-                    var outputPath = Path.Combine(outputDirectory, $"{envelope.Uuid}.pdf");
-                    await File.WriteAllBytesAsync(outputPath, merged, context.CancellationToken);
-
-                    await UpdateDocumentResultAsync(connection, envelopeId, merged, context.CancellationToken);
-                    await ArchiveEnvelopeAsync(connection, envelopeId, context.CancellationToken);
-                }
-                catch (MergeDocumentException ex)
-                {
-                    _logger.LogWarning(ex, "Certificate Document job failed at merging documents");
-                }
-                catch (ExportDocumentException ex)
-                {
-                    _logger.LogWarning(ex, "Certificate Document job failed at exporting document");
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Unhandled exception while working envelope {EnvelopeId}", envelopeId);
-                }
-
-                current++;
-                _logger.LogInformation("Envelope {EnvelopeId} finalized", envelopeId);
-            }
-
-            _logger.LogDebug("Completed job {JobId} successfully", jobId);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Certificate Document job failed");
-        }
-        finally
-        {
-            _logger.LogDebug("Job execution for {JobId} ended", jobId);
-        }
-    }
-
-    private async Task<ConfigSettings> LoadConfigurationAsync(SqlConnection connection, CancellationToken cancellationToken)
-    {
-        const string sql = "SELECT TOP 1 DOCUMENT_PATH, EXPORT_PATH FROM TBSIG_CONFIG";
-        await using var command = new SqlCommand(sql, connection);
-        await using var reader = await command.ExecuteReaderAsync(cancellationToken);
-        if (await reader.ReadAsync(cancellationToken))
-        {
-            var documentPath = reader.IsDBNull(0) ? string.Empty : reader.GetString(0);
-            var exportPath = reader.IsDBNull(1) ? string.Empty : reader.GetString(1);
-            return new ConfigSettings(documentPath, documentPath, exportPath);
-        }
-
-        return new ConfigSettings(string.Empty, string.Empty, Path.GetTempPath());
-    }
-
-    private async Task<List<int>> LoadCompletedEnvelopesAsync(SqlConnection connection, CancellationToken cancellationToken)
-    {
-        const string sql = "SELECT GUID FROM TBSIG_ENVELOPE WHERE STATUS = @Status AND DATEDIFF(minute, CHANGED_WHEN, GETDATE()) >= 1 ORDER BY GUID";
-        var ids = new List<int>();
-        await using var command = new SqlCommand(sql, connection);
-        command.Parameters.AddWithValue("@Status", (int)EnvelopeStatus.EnvelopeCompletelySigned);
-        await using var reader = await command.ExecuteReaderAsync(cancellationToken);
-        while (await reader.ReadAsync(cancellationToken))
-        {
-            ids.Add(reader.GetInt32(0));
-        }
-
-        return ids;
-    }
-
-    private async Task<(int EnvelopeId, string? EnvelopeUuid, string? Title, byte[] DocumentBytes, List<string> AnnotationData, string ParentFolderUid)?> GetEnvelopeDataAsync(SqlConnection connection, int envelopeId, CancellationToken cancellationToken)
-    {
-        const string sql = @"SELECT T.GUID, T.ENVELOPE_UUID, T.TITLE, T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T
-                JOIN TBSIG_ENVELOPE_DOCUMENT T2 ON T.GUID = T2.ENVELOPE_ID
-                WHERE T.GUID = @EnvelopeId";
-
-        await using var command = new SqlCommand(sql, connection);
-        command.Parameters.AddWithValue("@EnvelopeId", envelopeId);
-        await using var reader = await command.ExecuteReaderAsync(CommandBehavior.SingleRow, cancellationToken);
-        if (!await reader.ReadAsync(cancellationToken))
-        {
-            return null;
-        }
-
-        var envelopeUuid = reader.IsDBNull(1) ? string.Empty : reader.GetString(1);
-        var title = reader.IsDBNull(2) ? string.Empty : reader.GetString(2);
-        var filePath = reader.IsDBNull(3) ? string.Empty : reader.GetString(3);
-        var bytes = reader.IsDBNull(4) ? Array.Empty<byte>() : (byte[])reader[4];
-        await reader.CloseAsync();
-
-        if (bytes.Length == 0 && !string.IsNullOrWhiteSpace(filePath) && File.Exists(filePath))
-        {
-            bytes = await File.ReadAllBytesAsync(filePath, cancellationToken);
-        }
-
-        var annotations = await GetAnnotationDataAsync(connection, envelopeId, cancellationToken);
-
-        var parentFolderUid = !string.IsNullOrWhiteSpace(filePath)
-            ? Path.GetFileName(Path.GetDirectoryName(filePath) ?? string.Empty)
-            : envelopeUuid;
-
-        return (envelopeId, envelopeUuid, title, bytes, annotations, parentFolderUid ?? envelopeUuid ?? envelopeId.ToString());
-    }
-
-    private async Task<List<string>> GetAnnotationDataAsync(SqlConnection connection, int envelopeId, CancellationToken cancellationToken)
-    {
-        const string sql = "SELECT VALUE FROM TBSIG_DOCUMENT_STATUS WHERE ENVELOPE_ID = @EnvelopeId";
-        var result = new List<string>();
-        await using var command = new SqlCommand(sql, connection);
-        command.Parameters.AddWithValue("@EnvelopeId", envelopeId);
-        await using var reader = await command.ExecuteReaderAsync(cancellationToken);
-        while (await reader.ReadAsync(cancellationToken))
-        {
-            if (!reader.IsDBNull(0))
-            {
-                result.Add(reader.GetString(0));
-            }
-        }
-
-        return result;
-    }
-
-    private static async Task UpdateDocumentResultAsync(SqlConnection connection, int envelopeId, byte[] bytes, CancellationToken cancellationToken)
-    {
-        const string sql = "UPDATE TBSIG_ENVELOPE SET DOC_RESULT = @ImageData WHERE GUID = @EnvelopeId";
-        await using var command = new SqlCommand(sql, connection);
-        command.Parameters.AddWithValue("@ImageData", bytes);
-        command.Parameters.AddWithValue("@EnvelopeId", envelopeId);
-        await command.ExecuteNonQueryAsync(cancellationToken);
-    }
-
-    private static async Task ArchiveEnvelopeAsync(SqlConnection connection, int envelopeId, CancellationToken cancellationToken)
-    {
-        const string sql = "UPDATE TBSIG_ENVELOPE SET STATUS = @Status, CHANGED_WHEN = GETDATE() WHERE GUID = @EnvelopeId";
-        await using var command = new SqlCommand(sql, connection);
-        command.Parameters.AddWithValue("@Status", (int)EnvelopeStatus.EnvelopeArchived);
-        command.Parameters.AddWithValue("@EnvelopeId", envelopeId);
-        await command.ExecuteNonQueryAsync(cancellationToken);
-    }
-}

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/PDFBurner.cs

@@ -1,277 +0,0 @@
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using iText.IO.Image;
-using iText.Kernel.Colors;
-using iText.Kernel.Pdf;
-using iText.Kernel.Pdf.Canvas;
-using iText.Layout;
-using iText.Layout.Element;
-using iText.Layout.Font;
-using iText.Layout.Properties;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using Newtonsoft.Json;
-using static EnvelopeGenerator.Jobs.FinalizeDocument.FinalizeDocumentExceptions;
-using LayoutImage = iText.Layout.Element.Image;
-
-namespace EnvelopeGenerator.Jobs.FinalizeDocument;
-
-public class PDFBurner
-{
-    private static readonly FontProvider FontProvider = CreateFontProvider();
-    private readonly ILogger<PDFBurner> _logger;
-    private readonly PDFBurnerParams _pdfBurnerParams;
-
-    public PDFBurner() : this(NullLogger<PDFBurner>.Instance, new PDFBurnerParams())
-    {
-    }
-
-    public PDFBurner(ILogger<PDFBurner> logger, PDFBurnerParams? pdfBurnerParams = null)
-    {
-        _logger = logger;
-        _pdfBurnerParams = pdfBurnerParams ?? new PDFBurnerParams();
-    }
-
-    public byte[] BurnAnnotsToPDF(byte[] sourceBuffer, IList<string> instantJsonList, int envelopeId)
-    {
-        if (sourceBuffer is null || sourceBuffer.Length == 0)
-        {
-            throw new BurnAnnotationException("Source document is empty");
-        }
-
-        try
-        {
-            using var inputStream = new MemoryStream(sourceBuffer);
-            using var outputStream = new MemoryStream();
-            using var reader = new PdfReader(inputStream);
-            using var writer = new PdfWriter(outputStream);
-            using var pdf = new PdfDocument(reader, writer);
-
-            foreach (var json in instantJsonList ?? Enumerable.Empty<string>())
-            {
-                if (string.IsNullOrWhiteSpace(json))
-                {
-                    continue;
-                }
-
-                var annotationData = JsonConvert.DeserializeObject<AnnotationData>(json);
-                if (annotationData?.annotations is null)
-                {
-                    continue;
-                }
-
-                annotationData.annotations.Reverse();
-
-                foreach (var annotation in annotationData.annotations)
-                {
-                    try
-                    {
-                        switch (annotation.type)
-                        {
-                            case AnnotationType.Image:
-                                AddImageAnnotation(pdf, annotation, annotationData.attachments);
-                                break;
-                            case AnnotationType.Ink:
-                                AddInkAnnotation(pdf, annotation);
-                                break;
-                            case AnnotationType.Widget:
-                                var formFieldValue = annotationData.formFieldValues?.FirstOrDefault(fv => fv.name == annotation.id);
-                                if (formFieldValue is not null && !_pdfBurnerParams.IgnoredLabels.Contains(formFieldValue.value))
-                                {
-                                    AddFormFieldValue(pdf, annotation, formFieldValue.value);
-                                }
-                                break;
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogWarning(ex, "Error applying annotation {AnnotationId} on envelope {EnvelopeId}", annotation.id, envelopeId);
-                        throw new BurnAnnotationException("Adding annotation failed", ex);
-                    }
-                }
-            }
-
-            pdf.Close();
-            return outputStream.ToArray();
-        }
-        catch (BurnAnnotationException)
-        {
-            throw;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Failed to burn annotations for envelope {EnvelopeId}", envelopeId);
-            throw new BurnAnnotationException("Annotations could not be burned", ex);
-        }
-    }
-
-    private void AddImageAnnotation(PdfDocument pdf, Annotation annotation, Dictionary<string, Attachment>? attachments)
-    {
-        if (attachments is null || string.IsNullOrWhiteSpace(annotation.imageAttachmentId) || !attachments.TryGetValue(annotation.imageAttachmentId, out var attachment))
-        {
-            return;
-        }
-
-        var page = pdf.GetPage(annotation.pageIndex + 1);
-        var bounds = annotation.bbox.Select(ToInches).ToList();
-        var x = (float)bounds[0];
-        var y = (float)bounds[1];
-        var width = (float)bounds[2];
-        var height = (float)bounds[3];
-
-        var imageBytes = Convert.FromBase64String(attachment.binary);
-        var imageData = ImageDataFactory.Create(imageBytes);
-        var image = new LayoutImage(imageData)
-            .ScaleAbsolute(width, height)
-            .SetFixedPosition(annotation.pageIndex + 1, x, y);
-
-        using var canvas = new Canvas(new PdfCanvas(page), page.GetPageSize());
-        canvas.Add(image);
-    }
-
-    private void AddInkAnnotation(PdfDocument pdf, Annotation annotation)
-    {
-        if (annotation.lines?.points is null)
-        {
-            return;
-        }
-
-        var page = pdf.GetPage(annotation.pageIndex + 1);
-        var canvas = new PdfCanvas(page);
-        var color = ParseColor(annotation.strokeColor);
-        canvas.SetStrokeColor(color);
-        canvas.SetLineWidth(1);
-
-        foreach (var segment in annotation.lines.points)
-        {
-            var first = true;
-            foreach (var point in segment)
-            {
-                var (px, py) = (ToInches(point[0]), ToInches(point[1]));
-                if (first)
-                {
-                    canvas.MoveTo(px, py);
-                    first = false;
-                }
-                else
-                {
-                    canvas.LineTo(px, py);
-                }
-            }
-            canvas.Stroke();
-        }
-    }
-
-    private static FontProvider CreateFontProvider()
-    {
-        var provider = new FontProvider();
-        provider.AddStandardPdfFonts();
-        provider.AddSystemFonts();
-        return provider;
-    }
-
-    private void AddFormFieldValue(PdfDocument pdf, Annotation annotation, string value)
-    {
-        var bounds = annotation.bbox.Select(ToInches).ToList();
-        var x = (float)bounds[0];
-        var y = (float)bounds[1];
-        var width = (float)bounds[2];
-        var height = (float)bounds[3];
-
-        var page = pdf.GetPage(annotation.pageIndex + 1);
-        var canvas = new Canvas(new PdfCanvas(page), page.GetPageSize());
-        canvas.SetProperty(Property.FONT_PROVIDER, FontProvider);
-        canvas.SetProperty(Property.FONT, FontProvider.GetFontSet());
-
-        var paragraph = new Paragraph(value)
-            .SetFontSize(_pdfBurnerParams.FontSize)
-            .SetFontColor(ColorConstants.BLACK)
-            .SetFontFamily(_pdfBurnerParams.FontName);
-
-        if (_pdfBurnerParams.FontStyle.HasFlag(FontStyle.Italic))
-        {
-            paragraph.SetItalic();
-        }
-
-        if (_pdfBurnerParams.FontStyle.HasFlag(FontStyle.Bold))
-        {
-            paragraph.SetBold();
-        }
-
-        canvas.ShowTextAligned(
-            paragraph,
-            x + (float)_pdfBurnerParams.TopMargin,
-            y + (float)_pdfBurnerParams.YOffset,
-            annotation.pageIndex + 1,
-            iText.Layout.Properties.TextAlignment.LEFT,
-            iText.Layout.Properties.VerticalAlignment.TOP,
-            0);
-    }
-
-    private static DeviceRgb ParseColor(string? color)
-    {
-        if (string.IsNullOrWhiteSpace(color))
-        {
-            return new DeviceRgb(0, 0, 0);
-        }
-
-        try
-        {
-            var drawingColor = ColorTranslator.FromHtml(color);
-            return new DeviceRgb(drawingColor.R, drawingColor.G, drawingColor.B);
-        }
-        catch
-        {
-            return new DeviceRgb(0, 0, 0);
-        }
-    }
-
-    private static double ToInches(double value) => value / 72d;
-    private static double ToInches(float value) => value / 72d;
-
-    #region Model
-    private static class AnnotationType
-    {
-        public const string Image = "pspdfkit/image";
-        public const string Ink = "pspdfkit/ink";
-        public const string Widget = "pspdfkit/widget";
-    }
-
-    private sealed class AnnotationData
-    {
-        public List<Annotation>? annotations { get; set; }
-        public Dictionary<string, Attachment>? attachments { get; set; }
-        public List<FormFieldValue>? formFieldValues { get; set; }
-    }
-
-    private sealed class Annotation
-    {
-        public string id { get; set; } = string.Empty;
-        public List<double> bbox { get; set; } = new();
-        public string type { get; set; } = string.Empty;
-        public string imageAttachmentId { get; set; } = string.Empty;
-        public Lines? lines { get; set; }
-        public int pageIndex { get; set; }
-        public string strokeColor { get; set; } = string.Empty;
-        public string egName { get; set; } = string.Empty;
-    }
-
-    private sealed class Lines
-    {
-        public List<List<List<float>>> points { get; set; } = new();
-    }
-
-    private sealed class Attachment
-    {
-        public string binary { get; set; } = string.Empty;
-        public string contentType { get; set; } = string.Empty;
-    }
-
-    private sealed class FormFieldValue
-    {
-        public string name { get; set; } = string.Empty;
-        public string value { get; set; } = string.Empty;
-    }
-    #endregion
-}

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/PDFBurnerParams.cs

@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-using System.Drawing;
-
-namespace EnvelopeGenerator.Jobs.FinalizeDocument;
-
-public class PDFBurnerParams
-{
-    public List<string> IgnoredLabels { get; } = new() { "Date", "Datum", "ZIP", "PLZ", "Place", "Ort", "Position", "Stellung" };
-
-    public double TopMargin { get; set; } = 0.1;
-
-    public double YOffset { get; set; } = -0.3;
-
-    public string FontName { get; set; } = "Arial";
-
-    public int FontSize { get; set; } = 8;
-
-    public FontStyle FontStyle { get; set; } = FontStyle.Italic;
-}

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/PDFMerger.cs

@@ -1,46 +0,0 @@
-using System.IO;
-using iText.Kernel.Pdf;
-using iText.Kernel.Utils;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using static EnvelopeGenerator.Jobs.FinalizeDocument.FinalizeDocumentExceptions;
-
-namespace EnvelopeGenerator.Jobs.FinalizeDocument;
-
-public class PDFMerger
-{
-    private readonly ILogger<PDFMerger> _logger;
-
-    public PDFMerger() : this(NullLogger<PDFMerger>.Instance)
-    {
-    }
-
-    public PDFMerger(ILogger<PDFMerger> logger)
-    {
-        _logger = logger;
-    }
-
-    public byte[] MergeDocuments(byte[] document, byte[] report)
-    {
-        try
-        {
-            using var finalStream = new MemoryStream();
-            using var documentReader = new PdfReader(new MemoryStream(document));
-            using var reportReader = new PdfReader(new MemoryStream(report));
-            using var writer = new PdfWriter(finalStream);
-            using var targetDoc = new PdfDocument(documentReader, writer);
-            using var reportDoc = new PdfDocument(reportReader);
-
-            var merger = new PdfMerger(targetDoc);
-            merger.Merge(reportDoc, 1, reportDoc.GetNumberOfPages());
-
-            targetDoc.Close();
-            return finalStream.ToArray();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Failed to merge PDF documents");
-            throw new MergeDocumentException("Documents could not be merged", ex);
-        }
-    }
-}

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/ReportCreator.cs

@@ -1,91 +0,0 @@
-using System.Data;
-using System.IO;
-using EnvelopeGenerator.Domain.Entities;
-using iText.Kernel.Pdf;
-using iText.Layout.Element;
-using Microsoft.Data.SqlClient;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using static EnvelopeGenerator.Jobs.FinalizeDocument.FinalizeDocumentExceptions;
-using LayoutDocument = iText.Layout.Document;
-
-namespace EnvelopeGenerator.Jobs.FinalizeDocument;
-
-public class ReportCreator
-{
-    private readonly ILogger<ReportCreator> _logger;
-
-    public ReportCreator() : this(NullLogger<ReportCreator>.Instance)
-    {
-    }
-
-    public ReportCreator(ILogger<ReportCreator> logger)
-    {
-        _logger = logger;
-    }
-
-    public byte[] CreateReport(SqlConnection connection, Envelope envelope)
-    {
-        try
-        {
-            var reportItems = LoadReportItems(connection, envelope.Id);
-            using var stream = new MemoryStream();
-            using var writer = new PdfWriter(stream);
-            using var pdf = new PdfDocument(writer);
-            using var document = new LayoutDocument(pdf);
-
-            document.Add(new Paragraph("Envelope Finalization Report").SetFontSize(16));
-            document.Add(new Paragraph($"Envelope Id: {envelope.Id}"));
-            document.Add(new Paragraph($"UUID: {envelope.Uuid}"));
-            document.Add(new Paragraph($"Title: {envelope.Title}"));
-            document.Add(new Paragraph($"Subject: {envelope.Comment}"));
-            document.Add(new Paragraph($"Generated: {DateTime.UtcNow:O}"));
-            document.Add(new Paragraph(" "));
-
-            var table = new Table(4).UseAllAvailableWidth();
-            table.AddHeaderCell("Date");
-            table.AddHeaderCell("Status");
-            table.AddHeaderCell("User");
-            table.AddHeaderCell("EnvelopeId");
-
-            foreach (var item in reportItems.OrderByDescending(r => r.ItemDate))
-            {
-                table.AddCell(item.ItemDate.ToString("u"));
-                table.AddCell(item.ItemStatus.ToString());
-                table.AddCell(item.ItemUserReference);
-                table.AddCell(item.EnvelopeId.ToString());
-            }
-
-            document.Add(table);
-            document.Close();
-            return stream.ToArray();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Could not create report for envelope {EnvelopeId}", envelope.Id);
-            throw new CreateReportException("Could not prepare report data", ex);
-        }
-    }
-
-    private List<ReportItem> LoadReportItems(SqlConnection connection, int envelopeId)
-    {
-        const string sql = "SELECT ENVELOPE_ID, POS_WHEN, POS_STATUS, POS_WHO FROM VWSIG_ENVELOPE_REPORT WHERE ENVELOPE_ID = @EnvelopeId";
-        var result = new List<ReportItem>();
-
-        using var command = new SqlCommand(sql, connection);
-        command.Parameters.AddWithValue("@EnvelopeId", envelopeId);
-        using var reader = command.ExecuteReader();
-        while (reader.Read())
-        {
-            result.Add(new ReportItem
-            {
-                EnvelopeId = reader.GetInt32(0),
-                ItemDate = reader.IsDBNull(1) ? DateTime.MinValue : reader.GetDateTime(1),
-                ItemStatus = reader.IsDBNull(2) ? default : (EnvelopeGenerator.Domain.Constants.EnvelopeStatus)reader.GetInt32(2),
-                ItemUserReference = reader.IsDBNull(3) ? string.Empty : reader.GetString(3)
-            });
-        }
-
-        return result;
-    }
-}

EnvelopeGenerator.PdfEditor/EnvelopeGenerator.PdfEditor.csproj

@@ -17,6 +17,7 @@
   </PropertyGroup>
 	
   <ItemGroup>
+	<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
 	<PackageReference Include="itext" Version="8.0.5" />
 	<PackageReference Include="itext.bouncy-castle-adapter" Version="8.0.5" />
   </ItemGroup>

EnvelopeGenerator.Service/App.config

@@ -23,7 +23,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -31,7 +31,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -59,7 +59,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.3" newVersion="8.0.0.3" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -67,11 +67,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -79,7 +79,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -91,11 +91,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -117,6 +117,34 @@
         <assemblyIdentity name="Microsoft.IdentityModel.JsonWebTokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-7.5.1.0" newVersion="7.5.1.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Identity.Client" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.82.1.0" newVersion="4.82.1.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.Data.SqlClient" publicKeyToken="23ec7fc2d6eaa4a5" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Formats.Asn1" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.3" newVersion="10.0.0.3" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.AccessControl" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <entityFramework>

EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj

@@ -67,7 +67,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
-      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.6.2\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
     <Reference Include="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>
@@ -181,11 +181,11 @@
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=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 Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
-    <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 Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.3, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.3\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <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>

EnvelopeGenerator.Service/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net48" />
+  <package id="BouncyCastle.Cryptography" version="2.6.2" targetFramework="net462" />
   <package id="DigitalData.Core.Abstractions" version="4.3.0" targetFramework="net462" />
   <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net48" />
   <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net48" />
@@ -13,8 +13,8 @@
   <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net48" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
   <package id="Microsoft.Extensions.DependencyInjection" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.2" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.3" targetFramework="net462" />
   <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net48" />

EnvelopeGenerator.ServiceHost/EnvelopeGenerator.ServiceHost.csproj

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

EnvelopeGenerator.ServiceHost/Exceptions/BurnAnnotationException.cs

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

EnvelopeGenerator.ServiceHost/Exceptions/CreateReportException.cs

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

EnvelopeGenerator.ServiceHost/Exceptions/ExportDocumentException.cs

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

EnvelopeGenerator.ServiceHost/Exceptions/MergeDocumentException.cs

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

EnvelopeGenerator.ServiceHost/Extensions/DataRowExtensions.cs

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

EnvelopeGenerator.ServiceHost/Extensions/DependencyInjection.cs

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

EnvelopeGenerator.ServiceHost/Extensions/LoggerExtensions.cs

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

EnvelopeGenerator.ServiceHost/Jobs/ActionService.cs

@@ -0,0 +1,35 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs;
+
+/// <summary>
+/// migrate from EnvelopeGenerator.CommonServices.Services.ActionService
+/// </summary>
+[Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
+public class ActionService(IRepository<History> histRepo)
+{
+    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
+    public bool CreateReport(Envelope envelope, CancellationToken cancel = default)
+    {
+        throw new NotImplementedException();
+    }
+
+    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
+    public bool FinalizeEnvelope(Envelope envelope, CancellationToken cancel = default)
+    {
+        throw new NotImplementedException();
+    }
+
+    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
+    public bool CompleteEnvelope(Envelope envelope, CancellationToken cancel = default)
+    {
+        throw new NotImplementedException();
+    }
+
+    [Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
+    public bool CompleteEnvelope(Envelope envelope, Receiver receiver, CancellationToken cancel = default)
+    {
+        throw new NotImplementedException();
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFBurner.cs

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

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFMerger.cs

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

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportCreator.cs

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

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportItem.cs

@@ -1,7 +1,7 @@
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
 
 public class ReportItem
 {

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportSource.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
 
 public class ReportSource
 {

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/rptEnvelopeHistory.cs

@@ -0,0 +1,103 @@
+using DevExpress.XtraReports.UI;
+using DevExpress.Drawing;
+using System.Drawing;
+using System.IO;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
+
+public class rptEnvelopeHistory : XtraReport
+{
+    public rptEnvelopeHistory()
+    {
+        BuildLayout();
+    }
+
+    private void BuildLayout()
+    {
+        Bands.AddRange(
+        [
+            new TopMarginBand(),
+            new BottomMarginBand(),
+            new ReportHeaderBand { HeightF = 40 },
+            new PageHeaderBand { HeightF = 24 },
+            new DetailBand { HeightF = 22 }
+        ]);
+
+        var reportHeader = (ReportHeaderBand)Bands[nameof(ReportHeaderBand)]!;
+        var pageHeader = (PageHeaderBand)Bands[nameof(PageHeaderBand)]!;
+        var detail = (DetailBand)Bands[nameof(DetailBand)]!;
+
+        var title = new XRLabel
+        {
+            BoundsF = new RectangleF(0, 0, 750, 28),
+            Font = new DXFont("Segoe UI", 14, DXFontStyle.Bold),
+            Text = "Envelope History"
+        };
+        reportHeader.Controls.Add(title);
+
+        var headerTable = CreateTable(isHeader: true);
+        pageHeader.Controls.Add(headerTable);
+
+        var detailTable = CreateTable(isHeader: false);
+        detail.Controls.Add(detailTable);
+
+        Margins = new DXMargins(40, 40, 40, 40);
+        PaperKind = (DevExpress.Drawing.Printing.DXPaperKind)System.Drawing.Printing.PaperKind.A4;
+    }
+
+    private static XRTable CreateTable(bool isHeader)
+    {
+        var table = new XRTable
+        {
+            BoundsF = new RectangleF(0, 0, 750, 22),
+            Borders = DevExpress.XtraPrinting.BorderSide.All
+        };
+
+        var row = new XRTableRow();
+
+        if (isHeader)
+        {
+            row.Font = new DXFont("Segoe UI", 9, DXFontStyle.Bold);
+            row.BackColor = Color.Gainsboro;
+            row.Cells.Add(CreateCell("Date"));
+            row.Cells.Add(CreateCell("Status"));
+            row.Cells.Add(CreateCell("User"));
+            row.Cells.Add(CreateCell("Title"));
+            row.Cells.Add(CreateCell("Subject"));
+        }
+        else
+        {
+            row.Font = new DXFont("Segoe UI", 9, DXFontStyle.Regular);
+            row.Cells.Add(CreateCell("[ItemDate]"));
+            row.Cells.Add(CreateCell("[ItemStatusTranslated]"));
+            row.Cells.Add(CreateCell("[ItemUserReference]"));
+            row.Cells.Add(CreateCell("[EnvelopeTitle]"));
+            row.Cells.Add(CreateCell("[EnvelopeSubject]"));
+        }
+
+        table.Rows.Add(row);
+        return table;
+    }
+
+    private static XRTableCell CreateCell(string textOrExpression)
+    {
+        return new XRTableCell
+        {
+            Text = textOrExpression,
+            Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 4, 2, 2),
+            CanGrow = false
+        };
+    }
+
+    public object? DataSource { get; set; }
+    public string? DataMember { get; set; }
+
+    public void CreateDocument()
+    {
+    }
+
+    public void ExportToPdf(Stream stream)
+    {
+        stream.Write(Array.Empty<byte>(), 0, 0);
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocumentJob.cs

@@ -0,0 +1,160 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Modules.Database;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Configuration.Queries;
+using EnvelopeGenerator.Application.Envelopes.Queries;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.ServiceHost.Exceptions;
+using EnvelopeGenerator.ServiceHost.Extensions;
+using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
+using GdPicture.Internal.MSOfficeBinary.translator.Spreadsheet.XlsFileFormat.Records;
+using GdPicture14;
+using MediatR;
+using Microsoft.Data.SqlClient;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
+using System.Data;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs;
+
+[Obsolete("ActionService is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
+public class FinalizeDocumentJob(IOptions<WorkerOptions> options, ILogger<FinalizeDocumentJob> logger, TempFiles tempFiles, ActionService actionService, PDFBurner pdfBurner, PDFMerger pdfMerger, ReportCreator reportCreator, GdViewer? _gdViewer, LicenseManager licenseManager, IMediator mediator, IRepository<Envelope> envRepo, IRepository<Domain.Entities.DocumentStatus> docStatusRepo)
+{
+    private readonly WorkerOptions _options = options.Value;
+
+    private ConfigDto? _config;
+    
+    private const int CompleteWaitTime = 1;
+    private string _parentFolderUid = string.Empty;
+
+    private sealed class EnvelopeData
+    {
+        public int EnvelopeId { get; set; }
+        public string EnvelopeUuid { get; set; } = string.Empty;
+        public string DocumentPath { get; set; } = string.Empty;
+        public List<string> AnnotationData { get; set; } = new();
+        public byte[]? DocAsByte { get; set; }
+    }
+
+    public bool RethrowOnError { get; set; } = true;
+
+    public async Task ExecuteAsync(CancellationToken cancel = default)
+    {
+        var gdPictureKey = _options.GdPictureLicenseKey;
+        tempFiles.Create();
+        var jobId = typeof(FinalizeDocumentJob).FullName;
+
+        _config = await mediator.Send(new ReadDefaultConfigQuery(), cancel);
+
+        var envelopes = await envRepo
+            .Where(e => e.Status == EnvelopeStatus.EnvelopeCompletelySigned
+                && e.ChangedWhen.HasValue
+                && EF.Functions.DateDiffMinute(e.ChangedWhen.Value, DateTime.Now) >= CompleteWaitTime)
+            .OrderBy(e => e.Id)
+            .ToListAsync(cancel);
+
+        if (envelopes.Count > 0)
+            logger.LogInformation("Found [{count}] completed envelopes.", envelopes.Count);
+
+        foreach (var envelope in envelopes)
+        {
+            try
+            {
+                await Finalize(envelope, cancel);
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Unhandled exception while working envelope [{id}]", envelope.Id);
+
+                if(RethrowOnError)
+                    throw;
+            }
+
+            logger.LogInformation("Envelope [{id}] finalized!", envelope.Id);
+        }
+    }
+
+    private async Task Finalize(Envelope envelope, CancellationToken cancel)
+    {
+        var annotations = await docStatusRepo.Where(s => s.EnvelopeId == envelope.Id).Select(s => s.Value).ToListAsync(cancel);
+        var burnedDocument = pdfBurner!.BurnAnnotsToPDF(envelope.DefaultDocument.ByteData!, annotations, envelope.Id)
+            ?? throw new ApplicationException("Document could not be finalized");
+
+        actionService.CreateReport(envelope, cancel);
+
+        var report = reportCreator!.CreateReport(envelope);
+
+        var mergedDocument = pdfMerger!.MergeDocuments(burnedDocument, report);
+
+        var outputDirectoryPath = Path.Combine(_config!.ExportPath, _parentFolderUid);
+
+        if (!Directory.Exists(outputDirectoryPath))
+            Directory.CreateDirectory(outputDirectoryPath);
+
+        var outputFilePath = Path.Combine(outputDirectoryPath, $"{envelope.Uuid}.pdf");
+
+        try
+        {
+            File.WriteAllBytes(outputFilePath, mergedDocument);
+        }
+        catch (Exception ex)
+        {
+            throw new ExportDocumentException("Could not export final document to disk. Envelope Id is " + envelope.Id, ex);
+        }
+
+        var outputFile = await File.ReadAllBytesAsync(outputFilePath, cancel);
+        await envRepo.UpdateAsync(e => e.DocResult = outputFile, e => e.Id == envelope.Id, cancel);
+
+        SendFinalEmails(envelope);
+
+        actionService?.FinalizeEnvelope(envelope, cancel);
+    }
+
+    private bool SendFinalEmails(Envelope envelope)
+    {
+        var mailToCreator = (FinalEmailType)(envelope.FinalEmailToCreator ?? 0);
+        var mailToReceivers = (FinalEmailType)(envelope.FinalEmailToReceivers ?? 0);
+
+        if (mailToCreator != FinalEmailType.No)
+            SendFinalEmailToCreator(envelope, mailToCreator);
+        else
+            logger?.LogWarning("No SendFinalEmailToCreator - oMailToCreator [{mailToCreator}] <> [{noFinalEmailType}] ", mailToCreator, FinalEmailType.No);
+
+        if (mailToReceivers != FinalEmailType.No)
+        {
+            SendFinalEmailToReceivers(envelope, mailToReceivers);
+        }
+        else
+        {
+            logger?.LogWarning("No SendFinalEmailToReceivers - oMailToCreator [{mailToReceivers}] <> [{noFinalEmailType}] ", mailToReceivers, FinalEmailType.No);
+        }
+
+        return true;
+    }
+
+    private bool SendFinalEmailToCreator(Envelope envelope, FinalEmailType mailToCreator)
+    {
+        if (actionService?.CompleteEnvelope(envelope) == false)
+        {
+            logger?.LogError(new Exception("CompleteEnvelope failed"), "Envelope could not be completed for receiver [{email}]", envelope.User?.Email);
+            return false;
+        }
+
+        return true;
+    }
+
+    private bool SendFinalEmailToReceivers(Envelope envelope, FinalEmailType mailToReceivers)
+    {
+        foreach (var receiver in envelope.EnvelopeReceivers ?? Enumerable.Empty<EnvelopeReceiver>())
+        {
+            if (actionService?.CompleteEnvelope(envelope, receiver.Receiver) == false)
+            {
+                logger?.LogError(new Exception("CompleteEnvelope failed"), "Envelope could not be completed for receiver [{email}]", receiver.Receiver?.EmailAddress);
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/Infrastructure/Database.cs

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

EnvelopeGenerator.ServiceHost/Jobs/ReportModel.cs

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

EnvelopeGenerator.ServiceHost/Jobs/TempFiles.cs

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

EnvelopeGenerator.ServiceHost/Jobs/WorkerOptions.cs

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

EnvelopeGenerator.ServiceHost/Program.cs

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

EnvelopeGenerator.ServiceHost/Properties/launchSettings.json

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

EnvelopeGenerator.ServiceHost/Worker.cs

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

EnvelopeGenerator.ServiceHost/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

EnvelopeGenerator.ServiceHost/appsettings.json

@@ -0,0 +1,12 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "Worker": {
+    "DelayMilliseconds": 1000
+  },
+  "AllowedHosts": "*"
+}

EnvelopeGenerator.Tests/Domain/ConstantsTests.cs

@@ -1,17 +0,0 @@
-using EnvelopeGenerator.Domain.Constants;
-using NUnit.Framework;
-
-namespace EnvelopeGenerator.Tests.Domain;
-
-public class ConstantsTests
-{
-    [TestCase(EnvelopeSigningType.ReadAndSign, EnvelopeSigningType.ReadAndSign)]
-    [TestCase(EnvelopeSigningType.WetSignature, EnvelopeSigningType.WetSignature)]
-    [TestCase((EnvelopeSigningType)5, EnvelopeSigningType.WetSignature)]
-    public void Normalize_ReturnsExpectedValue(EnvelopeSigningType input, EnvelopeSigningType expected)
-    {
-        var normalized = input.Normalize();
-
-        Assert.That(normalized, Is.EqualTo(expected));
-    }
-}

EnvelopeGenerator.Tests/EnvelopeGenerator.Tests.csproj

@@ -24,15 +24,18 @@
     <PackageReference Include="DigitalData.Core.Abstractions" Version="4.3.0" />
     <PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
     <PackageReference Include="DigitalData.Core.Application" Version="3.4.0" />
+    <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.20" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
 	<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
+	<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
   </ItemGroup>
 
   <ItemGroup>
@@ -50,4 +53,8 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Domain\" />
+  </ItemGroup>
+
 </Project>

EnvelopeGenerator.Web/Controllers/EnvelopeController.cs

@@ -40,7 +40,7 @@ public class EnvelopeController : ViewControllerBase
     private readonly IMediator _mediator;
 
     [Obsolete("Use MediatR")]
-    public EnvelopeController(ILogger<EnvelopeController> logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer<Resource> localizer, IConfiguration configuration, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, IAuthenticator authenticator, IReceiverService receiverService, IEnvelopeSmsHandler envelopeSmsService, IMediator mediator) : base(logger, cultures, localizer)
+    public EnvelopeController(ILogger<EnvelopeController> logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer<Resource> localizer, IConfiguration configuration, MultiCulture cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, IAuthenticator authenticator, IReceiverService receiverService, IEnvelopeSmsHandler envelopeSmsService, IMediator mediator) : base(logger, cultures, localizer)
     {
         _envRcvService = envelopeReceiverService;
         _historyService = historyService;
@@ -91,7 +91,7 @@ public class EnvelopeController : ViewControllerBase
             if (await _historyService.IsSigned(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress))
             {
                 await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-                return View("EnvelopeSigned");
+                return View("EnvelopeSigned", er);
             }
             #endregion
 

EnvelopeGenerator.Web/Controllers/HomeController.cs

@@ -11,7 +11,7 @@ public class HomeController : ViewControllerBase
 {
     private readonly IConfiguration _configuration;
 
-    public HomeController(IConfiguration configuration, ILogger<HomeController> logger, Cultures cultures, IStringLocalizer<Resource> localizer) : base(logger, cultures, localizer)
+    public HomeController(IConfiguration configuration, ILogger<HomeController> logger, MultiCulture cultures, IStringLocalizer<Resource> localizer) : base(logger, cultures, localizer)
     {
         _configuration = configuration;
     }

EnvelopeGenerator.Web/Controllers/LocalizationController.cs

@@ -14,9 +14,9 @@ namespace EnvelopeGenerator.Web.Controllers
 
         private readonly IStringLocalizer<Resource> _localizer;
 
-        private readonly Cultures _cultures;
+        private readonly MultiCulture _cultures;
 
-        public LocalizationController(IStringLocalizer<Resource> localizer, Cultures cultures, ILogger<LocalizationController> logger)
+        public LocalizationController(IStringLocalizer<Resource> localizer, MultiCulture cultures, ILogger<LocalizationController> logger)
         {
             _localizer = localizer;
             _cultures = cultures;

EnvelopeGenerator.Web/Controllers/TFARegController.cs

@@ -26,7 +26,7 @@ public class TFARegController : ViewControllerBase
     private readonly TFARegParams _params;
 
     [Obsolete("Use MediatR")]
-    public TFARegController(ILogger<TFARegController> logger, Cultures cultures, IStringLocalizer<Resource> localizer, IEnvelopeReceiverService erService, IAuthenticator authenticator, IReceiverService receiverService, IOptions<TFARegParams> tfaRegParamsOptions) : base(logger, cultures, localizer)
+    public TFARegController(ILogger<TFARegController> logger, MultiCulture cultures, IStringLocalizer<Resource> localizer, IEnvelopeReceiverService erService, IAuthenticator authenticator, IReceiverService receiverService, IOptions<TFARegParams> tfaRegParamsOptions) : base(logger, cultures, localizer)
     {
         _envRcvService = erService;
         _authenticator = authenticator;

EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs

@@ -1,34 +1,22 @@
-using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.AspNetCore.Mvc;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
+using Microsoft.AspNetCore.Mvc;
+using MediatR;
+using EnvelopeGenerator.Application.EmailTemplates.Queries;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
-[Obsolete("Use MediatR")]
-public class TestEmailTemplateController : TestControllerBase<IEmailTemplateService, EmailTemplateDto, EmailTemplate, int>
+public class TestEmailTemplateController : ControllerBase
 {
-    public TestEmailTemplateController(ILogger<TestEmailTemplateController> logger, IEmailTemplateService service) : base(logger, service)
+    private readonly IMediator _mediator;
+
+    public TestEmailTemplateController(IMediator mediator)
     {
+        _mediator = mediator;
     }
 
     [HttpGet]
-    [Obsolete("Use MediatR")]
-    public virtual async Task<IActionResult> GetAll([FromQuery] string? tempType = null)
+    public virtual async Task<IActionResult> GetAll([FromQuery] ReadEmailTemplateQuery query, CancellationToken cancel)
     {
-        return tempType is null
-            ? await base.GetAll()
-            : await _service.ReadByNameAsync((EmailTemplateType)Enum.Parse(typeof(EmailTemplateType), tempType)).ThenAsync(
-                Success: Ok,
-                Fail: IActionResult (messages, notices) =>
-                {
-                    _logger.LogNotice(notices);
-                    return NotFound(messages);
-                });
+        var res = await _mediator.Send(query, cancel);
+        return Ok(res);
     }
-
-    [NonAction]
-    public override Task<IActionResult> GetAll() => base.GetAll();
 }

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs

@@ -1,56 +1,32 @@
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.AspNetCore.Mvc;
-using EnvelopeGenerator.Application.Common.Dto;
+using Microsoft.AspNetCore.Mvc;
 using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Interfaces.Services;
+using MediatR;
+using EnvelopeGenerator.Application.Envelopes.Queries;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
 [Obsolete("Use MediatR")]
-public class TestEnvelopeController : TestControllerBase<IEnvelopeService, EnvelopeDto, Envelope, int>
+public class TestEnvelopeController : ControllerBase
 {
-    public TestEnvelopeController(ILogger<TestEnvelopeController> logger, IEnvelopeService service) : base(logger, service)
-    {
-    }
+    private readonly IMediator _mediator;
 
-    [NonAction]
-    public override Task<IActionResult> GetAll() => base.GetAll();
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="mediator"></param>
+    public TestEnvelopeController(IMediator mediator)
+    {
+        _mediator = mediator;
+    }
 
     [HttpGet]
-    public async Task<IActionResult> GetAll([FromQuery] string? envelopeKey = default, [FromQuery] bool withDocuments = false, [FromQuery] bool withHistory = false, [FromQuery] bool withDocumentReceiverElement = false, [FromQuery] bool withUser = false, [FromQuery] bool withAll = true)
-    {
-        if (envelopeKey is not null)
-        {
-            (var uuid, var signature) = envelopeKey.DecodeEnvelopeReceiverId();
-            if (uuid is null)
-                return BadRequest("UUID is null");
-            var envlopeServiceResult = await _service.ReadByUuidAsync(
-                uuid: uuid,
-                withDocuments: withDocuments, withHistory: withHistory, withDocumentReceiverElement: withDocumentReceiverElement, withUser: withUser, withAll: withAll);
-
-            if (envlopeServiceResult.IsSuccess)
-            {
-                return Ok(envlopeServiceResult.Data);
-            }
-            return NotFound();
-        }
-
-        var result = await _service.ReadAllWithAsync(documents: withDocuments, history: withHistory);
-        if (result.IsSuccess)
-        {
-            return Ok(result);
-        }
-        return NotFound(result);
-    }
+    public async Task<IActionResult> GetAll([FromQuery] ReadEnvelopeQuery query, CancellationToken cancel) => Ok(await _mediator.Send(query, cancel));
 
     [HttpGet("decode")]
-    public IActionResult DecodeEnvelopeReceiverId(string envelopeReceiverId, int type = 0)
+    public IActionResult DecodeEnvelopeReceiverId(string envelopeReceiverId, int type = 0) => type switch
     {
-        return type switch
-        {
-            1 => Ok(envelopeReceiverId.GetEnvelopeUuid()),
-            2 => Ok(envelopeReceiverId.GetReceiverSignature()),
-            _ => Ok(envelopeReceiverId.DecodeEnvelopeReceiverId()),
-        };
-    }
+        1 => Ok(envelopeReceiverId.GetEnvelopeUuid()),
+        2 => Ok(envelopeReceiverId.GetReceiverSignature()),
+        _ => Ok(envelopeReceiverId.DecodeEnvelopeReceiverId()),
+    };
 }

EnvelopeGenerator.Web/Controllers/Test/TestLocalizerController.cs

@@ -1,9 +1,12 @@
 using AngleSharp.Common;
 using DigitalData.Core.API;
 using EnvelopeGenerator.Application.Resources;
+using EnvelopeGenerator.Web.Extensions;
 using EnvelopeGenerator.Web.Models;
+using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Localization;
+using System.Globalization;
 
 namespace EnvelopeGenerator.Web.Controllers.Test
 {
@@ -12,21 +15,30 @@ namespace EnvelopeGenerator.Web.Controllers.Test
     public class TestLocalizerController : ControllerBase
     {
         private readonly IStringLocalizer _localizer;
-        private readonly Cultures _cultures;
+        private readonly MultiCulture _cultures;
 
-        public TestLocalizerController(IStringLocalizer<Resource> localizer, Cultures cultures)
+        public TestLocalizerController(IStringLocalizer<Resource> localizer, MultiCulture cultures)
         {
             _localizer = localizer;
             _cultures = cultures;
         }
 
-        [HttpGet]
-        public IActionResult Localize([FromQuery] string key = "de_DE") => Ok(_localizer[key]);
+        [HttpGet("{key}")]
+        public IActionResult Localize([FromRoute] string key) => Ok(_localizer[key].Value);
 
         [HttpGet("fi-class")]
         public IActionResult GetFIClass(string? lang = null) => lang is null ? Ok(_cultures.FIClasses) : Ok(_cultures[lang]?.FIClass);
 
         [HttpGet("culture")]
         public IActionResult GetCultures(string? lang = null) => lang is null ? Ok(_cultures) : Ok(_cultures[lang]);
+
+        [HttpGet("culture/accept-language")]
+        public IActionResult GetCultureByAcceptLanguage()
+            => HttpContext.GetCultureByAcceptLanguage()?.Name is string culture 
+            ? Ok(culture)
+            : NotFound();
+
+        [HttpGet("culture/user")]
+        public IActionResult GetUserCulture() => Request.Cookies.GetCultureOrDefault() is string cult ? Ok(cult) : NotFound();
     }
 }

EnvelopeGenerator.Web/Controllers/ViewControllerBase.cs

@@ -8,10 +8,10 @@ namespace EnvelopeGenerator.Web.Controllers;
 public class ViewControllerBase : Controller
 {
     protected readonly ILogger _logger;
-    protected readonly Cultures _cultures;
+    protected readonly MultiCulture _cultures;
     protected readonly IStringLocalizer<Resource> _localizer;
 
-    public ViewControllerBase(ILogger logger, Cultures cultures, IStringLocalizer<Resource> localizer)
+    public ViewControllerBase(ILogger logger, MultiCulture cultures, IStringLocalizer<Resource> localizer)
     {
         _logger = logger;
         _cultures = cultures;

EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<PackageId>EnvelopeGenerator.Web</PackageId>
@@ -12,9 +12,9 @@
 		<PackageTags>digital data envelope generator web</PackageTags>
 		<Description>EnvelopeGenerator.Web is an ASP.NET MVC application developed to manage signing processes. It uses Entity Framework Core (EF Core) for database operations. The user interface for signing processes is developed with Razor View Engine (.cshtml files) and JavaScript under wwwroot, integrated with PSPDFKit. This integration allows users to view and sign documents seamlessly.</Description>
 		<ApplicationIcon>Assets\icon.ico</ApplicationIcon>
-		<Version>3.9.0</Version>
-		<AssemblyVersion>3.9.0</AssemblyVersion>
-		<FileVersion>3.9.0</FileVersion>
+		<Version>3.12.0</Version>						<!-- NuGet package version -->
+		<AssemblyVersion>3.12.0.0</AssemblyVersion>		<!-- Assembly version for API compatibility -->
+		<FileVersion>3.12.0.0</FileVersion>				<!-- Windows file version -->
 		<Copyright>Copyright © 2025 Digital Data GmbH. All rights reserved.</Copyright>
 	</PropertyGroup>
 
@@ -561,7 +561,6 @@
 		<None Include="wwwroot\lib\bootstrap-icons\icons\chat-square.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\chat-text-fill.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\chat-text.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\chat.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\check-all.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\check-circle-fill.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\check-circle.svg" />
@@ -1047,71 +1046,71 @@
 		<None Include="wwwroot\lib\bootstrap-icons\icons\file-x.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\file-zip-fill.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\file-zip.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\file.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\files-alt.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\files.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-aac.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-ai.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-bmp.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-cs.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-css.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-csv.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-doc.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-docx.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-exe.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-gif.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-heic.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-html.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-java.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-jpg.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-js.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-json.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-jsx.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-key.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-m4p.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-md.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-mdx.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-mov.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-mp3.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-mp4.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-otf.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-pdf.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-php.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-png.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-ppt.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-pptx.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-psd.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-py.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-raw.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-rb.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-sass.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-scss.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-sh.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-sql.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-svg.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-tiff.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-tsx.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-ttf.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-txt.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-wav.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-woff.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-xls.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-xlsx.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-xml.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filetype-yml.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\film.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filter-circle-fill.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filter-circle.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filter-left.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filter-right.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filter-square-fill.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filter-square.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\filter.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\fingerprint.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\fire.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\flag-fill.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\flag.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\floppy-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-earmark.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-easel-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-easel.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-excel-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-excel.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-font-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-font.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-image-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-image.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-lock-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-lock.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-lock2-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-lock2.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-medical-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-medical.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-minus-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-minus.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-music-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-music.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-pdf-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-pdf.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-person-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-person.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-play-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-play.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-plus-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-plus.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-post-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-post.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-ppt-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-ppt.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-richtext-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-richtext.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-ruled-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-ruled.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-slides-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-slides.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-spreadsheet-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-spreadsheet.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-text-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-text.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-word-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-word.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-x-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-x.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-zip-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-zip.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-earmark.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-easel-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-easel.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-excel-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-excel.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-font-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-font.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-image-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-image.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-lock-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-lock.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-lock2-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-lock2.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-medical-fill.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-medical.svg" />
+		<None Include="wwwroot\lib\bootstrap-icons\icons\file-minus-fill.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\floppy.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\floppy2-fill.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\floppy2.svg" />
@@ -2094,39 +2093,14 @@
 		<None Include="wwwroot\lib\bootstrap-icons\icons\zoom-out.svg" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-		<PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
-		<PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
-		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
-		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
-		<PackageReference Include="HtmlSanitizer" Version="8.0.865" />
-		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
-		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="NLog" Version="5.2.5" />
-		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
-		<PackageReference Include="Quartz" Version="3.8.0" />
-		<PackageReference Include="Quartz.AspNetCore" Version="3.8.0" />
-		<PackageReference Include="Quartz.Plugins" Version="3.8.0" />
-		<PackageReference Include="Quartz.Serialization.Json" Version="3.8.0" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-		<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
-		<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
-		<PackageReference Include="System.DirectoryServices" Version="7.0.1" />
-		<PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
-		<PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.1" />
-		<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
-		<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
-	</ItemGroup>
-
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 		<PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
 		<PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
-		<PackageReference Include="HtmlSanitizer" Version="8.0.865" />
-		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
-		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
+		<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.17" />
+		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.17" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="NLog" Version="5.2.5" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
@@ -2149,9 +2123,9 @@
 		<PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
-		<PackageReference Include="HtmlSanitizer" Version="8.0.865" />
-		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
-		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
+		<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="9.0.6" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="NLog" Version="5.2.5" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
@@ -2169,6 +2143,12 @@
 		<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
+	  <PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
+	  <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
 		<ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
@@ -2203,6 +2183,9 @@
 		<Content Update="wwwroot\favicon.ico">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
+		<Content Update="wwwroot\privacy-policy.fr-FR.html">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
 		<Content Update="wwwroot\privacy-policy.en-US.html">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>

EnvelopeGenerator.Web/Extensions/WebExtensions.cs

@@ -3,8 +3,10 @@ using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Web.Models;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.Mvc;
+using System.Globalization;
 using System.Security.Claims;
 
 namespace EnvelopeGenerator.Web.Extensions;
@@ -59,7 +61,14 @@ public static class WebExtensions
 
     #region Cookie
     public static string? GetCulture(this IRequestCookieCollection cookies)
-        => cookies[CookieRequestCultureProvider.DefaultCookieName];
+    {
+        if (cookies[CookieRequestCultureProvider.DefaultCookieName] is string cookieValue)
+            return CookieRequestCultureProvider.ParseCookieValue(cookieValue)?.Cultures.FirstOrDefault().Value;
+        else
+            return null;
+    }
+
+    public static string GetCultureOrDefault(this IRequestCookieCollection cookies) => GetCulture(cookies) ?? CultureInfo.CurrentCulture.Name;
 
     public static void SetCulture(this IResponseCookies cookies, string culture)
     {
@@ -116,4 +125,31 @@ public static class WebExtensions
         Body = "Bitte kontaktieren Sie das IT-Team."
     });
     #endregion
+
+    #region HttpContext
+    public static CultureInfo? GetCultureByAcceptLanguage(this HttpContext context)
+    {
+        var acceptLanguage = context.Request.Headers.AcceptLanguage.ToString();
+        if (string.IsNullOrWhiteSpace(acceptLanguage))
+            return null;
+
+        foreach (var value in acceptLanguage.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
+        {
+            var cultureName = value.Split(';', 2)[0];
+            if (string.IsNullOrWhiteSpace(cultureName))
+                continue;
+
+            try
+            {
+                return new CultureInfo(cultureName);
+            }
+            catch (CultureNotFoundException)
+            {
+                // ignore invalid cultures and continue
+            }
+        }
+
+        return null;
+    }
+    #endregion
 }

EnvelopeGenerator.Web/Middleware/CultureMiddleware.cs

@@ -9,9 +9,9 @@ namespace EnvelopeGenerator.Web.Middleware;
 public class CultureMiddleware
 {
     private readonly RequestDelegate _next;
-    private readonly Cultures _cultures;
+    private readonly MultiCulture _cultures;
 
-    public CultureMiddleware(RequestDelegate next, IOptions<Cultures> culturesOpt)
+    public CultureMiddleware(RequestDelegate next, IOptions<MultiCulture> culturesOpt)
     {
         _next = next;
         _cultures = culturesOpt.Value;
@@ -19,14 +19,17 @@ public class CultureMiddleware
 
     public async Task InvokeAsync(HttpContext context)
     {
-        var cookieName = CookieRequestCultureProvider.DefaultCookieName;
-        var cookieValue = context.Request.Cookies[cookieName];
+        var cookieValue = context.Request.Cookies.GetCulture();
 
-        if (string.IsNullOrEmpty(cookieValue))
+        if (!_cultures.Languages.Contains(cookieValue))
         {
-            context.Response.Cookies.SetCulture(_cultures.Default.Language);
-            CultureInfo.CurrentCulture = new CultureInfo(_cultures.Default.Language);
-            CultureInfo.CurrentUICulture = new CultureInfo(_cultures.Default.Language);
+            var requestCulture = context.GetCultureByAcceptLanguage()?.Name;
+            var culture = _cultures.GetOrDefault(requestCulture);
+            var cultureInfo = culture.Info ?? new CultureInfo(culture.Language);
+
+            context.Response.Cookies.SetCulture(culture.Language);
+            CultureInfo.CurrentCulture = cultureInfo;
+            CultureInfo.CurrentUICulture = cultureInfo;
         }
 
         await _next(context);

EnvelopeGenerator.Web/Models/Culture.cs

@@ -4,15 +4,20 @@ namespace EnvelopeGenerator.Web.Models
 {
     public class Culture
     {
-        private string _language = string.Empty;
-        public string Language { get => _language;
-            init {
+        private string _language = null!;
+
+        public required string Language
+        {
+            get => _language;
+            init
+            {
                 _language = value;
                 Info = new(value);
             } 
         }
-        public string FIClass { get; init; } = string.Empty;
 
-        public CultureInfo? Info { get; init; }
+        public string FIClass { get; init; } = null!;
+
+        public CultureInfo Info { get; init; } = null!;
     }
 }

EnvelopeGenerator.Web/Models/MultiCulture.cs

@@ -1,13 +1,15 @@
 namespace EnvelopeGenerator.Web.Models
 {
-    public class Cultures : List<Culture>
+    public class MultiCulture : List<Culture>
     {
         public IEnumerable<string> Languages => this.Select(c => c.Language);
 
         public IEnumerable<string> FIClasses => this.Select(c => c.FIClass);
 
         public Culture Default => this.First();
-        
-        public Culture? this[string? language] => language is null ? null : this.Where(c => c.Language == language).FirstOrDefault();
+    
+        public Culture GetOrDefault(string? language) => this[language] ?? Default;
+
+        public Culture? this[string? language] => language is null ? null : this.FirstOrDefault(c => string.Equals(c.Language, language, StringComparison.OrdinalIgnoreCase));
     }
 }

EnvelopeGenerator.Web/Program.cs

@@ -165,8 +165,8 @@ try
     });
 
     // Register the FlagIconCssClass instance as a singleton
-    builder.Services.Configure<Cultures>(config.GetSection("Cultures"));
-    builder.Services.AddSingleton(sp => sp.GetRequiredService<IOptions<Cultures>>().Value);
+    builder.Services.Configure<MultiCulture>(config.GetSection("Cultures"));
+    builder.Services.AddSingleton(sp => sp.GetRequiredService<IOptions<MultiCulture>>().Value);
 
     // Register mail services
 #pragma warning disable CS0618 // Type or member is obsolete
@@ -230,7 +230,7 @@ try
     app.UseAuthentication();
     app.UseAuthorization();
 
-    var cultures = app.Services.GetRequiredService<Cultures>();
+    var cultures = app.Services.GetRequiredService<MultiCulture>();
     if (!cultures.Any())
         throw new InvalidOperationException(@"Languages section is missing in the appsettings. Please configure like following.
             Language is both a name of the culture and the name of the resx file such as Resource.de-DE.resx

EnvelopeGenerator.Web/Views/Envelope/EnvelopeExpired.cshtml

@@ -1,5 +1,5 @@
 @{
-    ViewData["Title"] = "Abgelaufen";
+    ViewData["Title"] = _localizer["Expired"];
 }
 <div class="page container p-5">
     <header class="text-center">
@@ -15,9 +15,9 @@
                 <path fill="#263238" d="M26.4,39.9c0-0.2,0-0.4,0.1-0.6s0.2-0.3,0.3-0.5s0.3-0.2,0.5-0.3s0.4-0.1,0.6-0.1s0.5,0,0.7,0.1 s0.4,0.2,0.5,0.3s0.2,0.3,0.3,0.5s0.1,0.4,0.1,0.6s0,0.4-0.1,0.6s-0.2,0.3-0.3,0.5s-0.3,0.2-0.5,0.3s-0.4,0.1-0.7,0.1 s-0.5,0-0.6-0.1s-0.4-0.2-0.5-0.3s-0.2-0.3-0.3-0.5S26.4,40.1,26.4,39.9z M29.2,36.8h-2.3L26.5,27h3L29.2,36.8z" />
             </svg>
         </div>
-        <h1>Abgelaufen!</h1>
+        <h1>@_localizer["Expired"]</h1>
     </header>
     <section class="text-center">
-        <p>Der Zeitraum für die gemeinsame Nutzung von Dokumenten ist abgelaufen.</p>
+        <p>@_localizer["DocumentSharingPeriodExpired"]</p>
     </section>
 </div>