refactor(network): add bias to annot.top

- Hintergrund mit neuen Eigenschaften in Annotations.js binden

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeHistoryService.cs

@@ -7,7 +7,7 @@ using static EnvelopeGenerator.Common.Constants;
 
 namespace EnvelopeGenerator.Application.Contracts.Services;
 
-public interface IEnvelopeHistoryService : ICRUDService<EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>
+public interface IEnvelopeHistoryService : ICRUDService<EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistory, long>
 {
     Task<int> CountAsync(int? envelopeId = null, string? userReference = null, int? status = null);
 

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverReadOnlyService.cs

@@ -4,6 +4,6 @@ using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Contracts.Services;
 
-public interface IEnvelopeReceiverReadOnlyService : ICRUDService<EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnlyDto, EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly, long>
+public interface IEnvelopeReceiverReadOnlyService : ICRUDService<EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnlyDto, EnvelopeReceiverReadOnly, long>
 {
 }

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverService.cs

@@ -1,4 +1,5 @@
-using DigitalData.Core.Abstractions.Application;
+using CommandDotNet;
+using DigitalData.Core.Abstractions.Application;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using EnvelopeGenerator.Application.DTOs.Messaging;
@@ -25,6 +26,7 @@ public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDt
 
     Task<DataResult<bool>> VerifyAccessCodeAsync(string uuid, string signature, string accessCode);
 
+    [Command("verify-access-code-async-by-id")]
     Task<DataResult<bool>> VerifyAccessCodeAsync(string envelopeReceiverId, string accessCode);
 
     Task<DataResult<bool>> IsExisting(string envelopeReceiverId);

EnvelopeGenerator.Application/Contracts/Services/IReceiverService.cs

@@ -6,7 +6,7 @@ using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Contracts.Services;
 
-public interface IReceiverService : ICRUDService<ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>
+public interface IReceiverService : ICRUDService<ReceiverCreateDto, ReceiverReadDto, Receiver, int>
 {
     Task<DataResult<ReceiverReadDto>> ReadByAsync(string? emailAddress = null, string? signature = null);
 

EnvelopeGenerator.Application/DTOs/MappingProfile.cs

@@ -0,0 +1,70 @@
+using AutoMapper;
+using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Application.DTOs.Messaging;
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Application.Extensions;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.DTOs;
+
+/// <summary>
+/// Represents the AutoMapper profile configuration for mapping between
+/// domain entities and data transfer objects (DTOs) used within the EnvelopeGenerator application.
+/// </summary>
+public class MappingProfile : Profile
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MappingProfile"/> class.
+    /// Configures the mappings between entities and DTOs used throughout the application.
+    /// </summary>
+    public MappingProfile()
+    {
+        // Entity to DTO mappings
+        CreateMap<Config, ConfigDto>();
+        CreateMap<DocumentReceiverElement, DocumentReceiverElementDto>();
+        CreateMap<DocumentStatus, DocumentStatusDto>();
+        CreateMap<EmailTemplate, EmailTemplateDto>();
+        CreateMap<Envelope, EnvelopeDto>();
+        CreateMap<EnvelopeCertificate, EnvelopeCertificateDto>();
+        CreateMap<EnvelopeDocument, EnvelopeDocumentDto>();
+        CreateMap<Domain.Entities.EnvelopeHistory, EnvelopeHistoryDto>();
+        CreateMap<Domain.Entities.EnvelopeHistory, EnvelopeHistoryCreateDto>();
+        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverDto>();
+        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverSecretDto>();
+        CreateMap<EnvelopeType, EnvelopeTypeDto>();
+        CreateMap<Domain.Entities.Receiver, ReceiverReadDto>();
+        CreateMap<Domain.Entities.Receiver, ReceiverCreateDto>();
+        CreateMap<Domain.Entities.Receiver, ReceiverUpdateDto>();
+        CreateMap<UserReceiver, UserReceiverDto>();
+        CreateMap<Domain.Entities.EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
+
+        // DTO to Entity mappings
+        CreateMap<ConfigDto, Config>();
+        CreateMap<DocumentReceiverElementDto, DocumentReceiverElement>();
+        CreateMap<DocumentStatusDto, DocumentStatus>();
+        CreateMap<EmailTemplateDto, EmailTemplate>();
+        CreateMap<EnvelopeDto, Envelope>();
+        CreateMap<EnvelopeCertificateDto, EnvelopeCertificate>();
+        CreateMap<EnvelopeDocumentDto, EnvelopeDocument>();
+        CreateMap<EnvelopeHistoryDto, Domain.Entities.EnvelopeHistory>();
+        CreateMap<EnvelopeHistoryCreateDto, Domain.Entities.EnvelopeHistory>();
+        CreateMap<EnvelopeReceiverDto, Domain.Entities.EnvelopeReceiver>();
+        CreateMap<EnvelopeTypeDto, EnvelopeType>();
+        CreateMap<ReceiverReadDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
+        CreateMap<ReceiverCreateDto, Domain.Entities.Receiver>();
+        CreateMap<ReceiverUpdateDto, Domain.Entities.Receiver>();
+        CreateMap<UserReceiverDto, UserReceiver>();
+        CreateMap<EnvelopeReceiverBase, EnvelopeReceiverBasicDto>();
+        CreateMap<EnvelopeReceiverReadOnlyCreateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
+        CreateMap<EnvelopeReceiverReadOnlyUpdateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
+
+        // Messaging mappings
+        // for GTX messaging
+        CreateMap<GtxMessagingResponse, SmsResponse>()
+            .ConstructUsing(gtxRes => gtxRes.Ok()
+                ? new SmsResponse() { Ok = true }
+                : new SmsResponse() { Ok = false, Errors = gtxRes });
+    }
+}

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -1,6 +1,4 @@
-using DigitalData.UserManager.Application.MappingProfiles;
-using EnvelopeGenerator.Application.MappingProfiles;
-using EnvelopeGenerator.Application.Configurations;
+using EnvelopeGenerator.Application.Configurations;
 using EnvelopeGenerator.Application.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -8,11 +6,21 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
 using DigitalData.Core.Client;
 using QRCoder;
 using EnvelopeGenerator.Application.Contracts.Services;
+using System.Reflection;
 
-namespace EnvelopeGenerator.Application.Extensions;
+namespace EnvelopeGenerator.Application;
 
-public static class DIExtensions
+/// <summary>
+/// Extensions method for dependency injection
+/// </summary>
+public static class DependencyInjection
 {
+    /// <summary>
+    /// Adds all required services for envelope generator application
+    /// </summary>
+    /// <param name="services"></param>
+    /// <param name="config"></param>
+    /// <returns></returns>
     public static IServiceCollection AddEnvelopeGeneratorServices(this IServiceCollection services, IConfiguration config)
     {
         //Inject CRUD Service and repositoriesad
@@ -32,8 +40,8 @@ public static class DIExtensions
         services.TryAddScoped<IEnvelopeReceiverReadOnlyService, EnvelopeReceiverReadOnlyService>();
 
         //Auto mapping profiles
-        services.AddAutoMapper(typeof(BasicDtoMappingProfile).Assembly);
-        services.AddAutoMapper(typeof(UserMappingProfile).Assembly);
+        services.AddAutoMapper(Assembly.GetExecutingAssembly());
+        services.AddAutoMapper(typeof(DigitalData.UserManager.Application.DIExtensions));
 
         services.Configure<DispatcherParams>(config.GetSection(nameof(DispatcherParams)));
         services.Configure<MailParams>(config.GetSection(nameof(MailParams)));
@@ -47,6 +55,11 @@ public static class DIExtensions
         services.TryAddSingleton<IAuthenticator, Authenticator>();
         services.TryAddSingleton<QRCodeGenerator>();
 
+        services.AddMediatR(cfg =>
+        {
+            cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly());
+        });
+
         return services;
     }
 }

EnvelopeGenerator.Application/Documents/Queries/Read/ReadDocumentMappingProfile.cs

@@ -0,0 +1,18 @@
+using AutoMapper;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Documents.Queries.Read;
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadDocumentMappingProfile : Profile
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public ReadDocumentMappingProfile()
+    {
+        CreateMap<EnvelopeDocument, ReadDocumentResponse>();
+    }
+}

EnvelopeGenerator.Application/Documents/Queries/Read/ReadDocumentQuery.cs

@@ -0,0 +1,12 @@
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Documents.Queries.Read;
+
+/// <summary>
+/// Represents a query to read a document based on its unique identifier or associated envelope identifier.
+/// </summary>
+/// <param name="Id">The unique identifier of the document. Optional.</param>
+/// <param name="EnvelopeId">The identifier of the envelope associated with the document. Optional.</param>
+public record ReadDocumentQuery(int? Id = null, int? EnvelopeId = null) : IRequest<ReadDocumentResponse?>
+{
+}

EnvelopeGenerator.Application/Documents/Queries/Read/ReadDocumentQueryHandler.cs

@@ -0,0 +1,47 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Documents.Queries.Read;
+
+/// <summary>
+/// Handles queries for reading <see cref="EnvelopeDocument"/> data based on either the document ID or the envelope ID.
+/// </summary>
+public class ReadDocumentQueryHandler : IRequestHandler<ReadDocumentQuery, ReadDocumentResponse?>
+{
+    /// <summary>
+    /// Repository for accessing <see cref="EnvelopeDocument"/> entities.
+    /// </summary>
+    private readonly IRepository<EnvelopeDocument> _repo;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ReadDocumentQueryHandler"/> class.
+    /// </summary>
+    /// <param name="envelopeDocumentRepository">The repository used to access <see cref="EnvelopeDocument"/> entities.</param>
+    public ReadDocumentQueryHandler(IRepository<EnvelopeDocument> envelopeDocumentRepository)
+    {
+        _repo = envelopeDocumentRepository;
+    }
+
+    /// <summary>
+    /// Handles the <see cref="ReadDocumentQuery"/> and returns a <see cref="ReadDocumentResponse"/> based on the provided identifiers.
+    /// </summary>
+    /// <param name="query">The query containing the document ID or envelope ID to search for.</param>
+    /// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+    /// <returns>
+    /// A <see cref="ReadDocumentResponse"/> if a matching document is found; otherwise, <c>null</c>.
+    /// </returns>
+    /// <exception cref="InvalidOperationException">
+    /// Thrown when neither <see cref="ReadDocumentQuery.Id"/> nor <see cref="ReadDocumentQuery.EnvelopeId"/> is provided.
+    /// </exception>
+    public async Task<ReadDocumentResponse?> Handle(ReadDocumentQuery query, CancellationToken cancellationToken)
+    {
+        if (query.Id is not null)
+            return await _repo.ReadOrDefaultAsync<ReadDocumentResponse>(d => d.Id == query.Id);
+        else if (query.EnvelopeId is not null)
+            return await _repo.ReadOrDefaultAsync<ReadDocumentResponse>(d => d.EnvelopeId == query.EnvelopeId);
+
+        throw new InvalidOperationException(
+            $"Invalid {nameof(ReadDocumentQuery)}: either {nameof(query.Id)} or {nameof(query.EnvelopeId)} must be provided.");
+    }
+}

EnvelopeGenerator.Application/Documents/Queries/Read/ReadDocumentResponse.cs

@@ -0,0 +1,27 @@
+namespace EnvelopeGenerator.Application.Documents.Queries.Read;
+
+/// <summary>
+/// Represents the response for reading a document.
+/// </summary>
+public class ReadDocumentResponse
+{
+    /// <summary>
+    /// The unique identifier of the document.
+    /// </summary>
+    public int Guid { get; init; }
+
+    /// <summary>
+    /// The identifier of the associated envelope.
+    /// </summary>
+    public int EnvelopeId { get; init; }
+
+    /// <summary>
+    /// The date and time when the document was added.
+    /// </summary>
+    public DateTime AddedWhen { get; init; }
+
+    /// <summary>
+    /// The binary data of the document, if available.
+    /// </summary>
+    public byte[]? ByteData { get; init; }
+}

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -13,19 +13,18 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="AutoMapper" Version="13.0.1" />
-		<PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
-		<PackageReference Include="DigitalData.Core.Application" Version="2.0.0" />
+		<PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.3" />
+		<PackageReference Include="DigitalData.Core.Application" Version="3.2.1" />
 		<PackageReference Include="DigitalData.Core.Client" Version="2.0.3" />
-		<PackageReference Include="DigitalData.Core.DTO" Version="2.0.0" />
-		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="2.0.0" />
-		<PackageReference Include="MediatR" Version="11.1.0" />
+		<PackageReference Include="DigitalData.Core.DTO" Version="2.0.1" />
+		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.0.0" />
+		<PackageReference Include="MediatR" Version="12.5.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.18" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
 		<PackageReference Include="Otp.NET" Version="1.4.0" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
 		<PackageReference Include="QRCoder-ImageSharp" Version="0.10.0" />
-		<PackageReference Include="UserManager.Application" Version="2.0.0" />
-		<PackageReference Include="UserManager.Infrastructure" Version="2.0.0" />
+		<PackageReference Include="UserManager" Version="1.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -60,4 +59,25 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+	  <PackageReference Include="AutoMapper" Version="13.0.1" />
+	  <PackageReference Include="CommandDotNet">
+		<Version>7.0.5</Version>
+	  </PackageReference>
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+	  <PackageReference Include="AutoMapper" Version="14.0.0" />
+	  <PackageReference Include="CommandDotNet">
+	    <Version>8.1.1</Version>
+	  </PackageReference>
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+	  <PackageReference Include="AutoMapper" Version="14.0.0" />
+	  <PackageReference Include="CommandDotNet">
+	    <Version>8.1.1</Version>
+	  </PackageReference>
+	</ItemGroup>
+
 </Project>

EnvelopeGenerator.Application/MappingProfiles/BasicDtoMappingProfile.cs

@@ -1,64 +0,0 @@
-using AutoMapper;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
-using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Application.DTOs.Messaging;
-using EnvelopeGenerator.Application.DTOs.Receiver;
-using EnvelopeGenerator.Application.Extensions;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.MappingProfiles
-{
-    public class BasicDtoMappingProfile : Profile
-    {
-        public BasicDtoMappingProfile()
-        {
-            // Entity to DTO mappings
-            CreateMap<Config, ConfigDto>();
-            CreateMap<DocumentReceiverElement, DocumentReceiverElementDto>();
-            CreateMap<DocumentStatus, DocumentStatusDto>();
-            CreateMap<EmailTemplate, EmailTemplateDto>();
-            CreateMap<Envelope, EnvelopeDto>();
-            CreateMap<EnvelopeCertificate, EnvelopeCertificateDto>();
-            CreateMap<EnvelopeDocument, EnvelopeDocumentDto>();
-            CreateMap<EnvelopeHistory, EnvelopeHistoryDto>();
-            CreateMap<EnvelopeHistory, EnvelopeHistoryCreateDto>();
-            CreateMap<EnvelopeReceiver, EnvelopeReceiverDto>();
-            CreateMap<EnvelopeReceiver, EnvelopeReceiverSecretDto>();
-            CreateMap<EnvelopeType, EnvelopeTypeDto>();
-            CreateMap<Receiver, ReceiverReadDto>();
-            CreateMap<Receiver, ReceiverCreateDto>();
-            CreateMap<Receiver, ReceiverUpdateDto>();
-            CreateMap<UserReceiver, UserReceiverDto>();
-            CreateMap<EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
-
-            // DTO to Entity mappings
-            CreateMap<ConfigDto, Config>();
-            CreateMap<DocumentReceiverElementDto, DocumentReceiverElement>();
-            CreateMap<DocumentStatusDto, DocumentStatus>();
-            CreateMap<EmailTemplateDto, EmailTemplate>();
-            CreateMap<EnvelopeDto, Envelope>();
-            CreateMap<EnvelopeCertificateDto, EnvelopeCertificate>();
-            CreateMap<EnvelopeDocumentDto, EnvelopeDocument>();
-            CreateMap<EnvelopeHistoryDto, EnvelopeHistory>();
-            CreateMap<EnvelopeHistoryCreateDto, EnvelopeHistory>();
-            CreateMap<EnvelopeReceiverDto, EnvelopeReceiver>();
-            CreateMap<EnvelopeTypeDto, EnvelopeType>();
-            CreateMap<ReceiverReadDto, Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
-            CreateMap<ReceiverCreateDto, Receiver>();
-            CreateMap<ReceiverUpdateDto, Receiver>();
-            CreateMap<UserReceiverDto, UserReceiver>();
-            CreateMap<EnvelopeReceiverBase, EnvelopeReceiverBasicDto>();
-            CreateMap<EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnly>();
-            CreateMap<EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly>();
-
-            // Messaging mappings
-            // for GTX messaging
-            CreateMap<GtxMessagingResponse, SmsResponse>()
-                .ConstructUsing(gtxRes => gtxRes.Ok()
-                    ? new SmsResponse() { Ok = true }
-                    : new SmsResponse() { Ok = false, Errors = gtxRes });
-        }
-    }
-}

EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs

@@ -10,7 +10,7 @@ using EnvelopeGenerator.Application.Contracts.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 
-public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>, IEnvelopeHistoryService
+public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistory, long>, IEnvelopeHistoryService
 {
     public EnvelopeHistoryService(IEnvelopeHistoryRepository repository, IMapper mapper)
         : base(repository, mapper)

EnvelopeGenerator.Application/Services/EnvelopeReceiverReadOnlyService.cs

@@ -7,7 +7,7 @@ using EnvelopeGenerator.Application.Contracts.Repositories;
 
 namespace EnvelopeGenerator.Application.Services;
 
-public class EnvelopeReceiverReadOnlyService : CRUDService<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnlyDto, EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly, long>, IEnvelopeReceiverReadOnlyService
+public class EnvelopeReceiverReadOnlyService : CRUDService<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnlyDto, EnvelopeReceiverReadOnly, long>, IEnvelopeReceiverReadOnlyService
 {
     public EnvelopeReceiverReadOnlyService(IEnvelopeReceiverReadOnlyRepository repository, IMapper mapper) : base(repository, mapper)
     {

EnvelopeGenerator.Application/Services/ReceiverService.cs

@@ -10,7 +10,7 @@ using EnvelopeGenerator.Application.Contracts.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 
-public class ReceiverService : CRUDService<IReceiverRepository, ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>, IReceiverService
+public class ReceiverService : CRUDService<IReceiverRepository, ReceiverCreateDto, ReceiverReadDto, Receiver, int>, IReceiverService
 {
     public ReceiverService(IReceiverRepository repository, IMapper mapper)
         : base(repository, mapper)

EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs

@@ -2,27 +2,26 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace EnvelopeGenerator.Domain.Entities
+namespace EnvelopeGenerator.Domain.Entities;
+
+[Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")]
+public class EnvelopeDocument : IUnique<int>
 {
-    [Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")]
-    public class EnvelopeDocument : IUnique<int>
-    {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
 
-        [Required]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
+    [Required]
+    [Column("ENVELOPE_ID")]
+    public int EnvelopeId { get; set; }
 
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public required DateTime AddedWhen { get; set; }
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    public required DateTime AddedWhen { get; set; }
 
-        [Column("BYTE_DATA", TypeName = "varbinary(max)")]
-        public byte[]? ByteData { get; init; }
+    [Column("BYTE_DATA", TypeName = "varbinary(max)")]
+    public byte[]? ByteData { get; init; }
 
-        public IEnumerable<DocumentReceiverElement>? Elements { get; set; }
-    }
+    public IEnumerable<DocumentReceiverElement>? Elements { get; set; }
 }

EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
-    <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="1.0.0" />
-    <PackageReference Include="UserManager.Domain" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.3" />
+    <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="3.0.0" />
+    <PackageReference Include="UserManager.Domain" Version="3.0.2" />
   </ItemGroup>
 
   <ItemGroup>

EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb

@@ -156,7 +156,11 @@ Public Class EnvelopeEditorController
 
     Public Async Function CreateDocument(pDocumentFilePath As String) As Threading.Tasks.Task(Of EnvelopeDocument)
         Try
-            Dim oFileInfo = New FileInfo(pDocumentFilePath)
+            Dim oFixedPath = FixPageRotation.FixPageRotation(pDocumentFilePath)
+            If oFixedPath <> pDocumentFilePath Then
+                Logger.Info("PageRotation has been reseted to 0.")
+            End If
+            Dim oFileInfo = New FileInfo(oFixedPath)
             Dim oTempFiles As New TempFiles(State.LogConfig)
             Dim oTempFilePath = Path.Combine(oTempFiles._TempPath, Guid.NewGuid().ToString + oFileInfo.Extension)
 
@@ -172,7 +176,7 @@ Public Class EnvelopeEditorController
                 .FileNameOriginal = oFileInfo.Name,
                 .Thumbnail = Thumbnail.GetThumbnailFromPDFFile(oTempFilePath),
                 .PageCount = Thumbnail.GetPageCount(oTempFilePath),
-                .Byte_Data = ReadFile(pDocumentFilePath)
+                .Byte_Data = ReadFile(oFixedPath)
             }
 
             Return oDocument

EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj

@@ -368,6 +368,7 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Helper\Encryption.vb" />
+    <Compile Include="Helper\FixPageRotation.vb" />
     <Compile Include="Helper\RefreshHelper.vb" />
     <Compile Include="Helper\TempFiles.vb" />
     <Compile Include="Helper\Thumbnail.vb" />

EnvelopeGenerator.Form/Helper/FixPageRotation.vb

@@ -0,0 +1,48 @@
+Imports System.IO
+Imports GdPicture14
+
+Public Class FixPageRotation
+    ''' <summary>
+    ''' Checks if there are any rotations in the document. If so, normalizes the page rotation to 0 without affecting its visual appearance.
+    ''' Creates and uses a new document with the corrected properties.
+    ''' Fixes the issue of annotations being rotated to match the page's rotation.
+    ''' </summary>
+    ''' <param name="pFilePath"></param>
+    ''' <returns></returns>
+    Public Shared Function FixPageRotation(pFilePath As String) As String
+
+        Dim oFolder As String = Path.GetDirectoryName(pFilePath)
+        Dim oChanged As Boolean = False
+
+        Using gdpicturePDF As New GdPicturePDF()
+
+            Dim status As GdPictureStatus = gdpicturePDF.LoadFromFile(pFilePath, True)
+            If status = GdPictureStatus.OK Then
+
+                Dim count As Integer = gdpicturePDF.GetPageCount()
+                For i As Integer = 1 To count
+                    If gdpicturePDF.SelectPage(i) = GdPictureStatus.OK Then
+                        Dim rotation As Integer = gdpicturePDF.GetPageRotation()
+                        If rotation <> 0 Then
+                            gdpicturePDF.NormalizePage()
+                            oChanged = True
+                        End If
+                    End If
+                Next
+
+            End If
+
+            If oChanged Then
+                Dim newFilesPath As String = Path.Combine(oFolder, "RotationFixed_" & Path.GetFileName(pFilePath))
+                If gdpicturePDF.SaveToFile(newFilesPath) = GdPictureStatus.OK Then
+                    Return newFilesPath
+                End If
+            End If
+
+        End Using
+
+        Return pFilePath
+
+    End Function
+
+End Class

EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj

@@ -19,16 +19,35 @@
 
   <ItemGroup>
     <PackageReference Include="AspNetCore.Scalar" Version="1.1.8" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
-    <PackageReference Include="DigitalData.Core.API" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.API" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.4" />
     <PackageReference Include="Scalar.AspNetCore" Version="2.1.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.3" />
+    <PackageReference Include="DigitalData.Core.Application" Version="3.2.1" />
+    <PackageReference Include="DigitalData.Core.DTO" Version="2.0.1" />
+    <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="3.0.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
     <PackageReference Include="System.DirectoryServices" Version="7.0.1" />
     <PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
     <PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.1" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="System.DirectoryServices" Version="8.0.0" />
+    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="8.0.1" />
+    <PackageReference Include="System.DirectoryServices.Protocols" Version="8.0.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageReference Include="System.DirectoryServices" Version="9.0.4" />
+    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="9.0.4" />
+    <PackageReference Include="System.DirectoryServices.Protocols" Version="9.0.4" />
+  </ItemGroup>
+
   <ItemGroup>
     <Folder Include="ClientApp\" />
   </ItemGroup>

EnvelopeGenerator.GeneratorAPI/Program.cs

@@ -1,7 +1,6 @@
 using DigitalData.Core.API;
 using DigitalData.Core.Application;
 using DigitalData.UserManager.Application;
-using EnvelopeGenerator.Application.Extensions;
 using EnvelopeGenerator.Infrastructure;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Localization;
@@ -9,6 +8,8 @@ using Microsoft.EntityFrameworkCore;
 using System.Globalization;
 using Scalar.AspNetCore;
 using Microsoft.OpenApi.Models;
+using DigitalData.UserManager.DependencyInjection;
+using EnvelopeGenerator.Application;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -101,7 +102,7 @@ builder.Services.AddUserManager<EGDbContext>();
 
 // LDAP
 builder.ConfigureBySection<DirectorySearchOptions>();
-builder.Services.AddDirectorySearchService();
+builder.Services.AddDirectorySearchService(config.GetSection("DirectorySearchOptions"));
 
 // Localizer
 builder.Services.AddCookieBasedLocalizer() ;

EnvelopeGenerator.Infrastructure/DIExtensions.cs

@@ -3,6 +3,9 @@ using EnvelopeGenerator.Infrastructure.Repositories;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.EntityFrameworkCore;
+using DigitalData.Core.Infrastructure;
+using EnvelopeGenerator.Domain.Entities;
+using DigitalData.Core.Infrastructure.AutoMapper;
 
 namespace EnvelopeGenerator.Infrastructure;
 
@@ -30,13 +33,11 @@ public static class DIExtensions
         services.TryAddScoped<IConfigRepository, ConfigRepository>();
         services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
         services.TryAddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
-        services.TryAddScoped<IConfigRepository, ConfigRepository>();
         services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
         services.TryAddScoped<IDocumentStatusRepository, DocumentStatusRepository>();
         services.TryAddScoped<IEmailTemplateRepository, EmailTemplateRepository>();
         services.TryAddScoped<IEnvelopeRepository, EnvelopeRepository>();
         services.TryAddScoped<IEnvelopeCertificateRepository, EnvelopeCertificateRepository>();
-        services.TryAddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
         services.TryAddScoped<IEnvelopeHistoryRepository, EnvelopeHistoryRepository>();
         services.TryAddScoped<IEnvelopeReceiverRepository, EnvelopeReceiverRepository>();
         services.TryAddScoped<IEnvelopeTypeRepository, EnvelopeTypeRepository>();
@@ -44,6 +45,20 @@ public static class DIExtensions
         services.TryAddScoped<IUserReceiverRepository, UserReceiverRepository>();
         services.TryAddScoped<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyRepository>();
 
+        services.AddDbRepository<EGDbContext, Config>(context => context.Configs).UseAutoMapper();
+        services.AddDbRepository<EGDbContext, DocumentReceiverElement>(context => context.DocumentReceiverElements).UseAutoMapper();
+        services.AddDbRepository<EGDbContext, EnvelopeDocument>(context => context.EnvelopeDocument).UseAutoMapper();
+        services.AddDbRepository<EGDbContext, DocumentStatus>(context => context.DocumentStatus).UseAutoMapper();
+        services.AddDbRepository<EGDbContext, EmailTemplate>(context => context.EmailTemplate).UseAutoMapper();
+        services.AddDbRepository<EGDbContext, Envelope>(context => context.Envelopes).UseAutoMapper();
+        services.AddDbRepository<EGDbContext, EnvelopeCertificate>(context => context.EnvelopeCertificates).UseAutoMapper();
+        services.AddDbRepository<EGDbContext, EnvelopeHistory>(context => context.EnvelopeHistories).UseAutoMapper();
+        services.AddDbRepository<EGDbContext, EnvelopeReceiver>(context => context.EnvelopeReceivers).UseAutoMapper();
+        services.AddDbRepository<EGDbContext, EnvelopeType>(context => context.EnvelopeTypes).UseAutoMapper();
+        services.AddDbRepository<EGDbContext, Receiver>(context => context.Receivers).UseAutoMapper();
+        services.AddDbRepository<EGDbContext, UserReceiver>(context => context.UserReceivers).UseAutoMapper();
+        services.AddDbRepository<EGDbContext, EnvelopeReceiverReadOnly>(context => context.EnvelopeReceiverReadOnlys).UseAutoMapper();
+
         return services;
     }
 }

EnvelopeGenerator.Infrastructure/EGDbContext.cs

@@ -57,6 +57,8 @@ public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext
 
     public DbSet<EnvelopeReceiverReadOnly> EnvelopeReceiverReadOnlys { get; set; }
 
+    public DbSet<ClientUser> ClientUsers { get; set; }
+
     private readonly DbTriggerParams _triggers;
 
     private readonly ILogger<EGDbContext> _logger;

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

@@ -7,21 +7,31 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
-    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.0.0" />
-    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="2.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15" />
-    <PackageReference Include="UserManager.Infrastructure" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.3" />
+    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.0.4" />
+    <PackageReference Include="DigitalData.Core.Infrastructure.AutoMapper" Version="1.0.2" />
+    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.0.0" />
+	<PackageReference Include="UserManager" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
     <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
   </ItemGroup>
+	
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.20" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.15" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.4" />
+  </ItemGroup>
 
 </Project>

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeDocumentRepository.cs

@@ -1,5 +1,4 @@
 using DigitalData.Core.Infrastructure;
-using DigitalData.UserManager.Infrastructure.Repositories;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Contracts.Repositories;
 

EnvelopeGenerator.Terminal/CommandManager.cs

@@ -0,0 +1,42 @@
+using CommandDotNet;
+using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Documents.Queries.Read;
+using MediatR;
+using System.Reflection;
+using System.Text.Json;
+
+namespace EnvelopeGenerator.Terminal;
+
+public class CommandManager
+{
+    private static JsonSerializerOptions Options = new ()
+    {
+        WriteIndented = true
+    };
+    private readonly IEnvelopeReceiverService _envelopeReceiverService;
+    private readonly IMediator _mediator;
+
+    public CommandManager(IEnvelopeReceiverService envelopeReceiverService, IMediator mediator)
+    {
+        _envelopeReceiverService = envelopeReceiverService;
+        _mediator = mediator;
+    }
+
+    [DefaultCommand]
+    public void Execute([Option(Description = "print envelope generator termianal version.")] bool version)
+    {
+        if(version)
+            Console.WriteLine($"v{Assembly.GetExecutingAssembly().GetName().Version}");
+    }
+
+    [Subcommand]
+    public IEnvelopeReceiverService EnvelopeReceiver => _envelopeReceiverService;
+
+    [Command]
+    public async Task ReadDocument(IConsole console, int? id = null, int? envelopeId = null)
+    {
+        ReadDocumentQuery query = new(id, envelopeId);
+        var document = await _mediator.Send(query);
+        console.WriteLine(JsonSerializer.Serialize(document, Options));
+    }
+}

EnvelopeGenerator.Terminal/DependencyInjection.cs

@@ -0,0 +1,55 @@
+using CommandDotNet.NameCasing;
+using CommandDotNet;
+using Microsoft.Extensions.DependencyInjection;
+using CommandDotNet.IoC.MicrosoftDependencyInjection;
+using EnvelopeGenerator.Infrastructure;
+using Microsoft.Extensions.Configuration;
+using Microsoft.EntityFrameworkCore;
+using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Services;
+using Microsoft.Extensions.Hosting;
+using EnvelopeGenerator.Application;
+
+namespace EnvelopeGenerator.Terminal;
+
+public static class DependencyInjection
+{
+    public static IServiceCollection AddCommandManagerRunner(this IServiceCollection services, IConfiguration configuration, Case @case = Case.KebabCase, string connectionStringKeyName = "Default")
+    {
+        var connStr = configuration.GetConnectionString(connectionStringKeyName)
+            ?? throw new InvalidOperationException("There is no default connection string in appsettings.json.");
+
+        services.AddDistributedSqlServerCache(options =>
+        {
+            options.ConnectionString = connStr;
+            options.SchemaName = "dbo";
+            options.TableName = "TBDD_CACHE";
+        });
+
+        // Add envelope generator services
+        services.AddEnvelopeGeneratorRepositories(options => options.UseSqlServer(connStr));
+
+        return services
+            .AddSingleton<CommandManager>()
+            .AddEnvelopeGeneratorRepositories()
+            .AddEnvelopeGeneratorServices(configuration)
+            .AddSingleton(sp =>
+            {
+                var runner = new AppRunner<CommandManager>();
+                runner.UseMicrosoftDependencyInjection(sp);
+                runner.UseNameCasing(@case);
+                return runner;
+            })
+            .AddScoped<IEnvelopeMailService, EnvelopeMailService>()
+            .AddMemoryCache()
+            .AddLocalization();
+    }
+
+    public static Task<int> RunCommandManagerRunner(this IServiceProvider provider, string[] args)
+    {
+        var runner = provider.GetRequiredService<AppRunner<CommandManager>>();
+        return runner.RunAsync(args);
+    }
+
+    public static Task<int> RunCommandManagerRunner(this IHost host, string[] args) => host.Services.RunCommandManagerRunner(args);
+}

EnvelopeGenerator.Terminal/EnvelopeGenerator.Terminal.csproj

@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CommandDotNet" Version="7.0.5" />
+    <PackageReference Include="CommandDotNet.IoC.MicrosoftDependencyInjection" Version="5.0.1" />
+    <PackageReference Include="CommandDotNet.NameCasing" Version="4.0.2" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.3" />
+    <PackageReference Include="DigitalData.Core.Application" Version="3.2.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
+    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
+    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
+  </ItemGroup>
+
+</Project>

EnvelopeGenerator.Terminal/Program.cs

@@ -0,0 +1,19 @@
+using Microsoft.Extensions.Hosting;
+
+namespace EnvelopeGenerator.Terminal;
+
+public class Program
+{
+    static async Task<int> Main(string[] args)
+    {
+        var builder = Host.CreateApplicationBuilder(args);
+
+        var config = builder.Configuration;
+
+        builder.Services.AddCommandManagerRunner(config);
+
+        var app = builder.Build();
+
+        return await app.RunCommandManagerRunner(args);
+    }
+}

EnvelopeGenerator.Terminal/appsettings.json

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

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

@@ -23,15 +23,18 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.3" />
+    <PackageReference Include="DigitalData.Core.API" Version="2.1.1" />
+    <PackageReference Include="DigitalData.Core.Application" Version="3.2.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.20" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-	<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+	<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>

EnvelopeGenerator.Tests.Application/Mock.cs

@@ -1,10 +1,10 @@
 using Microsoft.Extensions.Hosting;
-using EnvelopeGenerator.Application.Extensions;
 using EnvelopeGenerator.Infrastructure;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using EnvelopeGenerator.Application.Services;
 using Microsoft.EntityFrameworkCore;
+using EnvelopeGenerator.Application;
 
 namespace EnvelopeGenerator.Tests.Application;
 

EnvelopeGenerator.Web/Controllers/ConfigController.cs

@@ -1,4 +1,5 @@
-using EnvelopeGenerator.Web.Models;
+using EnvelopeGenerator.Web.Models.Annotation;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 
@@ -6,6 +7,7 @@ namespace EnvelopeGenerator.Web.Controllers;
 
 [Route("api/[controller]")]
 [ApiController]
+[Authorize]
 public class ConfigController : ControllerBase
 {
     private readonly AnnotationParams _annotParams;
@@ -18,6 +20,6 @@ public class ConfigController : ControllerBase
     [HttpGet("Annotations")]
     public IActionResult GetAnnotationParams()
     {
-        return Ok(_annotParams.AnnotationDictionary);
+        return Ok(_annotParams.AnnotationJSObject);
     }
 }

EnvelopeGenerator.Web/Controllers/Test/TestControllerBase.cs

@@ -8,7 +8,7 @@ namespace EnvelopeGenerator.Web.Controllers.Test
     [ApiController]
     [Route("api/test/[controller]")]
     public class TestControllerBase<TCRUDService, TDto, TEntity, TId> : BasicCRUDControllerBase<TCRUDService, TDto, TEntity, TId> 
-        where TCRUDService : ICRUDService<TDto, TDto, TDto, TEntity, TId>
+        where TCRUDService : ICRUDService<TDto, TDto, TEntity, TId>
         where TDto : class, IUnique<TId> where TEntity : class, IUnique<TId>
     {
         public TestControllerBase(ILogger logger, TCRUDService service) : base(logger, service)

EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <PackageId>EnvelopeGenerator.Web</PackageId>
@@ -2101,15 +2101,16 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
-    <PackageReference Include="DigitalData.Core.API" Version="2.0.1" />
-    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.3" />
+    <PackageReference Include="DigitalData.Core.API" Version="2.1.1" />
+    <PackageReference Include="DigitalData.Core.Application" Version="3.2.1" />
+    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.0.0" />
     <PackageReference Include="DigitalData.Modules.Base" Version="1.3.8" />
     <PackageReference Include="DigitalData.Modules.Config" Version="1.3.0" />
     <PackageReference Include="DigitalData.Modules.Database" Version="2.3.5.4" />
     <PackageReference Include="HtmlSanitizer" Version="8.0.865" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -2131,7 +2132,6 @@
     <PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.1" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
     <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
-    <PackageReference Include="UserManager.Infrastructure" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>

EnvelopeGenerator.Web/Models/Annotation/Annotation.cs

@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
 
-namespace EnvelopeGenerator.Web.Models;
+namespace EnvelopeGenerator.Web.Models.Annotation;
 
-public record Annotation
+public record Annotation : IAnnotation
 {
     public required string Name { get; init; }
 
@@ -60,6 +60,16 @@ public record Annotation
     public Annotation? VerBoundAnnot { get; set; }
     #endregion
 
+    public Color? BackgroundColor { get; init; }
+
+    #region Border
+    public Color? BorderColor { get; init; }
+
+    public string? BorderStyle { get; init; }
+
+    public int? BorderWidth { get; set; }
+    #endregion
+
     [JsonIgnore]
     internal Annotation Default 
     { 

EnvelopeGenerator.Web/Models/Annotation/AnnotationParams.cs

@@ -1,15 +1,21 @@
 using System.Text.Json.Serialization;
 
-namespace EnvelopeGenerator.Web.Models;
+namespace EnvelopeGenerator.Web.Models.Annotation;
 
 public class AnnotationParams
 {
+    public AnnotationParams()
+    {
+        _AnnotationJSObjectInitor = new(CreateAnnotationJSObject);
+    }
+
+    public Background? Background { get; init; }
+
+    #region Annotation
     [JsonIgnore]
     public Annotation? DefaultAnnotation { get; init; }
 
-    private readonly IEnumerable<Annotation> _annots = new List<Annotation>();
-
-    public Annotation this[string name] => _annots.First(a => a.Name == name);
+    private readonly List<Annotation> _annots = new List<Annotation>();
 
     public bool TryGet(string name, out Annotation annotation)
     {
@@ -24,34 +30,50 @@ public class AnnotationParams
         get => _annots;
         init
         {
-            _annots = value;
+            _annots = value.ToList();
 
             if (DefaultAnnotation is not null)
                 foreach (var annot in _annots)
                     annot.Default = DefaultAnnotation;
 
-            foreach (var annot in _annots)
+            for (int i = 0; i < _annots.Count; i++)
             {
                 #region set bound annotations
                 // horizontal
-                if (annot.HorBoundAnnotName is string horBoundAnnotName)
+                if (_annots[i].HorBoundAnnotName is string horBoundAnnotName)
                     if (TryGet(horBoundAnnotName, out var horBoundAnnot))
-                        annot.HorBoundAnnot = horBoundAnnot;
+                        _annots[i].HorBoundAnnot = horBoundAnnot;
                     else
                         throw new InvalidOperationException($"{horBoundAnnotName} added as bound anotation. However, it is not defined.");
 
                 // vertical
-                if (annot.VerBoundAnnotName is string verBoundAnnotName)
+                if (_annots[i].VerBoundAnnotName is string verBoundAnnotName)
                     if (TryGet(verBoundAnnotName, out var verBoundAnnot))
-                        annot.VerBoundAnnot = verBoundAnnot;
+                        _annots[i].VerBoundAnnot = verBoundAnnot;
                     else
                         throw new InvalidOperationException($"{verBoundAnnotName} added as bound anotation. However, it is not defined.");
                 #endregion
             }
-
-            AnnotationDictionary = _annots.ToDictionary(a => a.Name.ToLower(), a => a);
         }
     }
+    #endregion
 
-    public Dictionary<string, Annotation> AnnotationDictionary { get; private init; } = new();
+    #region AnnotationJSObject
+    private Dictionary<string, IAnnotation> CreateAnnotationJSObject()
+    {
+        var dict = _annots.ToDictionary(a => a.Name.ToLower(), a => a as IAnnotation);
+
+        if (Background is not null)
+        {
+            Background.Locate(_annots);
+            dict.Add(Background.Name.ToLower(), Background);
+        }            
+
+        return dict;
+    }
+
+    private readonly Lazy<Dictionary<string, IAnnotation>> _AnnotationJSObjectInitor;
+
+    public Dictionary<string, IAnnotation> AnnotationJSObject => _AnnotationJSObjectInitor.Value;
+    #endregion
 }

EnvelopeGenerator.Web/Models/Annotation/Background.cs

@@ -0,0 +1,58 @@
+using System.Text.Json.Serialization;
+
+namespace EnvelopeGenerator.Web.Models.Annotation;
+
+/// <summary>
+/// The Background is an annotation for the PSPDF Kit. However, it has no function.
+/// It is only the first annotation as a background for other annotations.
+/// </summary>
+public record Background : IAnnotation
+{
+    [JsonIgnore]
+    public double Margin { get; init; }
+
+    public string Name { get; } = "Background";
+
+    public double? Width { get; set; }
+
+    public double? Height { get; set; }
+
+    public double Left { get; set; }
+
+    public double Top { get; set; }
+
+    public Color? BackgroundColor { get; init; }
+
+    #region Border
+    public Color? BorderColor { get; init; }
+
+    public string? BorderStyle { get; init; }
+
+    public int? BorderWidth { get; set; }
+    #endregion
+
+    public void Locate(IEnumerable<IAnnotation> annotations)
+    {
+        // set Top
+        if (annotations.MinBy(a => a.Top)?.Top is double minTop)
+            Top = minTop;
+
+        // set Left
+        if (annotations.MinBy(a => a.Left)?.Left is double minLeft)
+            Left = minLeft;
+
+        // set Width
+        if(annotations.MaxBy(a => a.GetRight())?.GetRight() is double maxRight)
+            Width = maxRight - Left;
+
+        // set Height
+        if (annotations.MaxBy(a => a.GetBottom())?.GetBottom() is double maxBottom)
+            Height = maxBottom - Top;
+
+        // add margins
+        Top -= Margin;
+        Left -= Margin;
+        Width += Margin * 2;
+        Height += Margin * 2;
+    }
+}

EnvelopeGenerator.Web/Models/Annotation/Color.cs

@@ -0,0 +1,10 @@
+namespace EnvelopeGenerator.Web.Models.Annotation;
+
+public record Color
+{
+    public int R { get; init; } = 0;
+
+    public int G { get; init; } = 0;
+
+    public int B { get; init; } = 0;
+}

EnvelopeGenerator.Web/Models/Annotation/Extensions.cs

@@ -0,0 +1,8 @@
+namespace EnvelopeGenerator.Web.Models.Annotation;
+
+public static class Extensions
+{
+    public static double GetRight(this IAnnotation annotation) => annotation.Left + annotation?.Width ?? 0;
+
+    public static double GetBottom(this IAnnotation annotation) => annotation.Top + annotation?.Height ?? 0;
+}

EnvelopeGenerator.Web/Models/Annotation/IAnnotation.cs

@@ -0,0 +1,22 @@
+namespace EnvelopeGenerator.Web.Models.Annotation;
+
+public interface IAnnotation
+{
+    string Name { get; }
+
+    double? Width { get; }
+
+    double? Height { get; }
+
+    double Left { get; }
+
+    double Top { get; }
+
+    Color? BackgroundColor { get; }
+
+    Color? BorderColor { get; }
+
+    string? BorderStyle { get; }
+
+    int? BorderWidth { get; }
+}

EnvelopeGenerator.Web/Program.cs

@@ -15,7 +15,7 @@ using DigitalData.EmailProfilerDispatcher;
 using EnvelopeGenerator.Infrastructure;
 using EnvelopeGenerator.Web.Sanitizers;
 using EnvelopeGenerator.Application.Contracts.Services;
-using EnvelopeGenerator.Application.Extensions;
+using EnvelopeGenerator.Web.Models.Annotation;
 
 var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
 logger.Info("Logging initialized!");

EnvelopeGenerator.Web/appsettings.json

@@ -151,6 +151,21 @@
   },
   "MainPageTitle": null,
   "AnnotationParams": {
+    "Background": {
+      "Margin": 0.20,
+      "BackgroundColor": {
+        "R": 222,
+        "G": 220,
+        "B": 215
+      },
+      "BorderColor": {
+        "R": 204,
+        "G": 202,
+        "B": 198
+      },
+      "BorderStyle": "underline",
+      "BorderWidth": 4
+    },
     "DefaultAnnotation": {
       "Width": 1,
       "Height": 0.5,

EnvelopeGenerator.Web/wwwroot/js/annotation.js

@@ -5,6 +5,34 @@ async function createAnnotations(document, instance) {
     for(var element of document.elements) {
         const annotParams = await getAnnotationParams(element.left, element.top);
         const page = element.page - 1
+        
+        //background
+        if(annotParams.background){
+            let background = annotParams.background;
+            const id_background = PSPDFKit.generateInstantId();
+            const annotation_background = new PSPDFKit.Annotations.WidgetAnnotation({
+                id: id_background,
+                pageIndex: page,
+                formFieldName: id_background,
+                backgroundColor: background?.backgroundColor ? new PSPDFKit.Color(background.backgroundColor) : null,
+                blendMode: 'normal',
+                boundingBox: new PSPDFKit.Geometry.Rect(background),
+                fontSize: 8,
+                borderStyle: background.borderStyle,
+                borderWidth: background.borderWidth,
+                borderColor: background?.borderColor ? new PSPDFKit.Color(background.borderColor) : null
+            });
+    
+            const formFieldBackground = new PSPDFKit.FormFields.ButtonFormField({
+                name: id_background,
+                annotationIds: PSPDFKit.Immutable.List([annotation_background.id]),
+                value: "",
+                readOnly: false
+            });
+
+            signatures.push(annotation_background)
+            signatures.push(formFieldBackground)
+        }
 
         //signatures
         const id = PSPDFKit.generateInstantId()
@@ -12,8 +40,8 @@ async function createAnnotations(document, instance) {
             id: id,
             pageIndex: page,
             formFieldName: id,
-            backgroundColor: PSPDFKit.Color.YELLOW,
-            blendMode: 'multiply',
+            backgroundColor: PSPDFKit.Color.LIGHT_YELLOW,
+            blendMode: 'normal',
             boundingBox: new PSPDFKit.Geometry.Rect(annotParams.signature),
         })
 
@@ -29,7 +57,7 @@ async function createAnnotations(document, instance) {
             pageIndex: page,
             formFieldName: id_position,
             backgroundColor: PSPDFKit.Color.DarkBlue,
-            blendMode: 'multiply',
+            blendMode: 'normal',
             boundingBox: new PSPDFKit.Geometry.Rect(annotParams.position),
             fontSize: 8
         })
@@ -48,7 +76,7 @@ async function createAnnotations(document, instance) {
             pageIndex: page,
             formFieldName: id_city,
             backgroundColor: PSPDFKit.Color.DarkBlue,
-            blendMode: 'multiply',
+            blendMode: 'normal',
             boundingBox: new PSPDFKit.Geometry.Rect(annotParams.city),
             fontSize: 8
         })
@@ -67,7 +95,7 @@ async function createAnnotations(document, instance) {
             pageIndex: page,
             formFieldName: id_date,
             backgroundColor: PSPDFKit.Color.DarkBlue,
-            blendMode: 'multiply',
+            blendMode: 'normal',
             boundingBox: new PSPDFKit.Geometry.Rect(annotParams.date),
             fontSize: 8,
             backgroundColor: PSPDFKit.Color.TRANSPARENT,
@@ -97,7 +125,7 @@ async function createAnnotations(document, instance) {
             id: id_date_label,
             pageIndex: page,
             formFieldName: id_date_label,
-            blendMode: 'multiply',
+            blendMode: 'normal',
             boundingBox: new PSPDFKit.Geometry.Rect(annotParams.datelabel),
             fontSize: 8,
             backgroundColor: PSPDFKit.Color.TRANSPARENT,
@@ -119,7 +147,7 @@ async function createAnnotations(document, instance) {
             id: id_city_label,
             pageIndex: page,
             formFieldName: id_city_label,
-            blendMode: 'multiply',
+            blendMode: 'normal',
             boundingBox: new PSPDFKit.Geometry.Rect(annotParams.citylabel),
             fontSize: 8,
             backgroundColor: PSPDFKit.Color.TRANSPARENT,
@@ -131,7 +159,8 @@ async function createAnnotations(document, instance) {
             name: id_city_label,
             annotationIds: PSPDFKit.Immutable.List([annotation_city_label.id]),
             value: "Ort",
-            readOnly: true
+            readOnly: true,
+            color: PSPDFKit.Color.BLACK
         })
 
         //position label
@@ -140,7 +169,7 @@ async function createAnnotations(document, instance) {
             id: id_position_label,
             pageIndex: page,
             formFieldName: id_position_label,
-            blendMode: 'multiply',
+            blendMode: 'normal',
             boundingBox: new PSPDFKit.Geometry.Rect(annotParams.positionlabel),
             fontSize: 8,
             backgroundColor: PSPDFKit.Color.TRANSPARENT,

EnvelopeGenerator.Web/wwwroot/js/network.js

@@ -175,21 +175,21 @@ async function setLanguage(language) {
             'Content-Type': 'application/json'
         }
     })
-    .then(res => res.json())
-    .then(langs => langs.includes(language))
-    .catch(err => false);
+        .then(res => res.json())
+        .then(langs => langs.includes(language))
+        .catch(err => false);
 
-    if(hasLang)
+    if (hasLang)
         return await fetch(`/lang/${language}`, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' }
         })
-        .then(response => {
-            if (response.redirected)
-                window.location.href = response.url;
-            else if (!response.ok)
-                return Promise.reject('Failed to set language');
-        });
+            .then(response => {
+                if (response.redirected)
+                    window.location.href = response.url;
+                else if (!response.ok)
+                    return Promise.reject('Failed to set language');
+            });
 }
 
 async function logout() {
@@ -204,22 +204,23 @@ async function logout() {
     });
 }
 
-function getAnnotationParams(leftInInch = 0, topInInch = 0, inchToPointFactor = 72) {
-    return fetch(`${window.location.origin}/api/Config/Annotations`, {
+
+async function getAnnotationParams(leftInInch = 0, topInInch = 0, inchToPointFactor = 72) {
+
+    const annotParams = await fetch(`${window.location.origin}/api/Config/Annotations`, {
         credentials: 'include',
         method: 'GET'
     })
-    .then(res => res.json())
-    .then(annotParams => {
-        for(var key in annotParams){
-            var annot = annotParams[key];
-            annot.width *= inchToPointFactor;
-            annot.height *= inchToPointFactor;
-            annot.left += leftInInch;
-            annot.left *= inchToPointFactor;
-            annot.top += topInInch;
-            annot.top *= inchToPointFactor;
-        }
-        return annotParams;
-    });
+        .then(res => res.json());
+
+    for (var key in annotParams) {
+        var annot = annotParams[key];
+        annot.width *= inchToPointFactor;
+        annot.height *= inchToPointFactor;
+        annot.left += leftInInch - 0.7;
+        annot.left *= inchToPointFactor;
+        annot.top += topInInch - 0.5;
+        annot.top *= inchToPointFactor;
+    }
+    return annotParams;
 }

EnvelopeGenerator.Web/wwwroot/js/network.min.js

@@ -1 +1 @@
-async function setLangAsync(n,t){document.getElementById("selectedFlag").className="fi "+t+" me-2";await fetch(`/lang/${n}`,{method:"POST",headers:{"Content-Type":"application/json"}})}async function setLanguage(n){const t=await fetch("/lang",{method:"GET",headers:{"Content-Type":"application/json"}}).then(n=>n.json()).then(t=>t.includes(n)).catch(()=>!1);if(t)return await fetch(`/lang/${n}`,{method:"POST",headers:{"Content-Type":"application/json"}}).then(n=>{if(n.redirected)window.location.href=n.url;else if(!n.ok)return Promise.reject("Failed to set language")})}async function logout(){return await fetch(`/auth/logout`,{method:"POST",headers:{"Content-Type":"application/json"}}).then(n=>{n.ok&&(window.location.href="/")})}function getAnnotationParams(n=0,t=0,i=72){return fetch(`${window.location.origin}/api/Config/Annotations`,{credentials:"include",method:"GET"}).then(n=>n.json()).then(r=>{var f,u;for(f in r)u=r[f],u.width*=i,u.height*=i,u.left+=n,u.left*=i,u.top+=t,u.top*=i;return r})}class Network{async getEnvelope(n){return this.getRequest(`/api/envelope/${n}`).then(this.wrapJsonResponse.bind(this))}async postEnvelope(n,t,i){return this.postRequest(`/api/envelope/${n}?index=${t}`,i).then(this.wrapJsonResponse.bind(this))}async getDocument(n,t){return this.getRequest(`/api/document/${n}?index=${t}`).then(this.wrapBinaryResponse.bind(this))}async openDocument(n){return this.postRequest(`/api/document/${n}`,{}).then(this.wrapJsonResponse.bind(this))}withCSRFToken(n){const t=getCSRFToken;let i=n.headers;return n.headers={...i,...t},n}getCSRFToken(){const n=document.getElementsByName("__RequestVerificationToken")[0].value;return{"X-XSRF-TOKEN":n}}getRequest(n){const t=this.getCSRFToken(),i={credentials:"include",method:"GET",headers:{...t}};return fetch(n,i)}postRequest(n,t){const i=this.getCSRFToken(),r={credentials:"include",method:"POST",headers:{...i,"Content-Type":"application/json; charset=utf-8"},body:JSON.stringify(t)};return fetch(n,r)}async wrapJsonResponse(n){return await this.wrapResponse(n,async n=>await n.json())}async wrapBinaryResponse(n){return await this.wrapResponse(n,async n=>await n.arrayBuffer())}async wrapResponse(n,t){let i;if(n.status===200){const r=await t(n);i=new WrappedResponse(r,null)}else if(n.status===403){const t=await n.json();i=new WrappedResponse(null,t)}else i=new WrappedResponse(null,null);return i}}class WrappedResponse{constructor(n,t){this.data=n;this.error=t;this.fatal=n===null&&t===null}}
+async function setLangAsync(n,t){document.getElementById("selectedFlag").className="fi "+t+" me-2";await fetch(`/lang/${n}`,{method:"POST",headers:{"Content-Type":"application/json"}})}async function setLanguage(n){const t=await fetch("/lang",{method:"GET",headers:{"Content-Type":"application/json"}}).then(n=>n.json()).then(t=>t.includes(n)).catch(()=>!1);if(t)return await fetch(`/lang/${n}`,{method:"POST",headers:{"Content-Type":"application/json"}}).then(n=>{if(n.redirected)window.location.href=n.url;else if(!n.ok)return Promise.reject("Failed to set language")})}async function logout(){return await fetch(`/auth/logout`,{method:"POST",headers:{"Content-Type":"application/json"}}).then(n=>{n.ok&&(window.location.href="/")})}async function getAnnotationParams(n=0,t=0,i=72){var f,r;const u=await fetch(`${window.location.origin}/api/Config/Annotations`,{credentials:"include",method:"GET"}).then(n=>n.json());for(f in u)r=u[f],r.width*=i,r.height*=i,r.left+=n-.7,r.left*=i,r.top+=t-.5,r.top*=i;return u}class Network{async getEnvelope(n){return this.getRequest(`/api/envelope/${n}`).then(this.wrapJsonResponse.bind(this))}async postEnvelope(n,t,i){return this.postRequest(`/api/envelope/${n}?index=${t}`,i).then(this.wrapJsonResponse.bind(this))}async getDocument(n,t){return this.getRequest(`/api/document/${n}?index=${t}`).then(this.wrapBinaryResponse.bind(this))}async openDocument(n){return this.postRequest(`/api/document/${n}`,{}).then(this.wrapJsonResponse.bind(this))}withCSRFToken(n){const t=getCSRFToken;let i=n.headers;return n.headers={...i,...t},n}getCSRFToken(){const n=document.getElementsByName("__RequestVerificationToken")[0].value;return{"X-XSRF-TOKEN":n}}getRequest(n){const t=this.getCSRFToken(),i={credentials:"include",method:"GET",headers:{...t}};return fetch(n,i)}postRequest(n,t){const i=this.getCSRFToken(),r={credentials:"include",method:"POST",headers:{...i,"Content-Type":"application/json; charset=utf-8"},body:JSON.stringify(t)};return fetch(n,r)}async wrapJsonResponse(n){return await this.wrapResponse(n,async n=>await n.json())}async wrapBinaryResponse(n){return await this.wrapResponse(n,async n=>await n.arrayBuffer())}async wrapResponse(n,t){let i;if(n.status===200){const r=await t(n);i=new WrappedResponse(r,null)}else if(n.status===403){const t=await n.json();i=new WrappedResponse(null,t)}else i=new WrappedResponse(null,null);return i}}class WrappedResponse{constructor(n,t){this.data=n;this.error=t;this.fatal=n===null&&t===null}}

EnvelopeGenerator.sln

@@ -35,6 +35,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "infrastructure", "infrastru
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "presentation", "presentation", "{E3C758DC-914D-4B7E-8457-0813F1FDB0CB}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Terminal", "EnvelopeGenerator.Terminal\EnvelopeGenerator.Terminal.csproj", "{A9F9B431-BB9B-49B8-9E2C-0703634A653A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -85,6 +87,10 @@ Global
 		{A4D0DD1A-67BC-4E1A-AD29-BC4BC0D41399}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A4D0DD1A-67BC-4E1A-AD29-BC4BC0D41399}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4D0DD1A-67BC-4E1A-AD29-BC4BC0D41399}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9F9B431-BB9B-49B8-9E2C-0703634A653A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9F9B431-BB9B-49B8-9E2C-0703634A653A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9F9B431-BB9B-49B8-9E2C-0703634A653A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9F9B431-BB9B-49B8-9E2C-0703634A653A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -104,6 +110,7 @@ Global
 		{A4D0DD1A-67BC-4E1A-AD29-BC4BC0D41399} = {0CBC2432-A561-4440-89BC-671B66A24146}
 		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {134D4164-B291-4E19-99B9-E4FA3AFAB62C}
 		{E3C758DC-914D-4B7E-8457-0813F1FDB0CB} = {134D4164-B291-4E19-99B9-E4FA3AFAB62C}
+		{A9F9B431-BB9B-49B8-9E2C-0703634A653A} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {73E60370-756D-45AD-A19A-C40A02DACCC7}