feat(appsettings.Dev): remove wrong cnn string

This reverts commit f4c61e3bc7.

EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeCertificateRepository.cs

@@ -1,12 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
-
-/// <summary>
-/// 
-/// </summary>
-[Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-public interface IEnvelopeCertificateRepository : ICRUDRepository<EnvelopeCertificate, int>
-{
-}

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeCertificateService.cs

@@ -1,13 +0,0 @@
-using DigitalData.Core.Abstraction.Application;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts.Services;
-
-/// <summary>
-/// 
-/// </summary>
-[Obsolete("Use MediatR")]
-public interface IEnvelopeCertificateService : IBasicCRUDService<EnvelopeCertificateDto, EnvelopeCertificate, int>
-{
-}

EnvelopeGenerator.Application/DTOs/EnvelopeCertificateDto.cs

@@ -1,50 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.DTOs;
-
-/// <summary>
-/// Data Transfer Object representing certificate information for an envelope.
-/// </summary>
-[ApiExplorerSettings(IgnoreApi = true)]
-public class EnvelopeCertificateDto
-{
-    /// <summary>
-    /// Gets the unique identifier of the certificate.
-    /// </summary>
-    public int Id { get; init; }
-
-    /// <summary>
-    /// Gets the envelope ID associated with the certificate.
-    /// </summary>
-    public int EnvelopeId { get; init; }
-
-    /// <summary>
-    /// Gets the UUID of the envelope.
-    /// </summary>
-    public string EnvelopeUuid { get; init; } = string.Empty;
-
-    /// <summary>
-    /// Gets the subject of the envelope.
-    /// </summary>
-    public string EnvelopeSubject { get; init; } = string.Empty;
-
-    /// <summary>
-    /// Gets the ID of the creator of the envelope.
-    /// </summary>
-    public int CreatorId { get; init; }
-
-    /// <summary>
-    /// Gets the name of the creator.
-    /// </summary>
-    public string CreatorName { get; init; } = string.Empty;
-
-    /// <summary>
-    /// Gets the email address of the creator.
-    /// </summary>
-    public string CreatorEmail { get; init; } = string.Empty;
-
-    /// <summary>
-    /// Gets the current status of the envelope.
-    /// </summary>
-    public int EnvelopeStatus { get; init; }
-}

EnvelopeGenerator.Application/DTOs/MappingProfile.cs

@@ -27,7 +27,6 @@ public class MappingProfile : Profile
         CreateMap<DocumentStatus, DocumentStatusDto>();
         CreateMap<EmailTemplate, EmailTemplateDto>();
         CreateMap<Envelope, EnvelopeDto>();
-        CreateMap<EnvelopeCertificate, EnvelopeCertificateDto>();
         CreateMap<EnvelopeDocument, EnvelopeDocumentDto>();
         CreateMap<Domain.Entities.EnvelopeHistory, EnvelopeHistoryDto>();
         CreateMap<Domain.Entities.EnvelopeHistory, EnvelopeHistoryCreateDto>();
@@ -45,7 +44,6 @@ public class MappingProfile : Profile
         CreateMap<DocumentStatusDto, DocumentStatus>();
         CreateMap<EmailTemplateDto, EmailTemplate>();
         CreateMap<EnvelopeDto, Envelope>();
-        CreateMap<EnvelopeCertificateDto, EnvelopeCertificate>();
         CreateMap<EnvelopeDocumentDto, EnvelopeDocument>();
         CreateMap<EnvelopeHistoryDto, Domain.Entities.EnvelopeHistory>();
         CreateMap<EnvelopeHistoryCreateDto, Domain.Entities.EnvelopeHistory>();

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -33,7 +33,6 @@ public static class DependencyInjection
         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>();

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -20,11 +20,22 @@
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
 		<PackageReference Include="MediatR" Version="12.5.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.18" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
 		<PackageReference Include="Otp.NET" Version="1.4.0" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
 		<PackageReference Include="QRCoder-ImageSharp" Version="0.10.0" />
-		<PackageReference Include="UserManager" Version="1.1.1" />
+		<PackageReference Include="UserManager" Version="1.1.3" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
 	</ItemGroup>
 
 	<ItemGroup>

EnvelopeGenerator.Application/Services/EnvelopeCertificateService.cs

@@ -1,25 +0,0 @@
-using AutoMapper;
-using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
-using EnvelopeGenerator.Application.Contracts.Services;
-
-namespace EnvelopeGenerator.Application.Services;
-
-/// <summary>
-/// 
-/// </summary>
-[Obsolete("Use MediatR")]
-public class EnvelopeCertificateService : BasicCRUDService<IEnvelopeCertificateRepository, EnvelopeCertificateDto, EnvelopeCertificate, int>, IEnvelopeCertificateService
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    /// <param name="mapper"></param>
-    public EnvelopeCertificateService(IEnvelopeCertificateRepository repository, IMapper mapper)
-        : base(repository, mapper)
-    {
-    }
-}

EnvelopeGenerator.CommonServices/EnvelopeGenerator.CommonServices.vbproj

@@ -84,8 +84,8 @@
     <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.UserManager.Domain, Version=3.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UserManager.Domain.3.2.1\lib\net462\DigitalData.UserManager.Domain.dll</HintPath>
+    <Reference Include="DigitalData.UserManager.Domain, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UserManager.Domain.3.2.3\lib\net462\DigitalData.UserManager.Domain.dll</HintPath>
     </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
       <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>

EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb

@@ -64,7 +64,7 @@ Public Class EnvelopeModel
         oEnvelope.Receivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id)
         oEnvelope.Documents = DocumentModel.List(oEnvelope.Id)
         oEnvelope.History = HistoryModel.List(oEnvelope.Id)
-        oEnvelope.EnvelopeType = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId)
+        oEnvelope.Type = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId)
 
         Return oEnvelope
     End Function

EnvelopeGenerator.CommonServices/packages.config

@@ -43,5 +43,5 @@
   <package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
-  <package id="UserManager.Domain" version="3.2.1" targetFramework="net462" />
+  <package id="UserManager.Domain" version="3.2.3" targetFramework="net462" />
 </packages>

EnvelopeGenerator.Domain/Entities/Config.cs

@@ -2,22 +2,30 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_CONFIG", Schema = "dbo")]
-    public class Config
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        [Column("SENDING_PROFILE", TypeName = "int")]
-        [Required]
-        public int SendingProfile { get; set; }
+#endif
 
-        [Column("SIGNATURE_HOST", TypeName = "nvarchar(128)")]
-        [Required]
-        public string SignatureHost { get; set; }
+[Table("TBSIG_CONFIG", Schema = "dbo")]
+public class Config
+{
+    [Column("SENDING_PROFILE", TypeName = "int")]
+    [Required]
+    public int SendingProfile { get; set; }
 
-        [Column("EXTERNAL_PROGRAM_NAME", TypeName = "nvarchar(30)")]
-        public string ExternalProgramName { get; set; }
+    [Column("SIGNATURE_HOST", TypeName = "nvarchar(128)")]
+    [Required]
+    public string SignatureHost { get; set; }
 
-        [Column("EXPORT_PATH", TypeName = "nvarchar(256)")]
-        public string ExportPath { get; set; }
+    [Column("EXTERNAL_PROGRAM_NAME", TypeName = "nvarchar(30)")]
+    public string ExternalProgramName { get; set; }
+
+    [Column("EXPORT_PATH", TypeName = "nvarchar(256)")]
+    public string ExportPath { get; set; }
+}
+
+#if NETFRAMEWORK
     }
-}
+#endif

EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs

@@ -6,93 +6,110 @@ using System;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
+#if NET
+    ;
+#elif NETFRAMEWORK
+    {
+#endif
+
+[Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
+public class DocumentReceiverElement
 {
-    [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
-    public class DocumentReceiverElement
+    public DocumentReceiverElement()
     {
         // TODO: * Check the Form App and remove the default value
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; } = -1;
-
-        [Required]
-        [Column("DOCUMENT_ID")]
-        public int DocumentId { get; set; }
-
-        [Required]
-        [Column("RECEIVER_ID")]
-        public int ReceiverId { get; set; }
-
-        [Required]
-        [Column("ELEMENT_TYPE")]
-        [DefaultValue(0)]
-        public int ElementType { get; set; }
-
-        [Required]
-        [Column("POSITION_X")]
-        [DefaultValue(0)]
-        public double X { get; set; }
-
-        [Required]
-        [Column("POSITION_Y")]
-        [DefaultValue(0)]
-        public double Y { get; set; }
-
-        [Required]
-        [Column("WIDTH")]
-        [DefaultValue(0)]
-        public double Width { get; set; }
-
-        [Required]
-        [Column("HEIGHT")]
-        [DefaultValue(0)]
-        public double Height { get; set; }
-
-        [Required]
-        [Column("PAGE")]
-        [DefaultValue(1)]
-        public int Page { get; set; }
-
-        // TODO: * Check the Form App and remove the default value
-        [Required]
-        [Column("REQUIRED")]
-        [DefaultValue(false)]
-        public bool Required { get; set; } = false;
-
-        [Column("TOOLTIP")]
-        public string Tooltip { get; set; }
-
-        // TODO: * Check the Form App and remove the default value
-        [Required]
-        [Column("READ_ONLY")]
-        [DefaultValue(false)]
-        public bool ReadOnly { get; set; } = false;
-
-        // TODO: * Check the Form App and remove the default value
-        [Required]
-        [Column("ANNOTATION_INDEX")]
-        [DefaultValue(0)]
-        public int AnnotationIndex { get; set; } = 0;
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        [DefaultValue("GETDATE()")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime ChangedWhen { get; set; }
-
-        [ForeignKey("DocumentId")]
-        public virtual EnvelopeDocument Document { get; set; }
-
-        [ForeignKey("ReceiverId")]
-        public virtual Receiver Receiver { get; set; }
-
-        [NotMapped]
-        public double Top => Math.Round(Y, 5);
-
-        [NotMapped]
-        public double Left => Math.Round(X, 5);
+#if NETFRAMEWORK
+        Id = -1;
+        Required = false;
+        ReadOnly = false;
+        AnnotationIndex = 0;
+#endif
     }
-}
+
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
+
+    [Required]
+    [Column("DOCUMENT_ID")]
+    public int DocumentId { get; set; }
+
+    [Required]
+    [Column("RECEIVER_ID")]
+    public int ReceiverId { get; set; }
+
+    [Required]
+    [Column("ELEMENT_TYPE")]
+    [DefaultValue(0)]
+    public int ElementType { get; set; }
+
+    [Required]
+    [Column("POSITION_X")]
+    [DefaultValue(0)]
+    public double X { get; set; }
+
+    [Required]
+    [Column("POSITION_Y")]
+    [DefaultValue(0)]
+    public double Y { get; set; }
+
+    [Required]
+    [Column("WIDTH")]
+    [DefaultValue(0)]
+    public double Width { get; set; }
+
+    [Required]
+    [Column("HEIGHT")]
+    [DefaultValue(0)]
+    public double Height { get; set; }
+
+    [Required]
+    [Column("PAGE")]
+    [DefaultValue(1)]
+    public int Page { get; set; }
+
+    [Required]
+    [Column("REQUIRED")]
+    [DefaultValue(false)]
+    public bool Required { get; set; }
+
+    [Column("TOOLTIP")]
+    public string Tooltip { get; set; }
+
+    [Required]
+    [Column("READ_ONLY")]
+    [DefaultValue(false)]
+    public bool ReadOnly { get; set; }
+
+    [Required]
+    [Column("ANNOTATION_INDEX")]
+    [DefaultValue(0)]
+    public int AnnotationIndex { get; set; }
+
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    [DefaultValue("GETDATE()")]
+    public DateTime AddedWhen { get; set; }
+
+    [Column("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime ChangedWhen { get; set; }
+
+    [ForeignKey("DocumentId")]
+    public virtual EnvelopeDocument Document { get; set; }
+
+    [ForeignKey("ReceiverId")]
+    public virtual Receiver Receiver { get; set; }
+
+#if NETFRAMEWORK
+    [NotMapped]
+    public double Top => Math.Round(Y, 5);
+
+    [NotMapped]
+    public double Left => Math.Round(X, 5);
+#endif
+}
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Domain/Entities/DocumentStatus.cs

@@ -5,45 +5,44 @@ using System;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")]
-    public class DocumentStatus
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
-
-        [Required]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
-
-        [Required]
-        [Column("RECEIVER_ID")]
-        public int ReceiverId { get; set; }
+#endif
 
+[Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")]
+public class DocumentStatus
+{
+    public DocumentStatus()
+    {
         // TODO: * check Form Application and remove default value
-        [Required]
-        [Column("STATUS")]
-        public Constants.DocumentStatus Status { get; set; } = Constants.DocumentStatus.Created;
-
-        [Column("STATUS_CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime StatusChangedWhen { get; set; }
-
-        [Column("VALUE", TypeName = "nvarchar(max)")]
-        public string Value { get; set; }
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime ChangedWhen { get; set; }
-
-        [ForeignKey("EnvelopeId")]
-        public virtual Envelope Envelope { get; set; }
-
-        [ForeignKey("ReceiverId")]
-        public virtual Receiver Receiver { get; set; }
+#if NETFRAMEWORK
+        Status = Constants.DocumentStatus.Created;
+#endif
     }
-}
+
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
+
+    [Required]
+    [Column("ENVELOPE_ID")]
+    public int EnvelopeId { get; set; }
+
+    [Required]
+    [Column("RECEIVER_ID")]
+    public int ReceiverId { get; set; }
+
+    [Required]
+    [Column("STATUS")]
+    public Constants.DocumentStatus Status { get; set; }
+
+    [Column("VALUE", TypeName = "nvarchar(max)")]
+    public string Value { get; set; }
+}
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Domain/Entities/EmailTemplate.cs

@@ -6,30 +6,38 @@ using System;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_EMAIL_TEMPLATE", Schema = "dbo")]
-    public class EmailTemplate
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
+#endif
 
-        [Column("NAME", TypeName = "nvarchar(64)")]
-        public string Name { get; set; }
+[Table("TBSIG_EMAIL_TEMPLATE", Schema = "dbo")]
+public class EmailTemplate
+{
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
 
-        [Column("BODY", TypeName = "nvarchar(max)")]
-        public string Body { get; set; }
+    [Column("NAME", TypeName = "nvarchar(64)")]
+    public string Name { get; set; }
 
-        [Column("SUBJECT", TypeName = "nvarchar(512)")]
-        public string Subject { get; set; }
+    [Column("BODY", TypeName = "nvarchar(max)")]
+    public string Body { get; set; }
 
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        [DefaultValue("GETDATE()")]
-        public DateTime AddedWhen { get; set; }
+    [Column("SUBJECT", TypeName = "nvarchar(512)")]
+    public string Subject { get; set; }
 
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime ChangedWhen { get; set; }
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    [DefaultValue("GETDATE()")]
+    public DateTime AddedWhen { get; set; }
+
+    [Column("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime ChangedWhen { get; set; }
+}
+
+#if NETFRAMEWORK
     }
-}
+#endif

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -8,164 +8,174 @@ using System.Linq;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
+#if NET
+    ;
+#elif NETFRAMEWORK
+    {
+#endif
+
+[Table("TBSIG_ENVELOPE", Schema = "dbo")]
+public class Envelope
 {
-    [Table("TBSIG_ENVELOPE", Schema = "dbo")]
-    public class Envelope
+    public Envelope()
     {
         // TODO: * Check the Form App and remove the default value
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; } = 0;
-
-        [Required]
-        [Column("USER_ID")]
-        public int UserId { get; set; }
-
-        // TODO: * Check the Form App and remove the default value
-        [Required]
-        [Column("STATUS")]
-        public int Status { get; set; } = (int)Constants.EnvelopeStatus.EnvelopeCreated;
-
-        [NotMapped]
-        public string StatusName => ((Constants.EnvelopeStatus)Status).ToString();
-
-        // TODO: The default value is set to 0. Check the Form App to remove this
-        [Required]
-        [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")]
-        public string Uuid { get; set; } = Guid.NewGuid().ToString();
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("MESSAGE", TypeName = "nvarchar(max)")]
-        public string Message { get; set; } = My.Resources.Envelope.Please_read_and_sign_this_document;
-
-        [Column("EXPIRES_WHEN", TypeName = "datetime")]
-        public DateTime ExpiresWhen { get; set; }
-
-        [Column("EXPIRES_WARNING_WHEN", TypeName = "datetime")]
-        public DateTime ExpiresWarningWhen { get; set; }
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime ChangedWhen { get; set; }
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("TITLE", TypeName = "nvarchar(128)")]
-        public string Title { get; set; } = string.Empty;
-
-        [Column("COMMENT", TypeName = "nvarchar(128)")]
-        public string Comment { get; set; } = string.Empty;
-
-        [Column("CONTRACT_TYPE")]
-        public int ContractType { get; set; }
-
-        // TODO: * Check the Form App and remove the default value
-        [NotMapped]
-        public string ContractTypeTranslated => My.Resources.Model.ResourceManager.GetString(ContractType.ToString());
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("LANGUAGE", TypeName = "nvarchar(5)")]
-        public string Language { get; set; } = "de-DE";
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("SEND_REMINDER_EMAILS")]
-        public bool SendReminderEmails { get; set; } = false;
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("FIRST_REMINDER_DAYS")]
-        public int FirstReminderDays { get; set; } = 0;
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("REMINDER_INTERVAL_DAYS")]
-        public int ReminderIntervalDays { get; set; } = 0;
-
-        [Column("ENVELOPE_TYPE")]
-        public int EnvelopeTypeId { get; set; }
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("CERTIFICATION_TYPE")]
-        public int CertificationType { get; set; } = (int)Constants.CertificationType.AdvancedElectronicSignature;
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("USE_ACCESS_CODE")]
-        public bool UseAccessCode { get; set; } = false;
-
-        [Column("FINAL_EMAIL_TO_CREATOR")]
-        public int FinalEmailToCreator { get; set; }
-
-        [Column("FINAL_EMAIL_TO_RECEIVERS")]
-        public int FinalEmailToReceivers { get; set; }
-
-        [Column("EXPIRES_WHEN_DAYS")]
-        public int ExpiresWhenDays { get; set; }
-
-        [Column("EXPIRES_WARNING_WHEN_DAYS")]
-        public int ExpiresWarningWhenDays { get; set; }
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("TFA_ENABLED", TypeName = "bit")]
-        public bool TFAEnabled { get; set; } = false;
-
-        [Column("DOC_RESULT", TypeName = "varbinary(max)")]
-        public byte[] DocResult { get; set; }
-
-        [NotMapped]
-        public string CURRENT_WORK_APP { get; set; } = "signFLOW GUI";
-
-        // TODO: * Check the Form App and remove the default value
-        [ForeignKey("UserId")]
-        public User User { get; set; }
-
-        [ForeignKey("EnvelopeTypeId")]
-        public EnvelopeType EnvelopeType { get; set; }
-
-        [NotMapped]
-        public string EnvelopeTypeTitle => EnvelopeType?.Title;
-
-        [NotMapped]
-        public bool IsAlreadySent => Status > (int)Constants.EnvelopeStatus.EnvelopeSaved;
-
-        [NotMapped]
-        public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(((Constants.EnvelopeStatus)Status).ToString());
-
-        [NotMapped]
-        public bool TFA_Enabled { get; set; } = false;
-
-        [NotMapped]
-        public byte[] DOC_RESULT { get; set; }
-
-        // TODO: * Check the Form App and remove the default value
-        [NotMapped]
-        public List<EnvelopeDocument> Documents { get; set; } = new List<EnvelopeDocument>();
-
-        // TODO: * Check the Form App and remove the default value
-        [NotMapped]
-        public List<EnvelopeHistory> History { get; set; } = new List<EnvelopeHistory>();
-
-        // TODO: * Check the Form App and remove the default value
-        [NotMapped]
-        public List<Receiver> Receivers { get; set; } = new List<Receiver>();
-
-        /// <summary>
-        /// Validates whether the receiver and document data are complete.
-        /// </summary>
-        public List<string> ValidateReceiverDocumentData()
-        {
-            var errors = new List<string>();
-
-            if (!Documents?.Any() ?? true)
-                errors.Add(My.Resources.Envelope.Missing_Documents);
-
-            if (!Receivers?.Any() ?? true)
-                errors.Add(My.Resources.Envelope.Missing_Receivers);
-
-            if (Receivers?.Any(r => !r.HasEmailAndName) ?? false)
-                errors.Add(My.Resources.Envelope.Incomplete_Receivers);
-
-            return errors;
-        }
+#if NETFRAMEWORK
+        Id = 0;
+        Status = (int)Constants.EnvelopeStatus.EnvelopeCreated;
+        Uuid = Guid.NewGuid().ToString();
+        Message = My.Resources.Envelope.Please_read_and_sign_this_document;
+        Title= string.Empty;
+        Comment = string.Empty;
+        Language = "de-DE";
+        SendReminderEmails = false;
+        FirstReminderDays = 0;
+        ReminderIntervalDays = 0;
+        CertificationType = (int)Constants.CertificationType.AdvancedElectronicSignature;
+        UseAccessCode = false;
+        Documents = Enumerable.Empty<EnvelopeDocument>().ToList();
+        History = Enumerable.Empty<EnvelopeHistory>().ToList();
+#endif
     }
-}
+        
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
+
+    [Required]
+    [Column("USER_ID")]
+    public int UserId { get; set; }
+
+    [Required]
+    [Column("STATUS")]
+    public int Status { get; set; }
+
+    [Required]
+    [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")]
+    public string Uuid { get; set; }
+
+    [Column("MESSAGE", TypeName = "nvarchar(max)")]
+    public string Message { get; set; }
+
+    [Column("EXPIRES_WHEN", TypeName = "datetime")]
+    public DateTime? ExpiresWhen { get; set; }
+
+    [Column("EXPIRES_WARNING_WHEN", TypeName = "datetime")]
+    public DateTime? ExpiresWarningWhen { get; set; }
+
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    public DateTime AddedWhen { get; set; }
+
+    [Column("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime? ChangedWhen { get; set; }
+
+    [Column("TITLE", TypeName = "nvarchar(128)")]
+    public string
+#if NET
+        ?
+#endif
+        Title { get; set; }
+
+    [Column("COMMENT", TypeName = "nvarchar(128)")]
+    public string Comment { get; set; }
+
+    [Column("CONTRACT_TYPE")]
+    public int? ContractType { get; set; }
+
+#if NETFRAMEWORK
+    [NotMapped]
+    public string ContractTypeTranslated => My.Resources.Model.ResourceManager.GetString(ContractType.ToString());
+#endif
+
+    [Column("LANGUAGE", TypeName = "nvarchar(5)")]
+    public string Language { get; set; }
+
+    [Column("SEND_REMINDER_EMAILS")]
+    public bool SendReminderEmails { get; set; }
+
+    [Column("FIRST_REMINDER_DAYS")]
+    public int? FirstReminderDays { get; set; }
+
+    [Column("REMINDER_INTERVAL_DAYS")]
+    public int? ReminderIntervalDays { get; set; }
+
+    [Column("ENVELOPE_TYPE")]
+    public int? EnvelopeTypeId { get; set; }
+
+    [Column("CERTIFICATION_TYPE")]
+    public int? CertificationType { get; set; }
+
+    [Column("USE_ACCESS_CODE")]
+    public bool UseAccessCode { get; set; }
+
+    [Column("FINAL_EMAIL_TO_CREATOR")]
+    public int? FinalEmailToCreator { get; set; }
+
+    [Column("FINAL_EMAIL_TO_RECEIVERS")]
+    public int? FinalEmailToReceivers { get; set; }
+
+    [Column("EXPIRES_WHEN_DAYS")]
+    public int? ExpiresWhenDays { get; set; }
+
+    [Column("EXPIRES_WARNING_WHEN_DAYS")]
+    public int? ExpiresWarningWhenDays { get; set; }
+
+    [ForeignKey("UserId")]
+    public User User { get; set; }
+
+    [ForeignKey("EnvelopeTypeId")]
+    public virtual EnvelopeType
+#if NET
+        ?
+#endif
+        Type { get; set; }
+
+#if NETFRAMEWORK
+    [NotMapped]
+    public string CURRENT_WORK_APP { get; set; } = "signFLOW GUI";
+
+    [NotMapped]
+    public bool IsAlreadySent => Status > (int)Constants.EnvelopeStatus.EnvelopeSaved;
+
+    [NotMapped]
+    public bool TFA_Enabled { get; set; } = false;
+
+    [NotMapped]
+    public byte[] DOC_RESULT { get; set; }
+#endif
+
+    public List<EnvelopeDocument> Documents { get; set; }
+
+    public List<EnvelopeHistory> History { get; set; }
+
+    // TODO: * Check the Form App and remove the default value
+    [NotMapped]
+    public List<Receiver> Receivers { get; set; } = Enumerable.Empty<Receiver>().ToList();
+
+#if NETFRAMEWORK
+    /// <summary>
+    /// Validates whether the receiver and document data are complete.
+    /// </summary>
+    public List<string> ValidateReceiverDocumentData()
+    {
+        var errors = new List<string>();
+
+        if (!Documents?.Any() ?? true)
+            errors.Add(My.Resources.Envelope.Missing_Documents);
+
+        if (!Receivers?.Any() ?? true)
+            errors.Add(My.Resources.Envelope.Missing_Receivers);
+
+        if (Receivers?.Any(r => !r.HasEmailAndName) ?? false)
+            errors.Add(My.Resources.Envelope.Incomplete_Receivers);
+
+        return errors;
+    }
+#endif
+}
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Domain/Entities/EnvelopeCertificate.cs

@@ -1,42 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_ENVELOPE_CERTIFICATE", Schema = "dbo")]
-    public class EnvelopeCertificate
-    {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
-
-        [Required]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
-
-        [Required]
-        [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")]
-        public string EnvelopeUuid { get; set; }
-
-        [Required]
-        [Column("ENVELOPE_SUBJECT", TypeName = "nvarchar(512)")]
-        public string EnvelopeSubject { get; set; }
-
-        [Required]
-        [Column("CREATOR_ID")]
-        public int CreatorId { get; set; }
-
-        [Required]
-        [Column("CREATOR_NAME", TypeName = "nvarchar(128)")]
-        public string CreatorName { get; set; }
-
-        [Required]
-        [Column("CREATOR_EMAIL", TypeName = "nvarchar(128)")]
-        public string CreatorEmail { get; set; }
-
-        [Required]
-        [Column("ENVELOPE_STATUS")]
-        public int EnvelopeStatus { get; set; }
-    }
-}

EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs

@@ -1,51 +1,64 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Drawing;
 #if NETFRAMEWORK
-using System;
+using System.Drawing;
 using System.Collections.Generic;
+using System.Linq;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")]
-    public class EnvelopeDocument
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
+#endif
 
-        [Required]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; } = 0;
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("BYTE_DATA", TypeName = "varbinary(max)")]
-        public byte[] ByteData { get; set; }
-
-        // TODO: * Check the Form App and remove the default value
-        public List<DocumentReceiverElement> Elements { get; set; } = new List<DocumentReceiverElement>();
-
-        [NotMapped]
-        public string FileNameOriginal { get; set; }
-
-        [NotMapped]
-        public bool IsTempFile { get; set; }
-
-        [NotMapped]
-        public string Filename { get; set; }
-
-        [NotMapped]
-        public string Filepath { get; set; }
-
-        [NotMapped]
-        public Bitmap Thumbnail { get; set; }
-
-        [NotMapped]
-        public int PageCount { get; set; }
+[Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")]
+public class EnvelopeDocument
+{
+    public EnvelopeDocument()
+    {
+#if NETFRAMEWORK
+        Elements = Enumerable.Empty<DocumentReceiverElement>().ToList();
+#endif
     }
-}
+
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
+
+    [Required]
+    [Column("ENVELOPE_ID")]
+    public int EnvelopeId { get; set; } = 0;
+
+    [Column("BYTE_DATA", TypeName = "varbinary(max)")]
+    public byte[] ByteData { get; set; }
+
+    public List<DocumentReceiverElement> Elements { get; set; }
+
+    // TODO: * Check the Form App and remove the default value
+    [NotMapped]
+    public string Filepath { get; set; }
+
+#if NETFRAMEWORK
+    [NotMapped]
+    public string FileNameOriginal { get; set; }
+
+    [NotMapped]
+    public bool IsTempFile { get; set; }
+
+    [NotMapped]
+    public string Filename { get; set; }
+
+    [NotMapped]
+    public Bitmap Thumbnail { get; set; }
+
+    [NotMapped]
+    public int PageCount { get; set; }
+#endif
+}
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs

@@ -6,43 +6,53 @@ using System;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_ENVELOPE_HISTORY", Schema = "dbo")]
-    public class EnvelopeHistory
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public long Id { get; set; }
+#endif
 
-        [Required]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
+[Table("TBSIG_ENVELOPE_HISTORY", Schema = "dbo")]
+public class EnvelopeHistory
+{
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public long Id { get; set; }
 
-        [Required]
-        [Column("USER_REFERENCE", TypeName = "nvarchar(128)")]
-        public string UserReference { get; set; }
+    [Required]
+    [Column("ENVELOPE_ID")]
+    public int EnvelopeId { get; set; }
 
-        [Required]
-        [Column("STATUS")]
-        public Constants.EnvelopeStatus  Status { get; set; }
+    [Required]
+    [Column("USER_REFERENCE", TypeName = "nvarchar(128)")]
+    public string UserReference { get; set; }
 
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public DateTime AddedWhen { get; set; }
+    [Required]
+    [Column("STATUS")]
+    public Constants.EnvelopeStatus  Status { get; set; }
 
-        [Column("ACTION_DATE", TypeName = "datetime")]
-        public DateTime ActionDate { get; set; } = DateTime.Now;
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+    public DateTime AddedWhen { get; set; }
 
-        [Column("COMMENT", TypeName = "nvarchar(max)")]
-        public string Comment { get; set; }
+    [Column("ACTION_DATE", TypeName = "datetime")]
+    public DateTime ActionDate { get; set; } = DateTime.Now;
 
-        public virtual User Sender { get; set; }
+    [Column("COMMENT", TypeName = "nvarchar(max)")]
+    public string Comment { get; set; }
 
-        public virtual Receiver Receiver { get; set; }
+    public virtual User Sender { get; set; }
 
-        [NotMapped]
-        public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString());
+    public virtual Receiver Receiver { get; set; }
+
+#if NETFRAMEWORK
+    [NotMapped]
+    public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString());
+#endif
+}
+
+#if NETFRAMEWORK
     }
-}
+#endif

EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs

@@ -5,59 +5,65 @@ using System;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
-    public class EnvelopeReceiver
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        [Key]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
+#endif
 
-        [Key]
-        [Column("RECEIVER_ID")]
-        public int ReceiverId { get; set; }
+[Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
+public class EnvelopeReceiver
+{
+    [Column("ENVELOPE_ID")]
+    public int EnvelopeId { get; set; }
 
-        [Required]
-        [Column("SEQUENCE")]
-        public int Sequence { get; set; }
+    [Column("RECEIVER_ID")]
+    public int ReceiverId { get; set; }
 
-        [Column("NAME", TypeName = "nvarchar(128)")]
-        public string Name { get; set; }
+    [Required]
+    [Column("SEQUENCE")]
+    public int Sequence { get; set; }
 
-        [Column("JOB_TITLE", TypeName = "nvarchar(128)")]
-        public string JobTitle { get; set; }
+    [Column("NAME", TypeName = "nvarchar(128)")]
+    public string Name { get; set; }
 
-        [Column("COMPANY_NAME", TypeName = "nvarchar(128)")]
-        public string CompanyName { get; set; }
+    [Column("JOB_TITLE", TypeName = "nvarchar(128)")]
+    public string JobTitle { get; set; }
 
-        [Column("PRIVATE_MESSAGE", TypeName = "nvarchar(max)")]
-        public string PrivateMessage { get; set; }
+    [Column("COMPANY_NAME", TypeName = "nvarchar(128)")]
+    public string CompanyName { get; set; }
 
-        [Column("ACCESS_CODE", TypeName = "nvarchar(64)")]
-        public string AccessCode { get; set; }
+    [Column("PRIVATE_MESSAGE", TypeName = "nvarchar(max)")]
+    public string PrivateMessage { get; set; }
 
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
+    [Column("ACCESS_CODE", TypeName = "nvarchar(64)")]
+    public string AccessCode { get; set; }
 
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime ChangedWhen { get; set; }
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    public DateTime AddedWhen { 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("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime ChangedWhen { get; set; }
 
-        [NotMapped]
-        public Tuple<int, int> Id => Tuple.Create(EnvelopeId, ReceiverId);
+    [Column("PHONE_NUMBER")]
+    [StringLength(20)]
+    [RegularExpression(@"^\+[0-9]+$", ErrorMessage = "Phone number must start with '+' followed by digits.")]
+    public string PhoneNumber { get; set; }
 
-        [NotMapped]
-        public bool HasPhoneNumber => !string.IsNullOrWhiteSpace(PhoneNumber);
+    [NotMapped]
+    public Tuple<int, int> Id => Tuple.Create(EnvelopeId, ReceiverId);
 
-        [ForeignKey("EnvelopeId")]
-        public Envelope Envelope { get; set; }
+    [NotMapped]
+    public bool HasPhoneNumber => !string.IsNullOrWhiteSpace(PhoneNumber);
 
-        [ForeignKey("ReceiverId")]
-        public Receiver Receiver { get; set; }
+    [ForeignKey("EnvelopeId")]
+    public Envelope Envelope { get; set; }
+
+    [ForeignKey("ReceiverId")]
+    public Receiver Receiver { get; set; }
+}
+
+#if NETFRAMEWORK
     }
-}
+#endif

EnvelopeGenerator.Domain/Entities/Receiver.cs

@@ -7,84 +7,94 @@ using System.Collections.Generic;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_RECEIVER", Schema = "dbo")]
-    public class Receiver
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
+#endif
 
-        [Required, EmailAddress]
-        [Column("EMAIL_ADDRESS", TypeName = "nvarchar(250)")]
-        [StringLength(250)]
-        public string EmailAddress { get; set; }
+[Table("TBSIG_RECEIVER", Schema = "dbo")]
+public class Receiver
+{
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
 
-        [Required]
-        [Column("SIGNATURE", TypeName = "nvarchar(64)")]
-        public string Signature { get; set; }
+    [Required, EmailAddress]
+    [Column("EMAIL_ADDRESS", TypeName = "nvarchar(250)")]
+    [StringLength(250)]
+    public string EmailAddress { get; set; }
 
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
+    [Required]
+    [Column("SIGNATURE", TypeName = "nvarchar(64)")]
+    public string Signature { get; set; }
 
-        [Column("TOTP_SECRET_KEY", TypeName = "nvarchar(MAX)")]
-        public string TotpSecretkey { get; set; }
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    public DateTime AddedWhen { get; set; }
 
-        [Column("TFA_REG_DEADLINE", TypeName = "datetime")]
-        public DateTime TfaRegDeadline { get; set; }
+    [Column("TOTP_SECRET_KEY", TypeName = "nvarchar(MAX)")]
+    public string TotpSecretkey { get; set; }
 
-        public List<EnvelopeReceiver> EnvelopeReceivers { get; set; }
+    [Column("TFA_REG_DEADLINE", TypeName = "datetime")]
+    public DateTime? TfaRegDeadline { get; set; }
 
-        [NotMapped]
-        public string Name { get; set; }
+    public List<EnvelopeReceiver> EnvelopeReceivers { get; set; }
 
-        [NotMapped]
-        public string Company { get; set; } = string.Empty;
+#if NETFRAMEWORK
+    [NotMapped]
+    public string Name { get; set; }
 
-        [NotMapped]
-        public string JobTitle { get; set; } = string.Empty;
+    [NotMapped]
+    public string Company { get; set; } = string.Empty;
 
-        [NotMapped]
-        public string PhoneNumber { get; set; } = string.Empty;
+    [NotMapped]
+    public string JobTitle { get; set; } = string.Empty;
 
-        [NotMapped]
-        public string AccessCode { get; set; } = string.Empty;
+    [NotMapped]
+    public string PhoneNumber { get; set; } = string.Empty;
 
-        [NotMapped]
-        public string PrivateMessage { get; set; } = string.Empty;
+    [NotMapped]
+    public string AccessCode { get; set; } = string.Empty;
 
-        [NotMapped]
-        public int Sequence { get; set; } = 0;
+    [NotMapped]
+    public string PrivateMessage { get; set; } = string.Empty;
 
-        [NotMapped]
-        public DateTime SignedDate { get; set; } = DateTime.MinValue;
+    [NotMapped]
+    public int Sequence { get; set; } = 0;
 
-        [NotMapped]
-        public Constants.ReceiverStatus Status { get; set; }
+    [NotMapped]
+    public DateTime SignedDate { get; set; } = DateTime.MinValue;
 
-        [NotMapped]
-        public Constants.ColorType ColorType { get; set; }
+    [NotMapped]
+    public Constants.ReceiverStatus Status { get; set; }
 
-        [NotMapped]
-        public bool HasId => Id > 0;
+    [NotMapped]
+    public Constants.ColorType ColorType { get; set; }
 
-        [NotMapped]
-        public bool HasEmailAndName =>
-            !string.IsNullOrWhiteSpace(EmailAddress) &&
-            !string.IsNullOrWhiteSpace(Name);
+    [NotMapped]
+    public bool HasId => Id > 0;
 
-        [NotMapped]
-        public string SignedDateDisplayValue =>
-            SignedDate == DateTime.MinValue ? "-" : SignedDate.ToString("G");
+    [NotMapped]
+    public bool HasEmailAndName =>
+        !string.IsNullOrWhiteSpace(EmailAddress) &&
+        !string.IsNullOrWhiteSpace(Name);
 
-        [NotMapped]
-        public Color Color => ColorType.ToColor();
+    [NotMapped]
+    public string SignedDateDisplayValue =>
+        SignedDate == DateTime.MinValue ? "-" : SignedDate.ToString("G");
 
-        public string GetSignature()
-        {
-            return EmailAddress.ToUpperInvariant().GetChecksum();
-        }
+    [NotMapped]
+    public Color Color => ColorType.ToColor();
+
+    public string GetSignature()
+    {
+        return EmailAddress.ToUpperInvariant().GetChecksum();
     }
-}
+#endif
+}
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj

@@ -35,7 +35,7 @@
 
   <ItemGroup>
     <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction.Attributes" Version="1.0.0" />
-    <PackageReference Include="UserManager.Domain" Version="3.2.1" />
+    <PackageReference Include="UserManager.Domain" Version="3.2.3" />
   </ItemGroup>
 
   <ItemGroup>

EnvelopeGenerator.Extensions/EnvelopeGenerator.Extensions.csproj

@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="HtmlSanitizer" Version="8.0.865" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <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" />

EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj

@@ -101,8 +101,8 @@
     <Reference Include="DigitalData.Modules.Messaging, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Modules.Messaging.1.9.8\lib\net462\DigitalData.Modules.Messaging.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.UserManager.Domain, Version=3.2.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UserManager.Domain.3.2.2\lib\net462\DigitalData.UserManager.Domain.dll</HintPath>
+    <Reference Include="DigitalData.UserManager.Domain, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UserManager.Domain.3.2.3\lib\net462\DigitalData.UserManager.Domain.dll</HintPath>
     </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
       <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>

EnvelopeGenerator.Form/frmEnvelopeMainData.vb

@@ -68,17 +68,17 @@ Public Class frmEnvelopeMainData
                 chked_2Faktor.EditValue = DEF_TF_ENABLED
 
             Else
-                If IsNothing(Envelope.EnvelopeType) Then
-                    Envelope.EnvelopeType = EnvelopeType
+                If IsNothing(Envelope.Type) Then
+                    Envelope.Type = EnvelopeType
                 End If
-                If Envelope.EnvelopeType.ContractType = 0 Then
+                If Envelope.Type.ContractType = 0 Then
                     cmbEnvelopeType.EditValue = EnvelopeType
                 Else
                     ' This will trigger loading values from the type
-                    cmbEnvelopeType.EditValue = Envelope.EnvelopeType
-                    ' cmbEnvelopeType.SelectedIndex = Convert.ToInt32(Envelope.EnvelopeType) - 1
+                    cmbEnvelopeType.EditValue = Envelope.Type
+                    ' cmbEnvelopeType.SelectedIndex = Convert.ToInt32(Envelope.Type) - 1
                     ' cmbEnvelopeType.SelectedIndex = Envelope.Type.Id - 1
-                    ' cmbEnvelopeType.SelectedItem = cmbEnvelopeType.Properties.Items.Cast(Of EnvelopeType).Where(Function(i) i.Id = Envelope.EnvelopeType.Id).SingleOrDefault()
+                    ' cmbEnvelopeType.SelectedItem = cmbEnvelopeType.Properties.Items.Cast(Of Type).Where(Function(i) i.Id = Envelope.Type.Id).SingleOrDefault()
                 End If
 
 
@@ -126,7 +126,7 @@ Public Class frmEnvelopeMainData
             oEnvelopeType = EnvelopeType
         End If
         Envelope.Title = txtTitle.EditValue.ToString
-        Envelope.EnvelopeType = oEnvelopeType
+        Envelope.Type = oEnvelopeType
         Envelope.EnvelopeTypeId = IIf(IsNothing(oEnvelopeType), 0, oEnvelopeType.Id)
         Envelope.CertificationType = cmbCertificationType.SelectedIndex + 1
         Envelope.Language = cmbLanguage.EditValue

EnvelopeGenerator.Form/packages.config

@@ -50,5 +50,5 @@
   <package id="System.Text.Json" version="9.0.0" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
-  <package id="UserManager.Domain" version="3.2.2" targetFramework="net462" />
+  <package id="UserManager.Domain" version="3.2.3" targetFramework="net462" />
 </packages>

EnvelopeGenerator.Infrastructure/DependencyExtensions.cs

@@ -48,7 +48,6 @@ public static class DIExtensions
         services.TryAddScoped<IDocumentStatusRepository, DocumentStatusRepository>();
         services.TryAddScoped<IEmailTemplateRepository, EmailTemplateRepository>();
         services.TryAddScoped<IEnvelopeRepository, EnvelopeRepository>();
-        services.TryAddScoped<IEnvelopeCertificateRepository, EnvelopeCertificateRepository>();
         services.TryAddScoped<IEnvelopeHistoryRepository, EnvelopeHistoryRepository>();
         services.TryAddScoped<IEnvelopeReceiverRepository, EnvelopeReceiverRepository>();
         services.TryAddScoped<IEnvelopeTypeRepository, EnvelopeTypeRepository>();
@@ -61,7 +60,6 @@ public static class DIExtensions
         services.AddDbRepository<EGDbContext, DocumentStatus>(context => context.DocumentStatus).UseAutoMapper();
         services.AddDbRepository<EGDbContext, EmailTemplate>(context => context.EmailTemplate).UseAutoMapper();
         services.AddDbRepository<EGDbContext, Envelope>(context => context.Envelopes).UseAutoMapper();
-        services.AddDbRepository<EGDbContext, EnvelopeCertificate>(context => context.EnvelopeCertificates).UseAutoMapper();
         services.AddDbRepository<EGDbContext, EnvelopeHistory>(context => context.EnvelopeHistories).UseAutoMapper();
         services.AddDbRepository<EGDbContext, EnvelopeReceiver>(context => context.EnvelopeReceivers).UseAutoMapper();
         services.AddDbRepository<EGDbContext, EnvelopeType>(context => context.EnvelopeTypes).UseAutoMapper();

EnvelopeGenerator.Infrastructure/EGDbContext.cs

@@ -29,8 +29,6 @@ public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext
 
     public DbSet<EmailTemplate> EmailTemplate { get; set; }
 
-    public DbSet<EnvelopeCertificate> EnvelopeCertificates { get; set; }
-
     public DbSet<EnvelopeDocument> EnvelopeDocument { get; set; }
 
     public DbSet<EnvelopeHistory> EnvelopeHistories { get; set; }
@@ -73,7 +71,6 @@ public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext
         Envelopes = Set<Envelope>();
         DocumentReceiverElements = Set<DocumentReceiverElement>();
         DocumentStatus = Set<DocumentStatus>();
-        EnvelopeCertificates = Set<EnvelopeCertificate>();
         EnvelopeDocument = Set<EnvelopeDocument>();
         EnvelopeHistories = Set<EnvelopeHistory>();
         EnvelopeTypes = Set<EnvelopeType>();
@@ -101,7 +98,6 @@ public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext
         modelBuilder.Entity<DocumentStatus>();
         modelBuilder.Entity<EmailTemplate>();
         modelBuilder.Entity<Envelope>();
-        modelBuilder.Entity<EnvelopeCertificate>();
         modelBuilder.Entity<EnvelopeHistory>();
         modelBuilder.Entity<EnvelopeType>();
         modelBuilder.Entity<Receiver>();
@@ -165,7 +161,6 @@ public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext
         AddTrigger<DocumentStatus>();
         AddTrigger<EmailTemplate>();
         AddTrigger<Envelope>();
-        AddTrigger<EnvelopeCertificate>();
         AddTrigger<EnvelopeDocument>();
         AddTrigger<EnvelopeHistory>();
         AddTrigger<EnvelopeReceiver>();

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.1.1" />
     <PackageReference Include="DigitalData.Core.Infrastructure.AutoMapper" Version="1.0.3" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
-	<PackageReference Include="UserManager" Version="1.1.1" />
+	<PackageReference Include="UserManager" Version="1.1.3" />
   </ItemGroup>
 
   <ItemGroup>

EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs

@@ -1053,7 +1053,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                         });
                 });
 
-            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.EnvelopeType", b =>
+            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Type", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -1271,7 +1271,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
 
             modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Envelope", b =>
                 {
-                    b.HasOne("EnvelopeGenerator.Domain.Entities.EnvelopeType", "EnvelopeType")
+                    b.HasOne("EnvelopeGenerator.Domain.Entities.Type", "Type")
                         .WithMany()
                         .HasForeignKey("EnvelopeTypeId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -1283,7 +1283,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.Navigation("EnvelopeType");
+                    b.Navigation("Type");
 
                     b.Navigation("User");
                 });

EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs

@@ -1050,7 +1050,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                         });
                 });
 
-            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.EnvelopeType", b =>
+            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Type", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -1268,7 +1268,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
 
             modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Envelope", b =>
                 {
-                    b.HasOne("EnvelopeGenerator.Domain.Entities.EnvelopeType", "EnvelopeType")
+                    b.HasOne("EnvelopeGenerator.Domain.Entities.Type", "Type")
                         .WithMany()
                         .HasForeignKey("EnvelopeTypeId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -1280,7 +1280,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.Navigation("EnvelopeType");
+                    b.Navigation("Type");
 
                     b.Navigation("User");
                 });

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeCertificateRepository.cs

@@ -1,13 +0,0 @@
-using DigitalData.Core.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
-
-namespace EnvelopeGenerator.Infrastructure.Repositories;
-
-[Obsolete("Use IRepository")]
-public class EnvelopeCertificateRepository : CRUDRepository<EnvelopeCertificate, int, EGDbContext>, IEnvelopeCertificateRepository
-{
-    public EnvelopeCertificateRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeCertificates)
-    {
-    }
-}

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeCertificateController.cs

@@ -1,14 +0,0 @@
-using EnvelopeGenerator.Application.Contracts.Services;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Web.Controllers.Test;
-
-[Obsolete("Use MediatR")]
-public class TestEnvelopeCertificateController : TestControllerBase<IEnvelopeCertificateService, EnvelopeCertificateDto, EnvelopeCertificate, int>
-{
-    public TestEnvelopeCertificateController(ILogger<TestEnvelopeCertificateController> logger, IEnvelopeCertificateService service) : base(logger, service)
-    {
-
-    }
-}

EnvelopeGenerator.Web/appsettings.Development.json

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