Integrate DevExpress Reporting for envelope history

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

EnvelopeGenerator.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

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

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

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

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

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

EnvelopeGenerator.Application/Configuration/Queries/ReadDefaultConfigQuery.cs

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

EnvelopeGenerator.Application/DocStatus/Commands/CreateDocStatusCommand.cs

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

EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs

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

EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs

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

EnvelopeGenerator.Application/DocStatus/Commands/UpdateDocStatusCommand.cs

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

EnvelopeGenerator.Application/DocStatus/MappingProfile.cs

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

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -37,7 +37,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
@@ -80,7 +80,7 @@
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
 	  <PackageReference Include="AutoMapper" Version="13.0.1" />
-	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
+	  <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
 	  <PackageReference Include="CommandDotNet">
 		<Version>7.0.5</Version>
 	  </PackageReference>
@@ -88,7 +88,6 @@
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 	  <PackageReference Include="AutoMapper" Version="14.0.0" />
-	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
 	  <PackageReference Include="CommandDotNet">
 	    <Version>8.1.1</Version>
 	  </PackageReference>
@@ -96,7 +95,6 @@
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
 	  <PackageReference Include="AutoMapper" Version="14.0.0" />
-	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
 	  <PackageReference Include="CommandDotNet">
 	    <Version>8.1.1</Version>
 	  </PackageReference>

EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs

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

EnvelopeGenerator.Application/Histories/MappingProfile.cs

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

EnvelopeGenerator.Application/Resources/Resource.cs

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

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

@@ -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.BBTests/frmFinalizePDF.vb

@@ -7,11 +7,10 @@ Imports GdPicture14
 Imports Newtonsoft.Json.Linq
 Imports EnvelopeGenerator.Infrastructure
 Imports Microsoft.EntityFrameworkCore
-Imports System.Text
 Imports DigitalData.Core.Abstractions
 
 Public Class frmFinalizePDF
-    Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;"
+    Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;" + "Encrypt=True;TrustServerCertificate=True;"
 
     Private Database As MSSQLServer
     Private LogConfig As LogConfig
@@ -93,56 +92,36 @@ Public Class frmFinalizePDF
     End Function
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        Try
+        Dim oTable = LoadAnnotationDataForEnvelope()
+        Dim oJsonList = oTable.Rows.
+            Cast(Of DataRow).
+            Select(Function(r As DataRow) r.Item("VALUE").ToString()).
+            ToList()
 
-            Dim oTable = LoadAnnotationDataForEnvelope()
+        Dim envelopeId As Integer = CInt(txtEnvelope.Text)
-            Dim oJsonList = oTable.Rows.
+        Dim oBuffer As Byte() = ReadEnvelope(envelopeId)
-                Cast(Of DataRow).
+        Dim oNewBuffer = PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, envelopeId)
-                Select(Function(r As DataRow) r.Item("VALUE").ToString()).
+        Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
-                ToList()
+        Dim oNewPath = Path.Combine(desktopPath, $"E{txtEnvelope.Text}R{txtReceiver.Text}.burned.pdf")
 
-            Dim envelopeId As Integer = CInt(txtEnvelope.Text)
+        File.WriteAllBytes(oNewPath, oNewBuffer)
-            Dim oBuffer As Byte() = ReadEnvelope(envelopeId)
-            Dim oNewBuffer = PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, envelopeId)
-            Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
-            Dim oNewPath = Path.Combine(desktopPath, $"E{txtEnvelope.Text}R{txtReceiver.Text}.burned.pdf")
-
-            File.WriteAllBytes(oNewPath, oNewBuffer)
-
-            Process.Start(oNewPath)
-        Catch ex As Exception
-            Dim exMsg As StringBuilder = New StringBuilder(ex.Message).AppendLine()
-
-            Dim innerEx = ex.InnerException
-            While (innerEx IsNot Nothing)
-                exMsg.AppendLine(innerEx.Message)
-                innerEx = innerEx.InnerException
-            End While
-
-            MsgBox(exMsg.ToString(), MsgBoxStyle.Critical)
-        End Try
 
+        Process.Start(oNewPath)
     End Sub
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
-        Try
+        Dim oTable = LoadAnnotationDataForEnvelope()
-            Dim oTable = LoadAnnotationDataForEnvelope()
+        Dim oJsonList = oTable.Rows.
-            Dim oJsonList = oTable.Rows.
+            Cast(Of DataRow).
-                Cast(Of DataRow).
+            Select(Function(r As DataRow) r.Item("VALUE").ToString()).
-                Select(Function(r As DataRow) r.Item("VALUE").ToString()).
+            Select(Function(s As String) JObject.Parse(s)).
-                Select(Function(s As String) JObject.Parse(s)).
+            ToList()
-                ToList()
 
-            Dim oJObject1 = oJsonList.First()
+        Dim oJObject1 = oJsonList.First()
-            Dim oJObject2 = oJsonList.ElementAt(1)
+        Dim oJObject2 = oJsonList.ElementAt(1)
 
-            oJObject1.Merge(oJObject2)
+        oJObject1.Merge(oJObject2)
 
-            txtResult.Text = oJObject1.ToString()
+        txtResult.Text = oJObject1.ToString()
-
-
-        Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Critical)
-        End Try
     End Sub
 End Class

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
+            Title { get; set; }
-        { get; set; }
 
         [Column("COMMENT", TypeName = "nvarchar(128)")]
-        public string Comment { get; set; }
+        public string
+#if nullable
+        ?
+#endif
+            Comment { get; set; }
 
         [Column("CONTRACT_TYPE")]
         public int? ContractType { get; set; }
@@ -106,7 +110,8 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [JsonIgnore]
         [NotMapped]
-        public bool ReadOnly => EnvelopeTypeId == 2;
+        [Obsolete("Use EnvelopeGenerator.Domain.Interfaces.EnvelopeExtensions.IsReadAndConfirm extension method instead.")]
+        public bool ReadOnly => this.IsReadAndConfirm();
 
         [Column("CERTIFICATION_TYPE")]
         public int? CertificationType { get; set; }
@@ -149,8 +154,7 @@ namespace EnvelopeGenerator.Domain.Entities
 #if nullable
         ?
 #endif
-            Type
+            Type { get; set; }
-        { get; set; }
 
 #if NETFRAMEWORK
         [NotMapped]
@@ -164,22 +168,26 @@ namespace EnvelopeGenerator.Domain.Entities
 #if nullable
         ?
 #endif
-            Documents
+            Documents { get; set; }
-        { get; set; }
+
+        [NotMapped]
+        public Document
+#if nullable
+        ?
+#endif
+            DefaultDocument => Documents?.FirstOrDefault();
 
         public List<History>
 #if nullable
         ?
 #endif
-            Histories
+            Histories { get; set; }
-        { get; set; }
 
         public List<EnvelopeReceiver>
 #if nullable
         ?
 #endif
-            EnvelopeReceivers
+            EnvelopeReceivers { get; set; }
-        { get; set; }
 
         //#if NETFRAMEWORK
         /// <summary>

EnvelopeGenerator.Domain/Entities/EnvelopeReport.cs

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

EnvelopeGenerator.Domain/Entities/History.cs

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

EnvelopeGenerator.Domain/Entities/Signature.cs

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

EnvelopeGenerator.Domain/Interfaces/IEnvelope.cs

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

EnvelopeGenerator.Infrastructure/EGDbContext.cs

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

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

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

@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
-    <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
-    <PackageReference Include="Quartz" Version="3.9.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
-    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
-    <ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj" />
-  </ItemGroup>
-
-</Project>

EnvelopeGenerator.Jobs/Jobs/APIBackendJobs/APIEnvelopeJob.cs

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

EnvelopeGenerator.Jobs/Jobs/DataRowExtensions.cs

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

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/FinalizeDocumentExceptions.cs

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

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/FinalizeDocumentJob.cs

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

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/PDFBurner.cs

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

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/PDFBurnerParams.cs

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

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/PDFMerger.cs

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

EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/ReportCreator.cs

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

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Auth/ApiAuthStateProvider.cs

@@ -1,46 +0,0 @@
-using System.Security.Claims;
-using Microsoft.AspNetCore.Components.Authorization;
-using EnvelopeGenerator.ReceiverUI.Client.Services;
-
-namespace EnvelopeGenerator.ReceiverUI.Client.Auth;
-
-/// <summary>
-/// Fragt die API, ob der Nutzer eingeloggt ist.
-/// 
-/// WARUM nicht selbst Token lesen?
-/// - Das Auth-Cookie ist HttpOnly → JavaScript/WASM kann es nicht lesen
-/// - Stattdessen: Frage die API "bin ich eingeloggt?" → GET /api/auth/check
-/// - Die API prüft das Cookie serverseitig und antwortet mit 200 oder 401
-/// </summary>
-public class ApiAuthStateProvider : AuthenticationStateProvider
-{
-    private readonly IAuthService _authService;
-
-    public ApiAuthStateProvider(IAuthService authService)
-    {
-        _authService = authService;
-    }
-
-    public override async Task<AuthenticationState> GetAuthenticationStateAsync()
-    {
-        var result = await _authService.CheckAuthAsync();
-
-        if (result.IsSuccess)
-        {
-            // Eingeloggt → Erstelle einen authentifizierten ClaimsPrincipal
-            var identity = new ClaimsIdentity("cookie");
-            return new AuthenticationState(new ClaimsPrincipal(identity));
-        }
-
-        // Nicht eingeloggt
-        return new AuthenticationState(new ClaimsPrincipal(new ClaimsIdentity()));
-    }
-
-    /// <summary>
-    /// Wird nach Login/Logout aufgerufen, damit Blazor den Auth-State aktualisiert.
-    /// </summary>
-    public void NotifyAuthChanged()
-    {
-        NotifyAuthenticationStateChanged(GetAuthenticationStateAsync());
-    }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Envelope/AccessCodeForm.razor

@@ -1,60 +0,0 @@
-@* DUMB COMPONENT: Kennt keine Services, nur Parameter und Events *@
-
-<div class="access-code-container">
-    <h2>Zugangscode eingeben</h2>
-    <p>Ein Zugangscode wurde an Ihre E-Mail-Adresse gesendet.</p>
-
-    <EditForm Model="_model" OnValidSubmit="Submit">
-        <DataAnnotationsValidator />
-
-        <div class="form-group">
-            <InputText @bind-Value="_model.Code"
-                       class="form-control code-input"
-                       placeholder="000000"
-                       maxlength="6" />
-            <ValidationMessage For="() => _model.Code" />
-        </div>
-
-        @if (!string.IsNullOrEmpty(ErrorMessage))
-        {
-            <div class="alert alert-danger mt-2">@ErrorMessage</div>
-        }
-
-        <button type="submit" class="btn btn-primary mt-3" disabled="@_isSubmitting">
-            @if (_isSubmitting)
-            {
-                <LoadingIndicator Small="true" />
-            }
-            else
-            {
-                <span>Bestätigen</span>
-            }
-        </button>
-    </EditForm>
-</div>
-
-@code {
-    // Parameter von der Eltern-Page
-    [Parameter] public required string EnvelopeKey { get; set; }
-    [Parameter] public string? ErrorMessage { get; set; }
-
-    // EventCallback: Informiert die Page, dass ein Code eingegeben wurde
-    [Parameter] public EventCallback<string> OnSubmit { get; set; }
-
-    private AccessCodeModel _model = new();
-    private bool _isSubmitting;
-
-    private async Task Submit()
-    {
-        _isSubmitting = true;
-        await OnSubmit.InvokeAsync(_model.Code);
-        _isSubmitting = false;
-    }
-
-    private class AccessCodeModel
-    {
-        [System.ComponentModel.DataAnnotations.Required(ErrorMessage = "Bitte Zugangscode eingeben")]
-        [System.ComponentModel.DataAnnotations.StringLength(6, MinimumLength = 4)]
-        public string Code { get; set; } = string.Empty;
-    }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Envelope/PdfViewer.razor

@@ -1,23 +0,0 @@
-@inject IJSRuntime JS
-@implements IAsyncDisposable
-
-<div id="pspdfkit-container" class="pdf-container" style="width: 100%; height: 80vh;"></div>
-
-@code {
-    [Parameter] public byte[]? DocumentBytes { get; set; }
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender && DocumentBytes is not null)
-        {
-            // TODO: PSPDFKit JS-Interop implementieren (Phase 6)
-            // await JS.InvokeVoidAsync("initPdfViewer", DocumentBytes);
-        }
-    }
-
-    public async ValueTask DisposeAsync()
-    {
-        // TODO: PSPDFKit aufräumen
-        // await JS.InvokeVoidAsync("destroyPdfViewer");
-    }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Envelope/SignaturePanel.razor

@@ -1,5 +0,0 @@
-<h3>SignaturePanel</h3>
-
-@code {
-
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Envelope/TwoFactorForm.razor

@@ -1,5 +0,0 @@
-<h3>TwoFactorForm</h3>
-
-@code {
-
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Layout/NavHeader.razor

@@ -1,5 +0,0 @@
-<h3>NavHeader</h3>
-
-@code {
-
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Shared/AlertMessage.razor

@@ -1,5 +0,0 @@
-<h3>AlertMessage</h3>
-
-@code {
-
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Shared/ErrorDisplay.razor

@@ -1,19 +0,0 @@
-<div class="text-center py-5">
-    @if (!string.IsNullOrEmpty(Icon))
-    {
-        <div class="mb-3">
-            <i class="bi bi-@Icon" style="font-size: 3rem;"></i>
-        </div>
-    }
-    <h2>@Title</h2>
-    @if (!string.IsNullOrEmpty(Message))
-    {
-        <p class="text-muted">@Message</p>
-    }
-</div>
-
-@code {
-    [Parameter] public string Title { get; set; } = "Fehler";
-    [Parameter] public string? Message { get; set; }
-    [Parameter] public string? Icon { get; set; }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Shared/LanguageSelector.razor

@@ -1,5 +0,0 @@
-<h3>LanguageSelector</h3>
-
-@code {
-
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Shared/LoadingIndicator.razor

@@ -1,18 +0,0 @@
-<div class="d-flex justify-content-center align-items-center @(Small ? "" : "py-5")" style="@(Small ? "" : "min-height: 40vh;")">
-    <div class="text-center">
-        <div class="spinner-border @(Small ? "spinner-border-sm" : "text-primary")"
-             style="@(Small ? "" : "width: 3rem; height: 3rem;")"
-             role="status">
-            <span class="visually-hidden">Laden...</span>
-        </div>
-        @if (!Small && Message is not null)
-        {
-            <p class="mt-3 text-muted">@Message</p>
-        }
-    </div>
-</div>
-
-@code {
-    [Parameter] public bool Small { get; set; }
-    [Parameter] public string? Message { get; set; }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/EnvelopeGenerator.ReceiverUI.Client.csproj

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
-
-	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
-		<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.3" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.3" />
-		<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.3" />
-	</ItemGroup>
-
-</Project>

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Models/AuthState.cs

@@ -1,13 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Client.Models;
-
-/// <summary>
-/// Hält den aktuellen Authentifizierungs-Zustand im Client.
-/// Wird vom ApiAuthStateProvider gesetzt und von Komponenten gelesen.
-/// </summary>
-public class AuthState
-{
-    public bool IsAuthenticated { get; set; }
-    public string? Role { get; set; }
-    public string? EnvelopeUuid { get; set; }
-    public string? ReceiverEmail { get; set; }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Models/DocumentModel.cs

@@ -1,12 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Client.Models;
-
-/// <summary>
-/// Client-seitiges DTO für Dokument-Daten.
-/// </summary>
-public record DocumentModel
-{
-    public int Id { get; init; }
-    public int EnvelopeId { get; init; }
-    public DateTime AddedWhen { get; init; }
-    public byte[]? ByteData { get; init; }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Models/EnvelopeModel.cs

@@ -1,27 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Client.Models;
-
-/// <summary>
-/// Client-seitiges DTO für Umschlag-Daten.
-/// Muss nur die JSON-Properties matchen, die die API zurückgibt
-/// und die der Client tatsächlich braucht.
-/// 
-/// WARUM eigene DTOs statt die aus EnvelopeGenerator.Application?
-/// - Application hat Server-Abhängigkeiten (SqlClient, JwtBearer, EF Core)
-/// - Diese Pakete existieren nicht für browser-wasm → Build-Fehler
-/// - Der Client braucht nur eine Teilmenge der Felder
-/// - Eigene DTOs machen den Client unabhängig vom Server
-/// </summary>
-public record EnvelopeModel
-{
-    public int Id { get; init; }
-    public string Uuid { get; init; } = string.Empty;
-    public string Title { get; init; } = string.Empty;
-    public string Message { get; init; } = string.Empty;
-    public bool UseAccessCode { get; init; }
-    public bool TFAEnabled { get; init; }
-    public bool ReadOnly { get; init; }
-    public string Language { get; init; } = "de-DE";
-    public DateTime AddedWhen { get; init; }
-    public UserModel? User { get; init; }
-    public IEnumerable<DocumentModel>? Documents { get; init; }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Models/EnvelopeReceiverModel.cs

@@ -1,15 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Client.Models;
-
-/// <summary>
-/// Client-seitiges DTO für die Envelope-Receiver-Zuordnung.
-/// </summary>
-public record EnvelopeReceiverModel
-{
-    public EnvelopeModel? Envelope { get; init; }
-    public ReceiverModel? Receiver { get; init; }
-    public int EnvelopeId { get; init; }
-    public int ReceiverId { get; init; }
-    public int Sequence { get; init; }
-    public string? Name { get; init; }
-    public bool HasPhoneNumber { get; init; }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Models/EnvelopeViewModel.cs

@@ -1,6 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Client.Models
-{
-    public class EnvelopeViewModel
-    {
-    }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Models/ReceiverModel.cs

@@ -1,13 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Client.Models;
-
-/// <summary>
-/// Client-seitiges DTO für Empfänger-Daten.
-/// </summary>
-public record ReceiverModel
-{
-    public int Id { get; init; }
-    public string EmailAddress { get; init; } = string.Empty;
-    public string Signature { get; init; } = string.Empty;
-    public DateTime AddedWhen { get; init; }
-    public DateTime? TfaRegDeadline { get; init; }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Models/UserModel.cs

@@ -1,10 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Client.Models;
-
-/// <summary>
-/// Client-seitiges DTO für Benutzer-Daten (Absender).
-/// </summary>
-public record UserModel
-{
-    public string? Email { get; init; }
-    public string? DisplayName { get; init; }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Envelope/EnvelopeExpired.razor

@@ -1,5 +0,0 @@
-<h3>EnvelopeExpired</h3>
-
-@code {
-
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Envelope/EnvelopeLocked.razor

@@ -1,5 +0,0 @@
-<h3>EnvelopeLocked</h3>
-
-@code {
-
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Envelope/EnvelopePage.razor

@@ -1,84 +0,0 @@
-@page "/envelope/{EnvelopeKey}"
-@rendermode InteractiveAuto
-@inject IEnvelopeService EnvelopeService
-@inject EnvelopeState State
-@implements IDisposable
-
-<PageTitle>Dokument</PageTitle>
-
-@switch (State.Status)
-{
-    case EnvelopePageStatus.Loading:
-        <LoadingIndicator Message="Dokument wird geladen..." />
-        break;
-
-    case EnvelopePageStatus.NotFound:
-        <ErrorDisplay Title="Nicht gefunden"
-                      Message="Dieses Dokument existiert nicht oder ist nicht mehr verfügbar." />
-        break;
-
-    case EnvelopePageStatus.AlreadySigned:
-        <ErrorDisplay Title="Bereits unterschrieben"
-                      Message="Dieses Dokument wurde bereits unterschrieben."
-                      Icon="check-circle" />
-        break;
-
-    case EnvelopePageStatus.RequiresAccessCode:
-        <AccessCodeForm EnvelopeKey="@EnvelopeKey"
-                        ErrorMessage="@State.ErrorMessage"
-                        OnSubmit="HandleAccessCodeSubmit" />
-        break;
-
-    case EnvelopePageStatus.ShowDocument:
-        <PdfViewer DocumentBytes="@_documentBytes" />
-        break;
-
-    case EnvelopePageStatus.Error:
-        <ErrorDisplay Title="Fehler" Message="@State.ErrorMessage" />
-        break;
-}
-
-@code {
-    [Parameter] public string EnvelopeKey { get; set; } = default!;
-
-    private byte[]? _documentBytes;
-
-    protected override async Task OnInitializedAsync()
-    {
-        State.OnChange += StateHasChanged;
-        await LoadEnvelopeAsync();
-    }
-
-    private async Task LoadEnvelopeAsync()
-    {
-        State.SetLoading();
-
-        // Die genaue API-Logik hängt von den verfügbaren Endpunkten ab.
-        // Dies ist die Struktur — die konkreten Endpoints implementierst du
-        // basierend auf den vorhandenen API-Controllern.
-        var result = await EnvelopeService.GetEnvelopeReceiversAsync();
-
-        if (!result.IsSuccess)
-        {
-            if (result.StatusCode == 401)
-                State.SetAccessCodeRequired();
-            else if (result.StatusCode == 404)
-                State.SetNotFound();
-            else
-                State.SetError(result.ErrorMessage ?? "Unbekannter Fehler");
-            return;
-        }
-
-        // Daten verarbeiten und Status setzen
-        State.SetDocument();
-    }
-
-    private async Task HandleAccessCodeSubmit(string code)
-    {
-        // AccessCode an API senden
-        // Bei Erfolg: State.SetDocument() oder State.SetTwoFactorRequired()
-        // Bei Fehler: State.SetError(...)
-    }
-
-    public void Dispose() => State.OnChange -= StateHasChanged;
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Envelope/EnvelopeRejected.razor

@@ -1,5 +0,0 @@
-<h3>EnvelopeRejected</h3>
-
-@code {
-
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Envelope/EnvelopeSigned.razor

@@ -1,5 +0,0 @@
-<h3>EnvelopeSigned</h3>
-
-@code {
-
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Home.razor

@@ -1,5 +0,0 @@
-<h3>Home</h3>
-
-@code {
-
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/NotFound.razor

@@ -1,5 +0,0 @@
-<h3>NotFound</h3>
-
-@code {
-
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Program.cs

@@ -1,27 +0,0 @@
-using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using EnvelopeGenerator.ReceiverUI.Client.Auth;
-using EnvelopeGenerator.ReceiverUI.Client.Services;
-using EnvelopeGenerator.ReceiverUI.Client.State;
-
-var builder = WebAssemblyHostBuilder.CreateDefault(args);
-
-// HttpClient: BaseAddress zeigt auf den ReceiverUI-Server (gleiche Domain)
-// Von dort werden alle /api/* Calls via YARP an die echte API weitergeleitet
-builder.Services.AddScoped(sp =>
-    new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
-
-// Auth: Blazor fragt über diesen Provider "Ist der Nutzer eingeloggt?"
-builder.Services.AddAuthorizationCore();
-builder.Services.AddScoped<ApiAuthStateProvider>();
-builder.Services.AddScoped<AuthenticationStateProvider>(sp =>
-    sp.GetRequiredService<ApiAuthStateProvider>());
-
-// API-Services: Je ein Service pro API-Controller
-builder.Services.AddScoped<IAuthService, AuthService>();
-builder.Services.AddScoped<IEnvelopeService, EnvelopeService>();
-
-// State: Ein State-Objekt pro Browser-Tab
-builder.Services.AddScoped<EnvelopeState>();
-
-await builder.Build().RunAsync();

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/AuthService.cs

@@ -1,54 +0,0 @@
-using EnvelopeGenerator.ReceiverUI.Client.Services.Base;
-
-namespace EnvelopeGenerator.ReceiverUI.Client.Services;
-
-/// <summary>
-/// Spricht mit dem bestehenden AuthController der API.
-/// Die API erkennt den Nutzer über das Cookie "AuthToken" automatisch.
-/// </summary>
-public class AuthService : ApiServiceBase, IAuthService
-{
-    public AuthService(HttpClient http, ILogger<AuthService> logger) : base(http, logger) { }
-
-    public async Task<ApiResponse> CheckAuthAsync(string? role = null, CancellationToken ct = default)
-    {
-        var endpoint = role is not null ? $"api/auth/check?role={role}" : "api/auth/check";
-        try
-        {
-            var response = await Http.GetAsync(endpoint, ct);
-            return response.IsSuccessStatusCode
-                ? ApiResponse.Success((int)response.StatusCode)
-                : ApiResponse.Failure((int)response.StatusCode);
-        }
-        catch (HttpRequestException ex)
-        {
-            Logger.LogError(ex, "HTTP error calling GET {Endpoint}", endpoint);
-            return ApiResponse.Failure(0, "Verbindung zum Server fehlgeschlagen.");
-        }
-        catch (TaskCanceledException)
-        {
-            return ApiResponse.Failure(0, "Anfrage abgebrochen.");
-        }
-    }
-
-    public async Task<ApiResponse> LogoutAsync(CancellationToken ct = default)
-    {
-        const string endpoint = "api/auth/logout";
-        try
-        {
-            var response = await Http.PostAsync(endpoint, null, ct);
-            return response.IsSuccessStatusCode
-                ? ApiResponse.Success((int)response.StatusCode)
-                : ApiResponse.Failure((int)response.StatusCode);
-        }
-        catch (HttpRequestException ex)
-        {
-            Logger.LogError(ex, "HTTP error calling POST {Endpoint}", endpoint);
-            return ApiResponse.Failure(0, "Verbindung zum Server fehlgeschlagen.");
-        }
-        catch (TaskCanceledException)
-        {
-            return ApiResponse.Failure(0, "Anfrage abgebrochen.");
-        }
-    }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/Base/ApiResponse.cs

@@ -1,38 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Client.Services.Base;
-
-/// <summary>
-/// Einheitliches Response-Objekt für ALLE API-Aufrufe.
-/// 
-/// WARUM: Jeder API-Aufruf kann fehlschlagen (Netzwerk, 401, 500...).
-/// Statt überall try-catch zu haben, kapselt dieses Objekt Erfolg/Fehler einheitlich.
-/// So kann jede Blazor-Komponente einheitlich darauf reagieren.
-/// </summary>
-public record ApiResponse<T>
-{
-    public bool IsSuccess { get; init; }
-    public T? Data { get; init; }
-    public int StatusCode { get; init; }
-    public string? ErrorMessage { get; init; }
-
-    public static ApiResponse<T> Success(T data, int statusCode = 200)
-        => new() { IsSuccess = true, Data = data, StatusCode = statusCode };
-
-    public static ApiResponse<T> Failure(int statusCode, string? error = null)
-        => new() { IsSuccess = false, StatusCode = statusCode, ErrorMessage = error };
-}
-
-/// <summary>
-/// Response ohne Daten (für POST/PUT/DELETE die nur Status zurückgeben).
-/// </summary>
-public record ApiResponse
-{
-    public bool IsSuccess { get; init; }
-    public int StatusCode { get; init; }
-    public string? ErrorMessage { get; init; }
-
-    public static ApiResponse Success(int statusCode = 200)
-        => new() { IsSuccess = true, StatusCode = statusCode };
-
-    public static ApiResponse Failure(int statusCode, string? error = null)
-        => new() { IsSuccess = false, StatusCode = statusCode, ErrorMessage = error };
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/Base/ApiServiceBase.cs

@@ -1,110 +0,0 @@
-using System.Net.Http.Json;
-using Microsoft.Extensions.Logging;
-
-namespace EnvelopeGenerator.ReceiverUI.Client.Services.Base;
-
-/// <summary>
-/// Basisklasse für ALLE API-Services.
-/// 
-/// WARUM eine Basisklasse?
-/// - Einheitliches Error-Handling: Jeder API-Aufruf wird gleich behandelt
-/// - DRY (Don't Repeat Yourself): Logging, Fehlerbehandlung, Serialisierung nur einmal
-/// - Einfache Erweiterung: Retry-Logik, Token-Refresh etc. nur hier ändern
-/// </summary>
-public abstract class ApiServiceBase
-{
-    protected readonly HttpClient Http;
-    protected readonly ILogger Logger;
-
-    protected ApiServiceBase(HttpClient http, ILogger logger)
-    {
-        Http = http;
-        Logger = logger;
-    }
-
-    /// <summary>
-    /// GET-Request mit Deserialisierung.
-    /// Alle API GET-Aufrufe gehen durch diese Methode.
-    /// </summary>
-    protected async Task<ApiResponse<T>> GetAsync<T>(string endpoint, CancellationToken ct = default)
-    {
-        try
-        {
-            var response = await Http.GetAsync(endpoint, ct);
-
-            if (!response.IsSuccessStatusCode)
-            {
-                var errorBody = await response.Content.ReadAsStringAsync(ct);
-                Logger.LogWarning("GET {Endpoint} failed: {Status} - {Body}",
-                    endpoint, (int)response.StatusCode, errorBody);
-                return ApiResponse<T>.Failure((int)response.StatusCode, errorBody);
-            }
-
-            var data = await response.Content.ReadFromJsonAsync<T>(cancellationToken: ct);
-            return ApiResponse<T>.Success(data!, (int)response.StatusCode);
-        }
-        catch (HttpRequestException ex)
-        {
-            Logger.LogError(ex, "HTTP error calling GET {Endpoint}", endpoint);
-            return ApiResponse<T>.Failure(0, "Verbindung zum Server fehlgeschlagen.");
-        }
-        catch (TaskCanceledException)
-        {
-            Logger.LogWarning("GET {Endpoint} was cancelled", endpoint);
-            return ApiResponse<T>.Failure(0, "Anfrage abgebrochen.");
-        }
-    }
-
-    /// <summary>
-    /// POST-Request mit Body und Response-Deserialisierung.
-    /// </summary>
-    protected async Task<ApiResponse<TResponse>> PostAsync<TRequest, TResponse>(
-        string endpoint, TRequest body, CancellationToken ct = default)
-    {
-        try
-        {
-            var response = await Http.PostAsJsonAsync(endpoint, body, ct);
-
-            if (!response.IsSuccessStatusCode)
-            {
-                var errorBody = await response.Content.ReadAsStringAsync(ct);
-                Logger.LogWarning("POST {Endpoint} failed: {Status} - {Body}",
-                    endpoint, (int)response.StatusCode, errorBody);
-                return ApiResponse<TResponse>.Failure((int)response.StatusCode, errorBody);
-            }
-
-            var data = await response.Content.ReadFromJsonAsync<TResponse>(cancellationToken: ct);
-            return ApiResponse<TResponse>.Success(data!, (int)response.StatusCode);
-        }
-        catch (HttpRequestException ex)
-        {
-            Logger.LogError(ex, "HTTP error calling POST {Endpoint}", endpoint);
-            return ApiResponse<TResponse>.Failure(0, "Verbindung zum Server fehlgeschlagen.");
-        }
-    }
-
-    /// <summary>
-    /// POST-Request ohne Response-Body (z.B. Logout).
-    /// </summary>
-    protected async Task<ApiResponse> PostAsync<TRequest>(
-        string endpoint, TRequest body, CancellationToken ct = default)
-    {
-        try
-        {
-            var response = await Http.PostAsJsonAsync(endpoint, body, ct);
-
-            if (!response.IsSuccessStatusCode)
-            {
-                var errorBody = await response.Content.ReadAsStringAsync(ct);
-                return ApiResponse.Failure((int)response.StatusCode, errorBody);
-            }
-
-            return ApiResponse.Success((int)response.StatusCode);
-        }
-        catch (HttpRequestException ex)
-        {
-            Logger.LogError(ex, "HTTP error calling POST {Endpoint}", endpoint);
-            return ApiResponse.Failure(0, "Verbindung zum Server fehlgeschlagen.");
-        }
-    }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/EnvelopeService.cs

@@ -1,16 +0,0 @@
-using EnvelopeGenerator.ReceiverUI.Client.Models;
-using EnvelopeGenerator.ReceiverUI.Client.Services.Base;
-
-namespace EnvelopeGenerator.ReceiverUI.Client.Services;
-
-public class EnvelopeService : ApiServiceBase, IEnvelopeService
-{
-    public EnvelopeService(HttpClient http, ILogger<EnvelopeService> logger) : base(http, logger) { }
-
-    public Task<ApiResponse<IEnumerable<EnvelopeModel>>> GetEnvelopesAsync(CancellationToken ct = default)
-        => GetAsync<IEnumerable<EnvelopeModel>>("api/envelope", ct);
-
-    public Task<ApiResponse<IEnumerable<EnvelopeReceiverModel>>> GetEnvelopeReceiversAsync(
-        CancellationToken ct = default)
-        => GetAsync<IEnumerable<EnvelopeReceiverModel>>("api/envelopereceiver", ct);
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/HistoryService.cs

@@ -1,6 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Client.Services
-{
-    public class HistoryService
-    {
-    }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/IAuthService.cs

@@ -1,20 +0,0 @@
-using EnvelopeGenerator.ReceiverUI.Client.Services.Base;
-
-namespace EnvelopeGenerator.ReceiverUI.Client.Services;
-
-/// <summary>
-/// Kommuniziert mit dem AuthController der API.
-/// 
-/// WARUM Interface + Implementierung?
-/// - Testbarkeit: In Unit-Tests kann man einen Mock verwenden
-/// - Austauschbarkeit: Wenn sich die API ändert, ändert sich nur die Implementierung
-/// - Blazor-Konvention: Services werden über Interfaces per DI registriert
-/// </summary>
-public interface IAuthService
-{
-    /// <summary>Prüft ob der Nutzer eingeloggt ist → GET /api/auth/check</summary>
-    Task<ApiResponse> CheckAuthAsync(string? role = null, CancellationToken ct = default);
-
-    /// <summary>Logout → POST /api/auth/logout</summary>
-    Task<ApiResponse> LogoutAsync(CancellationToken ct = default);
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/IEnvelopeService.cs

@@ -1,18 +0,0 @@
-using EnvelopeGenerator.ReceiverUI.Client.Models;
-using EnvelopeGenerator.ReceiverUI.Client.Services.Base;
-
-namespace EnvelopeGenerator.ReceiverUI.Client.Services;
-
-/// <summary>
-/// Kommuniziert mit EnvelopeController und EnvelopeReceiverController.
-/// Verwendet Client-eigene Models statt der Server-DTOs.
-/// </summary>
-public interface IEnvelopeService
-{
-    /// <summary>Lädt Umschläge → GET /api/envelope</summary>
-    Task<ApiResponse<IEnumerable<EnvelopeModel>>> GetEnvelopesAsync(CancellationToken ct = default);
-
-    /// <summary>Lädt EnvelopeReceiver → GET /api/envelopereceiver</summary>
-    Task<ApiResponse<IEnumerable<EnvelopeReceiverModel>>> GetEnvelopeReceiversAsync(
-        CancellationToken ct = default);
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/IHistoryService.cs

@@ -1,6 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Client.Services
-{
-    public interface IHistoryService
-    {
-    }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/State/AuthState.cs

@@ -1,6 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Client.State
-{
-    public class AuthState
-    {
-    }
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/State/EnvelopeState.cs

@@ -1,81 +0,0 @@
-namespace EnvelopeGenerator.ReceiverUI.Client.State;
-
-/// <summary>
-/// Hält den aktuellen Zustand des geladenen Umschlags.
-/// 
-/// WARUM ein eigenes State-Objekt?
-/// - Mehrere Komponenten auf einer Seite brauchen die gleichen Daten
-/// - Ohne State müsste jede Komponente die Daten selbst laden → doppelte API-Calls
-/// - StateHasChanged() informiert automatisch alle Subscriber
-/// 
-/// PATTERN: "Observable State" — Services setzen den State, Komponenten reagieren darauf.
-/// </summary>
-public class EnvelopeState
-{
-    private EnvelopePageStatus _status = EnvelopePageStatus.Loading;
-    private string? _errorMessage;
-
-    /// <summary>Aktueller Seitenstatus</summary>
-    public EnvelopePageStatus Status
-    {
-        get => _status;
-        private set
-        {
-            _status = value;
-            NotifyStateChanged();
-        }
-    }
-
-    /// <summary>Fehlermeldung (falls vorhanden)</summary>
-    public string? ErrorMessage
-    {
-        get => _errorMessage;
-        private set
-        {
-            _errorMessage = value;
-            NotifyStateChanged();
-        }
-    }
-
-    // --- Zustandsübergänge (öffentliche Methoden) ---
-
-    public void SetLoading() => Status = EnvelopePageStatus.Loading;
-
-    public void SetAccessCodeRequired()
-    {
-        ErrorMessage = null;
-        Status = EnvelopePageStatus.RequiresAccessCode;
-    }
-
-    public void SetTwoFactorRequired() => Status = EnvelopePageStatus.RequiresTwoFactor;
-
-    public void SetDocument() => Status = EnvelopePageStatus.ShowDocument;
-
-    public void SetError(string message)
-    {
-        ErrorMessage = message;
-        Status = EnvelopePageStatus.Error;
-    }
-
-    public void SetAlreadySigned() => Status = EnvelopePageStatus.AlreadySigned;
-    public void SetRejected() => Status = EnvelopePageStatus.Rejected;
-    public void SetNotFound() => Status = EnvelopePageStatus.NotFound;
-
-    // --- Event: Benachrichtigt Komponenten über Änderungen ---
-    public event Action? OnChange;
-    private void NotifyStateChanged() => OnChange?.Invoke();
-}
-
-/// <summary>Alle möglichen Zustände der Umschlag-Seite</summary>
-public enum EnvelopePageStatus
-{
-    Loading,
-    RequiresAccessCode,
-    RequiresTwoFactor,
-    ShowDocument,
-    AlreadySigned,
-    Rejected,
-    NotFound,
-    Expired,
-    Error
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/_Imports.razor

@@ -1,17 +0,0 @@
-@using System.Net.Http
-@using System.Net.Http.Json
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using static Microsoft.AspNetCore.Components.Web.RenderMode
-@using Microsoft.AspNetCore.Components.Web.Virtualization
-@using Microsoft.JSInterop
-@using EnvelopeGenerator.ReceiverUI.Client
-@using EnvelopeGenerator.ReceiverUI.Client.Models
-@using EnvelopeGenerator.ReceiverUI.Client.Services
-@using EnvelopeGenerator.ReceiverUI.Client.Services.Base
-@using EnvelopeGenerator.ReceiverUI.Client.State
-@using EnvelopeGenerator.ReceiverUI.Client.Auth
-@using EnvelopeGenerator.ReceiverUI.Client.Components.Shared
-@using EnvelopeGenerator.ReceiverUI.Client.Components.Envelope

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/wwwroot/css/app.css

@@ -1,2 +0,0 @@
-body {
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/App.razor

@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="de">
-
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <base href="/" />
-    <link rel="stylesheet" href="bootstrap/bootstrap.min.css" />
-    <link rel="stylesheet" href="app.css" />
-    <link rel="stylesheet" href="EnvelopeGenerator.ReceiverUI.styles.css" />
-    <link rel="icon" type="image/png" href="favicon.png" />
-    <HeadOutlet />
-</head>
-
-<body>
-    <Routes />
-    <script src="_framework/blazor.web.js"></script>
-</body>
-
-</html>

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Layout/AuthLayout.razor

@@ -1,5 +0,0 @@
-<h3>AuthLayout</h3>
-
-@code {
-
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Layout/MainLayout.razor

@@ -1,34 +0,0 @@
-@inherits LayoutComponentBase
-
-<div class="app-container">
-    <header class="app-header">
-        <div class="header-content">
-            <span class="app-title">signFLOW</span>
-        </div>
-    </header>
-
-    <main class="app-main">
-        <ErrorBoundary @ref="_errorBoundary">
-            <ChildContent>
-                @Body
-            </ChildContent>
-            <ErrorContent Context="ex">
-                <div class="error-container text-center py-5">
-                    <h2>😵 Ein unerwarteter Fehler ist aufgetreten</h2>
-                    <p class="text-muted">Bitte versuchen Sie es erneut.</p>
-                    <button class="btn btn-primary" @onclick="Recover">Erneut versuchen</button>
-                </div>
-            </ErrorContent>
-        </ErrorBoundary>
-    </main>
-
-    <footer class="app-footer text-center py-2 text-muted">
-        <small>&copy; @DateTime.Now.Year Digital Data GmbH</small>
-    </footer>
-</div>
-
-@code {
-    private ErrorBoundary? _errorBoundary;
-
-    private void Recover() => _errorBoundary?.Recover();
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Layout/MainLayout.razor.css

@@ -1,96 +0,0 @@
-.page {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-}
-
-main {
-    flex: 1;
-}
-
-.sidebar {
-    background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
-}
-
-.top-row {
-    background-color: #f7f7f7;
-    border-bottom: 1px solid #d6d5d5;
-    justify-content: flex-end;
-    height: 3.5rem;
-    display: flex;
-    align-items: center;
-}
-
-    .top-row ::deep a, .top-row ::deep .btn-link {
-        white-space: nowrap;
-        margin-left: 1.5rem;
-        text-decoration: none;
-    }
-
-    .top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
-        text-decoration: underline;
-    }
-
-    .top-row ::deep a:first-child {
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-
-@media (max-width: 640.98px) {
-    .top-row {
-        justify-content: space-between;
-    }
-
-    .top-row ::deep a, .top-row ::deep .btn-link {
-        margin-left: 0;
-    }
-}
-
-@media (min-width: 641px) {
-    .page {
-        flex-direction: row;
-    }
-
-    .sidebar {
-        width: 250px;
-        height: 100vh;
-        position: sticky;
-        top: 0;
-    }
-
-    .top-row {
-        position: sticky;
-        top: 0;
-        z-index: 1;
-    }
-
-    .top-row.auth ::deep a:first-child {
-        flex: 1;
-        text-align: right;
-        width: 0;
-    }
-
-    .top-row, article {
-        padding-left: 2rem !important;
-        padding-right: 1.5rem !important;
-    }
-}
-
-#blazor-error-ui {
-    background: lightyellow;
-    bottom: 0;
-    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
-    display: none;
-    left: 0;
-    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
-    position: fixed;
-    width: 100%;
-    z-index: 1000;
-}
-
-    #blazor-error-ui .dismiss {
-        cursor: pointer;
-        position: absolute;
-        right: 0.75rem;
-        top: 0.5rem;
-    }

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Pages/Error.razor

@@ -1,36 +0,0 @@
-@page "/Error"
-@using System.Diagnostics
-
-<PageTitle>Error</PageTitle>
-
-<h1 class="text-danger">Error.</h1>
-<h2 class="text-danger">An error occurred while processing your request.</h2>
-
-@if (ShowRequestId)
-{
-    <p>
-        <strong>Request ID:</strong> <code>@RequestId</code>
-    </p>
-}
-
-<h3>Development Mode</h3>
-<p>
-    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
-</p>
-<p>
-    <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
-    It can result in displaying sensitive information from exceptions to end users.
-    For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
-    and restarting the app.
-</p>
-
-@code{
-    [CascadingParameter]
-    private HttpContext? HttpContext { get; set; }
-
-    private string? RequestId { get; set; }
-    private bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
-
-    protected override void OnInitialized() =>
-        RequestId = Activity.Current?.Id ?? HttpContext?.TraceIdentifier;
-}

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Pages/Home.razor

@@ -1,7 +0,0 @@
-@page "/"
-
-<PageTitle>Home</PageTitle>
-
-<h1>Hello, world!</h1>
-
-Welcome to your new app.

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Routes.razor

@@ -1,14 +0,0 @@
-<Router AppAssembly="typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(Client._Imports).Assembly }">
-    <Found Context="routeData">
-        <RouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)" />
-        <FocusOnNavigate RouteData="routeData" Selector="h1" />
-    </Found>
-    <NotFound>
-        <LayoutView Layout="typeof(Layout.MainLayout)">
-            <div class="text-center py-5">
-                <h1>404</h1>
-                <p>Diese Seite wurde nicht gefunden.</p>
-            </div>
-        </LayoutView>
-    </NotFound>
-</Router>

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/_Imports.razor

@@ -1,9 +0,0 @@
-@using System.Net.Http
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using static Microsoft.AspNetCore.Components.Web.RenderMode
-@using Microsoft.AspNetCore.Components.Web.Virtualization
-@using Microsoft.JSInterop
-@using EnvelopeGenerator.ReceiverUI.Components
-@using EnvelopeGenerator.ReceiverUI.Components.Layout

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.csproj

@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
-		<Nullable>enable</Nullable>
-		<ImplicitUsings>enable</ImplicitUsings>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\EnvelopeGenerator.ReceiverUI.Client\EnvelopeGenerator.ReceiverUI.Client.csproj" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.3" />
-		<PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
-	</ItemGroup>
-
-</Project>

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Program.cs

@@ -1,42 +0,0 @@
-using EnvelopeGenerator.ReceiverUI.Components;
-
-var builder = WebApplication.CreateBuilder(args);
-
-builder.Services.AddRazorComponents()
-    .AddInteractiveServerComponents()
-    .AddInteractiveWebAssemblyComponents();
-
-// API-Proxy: Alle /api/* Aufrufe an die echte API weiterleiten
-// WARUM: Der Blazor-Client ruft /api/envelope auf. Diese Anfrage geht an den
-// ReceiverUI-Server (gleiche Domain, kein CORS), der sie an die echte API weiterleitet.
-var apiBaseUrl = builder.Configuration["ApiBaseUrl"]
-    ?? throw new InvalidOperationException("ApiBaseUrl is not configured in appsettings.json.");
-
-builder.Services.AddHttpForwarder();
-
-var app = builder.Build();
-
-if (app.Environment.IsDevelopment())
-{
-    app.UseWebAssemblyDebugging();
-}
-else
-{
-    app.UseExceptionHandler("/Error", createScopeForErrors: true);
-    app.UseHsts();
-}
-
-app.UseHttpsRedirection();
-app.UseStaticFiles();
-app.UseAntiforgery();
-
-// Alle /api/* Requests an die echte EnvelopeGenerator.API weiterleiten
-// So muss der Browser nie direkt mit der API sprechen → kein CORS, Cookies funktionieren
-app.MapForwarder("/api/{**catch-all}", apiBaseUrl);
-
-app.MapRazorComponents<App>()
-    .AddInteractiveServerRenderMode()
-    .AddInteractiveWebAssemblyRenderMode()
-    .AddAdditionalAssemblies(typeof(EnvelopeGenerator.ReceiverUI.Client._Imports).Assembly);
-
-app.Run();

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Properties/launchSettings.json

@@ -1,41 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-    "iisSettings": {
-      "windowsAuthentication": false,
-      "anonymousAuthentication": true,
-      "iisExpress": {
-        "applicationUrl": "http://localhost:3101",
-        "sslPort": 44303
-      }
-    },
-    "profiles": {
-      "http": {
-        "commandName": "Project",
-        "dotnetRunMessages": true,
-        "launchBrowser": true,
-        "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "http://localhost:5109",
-        "environmentVariables": {
-          "ASPNETCORE_ENVIRONMENT": "Development"
-        }
-      },
-      "https": {
-        "commandName": "Project",
-        "dotnetRunMessages": true,
-        "launchBrowser": true,
-        "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "applicationUrl": "https://localhost:7206;http://localhost:5109",
-        "environmentVariables": {
-          "ASPNETCORE_ENVIRONMENT": "Development"
-        }
-      },
-      "IIS Express": {
-        "commandName": "IISExpress",
-        "launchBrowser": true,
-        "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-        "environmentVariables": {
-          "ASPNETCORE_ENVIRONMENT": "Development"
-        }
-      }
-    }
-  }

EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/wwwroot/js/pdfviewer-interop.js

@@ -1 +0,0 @@
-

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">
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <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">
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.3, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <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.DependencyInjection.Abstractions" version="8.0.2" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.3" targetFramework="net462" />
   <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net48" />

EnvelopeGenerator.ServiceHost/EnvelopeGenerator.ServiceHost.csproj

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

EnvelopeGenerator.ServiceHost/Exceptions/BurnAnnotationException.cs

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

EnvelopeGenerator.ServiceHost/Exceptions/CreateReportException.cs

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

EnvelopeGenerator.ServiceHost/Exceptions/ExportDocumentException.cs

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

EnvelopeGenerator.ServiceHost/Exceptions/MergeDocumentException.cs

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

EnvelopeGenerator.ServiceHost/Extensions/DataRowExtensions.cs

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

EnvelopeGenerator.ServiceHost/Extensions/DependencyInjection.cs

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