feat(DTOExtension): Erweiterungsmethode hinzugefügt, um totp direkt über Receiver zu prüfen

- IsValidTotp Erweiterung hinzugefügt, um die totp zu überprüfen.

EnvelopeGenerator.Application/Configurations/CodeGeneratorParams.cs

@@ -0,0 +1,19 @@
+namespace EnvelopeGenerator.Application.Configurations
+{
+    public class CodeGeneratorParams
+    {
+        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/EnvelopeReceiverCacheParams.cs

@@ -0,0 +1,19 @@
+namespace EnvelopeGenerator.Application.Configurations
+{
+    public class EnvelopeReceiverCacheParams
+    {
+        /// <summary>
+        /// Gets the cache key format for SMS codes.
+        /// The placeholder {0} represents the envelopeReceiverId.
+        /// </summary>
+        public string CodeCacheKeyFormat { get; init; } = "sms-code-{0}";
+
+        /// <summary>
+        /// Gets the cache expiration key format for SMS codes.
+        /// The placeholder {0} represents the envelopeReceiverId.
+        /// </summary>
+        public string CodeExpirationCacheKeyFormat { get; init; } = "sms-code-expiration-{0}";
+
+        public TimeSpan CodeCacheValidityPeriod { get; init; } = new(0, 5, 0);
+    }
+}

EnvelopeGenerator.Application/Configurations/GtxMessaging/SmsParams.cs

@@ -0,0 +1,25 @@
+using DigitalData.Core.Abstractions.Client;
+using Microsoft.Extensions.Caching.Distributed;
+
+namespace EnvelopeGenerator.Application.Configurations.GtxMessaging
+{
+    /// <summary>
+    /// https://www.gtx-messaging.com/en/api-docs/sms-rest-api/
+    /// </summary>
+    public class SmsParams : 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";
+
+        public int CodeLength { get; init; } = 5;
+    }
+}

EnvelopeGenerator.Application/Contracts/ICodeGenerator.cs

@@ -0,0 +1,13 @@
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface ICodeGenerator
+    {
+        string GenerateCode(int length);
+
+        public string GenerateTotpSecretKey(int? length = null);
+
+        public byte[] GenerateTotpQrCode(string userEmail, string secretKey, string? issuer = null, string? totpUrlFormat = null, int? pixelsPerModule = null);
+
+        public byte[] GenerateTotpQrCode(string userEmail, int? length = null, string? issuer = null, string? totpUrlFormat = null, int? pixelsPerModule = null);
+    }
+}

EnvelopeGenerator.Application/Contracts/IEnvelopeMailService.cs

@@ -8,10 +8,12 @@ namespace EnvelopeGenerator.Application.Contracts
 {
     public interface IEnvelopeMailService : IEmailOutService
     {
-        Task<DataResult<int>> SendAsync(EnvelopeReceiverDto envelopeReceiverDto, Constants.EmailTemplateType tempType);
+        Task<DataResult<int>> SendAsync(EnvelopeReceiverDto envelopeReceiverDto, Constants.EmailTemplateType tempType, Dictionary<string, object>? optionalPlaceholders = null);
 
-        Task<DataResult<int>> SendAsync(EnvelopeReceiverReadOnlyDto dto);
+        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/IEnvelopeReceiverCache.cs

@@ -0,0 +1,17 @@
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IEnvelopeReceiverCache
+    {
+        Task<string?> GetSmsCodeAsync(string envelopeReceiverId);
+
+        /// <summary>
+        /// Asynchronously stores an SMS verification code in the cache and returns the expiration date of the code.
+        /// </summary>
+        /// <param name="envelopeReceiverId">The unique identifier for the recipient of the envelope to associate with the SMS code.</param>
+        /// <param name="code">The SMS verification code to be stored.</param>
+        /// <returns>A task that represents the asynchronous operation. The task result contains the expiration date and time of the stored SMS code.</returns>
+        Task<DateTime> SetSmsCodeAsync(string envelopeReceiverId, string code);
+
+        Task<DateTime?> GetSmsCodeExpirationAsync(string envelopeReceiverId);
+    }
+}

EnvelopeGenerator.Application/Contracts/IEnvelopeReceiverService.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstractions.Application;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
-using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Application.DTOs.Messaging;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Contracts
@@ -9,15 +9,17 @@ 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);
+        Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false, bool readOnly = true);
 
-        Task<DataResult<IEnumerable<EnvelopeReceiverSecretDto>>> ReadSecretByUuidAsync(string uuid, bool withEnvelope = false, bool withReceiver = 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);
+        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);
+        Task<DataResult<EnvelopeReceiverDto>> ReadByUuidSignatureAsync(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);
+        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);
         
@@ -30,5 +32,7 @@ namespace EnvelopeGenerator.Application.Contracts
         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/IMessagingService.cs

@@ -0,0 +1,13 @@
+using EnvelopeGenerator.Application.DTOs.Messaging;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IMessagingService
+    {
+        string ServiceProvider { get; }
+
+        Task<SmsResponse> SendSmsAsync(string recipient, string message);
+
+        Task<SmsResponse> SendSmsCodeAsync(string recipient, string envelopeReceiverId);
+    }
+}

EnvelopeGenerator.Application/Contracts/IReceiverService.cs

@@ -1,4 +1,5 @@
-using DigitalData.Core.Abstractions.Application;
+using DigitalData.Core.Abstractions;
+using DigitalData.Core.Abstractions.Application;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Domain.Entities;
@@ -7,8 +8,10 @@ namespace EnvelopeGenerator.Application.Contracts
 {
     public interface IReceiverService : ICRUDService<ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>
     {
-        public Task<DataResult<ReceiverReadDto>> ReadByAsync(string? emailAddress = null, string? signature = null);
+        Task<DataResult<ReceiverReadDto>> ReadByAsync(string? emailAddress = null, string? signature = null);
 
-        public Task<Result> DeleteByAsync(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/DIExtensions.cs

@@ -1,63 +0,0 @@
-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;
-
-namespace EnvelopeGenerator.Application
-{
-    public static class DIExtensions
-    {
-        public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, IConfiguration dispatcherConfigSection, IConfiguration mailConfigSection)
-        {
-            //Inject CRUD Service and repositoriesad
-            services.AddScoped<IConfigRepository, ConfigRepository>();
-            services.AddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
-            services.AddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
-            services.AddScoped<IConfigRepository, ConfigRepository>();
-            services.AddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
-            services.AddScoped<IDocumentStatusRepository, DocumentStatusRepository>();
-            services.AddScoped<IEmailTemplateRepository, EmailTemplateRepository>();
-            services.AddScoped<IEnvelopeRepository, EnvelopeRepository>();
-            services.AddScoped<IEnvelopeCertificateRepository, EnvelopeCertificateRepository>();
-            services.AddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
-            services.AddScoped<IEnvelopeHistoryRepository, EnvelopeHistoryRepository>();
-            services.AddScoped<IEnvelopeReceiverRepository, EnvelopeReceiverRepository>();
-            services.AddScoped<IEnvelopeTypeRepository, EnvelopeTypeRepository>();
-            services.AddScoped<IReceiverRepository, ReceiverRepository>();
-            services.AddScoped<IUserReceiverRepository, UserReceiverRepository>();
-            services.AddScoped<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyRepository>();
-            services.AddScoped<IConfigService, ConfigService>();
-            services.AddScoped<IDocumentReceiverElementService, DocumentReceiverElementService>();
-            services.AddScoped<IEnvelopeDocumentService, EnvelopeDocumentService>();
-            services.AddScoped<IEnvelopeHistoryService, EnvelopeHistoryService>();
-            services.AddScoped<IDocumentStatusService, DocumentStatusService>();
-            services.AddScoped<IEmailTemplateService, EmailTemplateService>();
-            services.AddScoped<IEnvelopeService, EnvelopeService>();
-            services.AddScoped<IEnvelopeCertificateService, EnvelopeCertificateService>();
-            services.AddScoped<IEnvelopeDocumentService, EnvelopeDocumentService>();
-            services.AddScoped<IEnvelopeReceiverService, EnvelopeReceiverService>();
-            services.AddScoped<IEnvelopeTypeService, EnvelopeTypeService>();
-            services.AddScoped<IReceiverService, ReceiverService>();
-            services.AddScoped<IUserReceiverService, UserReceiverService>();
-            services.AddScoped<IEnvelopeReceiverReadOnlyService, EnvelopeReceiverReadOnlyService>();
-
-            //Auto mapping profiles
-            services.AddAutoMapper(typeof(BasicDtoMappingProfile).Assembly);
-            services.AddAutoMapper(typeof(UserMappingProfile).Assembly);
-
-            services.Configure<DispatcherConfig>(dispatcherConfigSection);
-            services.Configure<MailConfig>(mailConfigSection);
-
-            return services;
-        }
-
-        public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, IConfiguration config) => services.AddEnvelopeGenerator(
-            dispatcherConfigSection: config.GetSection("DispatcherConfig"),
-            mailConfigSection: config.GetSection("MailConfig"));
-    }
-}

EnvelopeGenerator.Application/DTOs/ConfigDto.cs

@@ -1,4 +1,5 @@
 using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
 namespace EnvelopeGenerator.Application.DTOs
@@ -8,11 +9,9 @@ namespace EnvelopeGenerator.Application.DTOs
         int SendingProfile,
         string SignatureHost,
         string ExternalProgramName,
-        string ExportPath,
-        string DocumentPathDmz,
-        string ExportPathDmz,
-        string DocumentPathMoveAftsend) : IUnique<int>
+        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/EnvelopeDocumentDto.cs

@@ -7,6 +7,7 @@ namespace EnvelopeGenerator.Application.DTOs
         int Id,
         int EnvelopeId,
         DateTime AddedWhen,
-        IEnumerable<DocumentReceiverElementDto>? Elements
+        byte[]? ByteData = null,
+        IEnumerable<DocumentReceiverElementDto>? Elements = null
     ) : IUnique<int>;
 }

EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverBasicDto.cs

@@ -25,5 +25,9 @@ namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
         public DateTime AddedWhen { get; init; }
 
         public DateTime? ChangedWhen { get; init; }
+
+        public bool HasPhoneNumber { get; init; }
+
+        public bool TFAEnabled { get; init; }
     }
 }

EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverSecretDto.cs

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

EnvelopeGenerator.Application/DTOs/Messaging/SmsResponse.cs

@@ -0,0 +1,19 @@
+namespace EnvelopeGenerator.Application.DTOs.Messaging
+{
+    public record SmsResponse
+    {
+        public required bool Ok { get; init; }
+
+        public DateTime? Expiration { get; set; }
+
+        public DateTime? AllowedAt { get; set; }
+
+        public TimeSpan AllowedAfter => Allowed ? TimeSpan.Zero : AllowedAt!.Value - DateTime.Now;
+
+        public bool Allowed => AllowedAt is null || DateTime.Now >= AllowedAt;
+
+        public bool Error => !Ok && Allowed;
+
+        public dynamic? Errors { get; init; }
+    }
+}

EnvelopeGenerator.Application/DTOs/Receiver/ReceiverCreateDto.cs

@@ -4,7 +4,7 @@ using System.Text;
 
 namespace EnvelopeGenerator.Application.DTOs.Receiver
 {
-    public record ReceiverCreateDto([EmailAddress] string EmailAddress)
+    public record ReceiverCreateDto([EmailAddress] string EmailAddress, string? TotpSecretkey = null, DateTime? TotpExpiration = null)
     {
         public string Signature => sha256HexOfMail.Value;
 

EnvelopeGenerator.Application/DTOs/Receiver/ReceiverReadDto.cs

@@ -1,4 +1,6 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstractions;
+using DigitalData.Core.DTO;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using System.Text.Json.Serialization;
 
@@ -8,12 +10,17 @@ namespace EnvelopeGenerator.Application.DTOs.Receiver
         int Id,
         string EmailAddress,
         string Signature,
-        DateTime AddedWhen       
-        ) : BaseDTO<int>(Id)
+        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;
+
+        [TemplatePlaceholder("[TFA_QR_EXPIRATION]")]
+        public DateTime? TotpExpiration { get; set; } = null;
     };
 }

EnvelopeGenerator.Application/DTOs/Receiver/ReceiverUpdateDto.cs

@@ -2,5 +2,5 @@
 
 namespace EnvelopeGenerator.Application.DTOs.Receiver
 {
-    public record ReceiverUpdateDto(int Id) : IUnique<int>;
-}
+    public record ReceiverUpdateDto(int Id, string? TotpSecretkey = null, DateTime? TotpExpiration = null) : IUnique<int>;
+} 

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -12,11 +12,14 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+    <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="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>

EnvelopeGenerator.Application/Extensions/CacheExtensions.cs

@@ -0,0 +1,82 @@
+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)
+            => options is null
+                ? cache.SetAsync(key, BitConverter.GetBytes(value))
+                : cache.SetAsync(key, BitConverter.GetBytes(value), options: options);
+
+        public static async Task<long?> GetLongAsync(this IDistributedCache cache, string key)
+        {
+            var value = await cache.GetAsync(key);
+            return value is null ? null : BitConverter.ToInt64(value, 0);
+        }
+
+        public static Task SetDateTimeAsync(this IDistributedCache cache, string key, DateTime value, DistributedCacheEntryOptions? options = null)
+            => cache.SetLongAsync(key: key, value: value.Ticks, options: options);
+
+        public static async Task<DateTime?> GetDateTimeAsync(this IDistributedCache cache, string key)
+        {
+            var value = await cache.GetAsync(key);
+            return value is null ? null : new(BitConverter.ToInt64(value, 0));
+        }
+
+        public static Task SetTimeSpanAsync(this IDistributedCache cache, string key, TimeSpan value, DistributedCacheEntryOptions? options = null)
+            => cache.SetLongAsync(key: key, value: value.Ticks, options: options);
+
+        public static async Task<TimeSpan?> GetTimeSpanAsync(this IDistributedCache cache, string key)
+        {
+            var value = await cache.GetAsync(key);
+            return value is null ? null : new(BitConverter.ToInt64(value, 0));
+        }
+
+        public static string GetOrSet(this IDistributedCache cache, string key, Func<string> factory, DistributedCacheEntryOptions? options = null, bool cacheInBackground = false, CancellationToken token = default)
+        {
+            var value = cache.GetString(key);
+            if (value is null)
+            {
+                // create new and save
+                value = factory();
+
+                void Cache()
+                {
+                    if (options is null)
+                        cache.SetString(key: key, value: value);
+                    else
+                        cache.SetString(key: key, value: value, options: options);
+                }
+
+                if (cacheInBackground)
+                    _ = Task.Run(() => Cache(), token);
+                else
+                    Cache();
+            }
+
+            return value;
+        }
+
+        public static async Task<string> GetOrSetAsync(this IDistributedCache cache, string key, Func<Task<string>> factory, DistributedCacheEntryOptions? options = null, bool cacheInBackground = false, CancellationToken token = default)
+        {
+            var value = await cache.GetStringAsync(key, token: token);
+            if(value is null)
+            {
+                // create new and save
+                value = await factory();
+
+                Task CacheAsync() => options is null
+                    ? cache.SetStringAsync(key: key, value: value, token: token)
+                    : cache.SetStringAsync(key: key, value: value, options: options, token: token);
+
+                if (cacheInBackground)
+                    _ = Task.Run(async () => await CacheAsync(), token);
+                else
+                    await CacheAsync();
+            }
+
+            return value;
+        }
+    }
+}

EnvelopeGenerator.Application/Extensions/DIExtensions.cs

@@ -0,0 +1,78 @@
+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 EnvelopeGenerator.Application.Configurations.GtxMessaging;
+using QRCoder;
+
+namespace EnvelopeGenerator.Application.Extensions
+{
+    public static class DIExtensions
+    {
+        public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, IConfigurationSection dispatcherConfigSection, IConfigurationSection mailConfigSection, IConfigurationSection smsConfigSection, IConfigurationSection codeGeneratorConfigSection, IConfigurationSection envelopeReceiverCacheParamsSection)
+        {
+            //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<DispatcherConfig>(dispatcherConfigSection);
+            services.Configure<MailConfig>(mailConfigSection);
+            services.Configure<CodeGeneratorParams>(codeGeneratorConfigSection);
+            services.Configure<EnvelopeReceiverCacheParams>(envelopeReceiverCacheParamsSection);
+
+            services.AddHttpClientService<SmsParams>(smsConfigSection);
+            services.TryAddSingleton<IMessagingService, GtxMessagingService>();
+            services.TryAddSingleton<ICodeGenerator, CodeGenerator>();
+            services.TryAddSingleton<IEnvelopeReceiverCache, EnvelopeReceiverCache>();
+            services.TryAddSingleton<QRCodeGenerator>();
+
+            return services;
+        }
+
+        public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, IConfiguration config) => services.AddEnvelopeGenerator(
+            dispatcherConfigSection: config.GetSection("DispatcherConfig"),
+            mailConfigSection: config.GetSection("MailConfig"),
+            smsConfigSection: config.GetSection("SmsConfig"),
+            codeGeneratorConfigSection: config.GetSection("CodeGeneratorParams"),
+            envelopeReceiverCacheParamsSection: config.GetSection("EnvelopeReceiverCacheParams"));
+    }
+}

EnvelopeGenerator.Application/Extensions/DTOExtensions.cs

@@ -0,0 +1,22 @@
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Extensions;
+using Newtonsoft.Json;
+
+namespace EnvelopeGenerator.Application.Extensions
+{
+    public static class DTOExtensions
+    {
+        public static bool IsTotpSecretExpired(this ReceiverReadDto dto, int minutesBeforeExpiration = 30)
+            => dto.TotpExpiration < DateTime.Now.AddMinutes(minutesBeforeExpiration * -1);
+
+        public static bool IsTotpSecretInvalid(this ReceiverReadDto dto, int minutesBeforeExpiration = 30)
+            => dto.IsTotpSecretExpired(minutesBeforeExpiration) || dto.TotpSecretkey is null;
+
+        public static bool IsTotpSecretValid(this ReceiverReadDto dto, int minutesBeforeExpiration = 30)
+            => !dto.IsTotpSecretInvalid(minutesBeforeExpiration);
+
+        public static bool IsTotpValid(this ReceiverReadDto dto, string totp) => dto.TotpSecretkey is null ? throw new ArgumentNullException(nameof(dto), $"TotpSecretkey of DTO cannot validate without TotpSecretkey. Dto: {JsonConvert.SerializeObject(dto)}") : totp.IsValidTotp(dto.TotpSecretkey);
+
+        public static bool IsTotpInvalid(this ReceiverReadDto dto, string totp) => !dto.IsTotpValid(totp: totp);
+    }
+}

EnvelopeGenerator.Application/Extensions/MappingExtensions.cs

@@ -0,0 +1,14 @@
+using EnvelopeGenerator.Domain.HttpResponse;
+
+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

@@ -14,6 +14,7 @@
         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

@@ -3,8 +3,11 @@ 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;
+using EnvelopeGenerator.Domain.HttpResponse;
 
 namespace EnvelopeGenerator.Application.MappingProfiles
 {
@@ -43,13 +46,20 @@ namespace EnvelopeGenerator.Application.MappingProfiles
             CreateMap<EnvelopeHistoryCreateDto, EnvelopeHistory>();
             CreateMap<EnvelopeReceiverDto, EnvelopeReceiver>();
             CreateMap<EnvelopeTypeDto, EnvelopeType>();
-            CreateMap<ReceiverReadDto, Receiver>();
+            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.de-DE.resx

@@ -156,27 +156,63 @@
   <data name="Hello" xml:space="preserve">
     <value>Hallo</value>
   </data>
-  <data name="LocakedOpen" xml:space="preserve">
-    <value>Öffnen</value>
+  <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="LockedAccessCode" xml:space="preserve">
-    <value>Zugriffscode</value>
-  </data>
-  <data name="LockedBody" xml:space="preserve">
+  <data name="LockedBodyAccess" xml:space="preserve">
     <value>Wir haben Ihnen gerade den Zugriffscode an die hinterlegte Email Adresse gesendet. Dies kann evtl. einige Minuten dauern.</value>
   </data>
-  <data name="LockedFooterBody" xml:space="preserve">
+  <data name="LockedBodyAuthenticator" xml:space="preserve">
+    <value>Ihr QR-Code ist bis {0} gültig.</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 bitten, Ihnen den Code auf anderem Wege zukommen zu lassen.</value>
   </data>
-  <data name="LockedFooterTitle" xml:space="preserve">
+  <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="LockedTitle" xml:space="preserve">
+  <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>
@@ -213,6 +249,9 @@
   <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>

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

@@ -156,27 +156,63 @@
   <data name="Hello" xml:space="preserve">
     <value>Hello</value>
   </data>
-  <data name="LocakedOpen" xml:space="preserve">
-    <value>Open</value>
+  <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="LockedAccessCode" xml:space="preserve">
-    <value>Access Code</value>
-  </data>
-  <data name="LockedBody" xml:space="preserve">
+  <data name="LockedBodyAccess" xml:space="preserve">
     <value>We have just sent you the access code to the email address you provided. This may take a few minutes.</value>
   </data>
-  <data name="LockedFooterBody" xml:space="preserve">
+  <data name="LockedBodyAuthenticator" xml:space="preserve">
+    <value>Your QR code is valid until {0}.</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 your spam folder. Furthermore, you can also ask the sender to send the code by other means.</value>
   </data>
-  <data name="LockedFooterTitle" xml:space="preserve">
+  <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="LockedTitle" xml:space="preserve">
+  <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>
@@ -213,6 +249,9 @@
   <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>

EnvelopeGenerator.Application/Services/CodeGenerator.cs

@@ -0,0 +1,66 @@
+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 CodeGenerator : ICodeGenerator
+    {
+        public static Lazy<CodeGenerator> LazyStatic => new(() => new CodeGenerator(Options.Create<CodeGeneratorParams>(new()), new QRCodeGenerator()));
+
+        public static CodeGenerator Static => LazyStatic.Value;
+
+        private readonly CodeGeneratorParams _params;
+
+        private readonly QRCodeGenerator _qrCodeGenerator;
+
+        public CodeGenerator(IOptions<CodeGeneratorParams> 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);
+        }
+    }
+}

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -12,6 +12,8 @@ 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
 {
@@ -22,17 +24,19 @@ namespace EnvelopeGenerator.Application.Services
 		private readonly DispatcherConfig _dConfig;
 		private readonly IConfigService _configService;
 		private readonly Dictionary<string, string> _placeholders;
+		private readonly ICodeGenerator _codeGenerator;
 
-		public EnvelopeMailService(IEmailOutRepository repository, IMapper mapper, IEmailTemplateService tempService, IEnvelopeReceiverService envelopeReceiverService, IOptions<DispatcherConfig> dispatcherConfigOptions, IConfigService configService, IOptions<MailConfig> mailConfig) : base(repository, mapper)
+        public EnvelopeMailService(IEmailOutRepository repository, IMapper mapper, IEmailTemplateService tempService, IEnvelopeReceiverService envelopeReceiverService, IOptions<DispatcherConfig> dispatcherConfigOptions, IConfigService configService, IOptions<MailConfig> mailConfig, ICodeGenerator codeGenerator) : base(repository, mapper)
         {
             _tempService = tempService;
 			_envRcvService = envelopeReceiverService;
 			_dConfig = dispatcherConfigOptions.Value;
 			_configService = configService;
 			_placeholders = mailConfig.Value.Placeholders;
+			_codeGenerator = codeGenerator;
         }
 
-		private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? envelopeReceiverDto = null, EnvelopeReceiverReadOnlyDto? readOnlyDto = null)
+		private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? envelopeReceiverDto = null)
 		{
 			if (accessCode is not null)
                 _placeholders["[DOCUMENT_ACCESS_CODE]"] = accessCode;
@@ -63,10 +67,8 @@ namespace EnvelopeGenerator.Application.Services
 
             return _placeholders;
         }
-
-        public async Task<DataResult<int>> SendAccessCodeAsync(EnvelopeReceiverDto dto) => await SendAsync(dto: dto, tempType: Constants.EmailTemplateType.DocumentAccessCodeReceived);
-
-        public async Task<DataResult<int>> SendAsync(EnvelopeReceiverDto dto, Constants.EmailTemplateType tempType)
+		
+        public async Task<DataResult<int>> SendAsync(EnvelopeReceiverDto dto, EmailTemplateType tempType, Dictionary<string, object>? optionalPlaceholders = null)
         {
 			var tempSerResult = await _tempService.ReadByNameAsync(tempType);
 			if (tempSerResult.IsFailed)
@@ -104,14 +106,19 @@ namespace EnvelopeGenerator.Application.Services
 			
 			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)
+		public async Task<DataResult<int>> SendAsync(EnvelopeReceiverReadOnlyDto dto, Dictionary<string, object>? optionalPlaceholders = null)
 		{
-            var tempSerResult = await _tempService.ReadByNameAsync(Constants.EmailTemplateType.DocumentShared);
+            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;
@@ -140,7 +147,32 @@ namespace EnvelopeGenerator.Application.Services
 
             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)}");
+            if (dto.Receiver.TotpExpiration is null)
+                throw new ArgumentNullException(nameof(dto), $"TFA Qr Code cannot sent. Receiver.TotpExpiration is null. Envelope receiver dto is {JsonConvert.SerializeObject(dto)}");
+
+            var totp_qr_64 = _codeGenerator.GenerateTotpQrCode(userEmail: dto.Receiver.EmailAddress, secretKey: dto.Receiver.TotpSecretkey).ToBase64String();
+            return SendAsync(dto, EmailTemplateType.TotpSecret, new()
+			{
+				{"[TFA_QR_CODE]", totp_qr_64 },
+				{"[TFA_EXPIRATION]", dto.Receiver.TotpExpiration }
+			});
+        }
     }
 }

EnvelopeGenerator.Application/Services/EnvelopeReceiverCache.cs

@@ -0,0 +1,50 @@
+using AngleSharp.Dom;
+using EnvelopeGenerator.Application.Configurations;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.Extensions;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Options;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class EnvelopeReceiverCache : IEnvelopeReceiverCache
+    {
+        private readonly EnvelopeReceiverCacheParams _cacheParams;
+
+        private readonly DistributedCacheEntryOptions _codeCacheOptions;
+
+        private readonly IDistributedCache _cache;
+
+        public EnvelopeReceiverCache(IOptions<EnvelopeReceiverCacheParams> cacheParamOptions, IDistributedCache cache)
+        {
+            _cacheParams = cacheParamOptions.Value;
+            _codeCacheOptions = new() { AbsoluteExpirationRelativeToNow = cacheParamOptions.Value.CodeCacheValidityPeriod };
+            _cache = cache;
+        }
+
+        public async Task<string?> GetSmsCodeAsync(string envelopeReceiverId)
+        {
+            var code_key = string.Format(_cacheParams.CodeCacheKeyFormat, envelopeReceiverId);
+            return await _cache.GetStringAsync(code_key);
+        }
+
+        public async Task<DateTime> SetSmsCodeAsync(string envelopeReceiverId, string code)
+        {
+            // set key
+            var code_key = string.Format(_cacheParams.CodeCacheKeyFormat, envelopeReceiverId);
+            await _cache.SetStringAsync(code_key, code, _codeCacheOptions);
+
+            // set expiration
+            var code_expiration_key = string.Format(_cacheParams.CodeExpirationCacheKeyFormat, envelopeReceiverId);
+            var expiration = DateTime.Now + _cacheParams.CodeCacheValidityPeriod;
+            await _cache.SetDateTimeAsync(code_expiration_key, expiration, _codeCacheOptions);
+            return expiration;
+        }
+
+        public async Task<DateTime?> GetSmsCodeExpirationAsync(string envelopeReceiverId)
+        {
+            var code_expiration_key = string.Format(_cacheParams.CodeExpirationCacheKeyFormat, envelopeReceiverId);
+            return await _cache.GetDateTimeAsync(code_expiration_key);
+        }
+    }
+}

EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs

@@ -9,6 +9,7 @@ using EnvelopeGenerator.Infrastructure.Contracts;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using EnvelopeGenerator.Extensions;
+using EnvelopeGenerator.Application.DTOs.Messaging;
 
 namespace EnvelopeGenerator.Application.Services
 {
@@ -16,33 +17,36 @@ namespace EnvelopeGenerator.Application.Services
     {
         private readonly IStringLocalizer<Resource> _localizer;
 
-        public EnvelopeReceiverService(IEnvelopeReceiverRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper)
+        private readonly IMessagingService _messagingService;
+
+        public EnvelopeReceiverService(IEnvelopeReceiverRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper, IMessagingService messagingService)
             : base(repository, mapper)
         {
             _localizer = localizer;
+            _messagingService = messagingService;
         }
 
-        public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true)
+        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);
+            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)
+        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);
+            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<EnvelopeReceiverSecretDto>>> ReadSecretByUuidAsync(string uuid, bool withEnvelope = false, bool withReceiver = true)
+        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(_mapper.Map<IEnumerable<EnvelopeReceiverSecretDto>>(env_rcvs));
+            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)
+        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);
+            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);
@@ -50,7 +54,17 @@ namespace EnvelopeGenerator.Application.Services
             return Result.Success(_mapper.Map<EnvelopeReceiverDto>(env_rcv));
         }
 
-        public async Task<DataResult<EnvelopeReceiverDto>> ReadByEnvelopeReceiverIdAsync(string envelopeReceiverId, bool withEnvelope = true, bool withReceiver = true)
+        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();
 
@@ -61,7 +75,7 @@ namespace EnvelopeGenerator.Application.Services
                     .Notice(LogLevel.Warning, EnvelopeFlag.WrongEnvelopeReceiverId)
                     .Notice(LogLevel.Warning, Flag.PossibleSecurityBreach);
 
-            return await ReadByUuidSignatureAsync(uuid: uuid, signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver);
+            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)
@@ -135,5 +149,31 @@ namespace EnvelopeGenerator.Application.Services
             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 _messagingService.SendSmsAsync(recipient: env_rcv.PhoneNumber, message: message);
+
+            return Result.Success(res);
+        }
     }
 }

EnvelopeGenerator.Application/Services/GTXMessagingService.cs

@@ -0,0 +1,70 @@
+using AutoMapper;
+using DigitalData.Core.Abstractions.Client;
+using DigitalData.Core.Client;
+using EnvelopeGenerator.Application.Configurations.GtxMessaging;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs.Messaging;
+using EnvelopeGenerator.Application.Extensions;
+using EnvelopeGenerator.Domain.HttpResponse;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Options;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class GtxMessagingService : IMessagingService
+    {
+        private readonly IHttpClientService<SmsParams> _smsClient;
+
+        private readonly SmsParams _smsParams;
+
+        private readonly IMapper _mapper;
+
+        private readonly ICodeGenerator _codeGen;
+
+        private readonly IEnvelopeReceiverCache _erCache;
+
+        public string ServiceProvider { get; }
+
+        public GtxMessagingService(IHttpClientService<SmsParams> smsClient, IOptions<SmsParams> smsParamsOptions, IMapper mapper, ICodeGenerator codeGenerator, IEnvelopeReceiverCache envelopeReceiverCache)
+        {
+            _smsClient = smsClient;
+            _smsParams = smsParamsOptions.Value;
+            _mapper = mapper;
+            ServiceProvider = GetType().Name.Replace("Service", string.Empty);
+            _codeGen = codeGenerator;
+            _erCache = envelopeReceiverCache;
+        }
+
+        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>);
+        }
+
+        public async Task<SmsResponse> SendSmsCodeAsync(string recipient, string envelopeReceiverId)
+        {
+            var code = await _erCache.GetSmsCodeAsync(envelopeReceiverId);
+
+            if (code is null)
+            {
+                code = _codeGen.GenerateCode(_smsParams.CodeLength);                                
+                var expiration = await _erCache.SetSmsCodeAsync(envelopeReceiverId, code);                
+                var res = await SendSmsAsync(recipient: recipient, message: code);
+                res.Expiration = expiration;
+                return res;
+            }
+            else
+            {
+                var code_expiration = await _erCache.GetSmsCodeExpirationAsync(envelopeReceiverId);
+                return code_expiration is null
+                    ? new() { Ok = false }
+                    : new() { Ok = false, AllowedAt = code_expiration };
+            }
+        }
+    }
+}

EnvelopeGenerator.Application/Services/ReceiverService.cs

@@ -5,6 +5,8 @@ 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
 {
@@ -34,5 +36,17 @@ namespace EnvelopeGenerator.Application.Services
 
             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.Common/Constants.vb

@@ -18,6 +18,7 @@
         AccessCodeIncorrect = 2003
         DocumentOpened = 2004
         DocumentSigned = 2005
+        DocumentForwarded = 4001
         SignatureConfirmed = 2006
         DocumentRejected = 2007
         EnvelopeShared = 2008
@@ -77,7 +78,7 @@
 
     Public Enum CertificationType
         ElectronicSignature = 1
-        QualifiedSignature = 2
+        'QualifiedSignature = 2
     End Enum
 
     Public Enum FinalEmailType
@@ -98,12 +99,15 @@
         DocumentCompleted
         DocumentAccessCodeReceived
         DocumentShared
+        TotpSecret
     End Enum
 
     Public Enum EncodeType
         EnvelopeReceiver
         EnvelopeReceiverReadOnly
         Undefined
+        DocumentForwarded
+        DocumentShared
     End Enum
 
 #End Region
@@ -119,4 +123,4 @@
     Public Const RED_300 = "#fecaca"
     Public Const ORANGE_300 = "#fed7aa"
 #End Region
-End Class
+End Class

EnvelopeGenerator.Common/Entities/DbConfig.vb

@@ -1,15 +1,8 @@
 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 DocumentPath_DMZ As String = ""
-    Public Property ExportPath_DMZ As String = ""
-    Public Property DOCUMENT_PATH_MOVE_AFTSEND As String = ""
-    Public Property FINISHED_PATH_EX_DMZ As String = ""
-    Public Property EML_PATH_EX_DMZ As String = ""
     Public Property SendingProfile As Integer = 0
     Public Property SignatureHost As String = ""
-    Public Property NetUse_necessary As Boolean = False
-    Public Property NetUse_Finish As Boolean = False
 End Class

EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj

@@ -260,11 +260,13 @@
       <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>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Model.Designer.vb</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>

EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -82,49 +82,14 @@ Namespace Jobs
 
                 Logger.Debug("Loading ReportCreator..")
                 ReportCreator = New ReportCreator(LogConfig, oState)
-                Logger.Debug("My.Settings.RuninDMZ: [{0}]", My.Settings.RuninDMZ.ToString)
-                Logger.Debug("My.Settings.NetUse_Usr: [{0}]", My.Settings.NetUse_Usr)
 
+                Config.DocumentPath = Config.DocumentPath
 
-                If My.Settings.RuninDMZ = True Then
-                    If Config.DocumentPath_DMZ <> String.Empty Then
-                        Logger.Debug("RuninDMZ - Using DocumentPath_DMZ: [{0}] - Overwrite Document-Path", Config.DocumentPath_DMZ)
-                        Config.DocumentPath = Config.DocumentPath_DMZ
-                        Config.NetUse_necessary = True
-                    Else
-                        Config.DocumentPath = Config.DocumentPath
-                    End If
-                Else
-                    If Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
-                        Logger.Debug("Using DMZRemotePath: [{0}] - Overwrite Document-Path ...", Config.DOCUMENT_PATH_MOVE_AFTSEND)
-                        Config.DocumentPath = Config.DOCUMENT_PATH_MOVE_AFTSEND
-                        Config.NetUse_Finish = True
-
-                    Else
-                        Config.DocumentPath = Config.DocumentPath
-                    End If
-                End If
                 Logger.Debug("DocumentPath: [{0}]", Config.DocumentPath)
 
-                If My.Settings.RuninDMZ = True Then
-                    If Config.FINISHED_PATH_EX_DMZ <> String.Empty Then
-                        Logger.Debug("RuninDMZ - FINISHED_PATH_EX_DMZ configured: [{0}]", Config.FINISHED_PATH_EX_DMZ)
-                        Config.NetUse_Finish = True
-                    End If
-                    If Config.ExportPath_DMZ <> String.Empty Then
-                        Logger.Debug("RuninDMZ - Using ExportPath_DMZ: [{0}] - Overwrite ExportPath", Config.ExportPath_DMZ)
-                        Config.ExportPath = Config.ExportPath_DMZ
-                    End If
-                End If
 
                 Logger.Debug("ExportPath: [{0}]", Config.ExportPath)
 
-                If Config.NetUse_Finish = True Then
-                    If NetUse_Command(Config.DocumentPath, My.Settings.NetUse_Usr, My.Settings.NetUse_PW) = True Then
-                        Logger.Debug("NetUse_Finish = successful!")
-                    End If
-                End If
-
                 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)
@@ -157,10 +122,6 @@ Namespace Jobs
                             Logger.Warn("EnvelopeData could not be loaded for Id [{0}]!", oId)
                             Throw New ArgumentNullException("EnvelopeData")
                         End If
-                        If Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
-                            oEnvelopeData.DocumentPath.Replace(Config.DocumentPathOrigin, Config.DOCUMENT_PATH_MOVE_AFTSEND)
-                            Logger.Debug("Replaced Path in oEnvelopeData.DocumentPath!")
-                        End If
                         Logger.Debug("Burning Annotations to pdf ...")
                         Dim oBurnedDocument As Byte() = BurnAnnotationsToPdf(oEnvelopeData)
                         If oBurnedDocument Is Nothing Then
@@ -196,13 +157,6 @@ Namespace Jobs
                             Throw New ExportDocumentException("Could not export final document to disk!", ex)
                         End Try
 
-                        If Config.NetUse_Finish = True Then
-                            If Config.FINISHED_PATH_EX_DMZ <> String.Empty Then
-                                If My.Settings.NetUse_PW <> String.Empty And My.Settings.NetUse_Usr <> String.Empty Then
-                                    Clean_DNZ_PAth(Config.FINISHED_PATH_EX_DMZ)
-                                End If
-                            End If
-                        End If
                         Logger.Info("Writing EB-bytes to database...")
                         Update_File_DB(oOutputFilePath, oEnvelope.Id)
 
@@ -287,48 +241,48 @@ Namespace Jobs
             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
+        '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()
+        '    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
+        '        ' 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)
+        '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)
+        '    Logger.Debug("## Starting Clean_DNZ_PAth ...")
+        '    Logger.Debug("## pSourcePath {0}", pSourcePath)
 
-            Dim oDirectorySource = Path.Combine(pSourcePath, ParentFolderUID)
+        '    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
+        '    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
+        'End Function
         Private Function SendFinalEmails(pEnvelope As Envelope) As Boolean ', pAttachment As String
             Dim oMailToCreator = pEnvelope.FinalEmailToCreator
             Dim oMailToReceivers = pEnvelope.FinalEmailToReceivers
@@ -398,15 +352,7 @@ Namespace Jobs
             Dim oAnnotations = pEnvelopeData.AnnotationData
             Dim oInputPath = ""
             If IsNothing(pEnvelopeData.DocAsByte) Then
-                If My.Settings.RuninDMZ Then
-                    Logger.Debug("Replacing Path in pData.DocumentPath ...")
-                    oInputPath = pEnvelopeData.DocumentPath.Replace(Config.DocumentPathOrigin, Config.DocumentPath)
-                ElseIf Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
-                    Logger.Debug("Replacing Path in pData.DocumentPath ...")
-                    oInputPath = pEnvelopeData.DocumentPath.Replace(Config.DocumentPathOrigin, Config.DOCUMENT_PATH_MOVE_AFTSEND)
-                Else
-                    oInputPath = pEnvelopeData.DocumentPath
-                End If
+                oInputPath = pEnvelopeData.DocumentPath
                 Logger.Info($"Input path: [{oInputPath}]")
             Else
                 Logger.Info($"we got bytes..")

EnvelopeGenerator.Common/Models/ConfigModel.vb

@@ -16,17 +16,12 @@ Public Class ConfigModel
             Dim oRow As DataRow = oTable.Rows.Item(0)
 
             Return New DbConfig() With {
-                .DocumentPath = oRow.ItemEx("DOCUMENT_PATH", ""),
-               .DocumentPathOrigin = oRow.ItemEx("DOCUMENT_PATH", ""),
-                .DocumentPath_DMZ = oRow.ItemEx("DOCUMENT_PATH_DMZ", ""),
-                .ExportPath = oRow.ItemEx("EXPORT_PATH", ""),
-                .ExportPath_DMZ = oRow.ItemEx("EXPORT_PATH_DMZ", ""),
-                .SendingProfile = oRow.ItemEx("SENDING_PROFILE", 0),
-                .SignatureHost = oRow.ItemEx("SIGNATURE_HOST", ""),
-                .ExternalProgramName = oRow.ItemEx("EXTERNAL_PROGRAM_NAME", ""),
-                .DOCUMENT_PATH_MOVE_AFTSEND = oRow.ItemEx("DOCUMENT_PATH_MOVE_AFTSEND", ""),
-                .FINISHED_PATH_EX_DMZ = oRow.ItemEx("FINISHED_PATH_EX_DMZ", ""),
-                .EML_PATH_EX_DMZ = oRow.ItemEx("EML_PATH_EX_DMZ", "")
+              .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", "")
             }
         Catch ex As Exception
             Logger.Error(ex)

EnvelopeGenerator.Common/My Project/AssemblyInfo.vb

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

EnvelopeGenerator.Common/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -53,33 +53,6 @@ Namespace My
                 Return defaultInstance
             End Get
         End Property
-        
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
-        Public ReadOnly Property RuninDMZ() As Boolean
-            Get
-                Return CType(Me("RuninDMZ"),Boolean)
-            End Get
-        End Property
-        
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("dd-gan\Administrator")>  _
-        Public ReadOnly Property NetUse_Usr() As String
-            Get
-                Return CType(Me("NetUse_Usr"),String)
-            End Get
-        End Property
-        
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("sY4vnATDXwosbTJGip6SqA==")>  _
-        Public ReadOnly Property NetUse_PW() As String
-            Get
-                Return CType(Me("NetUse_PW"),String)
-            End Get
-        End Property
     End Class
 End Namespace
 

EnvelopeGenerator.Common/My Project/Settings.settings

@@ -1,15 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="true">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
   <Profiles />
-  <Settings>
-    <Setting Name="RuninDMZ" Type="System.Boolean" Scope="Application">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="NetUse_Usr" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">dd-gan\Administrator</Value>
-    </Setting>
-    <Setting Name="NetUse_PW" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">sY4vnATDXwosbTJGip6SqA==</Value>
-    </Setting>
-  </Settings>
+  <Settings />
 </SettingsFile>

EnvelopeGenerator.Common/Services/ActionService.vb

@@ -45,7 +45,7 @@ Public Class ActionService
         Return oSendResult
     End Function
     Public Function ResendReceiver(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
-        EmailService.SendDocumentReceivedEmail(pEnvelope, pReceiver)
+        Return EmailService.SendDocumentReceivedEmail(pEnvelope, pReceiver)
     End Function
 
 

EnvelopeGenerator.Common/Strings/Envelope.en.resx

@@ -138,6 +138,9 @@
   <data name="Document Could Not Be Saved" xml:space="preserve">
     <value>Document could not be saved!</value>
   </data>
+  <data name="Document forwarded" xml:space="preserve">
+    <value>Document forwarded to receiver: {0}</value>
+  </data>
   <data name="Edit Envelope" xml:space="preserve">
     <value>Edit Envelope</value>
   </data>
@@ -165,6 +168,9 @@
   <data name="Envelope-Editor" xml:space="preserve">
     <value>Envelope-Editor</value>
   </data>
+  <data name="Error email Validation" xml:space="preserve">
+    <value>The email  [ @Mail ] could not be varified!</value>
+  </data>
   <data name="Error sending the envelope" xml:space="preserve">
     <value>Error sending the envelope:</value>
   </data>

EnvelopeGenerator.Common/Strings/Envelope.resx

@@ -138,6 +138,9 @@
   <data name="Document Could Not Be Saved" xml:space="preserve">
     <value>Dokument konnte nicht gespeichert werden!</value>
   </data>
+  <data name="Document forwarded" xml:space="preserve">
+    <value>Umschlag an Empfänger {0} weitergeleitet.</value>
+  </data>
   <data name="Edit Envelope" xml:space="preserve">
     <value>Bearbeite Umschlag</value>
   </data>
@@ -165,6 +168,9 @@
   <data name="Envelope-Editor" xml:space="preserve">
     <value>Umschlag-Editor</value>
   </data>
+  <data name="Error email Validation" xml:space="preserve">
+    <value>Die Email-Adresse [ @Mail ] konnte nicht validiert werden!</value>
+  </data>
   <data name="Error sending the envelope" xml:space="preserve">
     <value>Fehler beim Senden des Umschlags:</value>
   </data>

EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb

@@ -127,6 +127,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Umschlag an Empfänger {0} weitergeleitet. ähnelt.
+        '''</summary>
+        Public Shared ReadOnly Property Document_forwarded() As String
+            Get
+                Return ResourceManager.GetString("Document forwarded", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Bearbeite Umschlag ähnelt.
         '''</summary>
@@ -208,6 +217,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Die Email-Adresse [ @Mail ] konnte nicht validiert werden! ähnelt.
+        '''</summary>
+        Public Shared ReadOnly Property Error_email_Validation() As String
+            Get
+                Return ResourceManager.GetString("Error email Validation", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Fehler beim Senden des Umschlags: ähnelt.
         '''</summary>

EnvelopeGenerator.Common/Strings/Model.Designer.vb

@@ -306,16 +306,16 @@ Namespace My.Resources
                 Return ResourceManager.GetString("PartlySigned", resourceCulture)
             End Get
         End Property
-        
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Qualifizierte Signatur ähnelt.
-        '''</summary>
-        Public Shared ReadOnly Property QualifiedSignature() As String
-            Get
-                Return ResourceManager.GetString("QualifiedSignature", resourceCulture)
-            End Get
-        End Property
-        
+
+        ''''<summary>
+        ''''  Sucht eine lokalisierte Zeichenfolge, die Qualifizierte Signatur ähnelt.
+        ''''</summary>
+        'Public Shared ReadOnly Property QualifiedSignature() As String
+        '    Get
+        '        Return ResourceManager.GetString("QualifiedSignature", resourceCulture)
+        '    End Get
+        'End Property
+
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Arbeitsanweisung ähnelt.
         '''</summary>

EnvelopeGenerator.Common/app.config

@@ -2,9 +2,6 @@
 <configuration>
 
     <configSections>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="EnvelopeGenerator.Common.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-        </sectionGroup>
     </configSections>
     <system.diagnostics>
         <sources>
@@ -29,17 +26,4 @@
         </sharedListeners>
     </system.diagnostics>
 
-    <applicationSettings>
-        <EnvelopeGenerator.Common.My.MySettings>
-            <setting name="RuninDMZ" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="NetUse_Usr" serializeAs="String">
-                <value>dd-gan\Administrator</value>
-            </setting>
-            <setting name="NetUse_PW" serializeAs="String">
-                <value>sY4vnATDXwosbTJGip6SqA==</value>
-            </setting>
-        </EnvelopeGenerator.Common.My.MySettings>
-    </applicationSettings>
 </configuration>

EnvelopeGenerator.Domain/Entities/Config.cs

@@ -1,6 +1,7 @@
 using DigitalData.Core.Abstractions;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Text.Json.Serialization;
 
 namespace EnvelopeGenerator.Domain.Entities
 {
@@ -23,19 +24,9 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("EXPORT_PATH", TypeName = "nvarchar(256)")]
         public string? ExportPath { get; init; }
 
-        [Column("DOCUMENT_PATH_DMZ", TypeName = "nvarchar(512)")]
-        [Required]
-        public string? DocumentPathDmz { get; init; }
-
-        [Column("EXPORT_PATH_DMZ", TypeName = "nvarchar(512)")]
-        [Required]
-        public required string ExportPathDmz { get; init; }
-
-        [Column("DOCUMENT_PATH_MOVE_AFTSEND", TypeName = "nvarchar(512)")]
-        [Required]
-        public required string DocumentPathMoveAftsend { get; init; }
-
         [Obsolete("Configuration does not have an ID; it represents a single table in the database.")]
+        [NotMapped]
+        [JsonIgnore]
         public int Id => throw new InvalidOperationException("This configuration does not support an ID as it represents a single table in the database.");
     }
 }

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -84,10 +84,6 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("EXPIRES_WARNING_WHEN_DAYS")]
         public int? ExpiresWarningWhenDays { get; set; }
 
-        [Required]
-        [Column("DMZ_MOVED")]
-        public bool DmzMoved { get; set; }
-
         /// <summary>
         /// The sender of envelope
         /// </summary>

EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs

@@ -16,20 +16,12 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("ENVELOPE_ID")]
         public int EnvelopeId { get; set; }
 
-        [Required]
-        [Column("FILENAME", TypeName = "nvarchar(256)")]
-        public required string Filename { get; set; }
-
-        [Required]
-        [Column("FILEPATH", TypeName = "nvarchar(256)")]
-        public required string Filepath { get; set; }
-
         [Required]
         [Column("ADDED_WHEN", TypeName = "datetime")]
         public required DateTime AddedWhen { get; set; }
 
-        [Column("FILENAME_ORIGINAL", TypeName = "nvarchar(256)")]
-        public required string FilenameOriginal { get; set; }
+        [Column("BYTE_DATA", TypeName = "varbinary(max)")]
+        public byte[]? ByteData { get; init; }
 
         public IEnumerable<DocumentReceiverElement>? Elements { get; set; }
     }

EnvelopeGenerator.Domain/Entities/EnvelopeReceiverBase.cs

@@ -41,6 +41,18 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("CHANGED_WHEN", TypeName = "datetime")]
         public DateTime? ChangedWhen { get; set; }
 
+        [Column("PHONE_NUMBER")]
+        [StringLength(20)]
+        [RegularExpression(@"^\+[0-9]+$", ErrorMessage = "Phone number must start with '+' followed by digits.")]
+        public string? PhoneNumber { get; set; }
+
+        [Column("TFA_ENABLED", TypeName = "bit")]
+        public bool TFAEnabled { get; set; }
+
+        [NotMapped]
         public (int Envelope, int Receiver) Id => (Envelope: EnvelopeId, Receiver: ReceiverId);
+
+        [NotMapped]
+        public bool HasPhoneNumber => PhoneNumber is not null;
     }
 }

EnvelopeGenerator.Domain/Entities/Receiver.cs

@@ -24,6 +24,12 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("ADDED_WHEN", TypeName = "datetime")]
         public DateTime AddedWhen { get; set; }
 
+        [Column("TOTP_SECRET_KEY", TypeName = "nvarchar(MAX)")]
+        public string? TotpSecretkey { get; set; }
+
+        [Column("TOTP_EXPIRATION", TypeName = "datetime")]
+        public DateTime? TotpExpiration { get; set; }
+
         public IEnumerable<EnvelopeReceiver>? EnvelopeReceivers { get; init; }
     }
 }

EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="1.0.0" />
     <PackageReference Include="UserManager.Domain" Version="1.0.0" />
   </ItemGroup>

EnvelopeGenerator.Domain/HttpResponse/GtxMessagingResponse.cs

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

EnvelopeGenerator.Extensions/EnvelopeGenerator.Extensions.csproj

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

EnvelopeGenerator.Extensions/StringExtension.cs

@@ -0,0 +1,14 @@
+using OtpNet;
+
+namespace EnvelopeGenerator.Extensions
+{
+    public static class StringExtension
+    {
+        public static bool IsValidTotp(this string totp, string secret)
+        {
+            var secret_bytes = Base32Encoding.ToBytes(secret);
+            var secret_totp = new Totp(secret_bytes);
+            return secret_totp.VerifyTotp(totp, out _, VerificationWindow.RfcSpecifiedNetworkDelay);
+        }
+    }
+}

EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb

@@ -158,6 +158,7 @@ Public Class EnvelopeEditorController
             Dim oTempFilePath = Path.Combine(oTempFiles.TempPath, Guid.NewGuid().ToString + oFileInfo.Extension)
 
             Await Helpers.CopyFileAsync(oFileInfo.FullName, oTempFilePath)
+
             'File.Copy(oFileInfo.FullName, oTempFilePath, True)
 
             Dim oFileInfoTemp = New FileInfo(oTempFilePath)
@@ -175,6 +176,7 @@ Public Class EnvelopeEditorController
 
         Catch ex As Exception
             Logger.Error(ex)
+            Logger.Warn($"error in CreateDocument: {ex.Message}")
             Return Nothing
         End Try
     End Function
@@ -288,7 +290,9 @@ Public Class EnvelopeEditorController
 #End Region
     Private Function GetEnvelopePath(pEnvelope As Envelope) As String
         Try
-            Dim oEnvelopePath As String = Path.Combine(State.DbConfig.DocumentPath, pEnvelope.Uuid)
+            Dim oTempFiles As New TempFiles(State.LogConfig)
+            Dim oTempFolderPath = oTempFiles.TempPath
+            Dim oEnvelopePath As String = Path.Combine(oTempFolderPath, pEnvelope.Uuid)
 
             If Not Directory.Exists(oEnvelopePath) Then
                 Directory.CreateDirectory(oEnvelopePath)

EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj

@@ -71,8 +71,9 @@
     <Reference Include="DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DigitalData.Controls.DocumentViewer">
-      <HintPath>..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+    <Reference Include="DigitalData.Controls.DocumentViewer, Version=1.9.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.GUIs.Common">
       <HintPath>..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
@@ -99,8 +100,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\EnvelopeGenerator.Common\bin\Debug\EnvelopeGenerator.Common.dll</HintPath>
     </Reference>
-    <Reference Include="GdPicture.NET.14, Version=14.2.89.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.2.89\lib\net462\GdPicture.NET.14.dll</HintPath>
+    <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="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
@@ -141,6 +142,12 @@
     <Compile Include="Controllers\EnvelopeListController.vb" />
     <Compile Include="Controllers\FieldEditorController.vb" />
     <Compile Include="Controllers\BaseController.vb" />
+    <Compile Include="frmChooseDocVariant.Designer.vb">
+      <DependentUpon>frmChooseDocVariant.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmChooseDocVariant.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmEnvelopeEditor.vb">
       <SubType>Form</SubType>
     </Compile>
@@ -189,6 +196,9 @@
       <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="My Project\AssemblyInfo.vb" />
+    <EmbeddedResource Include="frmChooseDocVariant.resx">
+      <DependentUpon>frmChooseDocVariant.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmEnvelopeEditor.en.resx">
       <DependentUpon>frmEnvelopeEditor.vb</DependentUpon>
       <SubType>Designer</SubType>
@@ -271,12 +281,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.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.89\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets'))" />
+    <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>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

EnvelopeGenerator.Form/ModuleSettings.vb

@@ -2,7 +2,7 @@
 Imports DigitalData.Modules.Logging
 
 Module ModuleSettings
-    Public DOCUMENT_PATH_MOVE_AFTSEND As String = ""
+    Public ENVELOPE_TEMP_DOCUMENT As String = ""
     Public CurrLogConfig As LogConfig
     Public Directory2Delete As String = ""
     Public MS_GDPICTUREKEY As String = ""

EnvelopeGenerator.Form/My Project/AssemblyInfo.vb

@@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Envelope Generator")>
 <Assembly: AssemblyCopyright("Copyright © 2024")>
-<Assembly: AssemblyTrademark("2.4.5.0")>
+<Assembly: AssemblyTrademark("2.8.0.0")>
 <Assembly: AssemblyCulture("")>
 
 ' Setting ComVisible to false makes the types in this assembly not visible 
@@ -32,5 +32,5 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 ' [assembly: AssemblyVersion("1.0.*")]
-<Assembly: AssemblyVersion("2.7.0.0")>
+<Assembly: AssemblyVersion("2.8.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>

EnvelopeGenerator.Form/app.config

@@ -72,7 +72,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.2.89.0" newVersion="14.2.89.0" />
+        <bindingRedirect oldVersion="0.0.0.0-14.2.90.0" newVersion="14.2.90.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

EnvelopeGenerator.Form/frmChooseDocVariant.Designer.vb

@@ -0,0 +1,75 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmChooseDocVariant
+    Inherits DevExpress.XtraEditors.XtraForm
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmChooseDocVariant))
+        Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl()
+        Me.SimpleButton2 = New DevExpress.XtraEditors.SimpleButton()
+        Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
+        Me.SuspendLayout()
+        '
+        'LabelControl1
+        '
+        Me.LabelControl1.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.LabelControl1.Appearance.Options.UseFont = True
+        Me.LabelControl1.Location = New System.Drawing.Point(12, 26)
+        Me.LabelControl1.Name = "LabelControl1"
+        Me.LabelControl1.Size = New System.Drawing.Size(625, 17)
+        Me.LabelControl1.TabIndex = 2
+        Me.LabelControl1.Text = "In diesem Dialog wählen Sie die Dokumente aus, welche dann zu einem Dokument verk" &
+    "ettet werden!"
+        '
+        'SimpleButton2
+        '
+        Me.SimpleButton2.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.SimpleButton2.Appearance.Options.UseFont = True
+        Me.SimpleButton2.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.SimpleButton2.Location = New System.Drawing.Point(142, 85)
+        Me.SimpleButton2.Name = "SimpleButton2"
+        Me.SimpleButton2.Size = New System.Drawing.Size(343, 50)
+        Me.SimpleButton2.TabIndex = 3
+        Me.SimpleButton2.Text = "Mehrere PDF auswählen und automatisch verketten"
+        '
+        'OpenFileDialog1
+        '
+        Me.OpenFileDialog1.FileName = "OpenFileDialog1"
+        Me.OpenFileDialog1.Filter = "PDF Files|*.pdf"
+        '
+        'frmChooseDocVariant
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(644, 189)
+        Me.Controls.Add(Me.SimpleButton2)
+        Me.Controls.Add(Me.LabelControl1)
+        Me.IconOptions.SvgImage = CType(resources.GetObject("frmChooseDocVariant.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.Name = "frmChooseDocVariant"
+        Me.Text = "Mehrere Dokumente"
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+    Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl
+    Friend WithEvents SimpleButton2 As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents OpenFileDialog1 As OpenFileDialog
+End Class

EnvelopeGenerator.Form/frmChooseDocVariant.resx

@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="SimpleButton2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJYEAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkRvY3VtZW50UERGIj4NCiAgICA8cGF0aCBkPSJN
+        MjIsMjR2NEgyVjJoMTR2NWMwLDAuNiwwLjQsMSwxLDFoNXY0aDJWN2wtNy03SDFDMC40LDAsMCwwLjQs
+        MCwxdjI4YzAsMC42LDAuNCwxLDEsMWgyMmMwLjYsMCwxLTAuNCwxLTEgICB2LTVIMjJ6IiBjbGFzcz0i
+        QmxhY2siIC8+DQogICAgPHBhdGggZD0iTTE5LjIsMTZjMC4zLDAuNSwwLjQsMS4xLDAuNCwxLjljMCww
+        LjktMC4yLDEuNS0wLjUsMmMtMC4zLDAuNS0wLjcsMC43LTEuMywwLjdoLTAuNnYtNS4zaDAuNiAgIEMx
+        OC40LDE1LjMsMTguOSwxNS42LDE5LjIsMTZ6IE0xMi4xLDE1LjNoLTAuNXYyLjZoMC41YzAuNywwLDEu
+        MS0wLjQsMS4xLTEuM2MwLTAuNC0wLjEtMC44LTAuMy0xQzEyLjYsMTUuNCwxMi40LDE1LjMsMTIuMSwx
+        NS4zeiAgICBNMzAsMTJ2MTJINlYxMkgzMHogTTE0LjgsMTYuNWMwLTAuOC0wLjItMS41LTAuNi0xLjlj
+        LTAuNC0wLjQtMS0wLjctMS44LTAuN0gxMHY4aDEuNnYtMi43aDAuNmMwLjgsMCwxLjQtMC4zLDEuOS0w
+        LjggICBDMTQuNSwxOCwxNC44LDE3LjMsMTQuOCwxNi41eiBNMjEuMiwxNy45YzAtMi42LTEuMS0zLjkt
+        My40LTMuOWgtMi4xdjhoMi4yYzEuMSwwLDEuOS0wLjQsMi41LTEuMUMyMC45LDIwLjIsMjEuMiwxOS4y
+        LDIxLjIsMTcuOXogICAgTTI2LDE0aC0zLjd2OGgxLjZ2LTMuMWgydi0xLjNoLTJ2LTIuMkgyNlYxNHoi
+        IGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="frmChooseDocVariant.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANYEAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTG9naWNhbCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KPC9z
+        dHlsZT4NCiAgPHBhdGggZD0iTTUsNGgyM1YzYzAtMC42LTAuNC0xLTEtMUg1QzMuMywyLDIsMy4zLDIs
+        NXYyMmMwLDEuNywxLjMsMywzLDNoMjJjMC42LDAsMS0wLjQsMS0xVjZINUM0LjQsNiw0LDUuNiw0LDUg
+        IEM0LDQuNCw0LjQsNCw1LDR6IE0xNiwyNGgtMnYtMmgyVjI0eiBNMTEuNiwxNC40YzAuMi0wLjUsMC40
+        LTAuOSwwLjctMS4zYzAuMy0wLjQsMC43LTAuNiwxLjEtMC44YzAuNC0wLjIsMC45LTAuMywxLjUtMC4z
+        ICBjMC43LDAsMS4zLDAuMSwxLjgsMC4zYzAuNSwwLjIsMC45LDAuNSwxLjIsMC44YzAuMywwLjMsMC41
+        LDAuNywwLjYsMWMwLjEsMC40LDAuMiwwLjcsMC4yLDFjMCwwLjQsMCwwLjctMC4xLDEgIGMtMC4xLDAu
+        My0wLjIsMC41LTAuMywwLjhjLTAuMSwwLjItMC4zLDAuNC0wLjQsMC42Yy0wLjIsMC4yLTAuMywwLjMt
+        MC41LDAuNGMtMC4yLDAuMS0wLjMsMC4zLTAuNSwwLjRjLTAuMiwwLjEtMC4zLDAuMy0wLjQsMC40ICBj
+        LTAuMSwwLjEtMC4zLDAuMy0wLjQsMC41Yy0wLjEsMC4yLTAuMiwwLjQtMC4yLDAuNnYwLjZoLTJ2LTAu
+        N2MwLTAuNCwwLjEtMC43LDAuMS0wLjljMC4xLTAuMywwLjItMC41LDAuMy0wLjcgIGMwLjEtMC4yLDAu
+        My0wLjQsMC40LTAuNWMwLjEtMC4xLDAuMy0wLjMsMC40LTAuNHMwLjMtMC4zLDAuNC0wLjRjMC4xLTAu
+        MSwwLjItMC4yLDAuMy0wLjRjMC4xLTAuMSwwLjItMC4zLDAuMi0wLjUgIGMwLjEtMC4yLDAuMS0wLjQs
+        MC4xLTAuNmMwLTAuNS0wLjEtMC45LTAuMy0xLjFjLTAuMi0wLjItMC41LTAuNC0wLjktMC40Yy0wLjMs
+        MC0wLjUsMC4xLTAuNywwLjJjLTAuMiwwLjEtMC40LDAuMy0wLjUsMC41ICBjLTAuMSwwLjItMC4yLDAu
+        NC0wLjMsMC43Yy0wLjEsMC4yLTAuMSwwLjUtMC4xLDAuOGgtMi4yQzExLjQsMTUuNCwxMS40LDE0Ljks
+        MTEuNiwxNC40eiIgY2xhc3M9IkJsdWUiIC8+DQo8L3N2Zz4L
+</value>
+  </data>
+</root>

EnvelopeGenerator.Form/frmChooseDocVariant.vb

@@ -0,0 +1,96 @@
+Imports DevExpress.XtraSplashScreen
+Imports EnvelopeGenerator.Common
+Imports DigitalData.Modules.Logging
+Imports GdPicture14
+Public Class frmChooseDocVariant
+    Private TempFiles As TempFiles
+    Public Property State As State
+    Private Logger As Logger
+    Private Sub frmChooseDocVariant_Load(sender As Object, e As EventArgs) Handles Me.Load
+        ENVELOPE_TEMP_DOCUMENT = ""
+        TempFiles = New TempFiles(State.LogConfig)
+        TempFiles.Create()
+        Logger = State.LogConfig.GetLogger()
+    End Sub
+
+    Private Sub SimpleButton1_Click(sender As Object, e As EventArgs)
+        OpenFileDialog1.Multiselect = False
+        Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
+
+        Try
+            If OpenFileDialog1.ShowDialog() = DialogResult.OK Then
+                ENVELOPE_TEMP_DOCUMENT = OpenFileDialog1.FileName
+            End If
+
+        Catch ex As Exception
+            Logger.Error(ex)
+        Finally
+            SplashScreenManager.CloseOverlayForm(oHandle)
+        End Try
+        ' Else
+        ' SplashScreenManager.CloseOverlayForm(oHandle)
+        ' End If
+    End Sub
+
+    Private Sub SimpleButton2_Click(sender As Object, e As EventArgs) Handles SimpleButton2.Click
+        OpenFileDialog1.Multiselect = True
+        Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
+        Try
+            Dim oErr As Boolean = False
+            If OpenFileDialog1.ShowDialog() = DialogResult.OK Then
+                Dim oIDX As Integer = 0
+                For Each oFile As String In OpenFileDialog1.FileNames
+                    oIDX += 1
+                Next
+
+                Dim arPDF As GdPicturePDF() = New GdPicturePDF(oIDX) {}
+                oIDX = 0
+                For Each oFile As String In OpenFileDialog1.FileNames
+                    arPDF(oIDX) = New GdPicturePDF()
+                    If arPDF(oIDX).LoadFromFile(oFile) <> GdPictureStatus.OK Then
+                        MsgBox($"PDF Statsu of file {oFile} is not OK. Please check PDF-conformity!", MsgBoxStyle.Critical)
+                        oErr = True
+                        Exit For
+                    End If
+                    oIDX += 1
+                Next
+                If oErr = False Then
+
+                    Dim dstPDF As GdPicturePDF = arPDF(0).MergeDocuments(arPDF)
+                    Dim oStatus As GdPictureStatus = arPDF(0).GetStat()
+                    If oStatus = GdPictureStatus.OK Then
+                        MsgBox("All documents have been successfully merged.", MsgBoxStyle.Information)
+                        Dim oTempFolder = TempFiles.TempPath
+                        Dim oTempFilename = String.Concat(oTempFolder, "\", $"MergedDoc.pdf")
+                        If System.IO.File.Exists(oTempFilename) Then
+                            System.IO.File.Delete(oTempFilename)
+                        End If
+                        If dstPDF.SaveToFile(oTempFilename) = GdPictureStatus.OK Then
+                            MessageBox.Show("Merged document has been successfully saved.", "Example: MergeDocuments")
+                            ENVELOPE_TEMP_DOCUMENT = oTempFilename
+                            dstPDF.CloseDocument()
+                        End If
+                    Else
+                        MessageBox.Show("The MergeDocuments() method has failed with the status: " + oStatus.ToString(), "Example: MergeDocuments")
+                    End If
+                    dstPDF.Dispose()
+                    oIDX = 0
+                    For Each oFile As String In OpenFileDialog1.FileNames
+                        arPDF(oIDX).CloseDocument()
+                        oIDX += 1
+                    Next
+                End If
+
+            End If
+
+        Catch ex As Exception
+            Logger.Error(ex)
+        Finally
+            SplashScreenManager.CloseOverlayForm(oHandle)
+        End Try
+    End Sub
+
+    Private Sub LabelControl1_Click(sender As Object, e As EventArgs) Handles LabelControl1.Click
+
+    End Sub
+End Class

EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb

@@ -58,12 +58,14 @@ Partial Public Class frmEnvelopeEditor
         Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
         Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupDocuments = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupInvitation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupAddSignature = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupReceiver = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.LayoutControlGroup4 = New DevExpress.XtraLayout.LayoutControlGroup()
         Me.LayoutControlGroup5 = New DevExpress.XtraLayout.LayoutControlGroup()
@@ -98,6 +100,7 @@ Partial Public Class frmEnvelopeEditor
         Me.EnvelopeDocumentBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
         Me.txtEnvelopeIdLabel = New DevExpress.XtraBars.BarStaticItem()
+        Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerControl1.Panel1.SuspendLayout()
@@ -240,9 +243,9 @@ Partial Public Class frmEnvelopeEditor
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnSave, Me.btnCancel, Me.btnNewFile, Me.btnDeleteFile, Me.btnSendEnvelope, Me.btnEditFields, Me.btnDeleteReceiver, Me.btnEditData, Me.txtCreatorEmailLabel, Me.txtEnvelopeIdLabel2, Me.BarButtonItem1, Me.BarStaticItem1, Me.BarButtonItem2})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnSave, Me.btnCancel, Me.btnNewFile, Me.btnDeleteFile, Me.btnSendEnvelope, Me.btnEditFields, Me.btnDeleteReceiver, Me.btnEditData, Me.txtCreatorEmailLabel, Me.txtEnvelopeIdLabel2, Me.BarButtonItem1, Me.BarStaticItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4})
         resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 15
+        Me.RibbonControl1.MaxItemId = 17
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -342,9 +345,15 @@ Partial Public Class frmEnvelopeEditor
         Me.BarButtonItem2.Id = 14
         Me.BarButtonItem2.Name = "BarButtonItem2"
         '
+        'BarButtonItem3
+        '
+        resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3")
+        Me.BarButtonItem3.Id = 15
+        Me.BarButtonItem3.Name = "BarButtonItem3"
+        '
         'RibbonPage1
         '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupDocuments, Me.RibbonPageGroupInvitation, Me.RibbonPageGroupAddSignature, Me.RibbonPageGroupReceiver})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupDocuments, Me.RibbonPageGroupInvitation, Me.RibbonPageGroupAddSignature, Me.RibbonPageGroupReceiver, Me.RibbonPageGroup2})
         Me.RibbonPage1.Name = "RibbonPage1"
         resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
         '
@@ -359,6 +368,7 @@ Partial Public Class frmEnvelopeEditor
         'RibbonPageGroupDocuments
         '
         Me.RibbonPageGroupDocuments.ItemLinks.Add(Me.btnNewFile)
+        Me.RibbonPageGroupDocuments.ItemLinks.Add(Me.BarButtonItem4)
         Me.RibbonPageGroupDocuments.ItemLinks.Add(Me.btnDeleteFile)
         Me.RibbonPageGroupDocuments.Name = "RibbonPageGroupDocuments"
         resources.ApplyResources(Me.RibbonPageGroupDocuments, "RibbonPageGroupDocuments")
@@ -382,6 +392,12 @@ Partial Public Class frmEnvelopeEditor
         Me.RibbonPageGroupReceiver.Name = "RibbonPageGroupReceiver"
         resources.ApplyResources(Me.RibbonPageGroupReceiver, "RibbonPageGroupReceiver")
         '
+        'RibbonPageGroup2
+        '
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3)
+        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
+        resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2")
+        '
         'RibbonStatusBar1
         '
         Me.RibbonStatusBar1.ItemLinks.Add(Me.txtCreatorEmailLabel)
@@ -659,6 +675,13 @@ Partial Public Class frmEnvelopeEditor
         Me.txtEnvelopeIdLabel.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         Me.txtEnvelopeIdLabel.Tag = "Envelope-ID: {0}"
         '
+        'BarButtonItem4
+        '
+        resources.ApplyResources(Me.BarButtonItem4, "BarButtonItem4")
+        Me.BarButtonItem4.Id = 16
+        Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem4.Name = "BarButtonItem4"
+        '
         'frmEnvelopeEditor
         '
         resources.ApplyResources(Me, "$this")
@@ -783,6 +806,9 @@ Partial Public Class frmEnvelopeEditor
     Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
 
 #End Region
 

EnvelopeGenerator.Form/frmEnvelopeEditor.resx

@@ -213,7 +213,7 @@
 </value>
   </data>
   <data name="btnNewFile.Caption" xml:space="preserve">
-    <value>Neues Dokument</value>
+    <value>Ein Dokument hinzufügen</value>
   </data>
   <data name="btnNewFile.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -414,6 +414,30 @@
   <data name="BarButtonItem2.Caption" xml:space="preserve">
     <value>Öffnen</value>
   </data>
+  <data name="BarButtonItem3.Caption" xml:space="preserve">
+    <value>BarButtonItem3</value>
+  </data>
+  <data name="BarButtonItem4.Caption" xml:space="preserve">
+    <value>Mehrere Dokumente hinzufügen</value>
+  </data>
+  <data name="BarButtonItem4.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHECAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTXVsdGlwbGVfRG9jdW1lbnRzIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91
+        bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmxhY2t7ZmlsbDoj
+        NzI3MjcyO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTMxLDhoLTVWNWMwLTAuNS0wLjUtMS0xLTFoLTVW
+        MWMwLTAuNS0wLjUtMS0xLTFIMUMwLjUsMCwwLDAuNSwwLDF2MjJjMCwwLjUsMC41LDEsMSwxaDV2M2Mw
+        LDAuNSwwLjUsMSwxLDEgIGg1djNjMCwwLjUsMC41LDEsMSwxaDE4YzAuNSwwLDEtMC41LDEtMVY5QzMy
+        LDguNSwzMS41LDgsMzEsOHogTTYsNXYxN0gyVjJoMTZ2Mkg3QzYuNSw0LDYsNC41LDYsNXogTTEyLDl2
+        MTdIOFY2aDE2djJIMTMgIEMxMi41LDgsMTIsOC41LDEyLDl6IE0zMCwzMEgxNFYxMGgxNlYzMHoiIGNs
+        YXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs=
+</value>
+  </data>
   <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
@@ -432,6 +456,9 @@
   <data name="RibbonPageGroupReceiver.Text" xml:space="preserve">
     <value>Empfänger</value>
   </data>
+  <data name="RibbonPageGroup2.Text" xml:space="preserve">
+    <value>RibbonPageGroup2</value>
+  </data>
   <data name="RibbonPage1.Text" xml:space="preserve">
     <value>Start</value>
   </data>
@@ -878,7 +905,7 @@
     <value>0</value>
   </data>
   <metadata name="FrmEditorBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 54</value>
+    <value>792, 17</value>
   </metadata>
   <metadata name="EnvelopeDocumentBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>557, 17</value>
@@ -1058,6 +1085,18 @@
   <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;BarButtonItem3.Name" xml:space="preserve">
+    <value>BarButtonItem3</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem3.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem4.Name" xml:space="preserve">
+    <value>BarButtonItem4</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem4.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
     <value>RibbonPage1</value>
   </data>
@@ -1094,6 +1133,12 @@
   <data name="&gt;&gt;RibbonPageGroupReceiver.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;RibbonPageGroup2.Name" xml:space="preserve">
+    <value>RibbonPageGroup2</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup2.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;LayoutControlGroup4.Name" xml:space="preserve">
     <value>LayoutControlGroup4</value>
   </data>

EnvelopeGenerator.Form/frmEnvelopeEditor.vb

@@ -4,9 +4,12 @@ Imports System.IO
 Imports DevExpress.Export.Xl
 Imports DevExpress.Utils.CommonDialogs
 Imports DevExpress.Utils.Drawing
+Imports DevExpress.Utils.Svg.CommonSvgImages
 Imports DevExpress.XtraEditors
 Imports DevExpress.XtraExport.Helpers
 Imports DevExpress.XtraGrid
+Imports DevExpress.XtraGrid.Columns
+Imports DevExpress.XtraGrid.Views.Base
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraSplashScreen
 Imports DigitalData.Modules.Base
@@ -30,6 +33,7 @@ Partial Public Class frmEnvelopeEditor
     Private Const COL_CODE = "AccessCode"
 
     Public Property State As State
+    Private TempFiles As TempFiles
 
     Public Sub New()
         InitializeComponent()
@@ -40,30 +44,30 @@ Partial Public Class frmEnvelopeEditor
         'SaveEnvelopeWithValidation()
         ' If Not IsNothing(Envelope) Then
         Try
-                ' prüfen ob es schon eine Datei gibt
-                If Documents.Count > 0 Then
-                    MsgBox(Resources.Envelope.Only_one_file_is_allowed, MsgBoxStyle.Information, Text)
-                    Return
+            ' prüfen ob es schon eine Datei gibt
+            If Documents.Count > 0 Then
+                MsgBox(Resources.Envelope.Only_one_file_is_allowed, MsgBoxStyle.Information, Text)
+                Return
+            End If
+
+            If OpenFileDialog1.ShowDialog() = DialogResult.OK Then
+                Dim oDocument = Await Controller.CreateDocument(OpenFileDialog1.FileName)
+
+                If oDocument IsNot Nothing Then
+                    Documents.Add(oDocument)
+                    ' Update_File_DB(OpenFileDialog1.FileName)
+                Else
+                    MsgBox(Resources.Envelope.Document_Could_Not_Be_Saved, MsgBoxStyle.Critical, Text)
                 End If
+            End If
 
-                If OpenFileDialog1.ShowDialog() = DialogResult.OK Then
-                    Dim oDocument = Await Controller.CreateDocument(OpenFileDialog1.FileName)
+        Catch ex As Exception
+            Logger.Error(ex)
+        Finally
+            SplashScreenManager.CloseOverlayForm(oHandle)
 
-                    If oDocument IsNot Nothing Then
-                        Documents.Add(oDocument)
-                        ' Update_File_DB(OpenFileDialog1.FileName)
-                    Else
-                        MsgBox(Resources.Envelope.Document_Could_Not_Be_Saved, MsgBoxStyle.Critical, Text)
-                    End If
-                End If
-
-            Catch ex As Exception
-                Logger.Error(ex)
-            Finally
-                SplashScreenManager.CloseOverlayForm(oHandle)
-
-                RibbonPageGroupAddSignature_Enabled()
-            End Try
+            RibbonPageGroupAddSignature_Enabled()
+        End Try
         ' Else
         ' SplashScreenManager.CloseOverlayForm(oHandle)
         ' End If
@@ -72,6 +76,8 @@ Partial Public Class frmEnvelopeEditor
     Private Sub frmEditor_Load(sender As Object, e As EventArgs) Handles Me.Load
         Logger = State.LogConfig.GetLogger()
         Logger.Debug("Loading Configuration..")
+        TempFiles = New TempFiles(State.LogConfig)
+        TempFiles.Create()
         If Envelope Is Nothing Then
             Controller = New EnvelopeEditorController(State)
 
@@ -93,6 +99,24 @@ Partial Public Class frmEnvelopeEditor
             Receivers = New BindingList(Of EnvelopeReceiver)(Controller.Envelope.Receivers)
 
             For Each docItem As EnvelopeDocument In Documents
+                If Not File.Exists(docItem.Filepath) Then
+                    Dim oTempFolder = TempFiles.TempPath
+                    Dim oTempFilename = String.Concat(oTempFolder, "\", $"ViewEnvDoc_{Envelope.Id}.pdf")
+                    If File.Exists(oTempFilename) Then
+                        Try
+                            File.OpenWrite(oTempFilename)
+                        Catch ex As Exception
+                            MsgBox("File might already be open?", MsgBoxStyle.Exclamation)
+                            Me.Cursor = Cursors.Default
+                            Exit Sub
+                        End Try
+
+
+                        File.Delete(oTempFilename)
+                    End If
+                    WriteBytetoPath(oTempFilename, docItem.Byte_Data)
+                    docItem.Filepath = oTempFilename
+                End If
                 If docItem.Thumbnail Is Nothing Then
                     docItem.Thumbnail = Controller.CreateThumbnail(docItem.Filepath)
                     docItem.PageCount = Controller.GetPageCount(docItem.Filepath)
@@ -141,6 +165,8 @@ Partial Public Class frmEnvelopeEditor
             Dim oDocument As EnvelopeDocument = DirectCast(ViewDocuments.GetFocusedRow(), EnvelopeDocument)
             If Controller.DeleteDocument(oDocument) Then
                 Documents.Remove(oDocument)
+                GridDocuments.DataSource = Nothing
+
             End If
         End If
     End Sub
@@ -163,6 +189,19 @@ Partial Public Class frmEnvelopeEditor
 
             If ViewDocuments.GetSelectedRows().Count > 0 Then
                 Dim oDocument As EnvelopeDocument = DirectCast(ViewDocuments.GetFocusedRow(), EnvelopeDocument)
+                Dim oEnvelope = Controller.Envelope
+                If Not IsNothing(oDocument.Byte_Data) Then
+                    Dim oTempFolder = TempFiles.TempPath
+                    Dim oTempFilename = String.Concat(oTempFolder, "\", $"ViewEnvDoc_{oEnvelope.Id}.pdf")
+                    If Not File.Exists(oTempFilename) Then
+                        WriteBytetoPath(oTempFilename, oDocument.Byte_Data)
+                        oDocument.Filepath = oTempFilename
+                    End If
+
+                End If
+
+
+
                 Dim oGDPictureKey As String = MS_GDPICTUREKEY
 
                 Dim oForm As New frmFieldEditor(State) With {
@@ -180,7 +219,23 @@ Partial Public Class frmEnvelopeEditor
             SplashScreenManager.CloseOverlayForm(oHandle)
         End Try
     End Sub
+    Private Sub WriteBytetoPath(ByVal sFileName As String, pByte As Byte())
 
+        'For Document
+        Try
+            If Not pByte Is Nothing Then
+                'Read image data into a file stream 
+                Using fs As New FileStream(sFileName, FileMode.OpenOrCreate, FileAccess.Write)
+                    fs.Write(pByte, 0, pByte.Length)
+                    'Set image variable value using memory stream. 
+                    fs.Flush()
+                    fs.Close()
+                End Using
+            End If
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in downloadFile")
+        End Try
+    End Sub
     Private Function SaveEnvelopeWithValidation() As Boolean
         Return SaveEnvelope(True)
     End Function
@@ -479,7 +534,12 @@ Partial Public Class frmEnvelopeEditor
         RibbonPageGroupAddSignature_Enabled()
     End Sub
     Dim CellValueChanged As Boolean = False
+    Private Sub ViewReceivers_ColumnPositionChanged(sender As Object, e As EventArgs) Handles ViewReceivers.ColumnPositionChanged
+
+
+    End Sub
     Private Sub ViewReceivers_CellValueChanged(sender As Object, e As Views.Base.CellValueChangedEventArgs) Handles ViewReceivers.CellValueChanged
+
         If e.Column.FieldName = COL_EMAIL And CellValueChanged = False Then
             If e.Value Is Nothing Then
                 ' Keine E-Mail-Adresse, also weg damit
@@ -491,21 +551,57 @@ Partial Public Class frmEnvelopeEditor
                 Dim oNameCellValue = ViewReceivers.GetRowCellValue(e.RowHandle, COL_NAME)
                 If oNameCellValue Is Nothing Then
                     Dim oEmailAdress As String = DirectCast(e.Value.ToString.ToLower, String)
+                    oEmailAdress = Trim(oEmailAdress)
+                    If IsValidEmailAddress(oEmailAdress) = True Then
+                        Dim oLastName As String = Controller.GetLastNameByEmailAdress(oEmailAdress)
+                        Dim oAccessCode As String = Helpers.GetAccessCode()
+                        ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_EMAIL), oEmailAdress)
+                        ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_NAME), oLastName)
+                        ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_CODE), oAccessCode)
+                        CellValueChanged = False
+                    Else
+                        Dim oMsg = Resources.Envelope.Error_email_Validation
+                        oMsg = oMsg.Replace("@Mail", oEmailAdress)
+                        MsgBox(oMsg, MsgBoxStyle.Exclamation, Text)
+                        ViewReceivers.DeleteRow(ViewReceivers.FocusedRowHandle)
+                    End If
 
-                    Dim oLastName As String = Controller.GetLastNameByEmailAdress(oEmailAdress)
-                    Dim oAccessCode As String = Helpers.GetAccessCode()
-                    ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_EMAIL), oEmailAdress)
-                    ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_NAME), oLastName)
-                    ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_CODE), oAccessCode)
-                    CellValueChanged = False
                 End If
             End If
         End If
     End Sub
+    Private Sub email_validation()
 
+    End Sub
+
+    Private Function IsValidEmailAddress(pEmailAddress As String) As Boolean
+        Try
+            If pEmailAddress.Contains("@") Then
+                Dim oAddress = New System.Net.Mail.MailAddress(pEmailAddress)
+                Return oAddress.Address = pEmailAddress
+            Else
+                Return False
+            End If
+        Catch ex As Exception
+            Logger.Error(ex)
+            Return False
+        End Try
+    End Function
     Private Sub RibbonControl1_Click(sender As Object, e As EventArgs) Handles RibbonControl1.Click
 
     End Sub
 
+    Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
+        frmChooseDocVariant.ShowDialog()
+    End Sub
+
+    Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick
+
+    End Sub
+
+    Private Sub ViewReceivers_CellValueChanging(sender As Object, e As CellValueChangedEventArgs) Handles ViewReceivers.CellValueChanging
+
+    End Sub
+
 
 End Class

EnvelopeGenerator.Form/frmEnvelopeMainData.resx

@@ -220,6 +220,9 @@
   <data name="&gt;&gt;btCancel.ZOrder" xml:space="preserve">
     <value>7</value>
   </data>
+  <data name="cmbCertificationType.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="cmbCertificationType.Location" type="System.Drawing.Point, System.Drawing">
     <value>207, 162</value>
   </data>

EnvelopeGenerator.Form/frmMain.vb

@@ -566,6 +566,7 @@ Public Class frmMain
             If oReceiver.Email = selReceiver.Email Then
                 If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then
                     MsgBox(Resources.Envelope.Invitation_successfully_resend, MsgBoxStyle.Information, Text)
+
                 End If
             End If
         Next

EnvelopeGenerator.Form/frmSplashScreen.vb

@@ -62,7 +62,7 @@ Public Class frmSplashScreen
     Private Sub Worker_DoWork(sender As Object, e As DoWorkEventArgs) Handles Worker.DoWork
         Dim oState As State = DirectCast(e.Argument, State)
 
-        Worker.ReportProgress(20, "Initialize Database")
+        Worker.ReportProgress(20, "Initializing Database")
         Thread.Sleep(300)
 
         Dim oConnectionString = MSSQLServer.DecryptConnectionString(oState.Config.ConnectionString)
@@ -74,13 +74,13 @@ Public Class frmSplashScreen
             DB_DD_ECM = oState.Database
         End If
 
-        Worker.ReportProgress(40, "Initialize Confguration")
+        Worker.ReportProgress(40, "Initializing Configuration")
         Thread.Sleep(300)
 
         Dim ConfigModel = New ConfigModel(oState)
         oState.DbConfig = ConfigModel.LoadConfiguration()
-        DOCUMENT_PATH_MOVE_AFTSEND = oState.DbConfig.DOCUMENT_PATH_MOVE_AFTSEND
-        Worker.ReportProgress(60, "Initialize User")
+        ' DOCUMENT_PATH_MOVE_AFTSEND = oState.DbConfig.DOCUMENT_PATH_MOVE_AFTSEND
+        Worker.ReportProgress(60, "Initializing User")
         Dim oKey = oState.Database.GetScalarValue("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE' and ACTIVE = 1")
         Thread.Sleep(300)
         If oKey.ToString <> String.Empty Then
@@ -91,7 +91,7 @@ Public Class frmSplashScreen
 
         Dim oUser = oUserModel.SelectUser()
 
-        Worker.ReportProgress(80, "Initialize Rights")
+        Worker.ReportProgress(80, "Initializing Rights")
         Thread.Sleep(300)
 
         ' This checks for module access and admin rights

EnvelopeGenerator.Form/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GdPicture" version="14.2.89" targetFramework="net462" />
-  <package id="GdPicture.runtimes.windows" version="14.2.89" targetFramework="net462" />
+  <package id="GdPicture" version="14.2.90" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.2.90" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net462" />
 </packages>

EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
     <PackageReference Include="DigitalData.Core.API" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.15" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />

EnvelopeGenerator.GeneratorAPI/Program.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.API;
 using DigitalData.Core.Application;
 using DigitalData.UserManager.Application;
-using EnvelopeGenerator.Application;
+using EnvelopeGenerator.Application.Extensions;
 using EnvelopeGenerator.Infrastructure;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Localization;
@@ -60,7 +60,7 @@ builder.Services.AddDirectorySearchService();
 builder.Services.AddCookieBasedLocalizer() ;
 
 // Envelope generator serives
-builder.Services.AddEnvelopeGenerator();
+builder.Services.AddEnvelopeGenerator(config);
 
 var app = builder.Build();
 

EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeReceiverRepository.cs

@@ -5,19 +5,19 @@ namespace EnvelopeGenerator.Infrastructure.Contracts
 {
     public interface IEnvelopeReceiverRepository : ICRUDRepository<EnvelopeReceiver, (int Envelope, int Receiver)>
     {
-        Task<IEnumerable<EnvelopeReceiver>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false);
+        Task<IEnumerable<EnvelopeReceiver>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false, bool readOnly = true);
 
-        Task<IEnumerable<EnvelopeReceiver>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true);
+        Task<IEnumerable<EnvelopeReceiver>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true, bool readOnly = true);
 
-        Task<EnvelopeReceiver?> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true);
+        Task<EnvelopeReceiver?> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true);
 
-        Task<string?> ReadAccessCodeAsync(string uuid, string signature);
+        Task<string?> ReadAccessCodeAsync(string uuid, string signature, bool readOnly = true);
 
         Task<int> CountAsync(string uuid, string signature);
 
-		Task<EnvelopeReceiver?> ReadByIdAsync(int envelopeId, int receiverId);
+		Task<EnvelopeReceiver?> ReadByIdAsync(int envelopeId, int receiverId, bool readOnly = true);
 
-		Task<string?> ReadAccessCodeByIdAsync(int envelopeId, int receiverId);
+		Task<string?> ReadAccessCodeByIdAsync(int envelopeId, int receiverId, bool readOnly = true);
 
         Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
 

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
     <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.0.0" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="2.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />

EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs

@@ -11,9 +11,9 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
         {
         }
 
-        private IQueryable<EnvelopeReceiver> ReadWhere(string? uuid = null, string? signature = null, bool withEnvelope = false, bool withReceiver = false)
+        private IQueryable<EnvelopeReceiver> ReadWhere(string? uuid = null, string? signature = null, bool withEnvelope = false, bool withReceiver = false, bool readOnly = true)
         {
-            var query = _dbSet.AsNoTracking();
+            var query = readOnly ? _dbSet.AsNoTracking() : _dbSet;
 
             if (uuid is not null)
                 query = query.Where(er => er.Envelope != null && er.Envelope.Uuid == uuid);
@@ -32,31 +32,34 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
             return query;
         }
 
-        public async Task<IEnumerable<EnvelopeReceiver>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false)
-            => await ReadWhere(uuid: uuid, withEnvelope: withEnvelope, withReceiver: withReceiver).ToListAsync();
+        public async Task<IEnumerable<EnvelopeReceiver>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false, bool readOnly = true)
+            => await ReadWhere(uuid: uuid, withEnvelope: withEnvelope, withReceiver: withReceiver, readOnly: readOnly).ToListAsync();
 
-        public async Task<IEnumerable<EnvelopeReceiver>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true)
-            => await ReadWhere(signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver).ToListAsync();
+        public async Task<IEnumerable<EnvelopeReceiver>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true, bool readOnly = true)
+            => await ReadWhere(signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver, readOnly: readOnly).ToListAsync();
 
-        public async Task<EnvelopeReceiver?> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true)
-            => await ReadWhere(uuid: uuid, signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver).FirstOrDefaultAsync();
+        public async Task<EnvelopeReceiver?> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true)
+            => await ReadWhere(uuid: uuid, signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver, readOnly: readOnly).FirstOrDefaultAsync();
 
-        public async Task<string?> ReadAccessCodeAsync(string uuid, string signature)
-            => await ReadWhere(uuid: uuid, signature: signature)
+        public async Task<string?> ReadAccessCodeAsync(string uuid, string signature, bool readOnly = true)
+            => await ReadWhere(uuid: uuid, signature: signature, readOnly: readOnly)
                 .Select(er => er.AccessCode)
                 .FirstOrDefaultAsync();
 
         public async Task<int> CountAsync(string uuid, string signature) => await ReadWhere(uuid: uuid, signature: signature).CountAsync();
 
-        public IQueryable<EnvelopeReceiver> ReadById(int envelopeId, int receiverId) => _dbSet.AsNoTracking()
-            .Where(er => er.EnvelopeId == envelopeId && er.ReceiverId == receiverId);
+        private IQueryable<EnvelopeReceiver> ReadById(int envelopeId, int receiverId, bool readOnly = true)
+        {
+            var query = readOnly ? _dbSet.AsNoTracking() : _dbSet;
+            return query.Where(er => er.EnvelopeId == envelopeId && er.ReceiverId == receiverId);
+        }
 
-        public async Task<EnvelopeReceiver?> ReadByIdAsync(int envelopeId, int receiverId)
-            => await ReadById(envelopeId: envelopeId, receiverId: receiverId)
+        public async Task<EnvelopeReceiver?> ReadByIdAsync(int envelopeId, int receiverId, bool readOnly = true)
+            => await ReadById(envelopeId: envelopeId, receiverId: receiverId, readOnly: readOnly)
             .FirstOrDefaultAsync();
 
-        public async Task<string?> ReadAccessCodeByIdAsync(int envelopeId, int receiverId)
-            => await ReadById(envelopeId: envelopeId, receiverId: receiverId)
+        public async Task<string?> ReadAccessCodeByIdAsync(int envelopeId, int receiverId, bool readOnly = true)
+            => await ReadById(envelopeId: envelopeId, receiverId: receiverId, readOnly: readOnly)
             .Select(er => er.AccessCode)
             .FirstOrDefaultAsync();
 

EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj

@@ -14,6 +14,8 @@
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -66,9 +68,8 @@
     <Reference Include="DigitalData.Modules.Messaging">
       <HintPath>..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
     </Reference>
-    <Reference Include="GdPicture.NET.14, Version=14.1.0.152, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
+    <Reference Include="GdPicture.NET.14, Version=14.2.89.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.2.89\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">
@@ -177,4 +178,11 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.89\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.89\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets'))" />
+  </Target>
 </Project>

EnvelopeGenerator.Service/My Project/AssemblyInfo.vb

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

EnvelopeGenerator.Service/Scheduler.vb

@@ -26,47 +26,52 @@ Public Class Scheduler
     End Sub
 
     Public Async Function Start(pInterval As Integer) As Task
-        Logger.Debug("Starting Scheduler..")
+        Try
+            Logger.Debug("Starting Scheduler..")
 
-        Dim oProperties As New NameValueCollection()
+            Dim oProperties As New NameValueCollection()
 
-        Scheduler = Await SchedulerBuilder.Create(oProperties).
-            UseDefaultThreadPool(Sub(x) x.MaxConcurrency = 5).
-            BuildScheduler()
+            Scheduler = Await SchedulerBuilder.Create(oProperties).
+                UseDefaultThreadPool(Sub(x) x.MaxConcurrency = 5).
+                BuildScheduler()
 
-        Dim oJobKey = New JobKey(JobName)
-        Dim oJobData = New JobDataMap() From {
-            {Common.Constants.GDPICTURE, LicenseKey},
-            {Common.Constants.LOGCONFIG, LogConfig},
-            {Common.Constants.DATABASE, ConnectionString},
-            {Common.Constants.IGNORED_LABELS, _ignoredLabels}
-        }
+            Dim oJobKey = New JobKey(JobName)
+            Dim oJobData = New JobDataMap() From {
+                {Common.Constants.GDPICTURE, LicenseKey},
+                {Common.Constants.LOGCONFIG, LogConfig},
+                {Common.Constants.DATABASE, ConnectionString},
+                {Common.Constants.IGNORED_LABELS, _ignoredLabels}
+            }
 
-        Logger.Debug("Initialized Job [{0}]", JobName)
+            Logger.Debug("Initialized Job [{0}]", JobName)
 
-        Dim oJob As IJobDetail = JobBuilder.Create(Of FinalizeDocumentJob).
-            UsingJobData(oJobData).
-            WithIdentity(oJobKey).
-            Build()
+            Dim oJob As IJobDetail = JobBuilder.Create(Of FinalizeDocumentJob).
+                UsingJobData(oJobData).
+                WithIdentity(oJobKey).
+                Build()
 
-        Dim oTrigger As ITrigger = TriggerBuilder.Create().
-            ForJob(oJobKey).
-            WithIdentity($"{JobName}-trigger").
-            WithSimpleSchedule(Sub(s) s.
-                RepeatForever().
-                WithIntervalInMinutes(pInterval)).
-            StartNow().
-            Build()
+            Dim oTrigger As ITrigger = TriggerBuilder.Create().
+                ForJob(oJobKey).
+                WithIdentity($"{JobName}-trigger").
+                WithSimpleSchedule(Sub(s) s.
+                    RepeatForever().
+                    WithIntervalInMinutes(pInterval)).
+                StartNow().
+                Build()
 
-        Logger.Debug("Initialized Trigger")
+            Logger.Debug("Initialized Trigger")
 
-        Await Scheduler.ScheduleJob(oJob, oTrigger)
+            Await Scheduler.ScheduleJob(oJob, oTrigger)
 
-        Logger.Debug("Job scheduled.")
+            Logger.Debug("Job scheduled.")
 
-        Await Scheduler.Start()
+            Await Scheduler.Start()
+
+            Logger.Info("Scheduler started!")
+        Catch ex As Exception
+            Logger.Error(ex)
+        End Try
 
-        Logger.Info("Scheduler started!")
     End Function
 
     Public Async Function [Stop]() As Task

EnvelopeGenerator.Service/Service.vb

@@ -37,13 +37,14 @@ Public Class Service
             TempFiles.Create()
 
             ' === Initialize Databases ===
-            Logger.Info("Inititalize Databases")
+            Logger.Info("Inititalize Database ...")
 
             If Config.ConnectionString = String.Empty Then
                 Throw New ApplicationException("Connection String is empty!")
             End If
 
             Database = New MSSQLServer(LogConfig, Config.ConnectionString)
+            Logger.Debug("Database initialized")
 
             If Database.DBInitialized = False Then
                 Throw New ApplicationException("Database connection could not be established!")

EnvelopeGenerator.Service/packages.config

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="GdPicture" version="14.2.89" targetFramework="net48" />
+  <package id="GdPicture.runtimes.windows" version="14.2.89" targetFramework="net48" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net461" />
   <package id="Quartz" version="3.8.0" targetFramework="net462" />

EnvelopeGenerator.Web/Controllers/BaseController.cs

@@ -1,5 +1,4 @@
-using EnvelopeGenerator.Common;
-using EnvelopeGenerator.Web.Services;
+using EnvelopeGenerator.Web.Services;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Web.Controllers

EnvelopeGenerator.Web/Controllers/DocumentController.cs

@@ -9,6 +9,7 @@ using EnvelopeGenerator.Extensions;
 namespace EnvelopeGenerator.Web.Controllers
 {
     [Authorize]
+    [Route("api/[controller]")]
     public class DocumentController : BaseController
     {
         private readonly EnvelopeOldService envelopeService;
@@ -48,7 +49,7 @@ namespace EnvelopeGenerator.Web.Controllers
         }
 
         [Authorize]
-        [HttpPost("api/document/{envelopeKey}")]
+        [HttpPost("{envelopeKey}")]
         public async Task<IActionResult> Open(string envelopeKey)
         {
             try

EnvelopeGenerator.Web/Controllers/EnvelopeController.cs

@@ -1,5 +1,4 @@
 using DigitalData.Core.DTO;
-using EnvelopeGenerator.Application;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Common;
 using EnvelopeGenerator.Web.Services;
@@ -23,7 +22,6 @@ namespace EnvelopeGenerator.Web.Controllers
         private readonly IReceiverService _receiverService;
         private readonly IEnvelopeReceiverService _envRcvService;
 
-
         public EnvelopeController(DatabaseService database,
             EnvelopeOldService envelope,
             ILogger<EnvelopeController> logger, UrlEncoder urlEncoder,

EnvelopeGenerator.Web/Controllers/HomeController.cs

@@ -17,6 +17,9 @@ using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using static EnvelopeGenerator.Common.Constants;
 using Ganss.Xss;
 using Newtonsoft.Json;
+using EnvelopeGenerator.Application.DTOs;
+using DigitalData.Core.Client;
+using EnvelopeGenerator.Application.Extensions;
 
 namespace EnvelopeGenerator.Web.Controllers
 {
@@ -32,8 +35,12 @@ namespace EnvelopeGenerator.Web.Controllers
         private readonly Cultures _cultures;
         private readonly IEnvelopeMailService _mailService;
         private readonly IEnvelopeReceiverReadOnlyService _readOnlyService;
+        private readonly IMessagingService _msgService;
+        private readonly IEnvelopeReceiverCache _erCache;
+        private readonly ICodeGenerator _codeGenerator;
+        private readonly IReceiverService _rcvService;
 
-        public HomeController(EnvelopeOldService envelopeOldService, ILogger<HomeController> logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer<Resource> localizer, IConfiguration configuration, HtmlSanitizer sanitizer, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService)
+        public HomeController(EnvelopeOldService envelopeOldService, ILogger<HomeController> logger, IEnvelopeReceiverService envelopeReceiverService, IEnvelopeHistoryService historyService, IStringLocalizer<Resource> localizer, IConfiguration configuration, HtmlSanitizer sanitizer, Cultures cultures, IEnvelopeMailService envelopeMailService, IEnvelopeReceiverReadOnlyService readOnlyService, IMessagingService messagingService, IEnvelopeReceiverCache envelopeReceiverCache, ICodeGenerator codeGenerator, IReceiverService receiverService)
         {
             this.envelopeOldService = envelopeOldService;
             _envRcvService = envelopeReceiverService;
@@ -45,13 +52,44 @@ namespace EnvelopeGenerator.Web.Controllers
             _mailService = envelopeMailService;
             _logger = logger;
             _readOnlyService = readOnlyService;
+            _msgService = messagingService;
+            _erCache = envelopeReceiverCache;
+            _codeGenerator = codeGenerator;
+            _rcvService = receiverService;
+        }
+
+        [HttpGet("/")]
+        public IActionResult Main([FromQuery] string? culture = null)
+        {
+            //TODO: add a middelware or use an asp.net functionality insead of this code-smell
+            culture = culture is not null ? _sanitizer.Sanitize(culture) : null;
+
+            if (UserLanguage is null && culture is null)
+            {
+                UserLanguage = _cultures.Default.Language;
+                return Redirect($"{Request.Headers["Referer"]}?culture={_cultures.Default.Language}");
+            }
+
+            ViewData["UserCulture"] = _cultures[UserLanguage];
+
+            return View();
         }
         
         [HttpGet("EnvelopeKey/{envelopeReceiverId}")]
-        public async Task<IActionResult> MainAsync([FromRoute] string envelopeReceiverId)
+        public async Task<IActionResult> MainAsync([FromRoute] string envelopeReceiverId, [FromQuery] string? culture = null)
         {
             try
             {
+                //TODO: add a middelware or use an asp.net functionality insead of this code-smell
+                culture = culture is not null ? _sanitizer.Sanitize(culture) : null;
+                envelopeReceiverId = _sanitizer.Sanitize(envelopeReceiverId);
+
+                if (UserLanguage is null && culture is null)
+                {
+                    UserLanguage = _cultures.Default.Language;
+                    return Redirect($"{Request.Headers["Referer"]}?culture={_cultures.Default.Language}");
+                }
+
                 envelopeReceiverId = _sanitizer.Sanitize(envelopeReceiverId);
 
                 if (!envelopeReceiverId.TryDecode(out var decoded))
@@ -99,26 +137,18 @@ namespace EnvelopeGenerator.Web.Controllers
         }
 
         [HttpGet("EnvelopeKey/{envelopeReceiverId}/Locked")]
-        public async Task<IActionResult> EnvelopeLocked([FromRoute] string envelopeReceiverId, [FromQuery] string? culture = null)
+        public async Task<IActionResult> EnvelopeLocked([FromRoute] string envelopeReceiverId)
         {
             try
             {
-                culture = culture is not null ? _sanitizer.Sanitize(culture) : null;
-                envelopeReceiverId = _sanitizer.Sanitize(envelopeReceiverId);
+                ViewData["UserCulture"] = _cultures[UserLanguage];
 
-                if (UserLanguage is null && culture is null)
-                {
-                    UserLanguage = _cultures.Default.Language;
-                    return Redirect($"{Request.Headers["Referer"]}?culture={_cultures.Default.Language}");
-                }
-                else if (UserLanguage is not null && culture is not null)
-                    return Redirect($"Locked");
-
-                ViewData["UserCulture"] = _cultures[UserLanguage ?? culture];
-
-                return await _envRcvService.IsExisting(envelopeReceiverId: envelopeReceiverId).ThenAsync(
-                    Success: isExisting => isExisting ? View().WithData("EnvelopeKey", envelopeReceiverId) : this.ViewEnvelopeNotFound(),
-                    Fail: IActionResult (messages,notices) =>
+                return await _envRcvService.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId: envelopeReceiverId).ThenAsync(
+                    Success: er => View()
+                        .WithData("EnvelopeKey", envelopeReceiverId)
+                        .WithData("TFAEnabled", er.TFAEnabled)
+                        .WithData("HasPhoneNumber", er.HasPhoneNumber),
+                    Fail: IActionResult (messages, notices) =>
                     {
                         _logger.LogNotice(notices);
                         Response.StatusCode = StatusCodes.Status401Unauthorized;
@@ -133,7 +163,7 @@ namespace EnvelopeGenerator.Web.Controllers
         }
 
         [HttpPost("EnvelopeKey/{envelopeReceiverId}/Locked")]
-        public async Task<IActionResult> LogInEnvelope([FromRoute] string envelopeReceiverId, [FromForm] string access_code)
+        public async Task<IActionResult> LogInEnvelope([FromRoute] string envelopeReceiverId, [FromForm] Auth auth)
         {
             try
             {
@@ -148,33 +178,102 @@ namespace EnvelopeGenerator.Web.Controllers
                     return Unauthorized();
                 }
 
-                _logger.LogInformation($"Envelope UUID: [{uuid}]\nReceiver Signature: [{signature}]");
+                _logger.LogInformation("Envelope UUID: [{uuid}]\nReceiver Signature: [{signature}]", uuid, signature);
 
                 //check access code
                 EnvelopeResponse response = await envelopeOldService.LoadEnvelope(envelopeReceiverId);
-                var verification = await _envRcvService.VerifyAccessCodeAsync(uuid: uuid, signature: signature, accessCode: access_code);
-                if (verification.IsFailed)
-                {
-                    _logger.LogNotice(verification.Notices);
-                    Response.StatusCode = StatusCodes.Status401Unauthorized;
-                    return View("EnvelopeLocked")
-                            .WithData("ErrorMessage", _localizer[WebKey.WrongAccessCode].Value);
-                }
 
-                return await _envRcvService.ReadByUuidSignatureAsync(uuid: uuid, signature: signature).ThenAsync<EnvelopeReceiverDto, IActionResult>(
-                        SuccessAsync: async er =>
+                return await _envRcvService.ReadWithSecretByUuidSignatureAsync(uuid: uuid, signature: signature).ThenAsync(
+                        SuccessAsync: async er_secret =>
                         {
-                            //check the access code verification
-                            if (verification.IsWrong())
-							{
-								//Constants.EnvelopeStatus.AccessCodeIncorrect
-								await _historyService.RecordAsync(er.EnvelopeId, er.Receiver!.EmailAddress, Constants.EnvelopeStatus.AccessCodeIncorrect);
-								Response.StatusCode = StatusCodes.Status401Unauthorized;
-								return View("EnvelopeLocked")
-										.WithData("ErrorMessage", _localizer[WebKey.WrongAccessCode].Value);
-							}
+                            async Task<IActionResult> TFAView(bool viaSms)
+                            {
+                                if (viaSms)
+                                {
+                                    var res = await _msgService.SendSmsCodeAsync(er_secret.PhoneNumber!, envelopeReceiverId: envelopeReceiverId);
+                                    if (res.Ok)
+                                        return View("EnvelopeLocked").WithData("CodeType", "smsCode").WithData("SmsExpiration", res.Expiration);
+                                    else if (!res.Allowed)
+                                        return View("EnvelopeLocked").WithData("CodeType", "smsCode").WithData("SmsExpiration", res.AllowedAt);
+                                    else
+                                    {
+                                        var res_json = JsonConvert.SerializeObject(res);
+                                        _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, message: $"An unexpected error occurred while sending an SMS code. Response: ${res_json}");
+                                        return this.ViewInnerServiceError();
+                                    }
+                                }
+                                else
+                                {
+                                    return View("EnvelopeLocked").WithData("CodeType", "authenticatorCode").WithData("QRCodeExpiration", er_secret.Receiver?.TotpExpiration);
+                                }
+                            }
 
-							await _historyService.RecordAsync(er.EnvelopeId, er.Receiver!.EmailAddress, Constants.EnvelopeStatus.AccessCodeCorrect);
+                            if (auth.HasMulti)
+                            {
+                                Response.StatusCode = StatusCodes.Status401Unauthorized;
+                                return View("EnvelopeLocked")
+                                        .WithData("ErrorMessage", _localizer[WebKey.WrongAccessCode].Value);
+                            }
+                            else if (auth.HasAccessCode)
+                            {
+                                //check the access code verification
+                                if (er_secret.AccessCode != auth.AccessCode)
+                                {
+                                    //Constants.EnvelopeStatus.AccessCodeIncorrect
+                                    await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, EnvelopeStatus.AccessCodeIncorrect);
+                                    Response.StatusCode = StatusCodes.Status401Unauthorized;
+                                    return View("EnvelopeLocked")
+                                            .WithData("ErrorMessage", _localizer[WebKey.WrongAccessCode].Value);
+                                }
+
+                                await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, EnvelopeStatus.AccessCodeCorrect);
+
+                                //check if the user has phone is added
+                                if (er_secret.TFAEnabled)
+                                {
+                                    var rcv = er_secret.Receiver;
+                                    if (rcv.IsTotpSecretInvalid())
+                                    {
+                                        rcv.TotpSecretkey = _codeGenerator.GenerateTotpSecretKey();
+                                        rcv.TotpExpiration = DateTime.Now.AddMonths(1);
+                                        await _rcvService.UpdateAsync(rcv);
+                                        await _mailService.SendTFAQrCodeAsync(er_secret);
+                                    }
+                                    return await TFAView(auth.UserSelectSMS);
+                                }
+                                    
+                            }
+                            else if (auth.HasSmsCode)
+                            {
+                                var smsCode = await _erCache.GetSmsCodeAsync(envelopeReceiverId);
+                                if (smsCode is null)
+                                    return RedirectToAction("EnvelopeLocked", new { envelopeReceiverId });
+
+                                if(auth.SmsCode != smsCode)
+                                {
+                                    Response.StatusCode = StatusCodes.Status401Unauthorized;
+                                    ViewData["ErrorMessage"] = _localizer[WebKey.WrongAccessCode].Value;
+                                    return await TFAView(viaSms: true);
+                                }
+                            }
+                            else if (auth.HasAuthenticatorCode)
+                            {
+                                if (er_secret.Receiver!.IsTotpInvalid(totp: auth.AuthenticatorCode!))
+                                {
+                                    Response.StatusCode = StatusCodes.Status401Unauthorized;
+                                    ViewData["ErrorMessage"] = _localizer[WebKey.WrongAccessCode].Value;
+                                    return await TFAView(viaSms: false);
+                                }
+                            }
+                            else
+                            {
+                                Response.StatusCode = StatusCodes.Status401Unauthorized;
+                                return View("EnvelopeLocked")
+                                        .WithData("ErrorMessage", _localizer[WebKey.WrongAccessCode].Value);
+                            }
+
+                            //continue the process without important data to minimize security errors.
+                            EnvelopeReceiverDto er = er_secret;
 
 							ViewData["EnvelopeKey"] = envelopeReceiverId;
 							//check rejection
@@ -189,15 +288,13 @@ namespace EnvelopeGenerator.Web.Controllers
                             if (await _historyService.IsSigned(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress))
                                 return View("EnvelopeSigned");
 
-                            if (response.Envelope.Documents.Count > 0)
+                            if (er.Envelope.Documents?.FirstOrDefault() is EnvelopeDocumentDto doc && doc.ByteData is not null)
                             {
-                                var document = await envelopeOldService.GetDocument(response.Envelope.Documents[0].Id, envelopeReceiverId);
-                                byte[] bytes = await envelopeOldService.GetDocumentContents(document);
-                                ViewData["DocumentBytes"] = bytes;
+                                ViewData["DocumentBytes"] = doc.ByteData;
                             }
                             else
                             {
-                                _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, message: "No document was found.");
+                                _logger.LogEnvelopeError(envelopeReceiverId: envelopeReceiverId, message: "No document byte-data was found in ENVELOPE_DOCUMENT table.");
 								return this.ViewDocumentNotFound();
 							}
 
@@ -259,6 +356,7 @@ namespace EnvelopeGenerator.Web.Controllers
                             return Redirect($"/EnvelopeKey/{envelopeReceiverId}/Locked");
 
                         await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+                        ViewData["UserCulture"] = _cultures[UserLanguage];
                         ViewData["EnvelopeKey"] = envelopeReceiverId;
                         return View();
                     },
@@ -286,7 +384,7 @@ namespace EnvelopeGenerator.Web.Controllers
                 await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
                 return await _envRcvService.ReadByEnvelopeReceiverIdAsync(envelopeReceiverId).ThenAsync(
                     SuccessAsync: async (er) =>
-                    {
+                    {ViewData["UserCulture"] = _cultures[UserLanguage];
                         ViewData["UserCulture"] = _cultures[UserLanguage];
                         return await _historyService.IsRejected(envelopeId: er.EnvelopeId)
                             ? View(er)
@@ -311,6 +409,8 @@ namespace EnvelopeGenerator.Web.Controllers
         {
             try
             {
+                ViewData["UserCulture"] = _cultures[UserLanguage];
+
                 readOnlyKey = _sanitizer.Sanitize(readOnlyKey);
 
                 // check if the readOnlyId is valid
@@ -350,12 +450,10 @@ namespace EnvelopeGenerator.Web.Controllers
                         _logger.LogNotice(hist_res.Notices);
                     }
 
-                    if (response.Envelope.Documents.Count > 0)
+                    if (er.Envelope.Documents?.FirstOrDefault() is EnvelopeDocumentDto doc && doc.ByteData is not null)
                     {
-                        var document = await envelopeOldService.GetDocument(response.Envelope.Documents[0].Id, envelopeKey);
-                        byte[] bytes = await envelopeOldService.GetDocumentContents(document);
+                        ViewData["DocumentBytes"] = doc.ByteData;
                         ViewData["EnvelopeKey"] = envelopeKey;
-                        ViewData["DocumentBytes"] = bytes;
                         ViewData["IsReadOnly"] = true;
                         ViewData["ReadOnly"] = erro;
                         ViewData["PSPDFKitLicenseKey"] = _configuration["PSPDFKitLicenseKey"];
@@ -363,7 +461,7 @@ namespace EnvelopeGenerator.Web.Controllers
                     }
                     else
                     {
-                        _logger.LogEnvelopeError(envelopeReceiverId: envelopeKey, message: "No document was found.");
+                        _logger.LogEnvelopeError(envelopeReceiverId: envelopeKey, message: "No document byte-data was found in ENVELOPE_DOCUMENT table.");
                         return this.ViewDocumentNotFound();
                     }
                 },

EnvelopeGenerator.Web/Controllers/LocalizationController.cs

@@ -1,6 +1,5 @@
 using EnvelopeGenerator.Application.Resources;
 using Ganss.Xss;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Localization;
 

EnvelopeGenerator.Web/Controllers/ReadOnlyController.cs

@@ -1,7 +1,6 @@
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Extensions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;

EnvelopeGenerator.Web/Controllers/Test/TestCacheController.cs

@@ -0,0 +1,35 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Caching.Distributed;
+
+namespace EnvelopeGenerator.Web.Controllers.Test
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class TestCacheController : ControllerBase
+    {
+        private readonly IDistributedCache _cache;
+
+        public TestCacheController(IDistributedCache cache)
+        {
+            _cache = cache;
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> SetCacheAsync(string key, string value)
+        {
+            var options = new DistributedCacheEntryOptions()
+                .SetAbsoluteExpiration(TimeSpan.FromMinutes(5));
+
+            await _cache.SetStringAsync(key, value, options);
+
+            return Ok();
+        }
+
+        [HttpGet]
+        public async Task<IActionResult> GetCacheAsync(string key)
+        {
+            var value = await _cache.GetStringAsync(key);
+            return value is null ? BadRequest() : Ok(value);
+        }
+    }
+}

EnvelopeGenerator.Web/Controllers/Test/TestMessagingController.cs

@@ -0,0 +1,24 @@
+using EnvelopeGenerator.Application.Contracts;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.Web.Controllers.Test
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class TestMessagingController : ControllerBase
+    {
+        private readonly IMessagingService _service;
+
+        public TestMessagingController(IMessagingService service)
+        {
+            _service = service;
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> SendAsync(string recipient, string message, bool staticResponse = true)
+        {
+            var res = await _service.SendSmsAsync(recipient: recipient, message: message);
+            return res is null? StatusCode(StatusCodes.Status500InternalServerError) : Ok(res);
+        }
+    }
+}

EnvelopeGenerator.Web/Controllers/Test/TestViewController.cs

@@ -1,10 +1,10 @@
-using EnvelopeGenerator.Application.Contracts;
-using EnvelopeGenerator.Common;
+using EnvelopeGenerator.Common;
 using EnvelopeGenerator.Web.Services;
 using Microsoft.AspNetCore.Mvc;
 
 namespace EnvelopeGenerator.Web.Controllers.Test
 {
+    [Route("api/test/[controller]")]
     public class TestViewController : BaseController
     {
         private readonly EnvelopeOldService envelopeOldService;
@@ -16,13 +16,13 @@ namespace EnvelopeGenerator.Web.Controllers.Test
             _config = configuration;
         }
 
-        [HttpGet("/")]
+        [HttpGet]
         public IActionResult Index()
         {
             return View("Index");
         }
 
-        [HttpPost("/")]
+        [HttpPost]
         public IActionResult DebugEnvelopes([FromForm] string? password)
         {
             try

EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <PackageId>EnvelopeGenerator.Web</PackageId>
-    <Version>2.1.1.0</Version>
+    <Version>2.7.0</Version>
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
     <Product>EnvelopeGenerator.Web</Product>
@@ -13,11 +13,18 @@
     <PackageTags>digital data envelope generator web</PackageTags>
     <Description>EnvelopeGenerator.Web is an ASP.NET MVC application developed to manage signing processes. It uses Entity Framework Core (EF Core) for database operations. The user interface for signing processes is developed with Razor View Engine (.cshtml files) and JavaScript under wwwroot, integrated with PSPDFKit. This integration allows users to view and sign documents seamlessly.</Description>
     <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
-    <AssemblyVersion>2.1.1.0</AssemblyVersion>
-    <FileVersion>2.1.1.0</FileVersion>
+    <AssemblyVersion>2.7.0</AssemblyVersion>
+    <FileVersion>2.7.0</FileVersion>
     <Copyright>Copyright © 2024 Digital Data GmbH. All rights reserved.</Copyright>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="wwwroot\lib\typed.js\**" />
+    <Content Remove="wwwroot\lib\typed.js\**" />
+    <EmbeddedResource Remove="wwwroot\lib\typed.js\**" />
+    <None Remove="wwwroot\lib\typed.js\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Remove="bundleconfig.json" />
   </ItemGroup>
@@ -39,8 +46,8 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
-    <PackageReference Include="DigitalData.Core.API" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
+    <PackageReference Include="DigitalData.Core.API" Version="2.0.1" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="2.0.0" />
     <PackageReference Include="HtmlSanitizer" Version="8.0.865" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
@@ -50,6 +57,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15" />
+    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="5.2.5" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
@@ -113,6 +121,12 @@
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
+    <None Update="Scripts\create-sql-cache.bat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Scripts\create-sql-cache.sql">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>

EnvelopeGenerator.Web/Models/Auth.cs

@@ -0,0 +1,15 @@
+namespace EnvelopeGenerator.Web.Models
+{
+    public record Auth(string? AccessCode = null, string? SmsCode = null, string? AuthenticatorCode = null, bool UserSelectSMS = default)
+    {
+        public bool HasAccessCode => AccessCode is not null;
+
+        public bool HasSmsCode => SmsCode is not null;
+
+        public bool HasAuthenticatorCode => AuthenticatorCode is not null;
+
+        public bool HasMulti => new[] { HasAccessCode, HasSmsCode, HasAuthenticatorCode }.Count(state => state) > 1;
+
+        public bool HasNone => !(HasAccessCode || HasSmsCode || HasAuthenticatorCode);
+    }
+}

EnvelopeGenerator.Web/Program.cs

@@ -1,4 +1,3 @@
-using DigitalData.UserManager.Infrastructure.Repositories;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.Services;
 using EnvelopeGenerator.Web.Services;
@@ -9,7 +8,6 @@ using NLog.Web;
 using DigitalData.Core.API;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using EnvelopeGenerator.Web.Models;
-using DigitalData.Core.DTO;
 using System.Text.Encodings.Web;
 using Ganss.Xss;
 using Microsoft.Extensions.Options;
@@ -17,6 +15,7 @@ using EnvelopeGenerator.Application;
 using DigitalData.EmailProfilerDispatcher;
 using EnvelopeGenerator.Infrastructure;
 using EnvelopeGenerator.Web.Sanitizers;
+using EnvelopeGenerator.Application.Extensions;
 
 var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
 logger.Info("Logging initialized!");
@@ -81,6 +80,12 @@ try
     //AddEF Core dbcontext
     var connStr = config.GetConnectionString(Key.Default) ?? throw new InvalidOperationException("There is no default connection string in appsettings.json.");
     builder.Services.AddDbContext<EGDbContext>(options => options.UseSqlServer(connStr));
+    builder.Services.AddDistributedSqlServerCache(options =>
+    {
+        options.ConnectionString = connStr;
+        options.SchemaName = "dbo";
+        options.TableName = "TBDD_CACHE";
+    });
 
     // Add envelope generator services
     builder.Services.AddEnvelopeGenerator(config);
@@ -130,8 +135,6 @@ try
 
     builder.Services.AddSingleton(config.GetSection("ContactLink").Get<ContactLink>() ?? new());
 
-    builder.Services.AddCookieConsentSettings();
-
     builder.Services.AddCookieBasedLocalizer();
     
     builder.Services.AddSingleton(HtmlEncoder.Default);

EnvelopeGenerator.Web/Scripts/create-sql-cache.bat

@@ -0,0 +1,2 @@
+dotnet sql-cache create "CONNECTION_STRING" dbo TBDD_CACHE
+pause

EnvelopeGenerator.Web/Scripts/create-sql-cache.sql

@@ -0,0 +1,23 @@
+USE [DD_ECM]
+GO
+
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+CREATE TABLE [dbo].[TBDD_CACHE](
+	[Id] [nvarchar](449) NOT NULL,
+	[Value] [varbinary](max) NOT NULL,
+	[ExpiresAtTime] [datetimeoffset](7) NOT NULL,
+	[SlidingExpirationInSeconds] [bigint] NULL,
+	[AbsoluteExpiration] [datetimeoffset](7) NULL,
+PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+

EnvelopeGenerator.Web/Services/EnvelopeOldService.cs

@@ -98,13 +98,6 @@ namespace EnvelopeGenerator.Web.Services
             //if documenet_path_dmz is existing in config, replace the path with it
             var config = await _configService.ReadDefaultAsync();
 
-            if (config.DocumentPathDmz is not null && config.DocumentPathDmz != string.Empty)
-                foreach (var doc in envelope.Documents)
-                {
-                    doc.Filepath = doc.Filepath.Replace(config.DocumentPath, config.DocumentPathDmz);
-                }
-
-
             return new()
             {
                 Receiver = receiver,

EnvelopeGenerator.Web/Views/Home/EnvelopeExpired.cshtml

@@ -20,5 +20,4 @@
     <section class="text-center">
         <p>Der Zeitraum für die gemeinsame Nutzung von Dokumenten ist abgelaufen.</p>
     </section>
-</div>
-<footer class="container" id="page-footer">&copy; SignFlow 2023-2024 <a href="https://digitaldata.works">Digital Data GmbH</a></footer>
+</div>

EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml

@@ -1,10 +1,21 @@
-@{
+@using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+@using Newtonsoft.Json
+@model Auth;
+@{
     var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string;
     var logo = _logoOpt.Value;
-}
-@{
     ViewData["Title"] = _localizer[WebKey.DocProtected];
     var userCulture = ViewData["UserCulture"] as Culture;
+    string codeType = ViewData["CodeType"] is string _codeType ? _codeType : "accessCode";
+    string codePropName = char.ToUpper(codeType[0]) + codeType.Substring(1);
+    string codeKeyName = codePropName.Replace("Code", "");
+    bool viaSms = codeType == "smsCode";
+    bool viaAuthenticator = codeType == "authenticatorCode";
+    bool viaTFA = viaSms || viaAuthenticator;
+    DateTime? smsExpiration = ViewData["SmsExpiration"] is DateTime _smsExpiration ? _smsExpiration : null;
+    DateTime? qrCodeExpiration = ViewData["QRCodeExpiration"] is DateTime _qrCodeExpiration ? _qrCodeExpiration : null;
+    bool tfaEnabled = ViewData["TFAEnabled"] is bool _tfaEnabled && _tfaEnabled;
+    bool hasPhoneNumber = ViewData["HasPhoneNumber"] is bool _hasPhoneNumber && _hasPhoneNumber;
 }
 <div class="page container py-4 px-4">
     <header class="text-center">
@@ -12,45 +23,46 @@
             <h3 class="text">@_localizer[WebKey.WelcomeToTheESignPortal]</h3>
             <img class="@logo.LockedPageClass" src="@logo.Src" />
         </div>
-        <div class="icon locked mt-4 mb-1">
+        <div class="icon locked @(viaTFA ? "tfa" : "") mt-4 mb-1">
             <svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" fill="currentColor" class="bi bi-shield-lock" viewBox="0 0 16 16">
                 <path d="M5.338 1.59a61 61 0 0 0-2.837.856.48.48 0 0 0-.328.39c-.554 4.157.726 7.19 2.253 9.188a10.7 10.7 0 0 0 2.287 2.233c.346.244.652.42.893.533q.18.085.293.118a1 1 0 0 0 .101.025 1 1 0 0 0 .1-.025q.114-.034.294-.118c.24-.113.547-.29.893-.533a10.7 10.7 0 0 0 2.287-2.233c1.527-1.997 2.807-5.031 2.253-9.188a.48.48 0 0 0-.328-.39c-.651-.213-1.75-.56-2.837-.855C9.552 1.29 8.531 1.067 8 1.067c-.53 0-1.552.223-2.662.524zM5.072.56C6.157.265 7.31 0 8 0s1.843.265 2.928.56c1.11.3 2.229.655 2.887.87a1.54 1.54 0 0 1 1.044 1.262c.596 4.477-.787 7.795-2.465 9.99a11.8 11.8 0 0 1-2.517 2.453 7 7 0 0 1-1.048.625c-.28.132-.581.24-.829.24s-.548-.108-.829-.24a7 7 0 0 1-1.048-.625 11.8 11.8 0 0 1-2.517-2.453C1.928 10.487.545 7.169 1.141 2.692A1.54 1.54 0 0 1 2.185 1.43 63 63 0 0 1 5.072.56" />
                 <path d="M9.5 6.5a1.5 1.5 0 0 1-1 1.415l.385 1.99a.5.5 0 0 1-.491.595h-.788a.5.5 0 0 1-.49-.595l.384-1.99a1.5 1.5 0 1 1 2-1.415" />
             </svg>
         </div>
-        <h1>@_localizer[WebKey.LockedTitle]</h1>
+        <h1>@_localizer[WebKey.Formats.LockedTitle.Format(codeKeyName)]</h1>
     </header>
     <section class="text-center">
-        <p>@_localizer[WebKey.LockedBody]</p>
+        <p>@_localizer[WebKey.Formats.LockedBody.Format(codeKeyName)].Value.Format(qrCodeExpiration.ToString())</p>
     </section>
     <div class="row m-0 p-0">
         <div class="access-code-panel justify-content-center align-items-center p-0 m-0">
             <form id="form-access-code" class="form form-floating mb-0" method="post"> 
                 <div class="form-floating access-code-form-floating">
-                    <input type="password" id="access_code" class="form-control" name="access_code" placeholder="@_localizer[WebKey.LockedAccessCode]" required="required">
-                    <label for="access_code">@_localizer[WebKey.LockedAccessCode]</label>
+                    <input type="password" id="access_code" class="form-control" name="@codeType" placeholder="@_localizer[WebKey.Formats.LockedCodeLabel.Format(codeKeyName)]" required="required">
+                    <label for="access_code">@_localizer[WebKey.Formats.LockedCodeLabel.Format(codeKeyName)]</label>
                     <button type="submit" class="btn btn-primary">
                         <span class="material-symbols-outlined">
                             login
                         </span>
                     </button>
-                </div>
-                <div class="dropdown flag-dropdown">
-                    <button class="btn btn-outline-secondary dropdown-toggle" type="button" id="langDropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
-                        <span class="fi @userCulture?.FIClass.TrySanitize(_sanitizer) me-2" id="selectedFlag"></span><span id="selectedLanguage"></span>
-                    </button>
-                    <ul class="dropdown-menu" aria-labelledby="langDropdownMenuButton">
-                        @foreach (var culture in _cultures)
+                    @if (tfaEnabled)
+                    {
+                    <div class="form-check form-switch tfa-sms">
+                        @if(hasPhoneNumber)
                         {
-                            var lang = culture.Language;
-                            var info = culture.Info;
-                            <li>
-                                <a class="dropdown-item" data-language="@lang.TrySanitize(_sanitizer)" data-flag="@_cultures[lang]?.FIClass.TrySanitize(_sanitizer)">
-                                    <span class="fi @_cultures[lang]?.FIClass.TrySanitize(_sanitizer) me-2"></span>@info?.Parent.NativeName
-                                </a>
-                            </li>
+                        <input asp-for="UserSelectSMS" class="form-check-input" name="userSelectSMS" type="checkbox" role="switch" id="flexSwitchCheckChecked">
                         }
-                    </ul>
+                        else
+                        {
+                        <input asp-for="UserSelectSMS" class="form-check-input" name="userSelectSMS" type="checkbox" role="switch" id="flexSwitchCheckChecked" disabled)>
+                        }                        
+                        <label class="form-check-label" for="flexSwitchCheckChecked">2FA per SMS</label>
+                    </div>
+                    }
+                    @if (smsExpiration is not null)
+                    {
+                    <div id="sms-timer" class="alert alert-primary" role="alert">00:00</div>
+                    }
                 </div>
             </form>
         </div>
@@ -64,22 +76,34 @@
     }
     <section class="no-receiver-explanation text-center">
         <details>
-            <summary>@_localizer[WebKey.LockedFooterTitle]</summary>
-            <p>@_localizer[WebKey.LockedFooterBody]</p>
+            <summary>@_localizer[WebKey.Formats.LockedFooterTitle.Format(codeKeyName)]</summary>
+            <p>@_localizer[WebKey.Formats.LockedFooterBody.Format(codeKeyName)]</p>
         </details>
     </section>
 </div>
 <script nonce="@nonce">
-    document.addEventListener('DOMContentLoaded', function () {
-        var dropdownItems = document.querySelectorAll('.dropdown-item');
-        dropdownItems.forEach(function (item) {
-            item.addEventListener('click', async function(event) {
-                event.preventDefault();
-                var language = this.getAttribute('data-language');
-                var flagCode = this.getAttribute('data-flag');
-                document.getElementById('selectedFlag').className = 'fi ' + flagCode + ' me-2';
-                await setLanguage(language);
-            });
-        });
-    });
+    var expiration = new Date(@Html.Raw(JsonConvert.SerializeObject(smsExpiration)));
+
+    const element = document.getElementById("sms-timer");
+
+    const interval = setInterval(function () {
+        var now = new Date();
+
+        var diffInMillis = expiration - now;
+
+        if (diffInMillis <= 0) {
+            element.textContent = "00:00";
+            clearInterval(interval);
+            return;
+        }
+
+        var minutes = Math.floor(diffInMillis / 1000 / 60);
+        var seconds = Math.floor((diffInMillis / 1000) % 60);
+
+        var formattedMinutes = minutes.toString().padStart(2, '0');
+        var formattedSeconds = seconds.toString().padStart(2, '0');
+
+        var remainingTime = `${formattedMinutes}:${formattedSeconds}`;
+        element.textContent = remainingTime;
+    }, 1000);
 </script>

EnvelopeGenerator.Web/Views/Home/EnvelopeRejected.cshtml

@@ -9,7 +9,6 @@
 @using Newtonsoft.Json
 @using Newtonsoft.Json.Serialization
 @model EnvelopeReceiverDto;
-<partial name="_CookieConsentPartial" />
 @{
 	var userCulture = ViewData["UserCulture"] as Culture;
 	var envelope = Model.Envelope;
@@ -69,5 +68,4 @@
 			</p>
 		</div>
     </section>   
-</div>
-<footer class="container" id="page-footer">&copy; SignFlow 2023-2024 <a href="https://digitaldata.works">Digital Data GmbH</a></footer>
+</div>

EnvelopeGenerator.Web/Views/Home/EnvelopeSigned.cshtml

@@ -14,5 +14,4 @@
     <section class="text-center">
         <p>Sie haben das Dokument signiert. Im Anschluss erhalten Sie eine schriftliche Bestätigung.</p>
     </section>   
-</div>
-<footer class="container" id="page-footer">&copy; SignFlow 2023-2024 <a href="https://digitaldata.works">Digital Data GmbH</a></footer>
+</div>