fix(_Layout): sanitzer entfernt, um Json-Deserilisationsfehler zu vermeiden.

- Gebunden mit Modell.

.gitignore

@@ -360,4 +360,6 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+/EnvelopeGenerator.Web/.config/dotnet-tools.json
+/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/.vscode

EnvelopeGenerator.Application/Configurations/AuthenticatorParams.cs

@@ -0,0 +1,19 @@
+namespace EnvelopeGenerator.Application.Configurations
+{
+    public class AuthenticatorParams
+    {
+        public string CharPool { get; init; } = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567890123456789012345678901234567890123456789";
+
+        //TODO: Increase the DefaultTotpSecretKeyLength (e.g. to 32) but make sure that the QR code is generated correctly and can be scanned by the authenticator.
+        public int DefaultTotpSecretKeyLength { get; init; } = 20;
+
+        public string TotpIssuer { get; init; } = "signFlow";
+
+        /// <summary>
+        /// 0 is user email, 1 is secret key and 2 is issuer.
+        /// </summary>
+        public string TotpUrlFormat { get; init; } = "otpauth://totp/{0}?secret={1}&issuer={2}";
+
+        public int TotpQRPixelsPerModule { get; init; } = 20;
+    }
+}

EnvelopeGenerator.Application/Configurations/DispatcherParams.cs

@@ -0,0 +1,12 @@
+namespace EnvelopeGenerator.Application.Configurations;
+
+public class DispatcherParams
+{
+    public int SendingProfile { get; init; } = 1;
+
+    public string AddedWho { get; init; } = "DDEnvelopGenerator";
+
+    public int ReminderTypeId { get; init; } = 202377;
+
+    public string EmailAttmt1 { get; init; } = string.Empty;
+}

EnvelopeGenerator.Application/Configurations/GtxMessagingParams.cs

@@ -0,0 +1,20 @@
+using DigitalData.Core.Abstractions.Client;
+namespace EnvelopeGenerator.Application.Configurations;
+
+/// <summary>
+/// https://www.gtx-messaging.com/en/api-docs/sms-rest-api/
+/// </summary>
+public class GtxMessagingParams : IHttpClientOptions
+{
+    public required string Uri { get; init; }
+
+    public string? Path { get; init; }
+
+    public Dictionary<string, object>? Headers { get; init; }
+
+    public Dictionary<string, object?>? QueryParams { get; init; }
+
+    public string RecipientQueryParamName { get; init; } = "to";
+
+    public string MessageQueryParamName { get; init; } = "text";
+}

EnvelopeGenerator.Application/Configurations/MailParams.cs

@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.Application.Configurations;
+
+public class MailParams
+{
+    public required Dictionary<string, string> Placeholders { get; init; }
+}

EnvelopeGenerator.Application/Configurations/TotpSmsParams.cs

@@ -0,0 +1,49 @@
+using OtpNet;
+using System.Globalization;
+
+namespace EnvelopeGenerator.Application.Configurations
+{
+    public class TotpSmsParams
+    {
+        /// <summary>
+        /// The unit is second.
+        /// </summary>
+        public int TotpStep { get; init; } = 90;
+
+        public string Format { get; init; } = "Ihr 2FA-Passwort lautet {0}. Gültig bis {1}";
+        
+        public ExpirationHandler Expiration { get; init; } = new();
+
+        public VerificationWindow? TotpVerificationWindow { get; private init; } = VerificationWindow.RfcSpecifiedNetworkDelay;
+
+        private IEnumerable<int>? _tvwParams;
+
+        public IEnumerable<int>? TotpVerificationWindowParams
+        {
+            get => _tvwParams;
+            init
+            {
+                _tvwParams = value;
+                if(_tvwParams is not null)
+                    TotpVerificationWindow = new(previous: _tvwParams.ElementAtOrDefault(0), future: _tvwParams.ElementAtOrDefault(0));
+            }
+        }
+
+        public class ExpirationHandler
+        {
+            public string CacheKeyFormat { get; init; } = "e{0}_r{1}_sms_code_expiration";
+
+            public string Format { get; init; } = "HH:mm:ss";
+
+            public string CultureName
+            {
+                get => _cultureInfo.Name;
+                init => _cultureInfo = new(value);
+            }
+
+            private CultureInfo _cultureInfo = new("de-DE");
+
+            public CultureInfo CultureInfo => _cultureInfo;
+        }
+    }
+}

EnvelopeGenerator.Application/Contracts/IAuthenticator.cs

@@ -0,0 +1,19 @@
+using OtpNet;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IAuthenticator
+    {
+        string GenerateCode(int length);
+
+        string GenerateTotpSecretKey(int? length = null);
+
+        byte[] GenerateTotpQrCode(string userEmail, string secretKey, string? issuer = null, string? totpUrlFormat = null, int? pixelsPerModule = null);
+
+        byte[] GenerateTotpQrCode(string userEmail, int? length = null, string? issuer = null, string? totpUrlFormat = null, int? pixelsPerModule = null);
+
+        string GenerateTotp(string secretKey, int step = 30);
+
+        bool VerifyTotp(string totpCode, string secretKey, int step = 30, VerificationWindow? window = null);
+    }
+}

EnvelopeGenerator.Application/Contracts/IConfigService.cs

@@ -0,0 +1,17 @@
+using DigitalData.Core.Abstractions.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IConfigService : IReadService<ConfigDto, Config, int>
+    {
+        Task<DataResult<ConfigDto>> ReadFirstAsync();
+
+        Task<ConfigDto> ReadDefaultAsync();
+
+        Task<string> ReadDefaultSignatureHost();
+
+	}
+}

EnvelopeGenerator.Application/Contracts/IDocumentReceiverElementService.cs

@@ -0,0 +1,10 @@
+using DigitalData.Core.Abstractions.Application;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IDocumentReceiverElementService : IBasicCRUDService<DocumentReceiverElementDto, DocumentReceiverElement, int>
+    {
+    }
+}

EnvelopeGenerator.Application/Contracts/IDocumentStatusService.cs

@@ -0,0 +1,9 @@
+using DigitalData.Core.Abstractions.Application;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IDocumentStatusService : IBasicCRUDService<DocumentStatusDto, DocumentStatus, int>
+    {
+    }
+}

EnvelopeGenerator.Application/Contracts/IEmailTemplateService.cs

@@ -0,0 +1,13 @@
+using DigitalData.Core.Abstractions.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+using static EnvelopeGenerator.Common.Constants;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IEmailTemplateService : IBasicCRUDService<EmailTemplateDto, EmailTemplate, int>
+    {
+        Task<DataResult<EmailTemplateDto>> ReadByNameAsync(EmailTemplateType type);
+    }
+}

EnvelopeGenerator.Application/Contracts/IEnvelopeCertificateService.cs

@@ -0,0 +1,10 @@
+using DigitalData.Core.Abstractions.Application;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IEnvelopeCertificateService : IBasicCRUDService<EnvelopeCertificateDto, EnvelopeCertificate, int>
+    {
+    }
+}

EnvelopeGenerator.Application/Contracts/IEnvelopeDocumentService.cs

@@ -0,0 +1,10 @@
+using DigitalData.Core.Abstractions.Application;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IEnvelopeDocumentService : IBasicCRUDService<EnvelopeDocumentDto, EnvelopeDocument, int>
+    {
+    }
+}

EnvelopeGenerator.Application/Contracts/IEnvelopeHistoryService.cs

@@ -0,0 +1,28 @@
+using DigitalData.Core.Abstractions.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Domain.Entities;
+using static EnvelopeGenerator.Common.Constants;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IEnvelopeHistoryService : ICRUDService<EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>
+    {
+        Task<int> CountAsync(int? envelopeId = null, string? userReference = null, int? status = null);
+
+        Task<bool> AccessCodeAlreadyRequested(int envelopeId, string userReference);
+
+        Task<bool> IsSigned(int envelopeId, string userReference);
+
+        Task<bool> IsRejected(int envelopeId, string? userReference = null);
+
+        Task<IEnumerable<EnvelopeHistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, int? status = null, bool withSender = false, bool withReceiver = false);
+
+        Task<IEnumerable<EnvelopeHistoryDto>> ReadRejectedAsync(int envelopeId, string? userReference = null);
+
+        Task<IEnumerable<ReceiverReadDto>> ReadRejectingReceivers(int envelopeId);
+
+		Task<DataResult<long>> RecordAsync(int envelopeId, string userReference, EnvelopeStatus status, string? comment = null);
+    }
+}

EnvelopeGenerator.Application/Contracts/IEnvelopeMailService.cs

@@ -0,0 +1,19 @@
+using DigitalData.Core.DTO;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Common;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IEnvelopeMailService : IEmailOutService
+    {
+        Task<DataResult<int>> SendAsync(EnvelopeReceiverDto envelopeReceiverDto, Constants.EmailTemplateType tempType, Dictionary<string, object>? optionalPlaceholders = null);
+
+        Task<DataResult<int>> SendAsync(EnvelopeReceiverReadOnlyDto dto, Dictionary<string, object>? optionalPlaceholders = null);
+
+        Task<DataResult<int>> SendAccessCodeAsync(EnvelopeReceiverDto envelopeReceiverDto);
+
+        Task<DataResult<int>> SendTFAQrCodeAsync(EnvelopeReceiverDto envelopeReceiverDto);
+    }
+}

EnvelopeGenerator.Application/Contracts/IEnvelopeReceiverReadOnlyService.cs

@@ -0,0 +1,10 @@
+using DigitalData.Core.Abstractions.Application;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IEnvelopeReceiverReadOnlyService : ICRUDService<EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnlyDto, EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly, long>
+    {
+    }
+}

EnvelopeGenerator.Application/Contracts/IEnvelopeReceiverService.cs

@@ -0,0 +1,38 @@
+using DigitalData.Core.Abstractions.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.DTOs.Messaging;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>
+    {
+
+        Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false, bool readOnly = true);
+
+        Task<DataResult<IEnumerable<string?>>> ReadAccessCodeByUuidAsync(string uuid, bool withEnvelope = false, bool withReceiver = true);
+
+        Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true, bool readOnly = true);
+
+        Task<DataResult<EnvelopeReceiverDto>> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true);
+
+        Task<DataResult<EnvelopeReceiverSecretDto>> ReadWithSecretByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true);
+
+        Task<DataResult<EnvelopeReceiverDto>> ReadByEnvelopeReceiverIdAsync(string envelopeReceiverId, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true);
+
+        Task<DataResult<string>> ReadAccessCodeByIdAsync(int envelopeId, int receiverId);
+        
+		Task<DataResult<bool>> VerifyAccessCodeAsync(string uuid, string signature, string accessCode);
+
+        Task<DataResult<bool>> VerifyAccessCodeAsync(string envelopeReceiverId, string accessCode);
+
+        Task<DataResult<bool>> IsExisting(string envelopeReceiverId);
+
+        Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
+
+        Task<DataResult<string?>> ReadLastUsedReceiverNameByMail(string mail);
+
+        Task<DataResult<SmsResponse>> SendSmsAsync(string envelopeReceiverId, string message);
+    }
+}

EnvelopeGenerator.Application/Contracts/IEnvelopeService.cs

@@ -0,0 +1,16 @@
+using DigitalData.Core.Abstractions.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IEnvelopeService : IBasicCRUDService<EnvelopeDto, Envelope, int>
+    {
+        Task<DataResult<IEnumerable<EnvelopeDto>>> ReadAllWithAsync(bool documents = false, bool history = false, bool documentReceiverElement = false);
+
+        Task<DataResult<EnvelopeDto>> ReadByUuidAsync(string uuid, bool withDocuments = false, bool withHistory = false, bool withDocumentReceiverElement = false, bool withUser = false, bool withAll = false);
+
+        Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[]ignore_statuses);
+    }
+}

EnvelopeGenerator.Application/Contracts/IEnvelopeSmsHandler.cs

@@ -0,0 +1,17 @@
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.DTOs.Messaging;
+
+namespace EnvelopeGenerator.Application.Contracts;
+
+public interface IEnvelopeSmsHandler
+{
+    /// <summary>
+    /// If expiration is passed then, sends sms and returns smsResponse and up-to-date expiration; otherwise send expiration.
+    /// </summary>
+    /// <param name="er_secret"></param>
+    /// <param name="cToken"></param>
+    /// <returns></returns>
+    Task<(SmsResponse? SmsResponse, DateTime Expiration)> SendTotpAsync(EnvelopeReceiverSecretDto er_secret, CancellationToken cToken = default);
+
+    bool VerifyTotp(string totpCode, string secretKey);
+}

EnvelopeGenerator.Application/Contracts/IEnvelopeTypeService.cs

@@ -0,0 +1,10 @@
+using DigitalData.Core.Abstractions.Application;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IEnvelopeTypeService : IBasicCRUDService<EnvelopeTypeDto, EnvelopeType, int>
+    {
+    }
+}

EnvelopeGenerator.Application/Contracts/IReceiverService.cs

@@ -0,0 +1,17 @@
+using DigitalData.Core.Abstractions;
+using DigitalData.Core.Abstractions.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IReceiverService : ICRUDService<ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>
+    {
+        Task<DataResult<ReceiverReadDto>> ReadByAsync(string? emailAddress = null, string? signature = null);
+
+        Task<Result> DeleteByAsync(string? emailAddress = null, string? signature = null);
+
+        Task<Result> UpdateAsync<TUpdateDto>(TUpdateDto updateDto) where TUpdateDto : IUnique<int>;
+    }
+}

EnvelopeGenerator.Application/Contracts/ISmsSender.cs

@@ -0,0 +1,11 @@
+using EnvelopeGenerator.Application.DTOs.Messaging;
+
+namespace EnvelopeGenerator.Application.Contracts;
+
+//TODO: move to DigitalData.Core
+public interface ISmsSender
+{
+    string ServiceProvider { get; }
+
+    Task<SmsResponse> SendSmsAsync(string recipient, string message);
+}

EnvelopeGenerator.Application/Contracts/IUserReceiverService.cs

@@ -0,0 +1,10 @@
+using DigitalData.Core.Abstractions.Application;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IUserReceiverService : IBasicCRUDService<UserReceiverDto, UserReceiver, int>
+    {
+    }
+}

EnvelopeGenerator.Application/DTOs/ConfigDto.cs

@@ -0,0 +1,19 @@
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text.Json.Serialization;
+
+namespace EnvelopeGenerator.Application.DTOs
+{
+    public record ConfigDto(
+        string DocumentPath,
+        int SendingProfile,
+        string SignatureHost,
+        string ExternalProgramName,
+        string ExportPath) : IUnique<int>
+    {
+        [NotMapped]
+        [JsonIgnore]
+        [Obsolete("Configuration does not have an ID; it represents a single table in the database.")]
+        public int Id => throw new InvalidOperationException("This configuration does not support an ID as it represents a single row in the database.");
+    };
+}

EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs

@@ -0,0 +1,24 @@
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
+{
+    public record DocumentReceiverElementDto(
+        int Id,
+        int DocumentId,
+        int ReceiverId,
+        int ElementType,
+        double X,
+        double Y,
+        double Width,
+        double Height,
+        int Page,
+        bool Required,
+        string? Tooltip,
+        bool ReadOnly,
+        int AnnotationIndex,
+        DateTime AddedWhen,
+        DateTime? ChangedWhen,
+        double Top,
+        double Left
+        ): IUnique<int>;
+}

EnvelopeGenerator.Application/DTOs/DocumentStatusDto.cs

@@ -0,0 +1,14 @@
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
+{
+    public record DocumentStatusDto(
+        int Id,
+        int EnvelopeId,
+        int ReceiverId,
+        int Status,
+        DateTime? StatusChangedWhen,
+        string Value,
+        DateTime AddedWhen,
+        DateTime? ChangedWhen) : IUnique<int>;
+}

EnvelopeGenerator.Application/DTOs/EmailTemplateDto.cs

@@ -0,0 +1,10 @@
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
+{
+    public record EmailTemplateDto(
+        int Id,
+        string Name,
+        string Body,
+        string Subject) : IUnique<int>;
+}

EnvelopeGenerator.Application/DTOs/EnvelopeCertificateDto.cs

@@ -0,0 +1,14 @@
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
+{
+    public record EnvelopeCertificateDto(
+        int Id,
+        int EnvelopeId,
+        string EnvelopeUuid,
+        string EnvelopeSubject,
+        int CreatorId,
+        string CreatorName,
+        string CreatorEmail,
+        int EnvelopeStatus) : IUnique<int>;
+}

EnvelopeGenerator.Application/DTOs/EnvelopeDocumentDto.cs

@@ -0,0 +1,13 @@
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
+{
+    public record EnvelopeDocumentDto
+    (
+        int Id,
+        int EnvelopeId,
+        DateTime AddedWhen,
+        byte[]? ByteData = null,
+        IEnumerable<DocumentReceiverElementDto>? Elements = null
+    ) : IUnique<int>;
+}

EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs

@@ -0,0 +1,69 @@
+using DigitalData.Core.Abstractions;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
+using DigitalData.UserManager.Application.DTOs.User;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.DTOs
+{
+    public record EnvelopeDto() : IUnique<int>
+    {
+		public int Id { get; set; }
+
+		public int UserId { get; set; }
+
+		public int Status { get; set; }
+
+		public string StatusName { get; set; }
+
+        public string Uuid { get; set; }
+
+		[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]")]
+		public string Title { get; set; }
+
+		public int? ContractType { get; set; }
+
+		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 IEnumerable<EnvelopeDocumentDto>? Documents { get; set; }
+	}
+}

EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryCreateDto.cs

@@ -0,0 +1,9 @@
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeHistory
+{
+    public record EnvelopeHistoryCreateDto(
+        int EnvelopeId,
+        string UserReference,
+        int Status,
+        DateTime? ActionDate,
+        string? Comment = null);
+}

EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryDto.cs

@@ -0,0 +1,21 @@
+using DigitalData.Core.Abstractions;
+using DigitalData.Core.DTO;
+using DigitalData.UserManager.Application.DTOs.User;
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using static EnvelopeGenerator.Common.Constants;
+
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeHistory
+{
+    public record EnvelopeHistoryDto(
+        long Id,
+        int EnvelopeId,
+        string UserReference,
+        int Status,
+        string? StatusName,
+        DateTime AddedWhen,
+        DateTime? ActionDate,
+        UserCreateDto? Sender,
+        ReceiverReadDto? Receiver,
+        ReferenceType ReferenceType,
+        string? Comment = null) : BaseDTO<long>(Id), IUnique<long>;
+}

EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverBasicDto.cs

@@ -0,0 +1,31 @@
+using DigitalData.Core.Abstractions;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
+
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
+{
+    public record EnvelopeReceiverBasicDto() : IUnique<(int Envelope, int Receiver)>
+    {
+        public (int Envelope, int Receiver) Id => (Envelope: EnvelopeId, Receiver: ReceiverId);
+
+        public int EnvelopeId { get; init; }
+
+        public int ReceiverId { get; init; }
+
+        public int Sequence { get; init; }
+
+        [TemplatePlaceholder("[NAME_RECEIVER]")]
+        public string? Name { get; init; }
+
+        public string? JobTitle { get; init; }
+
+        public string? CompanyName { get; init; }
+
+        public string? PrivateMessage { get; init; }
+
+        public DateTime AddedWhen { get; init; }
+
+        public DateTime? ChangedWhen { get; init; }
+
+        public bool HasPhoneNumber { get; init; }
+    }
+}

EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverDto.cs

@@ -0,0 +1,11 @@
+using EnvelopeGenerator.Application.DTOs.Receiver;
+
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
+{
+    public record EnvelopeReceiverDto() : EnvelopeReceiverBasicDto()
+    {
+        public EnvelopeDto? Envelope { get; set; }
+
+        public ReceiverReadDto? Receiver { get; set; }
+    }
+}

EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverSecretDto.cs

@@ -0,0 +1,9 @@
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
+{
+    public record EnvelopeReceiverSecretDto() : EnvelopeReceiverDto()
+    {
+        public string? AccessCode { get; init; }
+
+        public string? PhoneNumber { get; init; }
+    }
+}

EnvelopeGenerator.Application/DTOs/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyCreateDto.cs

@@ -0,0 +1,22 @@
+using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
+
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly
+{
+    public record EnvelopeReceiverReadOnlyCreateDto(
+        DateTime DateValid)
+    {
+        [EmailAddress]
+        [Required]
+        public required string ReceiverMail { get; init; }
+
+        [JsonIgnore]
+        public long? EnvelopeId { get; set; } = null;
+
+        [JsonIgnore]
+        public string? AddedWho { get; set; }
+
+        [JsonIgnore]
+        public DateTime AddedWhen { get; } = DateTime.Now;
+    };
+}

EnvelopeGenerator.Application/DTOs/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyDto.cs

@@ -0,0 +1,16 @@
+using EnvelopeGenerator.Application.DTOs.Receiver;
+
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly
+{
+    public record EnvelopeReceiverReadOnlyDto(
+        long Id,
+        long EnvelopeId,
+        string ReceiverMail,
+        DateTime DateValid,
+        DateTime AddedWhen,
+        string AddedWho,
+        EnvelopeDto? Envelope = null,              
+        string? ChangedWho = null,
+        DateTime? ChangedWhen = null,
+        ReceiverReadDto? Receiver = null);
+}

EnvelopeGenerator.Application/DTOs/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyUpdateDto.cs

@@ -0,0 +1,12 @@
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly
+{
+    public record EnvelopeReceiverReadOnlyUpdateDto(
+        long Id,
+        DateTime DateValid,
+        string ChangedWho) : IUnique<long>
+    {
+        public DateTime ChangedWhen { get; } = DateTime.Now;
+    };
+}

EnvelopeGenerator.Application/DTOs/EnvelopeTypeDto.cs

@@ -0,0 +1,21 @@
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
+{
+    public record EnvelopeTypeDto(
+        int Id,
+        string Title,
+        string Language,
+        int? ExpiresDays,
+        int? CertificationType,
+        bool? UseAccessCode,
+        int? FinalEmailToCreator,
+        int? FinalEmailToReceivers,
+        DateTime AddedWhen,
+        DateTime? ChangedWhen,
+        int? ExpiresWarningDays,
+        bool? SendReminderEmails,
+        int? FirstReminderDays,
+        int? ReminderIntervalDays,
+        int? ContractType) : IUnique<int>;
+}

EnvelopeGenerator.Application/DTOs/Messaging/GtxMessagingResponse.cs

@@ -0,0 +1,4 @@
+namespace EnvelopeGenerator.Application.DTOs.Messaging
+{
+    public class GtxMessagingResponse : Dictionary<string, object?> { }
+}

EnvelopeGenerator.Application/DTOs/Messaging/SmsResponse.cs

@@ -0,0 +1,11 @@
+namespace EnvelopeGenerator.Application.DTOs.Messaging
+{
+    public record SmsResponse
+    {
+        public required bool Ok { get; init; }
+
+        public bool Failed => !Ok;
+
+        public dynamic? Errors { get; init; }
+    }
+}

EnvelopeGenerator.Application/DTOs/Receiver/ReceiverCreateDto.cs

@@ -0,0 +1,21 @@
+using System.ComponentModel.DataAnnotations;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace EnvelopeGenerator.Application.DTOs.Receiver
+{
+    public record ReceiverCreateDto([EmailAddress] string EmailAddress, string? TotpSecretkey = null)
+    {
+        public string Signature => sha256HexOfMail.Value;
+
+        private readonly Lazy<string> sha256HexOfMail = new(() =>
+        {
+            var bytes_arr = Encoding.UTF8.GetBytes(EmailAddress.ToUpper());
+            var hash_arr = SHA256.HashData(bytes_arr);
+            var hexa_str = BitConverter.ToString(hash_arr);
+            return hexa_str.Replace("-", string.Empty);
+        });
+
+        public DateTime AddedWhen { get; } = DateTime.Now;
+    };
+}

EnvelopeGenerator.Application/DTOs/Receiver/ReceiverReadDto.cs

@@ -0,0 +1,24 @@
+using DigitalData.Core.Abstractions;
+using DigitalData.Core.DTO;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using System.Text.Json.Serialization;
+
+namespace EnvelopeGenerator.Application.DTOs.Receiver;
+
+public record ReceiverReadDto(
+    int Id,
+    string EmailAddress,
+    string Signature,
+    DateTime AddedWhen
+    ) : BaseDTO<int>(Id), IUnique<int>
+{
+    [JsonIgnore]
+    public IEnumerable<EnvelopeReceiverBasicDto>? EnvelopeReceivers { get; init; }
+
+    public string? LastUsedName => EnvelopeReceivers?.LastOrDefault()?.Name;
+
+    public string? TotpSecretkey { get; set; } = null;
+
+    public DateTime? TfaRegDeadline { get; set; }
+};

EnvelopeGenerator.Application/DTOs/Receiver/ReceiverUpdateDto.cs

@@ -0,0 +1,5 @@
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs.Receiver;
+
+public record ReceiverUpdateDto(int Id, string? TotpSecretkey = null, DateTime? TfaRegDeadline = null) : IUnique<int>;

EnvelopeGenerator.Application/DTOs/UserReceiverDto.cs

@@ -0,0 +1,13 @@
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
+{
+    public record UserReceiverDto(
+        int Id,
+        int UserId,
+        int ReceiverId,
+        string Name,
+        string CompanyName,
+        string JobTitle,
+        DateTime AddedWhen) : IUnique<int>;
+}

EnvelopeGenerator.Application/EnvelopeFlag.cs

@@ -0,0 +1,10 @@
+namespace EnvelopeGenerator.Application
+{
+    public enum EnvelopeFlag
+    {
+        EnvelopeOrReceiverNonexists,
+        NonDecodableEnvelopeReceiverId,
+        WrongEnvelopeReceiverId,
+        AccessCodeNull
+    }
+}

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -0,0 +1,60 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Remove="Resources\Model.Designer.vb" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="AutoMapper" Version="13.0.1" />
+		<PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
+		<PackageReference Include="DigitalData.Core.Application" Version="2.0.0" />
+		<PackageReference Include="DigitalData.Core.Client" Version="2.0.3" />
+		<PackageReference Include="DigitalData.Core.DTO" Version="2.0.0" />
+		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="2.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.18" />
+		<PackageReference Include="Otp.NET" Version="1.4.0" />
+		<PackageReference Include="QRCoder" Version="1.6.0" />
+		<PackageReference Include="QRCoder-ImageSharp" Version="0.10.0" />
+		<PackageReference Include="UserManager.Application" Version="2.0.0" />
+		<PackageReference Include="UserManager.Infrastructure" Version="2.0.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\EnvelopeGenerator.Extensions\EnvelopeGenerator.Extensions.csproj" />
+		<ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Compile Update="Resources\Model.Designer.cs">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Model.resx</DependentUpon>
+		</Compile>
+	</ItemGroup>
+
+	<ItemGroup>
+		<EmbeddedResource Update="Resources\Model.en.resx">
+			<CustomToolNamespace>My.Resources</CustomToolNamespace>
+			<LastGenOutput>Model.en.Designer.vb</LastGenOutput>
+			<Generator>PublicResXFileCodeGenerator</Generator>
+		</EmbeddedResource>
+		<EmbeddedResource Update="Resources\Model.resx">
+			<CustomToolNamespace>My.Resources</CustomToolNamespace>
+			<LastGenOutput>Model.Designer.cs</LastGenOutput>
+			<Generator>PublicResXFileCodeGenerator</Generator>
+		</EmbeddedResource>
+		<EmbeddedResource Update="Resources\Resource.de-DE.resx">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</EmbeddedResource>
+		<EmbeddedResource Update="Resources\Resource.en-US.resx">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</EmbeddedResource>
+	</ItemGroup>
+
+</Project>

EnvelopeGenerator.Application/Extensions/CacheExtensions.cs

@@ -0,0 +1,131 @@
+using Microsoft.Extensions.Caching.Distributed;
+
+namespace EnvelopeGenerator.Application.Extensions
+{
+    public static class CacheExtensions
+    {
+        public static Task SetLongAsync(this IDistributedCache cache, string key, long value, DistributedCacheEntryOptions? options = null, CancellationToken cToken = default)
+            => options is null
+                ? cache.SetAsync(key, BitConverter.GetBytes(value), token: cToken)
+                : cache.SetAsync(key, BitConverter.GetBytes(value), options: options, token: cToken);
+
+        public static async Task<long?> GetLongAsync(this IDistributedCache cache, string key, CancellationToken cToken = default)
+        {
+            var value = await cache.GetAsync(key, cToken);
+            return value is null ? null : BitConverter.ToInt64(value, 0);
+        }
+
+        public static Task SetDateTimeAsync(this IDistributedCache cache, string key, DateTime value, DistributedCacheEntryOptions? options = null, CancellationToken cToken = default)
+            => cache.SetLongAsync(key: key, value: value.Ticks, options: options, cToken: cToken);
+
+        public static async Task<DateTime?> GetDateTimeAsync(this IDistributedCache cache, string key, CancellationToken cToken = default)
+        {
+            var value = await cache.GetAsync(key, cToken);
+            return value is null ? null : new(BitConverter.ToInt64(value, 0));
+        }
+
+        public static Task SetTimeSpanAsync(this IDistributedCache cache, string key, TimeSpan value, DistributedCacheEntryOptions? options = null, CancellationToken cToken = default)
+            => cache.SetLongAsync(key: key, value: value.Ticks, options: options, cToken);
+
+        public static async Task<TimeSpan?> GetTimeSpanAsync(this IDistributedCache cache, string key, CancellationToken cToken = default)
+        {
+            var value = await cache.GetAsync(key, cToken);
+            return value is null ? null : new(BitConverter.ToInt64(value, 0));
+        }
+
+        //TODO: use code generator
+        #region GetOrSetAsync
+
+        #region string
+        public static async Task<string> GetOrSetAsync(this IDistributedCache cache, string key, Func<string> factory, DistributedCacheEntryOptions? options = null, bool cacheInBackground = false, CancellationToken cToken = default)
+        {
+            var value = await cache.GetStringAsync(key, cToken);
+            if (value is null)
+            {
+                // create new and save
+                value = factory();
+
+                Task CacheAsync() => options is null
+                        ? cache.SetStringAsync(key, value, cToken)
+                        : cache.SetStringAsync(key, value, options, cToken);
+
+                if (cacheInBackground)
+                    _ = Task.Run(async () => await CacheAsync(), cToken);
+                else
+                    await CacheAsync();
+            }
+
+            return value;
+        }
+
+        public static async Task<string> GetOrSetAsync(this IDistributedCache cache, string key, Func<Task<string>> factoryAsync, DistributedCacheEntryOptions? options = null, bool cacheInBackground = false, CancellationToken cToken = default)
+        {
+            var value = await cache.GetStringAsync(key, cToken);
+            if(value is null)
+            {
+                // create new and save
+                value = await factoryAsync();
+
+                Task CacheAsync() => options is null
+                    ? cache.SetStringAsync(key: key, value: value, token: cToken)
+                    : cache.SetStringAsync(key: key, value: value, options: options, token: cToken);
+
+                if (cacheInBackground)
+                    _ = Task.Run(async () => await CacheAsync(), cToken);
+                else
+                    await CacheAsync();
+            }
+
+            return value;
+        }
+        #endregion
+
+        #region DateTime
+        public static async Task<DateTime> GetOrSetAsync(this IDistributedCache cache, string key, Func<DateTime> factory, DistributedCacheEntryOptions? options = null, bool cacheInBackground = false, CancellationToken cToken = default)
+        {
+            if (await cache.GetDateTimeAsync(key, cToken) is DateTime dateTimeValue)
+                return dateTimeValue;
+            else
+            {
+                // create new and save
+                var newValue = factory();
+
+                Task CacheAsync() => options is null
+                        ? cache.SetDateTimeAsync(key, newValue, cToken: cToken)
+                        : cache.SetDateTimeAsync(key, newValue, options, cToken);
+
+                if (cacheInBackground)
+                    _ = Task.Run(async () => await CacheAsync(), cToken);
+                else
+                    await CacheAsync();
+
+                return newValue;
+            }
+        }
+
+        public static async Task<DateTime> GetOrSetAsync(this IDistributedCache cache, string key, Func<Task<DateTime>> factory, DistributedCacheEntryOptions? options = null, bool cacheInBackground = false, CancellationToken cToken = default)
+        {
+            if (await cache.GetDateTimeAsync(key, cToken) is DateTime dateTimeValue)
+                return dateTimeValue;
+            else
+            {
+                // create new and save
+                var newValue = await factory();
+
+                Task CacheAsync() => options is null
+                        ? cache.SetDateTimeAsync(key, newValue, cToken: cToken)
+                        : cache.SetDateTimeAsync(key, newValue, options, cToken);
+
+                if (cacheInBackground)
+                    _ = Task.Run(async () => await CacheAsync(), cToken);
+                else
+                    await CacheAsync();
+
+                return newValue;
+            }
+        }
+        #endregion
+
+        #endregion
+    }
+}

EnvelopeGenerator.Application/Extensions/DIExtensions.cs

@@ -0,0 +1,69 @@
+using DigitalData.UserManager.Application.MappingProfiles;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.MappingProfiles;
+using EnvelopeGenerator.Application.Configurations;
+using EnvelopeGenerator.Application.Services;
+using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Infrastructure.Repositories;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using DigitalData.Core.Client;
+using QRCoder;
+
+namespace EnvelopeGenerator.Application.Extensions;
+
+public static class DIExtensions
+{
+    public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, IConfiguration config)
+    {
+        //Inject CRUD Service and repositoriesad
+        services.TryAddScoped<IConfigRepository, ConfigRepository>();
+        services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
+        services.TryAddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
+        services.TryAddScoped<IConfigRepository, ConfigRepository>();
+        services.TryAddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
+        services.TryAddScoped<IDocumentStatusRepository, DocumentStatusRepository>();
+        services.TryAddScoped<IEmailTemplateRepository, EmailTemplateRepository>();
+        services.TryAddScoped<IEnvelopeRepository, EnvelopeRepository>();
+        services.TryAddScoped<IEnvelopeCertificateRepository, EnvelopeCertificateRepository>();
+        services.TryAddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
+        services.TryAddScoped<IEnvelopeHistoryRepository, EnvelopeHistoryRepository>();
+        services.TryAddScoped<IEnvelopeReceiverRepository, EnvelopeReceiverRepository>();
+        services.TryAddScoped<IEnvelopeTypeRepository, EnvelopeTypeRepository>();
+        services.TryAddScoped<IReceiverRepository, ReceiverRepository>();
+        services.TryAddScoped<IUserReceiverRepository, UserReceiverRepository>();
+        services.TryAddScoped<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyRepository>();
+        services.TryAddScoped<IConfigService, ConfigService>();
+        services.TryAddScoped<IDocumentReceiverElementService, DocumentReceiverElementService>();
+        services.TryAddScoped<IEnvelopeDocumentService, EnvelopeDocumentService>();
+        services.TryAddScoped<IEnvelopeHistoryService, EnvelopeHistoryService>();
+        services.TryAddScoped<IDocumentStatusService, DocumentStatusService>();
+        services.TryAddScoped<IEmailTemplateService, EmailTemplateService>();
+        services.TryAddScoped<IEnvelopeService, EnvelopeService>();
+        services.TryAddScoped<IEnvelopeCertificateService, EnvelopeCertificateService>();
+        services.TryAddScoped<IEnvelopeDocumentService, EnvelopeDocumentService>();
+        services.TryAddScoped<IEnvelopeReceiverService, EnvelopeReceiverService>();
+        services.TryAddScoped<IEnvelopeTypeService, EnvelopeTypeService>();
+        services.TryAddScoped<IReceiverService, ReceiverService>();
+        services.TryAddScoped<IUserReceiverService, UserReceiverService>();
+        services.TryAddScoped<IEnvelopeReceiverReadOnlyService, EnvelopeReceiverReadOnlyService>();
+
+        //Auto mapping profiles
+        services.AddAutoMapper(typeof(BasicDtoMappingProfile).Assembly);
+        services.AddAutoMapper(typeof(UserMappingProfile).Assembly);
+
+        services.Configure<DispatcherParams>(config.GetSection(nameof(DispatcherParams)));
+        services.Configure<MailParams>(config.GetSection(nameof(MailParams)));
+        services.Configure<AuthenticatorParams>(config.GetSection(nameof(AuthenticatorParams)));
+        services.Configure<TotpSmsParams>(config.GetSection(nameof(TotpSmsParams)));
+
+        services.AddHttpClientService<GtxMessagingParams>(config.GetSection(nameof(GtxMessagingParams)));
+        services.TryAddSingleton<ISmsSender, GTXSmsSender>();
+        services.TryAddSingleton<IEnvelopeSmsHandler, EnvelopeSmsHandler>();
+        services.TryAddSingleton<IAuthenticator, Authenticator>();
+        services.TryAddSingleton<QRCodeGenerator>();
+
+        return services;
+    }
+}

EnvelopeGenerator.Application/Extensions/MappingExtensions.cs

@@ -0,0 +1,14 @@
+using EnvelopeGenerator.Application.DTOs.Messaging;
+
+namespace EnvelopeGenerator.Application.Extensions
+{
+    public static class MappingExtensions
+    {
+        public static bool Ok(this GtxMessagingResponse gtxMessagingResponse)
+            => gtxMessagingResponse.TryGetValue("message-status", out var status)
+            && status?.ToString()?.ToLower() == "ok";
+
+        public static string ToBase64String(this byte[] bytes)
+            => Convert.ToBase64String(bytes);
+    }
+}

EnvelopeGenerator.Application/Key.cs

@@ -0,0 +1,20 @@
+namespace EnvelopeGenerator.Application
+{
+    public static class Key
+    {
+        public static readonly string InnerServiceError = nameof(InnerServiceError);
+        public static readonly string EnvelopeNotFound = nameof(EnvelopeNotFound);
+        public static readonly string EnvelopeReceiverNotFound = nameof(EnvelopeReceiverNotFound);
+        public static readonly string AccessCodeNull = nameof(AccessCodeNull);
+        public static readonly string WrongAccessCode = nameof(WrongAccessCode);
+        public static readonly string DataIntegrityIssue = nameof(DataIntegrityIssue);
+        public static readonly string SecurityBreachOrDataIntegrity = nameof(SecurityBreachOrDataIntegrity);
+        public static readonly string PossibleDataIntegrityIssue = nameof(PossibleDataIntegrityIssue);
+        public static readonly string SecurityBreach = nameof(SecurityBreach);
+        public static readonly string PossibleSecurityBreach = nameof(PossibleSecurityBreach);
+        public static readonly string WrongEnvelopeReceiverId = nameof(WrongEnvelopeReceiverId);
+        public static readonly string EnvelopeOrReceiverNonexists = nameof(EnvelopeOrReceiverNonexists);
+        public static readonly string PhoneNumberNonexists = nameof(PhoneNumberNonexists);
+        public static readonly string Default = nameof(Default);
+    }
+}

EnvelopeGenerator.Application/MappingProfiles/BasicDtoMappingProfile.cs

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

EnvelopeGenerator.Application/Resources/Resource.cs

@@ -0,0 +1,9 @@
+namespace EnvelopeGenerator.Application.Resources
+{
+    /// <summary>
+    /// The place holder class for Resource.*.resx
+    /// </summary>
+    public class Resource
+    {
+    }
+}

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

@@ -0,0 +1,261 @@
+<?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>
+  <data name="and" xml:space="preserve">
+    <value>und</value>
+  </data>
+  <data name="Back" xml:space="preserve">
+    <value>Zurück</value>
+  </data>
+  <data name="Complete" xml:space="preserve">
+    <value>Abschließen</value>
+  </data>
+  <data name="Confirmation" xml:space="preserve">
+    <value>Bestätigung</value>
+  </data>
+  <data name="de-DE" xml:space="preserve">
+    <value>Deutch</value>
+  </data>
+  <data name="DocProtected" xml:space="preserve">
+    <value>Dokument geschützt</value>
+  </data>
+  <data name="DocRejected" xml:space="preserve">
+    <value>Dokument abgelehnt</value>
+  </data>
+  <data name="DocSigned" xml:space="preserve">
+    <value>Dokument unterschrieben</value>
+  </data>
+  <data name="en-US" xml:space="preserve">
+    <value>Englisch</value>
+  </data>
+  <data name="EnvelopeInfo1" xml:space="preserve">
+    <value>Sie müssen {0} Vorgang unterzeichen. &lt;span class="highlight highlight-envelope-info-1"&gt;Bitte prüfen Sie die Seite {1}&lt;/span&gt;.</value>
+  </data>
+  <data name="EnvelopeInfo2" xml:space="preserve">
+    <value>Erstellt am {0} von {1}. Sie können den Absender über &lt;span class="highlight highlight-envelope-info-2"&gt;&lt;a class="mail-link" href="mailto:{2}?subject={3}&amp;body=Sehr%20geehrter%20{4}%20{5},%0A%0A%0A"&gt;{6}&lt;/a&gt;&lt;/span&gt; kontaktieren.</value>
+  </data>
+  <data name="Finalize" xml:space="preserve">
+    <value>Abschließen</value>
+  </data>
+  <data name="Hello" xml:space="preserve">
+    <value>Hallo</value>
+  </data>
+  <data name="HomePageDescription" xml:space="preserve">
+    <value>Das digitale Unterschriftenportal ist eine Plattform, die entwickelt wurde, um Ihre Dokumente sicher zu unterschreiben und zu verwalten. Mit seiner benutzerfreundlichen Oberfläche können Sie Ihre Dokumente schnell hochladen, die Unterschriftsprozesse verfolgen und Ihre digitalen Unterschriftenanwendungen einfach durchführen. Dieses Portal beschleunigt Ihren Arbeitsablauf mit rechtlich gültigen Unterschriften und erhöht gleichzeitig die Sicherheit Ihrer Dokumente.</value>
+  </data>
+  <data name="LocationWarning" xml:space="preserve">
+    <value>Bitte überprüfen Sie die Standortinformationen. Wenn sie falsch sind, korrigieren Sie diese bitte.</value>
+  </data>
+  <data name="LockedBodyAccess" xml:space="preserve">
+    <value>Wir senden Ihnen nun einen Zugriffscode an Ihre hinterlegte Email-Adresse. Dies kann evtl. einige Minuten dauern!</value>
+  </data>
+  <data name="LockedBodyAuthenticator" xml:space="preserve">
+    <value>Bitte geben Sie den in Ihrer Authenticator-App angegebenen TOTP-Code ein.</value>
+  </data>
+  <data name="LockedBodyAuthenticatorNew" xml:space="preserve">
+    <value>Wir haben den QR-Code an Ihre E-Mail-Adresse gesendet. Ihr QR-Code ist bis {0} gültig. Sie können ihn für alle Umschläge verwenden, die Sie an diese E-Mail-Adresse erhalten.</value>
+  </data>
+  <data name="LockedBodySms" xml:space="preserve">
+    <value>Wir haben soeben den Zugangscode als SMS an die von Ihnen angegebene Telefonnummer gesendet.</value>
+  </data>
+  <data name="LockedCodeLabelAccess" xml:space="preserve">
+    <value>Zugriffscode</value>
+  </data>
+  <data name="LockedCodeLabelAuthenticator" xml:space="preserve">
+    <value>TOTP</value>
+  </data>
+  <data name="LockedCodeLabelSms" xml:space="preserve">
+    <value>SMS-Code</value>
+  </data>
+  <data name="LockedFooterBodyAccess" xml:space="preserve">
+    <value>Bitte überprüfen Sie Ihr Email Postfach inklusive Spam-Ordner. Sie können auch den Absender &lt;a class="mail-link" href="mailto:{0}?subject={1}&amp;body={2}" target="_blank"&gt;{0}&lt;/a&gt; bitten, Ihnen den Code auf anderem Wege zukommen zu lassen.</value>
+  </data>
+  <data name="LockedFooterBodyAuthenticator" xml:space="preserve">
+    <value>Der neue QR-Code wird nur einmal für einen bestimmten Zeitraum gesendet und nach dem Scannen in Ihrer Authenticator-App gespeichert. Er kann für alle Umschläge verwendet werden, die an dieselbe E-Mail-Adresse gesendet werden, bis er abläuft. Wenn Sie die QR-Code-Mail nicht erhalten oder sie sowohl aus der Mail als auch aus authenticator löschen, kontaktieren Sie bitte den Absender.</value>
+  </data>
+  <data name="LockedFooterBodySms" xml:space="preserve">
+    <value>Sie können den Absender bitten, Ihre Rufnummer zu überprüfen. Die Telefonnummer muss mit der Ortsvorwahl eingegeben werden. Andernfalls können Sie beantragen, den Zwei-Faktor-Schutz zu entfernen.</value>
+  </data>
+  <data name="LockedFooterTitleAccess" xml:space="preserve">
+    <value>Sie haben keinen Zugriffscode erhalten?</value>
+  </data>
+  <data name="LockedFooterTitleAuthenticator" xml:space="preserve">
+    <value>Sie haben keinen QR-Code erhalten?</value>
+  </data>
+  <data name="LockedFooterTitleSms" xml:space="preserve">
+    <value>Sie haben keine SMS erhalten?</value>
+  </data>
+  <data name="LockedTitleAccess" xml:space="preserve">
+    <value>Dokument erfordert einen Zugriffscode</value>
+  </data>
+  <data name="LockedTitleAuthenticator" xml:space="preserve">
+    <value>2-Faktor-Authentifizierung</value>
+  </data>
+  <data name="LockedTitleSms" xml:space="preserve">
+    <value>2-Faktor-Authentifizierung</value>
+  </data>
+  <data name="Privacy" xml:space="preserve">
+    <value>Datenschutz</value>
+  </data>
+  <data name="ReadOnlyMessage" xml:space="preserve">
+    <value>Weitergeleitet von {0}. Gültig bis {1}.</value>
+  </data>
+  <data name="Reject" xml:space="preserve">
+    <value>Ablehnen</value>
+  </data>
+  <data name="Rejection" xml:space="preserve">
+    <value>Ablehnung</value>
+  </data>
+  <data name="RejectionInfo1" xml:space="preserve">
+    <value>Dieser Unterzeichnungsvorgang wurde abgelehnt!</value>
+  </data>
+  <data name="RejectionInfo1_ext" xml:space="preserve">
+    <value>Vorgang abgebrochen!</value>
+  </data>
+  <data name="RejectionInfo2" xml:space="preserve">
+    <value>Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
+  </data>
+  <data name="RejectionInfo2_ext" xml:space="preserve">
+    <value>Das Vorgang wurde von einer der beteiligten Parteien abgelehnt. Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
+  </data>
+  <data name="RejectionReasonQ" xml:space="preserve">
+    <value>Bitte geben Sie einen Grund an:</value>
+  </data>
+  <data name="SigAgree" xml:space="preserve">
+    <value>Durch Klick auf Abschließen stimme ich zu, dass die abgebildete und übermittelte Signatur als elektronische Darstellung meiner Signatur in den Fällen gelten, in denen ich sie auf Dokumenten, einschließlich rechtsgültiger Verträge verwende.</value>
+  </data>
+  <data name="SignDoc" xml:space="preserve">
+    <value>Dokument unterschreiben</value>
+  </data>
+  <data name="SigningProcessTitle" xml:space="preserve">
+    <value>Titel des Unterzeichnungs-Vorgangs</value>
+  </data>
+  <data name="UnexpectedError" xml:space="preserve">
+    <value>Ein unerwarteter Fehler ist aufgetreten.</value>
+  </data>
+  <data name="ViewDoc" xml:space="preserve">
+    <value>Dokument ansehen</value>
+  </data>
+  <data name="WelcomeToTheESignPortal" xml:space="preserve">
+    <value>Herzlich willkommen im eSign-Portal</value>
+  </data>
+  <data name="WrongAccessCode" xml:space="preserve">
+    <value>Ungültiger Zugangscode.</value>
+  </data>
+</root>

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

@@ -0,0 +1,261 @@
+<?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>
+  <data name="and" xml:space="preserve">
+    <value>and</value>
+  </data>
+  <data name="Back" xml:space="preserve">
+    <value>Back</value>
+  </data>
+  <data name="Complete" xml:space="preserve">
+    <value>Complete</value>
+  </data>
+  <data name="Confirmation" xml:space="preserve">
+    <value>Confirmation</value>
+  </data>
+  <data name="de-DE" xml:space="preserve">
+    <value>German</value>
+  </data>
+  <data name="DocProtected" xml:space="preserve">
+    <value>Document protected</value>
+  </data>
+  <data name="DocRejected" xml:space="preserve">
+    <value>Document rejected</value>
+  </data>
+  <data name="DocSigned" xml:space="preserve">
+    <value>Document signed</value>
+  </data>
+  <data name="en-US" xml:space="preserve">
+    <value>English</value>
+  </data>
+  <data name="EnvelopeInfo1" xml:space="preserve">
+    <value>You have to sign {0} process. &lt;span class="highlight highlight-envelope-info-1"&gt;Please check page {1}&lt;/span&gt;.</value>
+  </data>
+  <data name="EnvelopeInfo2" xml:space="preserve">
+    <value>Created on {0} by {1}. You can contact the sender via &lt;span class="highlight highlight-envelope-info-2"&gt;&lt;a class="mail-link" href="mailto:{2}?subject={3}&amp;body=Dear%20{4}%20{5},%0A%0A%0A"&gt;{6}&lt;/a&gt;&lt;/span&gt;.</value>
+  </data>
+  <data name="Finalize" xml:space="preserve">
+    <value>Finalize</value>
+  </data>
+  <data name="Hello" xml:space="preserve">
+    <value>Hello</value>
+  </data>
+  <data name="HomePageDescription" xml:space="preserve">
+    <value>The Digital Signature Portal is a platform developed for securely signing and managing your documents. With its user-friendly interface, you can quickly upload your documents, track the signing processes, and easily carry out your digital signature applications. This portal accelerates your workflow with legally valid signatures while enhancing the security of your documents.</value>
+  </data>
+  <data name="LocationWarning" xml:space="preserve">
+    <value>Please review the location information. If it is incorrect, kindly make the necessary corrections.</value>
+  </data>
+  <data name="LockedBodyAccess" xml:space="preserve">
+    <value>We will now send you an access code to your registered e-mail address. This may take a few minutes!</value>
+  </data>
+  <data name="LockedBodyAuthenticator" xml:space="preserve">
+    <value>Please enter the TOTP provided in your Authenticator app.</value>
+  </data>
+  <data name="LockedBodyAuthenticatorNew" xml:space="preserve">
+    <value>We have sent the QR code to your e-mail address. Your QR code is valid until {0}. You can use it for all envelopes received at this email address.</value>
+  </data>
+  <data name="LockedBodySms" xml:space="preserve">
+    <value>We have just sent the access code as an SMS to the phone number you provided.</value>
+  </data>
+  <data name="LockedCodeLabelAccess" xml:space="preserve">
+    <value>Access Code</value>
+  </data>
+  <data name="LockedCodeLabelAuthenticator" xml:space="preserve">
+    <value>TOTP</value>
+  </data>
+  <data name="LockedCodeLabelSms" xml:space="preserve">
+    <value>SMS Code</value>
+  </data>
+  <data name="LockedFooterBodyAccess" xml:space="preserve">
+    <value>Please check your email inbox including the spam folder. You can also ask the sender &lt;a class="mail-link" href="mailto:{0}?subject={1}&amp;body={2}" target="_blank"&gt;{0}&lt;/a&gt; to send you the code by other means.</value>
+  </data>
+  <data name="LockedFooterBodyAuthenticator" xml:space="preserve">
+    <value>The new QR code is sent only once for a given period and is saved in your authenticator app once scanned. It can be used for all envelopes received at the same email address until it expires. If you do not receive the QR code mail or delete it both from the mail and from authenticator, please contact the sender.</value>
+  </data>
+  <data name="LockedFooterBodySms" xml:space="preserve">
+    <value>You can ask the sender to check your phone number. The phone number must be entered with the area code. Otherwise you can request to remove the two-factor protection.</value>
+  </data>
+  <data name="LockedFooterTitleAccess" xml:space="preserve">
+    <value>You have not received an access code?</value>
+  </data>
+  <data name="LockedFooterTitleAuthenticator" xml:space="preserve">
+    <value>You have not received a QR code?</value>
+  </data>
+  <data name="LockedFooterTitleSms" xml:space="preserve">
+    <value>You have not received an SMS?</value>
+  </data>
+  <data name="LockedTitleAccess" xml:space="preserve">
+    <value>Document requires an access code</value>
+  </data>
+  <data name="LockedTitleAuthenticator" xml:space="preserve">
+    <value>2-Factor Authentication</value>
+  </data>
+  <data name="LockedTitleSms" xml:space="preserve">
+    <value>2-Factor Authentication</value>
+  </data>
+  <data name="Privacy" xml:space="preserve">
+    <value>Privacy</value>
+  </data>
+  <data name="ReadOnlyMessage" xml:space="preserve">
+    <value>Forwarded by {0}. Valid until {1}.</value>
+  </data>
+  <data name="Reject" xml:space="preserve">
+    <value>Reject</value>
+  </data>
+  <data name="Rejection" xml:space="preserve">
+    <value>Rejection</value>
+  </data>
+  <data name="RejectionInfo1" xml:space="preserve">
+    <value>This signing process was rejected!</value>
+  </data>
+  <data name="RejectionInfo1_ext" xml:space="preserve">
+    <value>Process canceled!</value>
+  </data>
+  <data name="RejectionInfo2" xml:space="preserve">
+    <value>You can contact {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Dear%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; if required.</value>
+  </data>
+  <data name="RejectionInfo2_ext" xml:space="preserve">
+    <value>The process has been rejected by one of the parties involved. You can contact {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Dear%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; if required.</value>
+  </data>
+  <data name="RejectionReasonQ" xml:space="preserve">
+    <value>Please give a reason:</value>
+  </data>
+  <data name="SigAgree" xml:space="preserve">
+    <value>By clicking on Finalize, I agree that the signature shown and submitted is an electronic representation of my signature in cases where I use it on documents, including legally binding contracts.</value>
+  </data>
+  <data name="SignDoc" xml:space="preserve">
+    <value>Sign document</value>
+  </data>
+  <data name="SigningProcessTitle" xml:space="preserve">
+    <value>Title of the signing process</value>
+  </data>
+  <data name="UnexpectedError" xml:space="preserve">
+    <value>An unexpected error has occurred.</value>
+  </data>
+  <data name="ViewDoc" xml:space="preserve">
+    <value>View document</value>
+  </data>
+  <data name="WelcomeToTheESignPortal" xml:space="preserve">
+    <value>Welcome to the eSign portal</value>
+  </data>
+  <data name="WrongAccessCode" xml:space="preserve">
+    <value>Invalid access code.</value>
+  </data>
+</root>

EnvelopeGenerator.Application/Services/Authenticator.cs

@@ -0,0 +1,71 @@
+using EnvelopeGenerator.Application.Configurations;
+using EnvelopeGenerator.Application.Contracts;
+using Microsoft.Extensions.Options;
+using OtpNet;
+using QRCoder;
+using System.Text;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class Authenticator : IAuthenticator
+    {
+        public static Lazy<Authenticator> LazyStatic => new(() => new Authenticator(Options.Create<AuthenticatorParams>(new()), new QRCodeGenerator()));
+
+        public static Authenticator Static => LazyStatic.Value;
+
+        private readonly AuthenticatorParams _params;
+
+        private readonly QRCodeGenerator _qrCodeGenerator;
+
+        public Authenticator(IOptions<AuthenticatorParams> options, QRCodeGenerator qrCodeGenerator)
+        {
+            _params = options.Value;
+            _qrCodeGenerator = qrCodeGenerator;
+        }
+
+        public string GenerateCode(int length)
+        {
+            //TODO: Inject Random as a singleton to support multithreading to improve performance.
+            Random random = new();
+
+            if (length <= 0)
+                throw new ArgumentException("Password length must be greater than 0.");
+
+            var passwordBuilder = new StringBuilder(length);
+
+            for (int i = 0; i < length; i++)
+                passwordBuilder.Append(_params.CharPool[random.Next(_params.CharPool.Length)]);
+
+            return passwordBuilder.ToString();
+        }
+
+        public string GenerateTotpSecretKey(int? length = null)
+            => Base32Encoding.ToString(KeyGeneration.GenerateRandomKey(length ?? _params.DefaultTotpSecretKeyLength));
+
+        public byte[] GenerateTotpQrCode(string userEmail, string secretKey, string? issuer = null, string? totpUrlFormat = null, int? pixelsPerModule = null)
+        {
+            var url = string.Format(totpUrlFormat ?? _params.TotpUrlFormat,
+                Uri.EscapeDataString(userEmail),
+                Uri.EscapeDataString(secretKey),
+                Uri.EscapeDataString(issuer ?? _params.TotpIssuer));
+            using var qrCodeData = _qrCodeGenerator.CreateQrCode(url, QRCodeGenerator.ECCLevel.Q);
+            using var qrCode = new BitmapByteQRCode(qrCodeData);
+            return qrCode.GetGraphic(pixelsPerModule ?? _params.TotpQRPixelsPerModule);
+        }
+
+        public byte[] GenerateTotpQrCode(string userEmail, int? length = null, string? issuer = null, string? totpUrlFormat = null, int? pixelsPerModule = null)
+        {
+            return GenerateTotpQrCode(
+                userEmail: userEmail,
+                secretKey: GenerateTotpSecretKey(length: length),
+                issuer: issuer,
+                totpUrlFormat: totpUrlFormat,
+                pixelsPerModule: pixelsPerModule);
+        }
+
+        public string GenerateTotp(string secretKey, int step = 30) => new Totp(Base32Encoding.ToBytes(secretKey), step).ComputeTotp();
+        
+        public bool VerifyTotp(string totpCode, string secretKey, int step = 30, VerificationWindow? window = null)
+            => new Totp(Base32Encoding.ToBytes(secretKey), step).VerifyTotp(totpCode, out _, window);
+    }
+}

EnvelopeGenerator.Application/Services/ConfigService.cs

@@ -0,0 +1,60 @@
+using AutoMapper;
+using DigitalData.Core.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Infrastructure.Contracts;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Logging;
+namespace EnvelopeGenerator.Application.Services
+{
+    public class ConfigService : ReadService<IConfigRepository, ConfigDto, Config, int>, IConfigService
+    {
+		private static readonly Guid DefaultConfigCacheId = Guid.NewGuid();
+
+		private readonly IMemoryCache _cache;
+        private readonly ILogger<ConfigService> _logger;
+		public ConfigService(IConfigRepository repository, IMapper mapper, IMemoryCache memoryCache, ILogger<ConfigService> logger) : base(repository, mapper)
+        {
+			_cache = memoryCache;
+            _logger = logger;
+        }
+
+        public async Task<DataResult<ConfigDto>> ReadFirstAsync()
+        {
+            var config = await _repository.ReadFirstAsync();
+            return config is null 
+                ? Result.Fail<ConfigDto>().Notice(LogLevel.Error, Flag.DataIntegrityIssue, "There is no configuration in DB.")
+                : Result.Success(_mapper.Map<ConfigDto>(config));
+        }
+
+		/// <summary>
+		/// Reads the default configuration asynchronously.
+		/// </summary>
+		/// <remarks>
+		/// The configuration is cached in memory upon the first retrieval. If the configuration is updated, 
+		/// the application needs to be restarted for the changes to take effect as the memory cache will not be updated automatically.
+		/// </remarks>
+		/// <returns>
+		/// A task that represents the asynchronous read operation. The task result contains the default configuration as a <see cref="ConfigDto"/>.
+		/// </returns>
+		/// <exception cref="InvalidOperationException">
+		/// Thrown when the default configuration cannot be found.
+		/// </exception>
+		public async Task<ConfigDto> ReadDefaultAsync()
+        {
+            var config = await _cache.GetOrCreateAsync(DefaultConfigCacheId, _ => ReadFirstAsync().ThenAsync(
+                    Success: config => config,
+                    Fail: (mssg, ntc) =>
+                    {
+                        _logger.LogNotice(ntc);
+                        throw new InvalidOperationException("Default configuration cannot find.");
+                    }));
+
+            return config!;
+        }
+
+        public async Task<string> ReadDefaultSignatureHost() => (await ReadDefaultAsync()).SignatureHost;
+    }
+}

EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs

@@ -0,0 +1,17 @@
+using AutoMapper;
+using DigitalData.Core.Application;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Infrastructure.Contracts;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class DocumentReceiverElementService : BasicCRUDService<IDocumentReceiverElementRepository, DocumentReceiverElementDto, DocumentReceiverElement, int>, IDocumentReceiverElementService
+    {
+        public DocumentReceiverElementService(IDocumentReceiverElementRepository repository, IMapper mapper)
+            : base(repository, mapper)
+        {
+        }
+    }
+}

EnvelopeGenerator.Application/Services/DocumentStatusService.cs

@@ -0,0 +1,17 @@
+using AutoMapper;
+using DigitalData.Core.Application;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Infrastructure.Contracts;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class DocumentStatusService : BasicCRUDService<IDocumentStatusRepository, DocumentStatusDto, DocumentStatus, int>, IDocumentStatusService
+    {
+        public DocumentStatusService(IDocumentStatusRepository repository, IMapper mapper)
+            : base(repository, mapper)
+        {
+        }
+    }
+}

EnvelopeGenerator.Application/Services/EmailTemplateService.cs

@@ -0,0 +1,30 @@
+using AutoMapper;
+using DigitalData.Core.Application;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Infrastructure.Contracts;
+using static EnvelopeGenerator.Common.Constants;
+using DigitalData.Core.DTO;
+using Microsoft.Extensions.Logging;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class EmailTemplateService : BasicCRUDService<IEmailTemplateRepository, EmailTemplateDto, EmailTemplate, int>, IEmailTemplateService
+    {
+        public EmailTemplateService(IEmailTemplateRepository repository, IMapper mapper)
+            : base(repository, mapper)
+        {
+        }
+
+        public async Task<DataResult<EmailTemplateDto>> ReadByNameAsync(EmailTemplateType type)
+        {
+            var temp = await _repository.ReadByNameAsync(type);
+            return temp is null 
+                ? Result.Fail<EmailTemplateDto>()
+                    .Message(Key.InnerServiceError)
+                    .Notice(LogLevel.Error, Flag.DataIntegrityIssue, $"EmailTemplateType '{type}' is not found in DB. Please, define required e-mail template.")
+                : Result.Success(_mapper.Map<EmailTemplateDto>(temp));
+        }
+    }
+}

EnvelopeGenerator.Application/Services/EnvelopeCertificateService.cs

@@ -0,0 +1,19 @@
+using AutoMapper;
+using DigitalData.Core.Application;
+using Microsoft.Extensions.Localization;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.Resources;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class EnvelopeCertificateService : BasicCRUDService<IEnvelopeCertificateRepository, EnvelopeCertificateDto, EnvelopeCertificate, int>, IEnvelopeCertificateService
+    {
+        public EnvelopeCertificateService(IEnvelopeCertificateRepository repository, IMapper mapper)
+            : base(repository, mapper)
+        {
+        }
+    }
+}

EnvelopeGenerator.Application/Services/EnvelopeDocumentService.cs

@@ -0,0 +1,16 @@
+using AutoMapper;
+using DigitalData.Core.Application;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Infrastructure.Contracts;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class EnvelopeDocumentService : BasicCRUDService<IEnvelopeDocumentRepository, EnvelopeDocumentDto, EnvelopeDocument, int>, IEnvelopeDocumentService
+    {
+        public EnvelopeDocumentService(IEnvelopeDocumentRepository repository, IMapper mapper) : base(repository, mapper)
+        {
+        }
+    }
+}

EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs

@@ -0,0 +1,85 @@
+using AutoMapper;
+using DigitalData.Core.Application;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Infrastructure.Contracts;
+using static EnvelopeGenerator.Common.Constants;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
+using EnvelopeGenerator.Application.DTOs.Receiver;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>, IEnvelopeHistoryService
+    {
+        public EnvelopeHistoryService(IEnvelopeHistoryRepository repository, IMapper mapper)
+            : base(repository, mapper)
+        {
+        }
+
+        public async Task<int> CountAsync(int? envelopeId = null, string? userReference = null, int? status = null) => await _repository.CountAsync(envelopeId: envelopeId, userReference: userReference, status: status);
+
+        public async Task<bool> HasStatus(EnvelopeStatus status, int envelopeId, string userReference) => await _repository.CountAsync(
+            envelopeId: envelopeId,
+            userReference: userReference,
+            status: (int) status) > 0;
+
+        public async Task<bool> AccessCodeAlreadyRequested(int envelopeId, string userReference) => await _repository.CountAsync(
+            envelopeId: envelopeId,
+            userReference:userReference,
+            status: (int) EnvelopeStatus.AccessCodeRequested) > 0;
+
+        public async Task<bool> IsSigned(int envelopeId, string userReference) => await _repository.CountAsync(
+            envelopeId: envelopeId,
+            userReference: userReference,
+            status: (int) EnvelopeStatus.DocumentSigned) > 0;
+
+        /// <summary>
+        /// Checks if the specified envelope has been rejected.
+        /// <para><b>Note:</b> <i>If any document within the envelope is rejected, the entire envelope will be considered rejected.</i></para>
+        /// </summary>
+        /// <param name="envelopeId">The ID of the envelope to check.</param>
+        /// <param name="userReference">Optional user reference associated with the envelope.</param>
+        /// <returns>A task that represents the asynchronous operation. The task result contains a boolean value indicating whether the envelope is rejected.</returns>
+        public async Task<bool> IsRejected(int envelopeId, string? userReference = null)
+        {
+            return await _repository.CountAsync(
+                envelopeId: envelopeId,
+                userReference: userReference,
+                status: (int)EnvelopeStatus.DocumentRejected) > 0;
+        }
+
+        public async Task<IEnumerable<EnvelopeHistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, int? status = null, bool withSender = false, bool withReceiver = false)
+        {
+            var histDTOs = _mapper.Map<IEnumerable<EnvelopeHistoryDto>>(
+                        await _repository.ReadAsync(
+                                    envelopeId: envelopeId,
+                                    userReference: userReference,
+                                    status: status,
+                                    withSender: withSender,
+                                    withReceiver: withReceiver));
+            return referenceType is null ? histDTOs : histDTOs.Where(h => h.ReferenceType == referenceType);
+        }
+
+        public async Task<IEnumerable<EnvelopeHistoryDto>> ReadRejectedAsync(int envelopeId, string? userReference = null) =>
+            await ReadAsync(envelopeId: envelopeId, userReference: userReference, status: (int)EnvelopeStatus.DocumentRejected, withReceiver:true);
+
+		//TODO: use IQueryable in repository to incerease the performance
+		public async Task<IEnumerable<ReceiverReadDto>> ReadRejectingReceivers(int envelopeId)
+		{
+			var envelopes = await ReadRejectedAsync(envelopeId);
+            return envelopes is null
+                ? Enumerable.Empty<ReceiverReadDto>()
+                : envelopes
+                    .Where(eh => eh?.Receiver != null)
+                    .Select(eh => eh.Receiver!);
+		}
+
+		public async Task<DataResult<long>> RecordAsync(int envelopeId, string userReference, EnvelopeStatus status, string? comment = null) => 
+            await CreateAsync(new (EnvelopeId: envelopeId, UserReference: userReference, Status: (int)status, ActionDate: DateTime.Now, Comment: comment))
+                .ThenAsync(
+                    Success: id => Result.Success(id),
+                    Fail: (mssg, ntc) => Result.Fail<long>().Message(mssg).Notice(ntc)
+                );
+    }
+}

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -0,0 +1,175 @@
+using AutoMapper;
+using DigitalData.Core.DTO;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
+using DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Services;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Common;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using static EnvelopeGenerator.Common.Constants;
+using EnvelopeGenerator.Extensions;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Application.Configurations;
+using EnvelopeGenerator.Application.Extensions;
+using Newtonsoft.Json;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
+    {
+		private readonly IEmailTemplateService _tempService;
+		private readonly IEnvelopeReceiverService _envRcvService;
+		private readonly DispatcherParams _dConfig;
+		private readonly IConfigService _configService;
+		private readonly Dictionary<string, string> _placeholders;
+		private readonly IAuthenticator _authenticator;
+
+        public EnvelopeMailService(IEmailOutRepository repository, IMapper mapper, IEmailTemplateService tempService, IEnvelopeReceiverService envelopeReceiverService, IOptions<DispatcherParams> dispatcherConfigOptions, IConfigService configService, IOptions<MailParams> mailConfig, IAuthenticator authenticator) : base(repository, mapper)
+        {
+            _tempService = tempService;
+			_envRcvService = envelopeReceiverService;
+			_dConfig = dispatcherConfigOptions.Value;
+			_configService = configService;
+			_placeholders = mailConfig.Value.Placeholders;
+			_authenticator = authenticator;
+        }
+
+		private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? envelopeReceiverDto = null)
+		{
+			if (accessCode is not null)
+                _placeholders["[DOCUMENT_ACCESS_CODE]"] = accessCode;
+
+			if(envelopeReceiverDto?.Envelope is not null && envelopeReceiverDto.Receiver is not null)
+			{
+				var erId = (envelopeReceiverDto.Envelope.Uuid, envelopeReceiverDto.Receiver.Signature).EncodeEnvelopeReceiverId();
+				var sigHost = await _configService.ReadDefaultSignatureHost();
+				var linkToDoc = $"{sigHost}/EnvelopeKey/{erId}";
+				_placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
+				_placeholders["[LINK_TO_DOCUMENT_TEXT]"] = linkToDoc[..Math.Min(40, linkToDoc.Length)] + "..";
+			}
+
+			return _placeholders;
+		}
+
+        private async Task<Dictionary<string, string>> CreatePlaceholders(EnvelopeReceiverReadOnlyDto? readOnlyDto = null)
+        {
+            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;
+                var erReadOnlyId = (readOnlyDto.Id).EncodeEnvelopeReceiverId();
+                var sigHost = await _configService.ReadDefaultSignatureHost();
+                var linkToDoc = $"{sigHost}/EnvelopeKey/{erReadOnlyId}";
+                _placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
+                _placeholders["[LINK_TO_DOCUMENT_TEXT]"] = linkToDoc[..Math.Min(40, linkToDoc.Length)] + "..";
+            }
+
+            return _placeholders;
+        }
+		
+        public async Task<DataResult<int>> SendAsync(EnvelopeReceiverDto dto, EmailTemplateType tempType, Dictionary<string, object>? optionalPlaceholders = null)
+        {
+			var tempSerResult = await _tempService.ReadByNameAsync(tempType);
+			if (tempSerResult.IsFailed)
+				return tempSerResult.ToFail<int>().Notice(LogLevel.Error, Flag.DataIntegrityIssue, $"The email cannot send because '{tempType}' template cannot found.");
+			var temp = tempSerResult.Data;
+
+			var mail = new EmailOutCreateDto()
+			{
+				EmailAddress = dto.Receiver!.EmailAddress,
+				EmailSubj = temp.Subject,
+				EmailBody = temp.Body,
+				//email_type = envelope_status,
+				//message = envelope_message,
+				ReferenceId = dto.EnvelopeId,               //REFERENCE_ID = ENVELOPE_ID
+				ReferenceString = dto!.Envelope!.Uuid,		//REFERENCE_STRING = ENVELOPE_UUID
+				//receiver_name = receiver.name,
+				//receiver_access_code = receiver.access_code,
+				//sender_adress = envelope.user.email,
+				//sender_name = envelope.user.full_name,
+				//envelope_title = envelope.title,
+				ReminderTypeId = _dConfig.ReminderTypeId,
+				SendingProfile = _dConfig.SendingProfile,
+				EntityId = null,
+				WfId = (int) EnvelopeStatus.MessageAccessCodeSent,
+				WfReference = null,
+				AddedWho = _dConfig.AddedWho,
+				EmailAttmt1 = _dConfig.EmailAttmt1
+			};
+
+			//get acccess code
+			var acResult = await _envRcvService.ReadAccessCodeByIdAsync(envelopeId: dto.EnvelopeId, receiverId: dto.ReceiverId);
+			if (acResult.IsFailed)
+				return acResult.ToFail<int>().Notice(LogLevel.Error, "Therefore, access code cannot be sent");
+			var accessCode = acResult.Data;
+			
+			var placeholders = await CreatePlaceholders(accessCode: accessCode, envelopeReceiverDto: dto);
+
+			// Add optional place holders.
+			if (optionalPlaceholders is not null)
+				foreach (var oph in optionalPlaceholders)
+					placeholders[oph.Key] = oph.Value.ToString() ?? "NULL";
+
+			//TODO: remove the requirement to add the models using reflections
+			return await CreateWithTemplateAsync(createDto: mail,placeholders: placeholders,
+				dto, dto.Envelope.User!, dto.Envelope);
+		}
+
+		public async Task<DataResult<int>> SendAsync(EnvelopeReceiverReadOnlyDto dto, Dictionary<string, object>? optionalPlaceholders = null)
+		{
+            var tempSerResult = await _tempService.ReadByNameAsync(EmailTemplateType.DocumentShared);
+            if (tempSerResult.IsFailed)
+                return tempSerResult.ToFail<int>().Notice(LogLevel.Error, Flag.DataIntegrityIssue, $"The email cannot send because '{Constants.EmailTemplateType.DocumentShared}' template cannot found.");
+            var temp = tempSerResult.Data;
+
+            var mail = new EmailOutCreateDto()
+            {
+                EmailAddress = dto.ReceiverMail,
+                EmailSubj = temp.Subject,
+                EmailBody = temp.Body,
+				//TODO: remove int casting when all 
+                ReferenceId = (int) dto.EnvelopeId,			//REFERENCE_ID = ENVELOPE_ID
+                ReferenceString = dto.Envelope!.Uuid,		//REFERENCE_STRING = ENVELOPE_UUID
+                                                            //receiver_name = receiver.name,
+                                                            //receiver_access_code = receiver.access_code,
+                                                            //sender_adress = envelope.user.email,
+                                                            //sender_name = envelope.user.full_name,
+                                                            //envelope_title = envelope.title,
+                ReminderTypeId = _dConfig.ReminderTypeId,
+                SendingProfile = _dConfig.SendingProfile,
+                EntityId = null,
+                WfId = (int)EnvelopeStatus.EnvelopeShared,
+                WfReference = null,
+                AddedWho = _dConfig.AddedWho,
+                EmailAttmt1 = _dConfig.EmailAttmt1
+            };
+
+            var placeholders = await CreatePlaceholders(readOnlyDto: dto);
+
+            // Add optional place holders.
+            if (optionalPlaceholders is not null)
+                foreach (var oph in optionalPlaceholders)
+                placeholders[oph.Key] = oph.Value.ToString() ?? "NULL";
+
+            return await CreateWithTemplateAsync(createDto: mail, placeholders: placeholders, dto.Envelope);
+        }
+
+        public async Task<DataResult<int>> SendAccessCodeAsync(EnvelopeReceiverDto dto) => await SendAsync(dto: dto, tempType: EmailTemplateType.DocumentAccessCodeReceived);
+
+        public Task<DataResult<int>> SendTFAQrCodeAsync(EnvelopeReceiverDto dto)
+        {
+            // Check if receiver or secret key is null
+            if (dto.Receiver is null)
+                throw new ArgumentNullException(nameof(dto), $"TFA Qr Code cannot sent. Receiver information is missing. Envelope receiver dto is {JsonConvert.SerializeObject(dto)}");
+            if (dto.Receiver.TotpSecretkey is null)
+                throw new ArgumentNullException(nameof(dto), $"TFA Qr Code cannot sent. Receiver.TotpSecretKey is null. Envelope receiver dto is {JsonConvert.SerializeObject(dto)}");
+
+            var totp_qr_64 = _authenticator.GenerateTotpQrCode(userEmail: dto.Receiver.EmailAddress, secretKey: dto.Receiver.TotpSecretkey).ToBase64String();
+            return SendAsync(dto, EmailTemplateType.TotpSecret, new()
+			{
+				{"[TFA_QR_CODE]", totp_qr_64 },
+			});
+        }
+    }
+}

EnvelopeGenerator.Application/Services/EnvelopeReceiverReadOnlyService.cs

@@ -0,0 +1,16 @@
+using AutoMapper;
+using DigitalData.Core.Application;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Infrastructure.Contracts;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class EnvelopeReceiverReadOnlyService : CRUDService<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnlyDto, EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly, long>, IEnvelopeReceiverReadOnlyService
+    {
+        public EnvelopeReceiverReadOnlyService(IEnvelopeReceiverReadOnlyRepository repository, IMapper mapper) : base(repository, mapper)
+        {
+        }
+    }
+}

EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs

@@ -0,0 +1,179 @@
+using AutoMapper;
+using DigitalData.Core.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Resources;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Infrastructure.Contracts;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Logging;
+using EnvelopeGenerator.Extensions;
+using EnvelopeGenerator.Application.DTOs.Messaging;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverRepository, EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>, IEnvelopeReceiverService
+    {
+        private readonly IStringLocalizer<Resource> _localizer;
+
+        private readonly ISmsSender _smsSender;
+
+        public EnvelopeReceiverService(IEnvelopeReceiverRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper, ISmsSender smsSender)
+            : base(repository, mapper)
+        {
+            _localizer = localizer;
+            _smsSender = smsSender;
+        }
+
+        public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true, bool readOnly = true)
+        {
+            var env_rcvs = await _repository.ReadBySignatureAsync(signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver, readOnly: readOnly);
+            return Result.Success(_mapper.Map<IEnumerable<EnvelopeReceiverDto>>(env_rcvs));
+        }
+
+        public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false, bool readOnly = true)
+        {
+            var env_rcvs = await _repository.ReadByUuidAsync(uuid: uuid, withEnvelope: withEnvelope, withReceiver: withReceiver, readOnly: readOnly);
+            return Result.Success(_mapper.Map<IEnumerable<EnvelopeReceiverDto>>(env_rcvs));
+        }
+
+        public async Task<DataResult<IEnumerable<string?>>> ReadAccessCodeByUuidAsync(string uuid, bool withEnvelope = false, bool withReceiver = true)
+        {
+            var env_rcvs = await _repository.ReadByUuidAsync(uuid: uuid, withEnvelope: withEnvelope, withReceiver: withReceiver);
+            return Result.Success(env_rcvs.Select(er => er.AccessCode));
+        }
+
+        public async Task<DataResult<EnvelopeReceiverDto>> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true)
+        {
+            var env_rcv = await _repository.ReadByUuidSignatureAsync(uuid: uuid, signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver, readOnly: readOnly);
+            if (env_rcv is null)
+                return Result.Fail<EnvelopeReceiverDto>()
+                    .Message(Key.EnvelopeReceiverNotFound);
+
+            return Result.Success(_mapper.Map<EnvelopeReceiverDto>(env_rcv));
+        }
+
+        public async Task<DataResult<EnvelopeReceiverSecretDto>> ReadWithSecretByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true)
+        {
+            var env_rcv = await _repository.ReadByUuidSignatureAsync(uuid: uuid, signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver, readOnly: readOnly);
+            if (env_rcv is null)
+                return Result.Fail<EnvelopeReceiverSecretDto>()
+                    .Message(Key.EnvelopeReceiverNotFound);
+
+            return Result.Success(_mapper.Map<EnvelopeReceiverSecretDto>(env_rcv));
+        }
+
+        public async Task<DataResult<EnvelopeReceiverDto>> ReadByEnvelopeReceiverIdAsync(string envelopeReceiverId, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true)
+        {
+            (string? uuid, string? signature)  = envelopeReceiverId.DecodeEnvelopeReceiverId();
+
+            if (uuid is null || signature is null)
+                return Result.Fail<EnvelopeReceiverDto>()
+                    .Message(_localizer[Key.WrongEnvelopeReceiverId])
+                    .Notice(LogLevel.Warning, (uuid, signature).ToTitle())
+                    .Notice(LogLevel.Warning, EnvelopeFlag.WrongEnvelopeReceiverId)
+                    .Notice(LogLevel.Warning, Flag.PossibleSecurityBreach);
+
+            return await ReadByUuidSignatureAsync(uuid: uuid, signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver, readOnly: readOnly);
+        }
+
+        public async Task<DataResult<bool>> VerifyAccessCodeAsync(string uuid, string signature, string accessCode)
+        {
+            var er = await _repository.ReadByUuidSignatureAsync(uuid: uuid, signature: signature);
+
+            if (er is null)
+                return Result.Fail<bool>()
+                    .Message(_localizer[Key.EnvelopeOrReceiverNonexists])
+                    .Notice(LogLevel.Warning, (uuid, signature).ToTitle())
+                    .Notice(LogLevel.Warning, EnvelopeFlag.EnvelopeOrReceiverNonexists)
+                    .Notice(LogLevel.Warning, Flag.PossibleDataIntegrityIssue);
+
+            var actualAccessCode = er.AccessCode;
+
+            if (actualAccessCode is null)
+                return Result.Fail<bool>()
+                    .Message(_localizer[Key.AccessCodeNull])
+                    .Notice(LogLevel.Critical, (uuid, signature).ToTitle())
+                    .Notice(LogLevel.Critical, EnvelopeFlag.AccessCodeNull)
+                    .Notice(LogLevel.Critical, Flag.DataIntegrityIssue);
+
+            else if (accessCode != actualAccessCode)
+                return Result.Success(false).Message(_localizer[Key.WrongAccessCode]);
+            else
+                return Result.Success(true);
+        }
+
+        public async Task<DataResult<bool>> VerifyAccessCodeAsync(string envelopeReceiverId, string accessCode)
+        {
+            (string? uuid, string? signature) = envelopeReceiverId.DecodeEnvelopeReceiverId();
+
+            if (uuid is null || signature is null)
+                return Result.Fail<bool>()
+                    .Message(Key.WrongEnvelopeReceiverId)
+                    .Notice(LogLevel.Critical, EnvelopeFlag.WrongEnvelopeReceiverId)
+                    .Notice(LogLevel.Critical, Flag.SecurityBreach)
+                    .Notice(LogLevel.Critical, "Attempt to verify access code detected. Such actions are generally not initiated by well-intentioned users. Potential security breach suspected. Immediate investigation required.");
+
+            return await VerifyAccessCodeAsync(uuid: uuid, signature: signature, accessCode: accessCode);
+        }
+
+        public async Task<DataResult<bool>> IsExisting(string envelopeReceiverId)
+        {
+            (string? uuid, string? signature) = envelopeReceiverId.DecodeEnvelopeReceiverId();
+
+            if (uuid is null || signature is null)
+                return Result.Fail<bool>().Notice(LogLevel.Warning, EnvelopeFlag.NonDecodableEnvelopeReceiverId, "In IsExisting(string envelopeReceiverId)");
+
+            int count = await _repository.CountAsync(uuid:uuid, signature:signature);
+            return Result.Success(count > 0);
+        }
+
+		public async Task<DataResult<string>> ReadAccessCodeByIdAsync(int envelopeId, int receiverId)
+		{
+            var code = await _repository.ReadAccessCodeByIdAsync(envelopeId: envelopeId, receiverId: receiverId);
+            return code is null ? 
+                Result.Fail<string>().Notice(LogLevel.Error, Flag.DataIntegrityIssue, $"Access code is null. Envelope ID is {envelopeId} and receiver ID {receiverId}")
+                : Result.Success(code);
+		}
+
+        public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses)
+        {
+            var er_list = await _repository.ReadByUsernameAsync(username: username, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses);
+            var dto_list = _mapper.Map<IEnumerable<EnvelopeReceiverDto>>(er_list);
+            return Result.Success(dto_list);
+        }
+
+        public async Task<DataResult<string?>> ReadLastUsedReceiverNameByMail(string mail)
+        {
+            var er = await _repository.ReadLastByReceiver(mail);
+            return er is null ? Result.Fail<string?>().Notice(LogLevel.None, Flag.NotFound) : Result.Success(er.Name);
+        }
+
+        public async Task<DataResult<SmsResponse>> SendSmsAsync(string envelopeReceiverId, string message)
+        {
+            (string? uuid, string? signature) = envelopeReceiverId.DecodeEnvelopeReceiverId();
+
+            if (uuid is null || signature is null)
+                return Result.Fail<SmsResponse>()
+                    .Message(_localizer[Key.WrongEnvelopeReceiverId])
+                    .Notice(LogLevel.Warning, (uuid, signature).ToTitle())
+                    .Notice(LogLevel.Warning, EnvelopeFlag.WrongEnvelopeReceiverId)
+                    .Notice(LogLevel.Warning, Flag.PossibleSecurityBreach);
+
+            var env_rcv = await _repository.ReadByUuidSignatureAsync(uuid: uuid, signature: signature, withEnvelope: false, withReceiver: false);
+            if (env_rcv is null)
+                return Result.Fail<SmsResponse>()
+                    .Message(Key.EnvelopeReceiverNotFound);
+
+            if (env_rcv.PhoneNumber is null)
+                return Result.Fail<SmsResponse>()
+                    .Message(Key.PhoneNumberNonexists)
+                    .Notice(LogLevel.Error, Flag.NotFound, $"An attempt was made to send sms to the user whose phone number is null. Envelope recipient ID is {envelopeReceiverId}, UUID is {uuid} and signature is {signature}.");
+
+            var res = await _smsSender.SendSmsAsync(recipient: env_rcv.PhoneNumber, message: message);
+
+            return Result.Success(res);
+        }
+    }
+}

EnvelopeGenerator.Application/Services/EnvelopeService.cs

@@ -0,0 +1,43 @@
+using AutoMapper;
+using DigitalData.Core.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Infrastructure.Contracts;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class EnvelopeService : BasicCRUDService<IEnvelopeRepository, EnvelopeDto, Envelope, int>, IEnvelopeService
+    {
+        public EnvelopeService(IEnvelopeRepository repository, IMapper mapper)
+            : base(repository, mapper)
+        {
+        }
+
+        public async Task<DataResult<IEnumerable<EnvelopeDto>>> ReadAllWithAsync(bool documents = false, bool history = false, bool documentReceiverElement = false)
+        {
+            var envelopes = await _repository.ReadAllWithAsync(documents: documents, history: history, documentReceiverElement: documentReceiverElement);
+            var readDto = _mapper.Map<IEnumerable<EnvelopeDto>>(envelopes);
+            return Result.Success(readDto);
+        }
+
+        public async Task<DataResult<EnvelopeDto>> ReadByUuidAsync(string uuid, bool withDocuments = false, bool withHistory = false, bool withDocumentReceiverElement = false, bool withUser = false, bool withAll = false)
+        {
+            var envelope = await _repository.ReadByUuidAsync(uuid: uuid, withDocuments: withDocuments, withHistory: withHistory, withDocumentReceiverElement: withDocumentReceiverElement, withUser:withUser, withAll:withAll);
+
+            if (envelope is null)
+                return Result.Fail<EnvelopeDto>();
+
+            var readDto = _mapper.Map<EnvelopeDto>(envelope);
+            return Result.Success(readDto);
+        }
+
+        public async Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[] ignore_statuses)
+        {
+            var users = await _repository.ReadByUserAsync(userId: userId, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses);            
+            var readDto = _mapper.Map<IEnumerable<EnvelopeDto>>(users);
+            return Result.Success(readDto);
+        }
+    }
+}

EnvelopeGenerator.Application/Services/EnvelopeSmsHandler.cs

@@ -0,0 +1,54 @@
+using EnvelopeGenerator.Application.Configurations;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.DTOs.Messaging;
+using EnvelopeGenerator.Application.Extensions;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Options;
+
+namespace EnvelopeGenerator.Application.Services;
+
+public class EnvelopeSmsHandler : IEnvelopeSmsHandler
+{
+    private readonly ISmsSender _sender;
+
+    private readonly TotpSmsParams _totpSmsParams;
+
+    private readonly IDistributedCache _dCache;
+
+    private readonly IAuthenticator _authenticator;
+
+    public EnvelopeSmsHandler(ISmsSender sender, IOptions<TotpSmsParams> totpSmsParamsOptions, IDistributedCache distributedCache, IAuthenticator authenticator)
+    {
+        _sender = sender;
+        _totpSmsParams = totpSmsParamsOptions.Value;
+        _dCache = distributedCache;
+        _authenticator = authenticator;
+    }
+
+    /// <summary>
+    /// If expiration is passed then, sends sms and returns smsResponse and up-to-date expiration; otherwise send expiration.
+    /// </summary>
+    /// <param name="er_secret"></param>
+    /// <param name="cToken"></param>
+    /// <returns></returns>
+    public async Task<(SmsResponse? SmsResponse, DateTime Expiration)> SendTotpAsync(EnvelopeReceiverSecretDto er_secret, CancellationToken cToken = default)
+    {
+        var key = string.Format(_totpSmsParams.Expiration.CacheKeyFormat, er_secret.EnvelopeId, er_secret.ReceiverId);
+        var expiration = await _dCache.GetDateTimeAsync(key, cToken);
+
+        if(expiration is DateTime expirationDateTime && expirationDateTime >= DateTime.Now)
+            return (null, expirationDateTime);
+        else
+        {
+            var new_expiration = DateTime.Now.AddSeconds(_totpSmsParams.TotpStep);
+            var totp = _authenticator.GenerateTotp(er_secret.Receiver!.TotpSecretkey!, _totpSmsParams.TotpStep);
+            var msg = string.Format(_totpSmsParams.Format, totp, new_expiration.ToString(_totpSmsParams.Expiration.Format, _totpSmsParams.Expiration.CultureInfo));
+            await _dCache.SetDateTimeAsync(key, new_expiration, cToken: cToken);
+            return (await _sender.SendSmsAsync(er_secret.PhoneNumber!, msg), new_expiration);
+        }
+    }
+
+    public bool VerifyTotp(string totpCode, string secretKey) => _authenticator
+        .VerifyTotp(totpCode, secretKey, _totpSmsParams.TotpStep, _totpSmsParams.TotpVerificationWindow);
+}

EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs

@@ -0,0 +1,30 @@
+using AutoMapper;
+using DigitalData.Core.Application;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Infrastructure.Contracts;
+using Microsoft.Extensions.Caching.Memory;
+using DigitalData.Core.DTO;
+using Microsoft.Extensions.Logging;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class EnvelopeTypeService : BasicCRUDService<IEnvelopeTypeRepository, EnvelopeTypeDto, EnvelopeType, int>, IEnvelopeTypeService
+    {
+        private static readonly Guid CacheKey = Guid.NewGuid();
+
+        private readonly IMemoryCache _cache;
+
+        public EnvelopeTypeService(IEnvelopeTypeRepository repository, IMapper mapper, IMemoryCache cache)
+            : base(repository, mapper)
+        {
+            _cache = cache;
+        }
+
+        public override async Task<DataResult<IEnumerable<EnvelopeTypeDto>>> ReadAllAsync() 
+            => await _cache.GetOrCreateAsync(CacheKey, async entry => await base.ReadAllAsync())
+            ?? Result.Fail<IEnumerable<EnvelopeTypeDto>>().Notice(LogLevel.Error, Flag.NotFound, "No cached envelope types are available in the database. If you have added any envelope types after the server started, please restart the server.");
+        
+    }
+}

EnvelopeGenerator.Application/Services/GTXSmsSender.cs

@@ -0,0 +1,40 @@
+using AutoMapper;
+using DigitalData.Core.Abstractions.Client;
+using DigitalData.Core.Client;
+using EnvelopeGenerator.Application.Configurations;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs.Messaging;
+using Microsoft.Extensions.Options;
+
+namespace EnvelopeGenerator.Application.Services;
+
+//TODO: move to DigitalData.Core
+public class GTXSmsSender : ISmsSender
+{
+    private readonly IHttpClientService<GtxMessagingParams> _smsClient;
+
+    private readonly GtxMessagingParams _smsParams;
+
+    private readonly IMapper _mapper;
+
+    public string ServiceProvider { get; }
+
+    public GTXSmsSender(IHttpClientService<GtxMessagingParams> smsClient, IOptions<GtxMessagingParams> smsParamsOptions, IMapper mapper)
+    {
+        _smsClient = smsClient;
+        _smsParams = smsParamsOptions.Value;
+        _mapper = mapper;
+        ServiceProvider = GetType().Name.Replace("Service", string.Empty);
+    }
+
+    public async Task<SmsResponse> SendSmsAsync(string recipient, string message)
+    {
+        return await _smsClient.FetchAsync(queryParams: new Dictionary<string, object?>()
+        {
+            { _smsParams.RecipientQueryParamName, recipient },
+            { _smsParams.MessageQueryParamName, message }
+        })
+        .ThenAsync(res => res.Json<GtxMessagingResponse>())
+        .ThenAsync(_mapper.Map<SmsResponse>);
+    }
+}

EnvelopeGenerator.Application/Services/ReceiverService.cs

@@ -0,0 +1,52 @@
+using AutoMapper;
+using DigitalData.Core.Application;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using DigitalData.Core.DTO;
+using DigitalData.Core.Abstractions;
+using Microsoft.Extensions.Logging;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class ReceiverService : CRUDService<IReceiverRepository, ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>, IReceiverService
+    {
+        public ReceiverService(IReceiverRepository repository, IMapper mapper)
+            : base(repository, mapper)
+        {
+        }
+
+        public async Task<DataResult<ReceiverReadDto>> ReadByAsync(string? emailAddress = null, string? signature = null)
+        {
+            var rcv = await _repository.ReadByAsync(emailAddress: emailAddress, signature: signature);
+
+            if (rcv is null)
+                return Result.Fail<ReceiverReadDto>();
+
+            return Result.Success(_mapper.Map<ReceiverReadDto>(rcv));
+        }
+
+        public async Task<Result> DeleteByAsync(string? emailAddress = null, string? signature = null)
+        {
+            var rcv = await _repository.ReadByAsync(emailAddress: emailAddress, signature: signature);
+
+            if (rcv is null)
+                return Result.Fail();
+
+            return await _repository.DeleteAsync(rcv) ? Result.Success() : Result.Fail();
+        }
+
+        public virtual async Task<Result> UpdateAsync<TUpdateDto>(TUpdateDto updateDto) where TUpdateDto : IUnique<int>
+        {
+            var val = await _repository.ReadByIdAsync(updateDto.Id);
+            if (val == null)
+            {
+                return Result.Fail().Notice(LogLevel.Warning, Flag.NotFound, $"{updateDto.Id} is not found in update process of {GetType()} entity.");
+            }
+
+            var entity = _mapper.Map(updateDto, val);
+            return (await _repository.UpdateAsync(entity)) ? Result.Success() : Result.Fail();
+        }
+    }
+}

EnvelopeGenerator.Application/Services/UserReceiverService.cs

@@ -0,0 +1,17 @@
+using AutoMapper;
+using DigitalData.Core.Application;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Infrastructure.Contracts;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class UserReceiverService : BasicCRUDService<IUserReceiverRepository, UserReceiverDto, UserReceiver, int>, IUserReceiverService
+    {
+        public UserReceiverService(IUserReceiverRepository repository, IMapper mapper)
+            : base(repository, mapper)
+        {
+        }
+    }
+}

EnvelopeGenerator.Common/Constants.vb

@@ -1,21 +1,41 @@
 Public Class Constants
 
 #Region "Status Fields"
+    'http://wiki.dd/xwiki13/bin/view/Anwendungen/Produkt-Handbuch/Sonstiges/SignFlow/Envelope%20Status/
     Public Enum EnvelopeStatus
         Invalid = 0
         EnvelopeCreated = 1001
         EnvelopeSaved = 1002
         EnvelopeQueued = 1003
-        EnvelopeSent = 1004
+        EnvelopeSent = 1004 ' Nicht verwendet
         EnvelopePartlySigned = 1005
         EnvelopeCompletelySigned = 1006
-        EnvelopeArchived = 1007
-        EnvelopeTransmittedDMS = 1008
+        EnvelopeReportCreated = 1007
+        EnvelopeArchived = 1008
         EnvelopeDeleted = 1009
-        DocumentOpened = 2001
-        DocumentSigned = 2002
-        SignatureConfirmed = 2003
-        TriggerInvitationSent = 3001        ' Wird von Trigger verwendet
+        AccessCodeRequested = 2001
+        AccessCodeCorrect = 2002
+        AccessCodeIncorrect = 2003
+        DocumentOpened = 2004
+        DocumentSigned = 2005
+        DocumentForwarded = 4001
+        SignatureConfirmed = 2006
+        DocumentRejected = 2007
+        EnvelopeShared = 2008
+        EnvelopeViewed = 2009
+        MessageInvitationSent = 3001        ' Wird von Trigger verwendet
+        MessageAccessCodeSent = 3002
+        MessageConfirmationSent = 3003
+        MessageDeletionSent = 3004
+        MessageCompletionSent = 3005
+    End Enum
+
+    'TODO: standardize in xwiki
+    Public Enum ReferenceType
+        Receiver
+        Sender
+        System
+        Unknown
     End Enum
 
     Public Enum ElementStatus
@@ -55,13 +75,59 @@
         ReceiverColor9 = 9
         ReceiverColor10 = 10
     End Enum
+
+    Public Enum CertificationType
+        AdvancedElectronicSignature = 1
+        'ElectronicSignature = 1
+        'QualifiedSignature = 2
+    End Enum
+
+    Public Enum FinalEmailType
+        No = 0
+        Yes = 1
+        YesWithAttachment = 2
+    End Enum
+
+    Public Enum PageOrientation
+        Portrait = 0
+        Landscape = 1
+    End Enum
+
+    Public Enum EmailTemplateType
+        DocumentReceived
+        DocumentSigned
+        DocumentDeleted
+        DocumentCompleted
+        DocumentAccessCodeReceived
+        DocumentShared
+        TotpSecret
+    End Enum
+
+    Public Enum EncodeType
+        EnvelopeReceiver
+        EnvelopeReceiverReadOnly
+        Undefined
+        DocumentForwarded
+        DocumentShared
+    End Enum
 #End Region
 
+#Region "Role"
+    Public NotInheritable Class ReceiverRole
+        Public Const PreAuth As String = "PreAuth"
+        Public Const FullyAuth As String = "FullyAuth"
+    End Class
+#End Region
 
 #Region "Constants"
 
     Public Const DATABASE = "DATABASE"
     Public Const LOGCONFIG = "LOGCONFIG"
+    Public Const GDPICTURE = "GDPICTURE"
+    Public Const IGNORED_LABELS = "IgnoredLabels"
 
+    Public Const GREEN_300 = "#bbf7d0"
+    Public Const RED_300 = "#fecaca"
+    Public Const ORANGE_300 = "#fed7aa"
 #End Region
-End Class
+End Class

EnvelopeGenerator.Common/Entities/DbConfig.vb

@@ -1,7 +1,9 @@
 Public Class DbConfig
-    Public Property ExternalProgramName As String = "Sign Flow"
+    Public Property ExternalProgramName As String = "signFLOW"
+    Public Property DocumentPathOrigin As String = ""
     Public Property DocumentPath As String = ""
     Public Property ExportPath As String = ""
     Public Property SendingProfile As Integer = 0
     Public Property SignatureHost As String = ""
+    Public Property Default_TFA_Enabled As Boolean = False
 End Class

EnvelopeGenerator.Common/Entities/EmailData.vb

@@ -1,32 +1,64 @@
 
 Public Class EmailData
-    Public Property EmailAdress As String
-    Public Property EmailSubject As String
-    Public Property EmailBody As String
-    Public Property ReferenceID As Integer
-    Public Property ReferenceString As String
+    Public Property EmailAdress As String = ""
+    Public Property EmailSubject As String = ""
+    Public Property EmailBody As String = ""
+    Public Property EmailType As Constants.EnvelopeStatus = Constants.EnvelopeStatus.Invalid
+    Public Property ReferenceID As Integer = 0
+    Public Property ReferenceString As String = ""
 
+    Public Property ReceiverAccessCode As String = ""
+    Public Property ReceiverName As String = ""
+    Public Property SenderName As String = ""
+    Public Property SenderAdress As String = ""
 
-    Public Property ReceiverName As String
-    Public Property SenderName As String
-    Public Property SenderAdress As String
-    Public Property SignatureLink As String
-    Public Property Message As String
+    Public Property SignatureLink As String = ""
+    Public Property Message As String = ""
+    Public Property EnvelopeTitle As String = ""
 
-    Public Sub New(pEnvelope As Envelope, pReceiver As EnvelopeReceiver)
+    Public Property EmailAttachment As String = ""
+    Public Property ATT1_RELATED_ID As Long
+    Public Property ATT1_REL_TYPE As String = ""
+
+    ''' <summary>
+    ''' Constructor for sending email to receiver
+    ''' </summary>
+    ''' <param name="pEnvelope"></param>
+    ''' <param name="pReceiver"></param>
+    ''' <param name="pStatus"></param>
+    Public Sub New(pEnvelope As Envelope, pReceiver As EnvelopeReceiver, pStatus As Constants.EnvelopeStatus)
         EmailAdress = pReceiver.Email
-        EmailSubject = pEnvelope.Subject
+        EmailSubject = String.Empty
+        EmailType = pStatus
+
         Message = pEnvelope.Message
         ReferenceID = pEnvelope.Id
         ReferenceString = pEnvelope.Uuid
         ReceiverName = pReceiver.Name
+        ReceiverAccessCode = pReceiver.AccessCode
         SenderAdress = pEnvelope.User.Email
         SenderName = pEnvelope.User.FullName
+        EnvelopeTitle = pEnvelope.Title
     End Sub
 
-    Public Sub New()
+    ''' <summary>
+    ''' Constructor for sending email to creator
+    ''' </summary>
+    ''' <param name="pEnvelope"></param>
+    ''' <param name="pStatus"></param>
+    Public Sub New(pEnvelope As Envelope, pStatus As Constants.EnvelopeStatus)
+        EmailAdress = pEnvelope.User.Email
+        EmailSubject = String.Empty
+        EmailType = pStatus
+
+        Message = pEnvelope.Message
+        ReferenceID = pEnvelope.Id
+        ReferenceString = pEnvelope.Uuid
+        ReceiverName = pEnvelope.User.FullName
+        ReceiverAccessCode = String.Empty
+        SenderAdress = pEnvelope.User.Email
+        SenderName = pEnvelope.User.FullName
+        EnvelopeTitle = pEnvelope.Title
     End Sub
 
-
-
 End Class

EnvelopeGenerator.Common/Entities/EmailTemplate.vb

@@ -1,138 +1,8 @@
-Imports DigitalData.Modules.Base
+Public Class EmailTemplate
 
-Public Class EmailTemplate
-    Private _DocumentReceivedBodyTemplate As List(Of String)
-    Private _DocumentSignedBodyTemplate As List(Of String)
-    Private _DocumentCompletedBodyTemplate As List(Of String)
-    Private _DocumentDeletedBodyTemplate As List(Of String)
+    Public Property Id As Integer
+    Public Property Name As String
+    Public Property Body As String
+    Public Property Subject As String
 
-    Private _DocumentReceivedSubjectTemplate As String
-    Private _DocumentSignedSubjectTemplate As String
-    Private _DocumentDeletedSubjectTemplate As String
-    Private _DocumentCompletedSubjectTemplate As String
-
-    Private _replaceDictionary As Dictionary(Of String, String)
-
-    Private DbConfig As DbConfig
-
-    Public Sub New(pState As State)
-        InitBodyTemplates()
-        InitSubjectTemplates()
-
-        DbConfig = pState.DbConfig
-    End Sub
-
-    Private Sub InitSubjectTemplates()
-        _DocumentReceivedSubjectTemplate = "Dokument zur Unterschrift erhalten: '<DOCUMENT_TITLE>'"
-        _DocumentSignedSubjectTemplate = "Dokument unterschrieben: '<DOCUMENT_TITLE>'"
-        _DocumentDeletedSubjectTemplate = "Dokument zurueckgezogen: '<DOCUMENT_TITLE>'"
-        _DocumentCompletedSubjectTemplate = "Dokument abgeschlossen: '<DOCUMENT_TITLE>'"
-    End Sub
-
-    Private Sub InitBodyTemplates()
-        _DocumentReceivedBodyTemplate = New List(Of String) From {
-            "Guten Tag, <NAME_RECEIVER>,",
-            "",
-            "<NAME_SENDER> hat Ihnen ein Dokument zum <SIGNATURE_TYPE> gesendet.",
-            "",
-            "Über den folgenden Link können Sie das Dokument einsehen: <a href=""<LINK_TO_DOCUMENT>""><LINK_TO_DOCUMENT_TEXT></a>",
-            "",
-            "<MESSAGE>",
-            "",
-            "Mit freundlichen Grüßen",
-            "<NAME_PORTAL>"
-        }
-
-        _DocumentSignedBodyTemplate = New List(Of String) From {
-            "Guten Tag, <NAME_RECEIVER>",
-            "",
-            "hiermit bestätigen wir Ihnen die erfolgreiche Signatur für den Vorgang <DOCUMENT_TITLE>.",
-            "",
-            "Mit freundlichen Grüßen",
-            "<NAME_PORTAL>"
-        }
-
-        _DocumentDeletedBodyTemplate = New List(Of String) From {
-            "Guten Tag, <NAME_RECEIVER>",
-            "",
-            "Der User <NAME_SENDER> hat den Umschlag <DOCUMENT_TITLE> gelöscht.",
-            "",
-            "Mit freundlichen Grüßen",
-            "<NAME_PORTAL>"
-        }
-
-        _DocumentCompletedBodyTemplate = New List(Of String) From {
-            "Guten Tag, <NAME_RECEIVER>",
-            "",
-            "Das Dokument <DOCUMENT_TITLE> wurde von allen Beteiligten unterschrieben.",
-            "",
-            "Mit freundlichen Grüßen",
-            "<NAME_PORTAL>"
-        }
-    End Sub
-
-    Private Sub InitDictionary(pEmailData As EmailData)
-        _replaceDictionary = New Dictionary(Of String, String) From {
-            {"<NAME_RECEIVER>", pEmailData.ReceiverName},
-            {"<NAME_SENDER>", pEmailData.SenderName},
-            {"<NAME_PORTAL>", DbConfig.ExternalProgramName},
-            {"<SIGNATURE_TYPE>", "signieren"},
-            {"<LINK_TO_DOCUMENT>", pEmailData.SignatureLink},
-            {"<LINK_TO_DOCUMENT_TEXT>", $"{pEmailData.SignatureLink.Truncate(40)}.."},
-            {"<DOCUMENT_TITLE>", pEmailData.EmailSubject},
-            {"<MESSAGE>", pEmailData.Message}
-        }
-    End Sub
-
-    Public Sub FillDocumentReceivedEmailBody(pEmailData As EmailData)
-        FillEmailBody(pEmailData, _DocumentReceivedBodyTemplate)
-    End Sub
-
-    Public Sub FillEnvelopeDeletedEmailBody(pEmailData As EmailData)
-        FillEmailBody(pEmailData, _DocumentDeletedBodyTemplate)
-    End Sub
-
-    Public Sub FillDocumentSignedEmailBody(pEmailData As EmailData)
-        FillEmailBody(pEmailData, _DocumentSignedBodyTemplate)
-    End Sub
-
-    Public Sub FillDocumentCompletedEmailBody(pEmailData As EmailData)
-        FillEmailBody(pEmailData, _DocumentCompletedBodyTemplate)
-    End Sub
-
-    Public Sub FillEmailSubject(pEmailData As EmailData, pTemplate As String)
-        InitDictionary(pEmailData)
-
-        Dim resultSubject As String = pTemplate
-
-        For Each dictItem As KeyValuePair(Of String, String) In _replaceDictionary
-            If resultSubject.Contains(dictItem.Key) Then
-                resultSubject = resultSubject.Replace(dictItem.Key, dictItem.Value)
-
-            End If
-        Next
-
-
-    End Sub
-
-    Public Sub FillEmailBody(pEmailData As EmailData, pTemplate As List(Of String))
-
-        InitDictionary(pEmailData)
-
-        Dim resultBody As String = ""
-
-        For Each lineItem As String In pTemplate
-            Dim oLineValue As String = lineItem
-            For Each dictItem As KeyValuePair(Of String, String) In _replaceDictionary
-                If oLineValue.Contains(dictItem.Key) Then
-                    oLineValue = oLineValue.Replace(dictItem.Key, dictItem.Value)
-
-                End If
-            Next
-            resultBody += oLineValue + "<br/>"
-        Next
-
-        pEmailData.EmailBody = resultBody
-
-    End Sub
 End Class

EnvelopeGenerator.Common/Entities/Envelope.vb

@@ -2,11 +2,26 @@
     Public Property Id As Integer = 0
     Public Property UserId As Integer
     Public Property Title As String = ""
-    Public Property ContractType As Constants.ContractType
-    Public Property Status As Constants.EnvelopeStatus
+    Public Property EnvelopeTypeId As Integer
+    Public Property ContractType As Integer
+    Public Property Status As Constants.EnvelopeStatus = Constants.EnvelopeStatus.EnvelopeCreated
     Public Property Uuid As String = Guid.NewGuid.ToString()
+    Public Property UseAccessCode As Boolean = False
+    Public Property Language As String = "de-DE"
+    Public Property CertificationType As Constants.CertificationType = Constants.CertificationType.AdvancedElectronicSignature
+    Public Property TFA_Enabled As Boolean = False
+    Public Property SendReminderEmails As Boolean = False
+    Public Property FirstReminderDays As Integer = 0
+    Public Property ReminderIntervalDays As Integer = 0
+
+    Public Property ExpiresWhen As Date
+    Public Property ExpiresWarningWhen As Date
+    Public Property ExpiresWhenDays As Integer
+    Public Property ExpiresWarningWhenDays As Integer
+
+    Public Property FinalEmailToCreator As Constants.FinalEmailType
+    Public Property FinalEmailToReceivers As Constants.FinalEmailType
 
-    Public Property Subject As String = My.Resources.Envelope.You_received_a_document_to_sign_
     Public Property Message As String = My.Resources.Envelope.Please_read_and_sign_this_document
 
     Public Property AddedWhen As Date
@@ -14,6 +29,20 @@
 
     Public Property Documents As New List(Of EnvelopeDocument)
     Public Property Receivers As New List(Of EnvelopeReceiver)
+    Public Property History As New List(Of EnvelopeHistoryEntry)
+    Public Property EnvelopeType As EnvelopeType
+    Public Property DOC_RESULT As Byte()
+    Public ReadOnly Property EnvelopeTypeTitle As String
+        Get
+            Return EnvelopeType?.Title
+        End Get
+    End Property
+
+    Public ReadOnly Property IsAlreadySent As Boolean
+        Get
+            Return Status > Constants.EnvelopeStatus.EnvelopeSaved
+        End Get
+    End Property
 
     Public ReadOnly Property StatusTranslated As String
         Get
@@ -40,6 +69,10 @@
             oErrors.Add(My.Resources.Envelope.Missing_Receivers)
         End If
 
+        If Receivers.Any(Function(r) r.HasEmailAndName = False) Then
+            oErrors.Add(My.Resources.Envelope.Incomplete_Receivers)
+        End If
+
         Return oErrors
     End Function
 

EnvelopeGenerator.Common/Entities/EnvelopeDocument.vb

@@ -17,4 +17,7 @@ Public Class EnvelopeDocument
     Public Property Filename As String
 
     Public Property Filepath As String
-End Class
+
+    Public Property PageCount As Integer
+    Public Property Byte_Data As Byte()
+End Class

EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb

@@ -1,6 +1,12 @@
 Public Class EnvelopeHistoryEntry
-    Public EnvelopeId As Integer
-    Public UserReference As String
-    Public Status As Constants.EnvelopeStatus
-    Public ActionDate As Date = Now()
+    Public Property EnvelopeId As Integer
+    Public Property UserReference As String
+    Public Property Status As Constants.EnvelopeStatus
+    Public ReadOnly Property StatusTranslated As String
+        Get
+            Dim oStatus = Status.ToString()
+            Return My.Resources.Model.ResourceManager.GetString(oStatus)
+        End Get
+    End Property
+    Public Property ActionDate As Date = Now()
 End Class

EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb

@@ -48,15 +48,34 @@ Public Class EnvelopeReceiver
 
     Public Property SignedDate As DateTime = DateTime.MinValue
 
+    Public ReadOnly Property SignedDateDisplayValue As String
+        Get
+            If SignedDate = DateTime.MinValue Then
+                Return "-"
+            Else
+                Return SignedDate.ToString("G")
+            End If
+
+        End Get
+    End Property
+
     Public ReadOnly Property HasId As Boolean
         Get
             Return Id > 0
         End Get
     End Property
 
+    Public ReadOnly Property HasEmailAndName As Boolean
+        Get
+            Return String.IsNullOrWhiteSpace(Email) = False And
+                String.IsNullOrWhiteSpace(Name) = False
+        End Get
+    End Property
+
     Public Property Sequence As Integer = 0
     Public Property PrivateMessage As String = ""
     Public Property AccessCode As String = ""
+    Public Property PhoneNumber As String = ""
 
     Public Function GetSignature() As String
         Return StringEx.GetChecksum(Email.ToUpper)

EnvelopeGenerator.Common/Entities/EnvelopeType.vb

@@ -0,0 +1,27 @@
+Public Class EnvelopeType
+
+    Public Property Id As Integer = 0
+    Public Property Title As String
+    Public Property UseAccessCode As Boolean
+    Public Property ContractType As Integer ' Unbenutzt
+
+    Public Property Language As String
+    Public Property CertificationType As Constants.CertificationType = Constants.CertificationType.AdvancedElectronicSignature
+    Public Property TFA_Enabled As Boolean = False
+    Public Property SendReminderEmails As Boolean = False
+    Public Property FirstReminderDays As Integer = 0
+    Public Property ReminderIntervalDays As Integer = 0
+
+    Public Property ExpiresWhen As Date
+    Public Property ExpiresWarningWhen As Date
+    Public Property ExpiresWhenDays As Integer
+    Public Property ExpiresWarningWhenDays As Integer
+
+    Public Property FinalEmailToCreator As Constants.FinalEmailType
+    Public Property FinalEmailToReceivers As Constants.FinalEmailType
+
+    Public Overrides Function ToString() As String
+        Return Title
+    End Function
+
+End Class

EnvelopeGenerator.Common/Entities/State.vb

@@ -3,6 +3,7 @@ Imports DigitalData.Modules.Logging
 
 Public Class State
     Public Property UserId As Integer
+    Public Property User As User
     Public Property Config As Config
     Public Property DbConfig As DbConfig
     Public Property LogConfig As LogConfig

EnvelopeGenerator.Common/Entities/User.vb

@@ -6,6 +6,9 @@
     Public Property Email As String
     Public Property Language As String
 
+    Public Property HasAccess As Boolean
+    Public Property IsAdmin As Boolean
+
     Public ReadOnly Property FullName() As String
         Get
             Return Prename + " " + Name

EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj

@@ -13,6 +13,8 @@
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,23 +58,27 @@
     <Reference Include="DevExpress.RichEdit.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.RichEdit.v21.2.Export, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Sparkline.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Xpo.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraCharts.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraGauges.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraReports.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DigitalData.Modules.Base, Version=1.3.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Base">
+      <HintPath>..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Logging, Version=2.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14, Version=14.2.90.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
@@ -124,27 +130,36 @@
     <Compile Include="Entities\ElementStatus.vb" />
     <Compile Include="Entities\EmailData.vb" />
     <Compile Include="Entities\EmailTemplate.vb" />
+    <Compile Include="Services\TemplateService.vb" />
     <Compile Include="Entities\Envelope.vb" />
     <Compile Include="Entities\EnvelopeDocument.vb" />
     <Compile Include="Entities\EnvelopeDocumentElement.vb" />
     <Compile Include="Entities\EnvelopeHistoryEntry.vb" />
     <Compile Include="Entities\EnvelopeReceiver.vb" />
     <Compile Include="Entities\EnvelopeResponse.vb" />
+    <Compile Include="Entities\EnvelopeType.vb" />
     <Compile Include="Entities\State.vb" />
     <Compile Include="Entities\User.vb" />
     <Compile Include="Helpers.vb" />
-    <Compile Include="Jobs\CertificateDocumentJob.vb" />
+    <Compile Include="Jobs\FinalizeDocument\FinalizeDocumentExceptions.vb" />
+    <Compile Include="Jobs\FinalizeDocument\FinalizeDocumentJob.vb" />
+    <Compile Include="Jobs\FinalizeDocument\PDFBurner.vb" />
+    <Compile Include="Jobs\FinalizeDocument\PDFMerger.vb" />
     <Compile Include="Models\BaseModel.vb" />
     <Compile Include="Models\CertificateModel.vb" />
+    <Compile Include="Models\ChartModel.vb" />
     <Compile Include="Models\ConfigModel.vb" />
     <Compile Include="Models\DocumentModel.vb" />
     <Compile Include="Models\ElementModel.vb" />
     <Compile Include="Models\DocumentStatusModel.vb" />
     <Compile Include="Models\ElementStatusModel.vb" />
     <Compile Include="Models\EmailModel.vb" />
+    <Compile Include="Models\EmailTemplateModel.vb" />
     <Compile Include="Models\EnvelopeModel.vb" />
     <Compile Include="Models\HistoryModel.vb" />
     <Compile Include="Models\ReceiverModel.vb" />
+    <Compile Include="Models\EnvelopeTypeModel.vb" />
+    <Compile Include="Models\ReportModel.vb" />
     <Compile Include="Models\UserModel.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
     <Compile Include="My Project\Application.Designer.vb">
@@ -162,9 +177,9 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="Reports\ReportCreator.vb" />
-    <Compile Include="Reports\ReportItem.vb" />
-    <Compile Include="Reports\ReportSource.vb" />
+    <Compile Include="Jobs\FinalizeDocument\ReportCreator.vb" />
+    <Compile Include="Jobs\FinalizeDocument\ReportItem.vb" />
+    <Compile Include="Jobs\FinalizeDocument\ReportSource.vb" />
     <Compile Include="Reports\rptEnvelopeHistory.Designer.vb">
       <DependentUpon>rptEnvelopeHistory.vb</DependentUpon>
     </Compile>
@@ -172,6 +187,7 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Services\ActionService.vb" />
+    <Compile Include="Services\BaseService.vb" />
     <Compile Include="Services\EmailService.vb" />
     <Compile Include="Services\HistoryService.vb" />
     <Compile Include="Strings\Email.en.Designer.vb">
@@ -204,6 +220,8 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Model.resx</DependentUpon>
     </Compile>
+    <Compile Include="Strings\Model.vb" />
+    <Compile Include="TempFiles.vb" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="My Project\licenses.licx" />
@@ -217,7 +235,7 @@
       <DependentUpon>rptEnvelopeHistory.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Strings\Email.en.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Email.en.Designer.vb</LastGenOutput>
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
     </EmbeddedResource>
@@ -225,29 +243,34 @@
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Envelope.en.Designer.vb</LastGenOutput>
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Strings\Envelope.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Envelope1.Designer.vb</LastGenOutput>
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Strings\Email.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Email.Designer.vb</LastGenOutput>
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
     </EmbeddedResource>
     <EmbeddedResource Include="Strings\Model.en.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Model.en.Designer.vb</LastGenOutput>
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Strings\Model.resx">
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Model.Designer.vb</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
       <LastGenOutput>Application.Designer.vb</LastGenOutput>
@@ -263,6 +286,16 @@
     <Content Include="Images\circle.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <EmbeddedResource Include="Templates\document_access_code_de.html" />
+    <EmbeddedResource Include="Templates\email_de.html" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets'))" />
+  </Target>
 </Project>

EnvelopeGenerator.Common/Helpers.vb

@@ -1,8 +1,28 @@
 Imports System.Drawing
+Imports System.IO
+Imports System.Security.Cryptography
+Imports System.Text
 Imports DevExpress.Utils.Svg
 Imports EnvelopeGenerator.Common.Constants
 
 Public Class Helpers
+    Private Shared key As String = "$xzBvyPETUS&amm8)D8x#)f;4%;?[BPd" ' Passwort-Schlüssel (16, 24, or 32 bytes)
+    Private Shared iv As String = "1wN&e[zrQ6_B7X/0" ' Initialisierungsvektor (16 bytes)
+
+    ' Entschlüsselungsfunktion
+    Public Shared Function Decrypt(cipherText As String) As String
+        Dim aesAlg As Aes = Aes.Create()
+        aesAlg.Key = Encoding.UTF8.GetBytes(key)
+        aesAlg.IV = Encoding.UTF8.GetBytes(iv)
+        Dim decryptor As ICryptoTransform = aesAlg.CreateDecryptor(aesAlg.Key, aesAlg.IV)
+        Dim cipherBytes As Byte() = Convert.FromBase64String(cipherText)
+        Dim msDecrypt As New IO.MemoryStream(cipherBytes)
+        Using csDecrypt As New CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read)
+            Using srDecrypt As New IO.StreamReader(csDecrypt)
+                Return srDecrypt.ReadToEnd()
+            End Using
+        End Using
+    End Function
 
     ''' <summary>
     ''' Encodes the EnvelopeUUID and the ReceiverSignature into an EnvelopeKey
@@ -38,6 +58,11 @@ Public Class Helpers
 
     End Function
 
+    Public Shared Function GetAccessCode() As String
+        Return Guid.NewGuid().ToString("d").Substring(1, 6).ToUpper()
+    End Function
+
+
     Public Shared Function ColorTypeToColor(pColorType As ColorType) As Color
         Select Case pColorType
             Case ColorType.ReceiverColor1
@@ -94,4 +119,16 @@ Public Class Helpers
             Return False
         End Try
     End Function
+
+    Public Shared Async Function CopyFileAsync(sourceFile As String, destinationFile As String) As Task
+        Dim fileOptions = IO.FileOptions.Asynchronous Or IO.FileOptions.SequentialScan
+        Dim bufferSize = 4096
+
+        Using sourceStream = New FileStream(sourceFile, FileMode.Open, FileAccess.Read, FileShare.Read, bufferSize, fileOptions)
+
+            Using destinationStream = New FileStream(destinationFile, FileMode.CreateNew, FileAccess.Write, FileShare.None, bufferSize, fileOptions)
+                Await sourceStream.CopyToAsync(destinationStream, bufferSize).ConfigureAwait(False)
+            End Using
+        End Using
+    End Function
 End Class

EnvelopeGenerator.Common/Jobs/CertificateDocumentJob.vb

@@ -1,36 +0,0 @@
-Imports DigitalData.Modules.Database
-Imports DigitalData.Modules.Logging
-Imports Quartz
-
-Public Class CertificateDocumentJob
-    Implements IJob
-
-    Public Function Execute(pContext As IJobExecutionContext) As Task Implements IJob.Execute
-        Dim oLogConfig As LogConfig = pContext.MergedJobDataMap.Item(Constants.LOGCONFIG)
-        Dim oConnectionString As String = pContext.MergedJobDataMap.Item(Constants.DATABASE)
-        Dim oLogger As Logger = oLogConfig.GetLogger()
-
-        Try
-            Dim oDatabase As New MSSQLServer(oLogConfig, MSSQLServer.DecryptConnectionString(oConnectionString))
-            Dim JobId = pContext.JobDetail.Key
-            oLogger.Info("Starting job {0}", JobId)
-
-            Dim oCompleteStatus As Integer = Constants.EnvelopeStatus.EnvelopeCompletelySigned
-            Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = {oCompleteStatus}"
-            Dim oTable = oDatabase.GetDatatable(oSql)
-
-            oLogger.Info("Found [{0}] completed envelopes.", oTable.Rows.Count)
-
-            ' Do important work...
-
-            oLogger.Info("Completed job {0}", JobId)
-            Return Task.FromResult(True)
-
-        Catch ex As Exception
-            oLogger.Warn("Certificate Document job failed!")
-            oLogger.Error(ex)
-
-            Return Task.FromException(ex)
-        End Try
-    End Function
-End Class

EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentExceptions.vb

@@ -0,0 +1,52 @@
+Namespace Jobs.FinalizeDocument
+    Public Class FinalizeDocumentExceptions
+
+        Public Class MergeDocumentException
+            Inherits ApplicationException
+
+            Public Sub New(message As String)
+                MyBase.New(message)
+            End Sub
+
+            Public Sub New(message As String, innerException As Exception)
+                MyBase.New(message, innerException)
+            End Sub
+        End Class
+
+        Public Class BurnAnnotationException
+            Inherits ApplicationException
+
+            Public Sub New(message As String)
+                MyBase.New(message)
+            End Sub
+
+            Public Sub New(message As String, innerException As Exception)
+                MyBase.New(message, innerException)
+            End Sub
+        End Class
+
+        Public Class CreateReportException
+            Inherits ApplicationException
+
+            Public Sub New(message As String)
+                MyBase.New(message)
+            End Sub
+
+            Public Sub New(message As String, innerException As Exception)
+                MyBase.New(message, innerException)
+            End Sub
+        End Class
+        Public Class ExportDocumentException
+            Inherits ApplicationException
+
+            Public Sub New(message As String)
+                MyBase.New(message)
+            End Sub
+
+            Public Sub New(message As String, innerException As Exception)
+                MyBase.New(message, innerException)
+            End Sub
+        End Class
+
+    End Class
+End Namespace

EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -0,0 +1,452 @@
+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
+
+Namespace Jobs
+    Public Class FinalizeDocumentJob
+        Implements IJob
+
+        Private ReadOnly LicenseManager As New LicenseManager()
+        Private GdViewer As GdViewer
+
+        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 ReportModel As ReportModel
+
+        Private ActionService As ActionService
+
+        Private PDFBurner As PDFBurner
+        Private PDFMerger As PDFMerger
+        Private ReportCreator As ReportCreator
+
+        Private ReadOnly CompleteWaitTime As Integer = 1
+        Private ParentFolderUID As String = ""
+        Private myTempFiles As TempFiles
+
+        Private Class EnvelopeData
+            Public EnvelopeId As Integer
+            Public EnvelopeUUID As String
+            Public DocumentPath As String
+            Public AnnotationData As List(Of String)
+            Public DocAsByte As Byte()
+
+        End Class
+
+        Public Function Execute(pContext As IJobExecutionContext) As Task Implements IJob.Execute
+            Dim oGdPictureKey As String = pContext.MergedJobDataMap.Item(Constants.GDPICTURE)
+            LogConfig = pContext.MergedJobDataMap.Item(Constants.LOGCONFIG)
+            Logger = LogConfig.GetLogger()
+            myTempFiles = New TempFiles(LogConfig)
+            myTempFiles.Create()
+            Dim JobId = pContext.JobDetail.Key
+            Logger.Info("Starting job {0}", JobId)
+
+            Try
+                Logger.Debug("Loading GdViewer..")
+                GdViewer = New GdViewer()
+                LicenseManager.RegisterKEY(oGdPictureKey)
+
+                Logger.Debug("Loading Database..")
+                Database = GetDatabase(pContext, LogConfig)
+
+                Logger.Debug("Loading Models & Services")
+                Dim oState = GetState()
+                InitializeModels(oState)
+
+                Logger.Debug("Loading Configuration..")
+                Config = ConfigModel.LoadConfiguration()
+                oState.DbConfig = Config
+
+                InitializeServices(oState)
+
+                Logger.Debug("Loading PDFBurner..")
+                Dim ignoredLabels As List(Of String) = pContext.MergedJobDataMap.Item(Constants.IGNORED_LABELS)
+                PDFBurner = New PDFBurner(LogConfig, oGdPictureKey, ignoredLabels)
+
+                Logger.Debug("Loading PDFMerger..")
+                PDFMerger = New PDFMerger(LogConfig, oGdPictureKey)
+
+                Logger.Debug("Loading ReportCreator..")
+                ReportCreator = New ReportCreator(LogConfig, oState)
+
+                Config.DocumentPath = Config.DocumentPath
+
+                Logger.Debug("DocumentPath: [{0}]", Config.DocumentPath)
+
+
+                Logger.Debug("ExportPath: [{0}]", Config.ExportPath)
+
+                Dim oCompleteStatus As Integer = Constants.EnvelopeStatus.EnvelopeCompletelySigned
+                Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = {oCompleteStatus} AND DATEDIFF(minute, CHANGED_WHEN, GETDATE()) >= {CompleteWaitTime} ORDER BY GUID"
+                Dim oTable = Database.GetDatatable(oSql)
+
+                Dim oEnvelopeIds As List(Of Integer) = oTable.Rows.Cast(Of DataRow).
+                    Select(Function(r) r.Item("GUID")).
+                    Cast(Of Integer).
+                    ToList()
+
+                If oEnvelopeIds.Count > 0 Then
+                    Logger.Info("Found [{0}] completed envelopes.", oEnvelopeIds.Count)
+                End If
+
+                Dim oTotal As Integer = oEnvelopeIds.Count
+                Dim oCurrent As Integer = 1
+
+                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
+                            Logger.Warn("Envelope could not be loaded for Id [{0}]!", oId)
+                            Throw New ArgumentNullException("EnvelopeData")
+                        End If
+                        Logger.Debug("Loading Envelope Data..")
+                        Dim oEnvelopeData = GetEnvelopeData(oId)
+
+                        If oEnvelopeData Is Nothing Then
+                            Logger.Warn("EnvelopeData could not be loaded for Id [{0}]!", oId)
+                            Throw New ArgumentNullException("EnvelopeData")
+                        End If
+                        Logger.Debug("Burning Annotations to pdf ...")
+                        Dim oBurnedDocument As Byte() = BurnAnnotationsToPdf(oEnvelopeData)
+                        If oBurnedDocument Is Nothing Then
+                            Logger.Warn("Document could not be finalized!")
+                            Throw New ApplicationException("Document could not be finalized")
+                        End If
+
+                        If ActionService.CreateReport(oEnvelope) = False Then
+                            Logger.Warn("Document Report could not be created!")
+                            Throw New ApplicationException("Document Report could not be created")
+                        End If
+
+                        Logger.Debug("Creating report..")
+                        Dim oReport As Byte() = ReportCreator.CreateReport(oEnvelope)
+                        Logger.Debug("Report created!")
+
+                        Logger.Debug("Merging documents ...")
+                        Dim oMergedDocument As Byte() = PDFMerger.MergeDocuments(oBurnedDocument, oReport)
+                        Logger.Debug("Documents merged!")
+
+                        Dim oOutputDirectoryPath = Path.Combine(Config.ExportPath, ParentFolderUID)
+                        If Not Directory.Exists(oOutputDirectoryPath) Then
+                            Directory.CreateDirectory(oOutputDirectoryPath)
+                        End If
+                        Dim oOutputFilePath = Path.Combine(oOutputDirectoryPath, $"{oEnvelope.Uuid}.pdf")
+                        Logger.Info("Writing finalized Pdf to disk..")
+                        Logger.Info("Output path is [{0}]", oOutputFilePath)
+
+                        Try
+                            File.WriteAllBytes(oOutputFilePath, oMergedDocument)
+                        Catch ex As Exception
+                            Logger.Warn("Could not export final document to disk!")
+                            Throw New ExportDocumentException("Could not export final document to disk!", ex)
+                        End Try
+
+                        Logger.Info("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!")
+                        End If
+                        Logger.Debug("Setting envelope status..")
+                        If ActionService.FinalizeEnvelope(oEnvelope) = False Then
+                            Logger.Warn("Envelope could not be finalized!")
+                            Throw New ApplicationException("Envelope could not be finalized")
+                        End If
+                    Catch ex As Exception
+                        Logger.Warn($"Unhandled exception while working envelope [{oId}] - [{ex.Message}]")
+                    End Try
+
+
+                    oCurrent += 1
+                    Logger.Info("Envelope finalized!")
+
+                Next
+
+                Logger.Debug("Completed job {0} successfully!", JobId)
+            Catch ex As MergeDocumentException
+                Logger.Warn("Certificate Document job failed at step: Merging documents!")
+                Logger.Error(ex)
+
+            Catch ex As ExportDocumentException
+                Logger.Warn("Certificate Document job failed at step: Exporting document!")
+                Logger.Error(ex)
+
+            Catch ex As Exception
+                Logger.Warn("Certificate Document job failed!")
+                Logger.Error(ex)
+            Finally
+                Logger.Info("Job execution for [{0}] ended", JobId)
+            End Try
+
+            Return Task.FromResult(True)
+        End Function
+        Private Sub Update_File_DB(pFilePath As String, pEnvelopeID As Long)
+            Dim SqlCom As SqlCommand
+            Dim imageData As Byte()
+            Dim sFileName As String
+            Dim qry As String
+
+            Try
+                'Read Image Bytes into a byte array 
+                'Initialize SQL Server Connection 
+
+                'Convert File to bytes Array
+                imageData = ReadFile(pFilePath)
+                If Not IsNothing(imageData) Then
+                    sFileName = System.IO.Path.GetFileName(pFilePath)
+                    'Set insert query 
+                    qry = $"UPDATE TBSIG_ENVELOPE SET DOC_RESULT = @ImageData WHERE GUID = {pEnvelopeID}"
+                    'Initialize SqlCommand object for insert. 
+                    SqlCom = New SqlCommand(qry, Database.GetConnection)
+                    'We are passing File Name and Image byte data as sql parameters. 
+                    SqlCom.Parameters.Add(New SqlParameter("@ImageData", DirectCast(imageData, Object)))
+                    'Execute the Query
+                    SqlCom.ExecuteNonQuery()
+                End If
+
+            Catch ex As Exception
+                Logger.Error(ex)
+            End Try
+        End Sub
+        'Open file in to a filestream and read data in a byte array. 
+        Private Function ReadFile(ByVal sPath As String) As Byte()
+            'Initialize byte array with a null value initially. 
+            Dim data As Byte() = Nothing
+            'Use FileInfo object to get file size. 
+            Dim fInfo As New FileInfo(sPath)
+            Dim numBytes As Long = fInfo.Length
+            'Open FileStream to read file 
+            Dim fStream As New FileStream(sPath, FileMode.Open, FileAccess.Read)
+            'Use BinaryReader to read file stream into byte array. 
+            Dim br As New BinaryReader(fStream)
+            'When you use BinaryReader, you need to supply number of bytes to read from file. 
+            'In this case we want to read entire file. So supplying total number of bytes. 
+            data = br.ReadBytes(CInt(numBytes))
+            Return data
+        End Function
+        'Private Function NetUse_Command(pDestinationPath As String, pUsername As String, pPassword As String)
+        '    Dim oDectryptedPW = Helpers.Decrypt(My.Settings.NetUse_PW)
+        '    Dim netUseCommand As String = $"net use {pDestinationPath} /user:{pUsername} {oDectryptedPW}"
+        '    Logger.Debug("EXECUTING NetUse_Command for " & pDestinationPath)
+        '    Dim processInfo As New ProcessStartInfo("cmd.exe", $"/C {netUseCommand}")
+        '    processInfo.RedirectStandardOutput = True
+        '    processInfo.UseShellExecute = False
+        '    processInfo.CreateNoWindow = True
+
+        '    Using process As Process = Process.Start(processInfo)
+        '        process.WaitForExit()
+
+        '        ' Prüfe den Rückgabewert des net use Befehls
+        '        If process.ExitCode = 0 Then
+        '            Return True
+        '        Else
+        '            Return False
+        '        End If
+        '    End Using
+        'End Function
+
+        'Private Function Clean_DNZ_PAth(pSourcePath As String) As Boolean
+        '    Dim oFilename = System.IO.Path.GetFileName(pSourcePath)
+
+        '    Logger.Debug("## Starting Clean_DNZ_PAth ...")
+        '    Logger.Debug("## pSourcePath {0}", pSourcePath)
+
+        '    Dim oDirectorySource = Path.Combine(pSourcePath, ParentFolderUID)
+
+        '    Try
+        '        Logger.Debug($"Deleting oDirectorySource {oDirectorySource} ...")
+        '        Directory.Delete(oDirectorySource, True)
+        '        Console.WriteLine($"Folder successfully deleted!")
+        '        Logger.Debug($"...Deleted!")
+        '        Return True
+        '    Catch ex As Exception
+        '        Logger.Error(ex)
+        '        Return False
+        '    End Try
+
+
+        'End Function
+        Private Function SendFinalEmails(pEnvelope As Envelope) As Boolean ', pAttachment As String
+            Dim oMailToCreator = pEnvelope.FinalEmailToCreator
+            Dim oMailToReceivers = pEnvelope.FinalEmailToReceivers
+
+            If oMailToCreator <> FinalEmailType.No Then
+                Logger.Debug("Sending email to creator ...")
+                SendFinalEmailToCreator(pEnvelope) ', pAttachment
+            End If
+
+            If oMailToReceivers <> FinalEmailType.No Then
+                Logger.Debug("Sending emails to receivers..")
+                SendFinalEmailToReceivers(pEnvelope) ', pAttachment
+            End If
+
+            Return True
+        End Function
+
+        Private Function SendFinalEmailToCreator(pEnvelope As Envelope) As Boolean ', pAttachment As String
+            Dim oIncludeAttachment = SendFinalEmailWithAttachment(pEnvelope.FinalEmailToCreator)
+            ' Dim oAttachment = String.Empty
+
+            Logger.Debug("Attachment included: [{0}]", oIncludeAttachment)
+            If oIncludeAttachment Then
+                'oAttachment = pAttachment
+            End If
+
+            If ActionService.CompleteEnvelope(pEnvelope) = False Then ', oAttachment
+                Logger.Error("Envelope could not be completed for receiver [{0}]", pEnvelope.User.Email)
+                Return False
+            End If
+
+            Return True
+        End Function
+
+        Private Function SendFinalEmailToReceivers(pEnvelope As Envelope) As Boolean ', pAttachment As String
+            Dim oIncludeAttachment = SendFinalEmailWithAttachment(pEnvelope.FinalEmailToReceivers)
+            'Dim oAttachment = String.Empty
+
+            Logger.Debug("Attachment included: [{0}]", oIncludeAttachment)
+            If oIncludeAttachment Then
+
+                ' oAttachment = pAttachment
+            End If
+
+            For Each oReceiver In pEnvelope.Receivers
+                If ActionService.CompleteEnvelope(pEnvelope, oReceiver) = False Then ', oAttachment
+                    Logger.Error("Envelope could not be completed for receiver [{0}]", oReceiver.Email)
+                    Return False
+                End If
+            Next
+
+            Return True
+        End Function
+
+        Private Function SendFinalEmailWithAttachment(pType As FinalEmailType)
+            If pType = FinalEmailType.YesWithAttachment Then
+                Return True
+            Else
+                Return False
+            End If
+        End Function
+
+        Private Function BurnAnnotationsToPdf(pEnvelopeData As EnvelopeData) As Byte()
+            Dim pEnvelopeId = pEnvelopeData.EnvelopeId
+
+            Logger.Info($"Burning [{pEnvelopeData.AnnotationData.Count}] signatures")
+            Dim oAnnotations = pEnvelopeData.AnnotationData
+            Dim oInputPath = ""
+            If IsNothing(pEnvelopeData.DocAsByte) Then
+                oInputPath = pEnvelopeData.DocumentPath
+                Logger.Info($"Input path: [{oInputPath}]")
+            Else
+                Logger.Info($"we got bytes..")
+                oInputPath = Config.DocumentPathOrigin
+                Logger.Info($"oInputPath: {Config.DocumentPathOrigin}")
+            End If
+
+
+            If IsNothing(pEnvelopeData.DocAsByte) Then
+                Dim oDirectorySource As String = Path.GetDirectoryName(oInputPath)
+                Dim split As String() = oDirectorySource.Split("\")
+                ParentFolderUID = split(split.Length - 1)
+            Else
+                ParentFolderUID = pEnvelopeData.EnvelopeUUID
+            End If
+
+
+            Logger.Info("ParentFolderUID: [{0}]", ParentFolderUID)
+            Dim oInputDocumentBuffer As Byte()
+            If Not IsNothing(pEnvelopeData.DocAsByte) Then
+                oInputDocumentBuffer = pEnvelopeData.DocAsByte
+            Else
+                Try
+                    oInputDocumentBuffer = File.ReadAllBytes(oInputPath)
+                Catch ex As Exception
+                    Logger.Error(ex)
+                    Throw New BurnAnnotationException("Source document could not be read from disk!", ex)
+                End Try
+            End If
+
+
+            Return PDFBurner.BurnInstantJSONAnnotationsToPDF(oInputDocumentBuffer, oAnnotations)
+        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 oAnnotationData = GetAnnotationData(pEnvelopeId)
+            Dim oData As New EnvelopeData With {
+                .EnvelopeId = pEnvelopeId,
+                .DocumentPath = oRow.ItemEx("FILEPATH", ""),
+                .AnnotationData = oAnnotationData,
+                .DocAsByte = DirectCast(oRow.Item("BYTE_DATA"), Byte()),
+                .EnvelopeUUID = oRow.ItemEx("ENVELOPE_UUID", "")
+            }
+
+            Logger.Debug("Document path: [{0}]", oData.DocumentPath)
+
+            Return oData
+        End Function
+
+        Private Function GetAnnotationData(pEnvelopeId As Integer) As List(Of String)
+            Dim oSql = $"SELECT VALUE FROM TBSIG_DOCUMENT_STATUS WHERE ENVELOPE_ID = {pEnvelopeId}"
+            Dim oTable As DataTable = Database.GetDatatable(oSql)
+
+            Return oTable.Rows.Cast(Of DataRow).
+                Select(Function(r) r.ItemEx("VALUE", String.Empty)).
+                Cast(Of String).
+                ToList()
+
+        End Function
+
+        Private Sub InitializeServices(pState As State)
+            ActionService = New ActionService(pState)
+        End Sub
+
+        Private Sub InitializeModels(pState As State)
+            ConfigModel = New ConfigModel(pState)
+            EnvelopeModel = New EnvelopeModel(pState)
+            ReportModel = New ReportModel(pState)
+        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 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/PDFBurner.vb

@@ -0,0 +1,222 @@
+Imports System.Drawing
+Imports System.IO
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging
+Imports GdPicture14
+Imports Newtonsoft.Json
+Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions
+
+Namespace Jobs.FinalizeDocument
+    Public Class PDFBurner
+        Inherits BaseClass
+
+        Private ReadOnly Manager As AnnotationManager
+        Private ReadOnly LicenseManager As LicenseManager
+
+        Private Const ANNOTATION_TYPE_IMAGE = "pspdfkit/image"
+        Private Const ANNOTATION_TYPE_INK = "pspdfkit/ink"
+        Private Const ANNOTATION_TYPE_WIDGET = "pspdfkit/widget"
+        Private Property _ignoredLabels As List(Of String)
+
+        Public Sub New(pLogConfig As LogConfig, pGDPictureLicenseKey As String, ignoredLabels As List(Of String))
+            MyBase.New(pLogConfig)
+
+            LicenseManager = New LicenseManager()
+            LicenseManager.RegisterKEY(pGDPictureLicenseKey)
+
+            Manager = New AnnotationManager()
+
+            _ignoredLabels = ignoredLabels
+        End Sub
+
+        Public Function BurnInstantJSONAnnotationsToPDF(pSourceBuffer As Byte(), pInstantJSONList As List(Of String)) As Byte()
+            Dim oResult As GdPictureStatus
+
+            Try
+                Using oSourceStream As New MemoryStream(pSourceBuffer)
+                    oResult = Manager.InitFromStream(oSourceStream)
+                    If oResult <> GdPictureStatus.OK Then
+                        Throw New BurnAnnotationException($"Could not open document for burning: [{oResult}]")
+                    End If
+
+                    For Each oJSON In pInstantJSONList
+                        If AddInstantJSONAnnotationToPDF(oJSON) = False Then
+                            Logger.Warn($"Error in AddInstantJSONAnnotationToPDF - oJson: ")
+                            Logger.Warn(oJSON)
+                            Throw New BurnAnnotationException($"Adding Annotation failed")
+                        End If
+                    Next
+                    oResult = Manager.BurnAnnotationsToPage(RemoveInitialAnnots:=True, VectorMode:=True)
+                    If oResult <> GdPictureStatus.OK Then
+                        Throw New BurnAnnotationException($"Could not burn annotations to file: [{oResult}]")
+                    End If
+
+                    Using oNewStream As New MemoryStream()
+                        oResult = Manager.SaveDocumentToPDF(oNewStream)
+                        If oResult <> GdPictureStatus.OK Then
+                            Throw New BurnAnnotationException($"Could not save document to stream: [{oResult}]")
+                        End If
+
+                        Manager.Close()
+
+                        Return oNewStream.ToArray()
+                    End Using
+                End Using
+            Catch ex As Exception
+                Logger.Error(ex)
+
+                Return Nothing
+            End Try
+        End Function
+
+        Private Function AddInstantJSONAnnotationToPDF(pInstantJSON As String) As Boolean
+            Try
+                Dim oAnnotationData = JsonConvert.DeserializeObject(Of AnnotationData)(pInstantJSON)
+
+                For Each oAnnotation In oAnnotationData.annotations
+                    Logger.Debug("Adding AnnotationID: " + oAnnotation.id)
+                    Select Case oAnnotation.type
+                        Case ANNOTATION_TYPE_IMAGE
+                            AddImageAnnotation(oAnnotation, oAnnotationData.attachments)
+
+                        Case ANNOTATION_TYPE_INK
+                            AddInkAnnotation(oAnnotation)
+
+                        Case ANNOTATION_TYPE_WIDGET
+                            'Add form field values
+                            Dim formFieldValue = oAnnotationData.formFieldValues.FirstOrDefault(Function(fv) fv.name = oAnnotation.id)
+                            If formFieldValue IsNot Nothing AndAlso Not _ignoredLabels.Contains(formFieldValue.value) Then
+                                AddFormFieldValue(oAnnotation, formFieldValue)
+                            End If
+                    End Select
+                Next
+
+                Return True
+            Catch ex As Exception
+                Logger.Warn("Could not create annotation from InstantJSON")
+                Logger.Error(ex)
+                Return False
+            End Try
+        End Function
+
+        Private Function AddImageAnnotation(pAnnotation As Annotation, pAttachments As Dictionary(Of String, Attachment)) As Boolean
+            Try
+                Dim oAttachment = pAttachments.Where(Function(a) a.Key = pAnnotation.imageAttachmentId).
+                        SingleOrDefault()
+
+                ' Convert pixels to Inches
+                Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
+
+                Dim oX = oBounds.Item(0)
+                Dim oY = oBounds.Item(1)
+                Dim oWidth = oBounds.Item(2)
+                Dim oHeight = oBounds.Item(3)
+
+                Manager.SelectPage(pAnnotation.pageIndex + 1)
+                Manager.AddEmbeddedImageAnnotFromBase64(oAttachment.Value.binary, oX, oY, oWidth, oHeight)
+
+                Return True
+            Catch ex As Exception
+                Logger.Warn("Could not add image annotation!")
+                Logger.Error(ex)
+
+                Return False
+            End Try
+        End Function
+
+        Private Function AddInkAnnotation(pAnnotation As Annotation) As Boolean
+            Try
+                Dim oSegments = pAnnotation.lines.points
+                Dim oColor = ColorTranslator.FromHtml(pAnnotation.strokeColor)
+                Manager.SelectPage(pAnnotation.pageIndex + 1)
+
+                For Each oSegment As List(Of List(Of Single)) In oSegments
+                    Dim oPoints = oSegment.
+                    Select(AddressOf ToPointF).
+                    ToArray()
+
+                    Manager.AddFreeHandAnnot(oColor, oPoints)
+                Next
+
+                Return True
+            Catch ex As Exception
+                Logger.Warn("Could not add image annotation!")
+                Logger.Error(ex)
+
+                Return False
+            End Try
+
+        End Function
+
+        Private Function AddFormFieldValue(pAnnotation As Annotation, formFieldValue As FormFieldValue) As Boolean
+            Try
+                ' Convert pixels to Inches
+                Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
+
+                Dim oX = oBounds.Item(0)
+                Dim oY = oBounds.Item(1)
+                Dim oWidth = oBounds.Item(2)
+                Dim oHeight = oBounds.Item(3)
+
+                Manager.SelectPage(pAnnotation.pageIndex + 1)
+                ' Add the text annotation
+                Dim ant = Manager.AddTextAnnot(oX, oY, oWidth, oHeight, formFieldValue.value)
+
+                ' Set the font properties
+                ant.FontName = "Arial"
+                ant.FontSize = 8
+                ant.FontStyle = FontStyle.Italic
+                Manager.SaveAnnotationsToPage()
+                Return True
+            Catch ex As Exception
+                Logger.Warn("Could not add image annotation!")
+                Logger.Error(ex)
+                Return False
+            End Try
+        End Function
+
+        Private Function ToPointF(pPoints As List(Of Single)) As PointF
+            Dim oPoints = pPoints.Select(AddressOf ToInches).ToList()
+            Return New PointF(oPoints.Item(0), oPoints.Item(1))
+        End Function
+
+        Private Function ToInches(pValue As Double) As Double
+            Return pValue / 72
+        End Function
+
+        Private Function ToInches(pValue As Single) As Single
+            Return pValue / 72
+        End Function
+
+        Friend Class AnnotationData
+            Public Property annotations As List(Of Annotation)
+            Public Property attachments As Dictionary(Of String, Attachment)
+            Public Property formFieldValues As List(Of FormFieldValue)
+        End Class
+
+        Friend Class Annotation
+            Public Property id As String
+            Public Property bbox As List(Of Double)
+            Public Property type As String
+            Public Property isSignature As Boolean
+            Public Property imageAttachmentId As String
+            Public Property lines As Lines
+            Public Property pageIndex As Integer
+            Public Property strokeColor As String
+        End Class
+
+        Friend Class Lines
+            Public Property points As List(Of List(Of List(Of Single)))
+        End Class
+
+        Friend Class Attachment
+            Public Property binary As String
+            Public Property contentType As String
+        End Class
+
+        Friend Class FormFieldValue
+            Public Property name As String
+            Public Property value As String
+        End Class
+    End Class
+End Namespace

EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFMerger.vb

@@ -0,0 +1,71 @@
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging
+Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions
+Imports GdPicture14
+Imports System.IO
+
+Public Class PDFMerger
+    Inherits BaseClass
+
+    Private ReadOnly Manager As AnnotationManager
+    Private ReadOnly LicenseManager As LicenseManager
+
+    Private Const ALLOW_RASTERIZATION = True
+    Private Const ALLOW_VECTORIZATION = True
+
+    Private ReadOnly PDFAConformanceLevel As PdfConversionConformance = PdfConversionConformance.PDF_A_1b
+
+    Public Sub New(pLogConfig As LogConfig, pGDPictureLicenseKey As String)
+        MyBase.New(pLogConfig)
+
+        LicenseManager = New LicenseManager()
+        LicenseManager.RegisterKEY(pGDPictureLicenseKey)
+
+        Manager = New AnnotationManager()
+    End Sub
+
+    Public Function MergeDocuments(pDocument As Byte(), pReport As Byte()) As Byte()
+        Using oDocumentStream As New MemoryStream(pDocument)
+            Using oReportStream As New MemoryStream(pReport)
+                Using oFinalStream As New MemoryStream()
+                    Using oDocumentPDF As New GdPicturePDF()
+                        Using oReportPDF As New GdPicturePDF()
+                            Dim oStatus As GdPictureStatus = GdPictureStatus.OK
+
+                            ' Load the source file into memory
+                            oDocumentPDF.LoadFromStream(oDocumentStream, True)
+
+                            oStatus = oDocumentPDF.GetStat()
+                            If oStatus <> GdPictureStatus.OK Then
+                                Throw New MergeDocumentException($"Document could not be loaded: {oStatus}")
+                            End If
+
+                            ' Load the report file into memory
+                            oReportPDF.LoadFromStream(oReportStream, True)
+                            oStatus = oReportPDF.GetStat()
+                            If oStatus <> GdPictureStatus.OK Then
+                                Throw New MergeDocumentException($"Report could not be loaded: {oStatus}")
+                            End If
+
+                            ' Merge the documents 
+                            Dim oMergedPDF = oDocumentPDF.Merge2Documents(oDocumentPDF, oReportPDF)
+                            oStatus = oMergedPDF.GetStat()
+                            If oStatus <> GdPictureStatus.OK Then
+                                Throw New MergeDocumentException($"Documents could not be merged: {oStatus}")
+                            End If
+
+                            ' Convert to PDF/A
+                            oMergedPDF.ConvertToPDFA(oFinalStream, PDFAConformanceLevel, ALLOW_VECTORIZATION, ALLOW_RASTERIZATION)
+                            oStatus = oDocumentPDF.GetStat()
+                            If oStatus <> GdPictureStatus.OK Then
+                                Throw New MergeDocumentException($"Document could not be converted to PDF/A: {oStatus}")
+                            End If
+
+                            Return oFinalStream.ToArray()
+                        End Using
+                    End Using
+                End Using
+            End Using
+        End Using
+    End Function
+End Class

EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportCreator.vb

@@ -0,0 +1,91 @@
+Imports System.IO
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Base
+Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions
+
+Public Class ReportCreator
+    Inherits BaseClass
+
+    Private Envelope As Envelope
+    Private ReadOnly ReportModel As ReportModel
+    Private ReadOnly EnvelopeModel As EnvelopeModel
+
+    Public Sub New(pLogConfig As LogConfig, pState As State)
+        MyBase.New(pLogConfig)
+
+        ReportModel = New ReportModel(pState)
+        EnvelopeModel = New EnvelopeModel(pState)
+    End Sub
+
+    Public Function CreateReport(pEnvelope As Envelope) As Byte()
+        Try
+            Logger.Debug("Loading report data..")
+            Dim oTable = ReportModel.List(pEnvelope.Id)
+            Dim oItems = GetReportSource(oTable)
+
+            Envelope = pEnvelope
+
+            If oItems.Count = 0 Then
+                Throw New CreateReportException("No report data found!")
+            End If
+
+            Logger.Debug("Creating report with [{0}] items..", oItems.Count)
+            Dim oBuffer = DoCreateReport(oItems)
+            Logger.Debug("Report created!")
+
+            Return oBuffer
+        Catch ex As Exception
+            Logger.Error(ex)
+            Throw New CreateReportException("Could not prepare report data!", ex)
+        End Try
+    End Function
+
+    Private Function GetReportSource(pDataTable As DataTable) As List(Of ReportItem)
+        Logger.Debug("Preparing report data")
+        Return pDataTable.Rows.
+            Cast(Of DataRow).
+            Select(AddressOf ToReportItem).
+            OrderByDescending(Function(r) r.ItemDate).
+            ToList()
+    End Function
+
+    Private Function DoCreateReport(pReportItems As List(Of ReportItem)) As Byte()
+        Dim oItems = pReportItems.Select(AddressOf MergeEnvelope).ToList()
+        Dim oSource As New ReportSource With {.Items = oItems}
+        Dim oReport As New rptEnvelopeHistory() With {.DataSource = oSource, .DataMember = "Items"}
+
+        Logger.Debug("Creating report in memory..")
+        oReport.CreateDocument()
+
+        Logger.Debug("Exporting report to stream..")
+        Using oStream As New MemoryStream()
+            oReport.ExportToPdf(oStream)
+
+            Logger.Debug("Writing report to buffer..")
+            Return oStream.ToArray()
+        End Using
+    End Function
+
+    Private Function MergeEnvelope(pItem As ReportItem) As ReportItem
+        If pItem.Envelope Is Nothing Then
+            pItem.Envelope = Envelope
+        End If
+        Return pItem
+    End Function
+
+    Private Function ToReportItem(pRow As DataRow) As ReportItem
+        Try
+            Return New ReportItem() With {
+                .EnvelopeId = pRow.Item("ENVELOPE_ID"),
+                .EnvelopeTitle = pRow.ItemEx("HEAD_TITLE", String.Empty),
+                .EnvelopeSubject = pRow.ItemEx("HEAD_SUBJECT", String.Empty),
+                .ItemDate = pRow.ItemEx(Of Date)("POS_WHEN", Nothing),
+                .ItemStatus = pRow.ItemEx("POS_STATUS", 0),
+                .ItemUserReference = pRow.ItemEx("POS_WHO", "")
+            }
+        Catch ex As Exception
+            Logger.Error(ex)
+            Throw New CreateReportException("Could not read data from database!", ex)
+        End Try
+    End Function
+End Class

EnvelopeGenerator.Common/Jobs/FinalizeDocument/ReportItem.vb

@@ -1,4 +1,6 @@
-Public Class ReportItem
+Imports System.Windows.Forms.VisualStyles.VisualStyleElement
+
+Public Class ReportItem
 
     Public Property Envelope As Envelope
     Public Property EnvelopeId As Integer
@@ -6,6 +8,13 @@
     Public Property EnvelopeSubject As String
 
     Public Property ItemStatus As Constants.EnvelopeStatus
+    Public ReadOnly Property ItemStatusTranslated As String
+        Get
+            Dim oStatus = ItemStatus.ToString()
+            Return My.Resources.Model.ResourceManager.GetString(oStatus)
+        End Get
+    End Property
+
     Public Property ItemUserReference As String
     Public Property ItemDate As Date
 

EnvelopeGenerator.Common/Models/CertificateModel.vb

@@ -31,7 +31,7 @@ Public Class CertificateModel
             Dim oCommand As New SqlCommand(oSql)
             oCommand.Parameters.Add("ENVELOPE_ID", SqlDbType.Int).Value = pEnvelope.Id
             oCommand.Parameters.Add("ENVELOPE_UUID", SqlDbType.NVarChar).Value = pEnvelope.Uuid
-            oCommand.Parameters.Add("ENVELOPE_SUBJECT", SqlDbType.NVarChar).Value = pEnvelope.Subject
+            oCommand.Parameters.Add("ENVELOPE_SUBJECT", SqlDbType.NVarChar).Value = String.Empty
             oCommand.Parameters.Add("CREATOR_ID", SqlDbType.Int).Value = pEnvelope.UserId
             oCommand.Parameters.Add("CREATOR_NAME", SqlDbType.NVarChar).Value = pEnvelope.User.FullName
             oCommand.Parameters.Add("CREATOR_EMAIL", SqlDbType.NVarChar).Value = pEnvelope.User.Email

EnvelopeGenerator.Common/Models/ChartModel.vb

@@ -0,0 +1,28 @@
+Imports System.Data.SqlClient
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging
+
+Public Class ChartModel
+    Inherits BaseModel
+
+    Public Sub New(pState As State)
+        MyBase.New(pState)
+
+    End Sub
+
+    Public Function LoadPIEExample() As DataTable
+        Try
+            Dim oSQL As String
+            oSQL = " SELECT 'ALLE' as Argument, 100 as Value"
+            oSQL += " UNION "
+            oSQL += " SELECT 'Komplett', 33 "
+
+            Dim oTable As DataTable = Database.GetDatatable(oSQL)
+
+            Return oTable
+        Catch ex As Exception
+            Logger.Error(ex)
+            Return Nothing
+        End Try
+    End Function
+End Class

EnvelopeGenerator.Common/Models/ConfigModel.vb

@@ -13,29 +13,24 @@ Public Class ConfigModel
         Try
             Dim oSql As String = "SELECT TOP 1 * FROM TBSIG_CONFIG"
             Dim oTable As DataTable = Database.GetDatatable(oSql)
-            Dim oRow = oTable.Rows.Item(0)
+            Dim oRow As DataRow = oTable.Rows.Item(0)
 
             Return New DbConfig() With {
-                .DocumentPath = oRow.ItemEx("DOCUMENT_PATH", ""),
-                .ExportPath = oRow.ItemEx("EXPORT_PATH", ""),
-                .SendingProfile = oRow.ItemEx("SENDING_PROFILE", 0),
-                .SignatureHost = oRow.ItemEx("SIGNATURE_HOST", ""),
-                .ExternalProgramName = oRow.ItemEx("EXTERNAL_PROGRAM_NAME", "")
+              .DocumentPath = oRow.ItemEx("DOCUMENT_PATH", ""),
+              .DocumentPathOrigin = oRow.ItemEx("DOCUMENT_PATH", ""),
+              .ExportPath = oRow.ItemEx("EXPORT_PATH", ""),
+              .SendingProfile = oRow.ItemEx("SENDING_PROFILE", 0),
+              .SignatureHost = oRow.ItemEx("SIGNATURE_HOST", ""),
+              .ExternalProgramName = oRow.ItemEx("EXTERNAL_PROGRAM_NAME", ""),
+              .Default_TFA_Enabled = oRow.ItemEx("DEF_TFA_ENABLED", False)
             }
         Catch ex As Exception
+            Logger.Error(ex)
             Return New DbConfig()
         End Try
     End Function
 
-    Public Function GetUserId() As Integer
-        Try
-            Dim oUserId As Integer = Database.GetScalarValue($"SELECT GUID FROM TBDD_USER WHERE USERNAME = '{Environment.UserName}'")
-            Return oUserId
 
-        Catch ex As Exception
-            Return 0
-        End Try
-    End Function
 
 
 End Class

EnvelopeGenerator.Common/Models/DocumentModel.vb

@@ -24,7 +24,8 @@ Public Class DocumentModel
             .Filepath = pRow.ItemEx("FILEPATH", ""),
             .FileNameOriginal = pRow.ItemEx("FILENAME_ORIGINAL", ""),
             .IsTempFile = False,
-            .Elements = ElementModel.List(oDocumentId, pReceiverId)
+            .Elements = ElementModel.List(oDocumentId, pReceiverId),
+            .Byte_Data = DirectCast(pRow.Item("BYTE_DATA"), Byte())
         }
     End Function
 
@@ -79,18 +80,21 @@ Public Class DocumentModel
                            ([FILENAME]
                            ,[FILENAME_ORIGINAL]
                            ,[FILEPATH]
-                           ,[ENVELOPE_ID])
+                           ,[ENVELOPE_ID]
+                           ,[BYTE_DATA])
                         VALUES
                            (@FILENAME
                            ,@FILENAME_ORIGINAL
                            ,@FILEPATH
-                           ,@ENVELOPE_ID)"
+                           ,@ENVELOPE_ID
+                           ,@BYTE_DATA)"
 
             Dim oCommand As New SqlCommand(oSql)
             oCommand.Parameters.Add("FILENAME", SqlDbType.NVarChar).Value = pDocument.Filename
             oCommand.Parameters.Add("FILENAME_ORIGINAL", SqlDbType.NVarChar).Value = pDocument.FileNameOriginal
             oCommand.Parameters.Add("FILEPATH", SqlDbType.NVarChar).Value = pDocument.Filepath
             oCommand.Parameters.Add("ENVELOPE_ID", SqlDbType.Int).Value = pEnvelope.Id
+            oCommand.Parameters.Add(New SqlParameter("@BYTE_DATA", DirectCast(pDocument.Byte_Data, Object)))
 
             If Database.ExecuteNonQuery(oCommand, pTransaction) Then
                 pDocument.EnvelopeId = pEnvelope.Id

EnvelopeGenerator.Common/Models/EmailModel.vb

@@ -12,8 +12,8 @@ Public Class EmailModel
     Public Function Insert(pEmail As EmailData) As Boolean
         Try
             Dim oSql = "INSERT INTO [dbo].[TBEMLP_EMAIL_OUT] "
-            oSql += " (EMAIL_ADRESS, EMAIL_SUBJ, EMAIL_BODY, ADDED_WHO, SENDING_PROFILE, REFERENCE_ID, REFERENCE_STRING, REMINDER_TYPE_ID, WF_ID) "
-            oSql += " VALUES (@EMAIL_ADRESS, @EMAIL_SUBJ, @EMAIL_BODY, @ADDED_WHO, @SENDING_PROFILE, @REFERENCE_ID, @REFERENCE_STRING, @REMINDER_TYPE_ID, @WF_ID)"
+            oSql += " (EMAIL_ADRESS, EMAIL_SUBJ, EMAIL_BODY, ADDED_WHO, SENDING_PROFILE, REFERENCE_ID, REFERENCE_STRING, REMINDER_TYPE_ID, WF_ID,ATT1_RELATED_ID,ATT1_REL_TYPE) "
+            oSql += " VALUES (@EMAIL_ADRESS, @EMAIL_SUBJ, @EMAIL_BODY, @ADDED_WHO, @SENDING_PROFILE, @REFERENCE_ID, @REFERENCE_STRING, @REMINDER_TYPE_ID, @WF_ID,@ATT1_RELATED_ID,@ATT1_REL_TYPE)"
             Dim oCommand As New SqlCommand(oSql)
             oCommand.Parameters.Add("EMAIL_ADRESS", SqlDbType.NVarChar).Value = pEmail.EmailAdress
             oCommand.Parameters.Add("EMAIL_SUBJ", SqlDbType.NVarChar).Value = pEmail.EmailSubject
@@ -23,7 +23,10 @@ Public Class EmailModel
             oCommand.Parameters.Add("REFERENCE_ID", SqlDbType.Int).Value = pEmail.ReferenceID
             oCommand.Parameters.Add("REFERENCE_STRING", SqlDbType.NVarChar).Value = pEmail.ReferenceString
             oCommand.Parameters.Add("REMINDER_TYPE_ID", SqlDbType.Int).Value = 202377
-            oCommand.Parameters.Add("WF_ID", SqlDbType.Int).Value = 202377                  ' Wegen DB-Trigger MUSS dieser Wert gesetzt werden
+            'oCommand.Parameters.Add("EMAIL_ATTMT1", SqlDbType.NVarChar).Value = pEmail.EmailAttachment
+            oCommand.Parameters.Add("WF_ID", SqlDbType.Int).Value = pEmail.EmailType  ' Wegen DB-Trigger MUSS dieser Wert gesetzt werden
+            oCommand.Parameters.Add("ATT1_RELATED_ID", SqlDbType.Int).Value = pEmail.ATT1_RELATED_ID
+            oCommand.Parameters.Add("ATT1_REL_TYPE", SqlDbType.NVarChar).Value = pEmail.ATT1_REL_TYPE
 
             If Database.ExecuteNonQuery(oCommand) Then
                 Return True

EnvelopeGenerator.Common/Models/EmailTemplateModel.vb

@@ -0,0 +1,31 @@
+Imports DigitalData.Modules.Base
+Imports EnvelopeGenerator.Common.Constants
+
+Public Class EmailTemplateModel
+    Inherits BaseModel
+
+    Public Sub New(pState As State)
+        MyBase.New(pState)
+    End Sub
+
+    Private Function ToEmailTemplate(pRow As DataRow) As EmailTemplate
+        Return New EmailTemplate() With {
+            .Id = pRow.ItemEx("GUID", 0),
+            .Name = pRow.ItemEx("NAME", ""),
+            .Body = pRow.ItemEx("BODY", ""),
+            .Subject = pRow.ItemEx("SUBJECT", "")
+        }
+    End Function
+
+    Public Function GetById(pEmailTemplateName As EmailTemplateType) As EmailTemplate
+        Dim oSql As String = $"SELECT * FROM TBSIG_EMAIL_TEMPLATE WHERE NAME = '{pEmailTemplateName}'"
+        Dim oTable As DataTable = Database.GetDatatable(oSql)
+
+        If oTable.Rows.Count = 0 Then
+            Return Nothing
+        End If
+
+        Dim oRow = oTable.Rows.Item(0)
+        Return ToEmailTemplate(oRow)
+    End Function
+End Class

EnvelopeGenerator.Common/Models/EnvelopeModel.vb

@@ -2,13 +2,16 @@
 Imports System.Web.UI.WebControls
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
+Imports EnvelopeGenerator.Common.Constants
 
 Public Class EnvelopeModel
     Inherits BaseModel
 
     Private ReadOnly UserModel As UserModel
     Private ReadOnly ReceiverModel As ReceiverModel
+    Private ReadOnly HistoryModel As HistoryModel
     Private ReadOnly DocumentModel As DocumentModel
+    Private ReadOnly EnvelopeTypeModel As EnvelopeTypeModel
 
     Public Sub New(pState As State)
         MyBase.New(pState)
@@ -16,25 +19,50 @@ Public Class EnvelopeModel
         UserModel = New UserModel(pState)
         ReceiverModel = New ReceiverModel(pState)
         DocumentModel = New DocumentModel(pState)
+        HistoryModel = New HistoryModel(pState)
+        EnvelopeTypeModel = New EnvelopeTypeModel(pState)
     End Sub
 
     Private Function ToEnvelope(pRow As DataRow) As Envelope
         Dim oEnvelope = New Envelope() With {
             .Id = pRow.ItemEx("GUID", 0),
             .Title = pRow.ItemEx("TITLE", ""),
-            .ContractType = ObjectEx.ToEnum(Of Constants.ContractType)(pRow.ItemEx("CONTRACT_TYPE", Constants.ContractType.Contract.ToString())),
+            .EnvelopeTypeId = pRow.ItemEx("ENVELOPE_TYPE", 0),
+            .ContractType = pRow.ItemEx("CONTRACT_TYPE", 0),
             .Uuid = pRow.ItemEx("ENVELOPE_UUID", ""),
-            .Subject = pRow.ItemEx("SUBJECT", ""),
             .Message = pRow.ItemEx("MESSAGE", ""),
             .UserId = pRow.ItemEx("USER_ID", 0),
+            .Language = pRow.ItemEx("LANGUAGE", "de-DE"),
             .Status = ObjectEx.ToEnum(Of Constants.EnvelopeStatus)(pRow.ItemEx("STATUS", Constants.EnvelopeStatus.EnvelopeCreated.ToString())),
             .AddedWhen = pRow.Item("ADDED_WHEN"),
-            .User = New User()
+            .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),
+            .ExpiresWarningWhen = pRow.ItemEx(Of Date)("EXPIRES_WARNING_WHEN", Nothing),
+            .ExpiresWhenDays = pRow.ItemEx("EXPIRES_WHEN_DAYS", 0),
+            .ExpiresWarningWhenDays = pRow.ItemEx("EXPIRES_WARNING_WHEN_DAYS", 0),
+            .SendReminderEmails = pRow.ItemEx("SEND_REMINDER_EMAILS", False),
+            .FirstReminderDays = pRow.ItemEx("FIRST_REMINDER_DAYS", 0),
+            .ReminderIntervalDays = pRow.ItemEx("REMINDER_INTERVAL_DAYS", 0),
+            .UseAccessCode = pRow.ItemEx("USE_ACCESS_CODE", False),
+            .FinalEmailToCreator = ObjectEx.ToEnum(Of Constants.FinalEmailType)(pRow.ItemEx("FINAL_EMAIL_TO_CREATOR", Constants.FinalEmailType.No.ToString())),
+            .FinalEmailToReceivers = ObjectEx.ToEnum(Of Constants.FinalEmailType)(pRow.ItemEx("FINAL_EMAIL_TO_RECEIVERS", Constants.FinalEmailType.No.ToString())),
+            .TFA_Enabled = pRow.ItemEx("TFA_Enabled", False)
         }
-
+        Dim oDOC_RESULT = pRow.Item("DOC_RESULT")
+        If Not IsDBNull(oDOC_RESULT) Then
+            Dim oByte As Byte() = DirectCast(pRow.Item("DOC_RESULT"), Byte())
+            If Not IsNothing(oByte) Then
+                oEnvelope.DOC_RESULT = oByte
+            End If
+        Else
+            oEnvelope.DOC_RESULT = Nothing
+        End If
         oEnvelope.User = UserModel.SelectUser(oEnvelope.UserId)
         oEnvelope.Receivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id)
         oEnvelope.Documents = DocumentModel.List(oEnvelope.Id)
+        oEnvelope.History = HistoryModel.List(oEnvelope.Id)
+        oEnvelope.EnvelopeType = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId)
 
         Return oEnvelope
     End Function
@@ -57,9 +85,9 @@ Public Class EnvelopeModel
         End Try
     End Function
 
-    Public Function GetById(pEnvelopeId As String) As Envelope
+    Public Function GetById(pEnvelopeId As Integer) As Envelope
         Try
-            Dim oSql = $"SELECT * FROM [dbo].[TBSIG_ENVELOPE] WHERE GUID = '{pEnvelopeId}'"
+            Dim oSql = $"SELECT * FROM [dbo].[TBSIG_ENVELOPE] WHERE GUID = {pEnvelopeId}"
             Dim oTable = Database.GetDatatable(oSql)
 
             Return ToEnvelope(oTable)
@@ -71,7 +99,7 @@ Public Class EnvelopeModel
 
     Public Function List() As IEnumerable(Of Envelope)
         Try
-            Dim oSql = $"EXEC PRSIG_GET_ENVELOPES_FOR_USER {State.UserId}"
+            Dim oSql = $"EXEC [dbo].[PRSIG_GET_ENVELOPES_FOR_USER] {State.UserId}"
             Dim oTable = Database.GetDatatable(oSql)
 
             Return oTable?.Rows.Cast(Of DataRow).
@@ -85,7 +113,7 @@ Public Class EnvelopeModel
 
     Public Function ListCompleted() As IEnumerable(Of Envelope)
         Try
-            Dim oSql = $"SELECT * FROM [dbo].[TBSIG_ENVELOPE] WHERE USER_ID = {State.UserId} AND STATUS = 4"
+            Dim oSql = $"EXEC [dbo].[PRSIG_GET_CLOSED_ENVELOPES_FOR_USER] {State.UserId}"
             Dim oTable = Database.GetDatatable(oSql)
 
             Return oTable?.Rows.Cast(Of DataRow).
@@ -116,20 +144,21 @@ Public Class EnvelopeModel
 
     Public Function Insert(pEnvelope As Envelope) As Boolean
         Try
-            Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE] (SUBJECT, MESSAGE, ENVELOPE_UUID, STATUS, USER_ID, TITLE, CONTRACT_TYPE) "
-            oSql += " VALUES (@SUBJECT, @MESSAGE, @UUID, @STATUS, @USER_ID, @TITLE, @CONTRACT_TYPE)"
+            Dim oSql = $"INSERT INTO [dbo].[TBSIG_ENVELOPE] (MESSAGE, ENVELOPE_UUID, STATUS, USER_ID) 
+            VALUES('', 
+                '{pEnvelope.Uuid}', 
+                '{CInt([Enum].Parse(GetType(EnvelopeStatus), Constants.EnvelopeStatus.EnvelopeCreated))}', 
+                '{pEnvelope.UserId}')"
             Dim oCommand As New SqlCommand(oSql)
-            oCommand.Parameters.Add("SUBJECT", SqlDbType.NVarChar).Value = String.Empty
-            oCommand.Parameters.Add("MESSAGE", SqlDbType.NVarChar).Value = String.Empty
-            oCommand.Parameters.Add("UUID", SqlDbType.NVarChar).Value = pEnvelope.Uuid
-            oCommand.Parameters.Add("STATUS", SqlDbType.Int).Value = Constants.EnvelopeStatus.EnvelopeCreated
-            oCommand.Parameters.Add("USER_ID", SqlDbType.Int).Value = pEnvelope.UserId
-            oCommand.Parameters.Add("TITLE", SqlDbType.NVarChar).Value = pEnvelope.Title
-            oCommand.Parameters.Add("CONTRACT_TYPE", SqlDbType.Int).Value = pEnvelope.ContractType
+            'oCommand.Parameters.Add("MESSAGE", SqlDbType.NVarChar).Value = String.Empty
+            'oCommand.Parameters.Add("UUID", SqlDbType.NVarChar).Value = pEnvelope.Uuid
+            'oCommand.Parameters.Add("STATUS", SqlDbType.Int).Value = Constants.EnvelopeStatus.EnvelopeCreated
+            'oCommand.Parameters.Add("USER_ID", SqlDbType.Int).Value = pEnvelope.UserId
+
 
             If Database.ExecuteNonQuery(oCommand) Then
                 pEnvelope.Id = GetEnvelopeId(pEnvelope)
-                SetEnvelopeDate(pEnvelope)  'TODO JJ fragen
+                SetEnvelopeDate(pEnvelope)
                 Return True
             Else
                 Return False
@@ -144,23 +173,48 @@ Public Class EnvelopeModel
     Public Function Update(pEnvelope As Envelope, pTransaction As SqlTransaction) As Boolean
         Try
             Dim oSql = "UPDATE [dbo].[TBSIG_ENVELOPE] SET "
-            oSql += " [SUBJECT] = @SUBJECT, "
             oSql += " [MESSAGE] = @MESSAGE, "
             oSql += " [STATUS] = @STATUS, "
             oSql += " [TITLE] = @TITLE, "
+            oSql += " [ENVELOPE_TYPE] = @ENVELOPE_TYPE, "
             oSql += " [CONTRACT_TYPE] = @CONTRACT_TYPE, "
-            oSql += " [CHANGED_WHEN] = GETDATE() "
+            oSql += " [LANGUAGE] = @LANGUAGE, "
+            oSql += " [CERTIFICATION_TYPE] = @CERTIFICATION_TYPE, "
+            oSql += " [EXPIRES_WHEN_DAYS] = @EXPIRES_WHEN_DAYS, "
+            oSql += " [EXPIRES_WARNING_WHEN_DAYS] = @EXPIRES_WARNING_WHEN_DAYS, "
+            oSql += " [FIRST_REMINDER_DAYS] = @FIRST_REMINDER_DAYS, "
+            oSql += " [FINAL_EMAIL_TO_CREATOR] = @FINAL_EMAIL_TO_CREATOR, "
+            oSql += " [FINAL_EMAIL_TO_RECEIVERS] = @FINAL_EMAIL_TO_RECEIVERS, "
+            oSql += " [REMINDER_INTERVAL_DAYS] = @REMINDER_INTERVAL_DAYS, "
+            oSql += " [SEND_REMINDER_EMAILS] = @SEND_REMINDER_EMAILS, "
+            oSql += " [USE_ACCESS_CODE] = @USE_ACCESS_CODE, "
+            oSql += " [CHANGED_WHEN] = GETDATE(), "
+            oSql += " [TFA_Enabled] = @TFA_Enabled"
             oSql += " WHERE GUID = @ID AND USER_ID = @USER_ID"
+
+
             Dim oCommand As New SqlCommand(oSql)
-            oCommand.Parameters.Add("SUBJECT", SqlDbType.NVarChar).Value = pEnvelope.Subject
+            oCommand.Parameters.Add("ID", SqlDbType.Int).Value = pEnvelope.Id
+            oCommand.Parameters.Add("USER_ID", SqlDbType.Int).Value = pEnvelope.UserId
             oCommand.Parameters.Add("MESSAGE", SqlDbType.NVarChar).Value = pEnvelope.Message
             oCommand.Parameters.Add("STATUS", SqlDbType.Int).Value = pEnvelope.Status
             oCommand.Parameters.Add("TITLE", SqlDbType.NVarChar).Value = pEnvelope.Title
+            oCommand.Parameters.Add("ENVELOPE_TYPE", SqlDbType.Int).Value = pEnvelope.EnvelopeTypeId
             oCommand.Parameters.Add("CONTRACT_TYPE", SqlDbType.Int).Value = pEnvelope.ContractType
-
-            oCommand.Parameters.Add("ID", SqlDbType.Int).Value = pEnvelope.Id
-            oCommand.Parameters.Add("USER_ID", SqlDbType.Int).Value = pEnvelope.UserId
-
+            If IsNothing(pEnvelope.Language) Then
+                pEnvelope.Language = "de-DE"
+            End If
+            oCommand.Parameters.Add("LANGUAGE", SqlDbType.NVarChar).Value = pEnvelope.Language
+            oCommand.Parameters.Add("CERTIFICATION_TYPE", SqlDbType.Int).Value = pEnvelope.CertificationType
+            oCommand.Parameters.Add("EXPIRES_WHEN_DAYS", SqlDbType.Int).Value = pEnvelope.ExpiresWhenDays
+            oCommand.Parameters.Add("EXPIRES_WARNING_WHEN_DAYS", SqlDbType.Int).Value = pEnvelope.ExpiresWarningWhenDays
+            oCommand.Parameters.Add("FIRST_REMINDER_DAYS", SqlDbType.Int).Value = pEnvelope.FirstReminderDays
+            oCommand.Parameters.Add("FINAL_EMAIL_TO_CREATOR", SqlDbType.Int).Value = pEnvelope.FinalEmailToCreator
+            oCommand.Parameters.Add("FINAL_EMAIL_TO_RECEIVERS", SqlDbType.Int).Value = pEnvelope.FinalEmailToReceivers
+            oCommand.Parameters.Add("REMINDER_INTERVAL_DAYS", SqlDbType.Int).Value = pEnvelope.ReminderIntervalDays
+            oCommand.Parameters.Add("SEND_REMINDER_EMAILS", SqlDbType.Bit).Value = pEnvelope.SendReminderEmails
+            oCommand.Parameters.Add("USE_ACCESS_CODE", SqlDbType.Bit).Value = pEnvelope.UseAccessCode
+            oCommand.Parameters.Add("TFA_ENABLED", SqlDbType.Bit).Value = pEnvelope.TFA_Enabled
             Return Database.ExecuteNonQuery(oCommand, pTransaction)
 
         Catch ex As Exception
@@ -172,7 +226,7 @@ Public Class EnvelopeModel
     Public Function Delete(pEnvelope As Envelope, pTransaction As SqlTransaction) As Boolean
         Try
             Dim oSql = $"DELETE FROM [dbo].[TBSIG_ENVELOPE] WHERE GUID = {pEnvelope.Id}"
-            'Return Database.ExecuteNonQuery(oSql, pTransaction)
+            Return Database.ExecuteNonQuery(oSql, pTransaction)
 
         Catch ex As Exception
             Return False