chore(Web): Aktualisiert auf 2.7.0.

- Erstellte Optionen.
 - Zu DI hinzugefügt.

EnvelopeGenerator.Application/Configurations/CodeGeneratorConfig.cs

@@ -0,0 +1,7 @@
+namespace EnvelopeGenerator.Application.Configurations
+{
+    public class CodeGeneratorConfig
+    {
+        public string CharPool { get; init; } = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567890123456789012345678901234567890123456789";
+    }
+}

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

@@ -1,4 +1,5 @@
 using DigitalData.Core.Abstractions.Client;
+using Microsoft.Extensions.Caching.Distributed;
 
 namespace EnvelopeGenerator.Application.Configurations.GtxMessaging
 {
@@ -18,5 +19,7 @@ namespace EnvelopeGenerator.Application.Configurations.GtxMessaging
         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,7 @@
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface ICodeGenerator
+    {
+        string GenerateCode(int length);
+    }
+}

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
@@ -11,12 +11,14 @@ namespace EnvelopeGenerator.Application.Contracts
 
         Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false);
 
-        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<EnvelopeReceiverDto>> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true);
 
+        Task<DataResult<EnvelopeReceiverSecretDto>> ReadWithSecretByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true);
+
         Task<DataResult<EnvelopeReceiverDto>> ReadByEnvelopeReceiverIdAsync(string envelopeReceiverId, bool withEnvelope = true, bool withReceiver = 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

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

EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverBasicDto.cs

@@ -25,5 +25,7 @@ namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
         public DateTime AddedWhen { get; init; }
 
         public DateTime? ChangedWhen { get; init; }
+
+        public bool HasPhoneNumber { 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/EnvelopeGenerator.Application.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
     <PackageReference Include="DigitalData.Core.Application" Version="2.0.0" />
-    <PackageReference Include="DigitalData.Core.Client" Version="2.0.2" />
+    <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" />

EnvelopeGenerator.Application/Extensions/CacheExtensions.cs

@@ -0,0 +1,43 @@
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+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));
+        }
+    }
+}

EnvelopeGenerator.Application/Extensions/DIExtensions.cs

@@ -11,11 +11,11 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
 using DigitalData.Core.Client;
 using EnvelopeGenerator.Application.Configurations.GtxMessaging;
 
-namespace EnvelopeGenerator.Application
+namespace EnvelopeGenerator.Application.Extensions
 {
     public static class DIExtensions
     {
-        public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, IConfigurationSection dispatcherConfigSection, IConfigurationSection mailConfigSection, IConfigurationSection smsConfigSection)
+        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>();
@@ -55,9 +55,13 @@ namespace EnvelopeGenerator.Application
 
             services.Configure<DispatcherConfig>(dispatcherConfigSection);
             services.Configure<MailConfig>(mailConfigSection);
+            services.Configure<CodeGeneratorConfig>(codeGeneratorConfigSection);
+            services.Configure<EnvelopeReceiverCacheParams>(envelopeReceiverCacheParamsSection);
 
             services.AddHttpClientService<SmsParams>(smsConfigSection);
             services.TryAddSingleton<IMessagingService, GtxMessagingService>();
+            services.TryAddSingleton<ICodeGenerator, CodeGenerator>();
+            services.TryAddSingleton<IEnvelopeReceiverCache, EnvelopeReceiverCache>();
 
             return services;
         }
@@ -65,6 +69,8 @@ namespace EnvelopeGenerator.Application
         public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, IConfiguration config) => services.AddEnvelopeGenerator(
             dispatcherConfigSection: config.GetSection("DispatcherConfig"),
             mailConfigSection: config.GetSection("MailConfig"),
-            smsConfigSection: config.GetSection("SmsConfig"));
+            smsConfigSection: config.GetSection("SmsConfig"),
+            codeGeneratorConfigSection: config.GetSection("CodeGeneratorConfig"),
+            envelopeReceiverCacheParamsSection: config.GetSection("EnvelopeReceiverCacheParams"));
     }
 }

EnvelopeGenerator.Application/Extensions/MappingExtensions.cs

@@ -0,0 +1,12 @@
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+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";
+    }
+}

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
 {
@@ -50,6 +53,13 @@ namespace EnvelopeGenerator.Application.MappingProfiles
             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

@@ -177,6 +177,21 @@
   <data name="LockedFooterTitle" xml:space="preserve">
     <value>Sie haben keinen Zugriffscode erhalten?</value>
   </data>
+  <data name="LockedSmsAccessCode" xml:space="preserve">
+    <value>SMS-Code</value>
+  </data>
+  <data name="LockedSmsTfaBody" xml:space="preserve">
+    <value>Wir haben soeben den Zugangscode als SMS an die von Ihnen angegebene Telefonnummer gesendet.</value>
+  </data>
+  <data name="LockedSmsTfaFooterBody" 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="LockedSmsTfaFooterTitle" xml:space="preserve">
+    <value>Sie haben keine SMS erhalten?</value>
+  </data>
+  <data name="LockedSmsTfaTitle" xml:space="preserve">
+    <value>2-Faktor-Authentifizierung</value>
+  </data>
   <data name="LockedTitle" xml:space="preserve">
     <value>Dokument erfordert einen Zugriffscode</value>
   </data>

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

@@ -177,6 +177,21 @@
   <data name="LockedFooterTitle" xml:space="preserve">
     <value>You have not received an access code?</value>
   </data>
+  <data name="LockedSmsAccessCode" xml:space="preserve">
+    <value>SMS Code</value>
+  </data>
+  <data name="LockedSmsTfaBody" xml:space="preserve">
+    <value>We have just sent the access code as an SMS to the phone number you provided.</value>
+  </data>
+  <data name="LockedSmsTfaFooterBody" 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="LockedSmsTfaFooterTitle" xml:space="preserve">
+    <value>You have not received an SMS?</value>
+  </data>
+  <data name="LockedSmsTfaTitle" xml:space="preserve">
+    <value>2-Factor Authentication</value>
+  </data>
   <data name="LockedTitle" xml:space="preserve">
     <value>Document requires an access code</value>
   </data>

EnvelopeGenerator.Application/Services/CodeGenerator.cs

@@ -0,0 +1,37 @@
+using EnvelopeGenerator.Application.Configurations;
+using EnvelopeGenerator.Application.Contracts;
+using Microsoft.Extensions.Options;
+using System.Text;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class CodeGenerator : ICodeGenerator
+    {
+        public static Lazy<CodeGenerator> LazyStatic => new(() => new CodeGenerator(Options.Create<CodeGeneratorConfig>(new())));
+
+        public static CodeGenerator Static => LazyStatic.Value;
+
+        private readonly string _charPool;
+
+        public CodeGenerator(IOptions<CodeGeneratorConfig> options)
+        {
+            _charPool = options.Value.CharPool;
+        }
+
+        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(_charPool[random.Next(_charPool.Length)]);
+
+            return passwordBuilder.ToString();
+        }
+    }
+}

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,10 +17,13 @@ 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)
@@ -34,10 +38,10 @@ namespace EnvelopeGenerator.Application.Services
             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)
@@ -50,6 +54,16 @@ namespace EnvelopeGenerator.Application.Services
             return Result.Success(_mapper.Map<EnvelopeReceiverDto>(env_rcv));
         }
 
+        public async Task<DataResult<EnvelopeReceiverSecretDto>> ReadWithSecretByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true)
+        {
+            var env_rcv = await _repository.ReadByUuidSignatureAsync(uuid: uuid, signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver);
+            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)
         {
             (string? uuid, string? signature)  = envelopeReceiverId.DecodeEnvelopeReceiverId();
@@ -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

@@ -1,7 +1,12 @@
-using DigitalData.Core.Abstractions.Client;
+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
@@ -11,21 +16,55 @@ namespace EnvelopeGenerator.Application.Services
         private readonly IHttpClientService<SmsParams> _smsClient;
 
         private readonly SmsParams _smsParams;
-        
-        public GtxMessagingService(IHttpClientService<SmsParams> smsClient, IOptions<SmsParams> smsParamsOptions)
+
+        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 Task<dynamic?> SendSmsAsync(string recipient, string message) => SendSmsAsync<dynamic>(recipient: recipient, message: message);
-
-        public async Task<TResponse?> SendSmsAsync<TResponse>(string recipient, string message)
+        public async Task<SmsResponse> SendSmsAsync(string recipient, string message)
         {
-            return await _smsClient.FetchAsync(queryParams: new Dictionary<string, object?>() {
+            return await _smsClient.FetchAsync(queryParams: new Dictionary<string, object?>()
+            {
                 { _smsParams.RecipientQueryParamName, recipient },
                 { _smsParams.MessageQueryParamName, message }
-            }).ThenAsync(res => res.Json<TResponse>());
+            })
+            .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.Domain/Entities/EnvelopeReceiverBase.cs

@@ -41,6 +41,15 @@ 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; }
+
+        [NotMapped]
         public (int Envelope, int Receiver) Id => (Envelope: EnvelopeId, Receiver: ReceiverId);
+
+        [NotMapped]
+        public bool HasPhoneNumber => PhoneNumber is not null;
     }
 }

EnvelopeGenerator.Domain/HttpResponse/GtxMessagingResponse.cs

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

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;

EnvelopeGenerator.Web/Controllers/HomeController.cs

@@ -18,7 +18,8 @@ using static EnvelopeGenerator.Common.Constants;
 using Ganss.Xss;
 using Newtonsoft.Json;
 using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
+using DigitalData.Core.Client;
+using DevExpress.Utils.About;
 
 namespace EnvelopeGenerator.Web.Controllers
 {
@@ -34,8 +35,10 @@ namespace EnvelopeGenerator.Web.Controllers
         private readonly Cultures _cultures;
         private readonly IEnvelopeMailService _mailService;
         private readonly IEnvelopeReceiverReadOnlyService _readOnlyService;
+        private readonly IMessagingService _msgService;
+        private readonly IEnvelopeReceiverCache _erCache;
 
-        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)
         {
             this.envelopeOldService = envelopeOldService;
             _envRcvService = envelopeReceiverService;
@@ -47,6 +50,8 @@ namespace EnvelopeGenerator.Web.Controllers
             _mailService = envelopeMailService;
             _logger = logger;
             _readOnlyService = readOnlyService;
+            _msgService = messagingService;
+            _erCache = envelopeReceiverCache;
         }
 
         [HttpGet("/")]
@@ -134,9 +139,9 @@ namespace EnvelopeGenerator.Web.Controllers
             {
                 ViewData["UserCulture"] = _cultures[UserLanguage];
 
-                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),
+                    Fail: IActionResult (messages, notices) =>
                     {
                         _logger.LogNotice(notices);
                         Response.StatusCode = StatusCodes.Status401Unauthorized;
@@ -151,7 +156,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
             {
@@ -166,33 +171,77 @@ 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<EnvelopeReceiverSecretDto, IActionResult>(
+                        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> SendSmsView()
+                            {
+                                var res = await _msgService.SendSmsCodeAsync(er_secret.PhoneNumber!, envelopeReceiverId: envelopeReceiverId);
+                                if (res.Ok)
+                                    return View("EnvelopeLocked").WithData("ViaSms", true).WithData("Expiration", res.Expiration);
+                                else if (!res.Allowed)
+                                    return View("EnvelopeLocked").WithData("ViaSms", true).WithData("Expiration", 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();
+                                }
+                            }
 
-							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, Constants.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, Constants.EnvelopeStatus.AccessCodeCorrect);
+
+                                //check if the user has phone is added
+                                if (er_secret.HasPhoneNumber)
+                                {
+                                    return await SendSmsView();
+                                }
+                            }
+                            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 SendSmsView();
+                                }
+                            }
+                            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

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

@@ -15,7 +15,7 @@ namespace EnvelopeGenerator.Web.Controllers.Test
         }
 
         [HttpPost]
-        public async Task<IActionResult> SendAsync(string recipient, string message)
+        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/EnvelopeGenerator.Web.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <PackageId>EnvelopeGenerator.Web</PackageId>
-    <Version>2.6.0</Version>
+    <Version>2.7.0</Version>
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
     <Product>EnvelopeGenerator.Web</Product>
@@ -13,8 +13,8 @@
     <PackageTags>digital data envelope generator web</PackageTags>
     <Description>EnvelopeGenerator.Web is an ASP.NET MVC application developed to manage signing processes. It uses Entity Framework Core (EF Core) for database operations. The user interface for signing processes is developed with Razor View Engine (.cshtml files) and JavaScript under wwwroot, integrated with PSPDFKit. This integration allows users to view and sign documents seamlessly.</Description>
     <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
-    <AssemblyVersion>2.6.0</AssemblyVersion>
-    <FileVersion>2.6.0</FileVersion>
+    <AssemblyVersion>2.7.0</AssemblyVersion>
+    <FileVersion>2.7.0</FileVersion>
     <Copyright>Copyright © 2024 Digital Data GmbH. All rights reserved.</Copyright>
   </PropertyGroup>
 
@@ -47,7 +47,7 @@
     <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
     <PackageReference Include="DigitalData.Core.Abstractions" Version="2.2.1" />
-    <PackageReference Include="DigitalData.Core.API" Version="2.0.0" />
+    <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" />
@@ -57,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" />
@@ -120,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,13 @@
+namespace EnvelopeGenerator.Web.Models
+{
+    public record Auth(string? AccessCode = null, string? SmsCode = null)
+    {
+        public bool HasAccessCode => AccessCode is not null;
+
+        public bool HasSmsCode => SmsCode is not null;
+
+        public bool HasMulti => HasAccessCode && HasSmsCode;
+
+        public bool HasNone => !(HasAccessCode || HasSmsCode);
+    }
+}

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);

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/Views/Home/EnvelopeLocked.cshtml

@@ -1,8 +1,13 @@
-@{
+@using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+@using Newtonsoft.Json
+@{
     var nonce = _accessor.HttpContext?.Items["csp-nonce"] as string;
     var logo = _logoOpt.Value;
     ViewData["Title"] = _localizer[WebKey.DocProtected];
     var userCulture = ViewData["UserCulture"] as Culture;
+    bool viaSms = ViewData["ViaSms"] is bool _viaSms && _viaSms;
+    var accessCodeName = viaSms ? "smsCode" : "accessCode";
+    DateTime? expiration = ViewData["Expiration"] is DateTime _expiration ? _expiration : null;
 }
 <div class="page container py-4 px-4">
     <header class="text-center">
@@ -10,28 +15,32 @@
             <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 @(viaSms ? "sms-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[viaSms ? WebKey.LockedSmsTfaTitle : WebKey.LockedTitle]</h1>
     </header>
     <section class="text-center">
-        <p>@_localizer[WebKey.LockedBody]</p>
+        <p>@_localizer[viaSms ? WebKey.LockedSmsTfaBody : WebKey.LockedBody]</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="@accessCodeName" placeholder="@_localizer[viaSms ? WebKey.LockedSmsAccessCode : WebKey.LockedAccessCode]" required="required">
+                    <label for="access_code">@_localizer[viaSms ? WebKey.LockedSmsAccessCode : WebKey.LockedAccessCode]</label>
                     <button type="submit" class="btn btn-primary">
                         <span class="material-symbols-outlined">
                             login
                         </span>
                     </button>
+                    @if (expiration is not null)
+                    {
+                    <div id="sms-timer" class="alert alert-primary" role="alert">00:00</div>
+                    }
                 </div>
             </form>
         </div>
@@ -45,8 +54,34 @@
     }
     <section class="no-receiver-explanation text-center">
         <details>
-            <summary>@_localizer[WebKey.LockedFooterTitle]</summary>
-            <p>@_localizer[WebKey.LockedFooterBody]</p>
+            <summary>@_localizer[viaSms ? WebKey.LockedSmsTfaFooterTitle : WebKey.LockedFooterTitle]</summary>
+            <p>@_localizer[viaSms ? WebKey.LockedSmsTfaFooterBody : WebKey.LockedFooterBody]</p>
         </details>
     </section>
-</div>
+</div>
+<script nonce="@nonce">
+    var expiration = new Date(@Html.Raw(JsonConvert.SerializeObject(expiration)));
+
+    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/WebKey.cs

@@ -11,11 +11,16 @@
         public static readonly string de_DE = nameof(de_DE).Replace("_", "-");
         public static readonly string en_US = nameof(en_US).Replace("_", "-");
         public static readonly string LockedTitle = nameof(LockedTitle);
+        public static readonly string LockedSmsTfaTitle = nameof(LockedSmsTfaTitle);
         public static readonly string LockedBody = nameof(LockedBody);
+        public static readonly string LockedSmsTfaBody = nameof(LockedSmsTfaBody);
         public static readonly string LocakedOpen = nameof(LocakedOpen);
         public static readonly string LockedAccessCode = nameof(LockedAccessCode);
+        public static readonly string LockedSmsAccessCode = nameof(LockedSmsAccessCode);
         public static readonly string LockedFooterTitle = nameof(LockedFooterTitle);
+        public static readonly string LockedSmsTfaFooterTitle = nameof(LockedSmsTfaFooterTitle);
         public static readonly string LockedFooterBody = nameof(LockedFooterBody);
+        public static readonly string LockedSmsTfaFooterBody = nameof(LockedSmsTfaFooterBody);
         public static readonly string WrongAccessCode = nameof(WrongAccessCode);
         public static readonly string SignDoc = nameof(SignDoc);
         public static readonly string DocRejected = nameof(DocRejected);

EnvelopeGenerator.Web/appsettings.json

@@ -134,7 +134,9 @@
     "Path": "smsc/sendsms/f566f7e5-bdf2-4a9a-bf52-ed88215a432e/json",
     "Headers": {},
     "QueryParams": {
-      "from": "signFLOW Portal"
-    }
-  }
+      "from": "signFlow"
+    },
+    "CodeCacheValidityPeriod": "00:10:00"
+  },
+  "EnvelopeReceiverCacheParams": {}
 }

EnvelopeGenerator.Web/wwwroot/css/site.css

@@ -221,10 +221,15 @@ footer {
         }
 
         .page header .icon.locked {
-            background-color: #ffc107;
+            background-color: #ffa407;
             color: #000;
         }
 
+            .page header .icon.locked.sms-tfa {
+                background-color: #ff7207;
+                color: #000;
+            }
+
         .page header .icon.signed {
             background-color: #146c43;
             color: #fff;
@@ -397,14 +402,17 @@ footer#page-footer {
 
 .access-code-form-floating {
     display: flex;
-    justify-content: start;
+    justify-content: space-between;
     flex-direction: row;
+    align-items: center;
 }
 
     .access-code-form-floating button {
         align-content: center;
         border-bottom-left-radius: 0;
         border-top-left-radius: 0;
+        margin:0;
+        height: 100%;
     }
 
     .access-code-form-floating input {
@@ -422,6 +430,24 @@ footer#page-footer {
     height: 2.5rem;
 }
 
+#sms-timer {
+    height: 3rem;
+    display: flex;
+    align-items: center;
+    font-family: 'Arial', sans-serif;
+    font-weight: bold;
+    color: #ffffff;
+    background-color: #007bff;
+    margin: 0 0 0 2rem;
+    border-radius: 8px;
+    text-align: center;
+}
+
+    #sms-timer:hover {
+        background-color: #0056b3;
+        cursor: pointer;
+    }
+
 /*.flag-dropdown button {
     height: 100%;
 }*/

EnvelopeGenerator.Web/wwwroot/js/event-binder.js

@@ -11,7 +11,7 @@ document.querySelectorAll('.email-input').forEach(input => {
 document.addEventListener('DOMContentLoaded', function () {
     var dropdownItems = document.querySelectorAll('.culture-dropdown-item');
     dropdownItems.forEach(function (item) {
-        item.addEventListener('click', async function(event) {
+        item.addEventListener('click', async function (event) {
             event.preventDefault();
             var language = this.getAttribute('data-language');
             var flagCode = this.getAttribute('data-flag');
@@ -21,6 +21,30 @@ document.addEventListener('DOMContentLoaded', function () {
     });
 });
 
+const setTimer = (elementId, expirationTime) => {
+    const element = document.getElementById(elementId);
+
+    const interval = setInterval(function () {
+        var now = new Date();
+
+        var diffInMillis = expirationTime - now;
+
+        if (diffInMillis <= 0) {
+            element.textContent = "00:00";
+            clearInterval(interval);
+        }
+
+        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);
+}
+
 const bsNotify = (message, options) => alertify.notify(
     `<div class="alert ${options.alert_type ? 'alert-' + options.alert_type : ''}" role="alert"><span class="material-symbols-outlined">${options?.icon_name ?? ''}</span><p>${message}</p></div>`,
     'custom',

EnvelopeGenerator.Web/wwwroot/js/event-binder.min.js

@@ -1 +1 @@
-document.querySelectorAll(".email-input").forEach(n=>{n.addEventListener("input",function(){/^\S+@\S+\.\S+$/.test(this.value)?this.classList.remove("is-invalid"):this.classList.add("is-invalid")})});document.addEventListener("DOMContentLoaded",function(){var n=document.querySelectorAll(".culture-dropdown-item");n.forEach(function(n){n.addEventListener("click",async function(n){n.preventDefault();var t=this.getAttribute("data-language"),i=this.getAttribute("data-flag");document.getElementById("selectedFlag").className="fi "+i+" me-2";await setLanguage(t)})})});const bsNotify=(n,t)=>alertify.notify(`<div class="alert ${t.alert_type?"alert-"+t.alert_type:""}" role="alert"><span class="material-symbols-outlined">${t?.icon_name??""}</span><p>${n}</p></div>`,"custom",t?.delay??5);class Comp{static ActPanel=class{static __Root;static get Root(){Comp.ActPanel.__Root??=document.getElementById("flex-action-panel");return Comp.ActPanel.__Root}static get Elements(){return[...Comp.ActPanel.Root.children]}static get IsHided(){return Comp.ActPanel.Root.style.display=="none"}static set Display(n){Comp.ActPanel.Root.style.display=n;Comp.ActPanel.Elements.forEach(t=>t.style.display=n)}static Toggle(){Comp.ActPanel.Display=Comp.ActPanel.IsHided?"":"none"}};static SignatureProgress=class{static __SignatureCount;static get SignatureCount(){this.__SignatureCount=parseInt(document.getElementById("signature-count").innerText);return this.__SignatureCount}static __SignedCountSpan;static get SignedCountSpan(){this.__SignedCountSpan??=document.getElementById("signed-count");return Comp.SignatureProgress.__SignedCountSpan}static __signedCount=0;static get SignedCount(){return this.__signedCount}static set SignedCount(n){this.__signedCount=n;const t=(n/this.SignatureCount)*100;this.SignedCountBar.style.setProperty("--progress-width",t+"%");this.SignedCountSpan.innerText=n.toString()}static __SignedCountBar;static get SignedCountBar(){this.__SignedCountBar??=document.getElementById("signed-count-bar");return this.__SignedCountBar}};static __ShareBackdrop;static get ShareBackdrop(){return Comp.__ShareBackdrop??=new bootstrap.Modal(document.getElementById("shareBackdrop")),this.__ShareBackdrop}}
+document.querySelectorAll(".email-input").forEach(n=>{n.addEventListener("input",function(){/^\S+@\S+\.\S+$/.test(this.value)?this.classList.remove("is-invalid"):this.classList.add("is-invalid")})});document.addEventListener("DOMContentLoaded",function(){var n=document.querySelectorAll(".culture-dropdown-item");n.forEach(function(n){n.addEventListener("click",async function(n){n.preventDefault();var t=this.getAttribute("data-language"),i=this.getAttribute("data-flag");document.getElementById("selectedFlag").className="fi "+i+" me-2";await setLanguage(t)})})});const setTimer=(n,t)=>{const i=document.getElementById(n),r=setInterval(function(){var u=new Date,n=t-u;n<=0&&(i.textContent="00:00",clearInterval(r));var f=Math.floor(n/6e4),e=Math.floor(n/1e3%60),o=f.toString().padStart(2,"0"),s=e.toString().padStart(2,"0"),h=`${o}:${s}`;i.textContent=h},1e3)},bsNotify=(n,t)=>alertify.notify(`<div class="alert ${t.alert_type?"alert-"+t.alert_type:""}" role="alert"><span class="material-symbols-outlined">${t?.icon_name??""}</span><p>${n}</p></div>`,"custom",t?.delay??5);class Comp{static ActPanel=class{static __Root;static get Root(){Comp.ActPanel.__Root??=document.getElementById("flex-action-panel");return Comp.ActPanel.__Root}static get Elements(){return[...Comp.ActPanel.Root.children]}static get IsHided(){return Comp.ActPanel.Root.style.display=="none"}static set Display(n){Comp.ActPanel.Root.style.display=n;Comp.ActPanel.Elements.forEach(t=>t.style.display=n)}static Toggle(){Comp.ActPanel.Display=Comp.ActPanel.IsHided?"":"none"}};static SignatureProgress=class{static __SignatureCount;static get SignatureCount(){this.__SignatureCount=parseInt(document.getElementById("signature-count").innerText);return this.__SignatureCount}static __SignedCountSpan;static get SignedCountSpan(){this.__SignedCountSpan??=document.getElementById("signed-count");return Comp.SignatureProgress.__SignedCountSpan}static __signedCount=0;static get SignedCount(){return this.__signedCount}static set SignedCount(n){this.__signedCount=n;const t=(n/this.SignatureCount)*100;this.SignedCountBar.style.setProperty("--progress-width",t+"%");this.SignedCountSpan.innerText=n.toString()}static __SignedCountBar;static get SignedCountBar(){this.__SignedCountBar??=document.getElementById("signed-count-bar");return this.__SignedCountBar}};static __ShareBackdrop;static get ShareBackdrop(){return Comp.__ShareBackdrop??=new bootstrap.Modal(document.getElementById("shareBackdrop")),this.__ShareBackdrop}}