Bump version to 1.2.3 for EnvelopeGenerator.GeneratorAPI

Updated the version information in the project file,
incrementing `<Version>`, `<FileVersion>`, and `<AssemblyVersion>`
from 1.2.2 to 1.2.3.

EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeReceiverRepository.cs

@@ -21,5 +21,5 @@ public interface IEnvelopeReceiverRepository : ICRUDRepository<EnvelopeReceiver,
 
     Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
 
-    Task<EnvelopeReceiver?> ReadLastByReceiver(string email);
+    Task<EnvelopeReceiver?> ReadLastByReceiverAsync(string? email = null, int? id = null, string? signature = null);
 }

EnvelopeGenerator.Application/Contracts/SQLExecutor/IDocumentExecutor.cs

@@ -0,0 +1,18 @@
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;
+
+/// <summary>
+/// 
+/// </summary>
+public interface IDocumentExecutor
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="base64"></param>
+    /// <param name="envelope_uuid"></param>
+    /// <param name="cancellation"></param>
+    /// <returns></returns>
+    Task<EnvelopeDocument> CreateDocumentAsync(string base64, string envelope_uuid, CancellationToken cancellation = default);
+}

EnvelopeGenerator.Application/Contracts/SQLExecutor/IEnvelopeExecutor.cs

@@ -0,0 +1,21 @@
+using Dapper;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;
+
+/// <summary>
+/// 
+/// </summary>
+public interface IEnvelopeExecutor : ISQLExecutor
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <param name="title"></param>
+    /// <param name="message"></param>
+    /// <param name="tfaEnabled"></param>
+    /// <param name="cancellation"></param>
+    /// <returns></returns>
+    Task<Envelope> CreateEnvelopeAsync(int userId, string title = "", string message = "", bool tfaEnabled = false, CancellationToken cancellation = default);
+}

EnvelopeGenerator.Application/Contracts/SQLExecutor/IEnvelopeReceiverExecutor.cs

@@ -0,0 +1,20 @@
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;
+
+/// <summary>
+/// 
+/// </summary>
+public interface IEnvelopeReceiverExecutor
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="envelope_uuid"></param>
+    /// <param name="emailAddress"></param>
+    /// <param name="salutation"></param>
+    /// <param name="phone"></param>
+    /// <param name="cancellation"></param>
+    /// <returns></returns>
+    Task<EnvelopeReceiver?> AddEnvelopeReceiverAsync(string envelope_uuid, string emailAddress, string? salutation = null, string? phone = null, CancellationToken cancellation = default);
+}

EnvelopeGenerator.Application/Contracts/SQLExecutor/IQuery.cs

@@ -0,0 +1,70 @@
+namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;
+
+/// <summary>
+/// Provides methods for executing common queries on a given entity type.
+/// This interface abstracts away the direct usage of ORM libraries (such as Entity Framework) for querying data
+/// and provides asynchronous and synchronous operations for querying a collection or single entity.
+/// </summary>
+/// <typeparam name="TEntity">The type of the entity being queried.</typeparam>
+public interface IQuery<TEntity>
+{
+    /// <summary>
+    /// Asynchronously retrieves the first entity or a default value if no entity is found.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous operation. The task result contains the entity or a default value.</returns>
+    public Task<TEntity?> FirstOrDefaultAsync();
+
+    /// <summary>
+    /// Asynchronously retrieves a single entity or a default value if no entity is found.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous operation. The task result contains the entity or a default value.</returns>
+    public Task<TEntity?> SingleOrDefaultAsync();
+
+    /// <summary>
+    /// Asynchronously retrieves a list of entities.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous operation. The task result contains the list of entities.</returns>
+    public Task<IEnumerable<TEntity>> ToListAsync();
+
+    /// <summary>
+    /// Asynchronously retrieves the first entity. Throws an exception if no entity is found.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous operation. The task result contains the first entity.</returns>
+    public Task<TEntity> FirstAsync();
+
+    /// <summary>
+    /// Asynchronously retrieves a single entity. Throws an exception if no entity is found.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous operation. The task result contains the single entity.</returns>
+    public Task<TEntity> SingleAsync();
+
+    /// <summary>
+    /// Synchronously retrieves the first entity or a default value if no entity is found.
+    /// </summary>
+    /// <returns>The first entity or a default value.</returns>
+    public TEntity? FirstOrDefault();
+
+    /// <summary>
+    /// Synchronously retrieves a single entity or a default value if no entity is found.
+    /// </summary>
+    /// <returns>The single entity or a default value.</returns>
+    public TEntity? SingleOrDefault();
+
+    /// <summary>
+    /// Synchronously retrieves a list of entities.
+    /// </summary>
+    /// <returns>The list of entities.</returns>
+    public IEnumerable<TEntity> ToList();
+
+    /// <summary>
+    /// Synchronously retrieves the first entity. Throws an exception if no entity is found.
+    /// </summary>
+    /// <returns>The first entity.</returns>
+    public TEntity First();
+
+    /// <summary>
+    /// Synchronously retrieves a single entity. Throws an exception if no entity is found.
+    /// </summary>
+    /// <returns>The single entity.</returns>
+    public TEntity Single();
+}

EnvelopeGenerator.Application/Contracts/SQLExecutor/ISQL.cs

@@ -0,0 +1,20 @@
+namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;
+
+/// <summary>
+/// Represents a raw SQL query contract.
+/// </summary>
+public interface ISQL
+{
+    /// <summary>
+    /// Gets the raw SQL query string.
+    /// </summary>
+    string Raw { get; }
+}
+
+/// <summary>
+/// Represents a typed SQL query contract for a specific entity.
+/// </summary>
+/// <typeparam name="TEntity">The type of the entity associated with the SQL query.</typeparam>
+public interface ISQL<TEntity> : ISQL
+{
+}

EnvelopeGenerator.Application/Contracts/SQLExecutor/ISQLExecutor.cs

@@ -0,0 +1,27 @@
+namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;
+
+/// <summary>
+/// Defines methods for executing raw SQL queries or custom SQL query classes and returning query executors for further operations.
+/// Provides abstraction for raw SQL execution as well as mapping the results to <typeparamref name="TEntity"/> objects.
+/// </summary>
+/// <typeparam name="TEntity">The entity type to which the SQL query results will be mapped.</typeparam>
+public interface ISQLExecutor<TEntity>: ISQLExecutor
+{
+    /// <summary>
+    /// Executes a raw SQL query and returns an <see cref="IQuery{TEntity}"/> for further querying operations on the result.
+    /// </summary>
+    /// <param name="sql">The raw SQL query to execute.</param>
+    /// <param name="cancellation">Optional cancellation token for the operation.</param>
+    /// <param name="parameters">Optional parameters for the SQL query.</param>
+    /// <returns>An <see cref="IQuery{TEntity}"/> instance for further query operations on the result.</returns>
+    IQuery<TEntity> Execute(string sql, CancellationToken cancellation = default, params object[] parameters);
+
+    /// <summary>
+    /// Executes a custom SQL query defined by a class that implements <see cref="ISQL{TEntity}"/> and returns an <see cref="IQuery{TEntity}"/> for further querying operations on the result.
+    /// </summary>
+    /// <typeparam name="TSQL">The type of the custom SQL query class implementing <see cref="ISQL{TEntity}"/>.</typeparam>
+    /// <param name="cancellation">Optional cancellation token for the operation.</param>
+    /// <param name="parameters">Optional parameters for the SQL query.</param>
+    /// <returns>An <see cref="IQuery{TEntity}"/> instance for further query operations on the result.</returns>
+    IQuery<TEntity> Execute<TSQL>(CancellationToken cancellation = default, params object[] parameters) where TSQL : ISQL<TEntity>;
+}

EnvelopeGenerator.Application/Contracts/SQLExecutor/ISQLExecutorBaseEntity.cs

@@ -0,0 +1,29 @@
+using Dapper;
+
+namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;
+
+/// <summary>
+/// 
+/// </summary>
+public interface ISQLExecutor
+{
+    /// <summary>
+    /// Executes a raw SQL query and returns an <see cref="IQuery{TEntity}"/> for further querying operations on the result.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity type to which the SQL query results will be mapped.</typeparam>
+    /// <param name="sql">The raw SQL query to execute.</param>
+    /// <param name="parameters">Parameters for the SQL query.</param>
+    /// <param name="cancellation">Optional cancellation token for the operation.</param>
+    /// <returns>An <see cref="IQuery{TEntity}"/> instance for further query operations on the result.</returns>
+    Task<IEnumerable<TEntity>> Execute<TEntity>(string sql, DynamicParameters parameters, CancellationToken cancellation = default);
+
+    /// <summary>
+    /// Executes a custom SQL query defined by a class that implements <see cref="ISQL{TEntity}"/> and returns an <see cref="IQuery{TEntity}"/> for further querying operations on the result.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity type to which the SQL query results will be mapped.</typeparam>
+    /// <typeparam name="TSQL">The type of the custom SQL query class implementing <see cref="ISQL{TEntity}"/>.</typeparam>
+    /// <param name="parameters">Parameters for the SQL query.</param>
+    /// <param name="cancellation">Optional cancellation token for the operation.</param>
+    /// <returns>An <see cref="IQuery{TEntity}"/> instance for further query operations on the result.</returns>
+    Task<IEnumerable<TEntity>> Execute<TEntity, TSQL>(DynamicParameters parameters, CancellationToken cancellation = default) where TSQL : ISQL;
+}

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverService.cs

@@ -3,6 +3,8 @@ using DigitalData.Core.Abstractions.Application;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using EnvelopeGenerator.Application.DTOs.Messaging;
+using EnvelopeGenerator.Application.Envelopes;
+using EnvelopeGenerator.Application.Receivers.Queries.Read;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Contracts.Services;
@@ -31,9 +33,9 @@ public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDt
 
     Task<DataResult<bool>> IsExisting(string envelopeReceiverId);
 
-    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
+    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, EnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params int[] ignore_statuses);
 
-    Task<DataResult<string?>> ReadLastUsedReceiverNameByMail(string mail);
+    Task<DataResult<string?>> ReadLastUsedReceiverNameByMailAsync(string? mail = null, int? id = null, string? signature = null);
 
     Task<DataResult<SmsResponse>> SendSmsAsync(string envelopeReceiverId, string message);
     Task<DataResult<IEnumerable<EnvelopeReceiverSecretDto>>> ReadWithSecretByUuidAsync(string uuid);

EnvelopeGenerator.Application/DTOs/EmailTemplateDto.cs

@@ -3,10 +3,30 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Application.DTOs
 {
+    /// <summary>
+    /// 
+    /// </summary>
     [ApiExplorerSettings(IgnoreApi = true)]
-    public record EmailTemplateDto(
+    public record EmailTemplateDto : IUnique<int>
-        int Id,
+    {
-        string Name,
+        /// <summary>
-        string Body,
+        /// 
-        string Subject) : IUnique<int>;
+        /// </summary>
+        public int Id{ get; init; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public required string Name { get; init; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public required string Body { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public required string Subject { get; set; }
+    };
 }

EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs

@@ -21,9 +21,9 @@ namespace EnvelopeGenerator.Application.DTOs
 
 		[TemplatePlaceholder("[MESSAGE]")]
 		public string Message { get; set; }
-		public DateTime? ExpiresWhen { get; set; }
+
-		public DateTime? ExpiresWarningWhen { get; set; }
 		public DateTime AddedWhen { get; set; }
+
 		public DateTime? ChangedWhen { get; set; }
 
 		[TemplatePlaceholder("[DOCUMENT_TITLE]")]
@@ -33,39 +33,24 @@ namespace EnvelopeGenerator.Application.DTOs
 
 		public string Language { get; set; }
 
-		public bool? SendReminderEmails { get; set; }
-
-		public int? FirstReminderDays { get; set; }
-
-		public int? ReminderIntervalDays { get; set; }
-
 		public int? EnvelopeTypeId { get; set; }
 
 		public int? CertificationType { get; set; }
 
 		public bool? UseAccessCode { get; set; }
 
-		public int? FinalEmailToCreator { get; set; }
-
-		public int? FinalEmailToReceivers { get; set; }
-
-		public int? ExpiresWhenDays { get; set; }
-
-		public int? ExpiresWarningWhenDays { get; set; }
-
         public bool TFAEnabled { get; init; }
 
-        public bool DmzMoved { get; set; }
 		public UserReadDto? User { get; set; }
+
 		public EnvelopeType? EnvelopeType { get; set; }
 
 		public string? EnvelopeTypeTitle { get; set; }
 
 		public bool IsAlreadySent { get; set; }
 
-		public string? StatusTranslated { get; set; }
+        public byte[]? DocResult { get; init; }
 
-		public string? ContractTypeTranslated { get; set; }
+        public IEnumerable<EnvelopeDocumentDto>? Documents { get; set; }
-		public IEnumerable<EnvelopeDocumentDto>? Documents { get; set; }
 	}
 }

EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryDto.cs

@@ -5,19 +5,32 @@ using EnvelopeGenerator.Application.DTOs.Receiver;
 using Microsoft.AspNetCore.Mvc;
 using static EnvelopeGenerator.Common.Constants;
 
-namespace EnvelopeGenerator.Application.DTOs.EnvelopeHistory
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
-{
+
-    [ApiExplorerSettings(IgnoreApi = true)]
+/// <summary>
-    public record EnvelopeHistoryDto(
+/// 
-        long Id,
+/// </summary>
-        int EnvelopeId,
+/// <param name="Id"></param>
-        string UserReference,
+/// <param name="EnvelopeId"></param>
-        int Status,
+/// <param name="UserReference"></param>
-        string? StatusName,
+/// <param name="Status"></param>
-        DateTime AddedWhen,
+/// <param name="StatusName"></param>
-        DateTime? ActionDate,
+/// <param name="AddedWhen"></param>
-        UserCreateDto? Sender,
+/// <param name="ActionDate"></param>
-        ReceiverReadDto? Receiver,
+/// <param name="Sender"></param>
-        ReferenceType ReferenceType,
+/// <param name="Receiver"></param>
-        string? Comment = null) : BaseDTO<long>(Id), IUnique<long>;
+/// <param name="ReferenceType"></param>
-}
+/// <param name="Comment"></param>
+[ApiExplorerSettings(IgnoreApi = true)]
+public record EnvelopeHistoryDto(
+    long Id,
+    int EnvelopeId,
+    string UserReference,
+    int Status,
+    string? StatusName,
+    DateTime AddedWhen,
+    DateTime? ActionDate,
+    UserCreateDto? Sender,
+    ReceiverReadDto? Receiver,
+    ReferenceType ReferenceType,
+    string? Comment = null) : BaseDTO<long>(Id), IUnique<long>;

EnvelopeGenerator.Application/DTOs/Receiver/ReceiverReadDto.cs

@@ -1,6 +1,5 @@
 using DigitalData.Core.Abstractions;
 using DigitalData.Core.DTO;
-using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using Microsoft.AspNetCore.Mvc;
 using System.Text.Json.Serialization;

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -7,6 +7,7 @@ using DigitalData.Core.Client;
 using QRCoder;
 using EnvelopeGenerator.Application.Contracts.Services;
 using System.Reflection;
+using EnvelopeGenerator.Application.EnvelopeReceivers.Commands.Create;
 
 namespace EnvelopeGenerator.Application;
 
@@ -58,6 +59,7 @@ public static class DependencyInjection
         services.AddMediatR(cfg =>
         {
             cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly());
+            cfg.RegisterServicesFromAssembly(typeof(CreateEnvelopeReceiverCommandHandler).Assembly);
         });
 
         return services;

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

@@ -3,23 +3,8 @@
 /// <summary>
 /// Represents the response for reading a document.
 /// </summary>
-public class ReadDocumentResponse
+public class ReadDocumentResponse : ReadDocumentResponseBase
 {
-    /// <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>

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

@@ -0,0 +1,22 @@
+namespace EnvelopeGenerator.Application.Documents.Queries.Read;
+
+/// <summary>
+/// Represents the response for reading a document.
+/// </summary>
+public class ReadDocumentResponseBase
+{
+    /// <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; }
+}

EnvelopeGenerator.Application/EmailTemplates/Commands/Reset/ResetEmailTemplateCommand.cs

@@ -1,4 +1,5 @@
 using EnvelopeGenerator.Common;
+using MediatR;
 
 namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
 
@@ -6,8 +7,7 @@ namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
 /// Ein Befehl zum Zurücksetzen einer E-Mail-Vorlage auf die Standardwerte.
 /// Erbt von <see cref="EmailTemplateQuery"/> und ermöglicht die Angabe einer optionalen ID und eines Typs der E-Mail-Vorlage.
 /// </summary>
-/// <param name="Id">Die optionale ID der E-Mail-Vorlage, die zurückgesetzt werden soll.</param>
+/// Beispiele:
-/// <param name="Type">Der Typ der E-Mail-Vorlage, z. B. <see cref="Constants.EmailTemplateType"/> (optional). Beispiele:
 /// 0 - DocumentReceived: Benachrichtigung über den Empfang eines Dokuments.
 /// 1 - DocumentSigned: Benachrichtigung über die Unterzeichnung eines Dokuments.
 /// 2 - DocumentDeleted: Benachrichtigung über das Löschen eines Dokuments.
@@ -19,4 +19,23 @@ namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
 /// 8 - DocumentRejected_REC (Für den ablehnenden Empfänger): Mail an den ablehnenden Empfänger, wenn das Dokument abgelehnt wird.
 /// 9 - DocumentRejected_REC_2 (Für sonstige Empfänger): Mail an andere Empfänger (Brief), wenn das Dokument abgelehnt wird.
 /// </param>
-public record ResetEnvelopeTemplateCommand(int? Id, Constants.EmailTemplateType? Type) : EmailTemplateQuery(Id, Type);
+public record ResetEmailTemplateCommand : EmailTemplateQuery, IRequest
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="orginal"></param>
+    public ResetEmailTemplateCommand(EmailTemplateQuery? orginal = null) : base(orginal ?? new())
+    {
+
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="Id">Die optionale ID der E-Mail-Vorlage, die zurückgesetzt werden soll.</param>
+    /// <param name="Type">Der Typ der E-Mail-Vorlage, z. B. <see cref="Constants.EmailTemplateType"/> (optional).
+    public ResetEmailTemplateCommand(int? Id = null, Constants.EmailTemplateType? Type = null) : base(Id, Type)
+    {
+    }
+};

EnvelopeGenerator.Application/EmailTemplates/Commands/Reset/ResetEmailTemplateCommandHandler.cs

@@ -0,0 +1,114 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
+
+/// <summary>
+/// 
+/// </summary>
+public class ResetEmailTemplateCommandHandler : IRequestHandler<ResetEmailTemplateCommand>
+{
+    private readonly IRepository<EmailTemplate> _repository;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repository"></param>
+    public ResetEmailTemplateCommandHandler(IRepository<EmailTemplate> repository)
+    {
+        _repository = repository;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public async Task Handle(ResetEmailTemplateCommand request, CancellationToken cancel)
+    {
+        var temps = request.Id is not null
+            ? await _repository.ReadAllAsync<EmailTemplateDto>(t => t.Id == request.Id, cancel)
+            : request.Type is not null
+                ? await _repository.ReadAllAsync<EmailTemplateDto>(t => t.Name == request.Type.ToString(), cancel)
+                : await _repository.ReadAllAsync<EmailTemplateDto>(ct: cancel);
+
+        foreach (var temp in temps)
+        {
+            var def = Defaults.Where(t => t.Name == temp.Name).FirstOrDefault();
+            if(def is not null)
+                await _repository.UpdateAsync(def, t => t.Id == temp.Id, cancel);
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static readonly IEnumerable<EmailTemplateDto> Defaults = new List<EmailTemplateDto>()
+    {
+        new(){
+        Id = 1,
+        Name = "DocumentReceived",
+        Body = "Guten Tag [NAME_RECEIVER],<br />\r\n<br /><B><I>\r\n[NAME_SENDER]</I></B> hat Ihnen ein Dokument zum [SIGNATURE_TYPE] gesendet.<br />\r\n<br />\r\nÜber den folgenden Link können Sie das Dokument einsehen und elektronisch unterschreiben: <a href=\"[LINK_TO_DOCUMENT]\">[LINK_TO_DOCUMENT_TEXT]</a><br />\r\n<br />\r\n[MESSAGE]<br />\r\n<br />\r\nMit freundlichen Grüßen<br />\r\n<br />\r\n[NAME_PORTAL]",
+        Subject = "Dokument erhalten: '[DOCUMENT_TITLE]'"
+        },
+        new(){
+        Id = 2,
+        Name = "DocumentDeleted",
+        Body = "Guten Tag [NAME_RECEIVER],<br />\r\n<br /><B><I>\r\n[NAME_SENDER]</I></B> hat den Umschlag <B><I>'[DOCUMENT_TITLE]'</I></B> gelöscht/zurückgezogen.<br /><p>\rBegründung: <br /> <I>[REASON]</I> <p>\r\n<br />\r\nMit freundlichen Grüßen<br />\r\n<br />\r\n[NAME_PORTAL]",
+        Subject = "Umschlag zurückgezogen: '[DOCUMENT_TITLE]'"
+        },
+        new(){
+        Id = 3,
+        Name = "DocumentSigned",
+        Body = "Guten Tag [NAME_RECEIVER],<br />\r\n<br />\r\nhiermit bestätigen wir Ihnen die erfolgreiche Signatur für den Vorgang <B><I>'[DOCUMENT_TITLE]'</I></B>.<br />\r\nWenn alle Vertragspartner unterzeichnet haben, erhalten Sie ebenfalls per email ein unterschriebenes Exemplar mit dem Signierungszertifikat!\r\n<br />\r\nMit freundlichen Grüßen<br />\r\n<br />\r\n[NAME_PORTAL]",
+        Subject = "Dokument unterschrieben: '[DOCUMENT_TITLE]'"
+        },
+        new(){
+        Id = 4,
+        Name = "DocumentCompleted",
+        Body = "Guten Tag [NAME_RECEIVER],<br />\r\n<br />\r\nDer Signaturvorgang <B><I>'[DOCUMENT_TITLE]'</I></B> wurde erfolgreich abgeschlossen.<br />\r\n<br />\r\nSie erhalten das Dokument mit einem detaillierten Ergebnisbericht als Anhang zu dieser Email.<br />\r\n<br />\r\nMit freundlichen Grüßen<br />\r\n<br />\r\n[NAME_PORTAL]",
+        Subject = "Umschlag abgeschlossen: '[DOCUMENT_TITLE]'"
+        },
+        new(){
+        Id = 5,
+        Name = "DocumentAccessCodeReceived",
+        Body = "Guten Tag [NAME_RECEIVER],<br />\r\n<br /><B><I>\r\n[NAME_SENDER]</I></B> hat Ihnen ein Dokument zum [SIGNATURE_TYPE] gesendet. <br />\r\n<br />\r\nVerwenden Sie den folgenden Zugriffscode, um das Dokument einzusehen:<br />\r\n<br />\r\n[DOCUMENT_ACCESS_CODE]<br />\r\n<br />\r\nMit freundlichen Grüßen<br />\r\n<br />\r\n[NAME_PORTAL]",
+        Subject = "Zugriffscode für Dokument erhalten: '[DOCUMENT_TITLE]'"
+        },
+        new(){
+        Id = 6,
+        Name = "DocumentRejected_ADM",
+        Body = "Guten Tag [NAME_SENDER],<p><B><I>[NAME_RECEIVER]</I></B> hat den Umschlag <B><I>'[DOCUMENT_TITLE]'</I></B> mit folgendem Grund abgelehnt: <p>\r\n[REASON] \r\n<p>Der Umschlag wurde auf den Status Rejected gesetzt. <p> \r\nMit freundlichen Grüßen<br />\r\n<br />\r\n[NAME_PORTAL]",
+        Subject = "'[DOCUMENT_TITLE]' - Unterzeichnungsvorgang zurückgezogen"
+        },
+        new(){
+        Id = 9,
+        Name = "DocumentRejected_REC",
+        Body = "Guten Tag [NAME_RECEIVER],\r\n<p>Hiermit bestätigen wir Ihnen die Ablehnung des Unterzeichnungsvorganges <B><I>'[DOCUMENT_TITLE]'</I></B>!<p>Der Vertragsinhaber <B><I>[NAME_SENDER]</I></B> wurde über die Ablehnung informiert. <p> \r\nMit freundlichen Grüßen<br />\r\n<br />\r\n[NAME_PORTAL]",
+        Subject = "'[DOCUMENT_TITLE]' - Bestätigung Ablehnung"
+        },
+        new(){
+        Id = 10,
+        Name = "DocumentRejected_REC_2",
+        Body = "Guten Tag [NAME_RECEIVER],\r\n<p>Der Unterzeichnungsvorganges <B><I>'[DOCUMENT_TITLE]'</I></B> wurde durch einen anderen Vertragspartner abgelehnt! Ihre notwendige Unterzeichnung wurde verworfen.<p> Der Vertragsinhaber <B><I>[NAME_SENDER]</I></B> wird sich bei Bedarf mit Ihnen in Verbindung setzen. <p> \r\nMit freundlichen Grüßen<br />\r\n<br />\r\n[NAME_PORTAL]",
+        Subject = "'[DOCUMENT_TITLE]' - Unterzeichnungsvorgang abgelehnt."
+        },
+        new(){
+        Id = 11,
+        Name = "DocumentShared",
+        Body = "Guten Tag,<br />  <br /><B><I>  [NAME_RECEIVER]</I></B> hat Ihnen ein Dokument zum Ansehen gesendet.<br />  <br />  Über den folgenden Link können Sie das Dokument einsehen: <a href=\"[LINK_TO_DOCUMENT]\">[LINK_TO_DOCUMENT_TEXT]</a><br /> <br />  <br />  Mit freundlichen Grüßen<br />  <br />  [NAME_PORTAL]",
+        Subject = "Dokument geteilt: '[DOCUMENT_TITLE]'"
+        },
+        new(){
+        Id = 12,
+        Name = "TotpSecret",
+        Body = "Guten Tag,<br /> <br />Sie können auf Ihren Zwei-Faktor-Authentifizierungscode zugreifen, indem Sie den unten stehenden QR-Code mit einer beliebigen Authentifizierungs-App auf Ihrem Telefon scannen (Google Authenticator, Microsoft Authenticator usw.). Dieser Code ist bis zum [TFA_EXPIRATION] gültig.<br /> <br /> <img src=\"data:image/png;base64,[TFA_QR_CODE]\" style=\"width: 13rem; height: 13rem;\"><br /> <br />\r\n<br /> Mit freundlichen Grüßen<br /> <br /> [NAME_PORTAL]",
+        Subject = "2-Faktor-Verifizierung QR-Code"
+        }
+    };
+
+}

EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommand.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+using MediatR;
+using System.Text.Json.Serialization;
 
 namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Update;
 
@@ -12,11 +13,17 @@ namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Update;
 /// <param name="Subject">
 /// (Optional) Der neue Betreff der E-Mail. Wenn null, bleibt der vorhandene Betreff unverändert.
 /// </param>
-public record UpdateEmailTemplateCommand(string? Body = null, string? Subject = null)
+public record UpdateEmailTemplateCommand(string? Body = null, string? Subject = null) : IRequest
 {
     /// <param>
     /// Die Abfrage, die die E-Mail-Vorlage darstellt, die aktualisiert werden soll.
     /// </param>
     [JsonIgnore]
     public EmailTemplateQuery? EmailTemplateQuery { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    [JsonIgnore]
+    public DateTime ChangedWhen { get; init; } = DateTime.Now;
 }

EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommandHandler.cs

@@ -0,0 +1,63 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Application.Exceptions;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Update;
+
+/// <summary>
+/// 
+/// </summary>
+public class UpdateEmailTemplateCommandHandler : IRequestHandler<UpdateEmailTemplateCommand>
+{
+    private readonly IRepository<EmailTemplate> _repository;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repository"></param>
+    public UpdateEmailTemplateCommandHandler(IRepository<EmailTemplate> repository)
+    {
+        _repository = repository;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    /// <exception cref="InvalidOperationException"></exception>
+    /// <exception cref="NotFoundException"></exception>
+    public async Task Handle(UpdateEmailTemplateCommand request, CancellationToken cancel)
+    {
+        EmailTemplateDto? temp;
+
+        if (request.EmailTemplateQuery?.Id is int id)
+        {
+            temp = await _repository.ReadOrDefaultAsync<EmailTemplateDto>(t => t.Id == id, single: false, cancel);
+        }
+        else if (request!.EmailTemplateQuery!.Type is Common.Constants.EmailTemplateType type)
+        {
+            temp = await _repository.ReadOrDefaultAsync<EmailTemplateDto>(t => t.Name == type.ToString(), single: false, cancel);
+        }
+        else
+        {
+            throw new InvalidOperationException("Both id and type is null. Id: " + request.EmailTemplateQuery.Id +". Type: " + request.EmailTemplateQuery.Type.ToString());
+        }
+
+        if (temp == null)
+        {
+            throw new NotFoundException();
+        }
+
+        if (request.Body is not null)
+            temp.Body = request.Body;
+
+        if (request.Subject is not null)
+            temp.Subject = request.Subject;
+
+        await _repository.UpdateAsync(temp, t => t.Id == temp.Id, cancel);
+    }
+}

EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateMappingProfile.cs

@@ -0,0 +1,23 @@
+using AutoMapper;
+using EnvelopeGenerator.Domain.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadEmailTemplateMappingProfile : Profile
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public ReadEmailTemplateMappingProfile()
+    {
+        CreateMap<EmailTemplate, ReadEmailTemplateResponse>();
+    }
+}

EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateQuery.cs

@@ -1,10 +1,12 @@
-namespace EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
 
 
 /// <summary>
 /// Stellt eine Abfrage dar, um eine E-Mail-Vorlage zu lesen.
 /// Diese Klasse erbt von <see cref="EmailTemplateQuery"/>.
 /// </summary>
-public record ReadEmailTemplateQuery : EmailTemplateQuery
+public record ReadEmailTemplateQuery : EmailTemplateQuery, IRequest<ReadEmailTemplateResponse?>
 {
 }

EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateQueryHandler.cs

@@ -0,0 +1,52 @@
+using AutoMapper;
+using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Common;
+using MediatR;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+
+namespace EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQuery, ReadEmailTemplateResponse?>
+{
+    private readonly IMapper _mapper;
+
+    private readonly IEmailTemplateRepository _repository;
+
+    /// <summary>
+    /// Initialisiert eine neue Instanz der <see cref="EmailTemplateController"/>-Klasse.
+    /// </summary>
+    /// <param name="mapper">
+    /// <param name="repository">
+    /// Die AutoMapper-Instanz, die zum Zuordnen von Objekten verwendet wird.
+    /// </param>
+    public ReadEmailTemplateQueryHandler(IMapper mapper, IEmailTemplateRepository repository)
+    {
+        _mapper = mapper;
+        _repository = repository;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    /// <exception cref="InvalidOperationException"></exception>
+    public async Task<ReadEmailTemplateResponse?> Handle(ReadEmailTemplateQuery request, CancellationToken cancellationToken)
+    {
+        var temp = request.Id is int id
+            ? await _repository.ReadByIdAsync(id)
+            : request.Type is Constants.EmailTemplateType type
+                ? await _repository.ReadByNameAsync(type)
+                : throw new InvalidOperationException("Either a valid integer ID or a valid EmailTemplateType must be provided in the request.");
+
+        var res = _mapper.Map<ReadEmailTemplateResponse>(temp);
+
+        return res;
+    }
+}

EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateResponse.cs

@@ -3,18 +3,35 @@
 /// <summary>
 /// Stellt die Antwort für eine Abfrage von E-Mail-Vorlagen bereit.
 /// </summary>
-/// <param name="Id">Die eindeutige Kennung der E-Mail-Vorlage.</param>
+public class ReadEmailTemplateResponse
-/// <param name="Type">Der Typ der E-Mail-Vorlage.</param>
-/// <param name="AddedWhen">Das Datum und die Uhrzeit, wann die Vorlage hinzugefügt wurde.</param>
-/// <param name="Body">Der Inhalt (Body) der E-Mail-Vorlage. Kann null sein.</param>
-/// <param name="Subject">Der Betreff der E-Mail-Vorlage. Kann null sein.</param>
-/// <param name="ChangedWhen">Das Datum und die Uhrzeit, wann die Vorlage zuletzt geändert wurde. Kann null sein.</param>
-public record ReadEmailTemplateResponse(
-    int Id,
-    int Type,
-    DateTime AddedWhen,
-    string? Body = null,
-    string? Subject = null,
-    DateTime? ChangedWhen = null)
 {
+    /// <summary>
+    /// Die eindeutige Kennung der E-Mail-Vorlage.
+    /// </summary>
+    public int Id { get; set; }
+
+    /// <summary>
+    /// Name des Typs
+    /// </summary>
+    public required string Name { get; set; }
+
+    /// <summary>
+    /// Das Datum und die Uhrzeit, wann die Vorlage hinzugefügt wurde.
+    /// </summary>
+    public DateTime AddedWhen { get; set; }
+
+    /// <summary>
+    /// Der Inhalt (Body) der E-Mail-Vorlage. Kann null sein.
+    /// </summary>
+    public string? Body { get; set; }
+
+    /// <summary>
+    /// Der Betreff der E-Mail-Vorlage. Kann null sein.
+    /// </summary>
+    public string? Subject { get; set; }
+
+    /// <summary>
+    /// Das Datum und die Uhrzeit, wann die Vorlage zuletzt geändert wurde. Kann null sein.
+    /// </summary>
+    public DateTime? ChangedWhen { get; set; }
 }

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -13,13 +13,16 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.3" />
+		<PackageReference Include="Dapper" Version="2.1.66" />
+		<PackageReference Include="DigitalData.Core.Abstractions" Version="3.6.0" />
 		<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.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.Data.SqlClient" Version="5.1.1" />
+		<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
 		<PackageReference Include="Otp.NET" Version="1.4.0" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
@@ -28,6 +31,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<ProjectReference Include="..\EnvelopeGenerator.Common\EnvelopeGenerator.Common.vbproj" />
 		<ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
 		<ProjectReference Include="..\EnvelopeGenerator.Extensions\EnvelopeGenerator.Extensions.csproj" />
 	</ItemGroup>

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/Create/CreateEnvelopeReceiverCommand.cs

@@ -1,4 +1,5 @@
-using MediatR;
+using EnvelopeGenerator.Application.Envelopes.Commands;
+using MediatR;
 using System.ComponentModel.DataAnnotations;
 
 namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands.Create;
@@ -17,43 +18,4 @@ public record CreateEnvelopeReceiverCommand(
     [Required] DocumentCreateCommand Document,
     [Required] IEnumerable<ReceiverGetOrCreateCommand> Receivers,
     bool TFAEnabled = false
-    ) : IRequest;
+    ) : CreateEnvelopeCommand(Title, Message, TFAEnabled), IRequest<CreateEnvelopeReceiverResponse?>;
-
-#region DTOs
-/// <summary>
-/// Signaturposition auf einem Dokument.
-/// </summary>
-/// <param name="X">X-Position</param>
-/// <param name="Y">Y-Position</param>
-/// <param name="Page">Seite, auf der sie sich befindet</param>
-public record Signature([Required] int X, [Required] int Y, [Required] int Page);
-
-/// <summary>
-/// DTO für Empfänger, die erstellt oder abgerufen werden sollen.
-/// Wenn nicht, wird sie erstellt und mit einer Signatur versehen.
-/// </summary>
-/// <param name="Signatures">Unterschriften auf Dokumenten.</param>
-/// <param name="Salution">Der Name, mit dem der Empfänger angesprochen werden soll. Bei Null oder keinem Wert wird der zuletzt verwendete Name verwendet.</param>
-/// <param name="PhoneNumber">Sollte mit Vorwahl geschrieben werden</param>
-public record ReceiverGetOrCreateCommand([Required] IEnumerable<Signature> Signatures, string? Salution = null, string? PhoneNumber = null)
-{
-    private string _emailAddress = string.Empty;
-
-    /// <summary>
-    /// E-Mail-Adresse des Empfängers.
-    /// </summary>
-    [Required]
-    public required string EmailAddress { get => _emailAddress.ToLower(); init => _emailAddress = _emailAddress.ToLower(); }
-};
-
-/// <summary>
-/// DTO zum Erstellen eines Dokuments.
-/// </summary>
-/// <param name="DataAsByte">
-/// Die Dokumentdaten im Byte-Array-Format. Wird verwendet, wenn das Dokument als Roh-Binärdaten bereitgestellt wird.
-/// </param>
-/// <param name="DataAsBase64">
-/// Die Dokumentdaten im Base64-String-Format. Wird verwendet, wenn das Dokument als Base64-codierter String bereitgestellt wird.
-/// </param>
-public record DocumentCreateCommand(byte[]? DataAsByte = null, string? DataAsBase64 = null);
-#endregion

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/Create/CreateEnvelopeReceiverCommandHandler.cs

@@ -0,0 +1,67 @@
+using AutoMapper;
+using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands.Create;
+
+/// <summary>
+/// Handles the creation of an envelope along with its associated document and recipients.
+/// This command processes the envelope data, including title, message, document content,
+/// recipient list, and optional two-factor authentication settings.
+/// </summary>
+public class CreateEnvelopeReceiverCommandHandler : IRequestHandler<CreateEnvelopeReceiverCommand, CreateEnvelopeReceiverResponse>
+{
+    private readonly IMapper _mapper;
+
+    private readonly IEnvelopeExecutor _envelopeExecutor;
+
+    private readonly IEnvelopeReceiverExecutor _erExecutor;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="mapper"></param>
+    /// <param name="envelopeExecutor"></param>
+    /// <param name="erExecutor"></param>
+    public CreateEnvelopeReceiverCommandHandler(IMapper mapper, IEnvelopeExecutor envelopeExecutor, IEnvelopeReceiverExecutor erExecutor)
+    {
+        _mapper = mapper;
+        _envelopeExecutor = envelopeExecutor;
+        _erExecutor = erExecutor;
+    }
+
+    /// <summary>
+    /// Handles the execution of the <see cref="CreateEnvelopeReceiverCommand"/>.
+    /// Responsible for validating input data, creating or retrieving recipients, associating signatures,
+    /// and storing the envelope and document details.
+    /// </summary>
+    /// <param name="request">The command containing all necessary information to create an envelope.</param>
+    /// <param name="cancel">Token to observe while waiting for the task to complete.</param>
+    /// <returns>A task representing the asynchronous operation.</returns>
+    public async Task<CreateEnvelopeReceiverResponse> Handle(CreateEnvelopeReceiverCommand request, CancellationToken cancel)
+    {
+        int userId = request.UserId ?? throw new InvalidOperationException("UserId cannot be null when creating an envelope.");
+
+        var envelope = await _envelopeExecutor.CreateEnvelopeAsync(userId, request.Title, request.Message, request.TFAEnabled, cancel);
+
+        List<EnvelopeReceiver> sentRecipients = new();
+        List<ReceiverGetOrCreateCommand> unsentRecipients = new();
+
+        foreach (var receiver in request.Receivers)
+        {
+            var envelopeReceiver = await _erExecutor.AddEnvelopeReceiverAsync(envelope.Uuid, receiver.EmailAddress, receiver.Salution, receiver.PhoneNumber, cancel);
+
+            if (envelopeReceiver is null)
+                unsentRecipients.Add(receiver);
+            else
+                sentRecipients.Add(envelopeReceiver);
+        }
+
+        var res = _mapper.Map<CreateEnvelopeReceiverResponse>(envelope);
+        res.UnsentReceivers = unsentRecipients;
+        res.SentReceiver = _mapper.Map<IEnumerable<ReceiverReadDto>>(sentRecipients);
+        return res;
+    }
+}

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/Create/CreateEnvelopeReceiverDtos.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands.Create;
+
+#region DTOs
+/// <summary>
+/// Signaturposition auf einem Dokument.
+/// </summary>
+/// <param name="X">X-Position</param>
+/// <param name="Y">Y-Position</param>
+/// <param name="Page">Seite, auf der sie sich befindet</param>
+public record Signature([Required] double X, [Required] double Y, [Required] int Page);
+
+/// <summary>
+/// DTO für Empfänger, die erstellt oder abgerufen werden sollen.
+/// Wenn nicht, wird sie erstellt und mit einer Signatur versehen.
+/// </summary>
+/// <param name="Signatures">Unterschriften auf Dokumenten.</param>
+/// <param name="Salution">Der Name, mit dem der Empfänger angesprochen werden soll. Bei Null oder keinem Wert wird der zuletzt verwendete Name verwendet.</param>
+/// <param name="PhoneNumber">Sollte mit Vorwahl geschrieben werden</param>
+public record ReceiverGetOrCreateCommand([Required] IEnumerable<Signature> Signatures, string? Salution = null, string? PhoneNumber = null)
+{
+    private string _emailAddress = string.Empty;
+
+    /// <summary>
+    /// E-Mail-Adresse des Empfängers.
+    /// </summary>
+    [Required]
+    public string EmailAddress { get => _emailAddress.ToLower(); init => _emailAddress = value.ToLower(); }
+};
+
+/// <summary>
+/// DTO zum Erstellen eines Dokuments.
+/// </summary>
+public record DocumentCreateCommand()
+{
+    /// <summary>
+    /// Die Dokumentdaten im Base64-String-Format. Wird verwendet, wenn das Dokument als Base64-codierter String bereitgestellt wird.
+    /// </summary>
+    [Required]
+    public required string DataAsBase64 { get; init; }
+};
+#endregion

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/Create/CreateEnvelopeReceiverMappingProfile.cs

@@ -0,0 +1,21 @@
+using AutoMapper;
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Application.Envelopes.Commands;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands.Create;
+
+/// <summary>
+/// 
+/// </summary>
+public class CreateEnvelopeReceiverMappingProfile : Profile
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public CreateEnvelopeReceiverMappingProfile()
+    {
+        CreateMap<Envelope, CreateEnvelopeResponse>();
+        CreateMap<Receiver, ReceiverReadDto>();
+    }
+}

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/Create/CreateEnvelopeReceiverResponse.cs

@@ -0,0 +1,39 @@
+using DigitalData.UserManager.Domain.Entities;
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Application.Envelopes.Commands;
+
+namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands.Create;
+
+/// <summary>
+/// 
+/// </summary>
+public record CreateEnvelopeReceiverResponse : CreateEnvelopeResponse
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="Id"></param>
+    /// <param name="UserId"></param>
+    /// <param name="Status"></param>
+    /// <param name="Uuid"></param>
+    /// <param name="Message"></param>
+    /// <param name="AddedWhen"></param>
+    /// <param name="ChangedWhen"></param>
+    /// <param name="Title"></param>
+    /// <param name="Language"></param>
+    /// <param name="TFAEnabled"></param>
+    /// <param name="User"></param>
+    public CreateEnvelopeReceiverResponse(int Id, int UserId, int Status, string Uuid, string? Message, DateTime AddedWhen, DateTime? ChangedWhen, string? Title, string Language, bool TFAEnabled, User User) : base(Id, UserId, Status, Uuid, Message, AddedWhen, ChangedWhen, Title, Language, TFAEnabled, User)
+    {
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public IEnumerable<ReceiverReadDto> SentReceiver { get; set; } = new List<ReceiverReadDto>();
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public IEnumerable<ReceiverGetOrCreateCommand> UnsentReceivers { get; set; } = new List<ReceiverGetOrCreateCommand>();
+}

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs

@@ -0,0 +1,26 @@
+using MediatR;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
+
+namespace EnvelopeGenerator.Application.Envelopes.Commands;
+
+/// <summary>
+/// Befehl zur Erstellung eines Umschlags.
+/// </summary>
+/// <param name="Title">Der Titel des Umschlags. Dies ist ein Pflichtfeld.</param>
+/// <param name="Message">Die Nachricht, die im Umschlag enthalten sein soll. Dies ist ein Pflichtfeld.</param>
+/// <param name="TFAEnabled">Gibt an, ob die Zwei-Faktor-Authentifizierung für den Umschlag aktiviert ist. Standardmäßig false.</param>
+public record CreateEnvelopeCommand(
+    [Required] string Title,
+    [Required] string Message,
+    bool TFAEnabled = false
+    ) : IRequest<CreateEnvelopeResponse?>
+{
+    /// <summary>
+    /// Id of receiver
+    /// </summary>
+    [JsonIgnore]
+    [BindNever]
+    public int? UserId { get; set; }
+};

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs

@@ -0,0 +1,41 @@
+using AutoMapper;
+using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Envelopes.Commands;
+
+/// <summary>
+/// 
+/// </summary>
+public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeCommand, CreateEnvelopeResponse?>
+{
+    private readonly IEnvelopeExecutor _envelopeExecutor;
+
+    private readonly IMapper _mapper;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="envelopeExecutor"></param>
+    /// <param name="mapper"></param>
+    public CreateEnvelopeCommandHandler(IEnvelopeExecutor envelopeExecutor, IMapper mapper)
+    {
+        _envelopeExecutor = envelopeExecutor;
+        _mapper = mapper;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public async Task<CreateEnvelopeResponse?> Handle(CreateEnvelopeCommand request, CancellationToken cancellationToken)
+    {
+        int userId = request.UserId ?? throw new InvalidOperationException("UserId cannot be null when creating an envelope.");
+
+        var envelope = await _envelopeExecutor.CreateEnvelopeAsync(userId, request.Title, request.Message, request.TFAEnabled, cancellationToken);
+
+        return _mapper.Map<CreateEnvelopeResponse>(envelope);
+    }
+}

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeMappingProfile.cs

@@ -0,0 +1,19 @@
+using AutoMapper;
+using EnvelopeGenerator.Application.EnvelopeReceivers.Commands.Create;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Envelopes.Commands;
+
+/// <summary>
+/// 
+/// </summary>
+public class CreateEnvelopeMappingProfile : Profile
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public CreateEnvelopeMappingProfile()
+    {
+        CreateMap<Envelope, CreateEnvelopeReceiverResponse>();
+    }
+}

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeResponse.cs

@@ -0,0 +1,20 @@
+using EnvelopeGenerator.Application.Envelopes.Queries.Read;
+
+namespace EnvelopeGenerator.Application.Envelopes.Commands;
+
+/// <summary>
+/// 
+/// </summary>
+/// <param name="Id"><inheritdoc/></param>
+/// <param name="UserId"><inheritdoc/></param>
+/// <param name="Status"><inheritdoc/></param>
+/// <param name="Uuid"><inheritdoc/></param>
+/// <param name="Message"><inheritdoc/></param>
+/// <param name="AddedWhen"><inheritdoc/></param>
+/// <param name="ChangedWhen"><inheritdoc/></param>
+/// <param name="Title"><inheritdoc/></param>
+/// <param name="Language"><inheritdoc/></param>
+/// <param name="TFAEnabled"><inheritdoc/></param>
+/// <param name="User"><inheritdoc/></param>
+public record CreateEnvelopeResponse(int Id, int UserId, int Status, string Uuid, string? Message, DateTime AddedWhen, DateTime? ChangedWhen, string? Title, string Language, bool TFAEnabled, DigitalData.UserManager.Domain.Entities.User User) 
+    : ReadEnvelopeResponse(Id, UserId, Status, Uuid, Message, AddedWhen, ChangedWhen, Title, Language, TFAEnabled, User);

EnvelopeGenerator.Application/Envelopes/Queries/ReceiverName/ReadReceiverNameQuery.cs

@@ -6,8 +6,6 @@ namespace EnvelopeGenerator.Application.Envelopes.Queries.ReceiverName;
 /// Eine Abfrage, um die zuletzt verwendete Anrede eines Empfängers zu ermitteln, 
 /// damit diese für zukünftige Umschläge wiederverwendet werden kann.
 /// </summary>
-/// <param name="Envelope">Der Umschlag, für den die Anrede des Empfängers ermittelt werden soll.</param>
+public record ReadReceiverNameQuery() : ReadReceiverQuery
-/// <param name="OnlyLast">Gibt an, ob nur die zuletzt verwendete Anrede zurückgegeben werden soll.</param>
-public record ReadReceiverNameQuery(EnvelopeQuery? Envelope = null, bool OnlyLast = true) : ReadReceiverQuery
 {
 }

EnvelopeGenerator.Application/Exceptions/BadRequestException.cs

@@ -0,0 +1,22 @@
+namespace EnvelopeGenerator.Application.Exceptions;
+
+/// <summary>
+/// Represents an exception that is thrown when a bad request is encountered.
+/// </summary>
+public class BadRequestException : Exception
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BadRequestException"/> class.
+    /// </summary>
+    public BadRequestException()
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BadRequestException"/> class with a specified error message.
+    /// </summary>
+    /// <param name="message">The message that describes the error.</param>
+    public BadRequestException(string? message) : base(message)
+    {
+    }
+}

EnvelopeGenerator.Application/Exceptions/NotFoundException.cs

@@ -0,0 +1,22 @@
+namespace EnvelopeGenerator.Application.Exceptions;
+
+/// <summary>
+/// Represents an exception that is thrown when a requested resource is not found.
+/// </summary>
+public class NotFoundException : Exception
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="NotFoundException"/> class.
+    /// </summary>
+    public NotFoundException()
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="NotFoundException"/> class with a specified error message.
+    /// </summary>
+    /// <param name="message">The message that describes the error.</param>
+    public NotFoundException(string? message) : base(message)
+    {
+    }
+}

EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryMappingProfile.cs

@@ -0,0 +1,18 @@
+using AutoMapper;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Histories.Queries.Read;
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadHistoryMappingProfile: Profile
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public ReadHistoryMappingProfile()
+    {
+        CreateMap<EnvelopeHistory, ReadHistoryResponse>();
+    }
+}

EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryQuery.cs

@@ -1,20 +1,20 @@
-using EnvelopeGenerator.Application.Envelopes.Queries.Read;
+using EnvelopeGenerator.Common;
-using EnvelopeGenerator.Application.Receivers.Queries.Read;
+using MediatR;
-using EnvelopeGenerator.Common;
+using System.ComponentModel.DataAnnotations;
 
 namespace EnvelopeGenerator.Application.Histories.Queries.Read;
 
+//TODO: Add sender query
 /// <summary>
 /// Repräsentiert eine Abfrage für die Verlaufshistorie eines Umschlags.
 /// </summary>
 /// <param name="EnvelopeId">Die eindeutige Kennung des Umschlags.</param>
-/// <param name="Envelope">Die Abfrage, die den Umschlag beschreibt.</param>
+/// <param name="Status">Der Status des Umschlags, der abgefragt werden soll. Kann optional angegeben werden, um die Ergebnisse zu filtern.</param>
-/// <param name="Receiver">Die Abfrage, die den Empfänger beschreibt.</param>
-/// <param name="Related">Abfrage, die angibt, worauf sich der Datensatz bezieht. Ob er sich auf den Empfänger, den Sender oder das System bezieht, wird durch 0, 1 bzw. 2 dargestellt.</param>
 /// <param name="OnlyLast">Abfrage zur Steuerung, ob nur der aktuelle Status oder der gesamte Datensatz zurückgegeben wird.</param>
 public record ReadHistoryQuery(
+    [Required]
     int EnvelopeId,
-    ReadEnvelopeQuery? Envelope = null,
+    Constants.EnvelopeStatus? Status = null,
-    ReadReceiverQuery? Receiver = null,
+    bool? OnlyLast = true) : IRequest<IEnumerable<ReadHistoryResponse>>
-    Constants.ReferenceType? Related = null,
+{
-    bool? OnlyLast = true);
+};

EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryQueryHandler.cs

@@ -0,0 +1,44 @@
+using AutoMapper;
+using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.Exceptions;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Histories.Queries.Read;
+
+/// <summary>
+/// 
+/// </summary>
+public class ReadHistoryQueryHandler : IRequestHandler<ReadHistoryQuery, IEnumerable<ReadHistoryResponse>>
+{
+    private readonly IEnvelopeHistoryRepository _repository;
+
+    private readonly IMapper _mapper;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="repository"></param>
+    /// <param name="mapper"></param>
+    public ReadHistoryQueryHandler(IEnvelopeHistoryRepository repository, IMapper mapper)
+    {
+        _repository = repository;
+        _mapper = mapper;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    /// <exception cref="NotFoundException"></exception>
+    public async Task<IEnumerable<ReadHistoryResponse>> Handle(ReadHistoryQuery request, CancellationToken cancellationToken)
+    {
+        var hists = await _repository.ReadAsync(request.EnvelopeId, status: request.Status is null ? null : (int) request.Status);
+
+        if (!hists.Any())
+            throw new NotFoundException();
+                
+        return _mapper.Map<IEnumerable<ReadHistoryResponse>>(hists);
+    }
+}

EnvelopeGenerator.Application/Histories/Queries/Read/ReadHistoryResponse.cs

@@ -0,0 +1,60 @@
+using EnvelopeGenerator.Common;
+
+namespace EnvelopeGenerator.Application.Histories.Queries.Read;
+
+/// <summary>
+/// Represents the history of an envelope, including its status, user actions, and references.
+/// </summary>
+public class ReadHistoryResponse
+{
+    /// <summary>
+    /// Gets or sets the unique identifier of the envelope history record.
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the identifier of the associated envelope.
+    /// </summary>
+    public int EnvelopeId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the reference identifier of the user who performed the action.
+    /// </summary>
+    public string UserReference { get; set; }
+
+    /// <summary>
+    /// Gets or sets the status code of the envelope.
+    /// </summary>
+    public int Status { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public Common.Constants.ReferenceType ReferenceType => Status.ToString().FirstOrDefault() switch
+    {
+        '1' => Constants.ReferenceType.Sender,
+        '2' => Constants.ReferenceType.Receiver,
+        _ => Constants.ReferenceType.System,
+    };
+
+    /// <summary>
+    /// Gets or sets the date and time when the record was added.
+    /// </summary>
+    public DateTime AddedWhen { get; set; }
+
+    /// <summary>
+    /// Gets or sets the date and time when the action occurred.
+    /// </summary>
+    public DateTime? ActionDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the optional comment about the envelope history record.
+    /// </summary>
+    public string? Comment { get; set; }
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        return Id.GetHashCode();
+    }
+}

EnvelopeGenerator.Application/SQL/DocumentCreateReadSQL.cs

@@ -0,0 +1,50 @@
+using Dapper;
+using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Exceptions;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.SQL;
+
+/// <summary>
+/// 
+/// </summary>
+public class DocumentCreateReadSQL : ISQL<EnvelopeDocument>
+{
+    /// <summary>
+    /// Base64, OUT_UID
+    /// </summary>
+    public string Raw => @"
+        DECLARE @BYTE_DATA1 as VARBINARY(MAX)
+        SET @BYTE_DATA1 = @ByteData
+        DECLARE	@OUT_DOCID int
+
+        EXEC	[dbo].[PRSIG_API_ADD_DOC]
+		        {0},
+		        @BYTE_DATA1,
+		        @OUT_DOCID OUTPUT
+
+        SELECT TOP(1) *
+          FROM [dbo].[TBSIG_ENVELOPE_DOCUMENT]
+          WHERE [GUID] = @OUT_DOCID
+    ";
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="base64"></param>
+    /// <returns></returns>
+    public static DynamicParameters CreateParmas(string base64)
+    {
+        try
+        {
+            var parameters = new DynamicParameters();
+            byte[] byteData = Convert.FromBase64String(base64);
+            parameters.Add("ByteData", byteData, System.Data.DbType.Binary);
+            return parameters;
+        }
+        catch(FormatException ex)
+        {
+            throw new BadRequestException(ex.Message.Replace("input", "dataAsBase64"));
+        }
+    }
+}

EnvelopeGenerator.Application/SQL/EnvelopeCreateReadSQL.cs

@@ -0,0 +1,49 @@
+using Dapper;
+using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Domain.Entities;
+using System.Data;
+
+namespace EnvelopeGenerator.Application.SQL;
+
+/// <summary>
+/// 
+/// </summary>
+public class EnvelopeCreateReadSQL : ISQL<Envelope>
+{
+    /// <summary>
+    /// USER_ID, TITLE, TFAEnabled, MESSAGE
+    /// </summary>
+    public string Raw => @"
+        DECLARE @OUT_UID varchar(36);
+
+        EXEC [dbo].[PRSIG_API_CREATE_ENVELOPE]
+            {0},
+            {1},
+            {2},
+            {3},
+            @OUT_UID OUTPUT;
+
+        SELECT TOP(1) *
+        FROM [dbo].[TBSIG_ENVELOPE]
+        WHERE [ENVELOPE_UUID] = @OUT_UID;
+    ";
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <param name="title"></param>
+    /// <param name="message"></param>
+    /// <param name="tfaEnabled"></param>
+    /// <returns></returns>
+    public static DynamicParameters CreateParams(int userId, string title = "", string message = "", bool tfaEnabled = false)
+    {
+        var parameters = new DynamicParameters();
+        parameters.Add("@UserId", userId);
+        parameters.Add("@Title", title);
+        parameters.Add("@TfaEnabled", tfaEnabled ? 1 : 0);
+        parameters.Add("@Message", message);
+        parameters.Add("@OutUid", dbType: DbType.String, size: 36, direction: ParameterDirection.Output);
+        return parameters;
+    }
+}

EnvelopeGenerator.Application/SQL/EnvelopeReceiverAddReadSQL.cs

@@ -0,0 +1,47 @@
+using Dapper;
+using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.SQL;
+
+/// <summary>
+/// 
+/// </summary>
+public class EnvelopeReceiverAddReadSQL : ISQL<Envelope>
+{
+    /// <summary>
+    /// ENV_UID, EMAIL_ADRESS, SALUTATION, PHONE, 
+    /// </summary>
+    public string Raw => @"
+		DECLARE	@OUT_RECEIVER_ID int
+
+		EXEC	[dbo].[PRSIG_API_CREATE_RECEIVER]
+				{0},
+				{1},
+				{2},
+				{3},
+				@OUT_RECEIVER_ID OUTPUT
+
+        SELECT TOP(1) [ENVELOPE_ID] As EnvelopeId, [RECEIVER_ID] As ReceiverId
+        FROM [dbo].[TBSIG_ENVELOPE_RECEIVER]
+		WHERE [GUID] = @OUT_RECEIVER_ID;
+	";
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="envelope_uuid"></param>
+    /// <param name="emailAddress"></param>
+    /// <param name="salutation"></param>
+    /// <param name="phone"></param>
+    /// <returns></returns>
+    public static DynamicParameters CreateParameters(string envelope_uuid, string emailAddress, string? salutation = null, string? phone = null)
+    {
+        var parameters = new DynamicParameters();
+        parameters.Add("@ENV_UID", envelope_uuid);
+        parameters.Add("@EMAIL_ADRESS", emailAddress);
+        parameters.Add("@SALUTATION", salutation);
+        parameters.Add("@PHONE", phone);
+        return parameters;
+    }
+}

EnvelopeGenerator.Application/SQL/ParamsExtensions.cs

@@ -0,0 +1,30 @@
+using System.Globalization;
+
+namespace EnvelopeGenerator.Application.SQL;
+
+/// <summary>
+/// Extension method for converting objects to SQL parameter strings.
+/// </summary>
+public static class ParamsExtensions
+{
+    /// <summary>
+    /// Converts a .NET object to its corresponding SQL-safe parameter string.
+    /// </summary>
+    /// <param name="obj">The object to convert.</param>
+    /// <returns>A string representing the SQL parameter.</returns>
+    public static string ToSqlParam(this object? obj)
+    {
+        if (obj is null)
+            return "NULL";
+        else if (obj is string strVal)
+            return $"'{strVal}'";
+        else if (obj is bool boolVal)
+            return boolVal ? "1" : "0";
+        else if (obj is double doubleVal)
+            return $"'{doubleVal.ToString(CultureInfo.InvariantCulture)}'";
+        else if (obj is int intVal)
+            return intVal.ToString();
+        else
+            throw new NotSupportedException($"Type '{obj.GetType().FullName}' is not supported for SQL parameter conversion.");
+    }
+}

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -57,7 +57,7 @@ namespace EnvelopeGenerator.Application.Services
         {
             if (readOnlyDto?.Envelope is not null && readOnlyDto.Receiver is not null)
             {
-                _placeholders["[NAME_RECEIVER]"] = await _envRcvService.ReadLastUsedReceiverNameByMail(readOnlyDto.AddedWho).ThenAsync(res => res, (msg, ntc) => string.Empty) ?? string.Empty;
+                _placeholders["[NAME_RECEIVER]"] = await _envRcvService.ReadLastUsedReceiverNameByMailAsync(readOnlyDto.AddedWho).ThenAsync(res => res, (msg, ntc) => string.Empty) ?? string.Empty;
                 var erReadOnlyId = (readOnlyDto.Id).EncodeEnvelopeReceiverId();
                 var sigHost = await _configService.ReadDefaultSignatureHost();
                 var linkToDoc = $"{sigHost}/EnvelopeKey/{erReadOnlyId}";

EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs

@@ -10,6 +10,8 @@ using Microsoft.Extensions.Logging;
 using EnvelopeGenerator.Extensions;
 using EnvelopeGenerator.Application.DTOs.Messaging;
 using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Envelopes;
+using EnvelopeGenerator.Application.Receivers.Queries.Read;
 
 namespace EnvelopeGenerator.Application.Services;
 
@@ -137,16 +139,32 @@ public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverReposit
             : Result.Success(code);
 		}
 
-    public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses)
+    public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, EnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params int[] ignore_statuses)
     {
         var er_list = await _repository.ReadByUsernameAsync(username: username, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses);
+        
+        if(envelopeQuery?.Id is int eId)
+            er_list = er_list.Where(er => er.EnvelopeId == eId);
+
+        if (envelopeQuery?.Uuid is string uuid)
+            er_list = er_list.Where(er => er.Envelope?.Uuid == uuid);
+
+        if (envelopeQuery?.Status is int status)
+            er_list = er_list.Where(er => er.Envelope?.Status == status);
+
+        if(receiverQuery?.Id is int id)
+            er_list = er_list.Where(er => er.Receiver?.Id == id);
+
+        if (receiverQuery?.Signature is string signature)
+            er_list = er_list.Where(er => er.Receiver?.Signature == signature);
+
         var dto_list = _mapper.Map<IEnumerable<EnvelopeReceiverDto>>(er_list);
         return Result.Success(dto_list);
     }
 
-    public async Task<DataResult<string?>> ReadLastUsedReceiverNameByMail(string mail)
+    public async Task<DataResult<string?>> ReadLastUsedReceiverNameByMailAsync(string? mail = null, int? id = null, string? signature = null)
     {
-        var er = await _repository.ReadLastByReceiver(mail);
+        var er = await _repository.ReadLastByReceiverAsync(mail, id, signature);
         return er is null ? Result.Fail<string?>().Notice(LogLevel.None, Flag.NotFound) : Result.Success(er.Name);
     }
 

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -4,6 +4,7 @@ Imports GdPicture14
 Imports Newtonsoft.Json.Linq
 Imports EnvelopeGenerator.Common.Jobs
 Imports System.IO
+Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument
 
 Public Class frmFinalizePDF
     Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;"
@@ -15,14 +16,14 @@ Public Class frmFinalizePDF
     Private Manager As AnnotationManager
     Private PDFBurner As FinalizeDocument.PDFBurner
     Private pGDPictureLicenseKey As String = "kG1Qf9PwmqgR8aDmIW2zI_ebj48RzqAJegRxcystEmkbTGQqfkNBdFOXIb6C_A00Ra8zZkrHdfjqzOPXK7kgkF2YDhvrqKfqh4WDug2vOt0qO31IommzkANSuLjZ4zmraoubyEVd25rE3veQ2h_j7tGIoH_LyIHmy24GaXsxdG0yCzIBMdiLbMMMDwcPY-809KeZ83Grv76OVhFvcbBWyYc251vou1N-kGg5_ZlHDgfWoY85gTLRxafjD3KS_i9ARW4BMiy36y8n7UP2jN8kGRnW_04ubpFtfjJqvtsrP_J9D0x7bqV8xtVtT5JI6dpKsVTiMgDCrIcoFSo5gCC1fw9oUopX4TDCkBQttO4-WHBlOeq9dG5Yb0otonVmJKaQA2tP6sMR-lZDs3ql_WI9t91yPWgpssrJUxSHDd27_LMTH_owJIqkF3NOJd9mYQuAv22oNKFYbH8e41pVKb8cT33Y9CgcQ_sy6YDA5PTuIRi67mjKge_nD9rd0IN213Ir9M_EFWqg9e4haWzIdHXQUo0md70kVhPX4UIH_BKJnxEEnFfoFRNMh77bB0N4jkcBEHPl-ghOERv8dOztf4vCnNpzzWvcLD2cqWIm6THy8XGGq9h4hp8aEreRleSMwv9QQAC7mjLwhQ1rBYkpUHlpTjhTLnMwHknl6HH0Z6zzmsgkRKVyfquv94Pd7QbQfZrRka0ss_48pf9p8hAywEn81Q=="
-    Private ReadOnly _ignoredLabels As New List(Of String) From {"Date", "Datum", "ZIP", "PLZ", "Place", "Ort", "Position", "Stellung"}
+    Private ReadOnly _pdfBurnerParams As New PDFBurnerParams()
 
     Private Sub frmFinalizePDF_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Application.StartupPath)
         Database = New MSSQLServer(LogConfig, MSSQLServer.DecryptConnectionString(CONNECTIONSTRING))
 
 
-        PDFBurner = New FinalizeDocument.PDFBurner(LogConfig, pGDPictureLicenseKey, _ignoredLabels)
+        PDFBurner = New FinalizeDocument.PDFBurner(LogConfig, pGDPictureLicenseKey, _pdfBurnerParams)
 
         Viewer = New GdViewer()
         Manager = New AnnotationManager()

EnvelopeGenerator.Common/Constants.vb

@@ -20,8 +20,7 @@
         AccessCodeIncorrect = 2003
         DocumentOpened = 2004
         DocumentSigned = 2005
-        DocumentForwarded = 4001
+        DocumentForwarded = 2006
-        SignatureConfirmed = 2006
         DocumentRejected = 2007
         EnvelopeShared = 2008
         EnvelopeViewed = 2009
@@ -33,10 +32,24 @@
         DocumentMod_Rotation = 4001
     End Enum
 
+    Public Class Status
+        Public Shared ReadOnly NonHist As IReadOnlyList(Of EnvelopeStatus) = New List(Of EnvelopeStatus) From {
+            EnvelopeStatus.Invalid,
+            EnvelopeStatus.EnvelopeSaved,
+            EnvelopeStatus.EnvelopeSent,
+            EnvelopeStatus.EnvelopePartlySigned
+        }
+
+        Public Shared ReadOnly RelatedToFormApp As IReadOnlyList(Of EnvelopeStatus) = New List(Of EnvelopeStatus) From {
+            EnvelopeStatus.EnvelopeCreated,
+            EnvelopeStatus.DocumentMod_Rotation
+        }
+    End Class
+
     'TODO: standardize in xwiki
     Public Enum ReferenceType
-        Receiver = 0
+        Sender = 1
-        Sender
+        Receiver
         System
         Unknown
     End Enum
@@ -130,7 +143,7 @@
     Public Const DATABASE = "DATABASE"
     Public Const LOGCONFIG = "LOGCONFIG"
     Public Const GDPICTURE = "GDPICTURE"
-    Public Const IGNORED_LABELS = "IgnoredLabels"
+    Public Const PDF_BURNER_PARAMS = "PDFBurnerParams"
 
     Public Const GREEN_300 = "#bbf7d0"
     Public Const RED_300 = "#fecaca"

EnvelopeGenerator.Common/Entities/EmailData.vb

@@ -19,6 +19,7 @@ Public Class EmailData
     Public Property EmailAttachment As String = ""
     Public Property ATT1_RELATED_ID As Long
     Public Property ATT1_REL_TYPE As String = ""
+    Public Property ADDED_WHO_PROCESS As String = "DDEnvelopGenerator"
 
     ''' <summary>
     ''' Constructor for sending email to receiver

EnvelopeGenerator.Common/Entities/Envelope.vb

@@ -25,6 +25,7 @@
     Public Property Message As String = My.Resources.Envelope.Please_read_and_sign_this_document
 
     Public Property AddedWhen As Date
+    Public Property ChangedWhen As Date
     Public Property User As New User()
 
     Public Property Documents As New List(Of EnvelopeDocument)
@@ -32,6 +33,7 @@
     Public Property History As New List(Of EnvelopeHistoryEntry)
     Public Property EnvelopeType As EnvelopeType
     Public Property DOC_RESULT As Byte()
+    Public Property CURRENT_WORK_APP As String = "signFLOW GUI"
     Public ReadOnly Property EnvelopeTypeTitle As String
         Get
             Return EnvelopeType?.Title

EnvelopeGenerator.Common/Entities/User.vb

@@ -8,6 +8,7 @@
 
     Public Property HasAccess As Boolean
     Public Property IsAdmin As Boolean
+    Public Property GhostModeActive As Boolean
 
     Public ReadOnly Property FullName() As String
         Get

EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj

@@ -281,6 +281,8 @@
     <Compile Include="Entities\ElementStatus.vb" />
     <Compile Include="Entities\EmailData.vb" />
     <Compile Include="Entities\EmailTemplate.vb" />
+    <Compile Include="Jobs\APIBackendJobs\APIEnvelopeJob.vb" />
+    <Compile Include="Jobs\FinalizeDocument\PDFBurnerParams.vb" />
     <Compile Include="Services\TemplateService.vb" />
     <Compile Include="Entities\Envelope.vb" />
     <Compile Include="Entities\EnvelopeDocument.vb" />

EnvelopeGenerator.Common/Helpers.vb

@@ -52,6 +52,7 @@ Public Class Helpers
     End Function
 
     Public Shared Function GetEnvelopeURL(pHost As String, pEnvelopeUuid As String, pReceiverSignature As String) As String
+
         Dim oEnvelopeUserReference As String = EncodeEnvelopeReceiverId(pEnvelopeUuid, pReceiverSignature)
         Dim oURL As String = String.Format("{0}/EnvelopeKey/{1}", pHost.Trim(), oEnvelopeUserReference)
         Return oURL

EnvelopeGenerator.Common/Jobs/APIBackendJobs/APIEnvelopeJob.vb

@@ -0,0 +1,221 @@
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Base
+Imports GdPicture14
+Imports Quartz
+Imports System.Security.Cryptography
+Imports System.IO
+Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions
+Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument
+Imports EnvelopeGenerator.Common.Constants
+Imports DevExpress.DataProcessing
+Imports System.Data.SqlClient
+Imports DevExpress.XtraRichEdit.Layout.Engine
+
+Namespace Jobs
+    Public Class APIEnvelopeJob
+        Implements IJob
+
+
+        Private LogConfig As LogConfig
+        Private Logger As Logger
+        Private Database As MSSQLServer
+        Private Config As DbConfig
+
+        Private ConfigModel As ConfigModel
+        Private EnvelopeModel As EnvelopeModel
+        Private ReceiverModel As ReceiverModel
+        Private ActionService As ActionService
+
+
+        Private ReadOnly CompleteWaitTime As Integer = 1
+
+        Private myTempFiles As TempFiles
+
+        Private Class EnvelopeData
+            Public EnvelopeId As Integer
+            Public EnvelopeUUID As String
+            Public DocumentPath As String
+        End Class
+
+        Public Function Execute(pContext As IJobExecutionContext) As Task Implements IJob.Execute
+            LogConfig = pContext.MergedJobDataMap.Item(Constants.LOGCONFIG)
+            Logger = LogConfig.GetLogger()
+            myTempFiles = New TempFiles(LogConfig)
+            myTempFiles.Create()
+            Dim JobId = pContext.JobDetail.Key
+            Logger.Debug("API Envelopes - Starting job {0}", JobId)
+
+            Try
+                Logger.Debug("API Envelopes - Loading Database..")
+                Database = GetDatabase(pContext, LogConfig)
+
+                Logger.Debug("API Envelopes - Loading Models & Services")
+                Dim oState = GetState()
+                InitializeModels(oState)
+
+                Logger.Debug("API Envelopes - Loading Configuration..")
+                Config = ConfigModel.LoadConfiguration()
+                oState.DbConfig = Config
+
+                InitializeServices(oState)
+                Config.DocumentPath = Config.DocumentPath
+
+                Logger.Debug("API Envelopes - ExportPath: [{0}]", Config.ExportPath)
+
+                Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE where SOURCE = 'API' AND STATUS = 1003 order by guid"
+                Dim oDTEnv_invitations = Database.GetDatatable(oSql)
+
+                Dim oEnvelopeIds As List(Of Integer) = oDTEnv_invitations.Rows.Cast(Of DataRow).
+                    Select(Function(r) r.Item("GUID")).
+                    Cast(Of Integer).
+                    ToList()
+
+                If oEnvelopeIds.Count > 0 Then
+                    Logger.Info("SendInvMail - Found [{0}] envelopes.", oEnvelopeIds.Count)
+                End If
+
+                Dim oTotal As Integer = oEnvelopeIds.Count
+                Dim oCurrent As Integer = 1
+
+                For Each oId In oEnvelopeIds
+                    Logger.Info("SendInvMail - Gathering Info for Envelope [{0}] ({1}/{2})", oId, oCurrent, oTotal)
+                    Try
+                        Dim oEnvelope = EnvelopeModel.GetById(oId)
+
+                        If oEnvelope Is Nothing Then
+                            Logger.Warn("SendInvMail - Envelope could not be loaded for Id [{0}]!", oId)
+                            Throw New ArgumentNullException("EnvelopeData")
+                        End If
+                        oEnvelope.CURRENT_WORK_APP = "signFLOW_API_EnvJob_InvMail"
+                        Logger.Debug("SendInvMail - Loading Envelope Data..")
+                        Dim oEnvelopeData = GetEnvelopeData(oId)
+                        oEnvelope.Receivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id).ToList()
+                        Logger.Debug("SendInvMail - Created Reveivers!")
+                        If oEnvelopeData Is Nothing Then
+                            Logger.Warn("SendInvMail - EnvelopeData could not be loaded for Id [{0}]!", oId)
+                            Throw New ArgumentNullException("EnvelopeData")
+                        End If
+                        Logger.Info("SendInvMail - Sending InvitationMails for Envelope [{0}]", oId)
+                        If ActionService.SendEnvelope(oEnvelope) = False Then
+                            Logger.Warn("SendInvMail - Could not send the InvitationMails for Envelope [{0}]", oId)
+                            Throw New ArgumentNullException("EnvelopeData")
+                        End If
+                    Catch ex As Exception
+                        Logger.Warn(ex, $"SendInvMail - Unhandled exception while working envelope [{oId}]")
+                    End Try
+
+                    oCurrent += 1
+                    Logger.Info("SendInvMail - Envelope finalized!")
+
+                Next
+                'Hier nun der Teil um zurückgezogene Envelopes abzuarbeiten
+                oSql = $"SELECT ENV.GUID,REJ.COMMENT 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"
+                Dim oDT_EnvWithdrawn = Database.GetDatatable(oSql)
+
+                oEnvelopeIds = oDTEnv_invitations.Rows.Cast(Of DataRow).
+                    Select(Function(r) r.Item("GUID")).
+                    Cast(Of Integer).
+                    ToList()
+
+                If oEnvelopeIds.Count > 0 Then
+                    Logger.Info("WithdrawnEnv - Found [{0}] envelopes.", oEnvelopeIds.Count)
+                End If
+
+                oTotal = oEnvelopeIds.Count
+                oCurrent = 1
+                Dim oEnvID As Integer
+                For Each oRow As DataRow In oDT_EnvWithdrawn.Rows
+                    oEnvID = oRow.Item("GUID")
+                    Dim oReason = oRow.Item("REJECTION_REASON")
+                    Logger.Info("WithdrawnEnv - Gathering Info for Envelope [{0}] ({1}/{2})", oEnvID, oCurrent, oTotal)
+                    Try
+                        Dim oEnvelope = EnvelopeModel.GetById(oEnvID)
+                        If oEnvelope Is Nothing Then
+                            Logger.Warn("WithdrawnEnv - Envelope could not be loaded for Id [{0}]!", oEnvID)
+                            Throw New ArgumentNullException("EnvelopeData")
+                        End If
+                        oEnvelope.CURRENT_WORK_APP = "signFLOW_API_EnvJob_Withdrawn"
+                        oEnvelope.Receivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id).ToList()
+
+                        Logger.Debug("WithdrawnEnv - Sending Withdrawn Mails..")
+
+                        If ActionService.API_SendWithdrawn_Mails(oEnvelope, oReason) = False Then
+                            Logger.Warn("Could not send the Mails for withdrawn Envelope")
+                        Else
+                            Dim oStatInsert = $"INSERT INTO TBSIG_ENVELOPE_HISTORY (ENVELOPE_ID,STATUS,USER_REFERENCE,ADDED_WHEN,ACTION_DATE) VALUES ('{oEnvelope.Id}',3004,'API',GETDATE(),GETDATE())"
+                            Database.ExecuteNonQuery(oStatInsert)
+                        End If
+                    Catch ex As Exception
+                        Logger.Warn(ex, $"WithdrawnEnv - Unhandled exception while working envelope [{oEnvID}]")
+                    End Try
+
+                    oCurrent += 1
+                    Logger.Info("WithdrawnEnv - Envelope finalized!")
+
+                Next
+
+
+                Logger.Debug("API Envelopes - Completed job {0} successfully!", JobId)
+            Catch ex As Exception
+                Logger.Warn("API Envelopes job failed!")
+                Logger.Error(ex)
+            Finally
+                Logger.Debug("API Envelopes execution for [{0}] ended", JobId)
+            End Try
+
+            Return Task.FromResult(True)
+        End Function
+        Private Sub InitializeModels(pState As State)
+            ConfigModel = New ConfigModel(pState)
+            EnvelopeModel = New EnvelopeModel(pState)
+            ReceiverModel = New ReceiverModel(pState)
+        End Sub
+        Private Sub InitializeServices(pState As State)
+            ActionService = New ActionService(pState, Database)
+        End Sub
+        Private Function GetDatabase(pContext As IJobExecutionContext, pLogConfig As LogConfig) As MSSQLServer
+            Dim oConnectionString As String = pContext.MergedJobDataMap.Item(Constants.DATABASE)
+            Dim Database = New MSSQLServer(pLogConfig, MSSQLServer.DecryptConnectionString(oConnectionString))
+
+            Return Database
+        End Function
+        Private Function GetEnvelopeData(pEnvelopeId As Integer) As EnvelopeData
+            Dim oSql = $"SELECT T.GUID, T.ENVELOPE_UUID,T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T
+                JOIN TBSIG_ENVELOPE_DOCUMENT T2 ON T.GUID = T2.ENVELOPE_ID
+                WHERE T.GUID = {pEnvelopeId}"
+            Dim oTable As DataTable = Database.GetDatatable(oSql)
+            Dim oRow As DataRow = oTable.Rows.Cast(Of DataRow).SingleOrDefault()
+            If oRow Is Nothing Then
+                Return Nothing
+            End If
+
+            Dim oData As New EnvelopeData With {
+                .EnvelopeId = pEnvelopeId,
+                .DocumentPath = oRow.ItemEx("FILEPATH", ""),
+                .EnvelopeUUID = oRow.ItemEx("ENVELOPE_UUID", "")
+            }
+
+            Logger.Debug("Document path: [{0}]", oData.DocumentPath)
+
+            Return oData
+        End Function
+
+
+
+
+        Private Function GetState() As State
+            Return New State With {
+                .LogConfig = LogConfig,
+                .Database = Database,
+                .UserId = 0,
+                .Config = Nothing,
+                .DbConfig = Nothing
+            }
+        End Function
+    End Class
+End Namespace

EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -53,7 +53,7 @@ Namespace Jobs
             myTempFiles = New TempFiles(LogConfig)
             myTempFiles.Create()
             Dim JobId = pContext.JobDetail.Key
-            Logger.Info("Starting job {0}", JobId)
+            Logger.Debug("Starting job {0}", JobId)
 
             Try
                 Logger.Debug("Loading GdViewer..")
@@ -74,8 +74,8 @@ Namespace Jobs
                 InitializeServices(oState)
 
                 Logger.Debug("Loading PDFBurner..")
-                Dim ignoredLabels As List(Of String) = pContext.MergedJobDataMap.Item(Constants.IGNORED_LABELS)
+                Dim pdfBurnerParams As PDFBurnerParams = pContext.MergedJobDataMap.Item(Constants.PDF_BURNER_PARAMS)
-                PDFBurner = New PDFBurner(LogConfig, oGdPictureKey, ignoredLabels)
+                PDFBurner = New PDFBurner(LogConfig, oGdPictureKey, pdfBurnerParams)
 
                 Logger.Debug("Loading PDFMerger..")
                 PDFMerger = New PDFMerger(LogConfig, oGdPictureKey)
@@ -108,7 +108,6 @@ Namespace Jobs
 
                 For Each oId In oEnvelopeIds
                     Logger.Info("Finalizing Envelope [{0}] ({1}/{2})", oId, oCurrent, oTotal)
-                    Logger.Debug("Loading Envelope..")
                     Try
                         Dim oEnvelope = EnvelopeModel.GetById(oId)
                         If oEnvelope Is Nothing Then
@@ -147,7 +146,7 @@ Namespace Jobs
                             Directory.CreateDirectory(oOutputDirectoryPath)
                         End If
                         Dim oOutputFilePath = Path.Combine(oOutputDirectoryPath, $"{oEnvelope.Uuid}.pdf")
-                        Logger.Info("Writing finalized Pdf to disk..")
+                        Logger.Debug("Writing finalized Pdf to disk..")
                         Logger.Info("Output path is [{0}]", oOutputFilePath)
 
                         Try
@@ -157,12 +156,14 @@ Namespace Jobs
                             Throw New ExportDocumentException("Could not export final document to disk!", ex)
                         End Try
 
-                        Logger.Info("Writing EB-bytes to database...")
+                        Logger.Debug("Writing EB-bytes to database...")
                         Update_File_DB(oOutputFilePath, oEnvelope.Id)
 
-                        Logger.Info("Sending finalized report-mails..")
+
                         If SendFinalEmails(oEnvelope) = False Then ', oOutputFilePath
                             Throw New ApplicationException("Final emails could not be sent!")
+                        Else
+                            Logger.Info("Report-mails successfully sent!")
                         End If
                         Logger.Debug("Setting envelope status..")
                         If ActionService.FinalizeEnvelope(oEnvelope) = False Then
@@ -175,7 +176,7 @@ Namespace Jobs
 
 
                     oCurrent += 1
-                    Logger.Info("Envelope finalized!")
+                    Logger.Info($"Envelope [{oId}] finalized!")
 
                 Next
 
@@ -192,7 +193,7 @@ Namespace Jobs
                 Logger.Warn("Certificate Document job failed!")
                 Logger.Error(ex)
             Finally
-                Logger.Info("Job execution for [{0}] ended", JobId)
+                Logger.Debug("Job execution for [{0}] ended", JobId)
             End Try
 
             Return Task.FromResult(True)
@@ -290,11 +291,15 @@ Namespace Jobs
             If oMailToCreator <> FinalEmailType.No Then
                 Logger.Debug("Sending email to creator ...")
                 SendFinalEmailToCreator(pEnvelope) ', pAttachment
+            Else
+                Logger.Warn($"No SendFinalEmailToCreator - oMailToCreator [{oMailToCreator}] <> [{FinalEmailType.No}] ")
             End If
 
             If oMailToReceivers <> FinalEmailType.No Then
                 Logger.Debug("Sending emails to receivers..")
                 SendFinalEmailToReceivers(pEnvelope) ', pAttachment
+            Else
+                Logger.Warn($"No SendFinalEmailToReceivers - oMailToCreator [{oMailToReceivers}] <> [{FinalEmailType.No}] ")
             End If
 
             Return True
@@ -355,9 +360,9 @@ Namespace Jobs
                 oInputPath = pEnvelopeData.DocumentPath
                 Logger.Info($"Input path: [{oInputPath}]")
             Else
-                Logger.Info($"we got bytes..")
+                Logger.Debug($"we got bytes..")
                 oInputPath = Config.DocumentPathOrigin
-                Logger.Info($"oInputPath: {Config.DocumentPathOrigin}")
+                Logger.Debug($"oInputPath: {Config.DocumentPathOrigin}")
             End If
 
 
@@ -421,7 +426,7 @@ Namespace Jobs
         End Function
 
         Private Sub InitializeServices(pState As State)
-            ActionService = New ActionService(pState)
+            ActionService = New ActionService(pState, Database)
         End Sub
 
         Private Sub InitializeModels(pState As State)

EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb

@@ -16,9 +16,9 @@ Namespace Jobs.FinalizeDocument
         Private Const ANNOTATION_TYPE_IMAGE = "pspdfkit/image"
         Private Const ANNOTATION_TYPE_INK = "pspdfkit/ink"
         Private Const ANNOTATION_TYPE_WIDGET = "pspdfkit/widget"
-        Private Property _ignoredLabels As List(Of String)
+        Private Property _pdfBurnerParams As PDFBurnerParams
 
-        Public Sub New(pLogConfig As LogConfig, pGDPictureLicenseKey As String, ignoredLabels As List(Of String))
+        Public Sub New(pLogConfig As LogConfig, pGDPictureLicenseKey As String, pdfBurnerParams As PDFBurnerParams)
             MyBase.New(pLogConfig)
 
             LicenseManager = New LicenseManager()
@@ -26,7 +26,7 @@ Namespace Jobs.FinalizeDocument
 
             Manager = New AnnotationManager()
 
-            _ignoredLabels = ignoredLabels
+            _pdfBurnerParams = pdfBurnerParams
         End Sub
 
         Public Function BurnInstantJSONAnnotationsToPDF(pSourceBuffer As Byte(), pInstantJSONList As List(Of String)) As Byte()
@@ -68,7 +68,8 @@ Namespace Jobs.FinalizeDocument
         Private Function AddInstantJSONAnnotationToPDF(pInstantJSON As String) As Boolean
             Try
                 Dim oAnnotationData = JsonConvert.DeserializeObject(Of AnnotationData)(pInstantJSON)
-
+                oAnnotationData.annotations.Reverse()
+                Dim formFieldIndex = 0
                 For Each oAnnotation In oAnnotationData.annotations
                     Logger.Debug("Adding AnnotationID: " + oAnnotation.id)
                     Select Case oAnnotation.type
@@ -81,10 +82,12 @@ Namespace Jobs.FinalizeDocument
                         Case ANNOTATION_TYPE_WIDGET
                             'Add form field values
                             Dim formFieldValue = oAnnotationData.formFieldValues.FirstOrDefault(Function(fv) fv.name = oAnnotation.id)
-                            If formFieldValue IsNot Nothing AndAlso Not _ignoredLabels.Contains(formFieldValue.value) Then
+                            If formFieldValue IsNot Nothing AndAlso Not _pdfBurnerParams.IgnoredLabels.Contains(formFieldValue.value) Then
-                                AddFormFieldValue(oAnnotation, formFieldValue)
+                                AddFormFieldValue(oAnnotation, formFieldValue, formFieldIndex)
+                                formFieldIndex += 1
                             End If
                     End Select
+
                 Next
 
                 Return True
@@ -144,13 +147,13 @@ Namespace Jobs.FinalizeDocument
 
         End Function
 
-        Private Function AddFormFieldValue(pAnnotation As Annotation, formFieldValue As FormFieldValue) As Boolean
+        Private Function AddFormFieldValue(pAnnotation As Annotation, formFieldValue As FormFieldValue, index As Integer) As Boolean
             Try
                 ' Convert pixels to Inches
                 Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
 
                 Dim oX = oBounds.Item(0)
-                Dim oY = oBounds.Item(1)
+                Dim oY = oBounds.Item(1) + _pdfBurnerParams.YOffset * index + _pdfBurnerParams.TopMargin
                 Dim oWidth = oBounds.Item(2)
                 Dim oHeight = oBounds.Item(3)
 
@@ -159,9 +162,9 @@ Namespace Jobs.FinalizeDocument
                 Dim ant = Manager.AddTextAnnot(oX, oY, oWidth, oHeight, formFieldValue.value)
 
                 ' Set the font properties
-                ant.FontName = "Arial"
+                ant.FontName = _pdfBurnerParams.FontName
-                ant.FontSize = 8
+                ant.FontSize = _pdfBurnerParams.FontSize
-                ant.FontStyle = FontStyle.Italic
+                ant.FontStyle = _pdfBurnerParams.FontStyle
                 Manager.SaveAnnotationsToPage()
                 Return True
             Catch ex As Exception

EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurnerParams.vb

@@ -0,0 +1,16 @@
+Imports System.Drawing
+Namespace Jobs.FinalizeDocument
+    Public Class PDFBurnerParams
+        Public Property IgnoredLabels As New List(Of String) From {"Date", "Datum", "ZIP", "PLZ", "Place", "Ort", "Position", "Stellung"}
+
+        Public Property TopMargin As Double = 0.1
+
+        Public Property YOffset As Double = -0.3
+
+        Public Property FontName As String = "Arial"
+
+        Public Property FontSize As Integer = 8
+
+        Public Property FontStyle As FontStyle = FontStyle.Italic
+    End Class
+End Namespace

EnvelopeGenerator.Common/Models/EmailModel.vb

@@ -18,7 +18,7 @@ Public Class EmailModel
             oCommand.Parameters.Add("EMAIL_ADRESS", SqlDbType.NVarChar).Value = pEmail.EmailAdress
             oCommand.Parameters.Add("EMAIL_SUBJ", SqlDbType.NVarChar).Value = pEmail.EmailSubject
             oCommand.Parameters.Add("EMAIL_BODY", SqlDbType.NVarChar).Value = pEmail.EmailBody
-            oCommand.Parameters.Add("ADDED_WHO", SqlDbType.NVarChar).Value = "DDEnvelopGenerator"
+            oCommand.Parameters.Add("ADDED_WHO", SqlDbType.NVarChar).Value = pEmail.ADDED_WHO_PROCESS
             oCommand.Parameters.Add("SENDING_PROFILE", SqlDbType.Int).Value = State.DbConfig.SendingProfile
             oCommand.Parameters.Add("REFERENCE_ID", SqlDbType.Int).Value = pEmail.ReferenceID
             oCommand.Parameters.Add("REFERENCE_STRING", SqlDbType.NVarChar).Value = pEmail.ReferenceString

EnvelopeGenerator.Common/Models/EnvelopeModel.vb

@@ -35,6 +35,7 @@ Public Class EnvelopeModel
             .Language = pRow.ItemEx("LANGUAGE", "de-DE"),
             .Status = ObjectEx.ToEnum(Of Constants.EnvelopeStatus)(pRow.ItemEx("STATUS", Constants.EnvelopeStatus.EnvelopeCreated.ToString())),
             .AddedWhen = pRow.Item("ADDED_WHEN"),
+            .ChangedWhen = pRow.ItemEx(Of Date)("CHANGED_WHEN", Nothing),
             .CertificationType = ObjectEx.ToEnum(Of Constants.CertificationType)(pRow.ItemEx("CERTIFICATION_TYPE", Constants.CertificationType.AdvancedElectronicSignature.ToString())),
             .User = New User(),
             .ExpiresWhen = pRow.ItemEx(Of Date)("EXPIRES_WHEN", Nothing),

EnvelopeGenerator.Common/Models/UserModel.vb

@@ -33,10 +33,10 @@ Public Class UserModel
             Dim oRow = oTable.Rows.Item(0)
             Dim oHasAccess = oRow.ItemEx("MODULE_ACCESS", False)
             Dim oIsAdmin = oRow.ItemEx("IS_ADMIN", False)
-
+            Dim oGhostmode = oRow.ItemEx("GHOST_MODE_OVERRIDE", False)
             pUser.HasAccess = oHasAccess
             pUser.IsAdmin = oIsAdmin
-
+            pUser.GhostModeActive = oGhostmode
             Return pUser
         Catch ex As Exception
             Logger.Error(ex)

EnvelopeGenerator.Common/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.4.3.0")>
+<Assembly: AssemblyVersion("2.7.0.0")>
-<Assembly: AssemblyFileVersion("2.4.3.0")>
+<Assembly: AssemblyFileVersion("2.7.0.0")>

EnvelopeGenerator.Common/Services/ActionService.vb

@@ -2,19 +2,24 @@
 Imports DigitalData.Modules.Base
 Imports EnvelopeGenerator.Common.Constants
 Imports EnvelopeGenerator.Common.My.Resources
+Imports DigitalData.Modules.Database
+Imports System.ComponentModel
 
 Public Class ActionService
     Inherits BaseService
 
+
     Private ReadOnly EmailService As EmailService
     Private ReadOnly HistoryService As HistoryService
 
     Private ReadOnly ReceiverModel As ReceiverModel
 
+    Private myDatabase As MSSQLServer
 
-    Public Sub New(pState As State)
+
+    Public Sub New(pState As State, pDD_ECM As MSSQLServer)
         MyBase.New(pState)
-
+        myDatabase = pDD_ECM
         EmailService = New EmailService(pState)
         HistoryService = New HistoryService(pState)
         ReceiverModel = New ReceiverModel(pState)
@@ -63,6 +68,8 @@ Public Class ActionService
         Else
             oStatus = Constants.EnvelopeStatus.EnvelopeDeleted
         End If
+        Dim oUpd = $"UPDATE TBSIG_ENVELOPE SET REJECTION_REASON = '{pReason}' WHERE GUID = {pEnvelope.Id}"
+        myDatabase.ExecuteNonQuery(oUpd)
         If HistoryService.SetEnvelopeStatus(pEnvelope, oStatus, pEnvelope.User.Email) = False Then
             Return False
         End If
@@ -77,6 +84,15 @@ Public Class ActionService
 
         Return True
     End Function
+    Public Function API_SendWithdrawn_Mails(pEnvelope As Envelope, pReason As String) As Boolean
+        Dim oSendResult As Boolean = False
+        For Each oReceiver As EnvelopeReceiver In pEnvelope.Receivers
+            If EmailService.SendEnvelopeDeletedEmail(pEnvelope, oReceiver, pReason) = False Then
+                Return False
+            End If
+        Next
+        Return True
+    End Function
 
     Public Function OpenEnvelope(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
         Dim oUserReference = pReceiver.Email

EnvelopeGenerator.Common/Services/BaseService.vb

@@ -1,13 +1,10 @@
 Imports DigitalData.Modules.Base
-
 Public Class BaseService
     Inherits BaseClass
 
     Friend Property State As State
-
     Public Sub New(pState As State)
         MyBase.New(pState.LogConfig)
-
         State = pState
     End Sub
 End Class

EnvelopeGenerator.Common/Services/EmailService.vb

@@ -17,10 +17,11 @@ Public Class EmailService
     End Sub
 
     Public Function SendEnvelopeDeletedEmail(pEnvelope As Envelope, pReceiver As EnvelopeReceiver, pReason As String) As Boolean
-        Logger.Debug("Creating email data object.")
+        Logger.Debug("SendEnvelopeDeletedEmail - Creating email data object...")
         Dim oEmailData As New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageDeletionSent) With
         {
-            .SignatureLink = ""
+            .SignatureLink = "",
+            .ADDED_WHO_PROCESS = pEnvelope.CURRENT_WORK_APP
         }
 
         EmailTemplate.FillEnvelopeDeletedEmailBody(oEmailData, pReason)
@@ -37,7 +38,8 @@ Public Class EmailService
         Logger.Debug("Creating email data object.")
         Dim oEmailData As New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageInvitationSent) With
         {
-            .SignatureLink = Helpers.GetEnvelopeURL(State.DbConfig.SignatureHost, pEnvelope.Uuid, pReceiver.Signature)
+            .SignatureLink = Helpers.GetEnvelopeURL(State.DbConfig.SignatureHost, pEnvelope.Uuid, pReceiver.Signature),
+            .ADDED_WHO_PROCESS = pEnvelope.CURRENT_WORK_APP
         }
 
         EmailTemplate.FillDocumentReceivedEmailBody(oEmailData)
@@ -51,9 +53,13 @@ Public Class EmailService
     End Function
 
     Public Function GetReceiverUrl(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As String
+        Logger.Debug($"State.DbConfig.SignatureHost: {State.DbConfig.SignatureHost}")
+        Logger.Debug($" pEnvelope.Uuid: {pEnvelope.Uuid}")
+        Logger.Debug($" pReceiver.Signature: {pReceiver.Signature}")
         Dim oEmailData As New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageInvitationSent) With
         {
-          .SignatureLink = Helpers.GetEnvelopeURL(State.DbConfig.SignatureHost, pEnvelope.Uuid, pReceiver.Signature)
+          .SignatureLink = Helpers.GetEnvelopeURL(State.DbConfig.SignatureHost, pEnvelope.Uuid, pReceiver.Signature),
+          .ADDED_WHO_PROCESS = pEnvelope.CURRENT_WORK_APP
         }
         Return oEmailData.SignatureLink
     End Function
@@ -61,9 +67,13 @@ Public Class EmailService
 
     Public Function SendDocumentAccessCodeReceivedEmail(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
         Logger.Debug("Creating email data object.")
+        Logger.Debug($"State.DbConfig.SignatureHost: {State.DbConfig.SignatureHost}")
+        Logger.Debug($" pEnvelope.Uuid: {pEnvelope.Uuid}")
+        Logger.Debug($" pReceiver.Signature: {pReceiver.Signature}")
         Dim oEmailData As New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageAccessCodeSent) With
         {
-            .SignatureLink = Helpers.GetEnvelopeURL(State.DbConfig.SignatureHost, pEnvelope.Uuid, pReceiver.Signature)
+            .SignatureLink = Helpers.GetEnvelopeURL(State.DbConfig.SignatureHost, pEnvelope.Uuid, pReceiver.Signature),
+            .ADDED_WHO_PROCESS = pEnvelope.CURRENT_WORK_APP
         }
 
         EmailTemplate.FillDocumentAccessCodeReceivedEmailBody(oEmailData)

EnvelopeGenerator.Common/Strings/Envelope.resx

@@ -220,6 +220,9 @@ Pattern: +491234567890</value>
   <data name="Missing Receivers" xml:space="preserve">
     <value>Fehlende Empfänger</value>
   </data>
+  <data name="ModificationOriginFile_FormFields" xml:space="preserve">
+    <value />
+  </data>
   <data name="New Envelope" xml:space="preserve">
     <value>Neuer Umschlag</value>
   </data>

EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb

@@ -371,6 +371,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        '''</summary>
+        Public Shared ReadOnly Property ModificationOriginFile_FormFields() As String
+            Get
+                Return ResourceManager.GetString("ModificationOriginFile_FormFields", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Neuer Umschlag ähnelt.
         '''</summary>

EnvelopeGenerator.Common/Strings/Model.Designer.vb

@@ -361,6 +361,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren! ähnelt.
+        '''</summary>
+        Public Shared ReadOnly Property ResetTOTPUser() As String
+            Get
+                Return ResourceManager.GetString("ResetTOTPUser", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Gespeichert ähnelt.
         '''</summary>
@@ -406,6 +415,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Erfolgreich! Dialog wird geschlossen. ähnelt.
+        '''</summary>
+        Public Shared ReadOnly Property Success_FormClose() As String
+            Get
+                Return ResourceManager.GetString("Success_FormClose", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Unsigniert ähnelt.
         '''</summary>

EnvelopeGenerator.Common/Strings/Model.en.resx

@@ -210,6 +210,9 @@
   <data name="ReadAndSign" xml:space="preserve">
     <value>Read and Sign</value>
   </data>
+  <data name="ResetTOTPUser" xml:space="preserve">
+    <value>Do you want to reset the 2-factor definition for this receiver? The receiver must then identify itself again!</value>
+  </data>
   <data name="Saved" xml:space="preserve">
     <value>Saved</value>
   </data>
@@ -225,6 +228,9 @@
   <data name="Signed" xml:space="preserve">
     <value>Signed</value>
   </data>
+  <data name="Success_FormClose" xml:space="preserve">
+    <value>Successful! Dialog is closed.successful! Dialog is closed.</value>
+  </data>
   <data name="Unsigned" xml:space="preserve">
     <value>Unsigned</value>
   </data>

EnvelopeGenerator.Common/Strings/Model.resx

@@ -216,6 +216,9 @@
   <data name="ReadAndSign" xml:space="preserve">
     <value>Arbeitsanweisung</value>
   </data>
+  <data name="ResetTOTPUser" xml:space="preserve">
+    <value>Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren!</value>
+  </data>
   <data name="Saved" xml:space="preserve">
     <value>Gespeichert</value>
   </data>
@@ -231,6 +234,9 @@
   <data name="Signed" xml:space="preserve">
     <value>Signiert</value>
   </data>
+  <data name="Success_FormClose" xml:space="preserve">
+    <value>Erfolgreich! Dialog wird geschlossen.</value>
+  </data>
   <data name="Unsigned" xml:space="preserve">
     <value>Unsigniert</value>
   </data>

EnvelopeGenerator.Domain/Entities/EmailTemplate.cs

@@ -1,4 +1,5 @@
 using DigitalData.Core.Abstractions;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -20,5 +21,13 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [Column("SUBJECT", TypeName = "nvarchar(512)")]
         public string? Subject { get; set; }
+
+        [Required]
+        [Column("ADDED_WHEN", TypeName = "datetime")]
+        [DefaultValue("GETDATE()")]
+        public DateTime AddedWhen { get; set; }
+
+        [Column("CHANGED_WHEN", TypeName = "datetime")]
+        public DateTime? ChangedWhen { get; set; }
     }
 }

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -28,7 +28,6 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")]
         public required string Uuid { get; init; }
 
-        [Required]
         [Column("MESSAGE", TypeName = "nvarchar(max)")]
         public string? Message { get; set; }
 
@@ -52,7 +51,7 @@ namespace EnvelopeGenerator.Domain.Entities
         public int? ContractType { get; set; }
 
         [Column("LANGUAGE", TypeName = "nvarchar(5)")]
-        public required string Language { get; set; }
+        public string? Language { get; set; }
 
         [Column("SEND_REMINDER_EMAILS")]
         public bool? SendReminderEmails { get; set; }
@@ -87,6 +86,9 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("TFA_ENABLED", TypeName = "bit")]
         public bool TFAEnabled { get; set; }
 
+        [Column("DOC_RESULT", TypeName = "varbinary(max)")]
+        public byte[]? DocResult { get; init; }
+
         /// <summary>
         /// The sender of envelope
         /// </summary>

EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs

@@ -2,7 +2,6 @@
 using DigitalData.UserManager.Domain.Entities;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using static EnvelopeGenerator.Common.Constants;
 
 namespace EnvelopeGenerator.Domain.Entities
 {
@@ -42,19 +41,5 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [ForeignKey("UserReference")]
         public virtual Receiver? Receiver { get; set; }
-
-        [NotMapped]
-        public ReferenceType ReferenceType => (Status / 1000) switch
-        {
-            1 => ReferenceType.Sender,
-            2 or 3 => ReferenceType.Receiver,
-            _ => ReferenceType.Unknown,
-        };
-
-        [NotMapped]
-        public string? StatusName
-            => (Enum.IsDefined(typeof(EnvelopeStatus), Status)) 
-                ? Enum.GetName(typeof(EnvelopeStatus), Status) 
-                : null;            
     }
 }

EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.3" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.6.0" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="3.0.0" />
     <PackageReference Include="UserManager.Domain" Version="3.0.2" />
   </ItemGroup>

EnvelopeGenerator.Extensions/EnvelopeGenerator.Extensions.csproj

@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="HtmlSanitizer" Version="8.0.865" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.4" />
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.19" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Otp.NET" Version="1.4.0" />

EnvelopeGenerator.Extensions/MemoryCacheExtensions.cs

@@ -0,0 +1,29 @@
+using Microsoft.Extensions.Caching.Memory;
+
+namespace EnvelopeGenerator.Extensions;
+
+public static class MemoryCacheExtensions
+{
+    private static readonly Guid BaseId = Guid.NewGuid();
+
+    public static IDictionary<string, int> GetEnumAsDictionary<TEnum>(this IMemoryCache memoryCache, string key = "", params object[] ignores)
+        where TEnum : Enum
+        => memoryCache.GetOrCreate(BaseId + typeof(TEnum).FullName + key, _ =>
+        {
+            var mergedIgnores = new List<TEnum>();
+
+            foreach (var ignore in ignores)
+            {
+                if (ignore is IEnumerable<TEnum> ignoreList)
+                    mergedIgnores.AddRange(ignoreList);
+                else if (ignore is TEnum ignoreVal)
+                    mergedIgnores.Add(ignoreVal);
+            }
+
+            return Enum.GetValues(typeof(TEnum))
+                   .Cast<TEnum>()
+                   .Where(e => !mergedIgnores.Contains(e))
+                   .ToDictionary(e => e.ToString(), e => Convert.ToInt32(e));
+        })
+           ?? throw new InvalidOperationException($"Failed to cache or retrieve enum dictionary for type '{typeof(TEnum).FullName}'.");
+}

EnvelopeGenerator.Form/Controllers/BaseController.vb

@@ -28,7 +28,7 @@ Public MustInherit Class BaseController
         State = pState
         Database = pState.Database
         InitializeModels(pState)
-        ActionService = New ActionService(pState)
+        ActionService = New ActionService(pState, Database)
     End Sub
 
     Private Sub InitializeModels(pState As State)

EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb

@@ -22,7 +22,7 @@ Public Class EnvelopeEditorController
         Envelope = CreateEnvelope()
         Thumbnail = New Thumbnail(pState.LogConfig)
         EmailService = New EmailService(pState)
-        ActionService = New ActionService(pState)
+        ActionService = New ActionService(pState, Nothing)
     End Sub
 
     Public Sub New(pState As State, pEnvelope As Envelope)
@@ -33,7 +33,7 @@ Public Class EnvelopeEditorController
         Envelope.Receivers = ReceiverModel.ListEnvelopeReceivers(pEnvelope.Id).ToList()
 
         Thumbnail = New Thumbnail(pState.LogConfig)
-        ActionService = New ActionService(pState)
+        ActionService = New ActionService(pState, Nothing)
     End Sub
 
 #Region "Public"

EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj

@@ -319,6 +319,12 @@
     <Compile Include="Controllers\EnvelopeListController.vb" />
     <Compile Include="Controllers\FieldEditorController.vb" />
     <Compile Include="Controllers\BaseController.vb" />
+    <Compile Include="frm2Factor_Properties.Designer.vb">
+      <DependentUpon>frm2Factor_Properties.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frm2Factor_Properties.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmEnvelopeEditor.vb">
       <SubType>Form</SubType>
     </Compile>
@@ -381,6 +387,9 @@
       <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="My Project\AssemblyInfo.vb" />
+    <EmbeddedResource Include="frm2Factor_Properties.resx">
+      <DependentUpon>frm2Factor_Properties.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmEnvelopeEditor.en.resx">
       <DependentUpon>frmEnvelopeEditor.vb</DependentUpon>
       <SubType>Designer</SubType>
@@ -416,6 +425,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmGhostMode.resx">
       <DependentUpon>frmGhostMode.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmMain.en.resx">
       <DependentUpon>frmMain.vb</DependentUpon>

EnvelopeGenerator.Form/Helper/FlattenFormFields.vb

@@ -18,6 +18,9 @@ Public Class FlattenFormFields
 
                 Dim newFilesPath As String = Path.Combine(oFolder, "InputFieldsFlattend_" & Path.GetFileName(pFilePath))
                 If gdpicturePdf.SaveToFile(newFilesPath) = GdPictureStatus.OK Then
+                    Dim oNameofFile = Path.GetFileName(newFilesPath)
+                    MsgBox("Your PDF-file contained form-fields!" & vbNewLine & "We needed to adapt the file and created an new version!" & vbNewLine &
+                        $"New filename: {oNameofFile}", MsgBoxStyle.Exclamation, "Information")
                     Return newFilesPath
                 End If
 

EnvelopeGenerator.Form/My Project/AssemblyInfo.vb

@@ -32,5 +32,5 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 ' [assembly: AssemblyVersion("1.0.*")]
-<Assembly: AssemblyVersion("2.9.0.0")>
+<Assembly: AssemblyVersion("2.9.1.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>

EnvelopeGenerator.Form/frm2Factor_Properties.Designer.vb

@@ -0,0 +1,121 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frm2Factor_Properties
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frm2Factor_Properties))
+        Me.txtMail = New System.Windows.Forms.TextBox()
+        Me.txtValid = New System.Windows.Forms.TextBox()
+        Me.chkTOTP = New System.Windows.Forms.CheckBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton()
+        Me.SuspendLayout()
+        '
+        'txtMail
+        '
+        Me.txtMail.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtMail.Location = New System.Drawing.Point(85, 24)
+        Me.txtMail.Name = "txtMail"
+        Me.txtMail.ReadOnly = True
+        Me.txtMail.Size = New System.Drawing.Size(342, 23)
+        Me.txtMail.TabIndex = 0
+        '
+        'txtValid
+        '
+        Me.txtValid.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtValid.Location = New System.Drawing.Point(85, 79)
+        Me.txtValid.Name = "txtValid"
+        Me.txtValid.ReadOnly = True
+        Me.txtValid.Size = New System.Drawing.Size(202, 23)
+        Me.txtValid.TabIndex = 1
+        '
+        'chkTOTP
+        '
+        Me.chkTOTP.AutoSize = True
+        Me.chkTOTP.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.chkTOTP.Location = New System.Drawing.Point(85, 53)
+        Me.chkTOTP.Name = "chkTOTP"
+        Me.chkTOTP.Size = New System.Drawing.Size(151, 20)
+        Me.chkTOTP.TabIndex = 2
+        Me.chkTOTP.Text = "Secret Key vorhanden"
+        Me.chkTOTP.UseVisualStyleBackColor = True
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label1.Location = New System.Drawing.Point(12, 27)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(47, 16)
+        Me.Label1.TabIndex = 3
+        Me.Label1.Text = "E-Mail:"
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label3.Location = New System.Drawing.Point(15, 82)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(64, 16)
+        Me.Label3.TabIndex = 5
+        Me.Label3.Text = "Gültig bis:"
+        '
+        'SimpleButton1
+        '
+        Me.SimpleButton1.Appearance.Font = New System.Drawing.Font("Tahoma", 9.75!)
+        Me.SimpleButton1.Appearance.Options.UseFont = True
+        Me.SimpleButton1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.SimpleButton1.Location = New System.Drawing.Point(18, 121)
+        Me.SimpleButton1.Name = "SimpleButton1"
+        Me.SimpleButton1.Size = New System.Drawing.Size(116, 40)
+        Me.SimpleButton1.TabIndex = 6
+        Me.SimpleButton1.Text = "Zurücksetzen"
+        '
+        'frm2Factor_Properties
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(443, 170)
+        Me.Controls.Add(Me.SimpleButton1)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.chkTOTP)
+        Me.Controls.Add(Me.txtValid)
+        Me.Controls.Add(Me.txtMail)
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "frm2Factor_Properties"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Zwei-Faktor Eigenschaften Empfänger:"
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents txtMail As TextBox
+    Friend WithEvents txtValid As TextBox
+    Friend WithEvents chkTOTP As CheckBox
+    Friend WithEvents Label1 As Label
+    Friend WithEvents Label3 As Label
+    Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton
+End Class

EnvelopeGenerator.Form/frm2Factor_Properties.resx

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="SimpleButton1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANcCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
+        QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
+        MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iUmVzZXRMYXlv
+        dXRPcHRpb25zIj4NCiAgICA8cGF0aCBkPSJNMTYsNGMtMy4zLDAtNi4zLDEuMy04LjUsMy41TDQsNHYx
+        MGgwLjJoNC4xSDE0bC0zLjYtMy42QzExLjgsOC45LDEzLjgsOCwxNiw4YzQuNCwwLDgsMy42LDgsOHMt
+        My42LDgtOCw4ICAgYy0zLjcsMC02LjgtMi42LTcuNy02SDQuMmMxLDUuNyw1LjksMTAsMTEuOCwxMGM2
+        LjYsMCwxMi01LjQsMTItMTJTMjIuNiw0LDE2LDR6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwv
+        c3ZnPgs=
+</value>
+  </data>
+</root>

EnvelopeGenerator.Form/frm2Factor_Properties.vb

@@ -0,0 +1,43 @@
+Imports DigitalData.Modules.Database
+Imports EnvelopeGenerator.Common.My
+Public Class frm2Factor_Properties
+    Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click
+        If MsgBox(Resources.Model.ResetTOTPUser, MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.Yes Then
+            Dim oupdSQL = $"UPDATE TBSIG_RECEIVER SET TOTP_SECRET_KEY = NULL, TFA_REG_DEADLINE = NULL WHERE EMAIL_ADDRESS = '{txtMail.Text}'"
+            If DD_ECM.ExecuteNonQuery(oupdSQL) = True Then
+                MsgBox(Resources.Model.Success_FormClose, MsgBoxStyle.Information)
+                Me.Close()
+            Else
+                MsgBox("Something went wrong. Check the log", MsgBoxStyle.Exclamation)
+            End If
+
+        End If
+    End Sub
+
+    Dim TOTP As String
+    Dim mail As String
+    Dim Deadline As DateTime
+    Dim DD_ECM As MSSQLServer
+    Public Sub New(pmail As String, pTOTP As String, pDeadline As DateTime, pDD_ECM As MSSQLServer)
+
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+
+        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+        mail = pmail
+        TOTP = pTOTP
+        Deadline = pDeadline
+        DD_ECM = pDD_ECM
+    End Sub
+
+    Private Sub frm2Faktor_Load(sender As Object, e As EventArgs) Handles Me.Load
+        chkTOTP.Checked = False
+        If Not IsNothing(TOTP) Then
+            If TOTP.Length > 1 Then
+                chkTOTP.Checked = True
+            End If
+        End If
+        txtMail.Text = mail
+        txtValid.Text = Deadline.ToString
+    End Sub
+End Class

EnvelopeGenerator.Form/frmEnvelopeEditor.resx

@@ -939,7 +939,7 @@
     <value>0</value>
   </data>
   <metadata name="FrmEditorBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 54</value>
+    <value>792, 17</value>
   </metadata>
   <metadata name="EnvelopeDocumentBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>557, 17</value>

EnvelopeGenerator.Form/frmEnvelopeEditor.vb

@@ -200,7 +200,7 @@ Partial Public Class frmEnvelopeEditor
     Private Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick
         Try
             If SaveEnvelopeWithOutValidation() = True Then
-                bsitm_info.Caption = "Data saved succeddfully " + Now.ToString
+                bsitm_info.Caption = "Data saved successfully " + Now.ToString
             Else
                 bsitm_info.Caption = "Exceprion - Error saving Data. Check LOG"
             End If
@@ -763,4 +763,6 @@ Partial Public Class frmEnvelopeEditor
             Process.Start(Documents.Item(0).Filepath)
         End If
     End Sub
+
+
 End Class

EnvelopeGenerator.Form/frmEnvelopeMainData.vb

@@ -65,6 +65,9 @@ Public Class frmEnvelopeMainData
                 chked_2Faktor.EditValue = DEF_TF_ENABLED
 
             Else
+                If IsNothing(Envelope.EnvelopeType) Then
+                    Envelope.EnvelopeType = EnvelopeType
+                End If
                 If Envelope.EnvelopeType.ContractType = 0 Then
                     cmbEnvelopeType.EditValue = EnvelopeType
                 Else

EnvelopeGenerator.Form/frmMain.Designer.vb

@@ -47,6 +47,7 @@ Partial Class frmMain
         Me.colStatus = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colTitle = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colAddedWhen = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.btnCreateEnvelope = New DevExpress.XtraBars.BarButtonItem()
         Me.btnEditEnvelope = New DevExpress.XtraBars.BarButtonItem()
@@ -65,6 +66,7 @@ Partial Class frmMain
         Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarStaticItemGhost = New DevExpress.XtraBars.BarStaticItem()
+        Me.bbtnitm2Faktor = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageEnvelopeActions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -88,22 +90,27 @@ Partial Class frmMain
         Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.XtraTabPageAdmin = New DevExpress.XtraTab.XtraTabPage()
         Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl()
         Me.GridControlData = New DevExpress.XtraGrid.GridControl()
         Me.GridViewData = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.PanelControl1 = New DevExpress.XtraEditors.PanelControl()
         Me.GroupControl2 = New DevExpress.XtraEditors.GroupControl()
-        Me.GroupControl1 = New DevExpress.XtraEditors.GroupControl()
+        Me.btnEvvallUs_lastmonth = New DevExpress.XtraEditors.SimpleButton()
         Me.btnEvvallUs_thismonth = New DevExpress.XtraEditors.SimpleButton()
+        Me.GroupControl1 = New DevExpress.XtraEditors.GroupControl()
         Me.btnEnvelopes_All = New DevExpress.XtraEditors.SimpleButton()
         Me.btnEnvelopes_thisYear = New DevExpress.XtraEditors.SimpleButton()
         Me.btnEnvelopes_lastmonth = New DevExpress.XtraEditors.SimpleButton()
         Me.btnEnvelopes_thismonth = New DevExpress.XtraEditors.SimpleButton()
+        Me.XtraTabPage3 = New DevExpress.XtraTab.XtraTabPage()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.txtEnvID = New System.Windows.Forms.TextBox()
         Me.RefreshTimer = New System.Windows.Forms.Timer(Me.components)
         Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
         Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components)
-        Me.btnEvvallUs_lastmonth = New DevExpress.XtraEditors.SimpleButton()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerControl1.Panel1.SuspendLayout()
@@ -136,6 +143,7 @@ Partial Class frmMain
         Me.GroupControl2.SuspendLayout()
         CType(Me.GroupControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupControl1.SuspendLayout()
+        Me.XtraTabPage3.SuspendLayout()
         Me.SuspendLayout()
         '
         'SplashScreenManager1
@@ -165,7 +173,7 @@ Partial Class frmMain
         resources.ApplyResources(Me.XtraTabControlMain, "XtraTabControlMain")
         Me.XtraTabControlMain.Name = "XtraTabControlMain"
         Me.XtraTabControlMain.SelectedTabPage = Me.XtraTabPage1
-        Me.XtraTabControlMain.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2, Me.XtraTabPageAdmin})
+        Me.XtraTabControlMain.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2, Me.XtraTabPageAdmin, Me.XtraTabPage3})
         '
         'XtraTabPage1
         '
@@ -279,11 +287,12 @@ Partial Class frmMain
         '
         'ViewEnvelopes
         '
-        Me.ViewEnvelopes.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colEnvelopeId, Me.colContractType, Me.colStatus, Me.colTitle, Me.colAddedWhen})
+        Me.ViewEnvelopes.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colEnvelopeId, Me.colContractType, Me.colStatus, Me.colTitle, Me.colAddedWhen, Me.GridColumn2})
         Me.ViewEnvelopes.GridControl = Me.GridEnvelopes
         Me.ViewEnvelopes.Name = "ViewEnvelopes"
         Me.ViewEnvelopes.OptionsBehavior.Editable = False
         Me.ViewEnvelopes.OptionsBehavior.ReadOnly = True
+        Me.ViewEnvelopes.OptionsView.ShowAutoFilterRow = True
         Me.ViewEnvelopes.OptionsView.ShowIndicator = False
         '
         'colEnvelopeId
@@ -318,14 +327,22 @@ Partial Class frmMain
         Me.colAddedWhen.FieldName = "AddedWhen"
         Me.colAddedWhen.Name = "colAddedWhen"
         '
+        'GridColumn2
+        '
+        resources.ApplyResources(Me.GridColumn2, "GridColumn2")
+        Me.GridColumn2.DisplayFormat.FormatString = "G"
+        Me.GridColumn2.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime
+        Me.GridColumn2.FieldName = "ChangedWhen"
+        Me.GridColumn2.Name = "GridColumn2"
+        '
         'RibbonControl
         '
         Me.RibbonControl.ExpandCollapseItem.Id = 0
         Me.RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex"), Integer)
         Me.RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex"), Integer)
-        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCreateEnvelope, Me.btnEditEnvelope, Me.btnDeleteEnvelope, Me.BarButtonItem1, Me.txtRefreshLabel, Me.btnShowDocument, Me.btnContactReceiver, Me.txtEnvelopeIdLabel, Me.btnOpenLogDirectory, Me.BarCheckItem1, Me.bsitmInfo, Me.bbtnitmEB, Me.bbtnitmInfoMail, Me.bbtnitm_ResendInvitation, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarStaticItemGhost})
+        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCreateEnvelope, Me.btnEditEnvelope, Me.btnDeleteEnvelope, Me.BarButtonItem1, Me.txtRefreshLabel, Me.btnShowDocument, Me.btnContactReceiver, Me.txtEnvelopeIdLabel, Me.btnOpenLogDirectory, Me.BarCheckItem1, Me.bsitmInfo, Me.bbtnitmEB, Me.bbtnitmInfoMail, Me.bbtnitm_ResendInvitation, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarStaticItemGhost, Me.bbtnitm2Faktor})
         resources.ApplyResources(Me.RibbonControl, "RibbonControl")
-        Me.RibbonControl.MaxItemId = 20
+        Me.RibbonControl.MaxItemId = 21
         Me.RibbonControl.Name = "RibbonControl"
         Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2})
         Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -483,6 +500,13 @@ Partial Class frmMain
         Me.BarStaticItemGhost.Name = "BarStaticItemGhost"
         Me.BarStaticItemGhost.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
         '
+        'bbtnitm2Faktor
+        '
+        resources.ApplyResources(Me.bbtnitm2Faktor, "bbtnitm2Faktor")
+        Me.bbtnitm2Faktor.Id = 20
+        Me.bbtnitm2Faktor.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitm2Faktor.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.bbtnitm2Faktor.Name = "bbtnitm2Faktor"
+        '
         'RibbonPage1
         '
         Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions, Me.RibbonPageGroup1, Me.RibbonPageGroupFunctions})
@@ -510,6 +534,7 @@ Partial Class frmMain
         Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.btnShowDocument)
         Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.bbtnitm_ResendInvitation)
         Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.btnContactReceiver)
+        Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.bbtnitm2Faktor)
         Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.bbtnitmEB)
         Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.bbtnitmInfoMail)
         Me.RibbonPageGroupFunctions.Name = "RibbonPageGroupFunctions"
@@ -637,11 +662,12 @@ Partial Class frmMain
         '
         'ViewCompleted
         '
-        Me.ViewCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.GridColumn4, Me.GridColumn5, Me.GridColumn7})
+        Me.ViewCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.GridColumn4, Me.GridColumn5, Me.GridColumn7, Me.GridColumn1})
         Me.ViewCompleted.GridControl = Me.GridCompleted
         Me.ViewCompleted.Name = "ViewCompleted"
         Me.ViewCompleted.OptionsBehavior.Editable = False
         Me.ViewCompleted.OptionsBehavior.ReadOnly = True
+        Me.ViewCompleted.OptionsView.ShowAutoFilterRow = True
         Me.ViewCompleted.OptionsView.ShowIndicator = False
         '
         'GridColumn3
@@ -665,9 +691,19 @@ Partial Class frmMain
         'GridColumn7
         '
         resources.ApplyResources(Me.GridColumn7, "GridColumn7")
+        Me.GridColumn7.DisplayFormat.FormatString = "G"
+        Me.GridColumn7.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime
         Me.GridColumn7.FieldName = "AddedWhen"
         Me.GridColumn7.Name = "GridColumn7"
         '
+        'GridColumn1
+        '
+        resources.ApplyResources(Me.GridColumn1, "GridColumn1")
+        Me.GridColumn1.DisplayFormat.FormatString = "G"
+        Me.GridColumn1.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime
+        Me.GridColumn1.FieldName = "ChangedWhen"
+        Me.GridColumn1.Name = "GridColumn1"
+        '
         'XtraTabPageAdmin
         '
         Me.XtraTabPageAdmin.Controls.Add(Me.SplitContainerControl2)
@@ -688,7 +724,7 @@ Partial Class frmMain
         'SplitContainerControl2.Panel2
         '
         resources.ApplyResources(Me.SplitContainerControl2.Panel2, "SplitContainerControl2.Panel2")
-        Me.SplitContainerControl2.SplitterPosition = 819
+        Me.SplitContainerControl2.SplitterPosition = 907
         '
         'GridControlData
         '
@@ -702,6 +738,7 @@ Partial Class frmMain
         '
         Me.GridViewData.GridControl = Me.GridControlData
         Me.GridViewData.Name = "GridViewData"
+        Me.GridViewData.OptionsView.ShowAutoFilterRow = True
         '
         'PanelControl1
         '
@@ -717,6 +754,20 @@ Partial Class frmMain
         resources.ApplyResources(Me.GroupControl2, "GroupControl2")
         Me.GroupControl2.Name = "GroupControl2"
         '
+        'btnEvvallUs_lastmonth
+        '
+        Me.btnEvvallUs_lastmonth.Appearance.BackColor = System.Drawing.Color.MediumPurple
+        Me.btnEvvallUs_lastmonth.Appearance.Options.UseBackColor = True
+        resources.ApplyResources(Me.btnEvvallUs_lastmonth, "btnEvvallUs_lastmonth")
+        Me.btnEvvallUs_lastmonth.Name = "btnEvvallUs_lastmonth"
+        '
+        'btnEvvallUs_thismonth
+        '
+        Me.btnEvvallUs_thismonth.Appearance.BackColor = System.Drawing.Color.MediumSlateBlue
+        Me.btnEvvallUs_thismonth.Appearance.Options.UseBackColor = True
+        resources.ApplyResources(Me.btnEvvallUs_thismonth, "btnEvvallUs_thismonth")
+        Me.btnEvvallUs_thismonth.Name = "btnEvvallUs_thismonth"
+        '
         'GroupControl1
         '
         Me.GroupControl1.Controls.Add(Me.btnEnvelopes_All)
@@ -726,13 +777,6 @@ Partial Class frmMain
         resources.ApplyResources(Me.GroupControl1, "GroupControl1")
         Me.GroupControl1.Name = "GroupControl1"
         '
-        'btnEvvallUs_thismonth
-        '
-        Me.btnEvvallUs_thismonth.Appearance.BackColor = System.Drawing.Color.MediumSlateBlue
-        Me.btnEvvallUs_thismonth.Appearance.Options.UseBackColor = True
-        resources.ApplyResources(Me.btnEvvallUs_thismonth, "btnEvvallUs_thismonth")
-        Me.btnEvvallUs_thismonth.Name = "btnEvvallUs_thismonth"
-        '
         'btnEnvelopes_All
         '
         Me.btnEnvelopes_All.Appearance.BackColor = System.Drawing.Color.MediumTurquoise
@@ -761,6 +805,30 @@ Partial Class frmMain
         resources.ApplyResources(Me.btnEnvelopes_thismonth, "btnEnvelopes_thismonth")
         Me.btnEnvelopes_thismonth.Name = "btnEnvelopes_thismonth"
         '
+        'XtraTabPage3
+        '
+        Me.XtraTabPage3.Controls.Add(Me.Label1)
+        Me.XtraTabPage3.Controls.Add(Me.Button1)
+        Me.XtraTabPage3.Controls.Add(Me.txtEnvID)
+        Me.XtraTabPage3.Name = "XtraTabPage3"
+        resources.ApplyResources(Me.XtraTabPage3, "XtraTabPage3")
+        '
+        'Label1
+        '
+        resources.ApplyResources(Me.Label1, "Label1")
+        Me.Label1.Name = "Label1"
+        '
+        'Button1
+        '
+        resources.ApplyResources(Me.Button1, "Button1")
+        Me.Button1.Name = "Button1"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'txtEnvID
+        '
+        resources.ApplyResources(Me.txtEnvID, "txtEnvID")
+        Me.txtEnvID.Name = "txtEnvID"
+        '
         'RefreshTimer
         '
         Me.RefreshTimer.Interval = 120000
@@ -773,13 +841,6 @@ Partial Class frmMain
         '
         Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1"
         '
-        'btnEvvallUs_lastmonth
-        '
-        Me.btnEvvallUs_lastmonth.Appearance.BackColor = System.Drawing.Color.MediumPurple
-        Me.btnEvvallUs_lastmonth.Appearance.Options.UseBackColor = True
-        resources.ApplyResources(Me.btnEvvallUs_lastmonth, "btnEvvallUs_lastmonth")
-        Me.btnEvvallUs_lastmonth.Name = "btnEvvallUs_lastmonth"
-        '
         'frmMain
         '
         resources.ApplyResources(Me, "$this")
@@ -823,6 +884,8 @@ Partial Class frmMain
         Me.GroupControl2.ResumeLayout(False)
         CType(Me.GroupControl1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.GroupControl1.ResumeLayout(False)
+        Me.XtraTabPage3.ResumeLayout(False)
+        Me.XtraTabPage3.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -906,4 +969,11 @@ Partial Class frmMain
     Friend WithEvents BarStaticItemGhost As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents btnEvvallUs_thismonth As DevExpress.XtraEditors.SimpleButton
     Friend WithEvents btnEvvallUs_lastmonth As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents GridColumn2 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents bbtnitm2Faktor As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents XtraTabPage3 As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents Label1 As Label
+    Friend WithEvents Button1 As Button
+    Friend WithEvents txtEnvID As TextBox
 End Class

EnvelopeGenerator.Form/frmMain.resx

@@ -265,7 +265,7 @@
     <value>2</value>
   </data>
   <data name="colContractType.Width" type="System.Int32, mscorlib">
-    <value>120</value>
+    <value>112</value>
   </data>
   <data name="colStatus.Caption" xml:space="preserve">
     <value>Status</value>
@@ -277,7 +277,7 @@
     <value>1</value>
   </data>
   <data name="colStatus.Width" type="System.Int32, mscorlib">
-    <value>193</value>
+    <value>180</value>
   </data>
   <data name="colTitle.Caption" xml:space="preserve">
     <value>Titel</value>
@@ -289,7 +289,7 @@
     <value>0</value>
   </data>
   <data name="colTitle.Width" type="System.Int32, mscorlib">
-    <value>575</value>
+    <value>538</value>
   </data>
   <data name="colAddedWhen.Caption" xml:space="preserve">
     <value>Erstellt am</value>
@@ -301,7 +301,19 @@
     <value>3</value>
   </data>
   <data name="colAddedWhen.Width" type="System.Int32, mscorlib">
-    <value>196</value>
+    <value>130</value>
+  </data>
+  <data name="GridColumn2.Caption" xml:space="preserve">
+    <value>Zuletzt geändert am</value>
+  </data>
+  <data name="GridColumn2.Visible" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="GridColumn2.VisibleIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="GridColumn2.Width" type="System.Int32, mscorlib">
+    <value>130</value>
   </data>
   <data name="RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -856,6 +868,43 @@
   <data name="BarStaticItemGhost.ItemAppearance.Normal.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 8.25pt, style=Bold</value>
   </data>
+  <data name="bbtnitm2Faktor.Caption" xml:space="preserve">
+    <value>2Faktor Eigenschaften</value>
+  </data>
+  <data name="bbtnitm2Faktor.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC4GAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
+        UmVke2ZpbGw6I0QxMUMxQzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuR3JlZW57ZmlsbDojMDM5
+        QzIzO30KPC9zdHlsZT4NCiAgPGcgaWQ9IkZpbmdlcnByaW50Ij4NCiAgICA8cGF0aCBkPSJNMjMsNmMt
+        MC4yLDAtMC40LTAuMS0wLjUtMC4yYy0wLjMtMC4yLTYuNi00LjEtMTUsMEM3LDYuMSw2LjQsNS45LDYu
+        MSw1LjRjLTAuMi0wLjUsMC0xLjEsMC41LTEuMyAgIEMxNi0wLjYsMjMuMiw0LDIzLjUsNC4yYzAuNSww
+        LjMsMC42LDAuOSwwLjMsMS40QzIzLjYsNS44LDIzLjMsNiwyMyw2eiBNMy43LDEzLjdjMTAuOS0xMS40
+        LDIyLjItMi4zLDIyLjYtMS45ICAgYzAuNCwwLjQsMS4xLDAuMywxLjQtMC4xYzAuNC0wLjQsMC4zLTEu
+        MS0wLjEtMS40Yy0wLjEtMC4xLTEzLjEtMTAuNy0yNS40LDIuMWMtMC40LDAuNC0wLjQsMSwwLDEuNEMy
+        LjUsMTMuOSwyLjgsMTQsMywxNCAgIEMzLjMsMTQsMy41LDEzLjksMy43LDEzLjd6IE0yNCwyN2MwLTAu
+        Ni0wLjQtMS0xLTFjLTUuMywwLTctMy4zLTcuMS0zLjRjLTAuMi0wLjUtMC44LTAuNy0xLjMtMC40Yy0w
+        LjUsMC4yLTAuNywwLjgtMC40LDEuMyAgIGMwLjEsMC4yLDIuNCw0LjYsOC45LDQuNkMyMy42LDI4LDI0
+        LDI3LjYsMjQsMjd6IE0xNS45LDI5LjRjMC4yLTAuNSwwLTEuMS0wLjQtMS4zYzAsMC0zLjUtMS44LTMu
+        NS01LjFjMC0xLjcsMS4zLTMsMy0zICAgYzEuNiwwLDIuMywwLjgsMy4zLDEuN2MxLDEsMi4zLDIuMyw0
+        LjcsMi4zYzIuOCwwLDUtMi4yLDUtNWMwLTMuMi00LTktMTItOUM3LjYsMTAsMiwxNiwyLDI1YzAsMC42
+        LDAuNCwxLDEsMXMxLTAuNCwxLTEgICBjMC03LjksNC43LTEzLDEyLTEzYzYuNiwwLDEwLDQuNiwxMCw3
+        YzAsMS43LTEuMywzLTMsM2MtMS42LDAtMi4zLTAuOC0zLjMtMS43Yy0xLTEtMi4zLTIuMy00LjctMi4z
+        Yy0yLjgsMC01LDIuMi01LDUgICBjMCw0LjYsNC40LDYuOCw0LjYsNi45QzE0LjcsMzAsMTQuOCwzMCwx
+        NSwzMEMxNS40LDMwLDE1LjcsMjkuOCwxNS45LDI5LjR6IE05LjcsMjkuOGMwLjQtMC40LDAuNS0xLDAu
+        MS0xLjRjMCwwLTEuOC0yLjEtMS44LTUuMyAgIGMwLTIuNCwyLjMtNyw4LTdjNC4zLDAsNiwzLjMsNi4x
+        LDMuNWMwLjIsMC41LDAuOCwwLjcsMS4zLDAuNGMwLjUtMC4yLDAuNy0wLjgsMC40LTEuM0MyMy44LDE4
+        LjQsMjEuNiwxNCwxNiwxNCAgIGMtNi41LDAtMTAsNS4yLTEwLDljMCw0LDIuMSw2LjUsMi4yLDYuN0M4
+        LjQsMjkuOSw4LjcsMzAsOSwzMEM5LjIsMzAsOS41LDI5LjksOS43LDI5Ljh6IiBjbGFzcz0iQmxhY2si
+        IC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
   <data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
@@ -1052,7 +1101,7 @@
     <value>2</value>
   </data>
   <data name="GridColumn3.Width" type="System.Int32, mscorlib">
-    <value>120</value>
+    <value>100</value>
   </data>
   <data name="GridColumn4.Caption" xml:space="preserve">
     <value>Status</value>
@@ -1064,7 +1113,7 @@
     <value>1</value>
   </data>
   <data name="GridColumn4.Width" type="System.Int32, mscorlib">
-    <value>195</value>
+    <value>163</value>
   </data>
   <data name="GridColumn5.Caption" xml:space="preserve">
     <value>Titel</value>
@@ -1076,7 +1125,7 @@
     <value>0</value>
   </data>
   <data name="GridColumn5.Width" type="System.Int32, mscorlib">
-    <value>574</value>
+    <value>482</value>
   </data>
   <data name="GridColumn7.Caption" xml:space="preserve">
     <value>Erstellt am</value>
@@ -1088,7 +1137,19 @@
     <value>3</value>
   </data>
   <data name="GridColumn7.Width" type="System.Int32, mscorlib">
-    <value>195</value>
+    <value>120</value>
+  </data>
+  <data name="GridColumn1.Caption" xml:space="preserve">
+    <value>Zuletzt geändert am</value>
+  </data>
+  <data name="GridColumn1.Visible" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="GridColumn1.VisibleIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="GridColumn1.Width" type="System.Int32, mscorlib">
+    <value>120</value>
   </data>
   <data name="GridCompleted.Size" type="System.Drawing.Size, System.Drawing">
     <value>1088, 469</value>
@@ -1139,7 +1200,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlData.Size" type="System.Drawing.Size, System.Drawing">
-    <value>819, 390</value>
+    <value>907, 390</value>
   </data>
   <data name="GridControlData.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -1262,7 +1323,7 @@
     <value>2</value>
   </data>
   <data name="GroupControl2.Text" xml:space="preserve">
-    <value>Umschläge alle User</value>
+    <value>Umschläge alle User (abrechnungsrelevant)</value>
   </data>
   <data name="&gt;&gt;GroupControl2.Name" xml:space="preserve">
     <value>GroupControl2</value>
@@ -1438,6 +1499,96 @@
   <data name="&gt;&gt;XtraTabPageAdmin.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
+  <data name="Label1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>21, 18</value>
+  </data>
+  <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>66, 13</value>
+  </data>
+  <data name="Label1.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="Label1.Text" xml:space="preserve">
+    <value>EnvelopeID:</value>
+  </data>
+  <data name="&gt;&gt;Label1.Name" xml:space="preserve">
+    <value>Label1</value>
+  </data>
+  <data name="&gt;&gt;Label1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label1.Parent" xml:space="preserve">
+    <value>XtraTabPage3</value>
+  </data>
+  <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="Button1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>24, 85</value>
+  </data>
+  <data name="Button1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>199, 23</value>
+  </data>
+  <data name="Button1.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="Button1.Text" xml:space="preserve">
+    <value>Finalisierung emails prüfen</value>
+  </data>
+  <data name="&gt;&gt;Button1.Name" xml:space="preserve">
+    <value>Button1</value>
+  </data>
+  <data name="&gt;&gt;Button1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Button1.Parent" xml:space="preserve">
+    <value>XtraTabPage3</value>
+  </data>
+  <data name="&gt;&gt;Button1.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="txtEnvID.Location" type="System.Drawing.Point, System.Drawing">
+    <value>24, 34</value>
+  </data>
+  <data name="txtEnvID.Size" type="System.Drawing.Size, System.Drawing">
+    <value>100, 20</value>
+  </data>
+  <data name="txtEnvID.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;txtEnvID.Name" xml:space="preserve">
+    <value>txtEnvID</value>
+  </data>
+  <data name="&gt;&gt;txtEnvID.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtEnvID.Parent" xml:space="preserve">
+    <value>XtraTabPage3</value>
+  </data>
+  <data name="&gt;&gt;txtEnvID.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="XtraTabPage3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1088, 469</value>
+  </data>
+  <data name="XtraTabPage3.Text" xml:space="preserve">
+    <value>Admin Test</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage3.Name" xml:space="preserve">
+    <value>XtraTabPage3</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage3.Type" xml:space="preserve">
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage3.Parent" xml:space="preserve">
+    <value>XtraTabControlMain</value>
+  </data>
+  <data name="&gt;&gt;XtraTabPage3.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
   <data name="&gt;&gt;XtraTabControlMain.Name" xml:space="preserve">
     <value>XtraTabControlMain</value>
   </data>
@@ -1717,6 +1868,12 @@
   <data name="&gt;&gt;colAddedWhen.Type" xml:space="preserve">
     <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;GridColumn2.Name" xml:space="preserve">
+    <value>GridColumn2</value>
+  </data>
+  <data name="&gt;&gt;GridColumn2.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;btnCreateEnvelope.Name" xml:space="preserve">
     <value>btnCreateEnvelope</value>
   </data>
@@ -1819,6 +1976,12 @@
   <data name="&gt;&gt;BarStaticItemGhost.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;bbtnitm2Faktor.Name" xml:space="preserve">
+    <value>bbtnitm2Faktor</value>
+  </data>
+  <data name="&gt;&gt;bbtnitm2Faktor.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
     <value>RibbonPage1</value>
   </data>
@@ -1939,6 +2102,12 @@
   <data name="&gt;&gt;GridColumn7.Type" xml:space="preserve">
     <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;GridColumn1.Name" xml:space="preserve">
+    <value>GridColumn1</value>
+  </data>
+  <data name="&gt;&gt;GridColumn1.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;GridViewData.Name" xml:space="preserve">
     <value>GridViewData</value>
   </data>

EnvelopeGenerator.Form/frmMain.vb

@@ -14,6 +14,8 @@ Imports System.Diagnostics
 Imports System.ComponentModel
 Imports DevExpress.XtraPrinting
 Imports System.Web
+Imports EnvelopeGenerator.Common.Constants
+Imports System.Security.Cryptography
 
 Public Class frmMain
     Private ReadOnly LogConfig As LogConfig
@@ -55,8 +57,10 @@ Public Class frmMain
         End Try
         If MYUSER.IsAdmin Then
             XtraTabControlMain.TabPages(2).PageVisible = True
+            XtraTabControlMain.TabPages(3).PageVisible = True
         Else
             XtraTabControlMain.TabPages(2).PageVisible = False
+            XtraTabControlMain.TabPages(3).PageVisible = False
         End If
         LoadEnvelopeData()
     End Sub
@@ -90,9 +94,11 @@ Public Class frmMain
             If ViewEnvelopes.RowCount = 0 Then
                 RibbonPageGroupFunctions.Enabled = False
                 btnDeleteEnvelope.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+                btnEditEnvelope.Enabled = False
             Else
                 RibbonPageGroupFunctions.Enabled = True
                 btnDeleteEnvelope.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+                btnEditEnvelope.Enabled = True
             End If
         Catch ex As Exception
             Logger.Error(ex)
@@ -220,19 +226,19 @@ Public Class frmMain
                     bbtnitm_ResendInvitation.Enabled = False
                     bbtnitmInfoMail.Enabled = False
                     bbtnitmEB.Enabled = True
+                    bbtnitm2Faktor.Enabled = False
                     LoadEnvelopeData()
                 Case 0
-                    If ViewEnvelopes.RowCount = 0 Then
-                        RibbonPageGroupFunctions.Enabled = False
-                    End If
                     btnEditEnvelope.Enabled = True
                     btnDeleteEnvelope.Enabled = True
                     btnContactReceiver.Enabled = True
                     btnShowDocument.Enabled = True
                     bbtnitm_ResendInvitation.Enabled = True
                     bbtnitmInfoMail.Enabled = True
+                    bbtnitm2Faktor.Enabled = True
                     bbtnitmEB.Enabled = False
                     LoadEnvelopeData()
+
                     txtEnvelopeIdLabel.Caption = "No Envelope selected"
 
                 Case 2
@@ -538,7 +544,7 @@ Public Class frmMain
         End If
         bbtnitmEB.Enabled = False
         RefreshTimer.Start()
-        If USER_GHOST_MODE_ACTIVE Then
+        If USER_GHOST_MODE_ACTIVE Or MYUSER.GhostModeActive Then
             frmGhostMode.ShowDialog()
             If USER_GHOST_MODE_USRNAME <> "" Then
                 MyUserModel = New UserModel(MyState)
@@ -546,7 +552,8 @@ Public Class frmMain
                 Dim oUser = MyUserModel.SelectUser()
                 If oUser IsNot Nothing Then
                     MyUserModel.CheckUserLogin(oUser)
-                    BarStaticItemGhost.Caption = $"GhostMode active: {USER_GHOST_MODE_USRNAME} - End signFLOW to quit mode"
+                    BarStaticItemGhost.Caption = $"GhostMode active: {USER_GHOST_MODE_USRNAME} - End signFLOW to quit ghost-mode"
+                    Me.Text = $"GhostMode active: {USER_GHOST_MODE_USRNAME} - End signFLOW to quit ghost - mode"
                     BarStaticItemGhost.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
                     LoadEnvelopeData()
                 End If
@@ -766,4 +773,63 @@ Public Class frmMain
             GridControlData.DataSource = Nothing
         End If
     End Sub
+
+    Private Sub bbtnitm2Faktor_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitm2Faktor.ItemClick
+        If ViewEnvelopes.FocusedRowHandle < 0 Then
+            Exit Sub
+        End If
+
+        Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
+        Dim oView As GridView = GridEnvelopes.FocusedView
+        If oView.Name = ViewReceivers.Name Then
+            Dim oReceiver As EnvelopeReceiver = oView.GetRow(oView.FocusedRowHandle)
+            Dim oEnvelopeTitle As String = Net.WebUtility.UrlEncode(oEnvelope.Title)
+            Dim oDT As DataTable = DB_DD_ECM.GetDatatable($"SELECT * FROM TBSIG_RECEIVER WHERE EMAIL_ADDRESS = '{oReceiver.Email}'")
+            If Not IsNothing(oDT) Then
+                If oDT.Rows.Count = 1 Then
+                    Dim oTFA_REG_DL = oDT.Rows(0).Item("TFA_REG_DEADLINE")
+                    Dim oTOTP = oDT.Rows(0).Item("TOTP_SECRET_KEY")
+                    Dim oForm As New frm2Factor_Properties(oReceiver.Email, oTOTP, oTFA_REG_DL, DB_DD_ECM)
+                    oForm.ShowDialog()
+                End If
+            End If
+
+        Else
+            MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
+        End If
+    End Sub
+
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        If txtEnvID.Text = String.Empty Then
+            Exit Sub
+        End If
+        Dim EnvelopeModel As EnvelopeModel
+        Dim oState = GetState()
+        EnvelopeModel = New EnvelopeModel(oState)
+
+        Dim oEnvelope = EnvelopeModel.GetById(txtEnvID.Text)
+        Dim oMailToCreator = oEnvelope.FinalEmailToCreator
+        Dim oMailToReceivers = oEnvelope.FinalEmailToReceivers
+
+        If oMailToCreator <> FinalEmailType.No Then
+            MsgBox("Finale email an Creator könnten/würden gesendet werden!")
+        Else
+            MsgBox("Finale email an Creator könnte/würde nicht erzeugt werden!" & vbNewLine & $"No SendFinalEmailToCreator - oMailToCreator [{oMailToCreator}] <> [{FinalEmailType.No}]")
+        End If
+
+        If oMailToReceivers <> FinalEmailType.No Then
+            MsgBox("Finale email an Unterzeichner könnten/würden gesendet werden!")
+        Else
+            MsgBox("Finale email an Unterzeichner könnte/würde nicht erzeugt werden!" & vbNewLine & $"No SendFinalEmailToReceivers - oMailToReceivers [{oMailToReceivers}] <> [{FinalEmailType.No}]")
+        End If
+    End Sub
+    Private Function GetState() As State
+        Return New State With {
+            .LogConfig = LogConfig,
+            .UserId = 0,
+            .Database = DB_DD_ECM,
+            .Config = Nothing,
+            .DbConfig = Nothing
+        }
+    End Function
 End Class

EnvelopeGenerator.Form/frmSplashScreen.resx

@@ -121,7 +121,7 @@
   <data name="PictureEdit1.EditValue" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAyAAAADICAYAAAAQj4UaAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        DQAACw0B7QfALAAASudJREFUeF7tvWusZNd5nukfcpSOmmre3Wp2s3lrdpNUk01RPxIk6iBBIjFxMBPZ
+        DAAACwwBP0AiyAAASudJREFUeF7tvWusZNd5nukfcpSOmmre3Wp2s3lrdpNUk01RPxIk6iBBIjFxMBPZ
         DGxLEyB2M8ggkegAsSRElikHEsnBJFZrRjZtxZIpZaIZRy2AloGxrAHIRKIQRIqVGJ6AsJEAAwgDOzNJ
         HCBSLsqfynmq+HV9tepd+1KnLnufen88OKf2rfa67HPed3/rW+t7PnffoxNjjDHGGLNb/n4L/9t9l6b8
         vXsX+ewBn1ngkSkvCH79hy9NXr5yafKbz1yavHr10uRfv/jo5Pe//Ohk8uoMfmcb+ziGYznnc4/q663C

EnvelopeGenerator.GeneratorAPI/Controllers/AuthController.cs

@@ -1,201 +1,142 @@
 using DigitalData.Core.Abstractions.Application;
 using DigitalData.UserManager.Application.Contracts;
-using DigitalData.UserManager.Application.DTOs.User;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Mvc;
-using System.Security.Claims;
-using DigitalData.UserManager.Application.DTOs.Auth;
 using Microsoft.AspNetCore.Authorization;
 using EnvelopeGenerator.GeneratorAPI.Models;
 
-namespace EnvelopeGenerator.GeneratorAPI.Controllers
+namespace EnvelopeGenerator.GeneratorAPI.Controllers;
+
+/// <summary>
+/// Controller verantwortlich für die Benutzer-Authentifizierung, einschließlich Anmelden, Abmelden und Überprüfung des Authentifizierungsstatus.
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+public partial class AuthController : ControllerBase
 {
+    private readonly ILogger<AuthController> _logger;
+    private readonly IUserService _userService;
+    private readonly IDirectorySearchService _dirSearchService;
+
     /// <summary>
-    /// Controller verantwortlich für die Benutzer-Authentifizierung, einschließlich Anmelden, Abmelden und Überprüfung des Authentifizierungsstatus.
+    /// Initializes a new instance of the <see cref="AuthController"/> class.
     /// </summary>
-    [Route("api/[controller]")]
+    /// <param name="logger">The logger instance.</param>
-    [ApiController]
+    /// <param name="userService">The user service instance.</param>
-    public partial class AuthController : ControllerBase
+    /// <param name="dirSearchService">The directory search service instance.</param>
+    public AuthController(ILogger<AuthController> logger, IUserService userService, IDirectorySearchService dirSearchService)
     {
-        private readonly ILogger<AuthController> _logger;
+        _logger = logger;
-        private readonly IUserService _userService;
+        _userService = userService;
-        private readonly IDirectorySearchService _dirSearchService;
+        _dirSearchService = dirSearchService;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AuthController"/> class.
-        /// </summary>
-        /// <param name="logger">The logger instance.</param>
-        /// <param name="userService">The user service instance.</param>
-        /// <param name="dirSearchService">The directory search service instance.</param>
-        public AuthController(ILogger<AuthController> logger, IUserService userService, IDirectorySearchService dirSearchService)
-        {
-            _logger = logger;
-            _userService = userService;
-            _dirSearchService = dirSearchService;
-        }
-
-        /// <summary>
-        /// Authentifiziert einen Benutzer und generiert ein JWT-Token. Wenn 'cookie' wahr ist, wird das Token als HTTP-Only-Cookie zurückgegeben.
-        /// </summary>
-        /// <param name="login">Benutzeranmeldedaten (Benutzername und Passwort).</param>
-        /// <param name="cookie">Wenn wahr, wird das JWT-Token auch als HTTP-Only-Cookie gesendet.</param>
-        /// <returns>
-        /// Gibt eine HTTP 200 oder 401.
-        /// </returns>
-        /// <remarks>
-        /// Sample request:
-        ///
-        ///     POST /api/auth?cookie=true
-        ///     {
-        ///        "username": "MaxMustermann",
-        ///        "password": "Geheim123!"
-        ///     }
-        ///     
-        ///     POST /api/auth?cookie=true
-        ///     {
-        ///        "id": "1",
-        ///        "password": "Geheim123!"
-        ///     }
-        ///
-        /// </remarks>
-        /// <response code="200">Erfolgreiche Anmeldung. Gibt das JWT-Token im Antwortkörper oder als Cookie zurück, wenn 'cookie' wahr ist.</response>
-        /// <response code="401">Unbefugt. Ungültiger Benutzername oder Passwort.</response>
-        [ProducesResponseType(typeof(string), StatusCodes.Status200OK, "text/javascript")]
-        [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
-        [AllowAnonymous]
-        [HttpPost]
-        public async Task<IActionResult> Login([FromBody] Login login, [FromQuery] bool cookie = false)
-        {
-            try
-            {
-                bool isValid = _dirSearchService.ValidateCredentials(login.Username, login.Password);
-
-                if (!isValid)
-                    return Unauthorized();
-
-                //find the user
-                var uRes = await _userService.ReadByUsernameAsync(login.Username);
-                if (!uRes.IsSuccess || uRes.Data is null)
-                {
-                    return Forbid();
-                }
-
-                UserReadDto user = uRes.Data;
-
-                // Create claims
-                var claims = new List<Claim>
-                    {
-                        new (ClaimTypes.NameIdentifier, user.Id.ToString()),
-                        new (ClaimTypes.Name, user.Username),
-                        new (ClaimTypes.Surname, user.Name!),
-                        new (ClaimTypes.GivenName, user.Prename!),
-                        new (ClaimTypes.Email, user.Email!),
-                    };
-
-                // Create claimsIdentity
-                var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
-
-                // Create authProperties
-                var authProperties = new AuthenticationProperties
-                {
-                    IsPersistent = true,
-                    AllowRefresh = true,
-                    ExpiresUtc = DateTime.Now.AddMinutes(180)
-                };
-
-                // Sign in
-                await HttpContext.SignInAsync(
-                    CookieAuthenticationDefaults.AuthenticationScheme,
-                    new ClaimsPrincipal(claimsIdentity),
-                    authProperties);
-
-                return Ok();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Unexpected error occurred.\n{ErrorMessage}", ex.Message);
-                return StatusCode(StatusCodes.Status500InternalServerError);
-            }
-        }
-
-        /// <summary>
-        /// Authentifiziert einen Benutzer und generiert ein JWT-Token. Das Token wird als HTTP-only-Cookie zurückgegeben.
-        /// </summary>
-        /// <param name="login">Benutzeranmeldedaten (Benutzername und Passwort).</param>
-        /// <returns>
-        /// Gibt eine HTTP 200 oder 401.
-        /// </returns>
-        /// <remarks>
-        /// Sample request:
-        ///
-        ///     POST /api/auth/form
-        ///     {
-        ///        "username": "MaxMustermann",
-        ///        "password": "Geheim123!"
-        ///     }
-        ///
-        /// </remarks>
-        /// <response code="200">Erfolgreiche Anmeldung. Gibt das JWT-Token im Antwortkörper oder als Cookie zurück, wenn 'cookie' wahr ist.</response>
-        /// <response code="401">Unbefugt. Ungültiger Benutzername oder Passwort.</response>
-        [ProducesResponseType(typeof(string), StatusCodes.Status200OK, "text/javascript")]
-        [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
-        [AllowAnonymous]
-        [HttpPost]
-        [Route("form")]
-        public async Task<IActionResult> Login([FromForm] Login login)
-        {
-            return await Login(login, true);
-        }
-
-        /// <summary>
-        /// Entfernt das Authentifizierungs-Cookie des Benutzers (AuthCookie)
-        /// </summary>
-        /// <returns>
-        /// Gibt eine HTTP 200 oder 401.
-        /// </returns>
-        /// <remarks>
-        /// Sample request:
-        ///
-        ///     POST /api/auth/logout
-        ///
-        /// </remarks>
-        /// <response code="200">Erfolgreich gelöscht, wenn der Benutzer ein berechtigtes Cookie hat.</response>
-        /// <response code="401">Wenn es kein zugelassenes Cookie gibt, wird „nicht zugelassen“ zurückgegeben.</response>
-        [ProducesResponseType(typeof(string), StatusCodes.Status200OK, "text/javascript")]
-        [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
-        [Authorize]
-        [HttpPost("logout")]
-        public async Task<IActionResult> Logout()
-        {
-            try
-            {
-                await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-                return Ok();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Unexpected error occurred.\n{ErrorMessage}", ex.Message);
-                return StatusCode(StatusCodes.Status500InternalServerError);
-            }
-        }
-
-        /// <summary>
-        /// Prüft, ob der Benutzer ein autorisiertes Token hat.
-        /// </summary>
-        /// <returns>Wenn ein autorisiertes Token vorhanden ist HTTP 200 asynchron 401</returns>
-        /// <remarks>
-        /// Sample request:
-        ///
-        ///     GET /api/auth
-        ///
-        /// </remarks>
-        /// <response code="200">Wenn es einen autorisierten Cookie gibt.</response>
-        /// <response code="401">Wenn kein Cookie vorhanden ist oder nicht autorisierte.</response>
-        [ProducesResponseType(typeof(string), StatusCodes.Status200OK, "text/javascript")]
-        [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
-        [Authorize]
-        [HttpGet]
-        public IActionResult IsAuthenticated() => Ok();
     }
+
+    /// <summary>
+    /// Authentifiziert einen Benutzer und generiert ein JWT-Token. Wenn 'cookie' wahr ist, wird das Token als HTTP-Only-Cookie zurückgegeben.
+    /// </summary>
+    /// <param name="login">Benutzeranmeldedaten (Benutzername und Passwort).</param>
+    /// <param name="cookie">Wenn wahr, wird das JWT-Token auch als HTTP-Only-Cookie gesendet.</param>
+    /// <returns>
+    /// Gibt eine HTTP 200 oder 401.
+    /// </returns>
+    /// <remarks>
+    /// Sample request:
+    ///
+    ///     POST /api/auth?cookie=true
+    ///     {
+    ///        "username": "MaxMustermann",
+    ///        "password": "Geheim123!"
+    ///     }
+    ///     
+    ///     POST /api/auth?cookie=true
+    ///     {
+    ///        "id": "1",
+    ///        "password": "Geheim123!"
+    ///     }
+    ///
+    /// </remarks>
+    /// <response code="200">Erfolgreiche Anmeldung. Gibt das JWT-Token im Antwortkörper oder als Cookie zurück, wenn 'cookie' wahr ist.</response>
+    /// <response code="401">Unbefugt. Ungültiger Benutzername oder Passwort.</response>
+    [ProducesResponseType(typeof(string), StatusCodes.Status200OK, "text/javascript")]
+    [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
+    [AllowAnonymous]
+    [HttpPost]
+    public Task<IActionResult> Login([FromBody] Login login, [FromQuery] bool cookie = false)
+    {
+        // added to configure open API (swagger and scalar)
+        throw new NotImplementedException();
+    }
+
+    /// <summary>
+    /// Authentifiziert einen Benutzer und generiert ein JWT-Token. Das Token wird als HTTP-only-Cookie zurückgegeben.
+    /// </summary>
+    /// <param name="login">Benutzeranmeldedaten (Benutzername und Passwort).</param>
+    /// <returns>
+    /// Gibt eine HTTP 200 oder 401.
+    /// </returns>
+    /// <remarks>
+    /// Sample request:
+    ///
+    ///     POST /api/auth/form
+    ///     {
+    ///        "username": "MaxMustermann",
+    ///        "password": "Geheim123!"
+    ///     }
+    ///
+    /// </remarks>
+    /// <response code="200">Erfolgreiche Anmeldung. Gibt das JWT-Token im Antwortkörper oder als Cookie zurück, wenn 'cookie' wahr ist.</response>
+    /// <response code="401">Unbefugt. Ungültiger Benutzername oder Passwort.</response>
+    [ProducesResponseType(typeof(string), StatusCodes.Status200OK, "text/javascript")]
+    [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
+    [AllowAnonymous]
+    [HttpPost]
+    [Route("form")]
+    public Task<IActionResult> Login([FromForm] Login login)
+    {
+        // added to configure open API (swagger and scalar)
+        throw new NotImplementedException();
+    }
+
+    /// <summary>
+    /// Entfernt das Authentifizierungs-Cookie des Benutzers (AuthCookie)
+    /// </summary>
+    /// <returns>
+    /// Gibt eine HTTP 200 oder 401.
+    /// </returns>
+    /// <remarks>
+    /// Sample request:
+    ///
+    ///     POST /api/auth/logout
+    ///
+    /// </remarks>
+    /// <response code="200">Erfolgreich gelöscht, wenn der Benutzer ein berechtigtes Cookie hat.</response>
+    /// <response code="401">Wenn es kein zugelassenes Cookie gibt, wird „nicht zugelassen“ zurückgegeben.</response>
+    [ProducesResponseType(typeof(string), StatusCodes.Status200OK, "text/javascript")]
+    [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
+    [Authorize]
+    [HttpPost("logout")]
+    public async Task<IActionResult> Logout()
+    {
+        await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+        return Ok();
+    }
+
+    /// <summary>
+    /// Prüft, ob der Benutzer ein autorisiertes Token hat.
+    /// </summary>
+    /// <returns>Wenn ein autorisiertes Token vorhanden ist HTTP 200 asynchron 401</returns>
+    /// <remarks>
+    /// Sample request:
+    ///
+    ///     GET /api/auth
+    ///
+    /// </remarks>
+    /// <response code="200">Wenn es einen autorisierten Cookie gibt.</response>
+    /// <response code="401">Wenn kein Cookie vorhanden ist oder nicht autorisierte.</response>
+    [ProducesResponseType(typeof(string), StatusCodes.Status200OK, "text/javascript")]
+    [ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
+    [Authorize]
+    [HttpGet]
+    public IActionResult IsAuthenticated() => Ok();
 }

EnvelopeGenerator.GeneratorAPI/Controllers/ControllerExtensions.cs

@@ -3,22 +3,60 @@ using System.Security.Claims;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers
 {
+    /// <summary>
+    /// Provides extension methods for extracting user information from a <see cref="ClaimsPrincipal"/>.
+    /// </summary>
     public static class ControllerExtensions
     {
-        public static int? GetId(this ClaimsPrincipal user)
+        /// <summary>
-            => int.TryParse(user.FindFirst(ClaimTypes.NameIdentifier)?.Value, out int result)
+        /// Attempts to retrieve the user's ID from the claims. Returns null if the ID is not found or invalid.
+        /// </summary>
+        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
+        /// <returns>The user's ID as an integer, or null if not found or invalid.</returns>
+        public static int? GetIdOrDefault(this ClaimsPrincipal user)
+            => int.TryParse(user.FindFirstValue(ClaimTypes.NameIdentifier) ?? user.FindFirstValue("sub"), out int result)
                 ? result : null;
-        
+
-        public static string? GetUsername(this ClaimsPrincipal user)
+        /// <summary>
+        /// Retrieves the user's ID from the claims. Throws an exception if the ID is missing or invalid.
+        /// </summary>
+        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
+        /// <returns>The user's ID as an integer.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if the user ID claim is missing or invalid.</exception>
+        public static int GetId(this ClaimsPrincipal user)
+            => user.GetIdOrDefault()
+            ?? throw new InvalidOperationException("User ID claim is missing or invalid. This may indicate a misconfigured or forged JWT token.");
+
+        /// <summary>
+        /// Retrieves the username from the claims, if available.
+        /// </summary>
+        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
+        /// <returns>The username as a string, or null if not found.</returns>
+        public static string? GetUsernameOrDefault(this ClaimsPrincipal user)
             => user.FindFirst(ClaimTypes.Name)?.Value;
-        
+
-        public static string? GetName(this ClaimsPrincipal user)
+        /// <summary>
+        /// Retrieves the user's surname (last name) from the claims, if available.
+        /// </summary>
+        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
+        /// <returns>The surname as a string, or null if not found.</returns>
+        public static string? GetNameOrDefault(this ClaimsPrincipal user)
             => user.FindFirst(ClaimTypes.Surname)?.Value;
-        
+
-        public static string? GetPrename(this ClaimsPrincipal user)
+        /// <summary>
+        /// Retrieves the user's given name (first name) from the claims, if available.
+        /// </summary>
+        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
+        /// <returns>The given name as a string, or null if not found.</returns>
+        public static string? GetPrenameOrDefault(this ClaimsPrincipal user)
             => user.FindFirst(ClaimTypes.GivenName)?.Value;
-        
+
-        public static string? GetEmail(this ClaimsPrincipal user)
+        /// <summary>
+        /// Retrieves the user's email address from the claims, if available.
+        /// </summary>
+        /// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
+        /// <returns>The email address as a string, or null if not found.</returns>
+        public static string? GetEmailOrDefault(this ClaimsPrincipal user)
             => user.FindFirst(ClaimTypes.Email)?.Value;
     }
 }

EnvelopeGenerator.GeneratorAPI/Controllers/EmailTemplateController.cs

@@ -5,11 +5,17 @@ using EnvelopeGenerator.Application.EmailTemplates.Commands.Reset;
 using EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using EnvelopeGenerator.Application.Contracts.Repositories;
+using EnvelopeGenerator.Application.DTOs;
+using MediatR;
+using System.Threading.Tasks;
+using DigitalData.UserManager.Application.Services;
+using EnvelopeGenerator.Application.Exceptions;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 
 /// <summary>
-/// Controller for managing email templates.
+/// Controller for managing temp templates.
 /// Steuerung zur Verwaltung von E-Mail-Vorlagen.
 /// </summary>
 [Route("api/[controller]")]
@@ -17,17 +23,27 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 [Authorize]
 public class EmailTemplateController : ControllerBase
 {
+    private readonly ILogger<EmailTemplateController> _logger;
+
     private readonly IMapper _mapper;
 
+    private readonly IEmailTemplateRepository _repository;
+
+    private readonly IMediator _mediator;
+
     /// <summary>
     /// Initialisiert eine neue Instanz der <see cref="EmailTemplateController"/>-Klasse.
     /// </summary>
     /// <param name="mapper">
+    /// <param name="repository">
     /// Die AutoMapper-Instanz, die zum Zuordnen von Objekten verwendet wird.
     /// </param>
-    public EmailTemplateController(IMapper mapper)
+    public EmailTemplateController(IMapper mapper, IEmailTemplateRepository repository, ILogger<EmailTemplateController> logger, IMediator mediator)
     {
         _mapper = mapper;
+        _repository = repository;
+        _logger = logger;
+        _mediator = mediator;
     }
 
     /// <summary>
@@ -45,17 +61,25 @@ public class EmailTemplateController : ControllerBase
     /// <response code="401">Wenn der Benutzer nicht authentifiziert ist.</response>
     /// <response code="404">Wenn die gesuchte Abfrage nicht gefunden wird.</response>
     [HttpGet]
-    public IActionResult Get([FromQuery] ReadEmailTemplateQuery? emailTemplate = null)
+    public async Task<IActionResult> Get([FromQuery] ReadEmailTemplateQuery? emailTemplate = null)
     {
-        // Implementation logic here
+        if (emailTemplate is null || (emailTemplate.Id is null && emailTemplate.Type is null))
-        return Ok(); // Placeholder for actual implementation
+        {
+            var temps = await _repository.ReadAllAsync();
+            return Ok(_mapper.Map<IEnumerable<EmailTemplateDto>>(temps));
+        }
+        else
+        {
+            var temp = await _mediator.Send(emailTemplate);
+            return temp is null ? NotFound() : Ok(temp);
+        }
     }
 
     /// <summary>
-    /// Updates an email template or resets it if no update command is provided.
+    /// Updates an temp template or resets it if no update command is provided.
     /// Aktualisiert eine E-Mail-Vorlage oder setzt sie zurück, wenn kein Aktualisierungsbefehl angegeben ist.
     /// </summary>
-    /// <param name="email">Die E-Mail-Vorlagenabfrage.</param>
+    /// <param name="temp">Die E-Mail-Vorlagenabfrage.</param>
     /// <param name="update">Der Aktualisierungsbefehl für die E-Mail-Vorlage.
     /// Wird auf Standardwert aktualisiert, wenn die Anfrage ohne http-Body gesendet wird.
     /// </param>
@@ -73,19 +97,22 @@ public class EmailTemplateController : ControllerBase
     /// <response code="401">Wenn der Benutzer nicht authentifiziert ist.</response>
     /// <response code="404">Wenn die gesuchte Abfrage nicht gefunden wird.</response>
     [HttpPut]
-    public IActionResult Update([FromQuery] EmailTemplateQuery email, [FromBody] UpdateEmailTemplateCommand? update = null)
+    public async Task<IActionResult> Update([FromQuery] EmailTemplateQuery? temp = null, [FromBody] UpdateEmailTemplateCommand? update = null)
     {
         if (update is null)
         {
-            var reset = _mapper.Map<ResetEnvelopeTemplateCommand>(email);
+            await _mediator.Send(new ResetEmailTemplateCommand(temp));
-            // Logic for resetting the email template
+            return Ok();
+        }
+        else if (temp is null)
+        {
+            return BadRequest("No both id and type");
         }
         else
         {
-            update.EmailTemplateQuery = email;
+            update.EmailTemplateQuery = temp;
-            // Logic for updating the email template
+            await _mediator.Send(update);
+            return Ok();
         }
-
-        return Ok(); // Placeholder for actual implementation
     }
 }

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs

@@ -1,8 +1,13 @@
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Envelopes.Commands;
 using EnvelopeGenerator.Application.Envelopes.Queries.Read;
+using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 
@@ -27,16 +32,19 @@ public class EnvelopeController : ControllerBase
 {
     private readonly ILogger<EnvelopeController> _logger;
     private readonly IEnvelopeService _envelopeService;
+    private readonly IMediator _mediator;
 
     /// <summary>
     /// Erstellt eine neue Instanz des EnvelopeControllers.
     /// </summary>
     /// <param name="logger">Der Logger, der für das Protokollieren von Informationen verwendet wird.</param>
     /// <param name="envelopeService">Der Dienst, der für die Verarbeitung von Umschlägen zuständig ist.</param>
-    public EnvelopeController(ILogger<EnvelopeController> logger, IEnvelopeService envelopeService)
+    /// <param name="mediator"></param>
+    public EnvelopeController(ILogger<EnvelopeController> logger, IEnvelopeService envelopeService, IMediator mediator)
     {
         _logger = logger;
         _envelopeService = envelopeService;
+        _mediator = mediator;
     }
 
     /// <summary>
@@ -53,26 +61,97 @@ public class EnvelopeController : ControllerBase
     [HttpGet]
     public async Task<IActionResult> GetAsync([FromQuery] ReadEnvelopeQuery envelope)
     {
-        try
+        if (User.GetId() is int intId)
+            return await _envelopeService.ReadByUserAsync(intId, min_status: envelope.Status, max_status: envelope.Status).ThenAsync(
+                Success: envelopes =>
+                {
+                    if (envelope.Id is int id)
+                        envelopes = envelopes.Where(e => e.Id == id);
+
+                    if (envelope.Status is int status)
+                        envelopes = envelopes.Where(e => e.Status == status);
+
+                    if (envelope.Uuid is string uuid)
+                        envelopes = envelopes.Where(e => e.Uuid == uuid);
+
+                    return envelopes.Any() ? Ok(envelopes) : NotFound();
+                },
+                Fail: IActionResult (msg, ntc) =>
+                {
+                    _logger.LogNotice(ntc);
+                    return StatusCode(StatusCodes.Status500InternalServerError);
+                });
+        else
         {
-            if (User.GetId() is int intId)
+            _logger.LogError("Trotz erfolgreicher Autorisierung wurde die Benutzer-ID nicht als Ganzzahl erkannt. Dies könnte auf eine fehlerhafte Erstellung der Anspruchsliste zurückzuführen sein.");
-                return await _envelopeService.ReadByUserAsync(intId, min_status: envelope.Status, max_status: envelope.Status).ThenAsync(
-                    Success: Ok,
-                    Fail: IActionResult (msg, ntc) =>
-                    {
-                        _logger.LogNotice(ntc);
-                        return StatusCode(StatusCodes.Status500InternalServerError);
-                    });
-            else
-            {
-                _logger.LogError("Trotz erfolgreicher Autorisierung wurde die Benutzer-ID nicht als Ganzzahl erkannt. Dies könnte auf eine fehlerhafte Erstellung der Anspruchsliste zurückzuführen sein.");
-                return StatusCode(StatusCodes.Status500InternalServerError);
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "{Message}", ex.Message);
             return StatusCode(StatusCodes.Status500InternalServerError);
         }
     }
+
+    /// <summary>
+    /// Ruft das Ergebnis eines Dokuments basierend auf der ID ab.
+    /// </summary>
+    /// <param name="id">Die eindeutige ID des Umschlags.</param>
+    /// <param name="view">Gibt an, ob das Dokument inline angezeigt werden soll (true) oder als Download bereitgestellt wird (false).</param>
+    /// <returns>Eine IActionResult-Instanz, die das Dokument oder einen Fehlerstatus enthält.</returns>
+    /// <response code="200">Das Dokument wurde erfolgreich abgerufen.</response>
+    /// <response code="404">Das Dokument wurde nicht gefunden oder ist nicht verfügbar.</response>
+    /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
+    [HttpGet("doc-result")]
+    public async Task<IActionResult> GetDocResultAsync([FromQuery] int id, [FromQuery] bool view = false)
+    {
+        if (User.GetId() is int intId)
+            return await _envelopeService.ReadByUserAsync(intId).ThenAsync(
+                Success: envelopes =>
+                {
+                    var envelope = envelopes.Where(e => e.Id == id).FirstOrDefault();
+
+                    if (envelope is null)
+                        return NotFound("Envelope not available.");
+                    else if (envelope?.DocResult is null)
+                        return NotFound("The document has not been fully signed or the result has not yet been released.");
+                    else
+                    {
+                        if (view)
+                        {
+                            Response.Headers.Append("Content-Disposition", "inline; filename=\"" + envelope.Uuid + ".pdf\"");
+                            return File(envelope.DocResult, "application/pdf");
+                        }
+                        else
+                            return File(envelope.DocResult, "application/pdf", $"{envelope.Uuid}.pdf");
+                    }
+                },
+                Fail: IActionResult (msg, ntc) =>
+                {
+                    _logger.LogNotice(ntc);
+                    return StatusCode(StatusCodes.Status500InternalServerError);
+                });
+        else
+        {
+            _logger.LogError("Trotz erfolgreicher Autorisierung wurde die Benutzer-ID nicht als Ganzzahl erkannt. Dies könnte auf eine fehlerhafte Erstellung der Anspruchsliste zurückzuführen sein.");
+            return StatusCode(StatusCodes.Status500InternalServerError);
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="envelope"></param>
+    /// <returns></returns>
+    [NonAction]
+    [Authorize]
+    [HttpPost]
+    public async Task<IActionResult> CreateAsync([FromQuery] CreateEnvelopeCommand envelope)
+    {
+        envelope.UserId = User.GetId();
+        var res = await _mediator.Send(envelope);
+
+        if (res is null)
+        {
+            _logger.LogError("Failed to create envelope. Envelope details: {EnvelopeDetails}", JsonConvert.SerializeObject(envelope));
+            return StatusCode(StatusCodes.Status500InternalServerError);
+        }
+        else
+            return Ok(res);
+    }
 }

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeReceiverController.cs

@@ -1,11 +1,20 @@
-using DigitalData.Core.DTO;
+using AutoMapper;
+using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
+using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Commands.Create;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Queries.Read;
 using EnvelopeGenerator.Application.Envelopes.Queries.ReceiverName;
+using EnvelopeGenerator.Application.SQL;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.GeneratorAPI.Models;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Data.SqlClient;
+using Microsoft.Extensions.Options;
+using System.Data;
 
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 
@@ -26,17 +35,37 @@ public class EnvelopeReceiverController : ControllerBase
 
     private readonly IMediator _mediator;
 
+    private readonly IMapper _mapper;
+
+    private readonly IEnvelopeExecutor _envelopeExecutor;
+
+    private readonly IEnvelopeReceiverExecutor _erExecutor;
+
+    private readonly IDocumentExecutor _documentExecutor;
+
+    private readonly string _cnnStr;
+
     /// <summary>
     /// Konstruktor für den EnvelopeReceiverController.
     /// </summary>
     /// <param name="logger">Logger-Instanz zur Protokollierung von Informationen und Fehlern.</param>
     /// <param name="envelopeReceiverService">Service zur Verwaltung von Umschlagempfängern.</param>
     /// <param name="mediator">Mediator-Instanz zur Verarbeitung von Befehlen und Abfragen.</param>
-    public EnvelopeReceiverController(ILogger<EnvelopeReceiverController> logger, IEnvelopeReceiverService envelopeReceiverService, IMediator mediator)
+    /// <param name="mapper"></param>
+    /// <param name="envelopeExecutor"></param>
+    /// <param name="erExecutor"></param>
+    /// <param name="documentExecutor"></param>
+    /// <param name="csOpt"></param>
+    public EnvelopeReceiverController(ILogger<EnvelopeReceiverController> logger, IEnvelopeReceiverService envelopeReceiverService, IMediator mediator, IMapper mapper, IEnvelopeExecutor envelopeExecutor, IEnvelopeReceiverExecutor erExecutor, IDocumentExecutor documentExecutor, IOptions<ConnectionString> csOpt)
     {
         _logger = logger;
         _erService = envelopeReceiverService;
         _mediator = mediator;
+        _mapper = mapper;
+        _envelopeExecutor = envelopeExecutor;
+        _erExecutor = erExecutor;
+        _documentExecutor = documentExecutor;
+        _cnnStr = csOpt.Value.Value;
     }
 
     /// <summary>
@@ -55,36 +84,35 @@ public class EnvelopeReceiverController : ControllerBase
     [HttpGet]
     public async Task<IActionResult> GetEnvelopeReceiver([FromQuery] ReadEnvelopeReceiverQuery envelopeReceiver)
     {
-        try
+        var username = User.GetUsernameOrDefault();
-        {
-            var username = User.GetUsername();
 
-            if (username is null)
+        if (username is null)
-            {
-                _logger.LogError(@"Envelope Receiver dto cannot be sent because username claim is null. Potential authentication and authorization error. The value of other claims are [id: {id}], [username: {username}], [name: {name}], [prename: {prename}], [email: {email}].",
-                    User.GetId(), User.GetUsername(), User.GetName(), User.GetPrename(), User.GetEmail());
-                return StatusCode(StatusCodes.Status500InternalServerError);
-            }
-
-            return await _erService.ReadByUsernameAsync(username: username).ThenAsync(
-                    Success: Ok,
-                    Fail: IActionResult (msg, ntc) =>
-                    {
-                        _logger.LogNotice(ntc);
-                        return StatusCode(StatusCodes.Status500InternalServerError, msg);
-                    });
-        }
-        catch (Exception ex)
         {
-            _logger.LogError(ex, "An unexpected error occurred. {message}", ex.Message);
+            _logger.LogError(@"Envelope Receiver dto cannot be sent because username claim is null. Potential authentication and authorization error. The value of other claims are [id: {id}], [username: {username}], [name: {name}], [prename: {prename}], [email: {email}].",
-            return new StatusCodeResult(StatusCodes.Status500InternalServerError);
+                User.GetId(), User.GetUsernameOrDefault(), User.GetNameOrDefault(), User.GetPrenameOrDefault(), User.GetEmailOrDefault());
+            return StatusCode(StatusCodes.Status500InternalServerError);
         }
+
+        return await _erService.ReadByUsernameAsync(
+            username: username,
+            min_status: envelopeReceiver.Status?.Min,
+            max_status: envelopeReceiver.Status?.Max,
+            envelopeQuery: envelopeReceiver.Envelope,
+            receiverQuery: envelopeReceiver.Receiver,
+            ignore_statuses: envelopeReceiver.Status?.Ignore ?? Array.Empty<int>())
+            .ThenAsync(
+                Success: Ok,
+                Fail: IActionResult (msg, ntc) =>
+                {
+                    _logger.LogNotice(ntc);
+                    return StatusCode(StatusCodes.Status500InternalServerError, msg);
+                });
     }
 
     /// <summary>
     /// Ruft den Namen des zuletzt verwendeten Empfängers basierend auf der angegebenen E-Mail-Adresse ab.
     /// </summary>
-    /// <param name="receiverName">Die Abfrage, die die E-Mail-Adresse des Empfängers enthält.</param>
+    /// <param name="receiver">Abfrage, bei der nur eine der Angaben ID, Signatur oder E-Mail-Adresse des Empfängers eingegeben werden muss.</param>
     /// <returns>Eine HTTP-Antwort mit dem Namen des Empfängers oder einem Fehlerstatus.</returns>
     /// <remarks>
     /// Dieser Endpunkt ermöglicht es, den Namen des zuletzt verwendeten Empfängers basierend auf der E-Mail-Adresse abzurufen.
@@ -95,33 +123,24 @@ public class EnvelopeReceiverController : ControllerBase
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
     [Authorize]
     [HttpGet("salute")]
-    public async Task<IActionResult> GetReceiverName([FromQuery] ReadReceiverNameQuery receiverName)
+    public async Task<IActionResult> GetReceiverName([FromQuery] ReadReceiverNameQuery receiver)
     {
-        try
+        return await _erService.ReadLastUsedReceiverNameByMailAsync(receiver.EmailAddress, receiver.Id, receiver.Signature).ThenAsync(
-        {
+                        Success: res => res is null ? NotFound() : Ok(res),
-            return await _erService.ReadLastUsedReceiverNameByMail(receiverName.EmailAddress).ThenAsync(
+                        Fail: IActionResult (msg, ntc) =>
-                            Success: res => res is null ? Ok(string.Empty) : Ok(res),
+                        {
-                            Fail: IActionResult (msg, ntc) =>
+                            if (ntc.HasFlag(Flag.NotFound))
-                            {
+                                return NotFound();
-                                if (ntc.HasFlag(Flag.NotFound))
-                                    return NotFound();
 
-                                _logger.LogNotice(ntc);
+                            _logger.LogNotice(ntc);
-                                return StatusCode(StatusCodes.Status500InternalServerError);
+                            return StatusCode(StatusCodes.Status500InternalServerError);
-                            });
+                        });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "{message}", ex.Message);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
     }
 
     /// <summary>
     /// Datenübertragungsobjekt mit Informationen zu Umschlägen, Empfängern und Unterschriften.
     /// </summary>
-    /// <param name="createEnvelopeQuery"></param>
+    /// <param name="request"></param>
-    /// <param name="cancellationToken">Token to cancel the operation</param>
     /// <returns>HTTP-Antwort</returns>
     /// <remarks>
     /// Sample request:
@@ -157,9 +176,133 @@ public class EnvelopeReceiverController : ControllerBase
     /// <response code="500">Es handelt sich um einen unerwarteten Fehler. Die Protokolle sollten überprüft werden.</response>
     [Authorize]
     [HttpPost]
-    public async Task<IActionResult> CreateAsync([FromBody] CreateEnvelopeReceiverCommand createEnvelopeQuery, CancellationToken cancellationToken)
+    public async Task<IActionResult> CreateAsync([FromBody] CreateEnvelopeReceiverCommand request)
     {
-        await _mediator.Send(createEnvelopeQuery, cancellationToken);
+        CancellationToken cancel = default;
-        return Accepted();
+        int userId = User.GetId();
+
+        #region Create Envelope
+        var envelope = await _envelopeExecutor.CreateEnvelopeAsync(userId, request.Title, request.Message, request.TFAEnabled, cancel);
+        #endregion
+
+        #region Add receivers
+        List<EnvelopeReceiver> sentReceivers = new();
+        List<ReceiverGetOrCreateCommand> unsentReceivers = new();
+
+        foreach (var receiver in request.Receivers)
+        {
+            var envelopeReceiver = await _erExecutor.AddEnvelopeReceiverAsync(envelope.Uuid, receiver.EmailAddress, receiver.Salution, receiver.PhoneNumber, cancel);
+
+            if (envelopeReceiver is null)
+                unsentReceivers.Add(receiver);
+            else
+                sentReceivers.Add(envelopeReceiver);
+        }
+
+        var res = _mapper.Map<CreateEnvelopeReceiverResponse>(envelope);
+        res.UnsentReceivers = unsentReceivers;
+        res.SentReceiver = _mapper.Map<List<ReceiverReadDto>>(sentReceivers.Select(er => er.Receiver));
+        #endregion
+
+        #region Add document
+        var document = await _documentExecutor.CreateDocumentAsync(request.Document.DataAsBase64, envelope.Uuid, cancel);
+
+        if (document is null)
+            return StatusCode(StatusCodes.Status500InternalServerError, "Document creation is failed.");
+        #endregion
+
+        #region Add document element
+        // @DOC_ID, @RECEIVER_ID, @POSITION_X, @POSITION_Y, @PAGE
+        string sql = @"
+                DECLARE @OUT_SUCCESS bit;
+
+                EXEC [dbo].[PRSIG_API_ADD_DOC_RECEIVER_ELEM]
+                    {0},
+                    {1},
+                    {2},
+                    {3},
+                    {4},
+                    @OUT_SUCCESS OUTPUT;
+
+                SELECT @OUT_SUCCESS as [@OUT_SUCCESS];";
+
+        foreach (var rcv in res.SentReceiver)
+            foreach (var sign in request.Receivers.Where(r => r.EmailAddress == rcv.EmailAddress).FirstOrDefault()?.Signatures ?? Array.Empty<Signature>())
+            {
+                using (SqlConnection conn = new(_cnnStr))
+                {
+                    conn.Open();
+
+                    var formattedSQL = string.Format(sql, document.Id.ToSqlParam(), rcv.Id.ToSqlParam(), sign.X.ToSqlParam(), sign.Y.ToSqlParam(), sign.Page.ToSqlParam());
+
+                    using SqlCommand cmd = new SqlCommand(formattedSQL, conn);
+                    cmd.CommandType = CommandType.Text;
+
+                    using SqlDataReader reader = cmd.ExecuteReader();
+                    if (reader.Read())
+                    {
+                        bool outSuccess = reader.GetBoolean(0);
+                    }
+                }
+            }
+        #endregion
+
+        #region Create history
+        // ENV_UID, STATUS_ID, USER_ID,
+        string sql_hist = @"
+                USE [DD_ECM]
+
+                DECLARE @OUT_SUCCESS bit;
+
+                EXEC [dbo].[PRSIG_API_ADD_HISTORY_STATE]
+                    {0},
+                    {1},
+                    {2},
+                    @OUT_SUCCESS OUTPUT;
+
+                SELECT @OUT_SUCCESS as [@OUT_SUCCESS];";
+
+        using (SqlConnection conn = new(_cnnStr))
+        {
+            conn.Open();
+            var formattedSQL_hist = string.Format(sql_hist, envelope.Uuid.ToSqlParam(), 1003.ToSqlParam(), userId.ToSqlParam());
+            using (SqlCommand cmd = new SqlCommand(formattedSQL_hist, conn))
+            {
+                cmd.CommandType = CommandType.Text;
+
+                using (SqlDataReader reader = cmd.ExecuteReader())
+                {
+                    if (reader.Read())
+                    {
+                        bool outSuccess = reader.GetBoolean(0);
+                    }
+                }
+            }
+        }
+        #endregion
+
+        return Ok(res);
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    public static bool IsBase64String(string input)
+    {
+        if (string.IsNullOrWhiteSpace(input))
+            return false;
+
+        try
+        {
+            Convert.FromBase64String(input);
+            return true;
+        }
+        catch (FormatException)
+        {
+            return false;
+        }
+    }
+
 }

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeTypeController.cs

@@ -21,20 +21,12 @@ public class EnvelopeTypeController : ControllerBase
     [HttpGet]
     public async Task<IActionResult> GetAllAsync()
     {
-        try
+        return await _service.ReadAllAsync().ThenAsync(
-        {
+            Success: Ok,
-            return await _service.ReadAllAsync().ThenAsync(
+            Fail: IActionResult (msg, ntc) =>
-                Success: Ok,
+            {
-                Fail: IActionResult (msg, ntc) =>
+                _logger.LogNotice(ntc);
-                {
+                return ntc.HasFlag(Flag.NotFound) ? NotFound() : StatusCode(StatusCodes.Status500InternalServerError);
-                    _logger.LogNotice(ntc);
+            });
-                    return ntc.HasFlag(Flag.NotFound) ? NotFound() : StatusCode(StatusCodes.Status500InternalServerError);
-                });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "{Message}", ex.Message);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
     }
 }

EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs

@@ -1,11 +1,12 @@
-using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
+using EnvelopeGenerator.Application.Contracts.Services;
-using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.Histories.Queries.Read;
+using EnvelopeGenerator.Extensions;
+using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Caching.Memory;
 using static EnvelopeGenerator.Common.Constants;
 
-
 namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 
 /// <summary>
@@ -16,72 +17,62 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers;
 [Authorize]
 public class HistoryController : ControllerBase
 {
-    private readonly ILogger<HistoryController> _logger;
-
     private readonly IEnvelopeHistoryService _service;
 
+    private readonly IMemoryCache _memoryCache;
+
+    private readonly IMediator _mediator;
+
     /// <summary>
     /// Konstruktor für den HistoryController.
     /// </summary>
-    /// <param name="logger">Der Logger, der für das Protokollieren von Informationen verwendet wird.</param>
     /// <param name="service">Der Dienst, der für die Verarbeitung der Umschlaghistorie verantwortlich ist.</param>
-    public HistoryController(ILogger<HistoryController> logger, IEnvelopeHistoryService service)
+    /// <param name="memoryCache"></param>
+    /// param name="mediator"
+    public HistoryController(IEnvelopeHistoryService service, IMemoryCache memoryCache, IMediator mediator)
     {
-        _logger = logger;
         _service = service;
+        _memoryCache = memoryCache;
+        _mediator = mediator;
     }
 
     /// <summary>
     /// Gibt alle möglichen Verweise auf alle möglichen Status in einem Verlaufsdatensatz zurück. (z. B. DocumentSigned bezieht sich auf Receiver.)
     /// Dies wird hinzugefügt, damit Client-Anwendungen sich selbst auf dem neuesten Stand halten können.
-    /// 0 - Receiver:
-    /// Historische Datensätze, die sich auf den Status des Absenders beziehen. Sie haben Statuscodes, die mit 1* beginnen.
     /// 1 - Sender:
-    /// Historische Datensätze über den Status der Empfänger. Diese haben Statuscodes, die mit 2* beginnen.
+    /// Historische Datensätze über den Status der Empfänger. Diese haben Statuscodes, die mit 1* beginnen.
-    /// 2 - System:
+    /// 2 - Receiver:
+    /// Historische Datensätze, die sich auf den Status des Absenders beziehen. Sie haben Statuscodes, die mit 2* beginnen.
+    /// 3 - System:
     /// Historische Datensätze, die sich auf den allgemeinen Zustand des Umschlags beziehen. Diese haben Statuscodes, die mit 3* beginnen.
-    /// 3 - Unknown: 
+    /// 4 - Unknown: 
     /// Ein unbekannter Datensatz weist auf einen möglichen Mangel oder eine Unstimmigkeit im Aktualisierungsprozess der Anwendung hin.
     /// </summary>
     /// <returns></returns>
     /// <response code="200"></response>
     [HttpGet("related")]
     [Authorize]
-    public IActionResult GetReferenceTypes()
+    public IActionResult GetReferenceTypes(ReferenceType? referenceType = null)
     {
-        // Enum zu Schlüssel-Wert-Paar
+        return referenceType is null ? Ok(_memoryCache.GetEnumAsDictionary<ReferenceType>("gen.api", ReferenceType.Unknown)) : Ok(referenceType.ToString());
-        var referenceTypes = Enum.GetValues(typeof(ReferenceType))
-                                 .Cast<ReferenceType>()
-                                 .ToDictionary(rt =>
-                                 {
-                                     var key = rt.ToString();
-                                     var keyAsCamelCase = char.ToLower(key[0]) + key[1..];
-                                     return keyAsCamelCase;
-                                 }, rt => (int)rt);
-
-        return Ok(referenceTypes);
     }
 
     /// <summary>
     /// Gibt alle möglichen Status in einem Verlaufsdatensatz zurück.
     /// Dies wird hinzugefügt, damit Client-Anwendungen sich selbst auf dem neuesten Stand halten können.
-    /// 0: Invalid
-    /// 1001: EnvelopeCreated
-    /// 1002: EnvelopeSaved
     /// 1003: EnvelopeQueued
-    /// 1004: EnvelopeSent (Nicht verwendet)
-    /// 1005: EnvelopePartlySigned
     /// 1006: EnvelopeCompletelySigned
     /// 1007: EnvelopeReportCreated
     /// 1008: EnvelopeArchived
     /// 1009: EnvelopeDeleted
+    /// 10007: EnvelopeRejected
+    /// 10009: EnvelopeWithdrawn
     /// 2001: AccessCodeRequested
     /// 2002: AccessCodeCorrect
     /// 2003: AccessCodeIncorrect
     /// 2004: DocumentOpened
     /// 2005: DocumentSigned
-    /// 4001: DocumentForwarded
+    /// 2006: DocumentForwarded
-    /// 2006: SignatureConfirmed
     /// 2007: DocumentRejected
     /// 2008: EnvelopeShared
     /// 2009: EnvelopeViewed
@@ -91,36 +82,26 @@ public class HistoryController : ControllerBase
     /// 3004: MessageDeletionSent
     /// 3005: MessageCompletionSent
     /// </summary>
-    /// <param name="related">
+    /// <param name="status">
     /// Abfrageparameter, der angibt, auf welche Referenz sich der Status bezieht.
-    /// 0 - Sender: Historische Datensätze, die sich auf den Status des Absenders beziehen. Sie haben Statuscodes, die mit 1* beginnen.
+    /// 1 - Sender: Historische Datensätze, die sich auf den Status des Absenders beziehen. Sie haben Statuscodes, die mit 1* beginnen.
-    /// 1 - Receiver: Historische Datensätze über den Status der Empfänger. Diese haben Statuscodes, die mit 2* beginnen.
+    /// 2 - Receiver: Historische Datensätze über den Status der Empfänger. Diese haben Statuscodes, die mit 2* beginnen.
-    /// 2 - System: Diese werden durch Datenbank-Trigger aktualisiert und sind in den Tabellen EnvelopeHistory und EmailOut zu finden.Sie arbeiten 
+    /// 3 - System: Diese werden durch Datenbank-Trigger aktualisiert und sind in den Tabellen EnvelopeHistory und EmailOut zu finden.Sie arbeiten 
     /// integriert mit der Anwendung EmailProfiler, um E-Mails zu versenden und haben die Codes, die mit 3* beginnen.
     /// </param>
     /// <returns>Gibt die HTTP-Antwort zurück.</returns>
     /// <response code="200"></response>
     [HttpGet("status")]
     [Authorize]
-    public IActionResult GetEnvelopeStatus([FromQuery] ReferenceType? related = null)
+    public IActionResult GetEnvelopeStatus([FromQuery] EnvelopeStatus? status = null)
     {
-        // Enum zu Schlüssel-Wert-Paar
+        return status is null ? Ok(_memoryCache.GetEnumAsDictionary<EnvelopeStatus>("gen.api", Status.NonHist, Status.RelatedToFormApp)) : Ok(status.ToString());
-        var referenceTypes = Enum.GetValues(typeof(EnvelopeStatus))
-                                 .Cast<EnvelopeStatus>()
-                                 .ToDictionary(rt =>
-                                 {
-                                     var key = rt.ToString();
-                                     var keyAsCamelCase = char.ToLower(key[0]) + key[1..];
-                                     return keyAsCamelCase;
-                                 }, rt => (int)rt);
-
-        return Ok(referenceTypes);
     }
 
     /// <summary>
     /// Ruft die gesamte Umschlaghistorie basierend auf den angegebenen Abfrageparametern ab.
     /// </summary>
-    /// <param name="history">Die Abfrageparameter, die die Filterkriterien für die Umschlaghistorie definieren.</param>
+    /// <param name="historyQuery">Die Abfrageparameter, die die Filterkriterien für die Umschlaghistorie definieren.</param>
     /// <returns>Eine Liste von Historieneinträgen, die den angegebenen Kriterien entsprechen, oder nur der letzte Eintrag.</returns>
     /// <response code="200">Die Anfrage war erfolgreich, und die Umschlaghistorie wird zurückgegeben.</response>
     /// <response code="400">Die Anfrage war ungültig oder unvollständig.</response>
@@ -129,27 +110,10 @@ public class HistoryController : ControllerBase
     /// <response code="500">Ein unerwarteter Fehler ist aufgetreten.</response>
     [HttpGet]
     [Authorize]
-    public async Task<IActionResult> GetAllAsync([FromQuery] ReadHistoryQuery history)
+    public async Task<IActionResult> GetAllAsync([FromQuery] ReadHistoryQuery historyQuery)
     {
-        bool withReceiver = false;
+        var history = await _mediator.Send(historyQuery);
-        bool withSender = false;
 
-        switch (history.Related)
+        return Ok((historyQuery.OnlyLast ?? false) ? history.MaxBy(h => h.AddedWhen) : history);
-        {
-            case ReferenceType.Receiver:
-                withReceiver = true;
-                break;
-            case ReferenceType.Sender:
-                withSender = true;
-                break;
-        }
-
-        var histories = await _service.ReadAsync(
-            envelopeId: history.EnvelopeId,
-            referenceType: history.Related,
-            withSender: withSender,
-            withReceiver: withReceiver);
-
-        return Ok(histories);
     }
 }

EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs

@@ -38,24 +38,23 @@ public class ReceiverController : CRUDControllerBaseWithErrorHandling<IReceiverS
     [HttpGet]
     public async Task<IActionResult> Get([FromQuery] ReadReceiverQuery receiver)
     {
-        if (receiver.EmailAddress is null && receiver.Signature is null)
+        if (receiver.Id is null && receiver.EmailAddress is null && receiver.Signature is null)
             return await base.GetAll();
 
-        try
+        if (receiver.Id is int id)
-        {
+            return await _service.ReadByIdAsync(id).ThenAsync(
-            return await _service.ReadByAsync(emailAddress: receiver.EmailAddress, signature: receiver.Signature).ThenAsync(
+                Success: Ok,
-                    Success: Ok,
+                Fail: IActionResult (msg, ntc) =>
-                    Fail: IActionResult (msg, ntc) =>
+                {
-                    {
+                    return NotFound();
-                        _logger.LogNotice(ntc);
+                });
-                        return StatusCode(StatusCodes.Status500InternalServerError);
+
-                    });
+        return await _service.ReadByAsync(emailAddress: receiver.EmailAddress, signature: receiver.Signature).ThenAsync(
-        }
+                Success: Ok,
-        catch (Exception ex)
+                Fail: IActionResult (msg, ntc) =>
-        {
+                {
-            _logger.LogError(ex, "{Message}", ex.Message);
+                    return NotFound();
-            return StatusCode(StatusCodes.Status500InternalServerError);
+                });
-        }
     }
 
     #region REMOVED ENDPOINTS

EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj

@@ -10,21 +10,24 @@
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
     <Product>EnvelopeGenerator.GeneratorAPI</Product>
-    <Version>1.2.0</Version>
+    <Version>1.2.3</Version>
-    <FileVersion>1.2.0</FileVersion>
+    <FileVersion>1.2.3</FileVersion>
-    <AssemblyVersion>1.2.0</AssemblyVersion>
+    <AssemblyVersion>1.2.3</AssemblyVersion>
     <PackageOutputPath>Copyright © 2025 Digital Data GmbH. All rights reserved.</PackageOutputPath>
 	<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AspNetCore.Scalar" Version="1.1.8" />
+    <PackageReference Include="DigitalData.Auth.Client" Version="1.3.7" />
     <PackageReference Include="DigitalData.Core.API" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.4" />
-    <PackageReference Include="Scalar.AspNetCore" Version="2.1.4" />
+    <PackageReference Include="NLog" Version="5.2.5" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.0" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.3" />
+    <PackageReference Include="Scalar.AspNetCore" Version="2.2.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.6.0" />
     <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" />