Bump version to 3.1.4 in project file

Updated package, assembly, and file versions from 3.1.3 to 3.1.4 to reflect the new release.

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -21,6 +21,7 @@
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.0.0" />
 		<PackageReference Include="MediatR" Version="12.5.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.18" />
+		<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
 		<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
 		<PackageReference Include="Otp.NET" Version="1.4.0" />

EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj

@@ -23,6 +23,8 @@
     <PackageReference Include="DigitalData.Core.API" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.4" />
+    <PackageReference Include="NLog" Version="5.2.5" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.0" />
     <PackageReference Include="Scalar.AspNetCore" Version="2.2.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
     <PackageReference Include="DigitalData.Core.Abstractions" Version="3.6.0" />

EnvelopeGenerator.GeneratorAPI/Program.cs

@@ -16,9 +16,20 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.IdentityModel.Tokens;
 using DigitalData.Core.Abstractions.Security.Extensions;
 using EnvelopeGenerator.GeneratorAPI.Middleware;
+using NLog.Web;
+using NLog;
 
+var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
+logger.Info("Logging initialized!");
+
+try
+{
     var builder = WebApplication.CreateBuilder(args);
 
+    builder.Logging.ClearProviders();
+    builder.Logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
+    builder.Host.UseNLog();
+
     var config = builder.Configuration;
 
     var deferredProvider = new DeferredServiceProvider();
@@ -209,3 +220,9 @@ app.UseAuthorization();
     app.MapControllers();
 
     app.Run();
+}
+catch (Exception ex)
+{
+    logger.Error(ex, "Stopped program because of exception");
+    throw;
+}

EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs

@@ -39,7 +39,11 @@ public class EnvelopeReceiverRepository : CRUDRepository<EnvelopeReceiver, (int
         => await ReadWhere(signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver, readOnly: readOnly).ToListAsync();
 
     public async Task<EnvelopeReceiver?> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true, bool readOnly = true)
-        => await ReadWhere(uuid: uuid, signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver, readOnly: readOnly).FirstOrDefaultAsync();
+    {
+        var query = ReadWhere(uuid: uuid, signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver, readOnly: readOnly);
+
+        return await query.FirstOrDefaultAsync();
+    }
 
     public async Task<string?> ReadAccessCodeAsync(string uuid, string signature, bool readOnly = true)
         => await ReadWhere(uuid: uuid, signature: signature, readOnly: readOnly)

EnvelopeGenerator.Web/Controllers/HomeController.cs

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

EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj

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

EnvelopeGenerator.Web/Program.cs

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

EnvelopeGenerator.Web/Services/DatabaseService.cs

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

EnvelopeGenerator.Web/appsettings.Development.json

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

EnvelopeGenerator.Web/appsettings.json

@@ -39,6 +39,11 @@
         "fileName": "${logDirectory}\\${logFileNamePrefix}-Info.log",
         "maxArchiveDays": 30
       },
+      "warningLogs": {
+        "type": "File",
+        "fileName": "${logDirectory}\\${logFileNamePrefix}-Warning.log",
+        "maxArchiveDays": 30
+      },
       "errorLogs": {
         "type": "File",
         "fileName": "${logDirectory}\\${logFileNamePrefix}-Error.log",
@@ -50,14 +55,17 @@
         "maxArchiveDays": 30
       }
     },
-    // Trace, Debug, Info, Warn, Error and *Fatal*
     "rules": [
       {
         "logger": "*",
-        "minLevel": "Info",
+        "level": "Info",
-        "maxLevel": "Warn",
         "writeTo": "infoLogs"
       },
+      {
+        "logger": "*",
+        "level": "Warn",
+        "writeTo": "warningLogs"
+      },
       {
         "logger": "*",
         "level": "Error",