diff --git a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj
index 9d36e46e..11124e86 100644
--- a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj
+++ b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj
@@ -24,7 +24,7 @@
-
+
diff --git a/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj b/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj
index 43fe29fd..00f19ad3 100644
--- a/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj
+++ b/EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj
@@ -84,6 +84,9 @@
..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll
+
+ ..\packages\UserManager.Domain.3.2.1\lib\net462\DigitalData.UserManager.Domain.dll
+
..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll
@@ -207,6 +210,9 @@
..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll
+
+ ..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll
+
@@ -214,6 +220,9 @@
..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll
+
+ ..\packages\System.Drawing.Common.4.7.3\lib\net461\System.Drawing.Common.dll
+
..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll
diff --git a/EnvelopeGenerator.CommonServices/packages.config b/EnvelopeGenerator.CommonServices/packages.config
index f099e9ec..b51efc1d 100644
--- a/EnvelopeGenerator.CommonServices/packages.config
+++ b/EnvelopeGenerator.CommonServices/packages.config
@@ -30,7 +30,9 @@
+
+
@@ -41,4 +43,5 @@
+
\ No newline at end of file
diff --git a/EnvelopeGenerator.Domain/Entities/EGUser.cs b/EnvelopeGenerator.Domain/Entities/EGUser.cs
index 58c7c795..d5494e6c 100644
--- a/EnvelopeGenerator.Domain/Entities/EGUser.cs
+++ b/EnvelopeGenerator.Domain/Entities/EGUser.cs
@@ -12,27 +12,6 @@ namespace EnvelopeGenerator.Domain.Entities
[Table("TBDD_USER", Schema = "dbo")]
public class EGUser : User
{
- [Required]
- [Column("GENERAL_VIEWER")]
- [StringLength(30)]
- [DefaultValue("NONE")]
- public string GeneralViewer { get; set; }
-
- [Required]
- [Column("WAN_ENVIRONMENT")]
- public bool WanEnvironment { get; set; }
-
- [Required]
- [Column("USERID_FK_INT_ECM")]
- public int UserIdFkIntEcm { get; set; }
-
- [Column("DELETED_WHEN")]
- public DateTime DeletedWhen { get; set; }
-
- [Column("DELETED_WHO")]
- [StringLength(50)]
- public string DeletedWho { get; set; }
-
#region FORM_APP
[NotMapped]
public bool HasAccess { get; set; }
diff --git a/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj b/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj
index 6e5ed056..ebc6be5c 100644
--- a/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj
+++ b/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj
@@ -33,7 +33,7 @@
-
+
diff --git a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj
index 8bcc59de..493eef1c 100644
--- a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj
+++ b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs
index 3993ce3f..39c93a2c 100644
--- a/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs
@@ -2,12 +2,11 @@
using EnvelopeGenerator.Domain.Entities;
using EnvelopeGenerator.Application.Contracts.Repositories;
using Microsoft.EntityFrameworkCore;
-using Microsoft.AspNetCore.Http.HttpResults;
using EnvelopeGenerator.Application.Exceptions;
-using EnvelopeGenerator.CommonServices.My.Resources;
namespace EnvelopeGenerator.Infrastructure.Repositories;
+[Obsolete("Use Repository")]
public class EnvelopeReceiverRepository : CRUDRepository, IEnvelopeReceiverRepository
{
public EnvelopeReceiverRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeReceivers)