diff --git a/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj b/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj
index 0b925aa3..2ec7538b 100644
--- a/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj
+++ b/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj
@@ -48,6 +48,9 @@
On
+
+ ..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll
+
..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll
@@ -69,6 +72,12 @@
+
+ ..\packages\DigitalData.Core.Abstraction.Application.1.3.3\lib\net462\DigitalData.Core.Abstraction.Application.dll
+
+
+ ..\packages\DigitalData.Core.Abstractions.4.1.1\lib\net462\DigitalData.Core.Abstractions.dll
+
..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll
@@ -172,9 +181,84 @@
..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
+
+ ..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll
+
-
- ..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll
+
+ ..\packages\Microsoft.Data.SqlClient.1.1.3\lib\net46\Microsoft.Data.SqlClient.dll
+
+
+ ..\packages\Microsoft.EntityFrameworkCore.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll
+
+
+ ..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll
+
+
+ ..\packages\Microsoft.EntityFrameworkCore.Relational.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll
+
+
+ ..\packages\Microsoft.EntityFrameworkCore.SqlServer.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.SqlServer.dll
+
+
+ ..\packages\Microsoft.Extensions.Caching.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll
+
+
+ ..\packages\Microsoft.Extensions.Caching.Memory.7.0.0\lib\net462\Microsoft.Extensions.Caching.Memory.dll
+
+
+ ..\packages\Microsoft.Extensions.Configuration.7.0.0\lib\net462\Microsoft.Extensions.Configuration.dll
+
+
+ ..\packages\Microsoft.Extensions.Configuration.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Abstractions.dll
+
+
+ ..\packages\Microsoft.Extensions.Configuration.Binder.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Binder.dll
+
+
+ ..\packages\Microsoft.Extensions.DependencyInjection.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll
+
+
+ ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+
+
+ ..\packages\Microsoft.Extensions.Localization.Abstractions.7.0.16\lib\net462\Microsoft.Extensions.Localization.Abstractions.dll
+
+
+ ..\packages\Microsoft.Extensions.Logging.7.0.0\lib\net462\Microsoft.Extensions.Logging.dll
+
+
+ ..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll
+
+
+ ..\packages\Microsoft.Extensions.Options.7.0.0\lib\net462\Microsoft.Extensions.Options.dll
+
+
+ ..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.7.0.0\lib\net462\Microsoft.Extensions.Options.ConfigurationExtensions.dll
+
+
+ ..\packages\Microsoft.Extensions.Primitives.7.0.0\lib\net462\Microsoft.Extensions.Primitives.dll
+
+
+ ..\packages\Microsoft.Identity.Client.3.0.8\lib\net45\Microsoft.Identity.Client.dll
+
+
+ ..\packages\Microsoft.IdentityModel.Abstractions.7.5.1\lib\net462\Microsoft.IdentityModel.Abstractions.dll
+
+
+ ..\packages\Microsoft.IdentityModel.JsonWebTokens.7.5.1\lib\net462\Microsoft.IdentityModel.JsonWebTokens.dll
+
+
+ ..\packages\Microsoft.IdentityModel.Logging.7.5.1\lib\net462\Microsoft.IdentityModel.Logging.dll
+
+
+ ..\packages\Microsoft.IdentityModel.Protocols.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.dll
+
+
+ ..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll
+
+
+ ..\packages\Microsoft.IdentityModel.Tokens.7.5.1\lib\net462\Microsoft.IdentityModel.Tokens.dll
..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
@@ -216,13 +300,26 @@
+
+ ..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll
+ True
+ True
+
..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll
+
+ ..\packages\System.Diagnostics.DiagnosticSource.7.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll
+
+
..\packages\System.Drawing.Common.4.7.3\lib\net461\System.Drawing.Common.dll
+
+
+ ..\packages\System.IdentityModel.Tokens.Jwt.7.5.1\lib\net462\System.IdentityModel.Tokens.Jwt.dll
+
..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll
@@ -244,9 +341,25 @@
+
+ ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll
+ True
+ True
+
+
+ ..\packages\System.Security.Cryptography.Cng.5.0.0\lib\net462\System.Security.Cryptography.Cng.dll
+
..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll
+
+ ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll
+ True
+ True
+
+
+ ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll
+
..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll
@@ -446,6 +559,10 @@
{4f32a98d-e6f0-4a09-bd97-1cf26107e837}
EnvelopeGenerator.Domain
+
+ {63e32615-0eca-42dc-96e3-91037324b7c7}
+ EnvelopeGenerator.Infrastructure
+
@@ -455,7 +572,9 @@
+
+
\ No newline at end of file
diff --git a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
index 89b15ade..cfc00b03 100644
--- a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
+++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
@@ -11,6 +11,9 @@ Imports EnvelopeGenerator.Domain.Constants
Imports DevExpress.DataProcessing
Imports System.Data.SqlClient
Imports EnvelopeGenerator.Domain.Entities
+Imports DigitalData.Core.Abstraction.Application
+Imports EnvelopeGenerator.Infrastructure
+Imports Microsoft.EntityFrameworkCore
Namespace Jobs
Public Class FinalizeDocumentJob
@@ -62,7 +65,21 @@ Namespace Jobs
LicenseManager.RegisterKEY(oGdPictureKey)
Logger.Debug("Loading Database..")
- Database = GetDatabase(pContext, LogConfig)
+ Dim oConnectionString As String = pContext.MergedJobDataMap.Item(Value.DATABASE)
+ Database = New MSSQLServer(LogConfig, MSSQLServer.DecryptConnectionString(oConnectionString))
+
+#Disable Warning BC40000 ' Type or member is obsolete
+ [Static].Services.AddEnvelopeGeneratorInfrastructureServices(
+ Sub(opt)
+ opt.AddDbTriggerParams(Config)
+ opt.AddDbContext(
+ Sub(options)
+ options.UseSqlServer(oConnectionString) _
+ .EnableSensitiveDataLogging() _
+ .EnableDetailedErrors()
+ End Sub)
+ End Sub)
+#Enable Warning BC40000 ' Type or member is obsolete
Logger.Debug("Loading Models & Services")
Dim oState = GetState()
@@ -439,13 +456,6 @@ Namespace Jobs
ReportModel = New ReportModel(pState)
End Sub
- Private Function GetDatabase(pContext As IJobExecutionContext, pLogConfig As LogConfig) As MSSQLServer
- Dim oConnectionString As String = pContext.MergedJobDataMap.Item(Value.DATABASE)
- Dim Database = New MSSQLServer(pLogConfig, MSSQLServer.DecryptConnectionString(oConnectionString))
-
- Return Database
- End Function
-
Private Function GetState() As State
Return New State With {
.LogConfig = LogConfig,
diff --git a/EnvelopeGenerator.CommonServices/app.config b/EnvelopeGenerator.CommonServices/app.config
index 5a0ef13d..ff50d9d0 100644
--- a/EnvelopeGenerator.CommonServices/app.config
+++ b/EnvelopeGenerator.CommonServices/app.config
@@ -77,6 +77,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/EnvelopeGenerator.CommonServices/packages.config b/EnvelopeGenerator.CommonServices/packages.config
index 98dfc956..21fdadcb 100644
--- a/EnvelopeGenerator.CommonServices/packages.config
+++ b/EnvelopeGenerator.CommonServices/packages.config
@@ -1,6 +1,9 @@
+
+
+
@@ -15,8 +18,35 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -31,14 +61,22 @@
+
+
+
+
+
+
+
+
diff --git a/EnvelopeGenerator.Form/app.config b/EnvelopeGenerator.Form/app.config
index ae6c01b4..8c7b693c 100644
--- a/EnvelopeGenerator.Form/app.config
+++ b/EnvelopeGenerator.Form/app.config
@@ -101,7 +101,7 @@
-
+
@@ -121,20 +121,92 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EnvelopeGenerator.Service/App.config b/EnvelopeGenerator.Service/App.config
index 9f4a6566..c75d22f5 100644
--- a/EnvelopeGenerator.Service/App.config
+++ b/EnvelopeGenerator.Service/App.config
@@ -53,6 +53,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+