Refactor LicenseManager registration with factory

Replaces transient LicenseManager registration (with per-injection license key retrieval via MediatR) with a singleton LicenseManagerFactory. This centralizes license management and may improve performance and maintainability.

EnvelopeGenerator.API/Controllers/EnvelopeController.cs

@@ -71,6 +71,7 @@ public class EnvelopeController : ControllerBase
     [HttpGet("doc-result")]
     public async Task<IActionResult> GetDocResultAsync([FromQuery] ReadEnvelopeQuery query, [FromQuery] bool view = false)
     {
+        query.IncludeDocResult = true;
         var envelopes = await _mediator.Send(query.Authorize(User.GetId()));
         var envelope = envelopes.FirstOrDefault();
 

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/EnvelopeDto.cs

@@ -1,7 +1,9 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
 using DigitalData.UserManager.Application.DTOs.User;
+using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Domain.Interfaces;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.Common.Dto;
@@ -10,7 +12,7 @@ namespace EnvelopeGenerator.Application.Common.Dto;
 /// 
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public record EnvelopeDto
+public record EnvelopeDto : IEnvelope
 {
 	/// <summary>
 	/// 
@@ -43,6 +45,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 +71,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 +86,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 +121,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>
@@ -123,4 +175,9 @@ public record EnvelopeDto
     /// 
     /// </summary>
     public IEnumerable<DocumentDto>? Documents { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public IEnumerable<EnvelopeReceiverDto>? EnvelopeReceivers { get; set; }
 }

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/Common/Query/EnvelopeQueryBase.cs

@@ -14,4 +14,10 @@ public record EnvelopeQueryBase
     /// Die universell eindeutige Kennung des Umschlags.
     /// </summary>
     public virtual string? Uuid { get; set; }
+
+    /// <summary>
+    /// Wenn gesetzt, wird das DocResult-Feld in der Abfrage einbezogen.
+    /// Standardmäßig wird DocResult nicht geladen, um große Binärdaten zu vermeiden.
+    /// </summary>
+    public bool IncludeDocResult { get; set; } = false;
 }

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/EnvelopeGenerator.Application.csproj

@@ -37,11 +37,11 @@
 	</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'">
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -78,28 +78,29 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-	  <PackageReference Include="AutoMapper" Version="13.0.1" />
-	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
-	  <PackageReference Include="CommandDotNet">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+	<PackageReference Include="AutoMapper" Version="13.0.1" />
+	<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
+	<PackageReference Include="CommandDotNet">
 		<Version>7.0.5</Version>
-	  </PackageReference>
-	</ItemGroup>
+	</PackageReference>
+  </ItemGroup>
 
-	<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>
-	</ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+	<PackageReference Include="AutoMapper" Version="14.0.0" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.17" />
+	<PackageReference Include="CommandDotNet">
+	  <Version>8.1.1</Version>
+	</PackageReference>
+  </ItemGroup>
 
-	<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>
-	</ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+	<PackageReference Include="AutoMapper" Version="14.0.0" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" />
+	<PackageReference Include="CommandDotNet">
+	  <Version>8.1.1</Version>
+	</PackageReference>
+  </ItemGroup>
 
 </Project>

EnvelopeGenerator.Application/Envelopes/Queries/ReadEnvelopeQuery.cs

@@ -24,6 +24,12 @@ public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest<IEnumerable<Envelo
     /// </summary>
     public int? UserId { get; init; }
 
+    /// <summary>
+    /// Optionaler Zeitfilter in Minuten; wenn gesetzt, werden nur Umschläge zurückgegeben,
+    /// deren letzte Änderung mindestens diese Anzahl an Minuten zurückliegt.
+    /// </summary>
+    public int? MinMinutesSinceLastChange { get; init; }
+
     /// <summary>
     /// Setzt den Benutzerkontext für die Abfrage.
     /// </summary>
@@ -132,6 +138,12 @@ public class ReadEnvelopeQueryHandler : IRequestHandler<ReadEnvelopeQuery, IEnum
                 query = query.Where(e => !status.Ignore.Contains(e.Status));
         }
 
+        if (request.MinMinutesSinceLastChange is int minMinutesSinceLastChange)
+        {
+            query = query.Where(e => e.ChangedWhen.HasValue
+                && EF.Functions.DateDiffMinute(e.ChangedWhen.Value, DateTime.Now) >= minMinutesSinceLastChange);
+        }
+
         var envelopes = await query
             .Include(e => e.Documents)
             .ToListAsync(cancel);

EnvelopeGenerator.Application/Envelopes/Queries/ReadSingleEnvelopeDocResultQuery.cs

@@ -0,0 +1,48 @@
+using MediatR;
+using EnvelopeGenerator.Application.Common.Dto;
+using DigitalData.Core.Exceptions;
+
+namespace EnvelopeGenerator.Application.Envelopes.Queries;
+
+/// <summary>
+/// Repräsentiert eine Abfrage für Umschläge.
+/// </summary>
+public record ReadSingleEnvelopeDocResultQuery() : IRequest<byte[]>
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public ReadSingleEnvelopeQuery Envelope { get; set; } = null!;
+}
+
+/// <summary>
+/// Verarbeitet <see cref="ReadEnvelopeQuery"/> und liefert passende <see cref="EnvelopeDto"/>-Ergebnisse.
+/// </summary>
+public class ReadSingleEnvelopeDocResultQueryHandler : IRequestHandler<ReadSingleEnvelopeDocResultQuery, byte[]>
+{
+    private readonly IMediator _mediator;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="mediator"></param>
+    public ReadSingleEnvelopeDocResultQueryHandler(IMediator mediator)
+    {
+        _mediator = mediator;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public async Task<byte[]> Handle(ReadSingleEnvelopeDocResultQuery request, CancellationToken cancellationToken)
+    {
+        request.Envelope.IncludeDocResult = true;
+        var result = await _mediator.Send(request.Envelope, cancellationToken);
+        return result.DocResult is byte[] docResult && docResult.Length > 0 
+            ? docResult 
+            : throw new NotFoundException($"Document for Envelope with ID {request.Envelope.Id} not found");
+    }
+}

EnvelopeGenerator.Application/Envelopes/Queries/ReadSingleEnvelopeQuery.cs

@@ -0,0 +1,78 @@
+using MediatR;
+using EnvelopeGenerator.Application.Common.Query;
+using EnvelopeGenerator.Application.Common.Dto;
+using AutoMapper;
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
+using DigitalData.Core.Exceptions;
+
+namespace EnvelopeGenerator.Application.Envelopes.Queries;
+
+/// <summary>
+/// Repräsentiert eine Abfrage für einen einzelnen Umschlag.
+/// </summary>
+public record ReadSingleEnvelopeQuery : EnvelopeQueryBase, IRequest<EnvelopeDto>
+{
+    /// <summary>
+    /// Optionaler Benutzerfilter; wenn gesetzt, werden nur Umschläge des Benutzers geladen.
+    /// </summary>
+    public int? UserId { get; init; }
+
+    /// <summary>
+    /// Setzt den Benutzerkontext für die Abfrage.
+    /// </summary>
+    public ReadSingleEnvelopeQuery Authorize(int userId) => this with { UserId = userId };
+}
+
+/// <summary>
+/// Verarbeitet <see cref="ReadSingleEnvelopeQuery"/> und liefert ein einzelnes <see cref="EnvelopeDto"/>-Ergebnis.
+/// </summary>
+public class ReadSingleEnvelopeQueryHandler : IRequestHandler<ReadSingleEnvelopeQuery, EnvelopeDto>
+{
+    private readonly IRepository<Envelope> _repository;
+    private readonly IMapper _mapper;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repository"></param>
+    /// <param name="mapper"></param>
+    public ReadSingleEnvelopeQueryHandler(IRepository<Envelope> repository, IMapper mapper)
+    {
+        _repository = repository;
+        _mapper = mapper;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public async Task<EnvelopeDto> Handle(ReadSingleEnvelopeQuery request, CancellationToken cancel)
+    {
+        var query = _repository.Query;
+
+        if (request.UserId is int userId)
+            query = query.Where(e => e.UserId == userId);
+
+        if (request.Id is int id)
+            query = query.Where(e => e.Id == id);
+
+        if (request.Uuid is string uuid)
+            query = query.Where(e => e.Uuid == uuid);
+        
+        var envelopes = await query
+            .Include(e => e.Documents)
+            .Take(2)
+            .ToListAsync(cancel);
+
+        if (envelopes.Count > 1)
+            throw new BadRequestException($"Multiple envelopes found for the given criteria: Id={request.Id}, Uuid={request.Uuid}, UserId={request.UserId}");
+
+        return envelopes.SingleOrDefault() is Envelope envelope
+            ? _mapper.Map<EnvelopeDto>(envelope)
+            : throw new NotFoundException($"Envelope with Id={request.Id}, Uuid={request.Uuid} not found");
+    }
+}

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

@@ -250,7 +250,7 @@
     <value>Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
   </data>
   <data name="RejectionInfo2_ext" xml:space="preserve">
-    <value>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>
@@ -447,4 +447,34 @@
   <data name="DocumentReset" xml:space="preserve">
     <value>Dokument wurde zurückgesetzt.</value>
   </data>
+  <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
+    <value>Dokument erfolgreich gelesen und bestätigt!</value>
+  </data>
+  <data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
+    <value>Sie haben das Dokument gelesen und bestätigt. Im Anschluss erhalten Sie eine schriftliche Bestätigung.</value>
+  </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>Bestätigen</value>
+  </data>
+  <data name="RejectionInfo1Confirmation" xml:space="preserve">
+    <value>Dieser Bestätigungsvorgang wurde abgelehnt!</value>
+  </data>
+  <data name="ConfirmDoc" xml:space="preserve">
+    <value>Dokument bestätigen</value>
+  </data>
+  <data name="DocConfirmed" xml:space="preserve">
+    <value>Dokument bestätigt</value>
+  </data>
+  <data name="ConfirmAgree" xml:space="preserve">
+    <value>Durch Klick auf Abschließen bestätige ich, das Dokument gelesen und zur Kenntnis genommen zu haben.</value>
+  </data>
+  <data name="ConfirmedBy" xml:space="preserve">
+    <value>Bestätigt von</value>
+  </data>
+  <data name="ConfirmationProcessTitle" xml:space="preserve">
+    <value>Titel des Lesebetätigungs-Vorgangs</value>
+  </data>
+  <data name="Confirmations" xml:space="preserve">
+    <value>Bestätigungen</value>
+  </data>
 </root>

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

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

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

@@ -12,6 +12,7 @@ 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;
 
@@ -49,14 +50,33 @@ public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
 		_sender = sender;
     }
 
-	private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? envelopeReceiverDto = null)
+	private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? er = null)
 	{
+		if (er!.Envelope.IsReadAndConfirm())
+		{
+			_placeholders["[SIGNATURE_TYPE]"] = "Lesen und bestätigen";
+			_placeholders["[DOCUMENT_PROCESS]"] = string.Empty;
+            _placeholders["[FINAL_STATUS]"] = "Lesebestätigung";
+            _placeholders["[FINAL_ACTION]"] = "Empfänger bestätigt";
+            _placeholders["[REJECTED_BY_OTHERS]"] = "anderen Empfänger abgelehnt!";
+            _placeholders["[RECEIVER_ACTION]"] = "bestätigt";
+        }
+		else
+        {
+            _placeholders["[SIGNATURE_TYPE]"] = "Signieren";
+            _placeholders["[DOCUMENT_PROCESS]"] = " und elektronisch unterschreiben";
+            _placeholders["[FINAL_STATUS]"] = "Signatur";
+            _placeholders["[FINAL_ACTION]"] = "Vertragspartner unterzeichnet";
+            _placeholders["[REJECTED_BY_OTHERS]"] = "anderen Vertragspartner abgelehnt! Ihre notwendige Unterzeichnung wurde verworfen.";
+            _placeholders["[RECEIVER_ACTION]"] = "unterschrieben";
+        }
+
 		if (accessCode is not null)
 			_placeholders["[DOCUMENT_ACCESS_CODE]"] = accessCode;
 
-		if (envelopeReceiverDto?.Envelope is not null && envelopeReceiverDto.Receiver is not null)
+		if (er?.Envelope is not null && er.Receiver is not null)
 		{
-			var erId = (envelopeReceiverDto.Envelope.Uuid, envelopeReceiverDto.Receiver.Signature).ToEnvelopeKey();
+			var erId = (er.Envelope.Uuid, er.Receiver.Signature).ToEnvelopeKey();
 			var sigHost = await _configService.ReadDefaultSignatureHost();
 			var linkToDoc = $"{sigHost}/EnvelopeKey/{erId}";
 			_placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
@@ -66,7 +86,8 @@ public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
 		return _placeholders;
 	}
 
-	private async Task<Dictionary<string, string>> CreatePlaceholders(EnvelopeReceiverReadOnlyDto? readOnlyDto = null)
+    // 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)
 	{
 		if (readOnlyDto?.Envelope is not null && readOnlyDto.Receiver is not null)
 		{
@@ -124,7 +145,7 @@ public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
 			return acResult.ToFail<int>().Notice(LogLevel.Error, "Therefore, access code cannot be sent");
 		var accessCode = acResult.Data;
 
-		var placeholders = await CreatePlaceholders(accessCode: accessCode, envelopeReceiverDto: dto);
+		var placeholders = await CreatePlaceholders(accessCode: accessCode, er: dto);
 
 		// Add optional place holders.
 		if (optionalPlaceholders is not null)

EnvelopeGenerator.Application/ThirdPartyModules/Queries/ReadThirdPartyModuleLicenseQuery.cs

@@ -0,0 +1,92 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace EnvelopeGenerator.Application.ThirdPartyModules.Queries;
+
+/// <summary>
+/// Query to read the license text of a third-party module.
+/// Either <see cref="Id"/> or <see cref="Name"/> must be provided, but not both.
+/// </summary>
+public record ReadThirdPartyModuleLicenseQuery : IRequest<string>
+{
+    /// <summary>
+    /// The unique identifier of the third-party module (optional).
+    /// </summary>
+    public int? Id { get; init; }
+
+    /// <summary>
+    /// The name of the third-party module (optional).
+    /// </summary>
+    public string? Name { get; init; }
+
+    /// <summary>
+    /// Whether to filter only active modules. Defaults to <c>true</c>.
+    /// </summary>
+    public bool Active { get; init; } = true;
+}
+
+/// <summary>
+/// Handles <see cref="ReadThirdPartyModuleLicenseQuery"/> and returns the license text of a third-party module.
+/// </summary>
+public class ReadThirdPartyModuleLicenseQueryHandler : IRequestHandler<ReadThirdPartyModuleLicenseQuery, string>
+{
+    private readonly IRepository<ThirdPartyModule> _repository;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ReadThirdPartyModuleLicenseQueryHandler"/> class.
+    /// </summary>
+    /// <param name="repository">The repository for accessing third-party modules.</param>
+    public ReadThirdPartyModuleLicenseQueryHandler(IRepository<ThirdPartyModule> repository)
+    {
+        _repository = repository;
+    }
+
+    /// <summary>
+    /// Handles the query by filtering on Id or Name and returning the license text.
+    /// </summary>
+    /// <param name="request">The query parameters.</param>
+    /// <param name="cancel">A cancellation token.</param>
+    /// <returns>The license text of the matching third-party module.</returns>
+    /// <exception cref="BadRequestException">
+    /// Thrown when neither Id nor Name is provided, or when both are provided.
+    /// </exception>
+    /// <exception cref="InvalidOperationException">
+    /// Thrown when multiple modules match the given criteria, indicating a data integrity issue.
+    /// </exception>
+    /// <exception cref="NotFoundException">
+    /// Thrown when no module matches the given criteria.
+    /// </exception>
+    public async Task<string> Handle(ReadThirdPartyModuleLicenseQuery request, CancellationToken cancel)
+    {
+        if (request.Id is null && request.Name is null)
+            throw new BadRequestException("Either Id or Name must be provided.");
+
+        if (request.Id is not null && request.Name is not null)
+            throw new BadRequestException("Only one of Id or Name must be provided, not both.");
+
+        var query = _repository.Query
+            .Where(m => m.Active == request.Active);
+
+        if (request.Id is int id)
+            query = query.Where(m => m.Id == id);
+
+        if (request.Name is string name)
+            query = query.Where(m => m.Name == name);
+
+        var modules = await query
+            .Take(2)
+            .ToListAsync(cancel);
+
+        if (modules.Count > 1)
+            throw new InvalidOperationException(
+                $"Data integrity violation: multiple third-party modules found for the given criteria (Id={request.Id}, Name={request.Name}, Active={request.Active}).");
+
+        return modules.SingleOrDefault() is ThirdPartyModule module
+            ? module.License
+            : throw new NotFoundException(
+                $"Third-party module not found for the given criteria (Id={request.Id}, Name={request.Name}, Active={request.Active}).");
+    }
+}

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/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; }
@@ -135,7 +140,9 @@ namespace EnvelopeGenerator.Domain.Entities
             = false;
 #endif
 
+#if NETFRAMEWORK
         [NotMapped]
+#endif
         [Column("DOC_RESULT")]
         public byte[]
 #if nullable
@@ -149,8 +156,7 @@ namespace EnvelopeGenerator.Domain.Entities
 #if nullable
         ?
 #endif
-            Type
-        { get; set; }
+            Type { get; set; }
 
 #if NETFRAMEWORK
         [NotMapped]
@@ -164,22 +170,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

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

EnvelopeGenerator.Domain/Entities/ThirdPartyModule.cs

@@ -0,0 +1,61 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using EnvelopeGenerator.Domain.Interfaces.Auditing;
+#if NETFRAMEWORK
+using System;
+#endif
+
+namespace EnvelopeGenerator.Domain.Entities
+{
+    [Table("TBDD_3RD_PARTY_MODULES", Schema = "dbo")]
+    public class ThirdPartyModule : IHasChangedWhen, IHasChangedWho
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        [Column("GUID")]
+        public int Id { get; set; }
+
+        [Required]
+        [Column("ACTIVE", TypeName = "bit")]
+        public bool Active { get; set; }
+
+        [Required]
+        [Column("NAME", TypeName = "varchar(50)")]
+        public string Name { get; set; }
+
+        [Column("DESCRIPTION", TypeName = "varchar(500)")]
+        public string
+#if nullable
+        ?
+#endif
+            Description { get; set; }
+
+        [Required]
+        [Column("LICENSE", TypeName = "varchar(max)")]
+        public string License { get; set; }
+
+        [Required]
+        [Column("VERSION", TypeName = "varchar(20)")]
+        public string Version { get; set; }
+        
+        [Column("ADDED_WHO", TypeName = "varchar(50)")]
+        public string
+#if nullable
+        ?
+#endif
+            AddedWho { get; set; }
+
+        [Column("ADDED_WHEN", TypeName = "datetime")]
+        public DateTime? AddedWhen { get; set; }
+
+        [Column("CHANGED_WHO", TypeName = "varchar(50)")]
+        public string
+#if nullable
+        ?
+#endif
+            ChangedWho { get; set; }
+
+        [Column("CHANGED_WHEN", TypeName = "datetime")]
+        public DateTime? ChangedWhen { get; set; }
+    }
+}

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.Infrastructure/EGDbContext.cs

@@ -79,6 +79,10 @@ public abstract class EGDbContextBase : DbContext
 
     public DbSet<ClientUser> ClientUsers { get; set; }
 
+    public DbSet<EnvelopeReport> EnvelopeReports { get; set; }
+
+    public DbSet<ThirdPartyModule> ThirdPartyModules { get; set; }
+
     private readonly DbTriggerParams _triggers;
 
     private readonly ILogger
@@ -200,6 +204,10 @@ public abstract class EGDbContextBase : DbContext
             .HasForeignKey(annot => annot.ElementId);
         #endregion
 
+        #region EnvelopeReport
+        modelBuilder.Entity<EnvelopeReport>().HasNoKey();
+        #endregion
+
         #region Trigger
         // Configure entities to handle database triggers
         void AddTrigger<T>() where T : class => _triggers

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

@@ -25,7 +25,7 @@
     <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.6.0" />
     <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.6.1" />
     <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
+    <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" />

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,7 +67,7 @@
       </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" />

EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj

@@ -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

@@ -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/Controllers/DocResultController.cs

@@ -0,0 +1,21 @@
+using EnvelopeGenerator.Application.Envelopes.Queries;
+using MediatR;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.ServiceHost.Controllers;
+
+[Route("api/[controller]")]
+[ApiController]
+public class DocResultController(IMediator mediator) : ControllerBase
+{
+    [HttpGet]
+    public async Task<IActionResult> GetAsync([FromQuery] ReadSingleEnvelopeDocResultQuery query, [FromQuery] bool download = false, CancellationToken cancel = default)
+    {
+        var bytes = await mediator.Send(query, cancel);
+
+        if (download)
+            return File(bytes, "application/pdf", $"envelope_{query.Envelope.Uuid}.pdf");
+
+        return File(bytes, "application/pdf");
+    }
+}

EnvelopeGenerator.ServiceHost/Controllers/FinalizeDocumentController.cs

@@ -0,0 +1,29 @@
+using EnvelopeGenerator.Application.Envelopes.Queries;
+using EnvelopeGenerator.ServiceHost.Jobs;
+using MediatR;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.ServiceHost.Controllers;
+
+/// <summary>
+/// 
+/// </summary>
+/// <param name="mediator"></param>
+/// <param name="job"></param>
+[Route("api/[controller]")]
+[ApiController]
+public class FinalizeDocumentController(IMediator mediator, FinalizeDocumentJob job) : ControllerBase
+{
+    [HttpGet]
+    public async Task<IActionResult> FinalizeEnvelopeDocument([FromQuery] ReadSingleEnvelopeQuery query, [FromQuery] bool forceRegenerate = false, CancellationToken cancel = default)
+    {
+        var envelope = await mediator.Send(query, cancel);
+
+        // TODO: migrate forceRegenerate input to FinalizeDocumentJob as property and remove this check from controller
+        if (envelope.DocResult is null || forceRegenerate)
+            await job.ExecuteAsync(envelope, cancel);
+
+        var docResult = await mediator.Send(new ReadSingleEnvelopeDocResultQuery() { Envelope = query }, cancel);
+        return File(docResult, "application/pdf", $"envelope_{query.Uuid}.pdf");
+    }
+}

EnvelopeGenerator.ServiceHost/Controllers/WorkerController.cs

@@ -0,0 +1,21 @@
+using EnvelopeGenerator.ServiceHost.Jobs;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.ServiceHost.Controllers;
+
+[Route("api/[controller]")]
+[ApiController]
+public class WorkerController(JobStateManager jobStateManager) : ControllerBase
+{
+    private readonly JobStateManager _jobStateManager = jobStateManager;
+
+    [HttpGet(nameof(FinalizeDocumentJob))]
+    public IActionResult GetStateOfFinalizeDocumentJob() => Ok(_jobStateManager.GetState<FinalizeDocumentJob>());
+
+    [HttpPost(nameof(FinalizeDocumentJob))]
+    public IActionResult SetStateOfFinalizeDocumentJob([FromQuery] State state)
+    {
+        _jobStateManager.SetState<FinalizeDocumentJob>(state);
+        return Ok();
+    }
+}

EnvelopeGenerator.ServiceHost/EnvelopeGenerator.ServiceHost.csproj

@@ -1,12 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
     <PackageReference Include="GdPicture" Version="14.3.3" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
@@ -17,16 +19,28 @@
     <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.*" />
+    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.17" />
+	<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
     <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\" />
+    <Compile Update="Jobs\FinalizeDocument\rptEnvelopeHistory.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Update="Jobs\FinalizeDocument\rptEnvelopeHistory.Designer.cs">
+      <DependentUpon>rptEnvelopeHistory.cs</DependentUpon>
+    </Compile>
+    <EmbeddedResource Update="Jobs\FinalizeDocument\rptEnvelopeHistory.resx">
+      <DependentUpon>rptEnvelopeHistory.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
 
 </Project>

EnvelopeGenerator.ServiceHost/Extensions/DependencyInjection.cs

@@ -1,4 +1,3 @@
-using DigitalData.Modules.Database;
 using EnvelopeGenerator.ServiceHost.Jobs;
 using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
 using GdPicture14;
@@ -11,26 +10,23 @@ 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.Configure<WorkerOptions>(configuration.GetSection("Worker"));
+        services.AddSingleton(provider =>
+        {
+            var options = provider.GetRequiredService<IOptions<WorkerOptions>>().Value;
+            var manager = new JobStateManager(options.InitialJobState);
+            return manager;
+        });
+        services.AddScoped<FinalizeDocumentJob>();
         services.AddScoped<ActionService>();
         services.AddSingleton<TempFiles>();
         services.AddScoped<PDFBurner>();
         services.AddScoped<PDFMerger>();
-        services.AddScoped<ReportModel>();
-        services.AddSingleton<State>();
-        services.AddScoped<MSSQLServer>();
+        services.AddScoped<ReportCreator>();
 
         //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.AddSingleton<LicenseManagerFactory>();
         services.AddTransient<AnnotationManager>();
 
         return services;

EnvelopeGenerator.ServiceHost/Jobs/ActionService.cs

@@ -1,30 +1,36 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Dto.Receiver;
 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
+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)
+    public bool CreateReport(EnvelopeDto 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)
+    public bool FinalizeEnvelope(EnvelopeDto 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)
+    public bool CompleteEnvelope(EnvelopeDto 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)
+    public bool CompleteEnvelope(EnvelopeDto envelope, ReceiverDto receiver, CancellationToken cancel = default)
     {
         throw new NotImplementedException();
     }

EnvelopeGenerator.ServiceHost/Jobs/ConfigModel.cs

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

EnvelopeGenerator.ServiceHost/Jobs/DbConfig.cs

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

EnvelopeGenerator.ServiceHost/Jobs/EnvelopeModel.cs

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

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFBurner.cs

@@ -4,6 +4,7 @@ using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure;
 using EnvelopeGenerator.PdfEditor;
 using EnvelopeGenerator.ServiceHost.Exceptions;
+using EnvelopeGenerator.ServiceHost.Jobs;
 using GdPicture14;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
@@ -11,16 +12,7 @@ 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)
+public class PDFBurner(IOptions<WorkerOptions> workerOptions, EGDbContext context, ILogger<PDFBurner> logger, LicenseManagerFactory licenseManagerFactory, AnnotationManager manager)
 {
     private readonly WorkerOptions.PDFBurnerOptions _options = workerOptions.Value.PdfBurner;
     

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFMerger.cs

@@ -1,4 +1,5 @@
 using EnvelopeGenerator.ServiceHost.Exceptions;
+using EnvelopeGenerator.ServiceHost.Jobs;
 using GdPicture14;
 using Microsoft.Extensions.Options;
 
@@ -7,16 +8,16 @@ namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
 public class PDFMerger
 {
     private readonly AnnotationManager _manager;
-    private readonly LicenseManager _licenseManager;
+    private readonly LicenseManagerFactory _licenseManagerFactory;
 
     private const bool AllowRasterization = true;
     private const bool AllowVectorization = true;
 
     private readonly PdfConversionConformance _pdfaConformanceLevel = PdfConversionConformance.PDF_A_1b;
 
-    public PDFMerger(LicenseManager licenseManager, AnnotationManager annotationManager)
+    public PDFMerger(LicenseManagerFactory licenseManagerFactory, AnnotationManager annotationManager)
     {
-        _licenseManager = licenseManager;
+        _licenseManagerFactory = licenseManagerFactory;
         _manager = annotationManager;
     }
 

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/ReportCreator.cs

@@ -1,102 +1,30 @@
-using System.Data;
-using EnvelopeGenerator.Domain.Constants;
+using DevExpress.Xpo;
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Application.Common.Dto;
 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)
+public class ReportCreator(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)
+    public async Task<byte[]> CreateReportAsync(EnvelopeDto envelope, CancellationToken cancel = default)
     {
-        try
-        {
-            Logger.LogDebug("Loading report data..");
-            var table = ReportModel.List(envelope.Id);
-            var items = GetReportSource(table);
+        var reports = await reportRepo.Where(r => r.EnvelopeId == envelope.Id).ToListAsync(cancel);
 
-            _envelope = envelope;
+        if (reports.Count == 0)
+            throw new CreateReportException("Could not prepare report data! No report data found!");
 
-            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)
+        var items = reports
+            .Select(r => new ReportItem(r, envelope))
             .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,3 +1,4 @@
+using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
@@ -5,15 +6,32 @@ namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
 
 public class ReportItem
 {
-    public Envelope? Envelope { get; set; }
-    public int EnvelopeId { get; set; }
+    public ReportItem() { }
+
+    public ReportItem(EnvelopeReport report, EnvelopeDto envelope)
+    {
+        CreatorFullName = envelope.User is not null
+            ? $"{envelope.User.Prename} {envelope.User.Name}".Trim()
+            : string.Empty;
+        CreatorEmailAddress = envelope.User?.Email ?? string.Empty;
+        EnvelopeTitle = report.HeadTitle ?? string.Empty;
+        EnvelopeUuid = report.HeadUuid ?? string.Empty;
+        EnvelopeCertificationType = envelope.CertificationType is int certType ? ((CertificationType)certType).ToString() : "null";
+        ItemStatus = (EnvelopeStatus)report.PosStatus;
+        ItemUserReference = report.PosWho ?? string.Empty;
+        ItemDate = report.PosWhen ?? DateTime.MinValue;
+    }
+
+    // Header fields (from Envelope)
+    public string CreatorFullName { get; set; } = string.Empty;
+    public string CreatorEmailAddress { get; set; } = string.Empty;
     public string EnvelopeTitle { get; set; } = string.Empty;
-    public string EnvelopeSubject { get; set; } = string.Empty;
+    public string EnvelopeUuid { get; set; } = string.Empty;
+    public string EnvelopeCertificationType { get; set; } = string.Empty;
 
+    // Detail fields (from EnvelopeReport)
     public EnvelopeStatus ItemStatus { get; set; }
-
     public string ItemStatusTranslated => ItemStatus.ToString();
-
     public string ItemUserReference { get; set; } = string.Empty;
     public DateTime ItemDate { get; set; }
 }

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/rptEnvelopeHistory.Designer.cs

@@ -0,0 +1,736 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Printing;
+using DevExpress.DataAccess.ObjectBinding;
+using DevExpress.XtraPrinting;
+using DevExpress.XtraReports.UI;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
+
+public partial class rptEnvelopeHistory : XtraReport
+{
+    /// <summary>
+    /// Required designer variable.
+    /// </summary>
+    private IContainer components = null;
+
+    /// <summary>
+    /// Clean up any resources being used.
+    /// </summary>
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing && components != null)
+        {
+            components.Dispose();
+        }
+        base.Dispose(disposing);
+    }
+
+    #region Designer generated code
+
+    /// <summary>
+    /// Required method for Designer support - do not modify
+    /// the contents of this method with the code editor.
+    /// </summary>
+    private void InitializeComponent()
+    {
+        this.components = new Container();
+        var resources = new ComponentResourceManager(typeof(rptEnvelopeHistory));
+        this.TopMargin = new TopMarginBand();
+        this.BottomMargin = new BottomMarginBand();
+        this.XrLabel1 = new XRLabel();
+        this.pageInfo1 = new XRPageInfo();
+        this.pageInfo2 = new XRPageInfo();
+        this.ReportHeader = new ReportHeaderBand();
+        this.label1 = new XRLabel();
+        this.XrTable3 = new XRTable();
+        this.XrTableRow8 = new XRTableRow();
+        this.XrTableCell13 = new XRTableCell();
+        this.XrTableCell15 = new XRTableCell();
+        this.XrTableRow9 = new XRTableRow();
+        this.XrTableCell14 = new XRTableCell();
+        this.XrTableCell17 = new XRTableCell();
+        this.XrTableCell16 = new XRTableCell();
+        this.XrTableCell18 = new XRTableCell();
+        this.XrTableRow10 = new XRTableRow();
+        this.XrTableCell19 = new XRTableCell();
+        this.XrTableCell20 = new XRTableCell();
+        this.XrTableCell21 = new XRTableCell();
+        this.XrTableCell22 = new XRTableCell();
+        this.XrTableRow11 = new XRTableRow();
+        this.XrTableCell23 = new XRTableCell();
+        this.XrTableCell24 = new XRTableCell();
+        this.XrTableCell25 = new XRTableCell();
+        this.XrTableCell26 = new XRTableCell();
+        this.GroupHeader1 = new GroupHeaderBand();
+        this.table1 = new XRTable();
+        this.tableRow1 = new XRTableRow();
+        this.tableCell1 = new XRTableCell();
+        this.tableCell2 = new XRTableCell();
+        this.tableCell3 = new XRTableCell();
+        this.Detail = new DetailBand();
+        this.table2 = new XRTable();
+        this.tableRow2 = new XRTableRow();
+        this.tableCell4 = new XRTableCell();
+        this.tableCell5 = new XRTableCell();
+        this.tableCell6 = new XRTableCell();
+        this.Title = new XRControlStyle();
+        this.DetailCaption1 = new XRControlStyle();
+        this.DetailData1 = new XRControlStyle();
+        this.DetailData3_Odd = new XRControlStyle();
+        this.PageInfo = new XRControlStyle();
+        this.ObjectDataSource1 = new ObjectDataSource(this.components);
+        ((ISupportInitialize)this.XrTable3).BeginInit();
+        ((ISupportInitialize)this.table1).BeginInit();
+        ((ISupportInitialize)this.table2).BeginInit();
+        ((ISupportInitialize)this.ObjectDataSource1).BeginInit();
+        ((ISupportInitialize)this).BeginInit();
+        //
+        // TopMargin
+        //
+        this.TopMargin.Dpi = 254F;
+        this.TopMargin.HeightF = 190.6042F;
+        this.TopMargin.Name = "TopMargin";
+        //
+        // BottomMargin
+        //
+        this.BottomMargin.Controls.AddRange(new XRControl[] { this.XrLabel1, this.pageInfo1, this.pageInfo2 });
+        this.BottomMargin.Dpi = 254F;
+        this.BottomMargin.Name = "BottomMargin";
+        //
+        // XrLabel1
+        //
+        this.XrLabel1.BorderColor = Color.FromArgb(165, 36, 49);
+        this.XrLabel1.Borders = BorderSide.Top;
+        this.XrLabel1.Dpi = 254F;
+        this.XrLabel1.Font = new Font("Arial", 8.25F, FontStyle.Bold);
+        this.XrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(896.5417F, 0F);
+        this.XrLabel1.Name = "XrLabel1";
+        this.XrLabel1.Padding = new PaddingInfo(0, 0, 0, 0, 254F);
+        this.XrLabel1.SizeF = new SizeF(645.5836F, 58F);
+        this.XrLabel1.StyleName = "Title";
+        this.XrLabel1.StylePriority.UseBorderColor = false;
+        this.XrLabel1.StylePriority.UseBorders = false;
+        this.XrLabel1.StylePriority.UseFont = false;
+        this.XrLabel1.StylePriority.UsePadding = false;
+        this.XrLabel1.Text = "Erstellt mit SignFlow";
+        //
+        // pageInfo1
+        //
+        this.pageInfo1.BorderColor = Color.FromArgb(165, 36, 49);
+        this.pageInfo1.Borders = BorderSide.Top;
+        this.pageInfo1.Dpi = 254F;
+        this.pageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+        this.pageInfo1.Name = "pageInfo1";
+        this.pageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
+        this.pageInfo1.SizeF = new SizeF(896.5417F, 58F);
+        this.pageInfo1.StyleName = "PageInfo";
+        this.pageInfo1.StylePriority.UseBorderColor = false;
+        this.pageInfo1.StylePriority.UseBorders = false;
+        this.pageInfo1.TextFormatString = "{0:dddd, d. MMMM yyyy HH:mm}";
+        //
+        // pageInfo2
+        //
+        this.pageInfo2.BorderColor = Color.FromArgb(165, 36, 49);
+        this.pageInfo2.Borders = BorderSide.Top;
+        this.pageInfo2.Dpi = 254F;
+        this.pageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(1542.125F, 0F);
+        this.pageInfo2.Name = "pageInfo2";
+        this.pageInfo2.SizeF = new SizeF(357.875F, 58F);
+        this.pageInfo2.StyleName = "PageInfo";
+        this.pageInfo2.StylePriority.UseBorderColor = false;
+        this.pageInfo2.StylePriority.UseBorders = false;
+        this.pageInfo2.TextAlignment = TextAlignment.TopRight;
+        this.pageInfo2.TextFormatString = "Seite {0} von {1}";
+        //
+        // ReportHeader
+        //
+        this.ReportHeader.Controls.AddRange(new XRControl[] { this.label1, this.XrTable3 });
+        this.ReportHeader.Dpi = 254F;
+        this.ReportHeader.HeightF = 406.0843F;
+        this.ReportHeader.Name = "ReportHeader";
+        //
+        // label1
+        //
+        this.label1.BackColor = Color.FromArgb(224, 224, 224);
+        this.label1.BorderColor = Color.FromArgb(165, 36, 49);
+        this.label1.Borders = BorderSide.Bottom;
+        this.label1.BorderWidth = 2F;
+        this.label1.Dpi = 254F;
+        this.label1.Font = new Font("Segoe UI", 14.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
+        this.label1.ForeColor = Color.Black;
+        this.label1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002422333F, 0F);
+        this.label1.Name = "label1";
+        this.label1.Padding = new PaddingInfo(10, 10, 5, 5, 254F);
+        this.label1.SizeF = new SizeF(1900F, 77.32857F);
+        this.label1.StyleName = "Title";
+        this.label1.StylePriority.UseBackColor = false;
+        this.label1.StylePriority.UseBorderColor = false;
+        this.label1.StylePriority.UseBorders = false;
+        this.label1.StylePriority.UseBorderWidth = false;
+        this.label1.StylePriority.UseFont = false;
+        this.label1.StylePriority.UseForeColor = false;
+        this.label1.StylePriority.UsePadding = false;
+        this.label1.Text = "Signierungszertifikat";
+        //
+        // XrTable3
+        //
+        this.XrTable3.Dpi = 254F;
+        this.XrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0.0002422333F, 96.60422F);
+        this.XrTable3.Name = "XrTable3";
+        this.XrTable3.OddStyleName = "DetailData3_Odd";
+        this.XrTable3.Rows.AddRange(new XRTableRow[] { this.XrTableRow8, this.XrTableRow9, this.XrTableRow10, this.XrTableRow11 });
+        this.XrTable3.SizeF = new SizeF(1900F, 284.4801F);
+        //
+        // XrTableRow8
+        //
+        this.XrTableRow8.Cells.AddRange(new XRTableCell[] { this.XrTableCell13, this.XrTableCell15 });
+        this.XrTableRow8.Dpi = 254F;
+        this.XrTableRow8.Name = "XrTableRow8";
+        this.XrTableRow8.Weight = 1D;
+        //
+        // XrTableCell13
+        //
+        this.XrTableCell13.BackColor = Color.FromArgb(224, 224, 224);
+        this.XrTableCell13.BorderColor = Color.FromArgb(165, 36, 49);
+        this.XrTableCell13.Borders = BorderSide.Bottom;
+        this.XrTableCell13.BorderWidth = 1F;
+        this.XrTableCell13.Dpi = 254F;
+        this.XrTableCell13.ForeColor = Color.Black;
+        this.XrTableCell13.Name = "XrTableCell13";
+        this.XrTableCell13.StyleName = "DetailCaption1";
+        this.XrTableCell13.StylePriority.UseBackColor = false;
+        this.XrTableCell13.StylePriority.UseBorderColor = false;
+        this.XrTableCell13.StylePriority.UseBorders = false;
+        this.XrTableCell13.StylePriority.UseBorderWidth = false;
+        this.XrTableCell13.StylePriority.UseForeColor = false;
+        this.XrTableCell13.Text = "Ersteller";
+        this.XrTableCell13.Weight = 0.38139956730411484D;
+        //
+        // XrTableCell15
+        //
+        this.XrTableCell15.BackColor = Color.FromArgb(224, 224, 224);
+        this.XrTableCell15.BorderColor = Color.FromArgb(165, 36, 49);
+        this.XrTableCell15.Borders = BorderSide.Bottom;
+        this.XrTableCell15.BorderWidth = 1F;
+        this.XrTableCell15.Dpi = 254F;
+        this.XrTableCell15.ForeColor = Color.Black;
+        this.XrTableCell15.Name = "XrTableCell15";
+        this.XrTableCell15.StyleName = "DetailCaption1";
+        this.XrTableCell15.StylePriority.UseBackColor = false;
+        this.XrTableCell15.StylePriority.UseBorderColor = false;
+        this.XrTableCell15.StylePriority.UseBorders = false;
+        this.XrTableCell15.StylePriority.UseBorderWidth = false;
+        this.XrTableCell15.StylePriority.UseForeColor = false;
+        this.XrTableCell15.Text = "Umschlag";
+        this.XrTableCell15.Weight = 0.49859081604996847D;
+        //
+        // XrTableRow9
+        //
+        this.XrTableRow9.Cells.AddRange(new XRTableCell[] { this.XrTableCell14, this.XrTableCell17, this.XrTableCell16, this.XrTableCell18 });
+        this.XrTableRow9.Dpi = 254F;
+        this.XrTableRow9.Name = "XrTableRow9";
+        this.XrTableRow9.Weight = 1D;
+        //
+        // XrTableCell14
+        //
+        this.XrTableCell14.BackColor = Color.White;
+        this.XrTableCell14.BorderColor = Color.Empty;
+        this.XrTableCell14.Borders = BorderSide.None;
+        this.XrTableCell14.Dpi = 254F;
+        this.XrTableCell14.Font = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
+        this.XrTableCell14.ForeColor = Color.Black;
+        this.XrTableCell14.Multiline = true;
+        this.XrTableCell14.Name = "XrTableCell14";
+        this.XrTableCell14.StyleName = "DetailCaption1";
+        this.XrTableCell14.StylePriority.UseBackColor = false;
+        this.XrTableCell14.StylePriority.UseBorderColor = false;
+        this.XrTableCell14.StylePriority.UseBorders = false;
+        this.XrTableCell14.StylePriority.UseFont = false;
+        this.XrTableCell14.StylePriority.UseForeColor = false;
+        this.XrTableCell14.Text = "Name";
+        this.XrTableCell14.Weight = 0.11578820509129036D;
+        //
+        // XrTableCell17
+        //
+        this.XrTableCell17.BackColor = Color.White;
+        this.XrTableCell17.BorderColor = Color.Empty;
+        this.XrTableCell17.Borders = BorderSide.None;
+        this.XrTableCell17.Dpi = 254F;
+        this.XrTableCell17.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[CreatorFullName]") });
+        this.XrTableCell17.Font = new Font("Arial", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
+        this.XrTableCell17.ForeColor = Color.Black;
+        this.XrTableCell17.Multiline = true;
+        this.XrTableCell17.Name = "XrTableCell17";
+        this.XrTableCell17.StyleName = "DetailCaption1";
+        this.XrTableCell17.StylePriority.UseBackColor = false;
+        this.XrTableCell17.StylePriority.UseBorderColor = false;
+        this.XrTableCell17.StylePriority.UseBorders = false;
+        this.XrTableCell17.StylePriority.UseFont = false;
+        this.XrTableCell17.StylePriority.UseForeColor = false;
+        this.XrTableCell17.Text = "XrTableCell17";
+        this.XrTableCell17.Weight = 0.2656113622128245D;
+        //
+        // XrTableCell16
+        //
+        this.XrTableCell16.BackColor = Color.White;
+        this.XrTableCell16.BorderColor = Color.Empty;
+        this.XrTableCell16.Borders = BorderSide.None;
+        this.XrTableCell16.Dpi = 254F;
+        this.XrTableCell16.Font = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
+        this.XrTableCell16.ForeColor = Color.Black;
+        this.XrTableCell16.Multiline = true;
+        this.XrTableCell16.Name = "XrTableCell16";
+        this.XrTableCell16.StyleName = "DetailCaption1";
+        this.XrTableCell16.StylePriority.UseBackColor = false;
+        this.XrTableCell16.StylePriority.UseBorderColor = false;
+        this.XrTableCell16.StylePriority.UseBorders = false;
+        this.XrTableCell16.StylePriority.UseFont = false;
+        this.XrTableCell16.StylePriority.UseForeColor = false;
+        this.XrTableCell16.Text = "Titel";
+        this.XrTableCell16.Weight = 0.11578821158083684D;
+        //
+        // XrTableCell18
+        //
+        this.XrTableCell18.BackColor = Color.White;
+        this.XrTableCell18.BorderColor = Color.Empty;
+        this.XrTableCell18.Borders = BorderSide.None;
+        this.XrTableCell18.Dpi = 254F;
+        this.XrTableCell18.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[EnvelopeTitle]") });
+        this.XrTableCell18.Font = new Font("Arial", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
+        this.XrTableCell18.ForeColor = Color.Black;
+        this.XrTableCell18.Multiline = true;
+        this.XrTableCell18.Name = "XrTableCell18";
+        this.XrTableCell18.StyleName = "DetailCaption1";
+        this.XrTableCell18.StylePriority.UseBackColor = false;
+        this.XrTableCell18.StylePriority.UseBorderColor = false;
+        this.XrTableCell18.StylePriority.UseBorders = false;
+        this.XrTableCell18.StylePriority.UseFont = false;
+        this.XrTableCell18.StylePriority.UseForeColor = false;
+        this.XrTableCell18.Text = "XrTableCell18";
+        this.XrTableCell18.Weight = 0.38280260446913167D;
+        //
+        // XrTableRow10
+        //
+        this.XrTableRow10.Cells.AddRange(new XRTableCell[] { this.XrTableCell19, this.XrTableCell20, this.XrTableCell21, this.XrTableCell22 });
+        this.XrTableRow10.Dpi = 254F;
+        this.XrTableRow10.Name = "XrTableRow10";
+        this.XrTableRow10.Weight = 1D;
+        //
+        // XrTableCell19
+        //
+        this.XrTableCell19.BackColor = Color.White;
+        this.XrTableCell19.BorderColor = Color.Empty;
+        this.XrTableCell19.Borders = BorderSide.None;
+        this.XrTableCell19.Dpi = 254F;
+        this.XrTableCell19.Font = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
+        this.XrTableCell19.ForeColor = Color.Black;
+        this.XrTableCell19.Multiline = true;
+        this.XrTableCell19.Name = "XrTableCell19";
+        this.XrTableCell19.StyleName = "DetailCaption1";
+        this.XrTableCell19.StylePriority.UseBackColor = false;
+        this.XrTableCell19.StylePriority.UseBorderColor = false;
+        this.XrTableCell19.StylePriority.UseBorders = false;
+        this.XrTableCell19.StylePriority.UseFont = false;
+        this.XrTableCell19.StylePriority.UseForeColor = false;
+        this.XrTableCell19.Text = "EmailAddress";
+        this.XrTableCell19.Weight = 0.11578820509129036D;
+        //
+        // XrTableCell20
+        //
+        this.XrTableCell20.BackColor = Color.White;
+        this.XrTableCell20.BorderColor = Color.Empty;
+        this.XrTableCell20.Borders = BorderSide.None;
+        this.XrTableCell20.Dpi = 254F;
+        this.XrTableCell20.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[CreatorEmailAddress]") });
+        this.XrTableCell20.Font = new Font("Arial", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
+        this.XrTableCell20.ForeColor = Color.Black;
+        this.XrTableCell20.Multiline = true;
+        this.XrTableCell20.Name = "XrTableCell20";
+        this.XrTableCell20.StyleName = "DetailCaption1";
+        this.XrTableCell20.StylePriority.UseBackColor = false;
+        this.XrTableCell20.StylePriority.UseBorderColor = false;
+        this.XrTableCell20.StylePriority.UseBorders = false;
+        this.XrTableCell20.StylePriority.UseFont = false;
+        this.XrTableCell20.StylePriority.UseForeColor = false;
+        this.XrTableCell20.Text = "XrTableCell20";
+        this.XrTableCell20.Weight = 0.2656113622128245D;
+        //
+        // XrTableCell21
+        //
+        this.XrTableCell21.BackColor = Color.White;
+        this.XrTableCell21.BorderColor = Color.Empty;
+        this.XrTableCell21.Borders = BorderSide.None;
+        this.XrTableCell21.Dpi = 254F;
+        this.XrTableCell21.Font = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
+        this.XrTableCell21.ForeColor = Color.Black;
+        this.XrTableCell21.Multiline = true;
+        this.XrTableCell21.Name = "XrTableCell21";
+        this.XrTableCell21.StyleName = "DetailCaption1";
+        this.XrTableCell21.StylePriority.UseBackColor = false;
+        this.XrTableCell21.StylePriority.UseBorderColor = false;
+        this.XrTableCell21.StylePriority.UseBorders = false;
+        this.XrTableCell21.StylePriority.UseFont = false;
+        this.XrTableCell21.StylePriority.UseForeColor = false;
+        this.XrTableCell21.Text = "Umschlag-ID";
+        this.XrTableCell21.Weight = 0.11578821158083684D;
+        //
+        // XrTableCell22
+        //
+        this.XrTableCell22.BackColor = Color.White;
+        this.XrTableCell22.BorderColor = Color.Empty;
+        this.XrTableCell22.Borders = BorderSide.None;
+        this.XrTableCell22.Dpi = 254F;
+        this.XrTableCell22.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[EnvelopeUuid]") });
+        this.XrTableCell22.Font = new Font("Arial", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
+        this.XrTableCell22.ForeColor = Color.Black;
+        this.XrTableCell22.Multiline = true;
+        this.XrTableCell22.Name = "XrTableCell22";
+        this.XrTableCell22.StyleName = "DetailCaption1";
+        this.XrTableCell22.StylePriority.UseBackColor = false;
+        this.XrTableCell22.StylePriority.UseBorderColor = false;
+        this.XrTableCell22.StylePriority.UseBorders = false;
+        this.XrTableCell22.StylePriority.UseFont = false;
+        this.XrTableCell22.StylePriority.UseForeColor = false;
+        this.XrTableCell22.Text = "XrTableCell22";
+        this.XrTableCell22.Weight = 0.38280260446913167D;
+        //
+        // XrTableRow11
+        //
+        this.XrTableRow11.Cells.AddRange(new XRTableCell[] { this.XrTableCell23, this.XrTableCell24, this.XrTableCell25, this.XrTableCell26 });
+        this.XrTableRow11.Dpi = 254F;
+        this.XrTableRow11.Name = "XrTableRow11";
+        this.XrTableRow11.Weight = 1D;
+        //
+        // XrTableCell23
+        //
+        this.XrTableCell23.BackColor = Color.White;
+        this.XrTableCell23.BorderColor = Color.Empty;
+        this.XrTableCell23.Borders = BorderSide.None;
+        this.XrTableCell23.Dpi = 254F;
+        this.XrTableCell23.Font = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
+        this.XrTableCell23.ForeColor = Color.Black;
+        this.XrTableCell23.Multiline = true;
+        this.XrTableCell23.Name = "XrTableCell23";
+        this.XrTableCell23.StyleName = "DetailCaption1";
+        this.XrTableCell23.StylePriority.UseBackColor = false;
+        this.XrTableCell23.StylePriority.UseBorderColor = false;
+        this.XrTableCell23.StylePriority.UseBorders = false;
+        this.XrTableCell23.StylePriority.UseFont = false;
+        this.XrTableCell23.StylePriority.UseForeColor = false;
+        this.XrTableCell23.Weight = 0.11578820509129036D;
+        //
+        // XrTableCell24
+        //
+        this.XrTableCell24.BackColor = Color.White;
+        this.XrTableCell24.BorderColor = Color.Empty;
+        this.XrTableCell24.Borders = BorderSide.None;
+        this.XrTableCell24.Dpi = 254F;
+        this.XrTableCell24.Font = new Font("Arial", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
+        this.XrTableCell24.ForeColor = Color.Black;
+        this.XrTableCell24.Multiline = true;
+        this.XrTableCell24.Name = "XrTableCell24";
+        this.XrTableCell24.StyleName = "DetailCaption1";
+        this.XrTableCell24.StylePriority.UseBackColor = false;
+        this.XrTableCell24.StylePriority.UseBorderColor = false;
+        this.XrTableCell24.StylePriority.UseBorders = false;
+        this.XrTableCell24.StylePriority.UseFont = false;
+        this.XrTableCell24.StylePriority.UseForeColor = false;
+        this.XrTableCell24.Weight = 0.2656113622128245D;
+        //
+        // XrTableCell25
+        //
+        this.XrTableCell25.BackColor = Color.White;
+        this.XrTableCell25.BorderColor = Color.Empty;
+        this.XrTableCell25.Borders = BorderSide.None;
+        this.XrTableCell25.Dpi = 254F;
+        this.XrTableCell25.Font = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0);
+        this.XrTableCell25.ForeColor = Color.Black;
+        this.XrTableCell25.Multiline = true;
+        this.XrTableCell25.Name = "XrTableCell25";
+        this.XrTableCell25.StyleName = "DetailCaption1";
+        this.XrTableCell25.StylePriority.UseBackColor = false;
+        this.XrTableCell25.StylePriority.UseBorderColor = false;
+        this.XrTableCell25.StylePriority.UseBorders = false;
+        this.XrTableCell25.StylePriority.UseFont = false;
+        this.XrTableCell25.StylePriority.UseForeColor = false;
+        this.XrTableCell25.Text = "Zertifizierung";
+        this.XrTableCell25.Weight = 0.11578821158083684D;
+        //
+        // XrTableCell26
+        //
+        this.XrTableCell26.BackColor = Color.White;
+        this.XrTableCell26.BorderColor = Color.Empty;
+        this.XrTableCell26.Borders = BorderSide.None;
+        this.XrTableCell26.Dpi = 254F;
+        this.XrTableCell26.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[EnvelopeCertificationType]") });
+        this.XrTableCell26.Font = new Font("Arial", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
+        this.XrTableCell26.ForeColor = Color.Black;
+        this.XrTableCell26.Multiline = true;
+        this.XrTableCell26.Name = "XrTableCell26";
+        this.XrTableCell26.StyleName = "DetailCaption1";
+        this.XrTableCell26.StylePriority.UseBackColor = false;
+        this.XrTableCell26.StylePriority.UseBorderColor = false;
+        this.XrTableCell26.StylePriority.UseBorders = false;
+        this.XrTableCell26.StylePriority.UseFont = false;
+        this.XrTableCell26.StylePriority.UseForeColor = false;
+        this.XrTableCell26.Text = "XrTableCell26";
+        this.XrTableCell26.Weight = 0.38280260446913161D;
+        //
+        // GroupHeader1
+        //
+        this.GroupHeader1.Controls.AddRange(new XRControl[] { this.table1 });
+        this.GroupHeader1.Dpi = 254F;
+        this.GroupHeader1.GroupUnion = GroupUnion.WithFirstDetail;
+        this.GroupHeader1.HeightF = 71.12F;
+        this.GroupHeader1.Name = "GroupHeader1";
+        //
+        // table1
+        //
+        this.table1.Dpi = 254F;
+        this.table1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+        this.table1.Name = "table1";
+        this.table1.Rows.AddRange(new XRTableRow[] { this.tableRow1 });
+        this.table1.SizeF = new SizeF(1900F, 71.12F);
+        //
+        // tableRow1
+        //
+        this.tableRow1.Cells.AddRange(new XRTableCell[] { this.tableCell1, this.tableCell2, this.tableCell3 });
+        this.tableRow1.Dpi = 254F;
+        this.tableRow1.Name = "tableRow1";
+        this.tableRow1.Weight = 1D;
+        //
+        // tableCell1
+        //
+        this.tableCell1.BackColor = Color.FromArgb(224, 224, 224);
+        this.tableCell1.BorderColor = Color.FromArgb(165, 36, 49);
+        this.tableCell1.Borders = BorderSide.Bottom;
+        this.tableCell1.BorderWidth = 1F;
+        this.tableCell1.Dpi = 254F;
+        this.tableCell1.ForeColor = Color.Black;
+        this.tableCell1.Name = "tableCell1";
+        this.tableCell1.StyleName = "DetailCaption1";
+        this.tableCell1.StylePriority.UseBackColor = false;
+        this.tableCell1.StylePriority.UseBorderColor = false;
+        this.tableCell1.StylePriority.UseBorders = false;
+        this.tableCell1.StylePriority.UseBorderWidth = false;
+        this.tableCell1.StylePriority.UseForeColor = false;
+        this.tableCell1.Text = "Ereignis";
+        this.tableCell1.Weight = 0.51726482588176181D;
+        //
+        // tableCell2
+        //
+        this.tableCell2.BackColor = Color.FromArgb(224, 224, 224);
+        this.tableCell2.BorderColor = Color.FromArgb(165, 36, 49);
+        this.tableCell2.Borders = BorderSide.Bottom;
+        this.tableCell2.BorderWidth = 1F;
+        this.tableCell2.Dpi = 254F;
+        this.tableCell2.ForeColor = Color.Black;
+        this.tableCell2.Name = "tableCell2";
+        this.tableCell2.StyleName = "DetailCaption1";
+        this.tableCell2.StylePriority.UseBackColor = false;
+        this.tableCell2.StylePriority.UseBorderColor = false;
+        this.tableCell2.StylePriority.UseBorders = false;
+        this.tableCell2.StylePriority.UseBorderWidth = false;
+        this.tableCell2.StylePriority.UseForeColor = false;
+        this.tableCell2.Text = "Benutzer";
+        this.tableCell2.Weight = 0.45140669898958585D;
+        //
+        // tableCell3
+        //
+        this.tableCell3.BackColor = Color.FromArgb(224, 224, 224);
+        this.tableCell3.BorderColor = Color.FromArgb(165, 36, 49);
+        this.tableCell3.Borders = BorderSide.Bottom;
+        this.tableCell3.BorderWidth = 1F;
+        this.tableCell3.Dpi = 254F;
+        this.tableCell3.ForeColor = Color.Black;
+        this.tableCell3.Name = "tableCell3";
+        this.tableCell3.StyleName = "DetailCaption1";
+        this.tableCell3.StylePriority.UseBackColor = false;
+        this.tableCell3.StylePriority.UseBorderColor = false;
+        this.tableCell3.StylePriority.UseBorders = false;
+        this.tableCell3.StylePriority.UseBorderWidth = false;
+        this.tableCell3.StylePriority.UseForeColor = false;
+        this.tableCell3.Text = "Zeitstempel";
+        this.tableCell3.Weight = 0.22479583469004233D;
+        //
+        // Detail
+        //
+        this.Detail.Controls.AddRange(new XRControl[] { this.table2 });
+        this.Detail.Dpi = 254F;
+        this.Detail.HeightF = 86.174F;
+        this.Detail.HierarchyPrintOptions.Indent = 50.8F;
+        this.Detail.Name = "Detail";
+        //
+        // table2
+        //
+        this.table2.Dpi = 254F;
+        this.table2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+        this.table2.Name = "table2";
+        this.table2.Rows.AddRange(new XRTableRow[] { this.tableRow2 });
+        this.table2.SizeF = new SizeF(1900F, 63.42F);
+        //
+        // tableRow2
+        //
+        this.tableRow2.Cells.AddRange(new XRTableCell[] { this.tableCell4, this.tableCell5, this.tableCell6 });
+        this.tableRow2.Dpi = 254F;
+        this.tableRow2.Name = "tableRow2";
+        this.tableRow2.Weight = 11.683999633789062D;
+        //
+        // tableCell4
+        //
+        this.tableCell4.Borders = BorderSide.None;
+        this.tableCell4.Dpi = 254F;
+        this.tableCell4.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[ItemStatusTranslated]") });
+        this.tableCell4.Name = "tableCell4";
+        this.tableCell4.StyleName = "DetailData1";
+        this.tableCell4.StylePriority.UseBorders = false;
+        this.tableCell4.Weight = 0.51726482142156094D;
+        //
+        // tableCell5
+        //
+        this.tableCell5.Dpi = 254F;
+        this.tableCell5.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[ItemUserReference]") });
+        this.tableCell5.Name = "tableCell5";
+        this.tableCell5.StyleName = "DetailData1";
+        this.tableCell5.Weight = 0.45140669932916544D;
+        //
+        // tableCell6
+        //
+        this.tableCell6.Dpi = 254F;
+        this.tableCell6.ExpressionBindings.AddRange(new ExpressionBinding[] { new ExpressionBinding("BeforePrint", "Text", "[ItemDate]") });
+        this.tableCell6.Name = "tableCell6";
+        this.tableCell6.StyleName = "DetailData1";
+        this.tableCell6.StylePriority.UseTextAlignment = false;
+        this.tableCell6.TextAlignment = TextAlignment.MiddleRight;
+        this.tableCell6.Weight = 0.22479581593269077D;
+        //
+        // Title
+        //
+        this.Title.BackColor = Color.Transparent;
+        this.Title.BorderColor = Color.Black;
+        this.Title.Borders = BorderSide.None;
+        this.Title.BorderWidth = 1F;
+        this.Title.Font = new Font("Arial", 14.25F);
+        this.Title.ForeColor = Color.FromArgb(75, 75, 75);
+        this.Title.Name = "Title";
+        this.Title.Padding = new PaddingInfo(15, 15, 0, 0, 254F);
+        //
+        // DetailCaption1
+        //
+        this.DetailCaption1.BackColor = Color.FromArgb(75, 75, 75);
+        this.DetailCaption1.BorderColor = Color.White;
+        this.DetailCaption1.Borders = BorderSide.Left;
+        this.DetailCaption1.BorderWidth = 2F;
+        this.DetailCaption1.Font = new Font("Arial", 8.25F, FontStyle.Bold);
+        this.DetailCaption1.ForeColor = Color.White;
+        this.DetailCaption1.Name = "DetailCaption1";
+        this.DetailCaption1.Padding = new PaddingInfo(15, 15, 0, 0, 254F);
+        this.DetailCaption1.TextAlignment = TextAlignment.MiddleLeft;
+        //
+        // DetailData1
+        //
+        this.DetailData1.BorderColor = Color.Transparent;
+        this.DetailData1.Borders = BorderSide.Left;
+        this.DetailData1.BorderWidth = 2F;
+        this.DetailData1.Font = new Font("Arial", 8.25F);
+        this.DetailData1.ForeColor = Color.Black;
+        this.DetailData1.Name = "DetailData1";
+        this.DetailData1.Padding = new PaddingInfo(15, 15, 0, 0, 254F);
+        this.DetailData1.TextAlignment = TextAlignment.MiddleLeft;
+        //
+        // DetailData3_Odd
+        //
+        this.DetailData3_Odd.BackColor = Color.FromArgb(231, 231, 231);
+        this.DetailData3_Odd.BorderColor = Color.Transparent;
+        this.DetailData3_Odd.Borders = BorderSide.None;
+        this.DetailData3_Odd.BorderWidth = 1F;
+        this.DetailData3_Odd.Font = new Font("Arial", 8.25F);
+        this.DetailData3_Odd.ForeColor = Color.Black;
+        this.DetailData3_Odd.Name = "DetailData3_Odd";
+        this.DetailData3_Odd.Padding = new PaddingInfo(15, 15, 0, 0, 254F);
+        this.DetailData3_Odd.TextAlignment = TextAlignment.MiddleLeft;
+        //
+        // PageInfo
+        //
+        this.PageInfo.Font = new Font("Arial", 8.25F, FontStyle.Bold);
+        this.PageInfo.ForeColor = Color.FromArgb(75, 75, 75);
+        this.PageInfo.Name = "PageInfo";
+        this.PageInfo.Padding = new PaddingInfo(15, 15, 0, 0, 254F);
+        //
+        // ObjectDataSource1
+        //
+        this.ObjectDataSource1.DataMember = "Items";
+        this.ObjectDataSource1.Name = "ObjectDataSource1";
+        //
+        // rptEnvelopeHistory
+        //
+        this.Bands.AddRange(new Band[] { this.TopMargin, this.BottomMargin, this.ReportHeader, this.GroupHeader1, this.Detail });
+        this.ComponentStorage.AddRange(new IComponent[] { this.ObjectDataSource1 });
+        this.DataSource = this.ObjectDataSource1;
+        this.Dpi = 254F;
+        this.Font = new Font("Arial", 9.75F);
+        this.Margins = new Margins(100, 100, 191, 100);
+        this.PageHeight = 2970;
+        this.PageWidth = 2100;
+        this.PaperKind = (DevExpress.Drawing.Printing.DXPaperKind)System.Drawing.Printing.PaperKind.A4;
+        this.ReportUnit = ReportUnit.TenthsOfAMillimeter;
+        this.SnapGridSize = 25F;
+        this.StyleSheet.AddRange(new XRControlStyle[] { this.Title, this.DetailCaption1, this.DetailData1, this.DetailData3_Odd, this.PageInfo });
+        this.Version = "24.2";
+        this.Watermark.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("rptEnvelopeHistory.Watermark.ImageSource"));
+        this.Watermark.ImageTransparency = 220;
+        ((ISupportInitialize)this.XrTable3).EndInit();
+        ((ISupportInitialize)this.table1).EndInit();
+        ((ISupportInitialize)this.table2).EndInit();
+        ((ISupportInitialize)this.ObjectDataSource1).EndInit();
+        ((ISupportInitialize)this).EndInit();
+    }
+
+    #endregion
+
+    private TopMarginBand TopMargin;
+    private BottomMarginBand BottomMargin;
+    private XRPageInfo pageInfo1;
+    private XRPageInfo pageInfo2;
+    private ReportHeaderBand ReportHeader;
+    private XRLabel label1;
+    private GroupHeaderBand GroupHeader1;
+    private XRTable table1;
+    private XRTableRow tableRow1;
+    private XRTableCell tableCell1;
+    private XRTableCell tableCell2;
+    private XRTableCell tableCell3;
+    private DetailBand Detail;
+    private XRTable table2;
+    private XRTableRow tableRow2;
+    private XRTableCell tableCell4;
+    private XRTableCell tableCell5;
+    private XRTableCell tableCell6;
+    private ObjectDataSource ObjectDataSource1;
+    private XRControlStyle Title;
+    private XRControlStyle DetailCaption1;
+    private XRControlStyle DetailData1;
+    private XRControlStyle DetailData3_Odd;
+    private XRControlStyle PageInfo;
+    private XRLabel XrLabel1;
+    private XRTable XrTable3;
+    private XRTableRow XrTableRow8;
+    private XRTableCell XrTableCell13;
+    private XRTableCell XrTableCell15;
+    private XRTableRow XrTableRow9;
+    private XRTableCell XrTableCell14;
+    private XRTableCell XrTableCell17;
+    private XRTableCell XrTableCell16;
+    private XRTableCell XrTableCell18;
+    private XRTableRow XrTableRow10;
+    private XRTableCell XrTableCell19;
+    private XRTableCell XrTableCell20;
+    private XRTableCell XrTableCell21;
+    private XRTableCell XrTableCell22;
+    private XRTableRow XrTableRow11;
+    private XRTableCell XrTableCell23;
+    private XRTableCell XrTableCell24;
+    private XRTableCell XrTableCell25;
+    private XRTableCell XrTableCell26;
+}

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/rptEnvelopeHistory.cs

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

EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocumentJob.cs

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

EnvelopeGenerator.ServiceHost/Jobs/Infrastructure/Database.cs

@@ -1,7 +1,7 @@
 using System.Data;
 using Microsoft.Data.SqlClient;
 
-namespace DigitalData.Modules.Database;
+namespace EnvelopeGenerator.ServiceHost.Jobs.Infrastructure;
 
 public class MSSQLServer(IConfiguration configuration)
 {

EnvelopeGenerator.ServiceHost/Jobs/JobStateManager.cs

@@ -0,0 +1,19 @@
+using AngleSharp.Common;
+using System.Collections.Concurrent;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs;
+
+public class JobStateManager(Dictionary<string, State>? initialState = null)
+{
+    private readonly ConcurrentDictionary<Type, State> _states = new();
+
+    public State GetState<TJob>() => _states.GetOrAdd(typeof(TJob), type => initialState?.GetOrDefault(type.Name, State.Stopped) ?? State.Stopped);
+
+    public State SetState<TJob>(State state) => _states[typeof(TJob)] = state;
+}
+
+public enum State
+{
+    Running,
+    Stopped
+}

EnvelopeGenerator.ServiceHost/Jobs/LicenseManagerFactory.cs

@@ -0,0 +1,39 @@
+using EnvelopeGenerator.Application.ThirdPartyModules.Queries;
+using GdPicture14;
+using MediatR;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace EnvelopeGenerator.ServiceHost.Jobs;
+
+public class LicenseManagerFactory
+{
+    private static readonly string _cacheKey = Guid.NewGuid().ToString();
+    private readonly IServiceScopeFactory scopeFactory;
+    private readonly IMemoryCache cache;
+
+    public LicenseManagerFactory(IServiceScopeFactory scopeFactory, IMemoryCache cache)
+    {
+        this.scopeFactory = scopeFactory;
+        this.cache = cache;
+        _ = CreateAsync(); // Preload the license key into the cache
+    }
+
+    public async Task<LicenseManager> CreateAsync(CancellationToken cancellationToken = default)
+    {
+        var key = await GetLicenseKeyAsync(cancellationToken);
+        var licenseManager = new LicenseManager();
+        licenseManager.RegisterKEY(key);
+        return licenseManager;
+    }
+
+    public async Task<string> GetLicenseKeyAsync(CancellationToken cancellationToken = default)
+    {
+        return await cache.GetOrCreateAsync(_cacheKey, async entry =>
+        {
+            entry.Priority = CacheItemPriority.NeverRemove;
+            using var scope = scopeFactory.CreateScope();
+            var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
+            return await mediator.Send(new ReadThirdPartyModuleLicenseQuery { Name = "GdPicture", Active =true }, cancellationToken);
+        }) ?? throw new InvalidOperationException("License key could not be retrieved.");
+    }
+}

EnvelopeGenerator.ServiceHost/Jobs/ReportModel.cs

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

EnvelopeGenerator.ServiceHost/Jobs/State.cs

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

EnvelopeGenerator.ServiceHost/Jobs/TempFiles.cs

@@ -2,12 +2,17 @@ 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;
@@ -15,6 +20,8 @@ public class TempFiles
         TempPath = Path.Combine(tempDirectoryPath, "EnvelopeGenerator");
     }
 
+
+    [Obsolete("Use memory cache instead of temp files.")]
     public bool Create()
     {
         try
@@ -37,6 +44,8 @@ public class TempFiles
         }
     }
 
+
+    [Obsolete("Use memory cache instead of temp files.")]
     private bool CleanUpFiles()
     {
         try
@@ -56,6 +65,8 @@ public class TempFiles
         }
     }
 
+
+    [Obsolete("Use memory cache instead of temp files.")]
     public bool CleanUp()
     {
         try

EnvelopeGenerator.ServiceHost/Jobs/WorkerOptions.cs

@@ -1,14 +1,22 @@
-using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
-using System.Drawing;
-
 namespace EnvelopeGenerator.ServiceHost.Jobs;
 
 public class WorkerOptions
 {
-    public string GdPictureLicenseKey { get; set; } = null!;
+    private int _delayMilliseconds = 1000;
 
-    [Obsolete("Use ILogger.")]
-    public bool Debug { get; set; }
+    public int DelayMilliseconds
+    {
+        get => _delayMilliseconds;
+        set
+        {
+            if (value < 1)
+                throw new ArgumentOutOfRangeException(nameof(value), "Delay must be at least 1 millisecond.");
+
+            _delayMilliseconds = value;
+        }
+    }
+
+    public Dictionary<string, State> InitialJobState { get; set; } = [];
 
     public PDFBurnerOptions PdfBurner { get; set; } = new();
 

EnvelopeGenerator.ServiceHost/Middleware/ExceptionHandlingMiddleware.cs

@@ -0,0 +1,75 @@
+namespace EnvelopeGenerator.ServiceHost.Middleware;
+
+using DigitalData.Core.Exceptions;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using System.Net;
+using System.Text.Json;
+
+/// <summary>
+/// Middleware for handling exceptions globally in the application.
+/// Captures exceptions thrown during the request pipeline execution,
+/// logs them, and returns an appropriate HTTP response with a JSON error message.
+/// </summary>
+/// <remarks>
+/// Initializes a new instance of the <see cref="ExceptionHandlingMiddleware"/> class.
+/// </remarks>
+/// <param name="next">The next middleware in the request pipeline.</param>
+/// <param name="logger">The logger instance for logging exceptions.</param>
+public class ExceptionHandlingMiddleware(RequestDelegate next, ILogger<ExceptionHandlingMiddleware> logger)
+{
+    /// <summary>
+    /// Invokes the middleware to handle the HTTP request.
+    /// </summary>
+    /// <param name="context">The HTTP context of the current request.</param>
+    /// <returns>A task that represents the asynchronous operation.</returns>
+    public async Task InvokeAsync(HttpContext context)
+    {
+        try
+        {
+            await next(context); // Continue down the pipeline
+        }
+        catch (Exception ex)
+        {
+            await HandleExceptionAsync(context, ex, logger);
+        }
+    }
+
+    /// <summary>
+    /// Handles exceptions by logging them and writing an appropriate JSON response.
+    /// </summary>
+    /// <param name="context">The HTTP context of the current request.</param>
+    /// <param name="exception">The exception that occurred.</param>
+    /// <param name="logger">The logger instance for logging the exception.</param>
+    /// <returns>A task that represents the asynchronous operation.</returns>
+    private static async Task HandleExceptionAsync(HttpContext context, Exception exception, ILogger logger)
+    {
+        context.Response.ContentType = "application/json";
+
+        string message;
+
+        switch (exception)
+        {
+            case BadRequestException badRequestEx:
+                context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
+                message = badRequestEx.Message;
+                break;
+
+            case NotFoundException notFoundEx:
+                context.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                message = notFoundEx.Message;
+                break;
+
+            default:
+                logger.LogError(exception, "Unhandled exception occurred.");
+                context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
+                message = "An unexpected error occurred.";
+                break;
+        }
+
+        await context.Response.WriteAsync(JsonSerializer.Serialize(new
+        {
+            message
+        }));
+    }
+}

EnvelopeGenerator.ServiceHost/Program.cs

@@ -1,20 +1,73 @@
+using DigitalData.UserManager.DependencyInjection;
+using EnvelopeGenerator.Application;
+using EnvelopeGenerator.Infrastructure;
 using EnvelopeGenerator.ServiceHost;
 using EnvelopeGenerator.ServiceHost.Extensions;
+using EnvelopeGenerator.ServiceHost.Middleware;
+using Microsoft.AspNetCore.Localization;
+using Microsoft.EntityFrameworkCore;
+using System.Globalization;
 
 var builder = WebApplication.CreateBuilder(args);
 
-// Add services to the container.
+#region Kestrel & Windows Service Configuration
+if (builder.Configuration.GetValue<bool>("UseWindowsService"))
+{
+    builder.Host.UseWindowsService();
+}
 
+if (builder.Configuration.GetValue<bool>("UseCustomKestrelEndpoints"))
+{
+    builder.WebHost.ConfigureKestrel((context, serverOptions) =>
+    {
+        var serverConfigSection = context.Configuration.GetSection("ServerConfig");
+        serverOptions.Configure(serverConfigSection);
+    });
+}
+#endregion
+
+var config = builder.Configuration;
+var connStr = config.GetConnectionString("Default") ??
+    throw new InvalidOperationException("Connection string 'Default' is missing in the configuration.");
+
+#region Service configuration
 builder.Services.AddControllers();
-builder.Services.AddFinalizeDocumentJob(builder.Configuration);
 builder.Services.AddHostedService<Worker>();
+builder.Services.AddDistributedSqlServerCache(options =>
+{
+    options.ConnectionString = connStr;
+    options.SchemaName = "dbo";
+    options.TableName = "TBDD_CACHE";
+});
+#pragma warning disable CS0618 
+builder.Services.AddFinalizeDocumentJob(config);
+builder.Services.AddEnvelopeGeneratorInfrastructureServices(
+    opt =>
+    {
+        opt.AddDbTriggerParams(config);
+        opt.AddDbContext((provider, options) =>
+        {
+            var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
+            options.UseSqlServer(connStr)
+                    .LogTo(log => logger.LogInformation("{log}", log), Microsoft.Extensions.Logging.LogLevel.Trace)
+                    .EnableSensitiveDataLogging()
+                    .EnableDetailedErrors();
+        });
+    });
+builder.Services.AddEnvelopeGeneratorServices(config);
+builder.Services.AddMemoryCache();
+builder.Services.AddUserManager<EGDbContext>();
+#pragma warning restore CS0618
+builder.Services.AddLocalization();
+#endregion
 
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
 
 var app = builder.Build();
 
+app.UseMiddleware<ExceptionHandlingMiddleware>();
+
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
@@ -22,10 +75,22 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
+#region Localizer
+var supportedCultureNames = config.GetSection("SupportedCultures").Get<string[]>() ?? ["de-DE", "en-US"];
+var supportedCultures = supportedCultureNames.Select(cName => new CultureInfo(cName)).ToList();
+var requestLocalizationOptions = new RequestLocalizationOptions
+{
+    SupportedCultures = supportedCultures,
+    SupportedUICultures = supportedCultures
+};
+requestLocalizationOptions.RequestCultureProviders.Add(new QueryStringRequestCultureProvider());
+app.UseRequestLocalization(requestLocalizationOptions);
+#endregion
+
 app.UseHttpsRedirection();
 
 app.UseAuthorization();
 
 app.MapControllers();
 
-app.Run();
+app.Run();

EnvelopeGenerator.ServiceHost/Worker.cs

@@ -1,18 +1,21 @@
 using EnvelopeGenerator.ServiceHost.Jobs;
+using Microsoft.Extensions.Options;
 
 namespace EnvelopeGenerator.ServiceHost;
 
 public class Worker : BackgroundService
 {
     private readonly ILogger<Worker> _logger;
-    private readonly int _delayMilliseconds;
-    private readonly FinalizeDocumentJob _finalizeDocumentJob;
+    private readonly WorkerOptions _options;
+    private readonly JobStateManager _jobStateManager;
+    private readonly IServiceScopeFactory _scopeFactory;
 
-    public Worker(ILogger<Worker> logger, IConfiguration configuration, FinalizeDocumentJob finalizeDocumentJob)
+    public Worker(ILogger<Worker> logger, IOptions<WorkerOptions> options, JobStateManager jobStateManager, IServiceScopeFactory scopeFactory)
     {
         _logger = logger;
-        _delayMilliseconds = Math.Max(1, configuration.GetValue("Worker:DelayMilliseconds", 1000));
-        _finalizeDocumentJob = finalizeDocumentJob;
+        _options = options.Value;
+        _jobStateManager = jobStateManager;
+        _scopeFactory = scopeFactory;
     }
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
@@ -24,8 +27,14 @@ public class Worker : BackgroundService
                 _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
             }
 
-            await _finalizeDocumentJob.ExecuteAsync(stoppingToken);
-            await Task.Delay(_delayMilliseconds, stoppingToken);
+            if (_jobStateManager.GetState<FinalizeDocumentJob>() == State.Running)
+            {
+                using var scope = _scopeFactory.CreateScope();
+                var finalizeDocumentJob = scope.ServiceProvider.GetRequiredService<FinalizeDocumentJob>();
+                await finalizeDocumentJob.ExecuteAsync(stoppingToken);
+            }
+
+            await Task.Delay(_options.DelayMilliseconds, stoppingToken);
         }
     }
-}
+}

EnvelopeGenerator.ServiceHost/appsettings.Development.json

@@ -2,7 +2,7 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Information"
     }
   }
 }

EnvelopeGenerator.ServiceHost/appsettings.json

@@ -6,7 +6,24 @@
     }
   },
   "Worker": {
-    "DelayMilliseconds": 1000
+    "DelayMilliseconds": 1000,
+    // InitialJobState: State values are 0 = Running, 1 = Stopped. Defaults to 1 (Stopped) if not specified.
+    "InitialJobState": {
+      "FinalizeDocumentJob": 0
+    }
   },
-  "AllowedHosts": "*"
-}
+  "AllowedHosts": "*",
+  "SupportedCultures": [ "de-DE", "en-US" ],
+  "ConnectionStrings": {
+    "Default": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;"
+  },
+  "UseWindowsService": false,
+  "UseCustomKestrelEndpoints": false,
+  "ServerConfig": {
+    "Endpoints": {
+      "Http": {
+        "Url": "http://localhost:1111"
+      }
+    }
+  }
+}

EnvelopeGenerator.Tests/Application/Fake.cs

@@ -193,13 +193,17 @@ public static class Extensions
     #endregion
 
     #region Envelope
-    public static CreateEnvelopeCommand CreateEnvelopeCommand(this Faker fake, int userId) => new()
+    public static CreateEnvelopeCommand CreateEnvelopeCommand(this Faker fake, int userId)
     {
-        Message = fake.Lorem.Paragraph(fake.Random.Number(2, 5)),
-        Title = fake.Lorem.Words(fake.Random.Number(3, 4)).Join(" "),
-        UserId = userId,
-        UseSQLExecutor = false
-    };
+        var cmd = new CreateEnvelopeCommand
+        {
+            Message = fake.Lorem.Paragraph(fake.Random.Number(2, 5)),
+            Title = fake.Lorem.Words(fake.Random.Number(3, 4)).Join(" "),
+            UseSQLExecutor = false
+        };
+        cmd.Authorize(userId);
+        return cmd;
+    }
 
     public static List<CreateEnvelopeCommand> CreateEnvelopeCommands(this Faker fake, params int[] userIDs)
         => Enumerable.Range(0, userIDs.Length)

EnvelopeGenerator.Tests/Application/MediatorExtensionsTests.cs

@@ -0,0 +1,308 @@
+using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Common.Extensions;
+using MediatR;
+
+namespace EnvelopeGenerator.Tests.Application;
+
+[TestFixture]
+public class MediatorExtensionsTests
+{
+    #region Stub infrastructure
+
+    private sealed class StubRequest<TResponse> : IRequest<TResponse?> { }
+
+    /// <summary>
+    /// Minimal <see cref="ISender"/> stub that returns a pre-configured response for any <see cref="ISender.Send{TResponse}"/> call.
+    /// </summary>
+    private sealed class StubSender : ISender
+    {
+        private readonly object? _response;
+
+        public StubSender(object? response) => _response = response;
+
+        public Task<TResponse> Send<TResponse>(IRequest<TResponse> request, CancellationToken cancellationToken = default)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            return Task.FromResult((TResponse)_response!);
+        }
+
+        public Task Send<TRequest>(TRequest request, CancellationToken cancellationToken = default) where TRequest : IRequest
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            return Task.CompletedTask;
+        }
+
+        public Task<object?> Send(object request, CancellationToken cancellationToken = default)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            return Task.FromResult(_response);
+        }
+
+        public IAsyncEnumerable<TResponse> CreateStream<TResponse>(IStreamRequest<TResponse> request, CancellationToken cancellationToken = default)
+            => throw new NotImplementedException();
+
+        public IAsyncEnumerable<object?> CreateStream(object request, CancellationToken cancellationToken = default)
+            => throw new NotImplementedException();
+    }
+
+    private static ISender CreateSender<T>(T? response) => new StubSender(response);
+
+    #endregion
+
+    #region Throw — non-null scalar
+
+    [Test]
+    public async Task Throw_WithNonNullResponse_ReturnsResponse()
+    {
+        var sender = CreateSender<string>("hello");
+        var request = new StubRequest<string?>();
+
+        var result = await sender.GetOr(request).Throw(() => new InvalidOperationException());
+
+        Assert.That(result, Is.EqualTo("hello"));
+    }
+
+    #endregion
+
+    #region Throw — null response
+
+    [Test]
+    public void Throw_WithNullResponse_ThrowsCustomException()
+    {
+        var sender = CreateSender<string>(null);
+        var request = new StubRequest<string?>();
+
+        var ex = Assert.ThrowsAsync<InvalidOperationException>(
+            () => sender.GetOr(request).Throw(() => new InvalidOperationException("custom")));
+
+        Assert.That(ex!.Message, Is.EqualTo("custom"));
+    }
+
+    #endregion
+
+    #region Throw — empty collection
+
+    [Test]
+    public void Throw_WithEmptyList_ThrowsCustomException()
+    {
+        var sender = CreateSender<List<string>>(new List<string>());
+        var request = new StubRequest<List<string>?>();
+
+        Assert.ThrowsAsync<ArgumentException>(
+            () => sender.GetOr(request).Throw(() => new ArgumentException("empty")));
+    }
+
+    #endregion
+
+    #region Throw — non-empty collection
+
+    [Test]
+    public async Task Throw_WithNonEmptyList_ReturnsResponse()
+    {
+        var expected = new List<int> { 1, 2 };
+        var sender = CreateSender<List<int>>(expected);
+        var request = new StubRequest<List<int>?>();
+
+        var result = await sender.GetOr(request).Throw(() => new InvalidOperationException());
+
+        Assert.That(result, Is.EqualTo(expected));
+    }
+
+    #endregion
+
+    #region Throw — string edge case (string implements IEnumerable)
+
+    [Test]
+    public async Task Throw_WithEmptyString_ReturnsEmptyString()
+    {
+        var sender = CreateSender<string>("");
+        var request = new StubRequest<string?>();
+
+        var result = await sender.GetOr(request).Throw(() => new InvalidOperationException("should not throw"));
+
+        Assert.That(result, Is.EqualTo(""));
+    }
+
+    #endregion
+
+    #region ThrowNotFound — non-null scalar
+
+    [Test]
+    public async Task ThrowNotFound_WithNonNullResponse_ReturnsResponse()
+    {
+        var sender = CreateSender<string>("hello");
+        var request = new StubRequest<string?>();
+
+        var result = await sender.GetOr(request).ThrowNotFound();
+
+        Assert.That(result, Is.EqualTo("hello"));
+    }
+
+    [Test]
+    public async Task ThrowNotFound_WithExceptionMessage_AndNonNullResponse_ReturnsResponse()
+    {
+        var sender = CreateSender<int>(42);
+        var request = new StubRequest<int?>();
+
+        var result = await sender.GetOr(request).ThrowNotFound("not found");
+
+        Assert.That(result, Is.EqualTo(42));
+    }
+
+    #endregion
+
+    #region ThrowNotFound — null response
+
+    [Test]
+    public void ThrowNotFound_WithNullResponse_ThrowsNotFoundException()
+    {
+        var sender = CreateSender<string>(null);
+        var request = new StubRequest<string?>();
+
+        Assert.ThrowsAsync<NotFoundException>(() => sender.GetOr(request).ThrowNotFound());
+    }
+
+    [Test]
+    public void ThrowNotFound_WithNullResponse_AndCustomMessage_ContainsMessage()
+    {
+        const string message = "Entity not found";
+        var sender = CreateSender<string>(null);
+        var request = new StubRequest<string?>();
+
+        var ex = Assert.ThrowsAsync<NotFoundException>(
+            () => sender.GetOr(request).ThrowNotFound(message));
+
+        Assert.That(ex!.Message, Does.Contain(message));
+    }
+
+    [Test]
+    public void ThrowNotFound_WithNullResponse_HasDefaultMessageWithTypeName()
+    {
+        var sender = CreateSender<string>(null);
+        var request = new StubRequest<string?>();
+
+        var ex = Assert.ThrowsAsync<NotFoundException>(() => sender.GetOr(request).ThrowNotFound());
+
+        Assert.That(ex!.Message, Does.Contain(nameof(String)));
+    }
+
+    #endregion
+
+    #region ThrowNotFound — empty collection
+
+    [Test]
+    public void ThrowNotFound_WithEmptyList_ThrowsNotFoundException()
+    {
+        var sender = CreateSender<List<string>>(new List<string>());
+        var request = new StubRequest<List<string>?>();
+
+        Assert.ThrowsAsync<NotFoundException>(() => sender.GetOr(request).ThrowNotFound());
+    }
+
+    [Test]
+    public void ThrowNotFound_WithEmptyArray_ThrowsNotFoundException()
+    {
+        var sender = CreateSender<int[]>(Array.Empty<int>());
+        var request = new StubRequest<int[]?>();
+
+        Assert.ThrowsAsync<NotFoundException>(() => sender.GetOr(request).ThrowNotFound());
+    }
+
+    [Test]
+    public void ThrowNotFound_WithEmptyCollection_AndCustomMessage_ContainsMessage()
+    {
+        const string message = "No items found";
+        var sender = CreateSender<List<int>>(new List<int>());
+        var request = new StubRequest<List<int>?>();
+
+        var ex = Assert.ThrowsAsync<NotFoundException>(
+            () => sender.GetOr(request).ThrowNotFound(message));
+
+        Assert.That(ex!.Message, Does.Contain(message));
+    }
+
+    #endregion
+
+    #region ThrowNotFound — non-empty collection
+
+    [Test]
+    public async Task ThrowNotFound_WithNonEmptyList_ReturnsResponse()
+    {
+        var expected = new List<string> { "a", "b" };
+        var sender = CreateSender<List<string>>(expected);
+        var request = new StubRequest<List<string>?>();
+
+        var result = await sender.GetOr(request).ThrowNotFound();
+
+        Assert.That(result, Is.EqualTo(expected));
+    }
+
+    [Test]
+    public async Task ThrowNotFound_WithNonEmptyArray_ReturnsResponse()
+    {
+        var expected = new[] { 1, 2, 3 };
+        var sender = CreateSender<int[]>(expected);
+        var request = new StubRequest<int[]?>();
+
+        var result = await sender.GetOr(request).ThrowNotFound();
+
+        Assert.That(result, Is.EqualTo(expected));
+    }
+
+    #endregion
+
+    #region ThrowInvalidOperation — null response
+
+    [Test]
+    public void ThrowInvalidOperation_WithNullResponse_ThrowsInvalidOperationException()
+    {
+        var sender = CreateSender<string>(null);
+        var request = new StubRequest<string?>();
+
+        Assert.ThrowsAsync<InvalidOperationException>(
+            () => sender.GetOr(request).ThrowInvalidOperation());
+    }
+
+    [Test]
+    public void ThrowInvalidOperation_WithNullResponse_AndCustomMessage_ContainsMessage()
+    {
+        const string message = "Something went wrong";
+        var sender = CreateSender<string>(null);
+        var request = new StubRequest<string?>();
+
+        var ex = Assert.ThrowsAsync<InvalidOperationException>(
+            () => sender.GetOr(request).ThrowInvalidOperation(message));
+
+        Assert.That(ex!.Message, Does.Contain(message));
+    }
+
+    #endregion
+
+    #region CancellationToken
+
+    [Test]
+    public void Throw_WithCancelledToken_ThrowsOperationCanceledException()
+    {
+        var sender = CreateSender<string>("value");
+        var request = new StubRequest<string?>();
+        var cts = new CancellationTokenSource();
+        cts.Cancel();
+
+        Assert.ThrowsAsync<OperationCanceledException>(
+            () => sender.GetOr(request, cts.Token).Throw(() => new InvalidOperationException()));
+    }
+
+    [Test]
+    public void ThrowNotFound_WithCancelledToken_ThrowsOperationCanceledException()
+    {
+        var sender = CreateSender<string>("value");
+        var request = new StubRequest<string?>();
+        var cts = new CancellationTokenSource();
+        cts.Cancel();
+
+        Assert.ThrowsAsync<OperationCanceledException>(
+            () => sender.GetOr(request, cts.Token).ThrowNotFound());
+    }
+
+    #endregion
+}

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

@@ -53,4 +53,8 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Domain\" />
+  </ItemGroup>
+
 </Project>

EnvelopeGenerator.Web/Controllers/EnvelopeController.cs

@@ -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/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.10.0</Version>						<!-- NuGet package version -->
-		<AssemblyVersion>3.10.0.0</AssemblyVersion>		<!-- Assembly version for API compatibility -->
-		<FileVersion>3.10.0.0</FileVersion>				<!-- Windows file version -->
+		<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>
 
@@ -2093,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="9.0.892" />
-		<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="8.0.1" />
-		<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
-		<PackageReference Include="System.DirectoryServices" Version="7.0.1" />
-		<PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
-		<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="9.0.892" />
-		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
-		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
+		<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,8 +2124,8 @@
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
 		<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
-		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
+		<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" />

EnvelopeGenerator.Web/Views/Envelope/EnvelopeRejected.cshtml

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

EnvelopeGenerator.Web/Views/Envelope/EnvelopeSigned.cshtml

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

EnvelopeGenerator.Web/Views/Envelope/ShowEnvelope.cshtml

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

EnvelopeGenerator.Web/appsettings.Mail.json

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

EnvelopeGenerator.Web/wwwroot/js/annotation.js

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

EnvelopeGenerator.Web/wwwroot/js/app.js

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

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

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

EnvelopeGenerator.sln

@@ -55,8 +55,8 @@ Global
 		{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{5E0E17C0-FF5A-4246-BF87-1ADD85376A27}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{4F32A98D-E6F0-4A09-BD97-1CF26107E837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU