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/Services/IEnvelopeReceiverService.cs

@@ -35,7 +35,7 @@ public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDt
 
     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/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,40 +33,22 @@ 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 string? ContractTypeTranslated { get; set; }
-
         public byte[]? DocResult { get; init; }
 
         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
-{
-    [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>;
-}
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
+
+/// <summary>
+/// 
+/// </summary>
+/// <param name="Id"></param>
+/// <param name="EnvelopeId"></param>
+/// <param name="UserReference"></param>
+/// <param name="Status"></param>
+/// <param name="StatusName"></param>
+/// <param name="AddedWhen"></param>
+/// <param name="ActionDate"></param>
+/// <param name="Sender"></param>
+/// <param name="Receiver"></param>
+/// <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/EmailTemplates/Commands/Reset/ResetEmailTemplateCommand.cs

@@ -7,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>
-/// <param name="Type">Der Typ der E-Mail-Vorlage, z. B. <see cref="Constants.EmailTemplateType"/> (optional). Beispiele:
+/// 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.
@@ -20,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 ResetEmailTemplateCommand(int? Id = null, Constants.EmailTemplateType? Type = null) : EmailTemplateQuery(Id, Type), IRequest;
+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

@@ -22,6 +22,12 @@ public class ResetEmailTemplateCommandHandler : IRequestHandler<ResetEmailTempla
         _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

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

@@ -20,4 +20,10 @@ public record UpdateEmailTemplateCommand(string? Body = null, string? Subject =
     /// </param>
     [JsonIgnore]
     public EmailTemplateQuery? EmailTemplateQuery { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    [JsonIgnore]
+    public DateTime ChangedWhen { get; init; } = DateTime.Now;
 }

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

@@ -3,8 +3,6 @@ using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Application.Exceptions;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 
 namespace EnvelopeGenerator.Application.EmailTemplates.Commands.Update;
 
@@ -34,13 +32,27 @@ public class UpdateEmailTemplateCommandHandler : IRequestHandler<UpdateEmailTemp
     /// <exception cref="NotFoundException"></exception>
     public async Task Handle(UpdateEmailTemplateCommand request, CancellationToken cancel)
     {
-        var temp = (request.EmailTemplateQuery?.Id is int id
-            ? await _repository.ReadOrDefaultAsync<EmailTemplateDto>(t => t.Id == id, single: false, cancel)
-            : request!.EmailTemplateQuery!.Type is Common.Constants.EmailTemplateType type
-                ? await _repository.ReadOrDefaultAsync<EmailTemplateDto>(t => t.Name == type.ToString(), single: false, cancel)
-                : throw new InvalidOperationException("Both id and type is null. Id: " + request.EmailTemplateQuery.Id + ". Type: " + request.EmailTemplateQuery.Type.ToString())) ?? throw new NotFoundException();
+        EmailTemplateDto? temp;
 
-        if(request.Body is not null)
+        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)

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -21,6 +21,7 @@
 		<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" />
@@ -30,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/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>
-/// <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
+public record ReadReceiverNameQuery() : 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

@@ -1,11 +1,21 @@
 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,6 +1,6 @@
-using EnvelopeGenerator.Application.Envelopes.Queries.Read;
-using EnvelopeGenerator.Application.Receivers.Queries.Read;
-using EnvelopeGenerator.Common;
+using EnvelopeGenerator.Common;
+using MediatR;
+using System.ComponentModel.DataAnnotations;
 
 namespace EnvelopeGenerator.Application.Histories.Queries.Read;
 
@@ -9,9 +9,12 @@ namespace EnvelopeGenerator.Application.Histories.Queries.Read;
 /// Repräsentiert eine Abfrage für die Verlaufshistorie eines Umschlags.
 /// </summary>
 /// <param name="EnvelopeId">Die eindeutige Kennung des Umschlags.</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="Status">Der Status des Umschlags, der abgefragt werden soll. Kann optional angegeben werden, um die Ergebnisse zu filtern.</param>
 /// <param name="OnlyLast">Abfrage zur Steuerung, ob nur der aktuelle Status oder der gesamte Datensatz zurückgegeben wird.</param>
 public record ReadHistoryQuery(
-    int? EnvelopeId = null,
-    Constants.ReferenceType? Related = null,
-    bool? OnlyLast = true);
+    [Required]
+    int EnvelopeId,
+    Constants.EnvelopeStatus? Status = null,
+    bool? OnlyLast = true) : IRequest<IEnumerable<ReadHistoryResponse>>
+{
+};

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

@@ -1,5 +1,6 @@
 using Dapper;
 using EnvelopeGenerator.Application.Contracts.SQLExecutor;
+using EnvelopeGenerator.Application.Exceptions;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.SQL;
@@ -34,9 +35,16 @@ public class DocumentCreateReadSQL : ISQL<EnvelopeDocument>
     /// <returns></returns>
     public static DynamicParameters CreateParmas(string base64)
     {
-        var parameters = new DynamicParameters();
-        byte[] byteData = Convert.FromBase64String(base64);
-        parameters.Add("ByteData", byteData, System.Data.DbType.Binary);
-        return parameters;
+        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/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

@@ -162,9 +162,9 @@ public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverReposit
         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.Common/Constants.vb

@@ -20,7 +20,7 @@
         AccessCodeIncorrect = 2003
         DocumentOpened = 2004
         DocumentSigned = 2005
-        DocumentForwarded = 4001
+        DocumentForwarded = 2006
         DocumentRejected = 2007
         EnvelopeShared = 2008
         EnvelopeViewed = 2009
@@ -48,8 +48,8 @@
 
     'TODO: standardize in xwiki
     Public Enum ReferenceType
-        Receiver = 0
-        Sender
+        Sender = 1
+        Receiver
         System
         Unknown
     End Enum

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

@@ -33,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/EnvelopeGenerator.Common.vbproj

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

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..")
@@ -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/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,7 +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.Item("CHANGED_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/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.4.0")>
-<Assembly: AssemblyFileVersion("2.4.4.0")>
+<Assembly: AssemblyVersion("2.7.0.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/Model.Designer.vb

@@ -325,15 +325,6 @@ 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 Nein ähnelt.
         '''</summary>
@@ -370,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>
@@ -415,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/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.Extensions/MemoryCacheExtensions.cs

@@ -6,11 +6,24 @@ public static class MemoryCacheExtensions
 {
     private static readonly Guid BaseId = Guid.NewGuid();
 
-    public static IDictionary<string, int> GetEnumAsDictionary<TEnum>(this IMemoryCache memoryCache)
+    public static IDictionary<string, int> GetEnumAsDictionary<TEnum>(this IMemoryCache memoryCache, string key = "", params object[] ignores)
         where TEnum : Enum
-        => memoryCache.GetOrCreate(BaseId + typeof(TEnum).FullName, _ =>
-               Enum.GetValues(typeof(TEnum))
+        => 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>()
-                   .ToDictionary(e => e.ToString(), e => Convert.ToInt32(e)))
+                   .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>

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

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

@@ -66,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()
@@ -103,6 +104,10 @@ Partial Class frmMain
         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)
@@ -138,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
@@ -167,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
         '
@@ -334,9 +340,9 @@ Partial Class frmMain
         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]
@@ -494,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})
@@ -521,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"
@@ -791,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
@@ -846,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()
 
@@ -931,4 +971,9 @@ Partial Class frmMain
     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

@@ -868,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>
@@ -1462,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>
@@ -1849,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>

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

@@ -118,16 +118,8 @@ public partial class AuthController : ControllerBase
     [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);
-        }
+        await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+        return Ok();
     }
 
     /// <summary>

EnvelopeGenerator.GeneratorAPI/Controllers/EmailTemplateController.cs

@@ -15,7 +15,7 @@ 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]")]
@@ -63,31 +63,23 @@ public class EmailTemplateController : ControllerBase
     [HttpGet]
     public async Task<IActionResult> Get([FromQuery] ReadEmailTemplateQuery? emailTemplate = null)
     {
-        try
+        if (emailTemplate is null || (emailTemplate.Id is null && emailTemplate.Type is null))
         {
-            if (emailTemplate is null || (emailTemplate.Id is null && emailTemplate.Type is null))
-            {
-                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);
-            }
+            var temps = await _repository.ReadAllAsync();
+            return Ok(_mapper.Map<IEnumerable<EmailTemplateDto>>(temps));
         }
-        catch (Exception ex)
+        else
         {
-            _logger.LogError(ex, "{Message}", ex.Message);
-            return StatusCode(StatusCodes.Status500InternalServerError);
+            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>
@@ -105,32 +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 async Task<IActionResult> Update([FromQuery] EmailTemplateQuery email, [FromBody] UpdateEmailTemplateCommand? update = null)
+    public async Task<IActionResult> Update([FromQuery] EmailTemplateQuery? temp = null, [FromBody] UpdateEmailTemplateCommand? update = null)
     {
-        try
+        if (update is null)
         {
-            if (update is null)
-            {
-                var reset = _mapper.Map<ResetEmailTemplateCommand>(email);
-                await _mediator.Send(new ResetEmailTemplateCommand(email?.Id, email?.Type));
-                return Ok();
-            }
-            else
-            {
-                var reset = _mapper.Map<ResetEmailTemplateCommand>(email);
-                await _mediator.Send(update);
-                return Ok();
-            }
-
+            await _mediator.Send(new ResetEmailTemplateCommand(temp));
+            return Ok();
         }
-        catch(NotFoundException)
+        else if (temp is null)
         {
-            return BadRequest();
+            return BadRequest("No both id and type");
         }
-        catch (Exception ex)
+        else
         {
-            _logger.LogError(ex, "An unexpected error occurred. {message}", ex.Message);
-            return new StatusCodeResult(StatusCodes.Status500InternalServerError);
+            update.EmailTemplateQuery = temp;
+            await _mediator.Send(update);
+            return Ok();
         }
     }
 }

EnvelopeGenerator.GeneratorAPI/Controllers/EnvelopeController.cs

@@ -61,37 +61,29 @@ 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)
-                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 Ok(envelopes);
-                    },
-                    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);
+            _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);
         }
     }
@@ -108,43 +100,35 @@ public class EnvelopeController : ControllerBase
     [HttpGet("doc-result")]
     public async Task<IActionResult> GetDocResultAsync([FromQuery] int id, [FromQuery] bool view = false)
     {
-        try
-        {
-            if (User.GetId() is int intId)
-                return await _envelopeService.ReadByUserAsync(intId).ThenAsync(
-                    Success: envelopes =>
-                    {
-                        var envelope = envelopes.Where(e => e.Id == id).FirstOrDefault();
+        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) =>
+                    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
                     {
-                        _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)
+                        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(ex, "{Message}", ex.Message);
+            _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);
         }
     }
@@ -159,23 +143,15 @@ public class EnvelopeController : ControllerBase
     [HttpPost]
     public async Task<IActionResult> CreateAsync([FromQuery] CreateEnvelopeCommand envelope)
     {
-        try
+        envelope.UserId = User.GetId();
+        var res = await _mediator.Send(envelope);
+
+        if (res is null)
         {
-            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);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "{Message}", ex.Message);
+            _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

@@ -84,43 +84,35 @@ public class EnvelopeReceiverController : ControllerBase
     [HttpGet]
     public async Task<IActionResult> GetEnvelopeReceiver([FromQuery] ReadEnvelopeReceiverQuery envelopeReceiver)
     {
-        try
-        {
-            var username = User.GetUsernameOrDefault();
+        var username = User.GetUsernameOrDefault();
 
-            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.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);
-                    });
-        }
-        catch (Exception ex)
+        if (username is null)
         {
-            _logger.LogError(ex, "An unexpected error occurred. {message}", ex.Message);
-            return new StatusCodeResult(StatusCodes.Status500InternalServerError);
+            _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.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.
@@ -131,26 +123,18 @@ 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.ReadLastUsedReceiverNameByMail(receiverName.EmailAddress).ThenAsync(
-                            Success: res => res is null ? Ok(string.Empty) : Ok(res),
-                            Fail: IActionResult (msg, ntc) =>
-                            {
-                                if (ntc.HasFlag(Flag.NotFound))
-                                    return NotFound();
+        return await _erService.ReadLastUsedReceiverNameByMailAsync(receiver.EmailAddress, receiver.Id, receiver.Signature).ThenAsync(
+                        Success: res => res is null ? NotFound() : Ok(res),
+                        Fail: IActionResult (msg, ntc) =>
+                        {
+                            if (ntc.HasFlag(Flag.NotFound))
+                                return NotFound();
 
-                                _logger.LogNotice(ntc);
-                                return StatusCode(StatusCodes.Status500InternalServerError);
-                            });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "{message}", ex.Message);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
+                            _logger.LogNotice(ntc);
+                            return StatusCode(StatusCodes.Status500InternalServerError);
+                        });
     }
 
     /// <summary>
@@ -194,44 +178,42 @@ public class EnvelopeReceiverController : ControllerBase
     [HttpPost]
     public async Task<IActionResult> CreateAsync([FromBody] CreateEnvelopeReceiverCommand request)
     {
-        try
+        CancellationToken cancel = default;
+        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)
         {
-            CancellationToken cancel = default;
-            int userId = User.GetId();
+            var envelopeReceiver = await _erExecutor.AddEnvelopeReceiverAsync(envelope.Uuid, receiver.EmailAddress, receiver.Salution, receiver.PhoneNumber, cancel);
 
-            #region Create Envelope
-            var envelope = await _envelopeExecutor.CreateEnvelopeAsync(userId, request.Title, request.Message, request.TFAEnabled, cancel);
-            #endregion
+            if (envelopeReceiver is null)
+                unsentReceivers.Add(receiver);
+            else
+                sentReceivers.Add(envelopeReceiver);
+        }
 
-            #region Add receivers
-            List<EnvelopeReceiver> sentReceivers = new();
-            List<ReceiverGetOrCreateCommand> unsentReceivers = new();
+        var res = _mapper.Map<CreateEnvelopeReceiverResponse>(envelope);
+        res.UnsentReceivers = unsentReceivers;
+        res.SentReceiver = _mapper.Map<List<ReceiverReadDto>>(sentReceivers.Select(er => er.Receiver));
+        #endregion
 
-            foreach (var receiver in request.Receivers)
-            {
-                var envelopeReceiver = await _erExecutor.AddEnvelopeReceiverAsync(envelope.Uuid, receiver.EmailAddress, receiver.Salution, receiver.PhoneNumber, cancel);
+        #region Add document
+        var document = await _documentExecutor.CreateDocumentAsync(request.Document.DataAsBase64, envelope.Uuid, cancel);
 
-                if (envelopeReceiver is null)
-                    unsentReceivers.Add(receiver);
-                else
-                    sentReceivers.Add(envelopeReceiver);
-            }
+        if (document is null)
+            return StatusCode(StatusCodes.Status500InternalServerError, "Document creation is failed.");
+        #endregion
 
-            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 = @"
+        #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]
@@ -244,30 +226,30 @@ public class EnvelopeReceiverController : ControllerBase
 
                 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>())
+        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))
                 {
-                    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())
                     {
-                        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);
-                        }
+                        bool outSuccess = reader.GetBoolean(0);
                     }
                 }
-            #endregion
+            }
+        #endregion
 
-            #region Create history
-            // ENV_UID, STATUS_ID, USER_ID,
-            string sql_hist = @"
+        #region Create history
+        // ENV_UID, STATUS_ID, USER_ID,
+        string sql_hist = @"
                 USE [DD_ECM]
 
                 DECLARE @OUT_SUCCESS bit;
@@ -280,32 +262,26 @@ public class EnvelopeReceiverController : ControllerBase
 
                 SELECT @OUT_SUCCESS as [@OUT_SUCCESS];";
 
-            using (SqlConnection conn = new(_cnnStr))
+        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))
             {
-                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;
+                cmd.CommandType = CommandType.Text;
 
-                    using (SqlDataReader reader = cmd.ExecuteReader())
+                using (SqlDataReader reader = cmd.ExecuteReader())
+                {
+                    if (reader.Read())
                     {
-                        if (reader.Read())
-                        {
-                            bool outSuccess = reader.GetBoolean(0);
-                        }
+                        bool outSuccess = reader.GetBoolean(0);
                     }
                 }
             }
-            #endregion
+        }
+        #endregion
 
-            return Ok(res);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "{Message}", ex.Message);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
+        return Ok(res);
     }
 
     /// <summary>

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,
-                Fail: IActionResult (msg, ntc) =>
-                {
-                    _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);
-        }
+        return await _service.ReadAllAsync().ThenAsync(
+            Success: Ok,
+            Fail: IActionResult (msg, ntc) =>
+            {
+                _logger.LogNotice(ntc);
+                return ntc.HasFlag(Flag.NotFound) ? NotFound() : StatusCode(StatusCodes.Status500InternalServerError);
+            });
     }
 }

EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs

@@ -1,13 +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>
@@ -18,34 +17,35 @@ 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, IMemoryCache memoryCache)
+    /// <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.
-    /// 2 - System:
+    /// Historische Datensätze über den Status der Empfänger. Diese haben Statuscodes, die mit 1* beginnen.
+    /// 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>
@@ -54,29 +54,25 @@ public class HistoryController : ControllerBase
     [Authorize]
     public IActionResult GetReferenceTypes(ReferenceType? referenceType = null)
     {
-        return referenceType is null ? Ok(_memoryCache.GetEnumAsDictionary<ReferenceType>()) : Ok(referenceType.ToString());
+        return referenceType is null ? Ok(_memoryCache.GetEnumAsDictionary<ReferenceType>("gen.api", ReferenceType.Unknown)) : Ok(referenceType.ToString());
     }
 
     /// <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: SignatureConfirmed
+    /// 2006: DocumentForwarded
     /// 2007: DocumentRejected
     /// 2008: EnvelopeShared
     /// 2009: EnvelopeViewed
@@ -88,9 +84,9 @@ public class HistoryController : ControllerBase
     /// </summary>
     /// <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 - 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 
+    /// 1 - Sender: Historische Datensätze, die sich auf den Status des Absenders beziehen. Sie haben Statuscodes, die mit 1* beginnen.
+    /// 2 - Receiver: Historische Datensätze über den Status der Empfänger. Diese haben Statuscodes, die mit 2* beginnen.
+    /// 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>
@@ -99,13 +95,13 @@ public class HistoryController : ControllerBase
     [Authorize]
     public IActionResult GetEnvelopeStatus([FromQuery] EnvelopeStatus? status = null)
     {
-        return status is null ? Ok(_memoryCache.GetEnumAsDictionary<EnvelopeStatus>()) : Ok(status.ToString());
+        return status is null ? Ok(_memoryCache.GetEnumAsDictionary<EnvelopeStatus>("gen.api", Status.NonHist, Status.RelatedToFormApp)) : Ok(status.ToString());
     }
 
     /// <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>
@@ -114,29 +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)
     {
+        var history = await _mediator.Send(historyQuery);
 
-
-        bool withReceiver = false;
-        bool withSender = false;
-
-        switch (history.Related)
-        {
-            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);
+        return Ok((historyQuery.OnlyLast ?? false) ? history.MaxBy(h => h.AddedWhen) : history);
     }
 }

EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs

@@ -41,28 +41,20 @@ public class ReceiverController : CRUDControllerBaseWithErrorHandling<IReceiverS
         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(
-                    Success: Ok,
-                    Fail: IActionResult (msg, ntc) =>
-                    {
-                        return NotFound();
-                    });
+        if (receiver.Id is int id)
+            return await _service.ReadByIdAsync(id).ThenAsync(
+                Success: Ok,
+                Fail: IActionResult (msg, ntc) =>
+                {
+                    return NotFound();
+                });
 
-            return await _service.ReadByAsync(emailAddress: receiver.EmailAddress, signature: receiver.Signature).ThenAsync(
-                    Success: Ok,
-                    Fail: IActionResult (msg, ntc) =>
-                    {
-                        return NotFound();
-                    });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "{Message}", ex.Message);
-            return StatusCode(StatusCodes.Status500InternalServerError);
-        }
+        return await _service.ReadByAsync(emailAddress: receiver.EmailAddress, signature: receiver.Signature).ThenAsync(
+                Success: Ok,
+                Fail: IActionResult (msg, ntc) =>
+                {
+                    return NotFound();
+                });
     }
 
     #region REMOVED ENDPOINTS

EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj

@@ -10,9 +10,9 @@
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
     <Product>EnvelopeGenerator.GeneratorAPI</Product>
-    <Version>1.2.1</Version>
-    <FileVersion>1.2.1</FileVersion>
-    <AssemblyVersion>1.2.1</AssemblyVersion>
+    <Version>1.2.3</Version>
+    <FileVersion>1.2.3</FileVersion>
+    <AssemblyVersion>1.2.3</AssemblyVersion>
     <PackageOutputPath>Copyright © 2025 Digital Data GmbH. All rights reserved.</PackageOutputPath>
 	<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
@@ -23,6 +23,8 @@
     <PackageReference Include="DigitalData.Core.API" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.4" />
+    <PackageReference Include="NLog" Version="5.2.5" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
     <PackageReference Include="Scalar.AspNetCore" Version="2.2.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
     <PackageReference Include="DigitalData.Core.Abstractions" Version="3.6.0" />

EnvelopeGenerator.GeneratorAPI/Middleware/ExceptionHandlingMiddleware.cs

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

EnvelopeGenerator.GeneratorAPI/Program.cs

@@ -15,19 +15,35 @@ using EnvelopeGenerator.GeneratorAPI.Models;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.IdentityModel.Tokens;
 using DigitalData.Core.Abstractions.Security.Extensions;
+using EnvelopeGenerator.GeneratorAPI.Middleware;
+using NLog.Web;
+using NLog;
 
-var builder = WebApplication.CreateBuilder(args);
+var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
+logger.Info("Logging initialized!");
 
-var config = builder.Configuration;
+try
+{
+    var builder = WebApplication.CreateBuilder(args);
 
-var deferredProvider = new DeferredServiceProvider();
+    builder.Logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
 
-builder.Services.AddControllers();
+    if (!builder.Environment.IsDevelopment())
+    {
+        builder.Logging.ClearProviders();
+        builder.Host.UseNLog();
+    }
 
-//CORS Policy
-var allowedOrigins = config.GetSection("AllowedOrigins").Get<string[]>() ??
-    throw new InvalidOperationException("AllowedOrigins section is missing in the configuration.");
-builder.Services.AddCors(options =>
+    var config = builder.Configuration;
+
+    var deferredProvider = new DeferredServiceProvider();
+
+    builder.Services.AddControllers();
+
+    //CORS Policy
+    var allowedOrigins = config.GetSection("AllowedOrigins").Get<string[]>() ??
+        throw new InvalidOperationException("AllowedOrigins section is missing in the configuration.");
+    builder.Services.AddCors(options =>
     {
         options.AddPolicy("AllowSpecificOriginsPolicy", builder =>
         {
@@ -39,34 +55,34 @@ builder.Services.AddCors(options =>
         });
     });
 
-// Swagger
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen(options =>
-{
-    options.SwaggerDoc("v1", new OpenApiInfo
+    // Swagger
+    builder.Services.AddEndpointsApiExplorer();
+    builder.Services.AddSwaggerGen(options =>
     {
-        Version = "v1",
-        Title = "signFLOW Absender-API",
-        Description = "Eine API zur Verwaltung der Erstellung, des Versands und der Nachverfolgung von Umschlägen in der signFLOW-Anwendung.",
-        Contact = new OpenApiContact
+        options.SwaggerDoc("v1", new OpenApiInfo
         {
-            Name = "Digital Data GmbH",
-            Url = new Uri("https://digitaldata.works/digitale-signatur#kontakt"),
-            Email = "info-flow@digitaldata.works"
-        },
-    });
+            Version = "v1",
+            Title = "signFLOW Absender-API",
+            Description = "Eine API zur Verwaltung der Erstellung, des Versands und der Nachverfolgung von Umschlägen in der signFLOW-Anwendung.",
+            Contact = new OpenApiContact
+            {
+                Name = "Digital Data GmbH",
+                Url = new Uri("https://digitaldata.works/digitale-signatur#kontakt"),
+                Email = "info-flow@digitaldata.works"
+            },
+        });
 
-    options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
-    {
-        Name = "Authorization",
-        Type = SecuritySchemeType.Http,
-        Scheme = "bearer",
-        BearerFormat = "JWT",
-        In = ParameterLocation.Header,
-        Description = "JWT-Autorisierungs-Header unter Verwendung des Bearer-Schemas.",
-    });
+        options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
+        {
+            Name = "Authorization",
+            Type = SecuritySchemeType.Http,
+            Scheme = "bearer",
+            BearerFormat = "JWT",
+            In = ParameterLocation.Header,
+            Description = "JWT-Autorisierungs-Header unter Verwendung des Bearer-Schemas.",
+        });
 
-    options.AddSecurityRequirement(new OpenApiSecurityRequirement
+        options.AddSecurityRequirement(new OpenApiSecurityRequirement
     {
         {
             new OpenApiSecurityScheme
@@ -81,128 +97,136 @@ builder.Services.AddSwaggerGen(options =>
         }
     });
 
-    var xmlFiles = Directory.GetFiles(AppContext.BaseDirectory, "*.xml");
-    foreach (var xmlFile in xmlFiles)
-    {
-        options.IncludeXmlComments(xmlFile);
-    }
-});
-builder.Services.AddOpenApi();
-// DbContext
-var connStr = config.GetConnectionString("Default") ?? throw new InvalidOperationException("There is no default connection string in appsettings.json.");
-
-builder.Services.Configure<ConnectionString>(cs => cs.Value = connStr);
-
-builder.Services.AddDbContext<EGDbContext>(options => options.UseSqlServer(connStr));
-
-builder.Services.AddAuthHubClient(config.GetSection("AuthClientParams"));
-
-var authTokenKeys = config.GetOrDefault<AuthTokenKeys>();
-
-builder.Services.AddAuthentication(options =>
-{
-    options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-})
-    .AddJwtBearer(opt =>
-    {
-        opt.TokenValidationParameters = new TokenValidationParameters
+        var xmlFiles = Directory.GetFiles(AppContext.BaseDirectory, "*.xml");
+        foreach (var xmlFile in xmlFiles)
         {
-            ValidateIssuerSigningKey = true,
-            IssuerSigningKeyResolver = (token, securityToken, identifier, parameters) =>
-            {
-                var clientParams = deferredProvider.GetOptions<ClientParams>();
-                var publicKey = clientParams!.PublicKeys.Get(authTokenKeys.Issuer, authTokenKeys.Audience);
-                return new List<SecurityKey>() { publicKey.SecurityKey };
-            },
-            ValidateIssuer = true,
-            ValidIssuer = authTokenKeys.Issuer,
-            ValidateAudience = true,
-            ValidAudience = authTokenKeys.Audience,
-        };
+            options.IncludeXmlComments(xmlFile);
+        }
+    });
+    builder.Services.AddOpenApi();
+    // DbContext
+    var connStr = config.GetConnectionString("Default") ?? throw new InvalidOperationException("There is no default connection string in appsettings.json.");
 
-        opt.Events = new JwtBearerEvents
+    builder.Services.Configure<ConnectionString>(cs => cs.Value = connStr);
+
+    builder.Services.AddDbContext<EGDbContext>(options => options.UseSqlServer(connStr));
+
+    builder.Services.AddAuthHubClient(config.GetSection("AuthClientParams"));
+
+    var authTokenKeys = config.GetOrDefault<AuthTokenKeys>();
+
+    builder.Services.AddAuthentication(options =>
+    {
+        options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
+        options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
+    })
+        .AddJwtBearer(opt =>
         {
-            OnMessageReceived = context =>
+            opt.TokenValidationParameters = new TokenValidationParameters
             {
-                // if there is no token read related cookie or query string
-                if (context.Token is null)   // if there is no token
+                ValidateIssuerSigningKey = true,
+                IssuerSigningKeyResolver = (token, securityToken, identifier, parameters) =>
                 {
-                    if (context.Request.Cookies.TryGetValue(authTokenKeys.Cookie, out var cookieToken) && cookieToken is not null)
-                        context.Token = cookieToken;
-                    else if (context.Request.Query.TryGetValue(authTokenKeys.QueryString, out var queryStrToken))
-                        context.Token = queryStrToken;
+                    var clientParams = deferredProvider.GetOptions<ClientParams>();
+                    var publicKey = clientParams!.PublicKeys.Get(authTokenKeys.Issuer, authTokenKeys.Audience);
+                    return new List<SecurityKey>() { publicKey.SecurityKey };
+                },
+                ValidateIssuer = true,
+                ValidIssuer = authTokenKeys.Issuer,
+                ValidateAudience = true,
+                ValidAudience = authTokenKeys.Audience,
+            };
+
+            opt.Events = new JwtBearerEvents
+            {
+                OnMessageReceived = context =>
+                {
+                    // if there is no token read related cookie or query string
+                    if (context.Token is null)   // if there is no token
+                    {
+                        if (context.Request.Cookies.TryGetValue(authTokenKeys.Cookie, out var cookieToken) && cookieToken is not null)
+                            context.Token = cookieToken;
+                        else if (context.Request.Query.TryGetValue(authTokenKeys.QueryString, out var queryStrToken))
+                            context.Token = queryStrToken;
+                    }
+                    return Task.CompletedTask;
                 }
-                return Task.CompletedTask;
-            }
-        };
+            };
+        });
+
+    // Authentication
+    builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
+    .AddCookie(options =>
+    {
+        options.Cookie.HttpOnly = true;  // Makes the cookie inaccessible to client-side scripts for security
+        options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest; // Ensures cookies are sent over HTTPS only
+        options.Cookie.SameSite = SameSiteMode.Strict; // Protects against CSRF attacks by restricting how cookies are sent with requests from external sites
+        options.LoginPath = "/api/auth/login";
+        options.LogoutPath = "/api/auth/logout";
+        options.SlidingExpiration = true;
     });
 
-// Authentication
-builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
-.AddCookie(options =>
-{
-    options.Cookie.HttpOnly = true;  // Makes the cookie inaccessible to client-side scripts for security
-    options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest; // Ensures cookies are sent over HTTPS only
-    options.Cookie.SameSite = SameSiteMode.Strict; // Protects against CSRF attacks by restricting how cookies are sent with requests from external sites
-    options.LoginPath = "/api/auth/login";
-    options.LogoutPath = "/api/auth/logout";
-    options.SlidingExpiration = true;
-});
+    // User manager
+    builder.Services.AddUserManager<EGDbContext>();
 
-// User manager
-builder.Services.AddUserManager<EGDbContext>();
+    // LDAP
+    builder.ConfigureBySection<DirectorySearchOptions>();
+    builder.Services.AddDirectorySearchService(config.GetSection("DirectorySearchOptions"));
 
-// LDAP
-builder.ConfigureBySection<DirectorySearchOptions>();
-builder.Services.AddDirectorySearchService(config.GetSection("DirectorySearchOptions"));
+    // Localizer
+    builder.Services.AddCookieBasedLocalizer();
 
-// Localizer
-builder.Services.AddCookieBasedLocalizer() ;
+    // Envelope generator serives
+    builder.Services
+        .AddEnvelopeGeneratorInfrastructureServices(sqlExecutorConfigureOptions: executor => executor.ConnectionString = connStr)
+        .AddEnvelopeGeneratorServices(config);
 
-// Envelope generator serives
-builder.Services
-    .AddEnvelopeGeneratorInfrastructureServices(sqlExecutorConfigureOptions: executor => executor.ConnectionString = connStr)
-    .AddEnvelopeGeneratorServices(config);
+    var app = builder.Build();
 
-var app = builder.Build();
+    deferredProvider.Factory = () => app.Services;
 
-deferredProvider.Factory = () => app.Services;
+    app.UseMiddleware<ExceptionHandlingMiddleware>();
 
-app.MapOpenApi();
+    app.MapOpenApi();
 
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment() || (app.IsDevOrDiP() && config.GetValue<bool>("UseSwagger")))
-{
-	app.UseSwagger();
-	app.UseSwaggerUI();
-    app.MapScalarApiReference();
+    // Configure the HTTP request pipeline.
+    if (app.Environment.IsDevelopment() || (app.IsDevOrDiP() && config.GetValue<bool>("UseSwagger")))
+    {
+        app.UseSwagger();
+        app.UseSwaggerUI();
+        app.MapScalarApiReference();
+    }
+
+    // Set CORS policy
+    app.UseCors("AllowSpecificOriginsPolicy");
+
+    // Localizer
+    string[] supportedCultureNames = { "de-DE", "en-US" };
+    IList<CultureInfo> list = supportedCultureNames.Select((string cn) => new CultureInfo(cn)).ToList();
+    CultureInfo cultureInfo = list.FirstOrDefault() ?? throw new ArgumentNullException("supportedCultureNames", "Supported cultures cannot be empty.");
+    RequestLocalizationOptions requestLocalizationOptions = new RequestLocalizationOptions
+    {
+        SupportedCultures = list,
+        SupportedUICultures = list
+    };
+    requestLocalizationOptions.RequestCultureProviders.Add(new QueryStringRequestCultureProvider());
+    app.UseRequestLocalization(requestLocalizationOptions);
+
+
+    app.UseHttpsRedirection();
+
+    app.UseDefaultFiles();
+    app.UseStaticFiles();
+
+    app.UseAuthentication();
+    app.UseAuthorization();
+
+    app.MapControllers();
+
+    app.Run();
 }
-
-// Set CORS policy
-app.UseCors("AllowSpecificOriginsPolicy");
-
-// Localizer
-string[] supportedCultureNames = { "de-DE", "en-US" };
-IList<CultureInfo> list = supportedCultureNames.Select((string cn) => new CultureInfo(cn)).ToList();
-CultureInfo cultureInfo = list.FirstOrDefault() ?? throw new ArgumentNullException("supportedCultureNames", "Supported cultures cannot be empty.");
-RequestLocalizationOptions requestLocalizationOptions = new RequestLocalizationOptions
+catch (Exception ex)
 {
-    SupportedCultures = list,
-    SupportedUICultures = list
-};
-requestLocalizationOptions.RequestCultureProviders.Add(new QueryStringRequestCultureProvider());
-app.UseRequestLocalization(requestLocalizationOptions);
-
-
-app.UseHttpsRedirection();
-
-app.UseDefaultFiles();
-app.UseStaticFiles();
-
-app.UseAuthentication();
-app.UseAuthorization();
-
-app.MapControllers();
-
-app.Run();
+    logger.Error(ex, "Stopped program because of exception");
+    throw;
+}

EnvelopeGenerator.GeneratorAPI/Properties/launchSettings.json

@@ -24,7 +24,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": false,
       "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7174;http://localhost:5131",
+      "applicationUrl": "https://localhost:8088;http://localhost:5131",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

EnvelopeGenerator.GeneratorAPI/appsettings.json

@@ -169,7 +169,8 @@
     "EnvelopeHistory": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
     "EmailOut": [ "TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD" ],
     "EnvelopeReceiverReadOnly": [ "TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD" ],
-    "Receiver": []
+    "Receiver": [],
+    "EmailTemplate": [ "TBSIG_EMAIL_TEMPLATE_AFT_UPD" ]
   },
   "MainPageTitle": null,
   "AnnotationParams": {

EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs

@@ -2,6 +2,9 @@
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Contracts.Repositories;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.AspNetCore.Http.HttpResults;
+using EnvelopeGenerator.Application.Exceptions;
+using EnvelopeGenerator.Common.My.Resources;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
@@ -39,7 +42,11 @@ public class EnvelopeReceiverRepository : CRUDRepository<EnvelopeReceiver, (int
         => await ReadWhere(signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver, readOnly: readOnly).ToListAsync();
 
     public async Task<EnvelopeReceiver?> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true)
-        => await ReadWhere(uuid: uuid, signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver, readOnly: readOnly).FirstOrDefaultAsync();
+    {
+        var query = ReadWhere(uuid: uuid, signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver, readOnly: readOnly);
+
+        return await query.FirstOrDefaultAsync();
+    }
 
     public async Task<string?> ReadAccessCodeAsync(string uuid, string signature, bool readOnly = true)
         => await ReadWhere(uuid: uuid, signature: signature, readOnly: readOnly)
@@ -89,8 +96,26 @@ public class EnvelopeReceiverRepository : CRUDRepository<EnvelopeReceiver, (int
         return await query.Include(er => er.Envelope).Include(er => er.Receiver).ToListAsync();
     }
 
-    public async Task<EnvelopeReceiver?> ReadLastByReceiver(string email)
+    public async Task<EnvelopeReceiver?> ReadLastByReceiverAsync(string? email = null, int? id = null, string? signature = null)
     {
-        return await _dbSet.Where(er => er.Receiver!.EmailAddress == email).OrderBy(er => er.EnvelopeId).LastOrDefaultAsync();
+        var parameters = new[] { email, id?.ToString(), signature }.Count(p => p != null);
+
+        if (parameters == 0)
+            throw new BadRequestException("You must provide either 'email', 'id', or 'signature' for the query.");
+        if (parameters > 1)
+            throw new BadRequestException("Please provide only one parameter: either 'email', 'id', or 'signature'.");
+
+        var query = _dbSet.AsNoTracking();
+
+        if(email is not null)
+            query = query.Where(er => er.Receiver!.EmailAddress == email);
+
+        if (id is not null)
+            query = query.Where(er => er.Receiver!.Id == id);
+
+        if (signature is not null)
+            query = query.Where(er => er.Receiver!.Signature == signature);
+
+        return await query.OrderBy(er => er.EnvelopeId).LastOrDefaultAsync();
     }      
 }

EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj

@@ -260,6 +260,7 @@
   <ItemGroup>
     <Compile Include="Config.vb" />
     <Compile Include="LogProvider.vb" />
+    <Compile Include="Scheduler_Envelopetask_API.vb" />
     <Compile Include="Service.Designer.vb">
       <DependentUpon>Service.vb</DependentUpon>
     </Compile>
@@ -288,7 +289,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="Scheduler.vb" />
+    <Compile Include="Scheduler_FinishEnvelope.vb" />
     <Compile Include="TempFiles.vb" />
   </ItemGroup>
   <ItemGroup>

EnvelopeGenerator.Service/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.8.0.0")>
-<Assembly: AssemblyFileVersion("1.8.0.0")>
+<Assembly: AssemblyVersion("1.9.0.0")>
+<Assembly: AssemblyFileVersion("1.9.0.0")>

EnvelopeGenerator.Service/Scheduler_Envelopetask_API.vb

@@ -0,0 +1,72 @@
+Imports System.Collections.Specialized
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Logging
+Imports EnvelopeGenerator.Common.Jobs
+Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument
+Imports Quartz
+Public Class Scheduler_Envelopetask_API
+    Inherits BaseClass
+    Private Scheduler As IScheduler
+    Private ReadOnly ConnectionString As String
+
+    Private Const JobName = "SendInvitationMailsAPI"
+    Public Sub New(pLogConfig As LogConfig, pConnectionString As String)
+        MyBase.New(pLogConfig)
+        ConnectionString = pConnectionString
+        Dim oLogProvider = New LogProvider(Logger)
+        Logging.LogProvider.SetCurrentLogProvider(oLogProvider)
+    End Sub
+
+    Public Async Function Start(pInterval As Integer) As Task
+        Try
+            Logger.Debug("Starting Scheduler SendMailsfromAPI..")
+
+            Dim oProperties As New NameValueCollection()
+
+            Scheduler = Await SchedulerBuilder.Create(oProperties).
+            UseDefaultThreadPool(Sub(x) x.MaxConcurrency = 5).
+            BuildScheduler()
+            Dim oJobKey = New JobKey(JobName)
+            Dim oJobData = New JobDataMap() From {
+                {Common.Constants.LOGCONFIG, LogConfig},
+                {Common.Constants.DATABASE, ConnectionString}
+            }
+
+            Logger.Debug("Initialized Job [{0}]", JobName)
+
+            Dim oJob As IJobDetail = JobBuilder.Create(Of APIEnvelopeJob).
+            UsingJobData(oJobData).
+            WithIdentity(oJobKey).
+            Build()
+
+            Dim oTrigger As ITrigger = TriggerBuilder.Create().
+            ForJob(oJobKey).
+            WithIdentity($"{JobName}-trigger").
+            WithSimpleSchedule(Sub(s) s.
+                RepeatForever().
+                WithIntervalInMinutes(pInterval)).
+            StartNow().
+            Build()
+
+            Logger.Debug($"{JobName}-trigger initialized")
+
+            Await Scheduler.ScheduleJob(oJob, oTrigger)
+
+            Logger.Debug($"{JobName}-scheduled")
+
+            Await Scheduler.Start()
+
+            Logger.Info($"{JobName}-started")
+        Catch ex As Exception
+            Logger.Error(ex)
+        End Try
+
+    End Function
+
+    Public Async Function [Stop]() As Task
+        Logger.Info("Stopping scheduler SendMailsfromAPI..")
+        Await Scheduler.Shutdown()
+        Logger.Info("Scheduler SendMailsfromAPI stopped!")
+    End Function
+End Class

EnvelopeGenerator.Service/Scheduler_FinishEnvelope.vb

@@ -6,7 +6,7 @@ Imports EnvelopeGenerator.Common.Jobs
 Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument
 Imports Quartz
 
-Public Class Scheduler
+Public Class Scheduler_FinishEnvelope
     Inherits BaseClass
 
     Private Scheduler As IScheduler
@@ -28,7 +28,7 @@ Public Class Scheduler
 
     Public Async Function Start(pInterval As Integer) As Task
         Try
-            Logger.Debug("Starting Scheduler..")
+            Logger.Debug("Starting Scheduler Finish Envelope..")
 
             Dim oProperties As New NameValueCollection()
 

EnvelopeGenerator.Service/Service.vb

@@ -2,6 +2,7 @@
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Config
+Imports System.Threading
 
 Public Class Service
     Private Logger As Logger
@@ -10,7 +11,8 @@ Public Class Service
     Private Config As Config
     Private Database As MSSQLServer
     Private TempFiles As TempFiles
-    Private Scheduler As Scheduler
+    Private Scheduler1 As Scheduler_FinishEnvelope
+    Private Scheduler2 As Scheduler_Envelopetask_API
 
     Protected Overrides Async Sub OnStart(ByVal args() As String)
         Try
@@ -53,10 +55,15 @@ Public Class Service
 
             ' === Initialize Queue ===
 
-            Logger.Debug("Inititalize Quartz")
+            Logger.Debug("Inititalizing scheduler(s) ...")
 
-            Scheduler = New Scheduler(LogConfig, Config.ConnectionString, oKey, Config.PDFBurnerParams)
-            Await Scheduler.Start(Config.IntervalInMin)
+            Scheduler1 = New Scheduler_FinishEnvelope(LogConfig, Config.ConnectionString, oKey, Config.PDFBurnerParams)
+            Await Scheduler1.Start(Config.IntervalInMin)
+
+            Thread.Sleep(2500)
+
+            Scheduler2 = New Scheduler_Envelopetask_API(LogConfig, Config.ConnectionString)
+            Await Scheduler2.Start(Config.IntervalInMin)
 
             Logger.Info("Started [{0}] !", ServiceName)
 
@@ -67,8 +74,9 @@ Public Class Service
 
     Protected Overrides Async Sub OnStop()
         Try
-            Logger.Info("Stopping [{0}] !", ServiceName)
-            Await Scheduler.Stop()
+            Logger.Info("Stopping [{0}] ...", ServiceName)
+            Await Scheduler1.Stop()
+            Await Scheduler2.Stop()
             TempFiles.CleanUp()
             Logger.Info("Stopped [{0}] !", ServiceName)
         Catch ex As Exception

EnvelopeGenerator.Web/Controllers/HomeController.cs

@@ -96,31 +96,32 @@ public class HomeController : ViewControllerBase
 
             ViewData["EnvelopeKey"] = envelopeReceiverId;
 
-            return await _envRcvService.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId: envelopeReceiverId).ThenAsync<EnvelopeReceiverDto, IActionResult>(
-                SuccessAsync: async er =>
+            var er_res = await _envRcvService.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId: envelopeReceiverId);
+
+            if (er_res.IsFailed)
+            {
+                _logger.LogNotice(er_res.Notices);
+                return this.ViewEnvelopeNotFound();
+            }
+
+            var er = er_res.Data;
+
+            EnvelopeResponse response = await envelopeOldService.LoadEnvelope(envelopeReceiverId);
+
+            bool accessCodeAlreadyRequested = await _historyService.AccessCodeAlreadyRequested(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress);
+            if (!accessCodeAlreadyRequested)
+            {
+                await _historyService.RecordAsync(er.EnvelopeId, er.Receiver.EmailAddress, EnvelopeStatus.AccessCodeRequested);
+
+                var mailRes = await _mailService.SendAccessCodeAsync(envelopeReceiverDto: er);
+                if (mailRes.IsFailed)
                 {
-                    EnvelopeResponse response = await envelopeOldService.LoadEnvelope(envelopeReceiverId);
+                    _logger.LogNotice(mailRes);
+                    return this.ViewAccessCodeNotSent();
+                }
+            }
 
-                    bool accessCodeAlreadyRequested = await _historyService.AccessCodeAlreadyRequested(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress);
-                    if (!accessCodeAlreadyRequested)
-                    {
-                        await _historyService.RecordAsync(er.EnvelopeId, er.Receiver.EmailAddress, EnvelopeStatus.AccessCodeRequested);
-
-                        var mailRes = await _mailService.SendAccessCodeAsync(envelopeReceiverDto: er);
-                        if (mailRes.IsFailed)
-                        {
-                            _logger.LogNotice(mailRes);
-                            return this.ViewAccessCodeNotSent();
-                        }
-                    }
-
-                    return Redirect($"{envelopeReceiverId}/Locked");
-                },
-                Fail: (messages, notices) =>
-                {
-                    _logger.LogNotice(notices);
-                    return this.ViewEnvelopeNotFound();
-                });
+            return Redirect($"{envelopeReceiverId}/Locked");
         }
         catch(Exception ex)
         {

EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <PackageId>EnvelopeGenerator.Web</PackageId>
-    <Version>3.1.2</Version>
+    <Version>3.1.4</Version>
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
     <Product>EnvelopeGenerator.Web</Product>
@@ -13,8 +13,8 @@
     <PackageTags>digital data envelope generator web</PackageTags>
     <Description>EnvelopeGenerator.Web is an ASP.NET MVC application developed to manage signing processes. It uses Entity Framework Core (EF Core) for database operations. The user interface for signing processes is developed with Razor View Engine (.cshtml files) and JavaScript under wwwroot, integrated with PSPDFKit. This integration allows users to view and sign documents seamlessly.</Description>
     <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
-    <AssemblyVersion>3.1.2</AssemblyVersion>
-    <FileVersion>3.1.2</FileVersion>
+    <AssemblyVersion>3.1.4</AssemblyVersion>
+    <FileVersion>3.1.4</FileVersion>
     <Copyright>Copyright © 2025 Digital Data GmbH. All rights reserved.</Copyright>
   </PropertyGroup>
 
@@ -2126,7 +2126,7 @@
     <PackageReference Include="Quartz.Serialization.Json" Version="3.8.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
     <PackageReference Include="System.DirectoryServices" Version="7.0.1" />
     <PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
     <PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.1" />

EnvelopeGenerator.Web/Program.cs

@@ -24,6 +24,14 @@ try
 {
     var builder = WebApplication.CreateBuilder(args);
 
+    builder.Logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
+
+    if (!builder.Environment.IsDevelopment())
+    {
+        builder.Logging.ClearProviders();
+        builder.Host.UseNLog();
+    }
+
     var config = builder.Configuration;
 
     var allowedOrigins = config.GetSection("AllowedOrigins").Get<string[]>() ??
@@ -41,15 +49,14 @@ try
         });
     });
 
-    builder.Logging.ClearProviders();
-    builder.Host.UseNLog();
-
     // Add base services
     builder.Services.AddScoped<DatabaseService>();
 
     // Add higher order services
     builder.Services.AddScoped<EnvelopeOldService>();
 
+    builder.Services.AddHttpContextAccessor();
+
     builder.ConfigureBySection<TFARegParams>();
 
     // Add controllers and razor views

EnvelopeGenerator.Web/Services/DatabaseService.cs

@@ -18,9 +18,9 @@ namespace EnvelopeGenerator.Web.Services
             public ActionService actionService;
             public EmailService emailService;
 
-            public ServiceContainer(State state)
+            public ServiceContainer(State state, MSSQLServer MSSQL)
             {
-                actionService = new(state);
+                actionService = new(state, MSSQL);
                 emailService = new(state);
             }
         }
@@ -82,7 +82,7 @@ namespace EnvelopeGenerator.Web.Services
                 State.DbConfig = configModel.LoadConfiguration();
 
                 Models = new(State);
-                Services = new(State);
+                Services = new(State, MSSQL);
             }
             else
             {

EnvelopeGenerator.Web/appsettings.Development.json

@@ -7,5 +7,8 @@
     }
   },
   "AdminPassword": "dd",
-  "UseCSPInDev": false
+  "UseCSPInDev": false,
+  "ConnectionStrings": {
+    "Default": "Server=sDD-VMP04-SQL19\\CURSORAG;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;"
+  }
 }

EnvelopeGenerator.Web/appsettings.json

@@ -39,6 +39,11 @@
         "fileName": "${logDirectory}\\${logFileNamePrefix}-Info.log",
         "maxArchiveDays": 30
       },
+      "warningLogs": {
+        "type": "File",
+        "fileName": "${logDirectory}\\${logFileNamePrefix}-Warning.log",
+        "maxArchiveDays": 30
+      },
       "errorLogs": {
         "type": "File",
         "fileName": "${logDirectory}\\${logFileNamePrefix}-Error.log",
@@ -50,14 +55,17 @@
         "maxArchiveDays": 30
       }
     },
-    // Trace, Debug, Info, Warn, Error and *Fatal*
     "rules": [
       {
         "logger": "*",
-        "minLevel": "Info",
-        "maxLevel": "Warn",
+        "level": "Info",
         "writeTo": "infoLogs"
       },
+      {
+        "logger": "*",
+        "level": "Warn",
+        "writeTo": "warningLogs"
+      },
       {
         "logger": "*",
         "level": "Error",
@@ -147,7 +155,8 @@
     "EnvelopeHistory": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ],
     "EmailOut": [ "TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD" ],
     "EnvelopeReceiverReadOnly": [ "TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD" ],
-    "Receiver": []
+    "Receiver": [],
+    "EmailTemplate": [ "TBSIG_EMAIL_TEMPLATE_AFT_UPD" ]
   },
   "MainPageTitle": null,
   "AnnotationParams": {