Compare commits
109 Commits
b9cd629766
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 5c0345a810 | |||
| d9a55ec0eb | |||
| 2feebf264b | |||
| 5853868de2 | |||
| 03a3d0a116 | |||
| 3a21b3ba94 | |||
| 224d029c18 | |||
| 6eb92a31a6 | |||
| d0ddf00fc2 | |||
| e13413c7fc | |||
| 6c9b8ad3a8 | |||
| 93d9aa0742 | |||
| fd2b21a73c | |||
| deae4d2acc | |||
| 55140846ba | |||
| 9c2de46253 | |||
| fa56f2059a | |||
| bb5175347c | |||
| 85033ce667 | |||
| c8bd2a348d | |||
| b5c9c8da6c | |||
| abd3c23f8c | |||
| 9d4806bef7 | |||
| 48b2fc0eca | |||
| 18fbc2100f | |||
| 13784cd595 | |||
| 67e435c3fa | |||
| 3c80bc4d26 | |||
| 22895e259a | |||
| f4d2b65943 | |||
| 17da3ea91e | |||
| 621f9333a4 | |||
| 34b184b057 | |||
| c77beb88df | |||
| 35b6093169 | |||
| 23f2056421 | |||
| 2b580f5e3d | |||
| 89a4e789f1 | |||
| 94658b0d9b | |||
| 6ad76fa4b0 | |||
| 31933f5568 | |||
| 47c4f33dfc | |||
| 26d41d9178 | |||
| 238c938ce7 | |||
| 5fb7b5a79e | |||
| 2c8b65d576 | |||
| e1f24249a9 | |||
| f6dc454193 | |||
| b65098fafb | |||
| c6fe7722b4 | |||
| 2065102fb3 | |||
| 858b748e65 | |||
| 25c03b350b | |||
| ed9ea0ac54 | |||
| 18c1adb68a | |||
| ec8b9adb9c | |||
| 4a10db0865 | |||
| ceb2860883 | |||
| 11e72bac53 | |||
| 638b734648 | |||
| eec1b4926b | |||
| d7611a6b59 | |||
| 0cf603fc79 | |||
| e3d2225a44 | |||
| 595bbf3f25 | |||
| ee7d01ed7f | |||
| 85104511fd | |||
| 1b87528cca | |||
| 2913514da8 | |||
| ce7e70162b | |||
| 5e00b6e9ec | |||
| f0b4c8d00c | |||
| abf616c115 | |||
| 42585e1f2c | |||
| ff10fc6b0a | |||
| 7222f7e9a7 | |||
| d913b949e0 | |||
| a35e05d016 | |||
| 8aabc3e233 | |||
| 8b7f99eb76 | |||
| 91e90b322b | |||
| 74e55e9206 | |||
| fc5ad7ea3c | |||
| ff5582c9b5 | |||
| 6523cca945 | |||
| 28d0b6f81c | |||
| 5df38754cb | |||
| c2b7579717 | |||
| ae1ecbc15f | |||
| 4dcfe67038 | |||
| c812d4dc1f | |||
| 8d27718062 | |||
| c746612d80 | |||
| 06551d502b | |||
| 0f28b80e16 | |||
| f7af3776c2 | |||
| 8ba9e8ec20 | |||
| 226d852c6f | |||
| fb155fe706 | |||
| 658cb28e1c | |||
| f38098aed8 | |||
| 00c3fd18a9 | |||
| 8929c517fe | |||
| 07ce6ccfe1 | |||
| 26beae0d14 | |||
| e423c6d751 | |||
| 56d1dc050f | |||
| 016dec74f9 | |||
| 6dfcc1b2be |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -370,4 +370,3 @@ FodyWeavers.xsd
|
|||||||
/EnvelopeGenerator.Server/EnvelopeGenerator.Server/publish-output
|
/EnvelopeGenerator.Server/EnvelopeGenerator.Server/publish-output
|
||||||
/EnvelopeGenerator.Server/EnvelopeGenerator.Server/tekh_softHSM_test.md
|
/EnvelopeGenerator.Server/EnvelopeGenerator.Server/tekh_softHSM_test.md
|
||||||
/ignore/EnvelopeGenerator.Form
|
/ignore/EnvelopeGenerator.Form
|
||||||
/EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.Secrets.json
|
|
||||||
|
|||||||
@@ -287,6 +287,7 @@ Manual testing workflow:
|
|||||||
- Audit `EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/` for unnecessary request/payload remapping and remove redundant mappings where direct request DTO usage is safe; review client HTTP methods end-to-end for similar avoidable transformation layers.
|
- Audit `EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Services/` for unnecessary request/payload remapping and remove redundant mappings where direct request DTO usage is safe; review client HTTP methods end-to-end for similar avoidable transformation layers.
|
||||||
- Centralize dependency injection registrations into dedicated extension methods/modules (especially server + client service registrations in `Program.cs`) to reduce startup composition sprawl and improve maintainability.
|
- Centralize dependency injection registrations into dedicated extension methods/modules (especially server + client service registrations in `Program.cs`) to reduce startup composition sprawl and improve maintainability.
|
||||||
- Refactor `EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/PdfRenderController.cs` + matching client service contract to remove JSON/base64 `byte[]` transport for PDF rendering; prefer binary streaming (`application/octet-stream` or multipart), avoid `data:` URL bloat where possible, and validate end-to-end memory/latency behavior with large PDFs.
|
- Refactor `EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/PdfRenderController.cs` + matching client service contract to remove JSON/base64 `byte[]` transport for PDF rendering; prefer binary streaming (`application/octet-stream` or multipart), avoid `data:` URL bloat where possible, and validate end-to-end memory/latency behavior with large PDFs.
|
||||||
|
- Move sender PDF image editor initial zoom from hardcoded value to Options pattern configuration (bind from `appsettings.json` and inject via `IOptions`/`IOptionsMonitor`) so default zoom (for example `%180`) is environment-configurable.
|
||||||
- Establish a DevExpress toast-based notification architecture using `DxToastProvider` + `IToastNotificationService` (tab/page-scoped provider strategy, standardized `ToastOptions` factory, and severity-to-style mapping) so sender/receiver flows show consistent, non-duplicated, actionable feedback.
|
- Establish a DevExpress toast-based notification architecture using `DxToastProvider` + `IToastNotificationService` (tab/page-scoped provider strategy, standardized `ToastOptions` factory, and severity-to-style mapping) so sender/receiver flows show consistent, non-duplicated, actionable feedback.
|
||||||
- Eliminate manual property-by-property request→domain mapping drift (example: `CreateEnvelopeCommandHandler`) by introducing a standardized mapping policy (AutoMapper/profile conventions or reflection/source-generator based mapper) and enforcing it across envelope workflows; this needs to be solved in the shared company Core library level so all services get the same guardrails by default.
|
- Eliminate manual property-by-property request→domain mapping drift (example: `CreateEnvelopeCommandHandler`) by introducing a standardized mapping policy (AutoMapper/profile conventions or reflection/source-generator based mapper) and enforcing it across envelope workflows; this needs to be solved in the shared company Core library level so all services get the same guardrails by default.
|
||||||
- P1 security workstream: remove dynamic SQL string composition/interpolation from active save/create/update paths (`string.Format`, `$"...{input}..."`, `ToSqlParam`) and migrate to parameterized queries only; treat this as a potential SQL injection vulnerability (stability + security risk), execute repo-wide audit, and add CI guardrails to block reintroduction.
|
- P1 security workstream: remove dynamic SQL string composition/interpolation from active save/create/update paths (`string.Format`, `$"...{input}..."`, `ToSqlParam`) and migrate to parameterized queries only; treat this as a potential SQL injection vulnerability (stability + security risk), execute repo-wide audit, and add CI guardrails to block reintroduction.
|
||||||
|
|||||||
@@ -1,94 +0,0 @@
|
|||||||
using EnvelopeGenerator.Application.Common.Enums;
|
|
||||||
using System.ComponentModel.DataAnnotations;
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Application.Common.Configurations;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Represents PKCS#11 signing configuration for PDF signing workflows.
|
|
||||||
/// This options model maps to the <c>Crypt:Pkcs11</c> configuration section.
|
|
||||||
/// </summary>
|
|
||||||
public sealed class Pkcs11Options
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Configuration section path used for binding PKCS#11 options.
|
|
||||||
/// </summary>
|
|
||||||
public const string SectionName = "Crypt:Pkcs11";
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Optional base directory that contains the <c>pkcs11</c> folder.
|
|
||||||
/// If null/empty, runtime uses the application base directory.
|
|
||||||
/// </summary>
|
|
||||||
public string? AssetsRootPath { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Optional numeric slot identifier used to directly select the target token slot.
|
|
||||||
/// </summary>
|
|
||||||
public ulong? SlotId { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Optional token label used as a fallback token selector when <see cref="SlotId"/> is not provided.
|
|
||||||
/// </summary>
|
|
||||||
public string? TokenLabel { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Optional PKCS#11 proxy endpoint (for example <c>tcp://host:port</c>).
|
|
||||||
/// </summary>
|
|
||||||
public string? ProxySocket { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Resolved absolute PKCS#11 proxy module path used at runtime.
|
|
||||||
/// Computed from <see cref="AssetsRootPath"/> and runtime defaults.
|
|
||||||
/// </summary>
|
|
||||||
public string ResolvedLibraryPath { get; private set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Resolved absolute pkcs11-tool path used at runtime.
|
|
||||||
/// Computed from <see cref="AssetsRootPath"/> and runtime defaults.
|
|
||||||
/// Can be null when tool fallback is not available.
|
|
||||||
/// </summary>
|
|
||||||
public string? ResolvedToolPath { get; private set; }
|
|
||||||
|
|
||||||
public void SetResolvedPaths(string resolvedLibraryPath, string? resolvedToolPath)
|
|
||||||
{
|
|
||||||
ResolvedLibraryPath = resolvedLibraryPath;
|
|
||||||
ResolvedToolPath = resolvedToolPath;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// User PIN used to authenticate to the PKCS#11 token session.
|
|
||||||
/// </summary>
|
|
||||||
[Required]
|
|
||||||
[MinLength(1)]
|
|
||||||
public required string UserPin { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Label of the private key object used to create digital signatures.
|
|
||||||
/// </summary>
|
|
||||||
[Required]
|
|
||||||
[MinLength(1)]
|
|
||||||
public required string PrivateKeyLabel { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Label of the certificate object returned/embedded with the signature.
|
|
||||||
/// </summary>
|
|
||||||
[Required]
|
|
||||||
[MinLength(1)]
|
|
||||||
public required string CertificateLabel { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Optional global default signing reason used when request-level options do not specify a value.
|
|
||||||
/// </summary>
|
|
||||||
public string? DefaultReason { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Application name embedded into PDF signature metadata.
|
|
||||||
/// This value is controlled via app settings and is not client-overridable.
|
|
||||||
/// </summary>
|
|
||||||
public string? ApplicationName { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Controls how fallback signing time is created when request-level options do not specify a value.
|
|
||||||
/// <c>true</c> uses <see cref="DateTimeOffset.UtcNow"/>, <c>false</c> uses <see cref="DateTimeOffset.Now"/>.
|
|
||||||
/// </summary>
|
|
||||||
public bool UseUtcSigningTime { get; set; } = true;
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
namespace EnvelopeGenerator.Application.Common.Configurations;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public class SignatureFieldParams
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public double Width { get; init; } = 1.77;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public double Height { get; init; } = 1.96;
|
||||||
|
}
|
||||||
@@ -23,5 +23,5 @@ public record DocumentDto : DocumentDetailsDto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the binary data of the document, if available.
|
/// Gets or sets the binary data of the document, if available.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public byte[]? ByteData { get; init; }
|
public byte[]? ByteData { get; set; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,11 +59,6 @@ public record EnvelopeDto : IEnvelope
|
|||||||
[TemplatePlaceholder("[DOCUMENT_TITLE]")]
|
[TemplatePlaceholder("[DOCUMENT_TITLE]")]
|
||||||
public string Title { get; set; } = string.Empty;
|
public string Title { get; set; } = string.Empty;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
///
|
|
||||||
/// </summary>
|
|
||||||
public int? ContractType { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Default value is 'de-DE'
|
/// Default value is 'de-DE'
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -72,7 +67,7 @@ public record EnvelopeDto : IEnvelope
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? EnvelopeTypeId { get; set; }
|
public EnvelopeType? Type { get; set; }
|
||||||
|
|
||||||
// TODO: use ReadAndConfirm property name
|
// TODO: use ReadAndConfirm property name
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -84,17 +79,12 @@ public record EnvelopeDto : IEnvelope
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? CertificationType { get; set; }
|
public FinalEmailType? FinalEmailToCreator { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? FinalEmailToCreator { get; set; }
|
public FinalEmailType? FinalEmailToReceivers { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
///
|
|
||||||
/// </summary>
|
|
||||||
public int? FinalEmailToReceivers { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
@@ -139,7 +129,7 @@ public record EnvelopeDto : IEnvelope
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public EnvelopeType? EnvelopeType { get; set; }
|
public EnvelopeTypeDefaultsDto? Defaults { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
|
|||||||
@@ -1,14 +1,16 @@
|
|||||||
namespace EnvelopeGenerator.Application.Common.Dto;
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Common.Dto;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Data Transfer Object representing a type of envelope with its configuration settings.
|
/// Data Transfer Object representing a type of envelope with its configuration settings.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class EnvelopeTypeDto
|
public class EnvelopeTypeDefaultsDto
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the unique identifier of the envelope type.
|
/// Gets or sets the unique identifier of the envelope type.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int Id { get; set; }
|
public EnvelopeType Id { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the title of the envelope type.
|
/// Gets or sets the title of the envelope type.
|
||||||
@@ -25,11 +27,6 @@ public class EnvelopeTypeDto
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public int? ExpiresDays { get; set; }
|
public int? ExpiresDays { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the certification type identifier.
|
|
||||||
/// </summary>
|
|
||||||
public int? CertificationType { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets a value indicating whether an access code is required.
|
/// Gets or sets a value indicating whether an access code is required.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -38,12 +35,12 @@ public class EnvelopeTypeDto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the final email template ID to be sent to the creator.
|
/// Gets or sets the final email template ID to be sent to the creator.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? FinalEmailToCreator { get; set; }
|
public FinalEmailType? FinalEmailToCreator { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the final email template ID to be sent to the receivers.
|
/// Gets or sets the final email template ID to be sent to the receivers.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? FinalEmailToReceivers { get; set; }
|
public FinalEmailType? FinalEmailToReceivers { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the timestamp when this envelope type was added.
|
/// Gets or sets the timestamp when this envelope type was added.
|
||||||
@@ -74,9 +71,4 @@ public class EnvelopeTypeDto
|
|||||||
/// Gets or sets the interval in days between reminder emails.
|
/// Gets or sets the interval in days between reminder emails.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? ReminderIntervalDays { get; set; }
|
public int? ReminderIntervalDays { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the contract type associated with the envelope type.
|
|
||||||
/// </summary>
|
|
||||||
public int? ContractType { get; set; }
|
|
||||||
}
|
}
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
namespace EnvelopeGenerator.Application.Common.Dto;
|
|
||||||
|
|
||||||
public sealed record Pkcs11SelfTestStatusDto(
|
|
||||||
bool Completed,
|
|
||||||
bool Success,
|
|
||||||
string Mode,
|
|
||||||
string Summary,
|
|
||||||
DateTimeOffset? CheckedAtUtc,
|
|
||||||
string? InteropError,
|
|
||||||
string? ToolError);
|
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public interface IRequestContext
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
string? Origin { get; }
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using DigitalData.Core.Abstraction.Application.Repository;
|
using DigitalData.Core.Abstraction.Application.Repository;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
using EnvelopeGenerator.Domain.Entities;
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
|
||||||
@@ -7,6 +8,6 @@ namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
|
|||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Obsolete("Use IRepository")]
|
[Obsolete("Use IRepository")]
|
||||||
public interface IEnvelopeTypeRepository : ICRUDRepository<EnvelopeType, int>
|
public interface IEnvelopeTypeRepository : ICRUDRepository<EnvelopeTypeDefaults, EnvelopeType>
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
using DigitalData.Core.Abstraction.Application;
|
using DigitalData.Core.Abstraction.Application;
|
||||||
using EnvelopeGenerator.Application.Common.Dto;
|
using EnvelopeGenerator.Application.Common.Dto;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
using EnvelopeGenerator.Domain.Entities;
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
|
||||||
@@ -8,6 +9,6 @@ namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
|
|||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Obsolete("Use MediatR")]
|
[Obsolete("Use MediatR")]
|
||||||
public interface IEnvelopeTypeService : IBasicCRUDService<EnvelopeTypeDto, EnvelopeType, int>
|
public interface IEnvelopeTypeService : IBasicCRUDService<EnvelopeTypeDefaultsDto, EnvelopeTypeDefaults, EnvelopeType>
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
using EnvelopeGenerator.Application.Common.Dto;
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
|
|
||||||
|
|
||||||
public interface IPkcs11SelfTestStatusProvider
|
|
||||||
{
|
|
||||||
Pkcs11SelfTestStatusDto GetStatus();
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Payload for <see cref="EmailTemplateType.DocumentAccessCodeReceived"/> template.
|
||||||
|
/// </summary>
|
||||||
|
public record DocumentAccessCodeReceivedNotification : EnvelopeNotificationBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[DOCUMENT_TITLE]</c> in mail subject/body.
|
||||||
|
/// </summary>
|
||||||
|
public required string DocumentTitle { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_RECEIVER]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string NameReceiver { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_SENDER]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string NameSender { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Determines <c>[SIGNATURE_TYPE]</c> text in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required bool IsReadAndConfirm { private get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[SIGNATURE_TYPE]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public string SignatureType => IsReadAndConfirm ? "Signieren" : "Lesen und bestätigen";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[DOCUMENT_ACCESS_CODE]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string DocumentAccessCode { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_PORTAL]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public string NamePortal { get; init; } = "signFLOW Portal";
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override EmailTemplateType GetTemplateType() => EmailTemplateType.DocumentAccessCodeReceived;
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Payload for <see cref="EmailTemplateType.DocumentCompleted"/> template.
|
||||||
|
/// </summary>
|
||||||
|
public record DocumentCompletedNotification : EnvelopeNotificationBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[DOCUMENT_TITLE]</c> in mail subject/body.
|
||||||
|
/// </summary>
|
||||||
|
public required string DocumentTitle { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_RECEIVER]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string NameReceiver { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_PORTAL]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public string NamePortal { get; init; } = "signFLOW Portal";
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override EmailTemplateType GetTemplateType() => EmailTemplateType.DocumentCompleted;
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Payload for <see cref="EmailTemplateType.DocumentDeleted"/> template.
|
||||||
|
/// </summary>
|
||||||
|
public record DocumentDeletedNotification : EnvelopeNotificationBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[DOCUMENT_TITLE]</c> in mail subject/body.
|
||||||
|
/// </summary>
|
||||||
|
public required string DocumentTitle { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_RECEIVER]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string NameReceiver { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_SENDER]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string NameSender { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[REASON]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string Reason { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_PORTAL]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public string NamePortal { get; init; } = "signFLOW Portal";
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override EmailTemplateType GetTemplateType() => EmailTemplateType.DocumentDeleted;
|
||||||
|
}
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
using EnvelopeGenerator.Application.Common.Extensions;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public record DocumentReceivedNotification : EnvelopeNotificationBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required string DocumentTitle { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required string NameReceiver { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required string NameSender { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [SIGNATURE_TYPE]
|
||||||
|
/// </summary>
|
||||||
|
public required bool IsReadAndConfirm { private get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string SignatureType => IsReadAndConfirm ? "Signieren" : "Lesen und bestätigen";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required bool AdvancedSignature { private get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string DocumentProcess => AdvancedSignature ? " und elektronisch unterschreiben" : string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required Uri Origin { private get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required string EnvelopeUuid { private get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required string ReceiverSignature { private get; init; }
|
||||||
|
|
||||||
|
private Uri EnvelopeURL => new(Origin, $"Envelope/{(EnvelopeUuid, ReceiverSignature).ToEnvelopeKey()}");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string LinkToDocument => EnvelopeURL.AbsoluteUri;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string LinkToDocumentText
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
var urlText = EnvelopeURL.ToString();
|
||||||
|
return $"{urlText[..Math.Min(urlText.Length, 40)]}..";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required string Message { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string NamePortal { get; set; } = "signFLOW Portal";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public override EmailTemplateType GetTemplateType()
|
||||||
|
{
|
||||||
|
return EmailTemplateType.DocumentReceived;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Payload for <see cref="EmailTemplateType.DocumentRejected_ADM"/> template.
|
||||||
|
/// </summary>
|
||||||
|
public record DocumentRejectedAdmNotification : EnvelopeNotificationBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[DOCUMENT_TITLE]</c> in mail subject/body.
|
||||||
|
/// </summary>
|
||||||
|
public required string DocumentTitle { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_SENDER]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string NameSender { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_RECEIVER]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string NameReceiver { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[REASON]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string Reason { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_PORTAL]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public string NamePortal { get; init; } = "signFLOW Portal";
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override EmailTemplateType GetTemplateType() => EmailTemplateType.DocumentRejected_ADM;
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Payload for <see cref="EmailTemplateType.DocumentRejected_REC_2"/> template.
|
||||||
|
/// </summary>
|
||||||
|
public record DocumentRejectedRec2Notification : EnvelopeNotificationBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[DOCUMENT_TITLE]</c> in mail subject/body.
|
||||||
|
/// </summary>
|
||||||
|
public required string DocumentTitle { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_RECEIVER]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string NameReceiver { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_SENDER]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string NameSender { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_PORTAL]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public string NamePortal { get; init; } = "signFLOW Portal";
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override EmailTemplateType GetTemplateType() => EmailTemplateType.DocumentRejected_REC_2;
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Payload for <see cref="EmailTemplateType.DocumentRejected_REC"/> template.
|
||||||
|
/// </summary>
|
||||||
|
public record DocumentRejectedRecNotification : EnvelopeNotificationBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[DOCUMENT_TITLE]</c> in mail subject/body.
|
||||||
|
/// </summary>
|
||||||
|
public required string DocumentTitle { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_RECEIVER]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string NameReceiver { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_SENDER]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string NameSender { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_PORTAL]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public string NamePortal { get; init; } = "signFLOW Portal";
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override EmailTemplateType GetTemplateType() => EmailTemplateType.DocumentRejected_REC;
|
||||||
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
using EnvelopeGenerator.Application.Common.Extensions;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Payload for <see cref="EmailTemplateType.DocumentShared"/> template.
|
||||||
|
/// </summary>
|
||||||
|
public record DocumentSharedNotification : EnvelopeNotificationBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[DOCUMENT_TITLE]</c> in mail subject/body.
|
||||||
|
/// </summary>
|
||||||
|
public required string DocumentTitle { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_RECEIVER]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string NameReceiver { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Base host used to build document link placeholders.
|
||||||
|
/// </summary>
|
||||||
|
public required Uri Origin { private get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Read-only share identifier used to build link placeholders.
|
||||||
|
/// </summary>
|
||||||
|
public required long ReadOnlyId { private get; init; }
|
||||||
|
|
||||||
|
private Uri EnvelopeUrl => new(Origin, $"EnvelopeKey/{ReadOnlyId.ToEnvelopeKey()}");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[LINK_TO_DOCUMENT]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public string LinkToDocument => EnvelopeUrl.AbsoluteUri;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[LINK_TO_DOCUMENT_TEXT]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public string LinkToDocumentText
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
var urlText = EnvelopeUrl.ToString();
|
||||||
|
return $"{urlText[..Math.Min(urlText.Length, 40)]}..";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_PORTAL]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public string NamePortal { get; init; } = "signFLOW Portal";
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override EmailTemplateType GetTemplateType() => EmailTemplateType.DocumentShared;
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public record DocumentSignedNotification : EnvelopeNotificationBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required string DocumentTitle { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required string NameReceiver { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string NamePortal { get; init; } = "signFLOW Portal";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required bool IsReadAndConfirm { private get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string ReceiverAction => IsReadAndConfirm ? "bestätigt" : "unterschrieben";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string FinalStatus => IsReadAndConfirm ? "Lesebestätigung" : "Signatur";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string FinalAction => IsReadAndConfirm ? "Empfänger bestätigt" : "Vertragspartner unterzeichnet";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public override EmailTemplateType GetTemplateType() => EmailTemplateType.DocumentSigned;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
|
||||||
|
Umschlag abgeschlossen: '[DOCUMENT_TITLE]'
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
Guten Tag [NAME_RECEIVER],<br /> <br /> Der Vorgang <B><I>'[DOCUMENT_TITLE]'</I></B> wurde erfolgreich abgeschlossen.<br /> <br /> Sie erhalten das Dokument mit einem detaillierten Ergebnisbericht als Anhang zu dieser Email.<br /> <br /> Mit freundlichen Grüßen<br /> <br /> [NAME_PORTAL]
|
||||||
|
|
||||||
|
*/
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public abstract record EnvelopeNotificationBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public abstract EmailTemplateType GetTemplateType();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public IReadOnlyList<(string FileName, byte[] Content)>? Attachments { get; init; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public interface IEnvelopeNotificationService
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="TEnvelopeNotificationBase"></typeparam>
|
||||||
|
/// <param name="receiverEmail"></param>
|
||||||
|
/// <param name="notification"></param>
|
||||||
|
/// <param name="cancel"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public Task Notify<TEnvelopeNotificationBase>(string receiverEmail, TEnvelopeNotificationBase notification, CancellationToken cancel = default)
|
||||||
|
where TEnvelopeNotificationBase : EnvelopeNotificationBase;
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Payload for <see cref="EmailTemplateType.TotpSecret"/> template.
|
||||||
|
/// </summary>
|
||||||
|
public record TotpSecretNotification : EnvelopeNotificationBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[TFA_EXPIRATION]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string TfaExpiration { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[TFA_QR_CODE]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public required string TfaQrCode { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Replaces <c>[NAME_PORTAL]</c> in mail body.
|
||||||
|
/// </summary>
|
||||||
|
public string NamePortal { get; init; } = "signFLOW Portal";
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override EmailTemplateType GetTemplateType() => EmailTemplateType.TotpSecret;
|
||||||
|
}
|
||||||
@@ -30,14 +30,14 @@ public class MappingProfile : Profile
|
|||||||
CreateMap<EmailTemplate, EmailTemplateDto>();
|
CreateMap<EmailTemplate, EmailTemplateDto>();
|
||||||
CreateMap<Envelope, EnvelopeDto>()
|
CreateMap<Envelope, EnvelopeDto>()
|
||||||
.ForMember(dest => dest.EnvelopeTypeTitle,
|
.ForMember(dest => dest.EnvelopeTypeTitle,
|
||||||
opt => opt.MapFrom(src => src.Type != null ? src.Type.Title : null));
|
opt => opt.MapFrom(src => src.Defaults != null ? src.Defaults.Title : null));
|
||||||
CreateMap<Document, DocumentDto>();
|
CreateMap<Document, DocumentDto>();
|
||||||
CreateMap<Document, DocumentDetailsDto>();
|
CreateMap<Document, DocumentDetailsDto>();
|
||||||
CreateMap<History, HistoryDto>().ForMember(dest => dest.ActionDate, opt => opt.MapFrom(src => src.ChangedWhen));
|
CreateMap<History, HistoryDto>().ForMember(dest => dest.ActionDate, opt => opt.MapFrom(src => src.ChangedWhen));
|
||||||
CreateMap<History, HistoryCreateDto>().ForMember(dest => dest.ActionDate, opt => opt.MapFrom(src => src.ChangedWhen));
|
CreateMap<History, HistoryCreateDto>().ForMember(dest => dest.ActionDate, opt => opt.MapFrom(src => src.ChangedWhen));
|
||||||
CreateMap<EnvelopeReceiver, EnvelopeReceiverDto>();
|
CreateMap<EnvelopeReceiver, EnvelopeReceiverDto>();
|
||||||
CreateMap<EnvelopeReceiver, EnvelopeReceiverSecretDto>();
|
CreateMap<EnvelopeReceiver, EnvelopeReceiverSecretDto>();
|
||||||
CreateMap<EnvelopeType, EnvelopeTypeDto>();
|
CreateMap<EnvelopeTypeDefaults, EnvelopeTypeDefaultsDto>();
|
||||||
CreateMap<Receiver, ReceiverDto>();
|
CreateMap<Receiver, ReceiverDto>();
|
||||||
CreateMap<EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
|
CreateMap<EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
|
||||||
CreateMap<ElementAnnotation, AnnotationDto>();
|
CreateMap<ElementAnnotation, AnnotationDto>();
|
||||||
@@ -55,7 +55,7 @@ public class MappingProfile : Profile
|
|||||||
CreateMap<HistoryDto, History>().ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(src => src.ActionDate));
|
CreateMap<HistoryDto, History>().ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(src => src.ActionDate));
|
||||||
CreateMap<HistoryCreateDto, History>().ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(src => src.ActionDate));
|
CreateMap<HistoryCreateDto, History>().ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(src => src.ActionDate));
|
||||||
CreateMap<EnvelopeReceiverDto, EnvelopeReceiver>();
|
CreateMap<EnvelopeReceiverDto, EnvelopeReceiver>();
|
||||||
CreateMap<EnvelopeTypeDto, EnvelopeType>();
|
CreateMap<EnvelopeTypeDefaultsDto, EnvelopeTypeDefaults>();
|
||||||
CreateMap<ReceiverDto, Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
|
CreateMap<ReceiverDto, Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
|
||||||
CreateMap<EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnly>();
|
CreateMap<EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnly>();
|
||||||
CreateMap<EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly>();
|
CreateMap<EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly>();
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
|
using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
|
||||||
using EnvelopeGenerator.Application.Common.Configurations;
|
using EnvelopeGenerator.Application.Common.Configurations;
|
||||||
using EnvelopeGenerator.Application.Common.Extensions;
|
using EnvelopeGenerator.Application.Common.Extensions;
|
||||||
|
using EnvelopeGenerator.Application.Common.Notifications.EnvelopeDeleted;
|
||||||
using EnvelopeGenerator.Domain.Constants;
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
using EnvelopeGenerator.Domain.Entities;
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
using MediatR;
|
using MediatR;
|
||||||
@@ -96,6 +97,10 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
|
|||||||
/// <exception cref="NotImplementedException"></exception>
|
/// <exception cref="NotImplementedException"></exception>
|
||||||
public virtual async Task Handle(TNotification notification, CancellationToken cancel)
|
public virtual async Task Handle(TNotification notification, CancellationToken cancel)
|
||||||
{
|
{
|
||||||
|
// do not send email if the envelope is deleted and the status is less than or equal to EnvelopeSaved
|
||||||
|
if (notification is EnvelopeDeletedNotification delNot && delNot.Envelope.Status <= EnvelopeStatus.EnvelopeSaved)
|
||||||
|
return;
|
||||||
|
|
||||||
var placeHolders = CreatePlaceHolders(notification);
|
var placeHolders = CreatePlaceHolders(notification);
|
||||||
|
|
||||||
var temp = await TempRepo
|
var temp = await TempRepo
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ using EnvelopeGenerator.Application.DocReceiverElements.Commands;
|
|||||||
using EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
|
using EnvelopeGenerator.Application.DocReceiverElements.Behaviors;
|
||||||
using EnvelopeGenerator.Application.Common.Behaviors;
|
using EnvelopeGenerator.Application.Common.Behaviors;
|
||||||
using FluentValidation;
|
using FluentValidation;
|
||||||
|
using EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Application;
|
namespace EnvelopeGenerator.Application;
|
||||||
|
|
||||||
@@ -44,14 +45,18 @@ public static class DependencyInjection
|
|||||||
services.TryAddScoped<IEnvelopeReceiverReadOnlyService, EnvelopeReceiverReadOnlyService>();
|
services.TryAddScoped<IEnvelopeReceiverReadOnlyService, EnvelopeReceiverReadOnlyService>();
|
||||||
|
|
||||||
//Auto mapping profiles
|
//Auto mapping profiles
|
||||||
services.AddAutoMapper(Assembly.GetExecutingAssembly());
|
services.AddAutoMapper(
|
||||||
services.AddAutoMapper(typeof(DigitalData.UserManager.Application.DIExtensions));
|
_ => { },
|
||||||
|
Assembly.GetExecutingAssembly(),
|
||||||
|
typeof(DigitalData.UserManager.Application.DIExtensions).Assembly);
|
||||||
|
|
||||||
services.Configure<DispatcherParams>(config.GetSection(nameof(DispatcherParams)));
|
services.Configure<DispatcherParams>(config.GetSection(nameof(DispatcherParams)));
|
||||||
services.Configure<MailParams>(config.GetSection(nameof(MailParams)));
|
services.Configure<MailParams>(config.GetSection(nameof(MailParams)));
|
||||||
|
services.Configure<SignatureFieldParams>(config.GetSection(nameof(SignatureFieldParams)));
|
||||||
services.Configure<AuthenticatorParams>(config.GetSection(nameof(AuthenticatorParams)));
|
services.Configure<AuthenticatorParams>(config.GetSection(nameof(AuthenticatorParams)));
|
||||||
services.Configure<TotpSmsParams>(config.GetSection(nameof(TotpSmsParams)));
|
services.Configure<TotpSmsParams>(config.GetSection(nameof(TotpSmsParams)));
|
||||||
services.Configure<ESignParams>(config.GetSection(nameof(ESignParams)));
|
services.Configure<ESignParams>(config.GetSection(nameof(ESignParams)));
|
||||||
|
services.Configure<SendAccessCodeParams>(config.GetSection(nameof(SendAccessCodeParams)));
|
||||||
|
|
||||||
services.AddHttpClientService<GtxMessagingParams>(config.GetSection(nameof(GtxMessagingParams)));
|
services.AddHttpClientService<GtxMessagingParams>(config.GetSection(nameof(GtxMessagingParams)));
|
||||||
services.TryAddScoped<ISmsSender, GTXSmsSender>(); // Changed: Singleton → Scoped
|
services.TryAddScoped<ISmsSender, GTXSmsSender>(); // Changed: Singleton → Scoped
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
using AutoMapper;
|
|
||||||
using AutoMapper.QueryableExtensions;
|
|
||||||
using DigitalData.Core.Abstraction.Application.Repository;
|
using DigitalData.Core.Abstraction.Application.Repository;
|
||||||
using EnvelopeGenerator.Application.Common.Dto;
|
using EnvelopeGenerator.Application.Common.Dto;
|
||||||
using EnvelopeGenerator.Domain.Entities;
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
@@ -21,12 +19,10 @@ public record ReadDocumentDetailsQuery(int EnvelopeId, int? UserId = null) : IRe
|
|||||||
public class ReadDocumentDetailsQueryHandler : IRequestHandler<ReadDocumentDetailsQuery, DocumentDetailsDto?>
|
public class ReadDocumentDetailsQueryHandler : IRequestHandler<ReadDocumentDetailsQuery, DocumentDetailsDto?>
|
||||||
{
|
{
|
||||||
private readonly IRepository<Document> _repo;
|
private readonly IRepository<Document> _repo;
|
||||||
private readonly IMapper _mapper;
|
|
||||||
|
|
||||||
public ReadDocumentDetailsQueryHandler(IRepository<Document> repo, IMapper mapper)
|
public ReadDocumentDetailsQueryHandler(IRepository<Document> repo)
|
||||||
{
|
{
|
||||||
_repo = repo;
|
_repo = repo;
|
||||||
_mapper = mapper;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<DocumentDetailsDto?> Handle(ReadDocumentDetailsQuery query, CancellationToken cancel)
|
public async Task<DocumentDetailsDto?> Handle(ReadDocumentDetailsQuery query, CancellationToken cancel)
|
||||||
@@ -36,9 +32,71 @@ public class ReadDocumentDetailsQueryHandler : IRequestHandler<ReadDocumentDetai
|
|||||||
if (query.UserId is int userId)
|
if (query.UserId is int userId)
|
||||||
docQuery = docQuery.Where(doc => doc.Envelope.UserId == userId);
|
docQuery = docQuery.Where(doc => doc.Envelope.UserId == userId);
|
||||||
|
|
||||||
return await docQuery
|
// shortcut: manual select avoids AutoMapper ProjectTo pulling BYTE_DATA and the full navigation
|
||||||
|
// graph (Envelope → History → User etc.) which caused an extremely slow query (~87s).
|
||||||
|
// Annotations navigation is IEnumerable<T> on the entity (not ICollection<T>), so EF Core
|
||||||
|
// cannot translate it in a Select projection — we skip it entirely here; sender editor only
|
||||||
|
// needs element coordinates, not annotation payloads.
|
||||||
|
var raw = await docQuery
|
||||||
.Where(d => d.EnvelopeId == query.EnvelopeId)
|
.Where(d => d.EnvelopeId == query.EnvelopeId)
|
||||||
.ProjectTo<DocumentDetailsDto>(_mapper.ConfigurationProvider)
|
.Select(d => new
|
||||||
|
{
|
||||||
|
d.Id,
|
||||||
|
d.EnvelopeId,
|
||||||
|
d.AddedWhen,
|
||||||
|
Elements = d.Elements == null ? null : d.Elements.Select(e => new
|
||||||
|
{
|
||||||
|
e.Id,
|
||||||
|
e.DocumentId,
|
||||||
|
e.ReceiverId,
|
||||||
|
e.ElementType,
|
||||||
|
e.X,
|
||||||
|
e.Y,
|
||||||
|
e.Width,
|
||||||
|
e.Height,
|
||||||
|
e.Page,
|
||||||
|
e.Required,
|
||||||
|
e.Tooltip,
|
||||||
|
e.ReadOnly,
|
||||||
|
e.AnnotationIndex,
|
||||||
|
e.AddedWhen,
|
||||||
|
e.ChangedWhen,
|
||||||
|
e.FullName,
|
||||||
|
e.Position,
|
||||||
|
e.Place,
|
||||||
|
}).ToList()
|
||||||
|
})
|
||||||
.FirstOrDefaultAsync(cancel);
|
.FirstOrDefaultAsync(cancel);
|
||||||
|
|
||||||
|
if (raw is null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
return new DocumentDetailsDto
|
||||||
|
{
|
||||||
|
Id = raw.Id,
|
||||||
|
EnvelopeId = raw.EnvelopeId,
|
||||||
|
AddedWhen = raw.AddedWhen,
|
||||||
|
Elements = raw.Elements?.Select(e => new DocReceiverElementDto
|
||||||
|
{
|
||||||
|
Id = e.Id,
|
||||||
|
DocumentId = e.DocumentId,
|
||||||
|
ReceiverId = e.ReceiverId,
|
||||||
|
ElementType = e.ElementType,
|
||||||
|
X = e.X,
|
||||||
|
Y = e.Y,
|
||||||
|
Width = e.Width,
|
||||||
|
Height = e.Height,
|
||||||
|
Page = e.Page,
|
||||||
|
Required = e.Required,
|
||||||
|
Tooltip = e.Tooltip,
|
||||||
|
ReadOnly = e.ReadOnly,
|
||||||
|
AnnotationIndex = e.AnnotationIndex,
|
||||||
|
AddedWhen = e.AddedWhen,
|
||||||
|
ChangedWhen = e.ChangedWhen,
|
||||||
|
FullName = e.FullName,
|
||||||
|
Position = e.Position,
|
||||||
|
Place = e.Place,
|
||||||
|
})
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,10 +20,9 @@
|
|||||||
<PackageReference Include="DigitalData.Core.Client" Version="2.1.0" />
|
<PackageReference Include="DigitalData.Core.Client" Version="2.1.0" />
|
||||||
<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
|
<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
|
||||||
<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
|
<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
|
||||||
<PackageReference Include="FluentValidation" Version="11.11.0" />
|
|
||||||
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
|
|
||||||
<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
|
<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
|
||||||
<PackageReference Include="MediatR" Version="12.5.0" />
|
<PackageReference Include="MediatR" Version="14.2.0" />
|
||||||
<PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
|
<PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
|
||||||
<PackageReference Include="Otp.NET" Version="1.4.0" />
|
<PackageReference Include="Otp.NET" Version="1.4.0" />
|
||||||
<PackageReference Include="QRCoder" Version="1.6.0" />
|
<PackageReference Include="QRCoder" Version="1.6.0" />
|
||||||
@@ -36,14 +35,20 @@
|
|||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
|
||||||
|
<PackageReference Include="FluentValidation" Version="11.11.0" />
|
||||||
|
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
|
||||||
|
<PackageReference Include="FluentValidation" Version="12.1.1" />
|
||||||
|
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
|
||||||
|
<PackageReference Include="FluentValidation" Version="12.1.1" />
|
||||||
|
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -89,14 +94,14 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
|
||||||
<PackageReference Include="AutoMapper" Version="14.0.0" />
|
<PackageReference Include="AutoMapper" Version="16.2.0" />
|
||||||
<PackageReference Include="CommandDotNet">
|
<PackageReference Include="CommandDotNet">
|
||||||
<Version>8.1.1</Version>
|
<Version>8.1.1</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
|
||||||
<PackageReference Include="AutoMapper" Version="14.0.0" />
|
<PackageReference Include="AutoMapper" Version="16.2.0" />
|
||||||
<PackageReference Include="CommandDotNet">
|
<PackageReference Include="CommandDotNet">
|
||||||
<Version>8.1.1</Version>
|
<Version>8.1.1</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
|||||||
@@ -0,0 +1,84 @@
|
|||||||
|
using DigitalData.Core.Abstraction.Application.Repository;
|
||||||
|
using DigitalData.Core.Exceptions;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
|
using EnvelopeGenerator.Domain.Exceptions;
|
||||||
|
using MediatR;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public record RemoveEnvelopeReceiverCommand : IRequest
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required int EnvelopeId { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required int ReceiverId { get; init; }
|
||||||
|
|
||||||
|
internal int? UserId { get; private set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="userId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public RemoveEnvelopeReceiverCommand Authenticated(int userId)
|
||||||
|
{
|
||||||
|
UserId = userId;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="Repo"></param>
|
||||||
|
public class RemoveEnvelopeReceiverCommandHandler(
|
||||||
|
IRepository<EnvelopeReceiver> Repo,
|
||||||
|
IRepository<DocReceiverElement> ElementRepo,
|
||||||
|
IRepository<ElementAnnotation> AnnotRepo) : IRequestHandler<RemoveEnvelopeReceiverCommand>
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="request"></param>
|
||||||
|
/// <param name="cancel"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
/// <exception cref="NotImplementedException"></exception>
|
||||||
|
public async Task Handle(RemoveEnvelopeReceiverCommand request, CancellationToken cancel)
|
||||||
|
{
|
||||||
|
var er = await Repo.Query
|
||||||
|
.Where(er => er.EnvelopeId == request.EnvelopeId && er.ReceiverId == request.ReceiverId)
|
||||||
|
.Include(er => er.Envelope)
|
||||||
|
.SingleOrDefaultAsync(cancel)
|
||||||
|
?? throw new NotFoundException();
|
||||||
|
|
||||||
|
if (er.Envelope is null)
|
||||||
|
throw new InvalidOperationException($"In {nameof(RemoveEnvelopeReceiverCommandHandler)} EnvelopeReceiver.Envelope is null." +
|
||||||
|
$"This should not happen." +
|
||||||
|
$"EnvelopeId: {request.EnvelopeId}, ReceiverId: {request.ReceiverId}");
|
||||||
|
|
||||||
|
if (request.UserId is int userId && er.Envelope.UserId != userId)
|
||||||
|
throw new AuthorizationException("Cannot remove receiver from envelope that you do not own.");
|
||||||
|
|
||||||
|
if (er.Envelope.Status > EnvelopeStatus.EnvelopeSaved)
|
||||||
|
throw new ForbiddenException("Cannot remove receiver from envelope that is already processed.");
|
||||||
|
|
||||||
|
// 1. Delete all ElementAnnotations for this EnvelopeReceiver
|
||||||
|
await AnnotRepo.DeleteAsync(ann => ann.Element.Document.EnvelopeId == request.EnvelopeId && ann.Element.ReceiverId == request.ReceiverId, cancel);
|
||||||
|
|
||||||
|
// 2. Delete all DocReceiverElements for this EnvelopeReceiver
|
||||||
|
await ElementRepo.DeleteAsync(el => el.Document.EnvelopeId == request.EnvelopeId && el.ReceiverId == request.ReceiverId, cancel);
|
||||||
|
|
||||||
|
// 3. Delete the EnvelopeReceiver
|
||||||
|
await Repo.DeleteAsync(er => er.EnvelopeId == request.EnvelopeId && er.ReceiverId == request.ReceiverId, cancel);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,151 @@
|
|||||||
|
using DigitalData.Core.Exceptions;
|
||||||
|
using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
|
||||||
|
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
||||||
|
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
using EnvelopeGenerator.Domain.Exceptions;
|
||||||
|
using MediatR;
|
||||||
|
using Microsoft.Extensions.Caching.Memory;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="Key"></param>
|
||||||
|
public record SendAccessCodeCommand(string Key) : IRequest<SendAccessCodeResult>
|
||||||
|
{
|
||||||
|
internal bool MultipleRequestsAllowed { get; private set; } = false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SendAccessCodeCommand AllowMultipleRequests(bool allow = true)
|
||||||
|
{
|
||||||
|
MultipleRequestsAllowed = allow;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Business result of an access-code request.
|
||||||
|
/// </summary>
|
||||||
|
public enum SendAccessCodeResult
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Access code sent successfully. HTTP: 200 OK.
|
||||||
|
/// </summary>
|
||||||
|
Sent,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Receiver has already signed this envelope; requesting a code is no longer applicable. HTTP: 409 Conflict.
|
||||||
|
/// </summary>
|
||||||
|
AlreadySigned,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Envelope does not require an access code. HTTP: 200 OK (or 204 No Content).
|
||||||
|
/// </summary>
|
||||||
|
NoAccessCodeRequired,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Access code was already requested and the request limit/rule blocks another send. HTTP: 429 Too Many Requests.
|
||||||
|
/// </summary>
|
||||||
|
RequestLimitExceeded
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public class SendAccessCodeCommandHandler(IMediator Sender, IEnvelopeHistoryService HistoryService, IEnvelopeNotificationService NtfService, IOptions<SendAccessCodeParams> options, IMemoryCache Cache) : IRequestHandler<SendAccessCodeCommand, SendAccessCodeResult>
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public readonly SendAccessCodeParams Options = options.Value;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="request"></param>
|
||||||
|
/// <param name="cancel"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public async Task<SendAccessCodeResult> Handle(SendAccessCodeCommand request, CancellationToken cancel)
|
||||||
|
{
|
||||||
|
// read envelope receiver
|
||||||
|
var ers = (await Sender.Send(new ReadEnvelopeReceiverQuery
|
||||||
|
{
|
||||||
|
Key = request.Key,
|
||||||
|
}, cancel));
|
||||||
|
|
||||||
|
if (ers.SingleOrDefault() is not EnvelopeReceiverDto er || er.Envelope is null || er.Receiver is null)
|
||||||
|
throw new NotFoundException($"Envelope receiver with key '{request.Key}' not found.");
|
||||||
|
|
||||||
|
if (!er.Envelope.UseAccessCode)
|
||||||
|
return SendAccessCodeResult.NoAccessCodeRequired;
|
||||||
|
|
||||||
|
var userReference = er.Receiver.EmailAddress;
|
||||||
|
|
||||||
|
if (await HistoryService.IsSigned(er.EnvelopeId, userReference))
|
||||||
|
return SendAccessCodeResult.AlreadySigned;
|
||||||
|
|
||||||
|
var accessCodeAlreadyRequested = await HistoryService.AccessCodeAlreadyRequested(er.EnvelopeId, userReference);
|
||||||
|
if (accessCodeAlreadyRequested && (!request.MultipleRequestsAllowed || await IsAccessCodeRequestsDisabled(request.Key, cancel)))
|
||||||
|
return SendAccessCodeResult.RequestLimitExceeded;
|
||||||
|
|
||||||
|
// create a history record
|
||||||
|
if (!accessCodeAlreadyRequested)
|
||||||
|
{
|
||||||
|
var historyResult = await HistoryService.RecordAsync(er.EnvelopeId, userReference, EnvelopeStatus.AccessCodeRequested);
|
||||||
|
if (historyResult.IsFailed)
|
||||||
|
{
|
||||||
|
throw new ApplicationException($"Failed to record AccessCodeRequested history for envelope {er.EnvelopeId} and receiver {userReference}.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (er.AccessCode is null)
|
||||||
|
throw new DataIntegrityException($"Access code is null for envelope receiver with key '{request.Key}' although use-access-code is true.");
|
||||||
|
|
||||||
|
await NtfService.Notify(er.Receiver.EmailAddress, new DocumentAccessCodeReceivedNotification()
|
||||||
|
{
|
||||||
|
DocumentAccessCode = er.AccessCode,
|
||||||
|
DocumentTitle = er.Envelope.Title,
|
||||||
|
NameReceiver = er.Name ?? string.Empty,
|
||||||
|
IsReadAndConfirm = er.Envelope.Type == EnvelopeType.ReadAndConfirm,
|
||||||
|
NameSender = er.Envelope.User!.Username,
|
||||||
|
}, cancel);
|
||||||
|
|
||||||
|
await DisableAccessCodeRequests(request.Key, cancel);
|
||||||
|
|
||||||
|
return SendAccessCodeResult.Sent;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string DisableAccessCodeRequestsCacheKeyPrefix => "DisableAccessCodeRequests_";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="envelopeKey"></param>
|
||||||
|
/// <param name="cancellationToken"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
private Task<bool> IsAccessCodeRequestsDisabled(string envelopeKey, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
bool hasCache = Cache.TryGetValue<bool>(DisableAccessCodeRequestsCacheKeyPrefix + envelopeKey, out var disabled);
|
||||||
|
return Task.FromResult(hasCache && disabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="envelopeKey"></param>
|
||||||
|
/// <param name="cancellationToken"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
private Task DisableAccessCodeRequests(string envelopeKey, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
Cache.Set(DisableAccessCodeRequestsCacheKeyPrefix + envelopeKey, true, Options.RepeatRequestBlockingPeriod);
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public record SendAccessCodeParams
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public TimeSpan RepeatRequestBlockingPeriod { get; init; } = TimeSpan.FromMinutes(1);
|
||||||
|
}
|
||||||
@@ -9,20 +9,20 @@ namespace EnvelopeGenerator.Application.EnvelopeTypes.Queries;
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public record ReadEnvelopeTypesQuery : IRequest<IEnumerable<EnvelopeTypeDto>>;
|
public record ReadEnvelopeTypesQuery : IRequest<IEnumerable<EnvelopeTypeDefaultsDto>>;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class ReadEnvelopeTypesQueryHandler : IRequestHandler<ReadEnvelopeTypesQuery, IEnumerable<EnvelopeTypeDto>>
|
public class ReadEnvelopeTypesQueryHandler : IRequestHandler<ReadEnvelopeTypesQuery, IEnumerable<EnvelopeTypeDefaultsDto>>
|
||||||
{
|
{
|
||||||
private readonly IRepository<EnvelopeType> _repository;
|
private readonly IRepository<EnvelopeTypeDefaults> _repository;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="repository"></param>
|
/// <param name="repository"></param>
|
||||||
public ReadEnvelopeTypesQueryHandler(IRepository<EnvelopeType> repository)
|
public ReadEnvelopeTypesQueryHandler(IRepository<EnvelopeTypeDefaults> repository)
|
||||||
{
|
{
|
||||||
_repository = repository;
|
_repository = repository;
|
||||||
}
|
}
|
||||||
@@ -33,29 +33,27 @@ public class ReadEnvelopeTypesQueryHandler : IRequestHandler<ReadEnvelopeTypesQu
|
|||||||
/// <param name="request"></param>
|
/// <param name="request"></param>
|
||||||
/// <param name="cancellationToken"></param>
|
/// <param name="cancellationToken"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public async Task<IEnumerable<EnvelopeTypeDto>> Handle(ReadEnvelopeTypesQuery request, CancellationToken cancellationToken)
|
public async Task<IEnumerable<EnvelopeTypeDefaultsDto>> Handle(ReadEnvelopeTypesQuery request, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
// TODO: Temporary manual projection to avoid null-materialization crashes from legacy nullable DB columns in EnvelopeType.
|
// TODO: Temporary manual projection to avoid null-materialization crashes from legacy nullable DB columns in EnvelopeType.
|
||||||
// Revisit and switch to AutoMapper query projection (ProjectTo) after schema nullability and mapping contracts are stabilized.
|
// Revisit and switch to AutoMapper query projection (ProjectTo) after schema nullability and mapping contracts are stabilized.
|
||||||
return await _repository.Query
|
return await _repository.Query
|
||||||
.AsNoTracking()
|
.AsNoTracking()
|
||||||
.Select(t => new EnvelopeTypeDto
|
.Select(t => new EnvelopeTypeDefaultsDto
|
||||||
{
|
{
|
||||||
Id = t.Id,
|
Id = t.Id,
|
||||||
Title = t.Title ?? string.Empty,
|
Title = t.Title ?? string.Empty,
|
||||||
Language = string.IsNullOrWhiteSpace(t.Language) ? "de-DE" : t.Language,
|
Language = string.IsNullOrWhiteSpace(t.Language) ? "de-DE" : t.Language,
|
||||||
ExpiresDays = t.ExpiresDays,
|
ExpiresDays = t.ExpiresDays,
|
||||||
CertificationType = (int?)t.CertificationType,
|
|
||||||
UseAccessCode = t.UseAccessCode,
|
UseAccessCode = t.UseAccessCode,
|
||||||
FinalEmailToCreator = (int?)t.FinalEmailToCreator,
|
FinalEmailToCreator = t.FinalEmailToCreator,
|
||||||
FinalEmailToReceivers = (int?)t.FinalEmailToReceivers,
|
FinalEmailToReceivers = t.FinalEmailToReceivers,
|
||||||
AddedWhen = t.AddedWhen,
|
AddedWhen = t.AddedWhen,
|
||||||
ChangedWhen = t.ChangedWhen,
|
ChangedWhen = t.ChangedWhen,
|
||||||
ExpiresWarningDays = t.ExpiresWarningDays,
|
ExpiresWarningDays = t.ExpiresWarningDays,
|
||||||
SendReminderEmails = t.SendReminderEmails,
|
SendReminderEmails = t.SendReminderEmails,
|
||||||
FirstReminderDays = t.FirstReminderDays,
|
FirstReminderDays = t.FirstReminderDays,
|
||||||
ReminderIntervalDays = t.ReminderIntervalDays,
|
ReminderIntervalDays = t.ReminderIntervalDays,
|
||||||
ContractType = t.ContractType
|
|
||||||
})
|
})
|
||||||
.ToListAsync(cancellationToken);
|
.ToListAsync(cancellationToken);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
using EnvelopeGenerator.Application.Common.Dto;
|
using DigitalData.Core.Abstraction.Application.Repository;
|
||||||
|
using EnvelopeGenerator.Application.Common.Dto;
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
|
using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
using MediatR;
|
using MediatR;
|
||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
using System.ComponentModel.DataAnnotations.Schema;
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
@@ -20,7 +22,7 @@ public record CreateEnvelopeCommand : IRequest<EnvelopeDto?>
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Kennung des ausgewaehlten Umschlagtyps (Vorlage).
|
/// Kennung des ausgewaehlten Umschlagtyps (Vorlage).
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? EnvelopeTypeId { get; set; }
|
public EnvelopeType? Type { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Sprachcode fuer Umschlaginhalt und Benachrichtigungen.
|
/// Sprachcode fuer Umschlaginhalt und Benachrichtigungen.
|
||||||
@@ -32,20 +34,15 @@ public record CreateEnvelopeCommand : IRequest<EnvelopeDto?>
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool? UseAccessCode { get; set; }
|
public bool? UseAccessCode { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Zertifizierungstyp fuer den Signaturprozess.
|
|
||||||
/// </summary>
|
|
||||||
public int? CertificationType { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Finale E-Mail-Einstellung fuer den Ersteller.
|
/// Finale E-Mail-Einstellung fuer den Ersteller.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? FinalEmailToCreator { get; set; }
|
public FinalEmailType? FinalEmailToCreator { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Finale E-Mail-Einstellung fuer die Empfaenger.
|
/// Finale E-Mail-Einstellung fuer die Empfaenger.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? FinalEmailToReceivers { get; set; }
|
public FinalEmailType? FinalEmailToReceivers { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gibt an, ob Erinnerungs-E-Mails aktiviert sind.
|
/// Gibt an, ob Erinnerungs-E-Mails aktiviert sind.
|
||||||
@@ -129,10 +126,27 @@ public record CreateEnvelopeCommand : IRequest<EnvelopeDto?>
|
|||||||
public bool UseSQLExecutor { get; set; } = true;
|
public bool UseSQLExecutor { get; set; } = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="DataAsBase64"></param>
|
||||||
public record CreateEnvelopeDocumentDto(string DataAsBase64);
|
public record CreateEnvelopeDocumentDto(string DataAsBase64);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="X"></param>
|
||||||
|
/// <param name="Y"></param>
|
||||||
|
/// <param name="Page"></param>
|
||||||
public record CreateEnvelopeFieldDto(double X, double Y, int Page);
|
public record CreateEnvelopeFieldDto(double X, double Y, int Page);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="EmailAddress"></param>
|
||||||
|
/// <param name="Name"></param>
|
||||||
|
/// <param name="PhoneNumber"></param>
|
||||||
|
/// <param name="Fields"></param>
|
||||||
public record CreateEnvelopeReceiverDto(
|
public record CreateEnvelopeReceiverDto(
|
||||||
string EmailAddress,
|
string EmailAddress,
|
||||||
string? Name,
|
string? Name,
|
||||||
|
|||||||
@@ -1,68 +1,66 @@
|
|||||||
using AutoMapper;
|
using AutoMapper;
|
||||||
using MediatR;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
using DigitalData.Core.Abstraction.Application.Repository;
|
using DigitalData.Core.Abstraction.Application.Repository;
|
||||||
using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
|
|
||||||
using DigitalData.Core.Exceptions;
|
using DigitalData.Core.Exceptions;
|
||||||
using EnvelopeGenerator.Domain.Entities;
|
using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
|
||||||
using EnvelopeGenerator.Application.Common.Dto;
|
using DigitalData.UserManager.Domain.Entities;
|
||||||
using EnvelopeGenerator.Application.Common.Configurations;
|
using EnvelopeGenerator.Application.Common.Configurations;
|
||||||
|
using EnvelopeGenerator.Application.Common.Dto;
|
||||||
using EnvelopeGenerator.Application.Common.Extensions;
|
using EnvelopeGenerator.Application.Common.Extensions;
|
||||||
|
using EnvelopeGenerator.Application.Common.Interfaces;
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
||||||
|
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
|
using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
|
||||||
using EnvelopeGenerator.Application.Histories.Commands;
|
using EnvelopeGenerator.Application.Histories.Commands;
|
||||||
using EnvelopeGenerator.Domain.Constants;
|
|
||||||
using EnvelopeGenerator.Domain;
|
using EnvelopeGenerator.Domain;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
|
using EnvelopeGenerator.Domain.Interfaces;
|
||||||
|
using MediatR;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Application.Envelopes.Commands;
|
namespace EnvelopeGenerator.Application.Envelopes.Commands;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeCommand, EnvelopeDto?>
|
/// <param name="Provider"></param>
|
||||||
|
/// <param name="Mapper"></param>
|
||||||
|
/// <param name="EnvNtfService"></param>
|
||||||
|
/// <param name="ReqCntxt"></param>
|
||||||
|
/// <param name="Logger"></param>
|
||||||
|
public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Mapper, IEnvelopeNotificationService EnvNtfService, IRequestContext ReqCntxt, ILogger<CreateEnvelopeCommandHandler> Logger) : IRequestHandler<CreateEnvelopeCommand, EnvelopeDto?>
|
||||||
{
|
{
|
||||||
private readonly IServiceProvider _provider;
|
private IEnvelopeExecutor Executor => Provider.GetRequiredService<IEnvelopeExecutor>();
|
||||||
|
|
||||||
private IEnvelopeExecutor Executor => _provider.GetRequiredService<IEnvelopeExecutor>();
|
private IRepository<Envelope> Repository => Provider.GetRequiredService<IRepository<Envelope>>();
|
||||||
|
|
||||||
private IRepository<Envelope> Repository => _provider.GetRequiredService<IRepository<Envelope>>();
|
private IRepository<Document> DocumentRepository => Provider.GetRequiredService<IRepository<Document>>();
|
||||||
|
|
||||||
private IRepository<Document> DocumentRepository => _provider.GetRequiredService<IRepository<Document>>();
|
private IRepository<EnvelopeReceiver> EnvelopeReceiverRepository => Provider.GetRequiredService<IRepository<EnvelopeReceiver>>();
|
||||||
|
|
||||||
private IRepository<EnvelopeReceiver> EnvelopeReceiverRepository => _provider.GetRequiredService<IRepository<EnvelopeReceiver>>();
|
private IRepository<EnvelopeTypeDefaults> EnvelopeTypeRepository => Provider.GetRequiredService<IRepository<EnvelopeTypeDefaults>>();
|
||||||
|
|
||||||
private IRepository<EnvelopeType> EnvelopeTypeRepository => _provider.GetRequiredService<IRepository<EnvelopeType>>();
|
private IRepository<Receiver> ReceiverRepository => Provider.GetRequiredService<IRepository<Receiver>>();
|
||||||
|
|
||||||
private IRepository<Receiver> ReceiverRepository => _provider.GetRequiredService<IRepository<Receiver>>();
|
private IRepository<DocReceiverElement> DocReceiverElementRepository => Provider.GetRequiredService<IRepository<DocReceiverElement>>();
|
||||||
|
|
||||||
private IRepository<DocReceiverElement> DocReceiverElementRepository => _provider.GetRequiredService<IRepository<DocReceiverElement>>();
|
private IRepository<EmailTemplate> EmailTemplateRepository => Provider.GetRequiredService<IRepository<EmailTemplate>>();
|
||||||
|
|
||||||
private IRepository<EmailTemplate> EmailTemplateRepository => _provider.GetRequiredService<IRepository<EmailTemplate>>();
|
private IRepository<EmailOut> EmailOutRepository => Provider.GetRequiredService<IRepository<EmailOut>>();
|
||||||
|
|
||||||
private IRepository<EmailOut> EmailOutRepository => _provider.GetRequiredService<IRepository<EmailOut>>();
|
private MailParams MailParams => Provider.GetRequiredService<IOptions<MailParams>>().Value;
|
||||||
|
|
||||||
private MailParams MailParams => _provider.GetRequiredService<IOptions<MailParams>>().Value;
|
private DispatcherParams DispatcherParams => Provider.GetRequiredService<IOptions<DispatcherParams>>().Value;
|
||||||
|
|
||||||
private DispatcherParams DispatcherParams => _provider.GetRequiredService<IOptions<DispatcherParams>>().Value;
|
private SignatureFieldParams SignatureFieldParams => Provider.GetRequiredService<IOptionsMonitor<SignatureFieldParams>>().CurrentValue;
|
||||||
|
|
||||||
private IConfigService ConfigService => _provider.GetRequiredService<IConfigService>();
|
[Obsolete("Use IConfigService instead.")]
|
||||||
|
private IConfigService ConfigService => Provider.GetRequiredService<IConfigService>();
|
||||||
|
|
||||||
private IMediator Mediator => _provider.GetRequiredService<IMediator>();
|
private IMediator Mediator => Provider.GetRequiredService<IMediator>();
|
||||||
|
|
||||||
private readonly IMapper _mapper;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
///
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="provider"></param>
|
|
||||||
/// <param name="mapper"></param>
|
|
||||||
public CreateEnvelopeCommandHandler(IServiceProvider provider, IMapper mapper)
|
|
||||||
{
|
|
||||||
_provider = provider;
|
|
||||||
_mapper = mapper;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
@@ -95,10 +93,9 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
e.Title = title;
|
e.Title = title;
|
||||||
e.Message = message;
|
e.Message = message;
|
||||||
e.TfaEnabled = request.TFAEnabled;
|
e.TfaEnabled = request.TFAEnabled;
|
||||||
e.EnvelopeTypeId = settings.EnvelopeTypeId;
|
e.Type = settings.Type;
|
||||||
e.Language = settings.Language;
|
e.Language = settings.Language;
|
||||||
e.UseAccessCode = settings.UseAccessCode;
|
e.UseAccessCode = settings.UseAccessCode;
|
||||||
e.CertificationType = settings.CertificationType;
|
|
||||||
e.FinalEmailToCreator = settings.FinalEmailToCreator;
|
e.FinalEmailToCreator = settings.FinalEmailToCreator;
|
||||||
e.FinalEmailToReceivers = settings.FinalEmailToReceivers;
|
e.FinalEmailToReceivers = settings.FinalEmailToReceivers;
|
||||||
e.SendReminderEmails = settings.SendReminderEmails;
|
e.SendReminderEmails = settings.SendReminderEmails;
|
||||||
@@ -106,7 +103,6 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
e.ReminderIntervalDays = settings.ReminderIntervalDays;
|
e.ReminderIntervalDays = settings.ReminderIntervalDays;
|
||||||
e.ExpiresWhenDays = settings.ExpiresWhenDays;
|
e.ExpiresWhenDays = settings.ExpiresWhenDays;
|
||||||
e.ExpiresWarningWhenDays = settings.ExpiresWarningWhenDays;
|
e.ExpiresWarningWhenDays = settings.ExpiresWarningWhenDays;
|
||||||
e.ContractType = settings.ContractType;
|
|
||||||
e.ExpiresWhen = settings.ExpiresWhen;
|
e.ExpiresWhen = settings.ExpiresWhen;
|
||||||
e.ExpiresWarningWhen = settings.ExpiresWarningWhen;
|
e.ExpiresWarningWhen = settings.ExpiresWarningWhen;
|
||||||
e.Status = EnvelopeStatus.EnvelopeSaved;
|
e.Status = EnvelopeStatus.EnvelopeSaved;
|
||||||
@@ -116,10 +112,9 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
envelope.Title = title;
|
envelope.Title = title;
|
||||||
envelope.Message = message;
|
envelope.Message = message;
|
||||||
envelope.TfaEnabled = request.TFAEnabled;
|
envelope.TfaEnabled = request.TFAEnabled;
|
||||||
envelope.EnvelopeTypeId = settings.EnvelopeTypeId;
|
envelope.Type = settings.Type;
|
||||||
envelope.Language = settings.Language;
|
envelope.Language = settings.Language;
|
||||||
envelope.UseAccessCode = settings.UseAccessCode;
|
envelope.UseAccessCode = settings.UseAccessCode;
|
||||||
envelope.CertificationType = settings.CertificationType;
|
|
||||||
envelope.FinalEmailToCreator = settings.FinalEmailToCreator;
|
envelope.FinalEmailToCreator = settings.FinalEmailToCreator;
|
||||||
envelope.FinalEmailToReceivers = settings.FinalEmailToReceivers;
|
envelope.FinalEmailToReceivers = settings.FinalEmailToReceivers;
|
||||||
envelope.SendReminderEmails = settings.SendReminderEmails;
|
envelope.SendReminderEmails = settings.SendReminderEmails;
|
||||||
@@ -127,7 +122,6 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
envelope.ReminderIntervalDays = settings.ReminderIntervalDays;
|
envelope.ReminderIntervalDays = settings.ReminderIntervalDays;
|
||||||
envelope.ExpiresWhenDays = settings.ExpiresWhenDays;
|
envelope.ExpiresWhenDays = settings.ExpiresWhenDays;
|
||||||
envelope.ExpiresWarningWhenDays = settings.ExpiresWarningWhenDays;
|
envelope.ExpiresWarningWhenDays = settings.ExpiresWarningWhenDays;
|
||||||
envelope.ContractType = settings.ContractType;
|
|
||||||
envelope.ExpiresWhen = settings.ExpiresWhen;
|
envelope.ExpiresWhen = settings.ExpiresWhen;
|
||||||
envelope.ExpiresWarningWhen = settings.ExpiresWarningWhen;
|
envelope.ExpiresWarningWhen = settings.ExpiresWarningWhen;
|
||||||
envelope.Status = EnvelopeStatus.EnvelopeSaved;
|
envelope.Status = EnvelopeStatus.EnvelopeSaved;
|
||||||
@@ -147,11 +141,10 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
AddedWhen = now,
|
AddedWhen = now,
|
||||||
ChangedWhen = now,
|
ChangedWhen = now,
|
||||||
Comment = string.Empty,
|
Comment = string.Empty,
|
||||||
EnvelopeTypeId = settings.EnvelopeTypeId,
|
Type = settings.Type,
|
||||||
Language = settings.Language,
|
Language = settings.Language,
|
||||||
TfaEnabled = request.TFAEnabled,
|
TfaEnabled = request.TFAEnabled,
|
||||||
UseAccessCode = settings.UseAccessCode,
|
UseAccessCode = settings.UseAccessCode,
|
||||||
CertificationType = settings.CertificationType,
|
|
||||||
FinalEmailToCreator = settings.FinalEmailToCreator,
|
FinalEmailToCreator = settings.FinalEmailToCreator,
|
||||||
FinalEmailToReceivers = settings.FinalEmailToReceivers,
|
FinalEmailToReceivers = settings.FinalEmailToReceivers,
|
||||||
SendReminderEmails = settings.SendReminderEmails,
|
SendReminderEmails = settings.SendReminderEmails,
|
||||||
@@ -160,8 +153,7 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
ExpiresWhenDays = settings.ExpiresWhenDays,
|
ExpiresWhenDays = settings.ExpiresWhenDays,
|
||||||
ExpiresWarningWhenDays = settings.ExpiresWarningWhenDays,
|
ExpiresWarningWhenDays = settings.ExpiresWarningWhenDays,
|
||||||
ExpiresWhen = settings.ExpiresWhen,
|
ExpiresWhen = settings.ExpiresWhen,
|
||||||
ExpiresWarningWhen = settings.ExpiresWarningWhen,
|
ExpiresWarningWhen = settings.ExpiresWarningWhen
|
||||||
ContractType = settings.ContractType
|
|
||||||
}, cancel);
|
}, cancel);
|
||||||
|
|
||||||
if (request.UseSQLExecutor)
|
if (request.UseSQLExecutor)
|
||||||
@@ -171,10 +163,9 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
e.Title = title;
|
e.Title = title;
|
||||||
e.Message = message;
|
e.Message = message;
|
||||||
e.TfaEnabled = request.TFAEnabled;
|
e.TfaEnabled = request.TFAEnabled;
|
||||||
e.EnvelopeTypeId = settings.EnvelopeTypeId;
|
e.Type = settings.Type;
|
||||||
e.Language = settings.Language;
|
e.Language = settings.Language;
|
||||||
e.UseAccessCode = settings.UseAccessCode;
|
e.UseAccessCode = settings.UseAccessCode;
|
||||||
e.CertificationType = settings.CertificationType;
|
|
||||||
e.FinalEmailToCreator = settings.FinalEmailToCreator;
|
e.FinalEmailToCreator = settings.FinalEmailToCreator;
|
||||||
e.FinalEmailToReceivers = settings.FinalEmailToReceivers;
|
e.FinalEmailToReceivers = settings.FinalEmailToReceivers;
|
||||||
e.SendReminderEmails = settings.SendReminderEmails;
|
e.SendReminderEmails = settings.SendReminderEmails;
|
||||||
@@ -184,7 +175,6 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
e.ExpiresWarningWhenDays = settings.ExpiresWarningWhenDays;
|
e.ExpiresWarningWhenDays = settings.ExpiresWarningWhenDays;
|
||||||
e.ExpiresWhen = settings.ExpiresWhen;
|
e.ExpiresWhen = settings.ExpiresWhen;
|
||||||
e.ExpiresWarningWhen = settings.ExpiresWarningWhen;
|
e.ExpiresWarningWhen = settings.ExpiresWarningWhen;
|
||||||
e.ContractType = settings.ContractType;
|
|
||||||
e.Status = EnvelopeStatus.EnvelopeSaved;
|
e.Status = EnvelopeStatus.EnvelopeSaved;
|
||||||
e.ChangedWhen = now;
|
e.ChangedWhen = now;
|
||||||
}, e => e.Id == envelope.Id, cancel);
|
}, e => e.Id == envelope.Id, cancel);
|
||||||
@@ -192,10 +182,9 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
envelope.Title = title;
|
envelope.Title = title;
|
||||||
envelope.Message = message;
|
envelope.Message = message;
|
||||||
envelope.TfaEnabled = request.TFAEnabled;
|
envelope.TfaEnabled = request.TFAEnabled;
|
||||||
envelope.EnvelopeTypeId = settings.EnvelopeTypeId;
|
envelope.Type = settings.Type;
|
||||||
envelope.Language = settings.Language;
|
envelope.Language = settings.Language;
|
||||||
envelope.UseAccessCode = settings.UseAccessCode;
|
envelope.UseAccessCode = settings.UseAccessCode;
|
||||||
envelope.CertificationType = settings.CertificationType;
|
|
||||||
envelope.FinalEmailToCreator = settings.FinalEmailToCreator;
|
envelope.FinalEmailToCreator = settings.FinalEmailToCreator;
|
||||||
envelope.FinalEmailToReceivers = settings.FinalEmailToReceivers;
|
envelope.FinalEmailToReceivers = settings.FinalEmailToReceivers;
|
||||||
envelope.SendReminderEmails = settings.SendReminderEmails;
|
envelope.SendReminderEmails = settings.SendReminderEmails;
|
||||||
@@ -205,7 +194,6 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
envelope.ExpiresWarningWhenDays = settings.ExpiresWarningWhenDays;
|
envelope.ExpiresWarningWhenDays = settings.ExpiresWarningWhenDays;
|
||||||
envelope.ExpiresWhen = settings.ExpiresWhen;
|
envelope.ExpiresWhen = settings.ExpiresWhen;
|
||||||
envelope.ExpiresWarningWhen = settings.ExpiresWarningWhen;
|
envelope.ExpiresWarningWhen = settings.ExpiresWarningWhen;
|
||||||
envelope.ContractType = settings.ContractType;
|
|
||||||
envelope.Status = EnvelopeStatus.EnvelopeSaved;
|
envelope.Status = EnvelopeStatus.EnvelopeSaved;
|
||||||
envelope.ChangedWhen = now;
|
envelope.ChangedWhen = now;
|
||||||
}
|
}
|
||||||
@@ -230,17 +218,17 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
.ThenInclude(er => er.Receiver)
|
.ThenInclude(er => er.Receiver)
|
||||||
.FirstAsync(e => e.Id == envelope.Id, cancel);
|
.FirstAsync(e => e.Id == envelope.Id, cancel);
|
||||||
|
|
||||||
return _mapper.Map<EnvelopeDto>(envelope);
|
return Mapper.Map<EnvelopeDto>(envelope);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<EnvelopeSettings> ResolveEnvelopeSettingsAsync(CreateEnvelopeCommand request, Envelope? existing, CancellationToken cancel)
|
private async Task<EnvelopeSettings> ResolveEnvelopeSettingsAsync(CreateEnvelopeCommand request, Envelope? existing, CancellationToken cancel)
|
||||||
{
|
{
|
||||||
EnvelopeType? selectedType = null;
|
EnvelopeTypeDefaults? selectedType = null;
|
||||||
if (request.EnvelopeTypeId is int envelopeTypeId && envelopeTypeId > 0)
|
if (request.Type is EnvelopeType type)
|
||||||
{
|
{
|
||||||
selectedType = await EnvelopeTypeRepository.Query
|
selectedType = await EnvelopeTypeRepository.Query
|
||||||
.FirstOrDefaultAsync(t => t.Id == envelopeTypeId, cancel)
|
.FirstOrDefaultAsync(t => t.Id == type, cancel)
|
||||||
?? throw new BadRequestException($"Envelope type {envelopeTypeId} not found.");
|
?? throw new BadRequestException($"Envelope type {type} not found.");
|
||||||
}
|
}
|
||||||
|
|
||||||
var expiresWhenDays = Math.Max(0,
|
var expiresWhenDays = Math.Max(0,
|
||||||
@@ -264,21 +252,17 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
useAccessCode = true;
|
useAccessCode = true;
|
||||||
|
|
||||||
return new EnvelopeSettings(
|
return new EnvelopeSettings(
|
||||||
EnvelopeTypeId: request.EnvelopeTypeId ?? existing?.EnvelopeTypeId,
|
Type: request.Type ?? existing?.Type,
|
||||||
Language: ResolveLanguage(request.Language, selectedType?.Language, existing?.Language),
|
Language: ResolveLanguage(request.Language, selectedType?.Language, existing?.Language),
|
||||||
UseAccessCode: useAccessCode,
|
UseAccessCode: useAccessCode,
|
||||||
CertificationType: request.CertificationType
|
|
||||||
?? (int?)selectedType?.CertificationType
|
|
||||||
?? existing?.CertificationType
|
|
||||||
?? (int)CertificationType.AdvancedElectronicSignature,
|
|
||||||
FinalEmailToCreator: request.FinalEmailToCreator
|
FinalEmailToCreator: request.FinalEmailToCreator
|
||||||
?? (int?)selectedType?.FinalEmailToCreator
|
?? selectedType?.FinalEmailToCreator
|
||||||
?? existing?.FinalEmailToCreator
|
?? existing?.FinalEmailToCreator
|
||||||
?? (int)FinalEmailType.No,
|
?? FinalEmailType.No,
|
||||||
FinalEmailToReceivers: request.FinalEmailToReceivers
|
FinalEmailToReceivers: request.FinalEmailToReceivers
|
||||||
?? (int?)selectedType?.FinalEmailToReceivers
|
?? selectedType?.FinalEmailToReceivers
|
||||||
?? existing?.FinalEmailToReceivers
|
?? existing?.FinalEmailToReceivers
|
||||||
?? (int)FinalEmailType.No,
|
?? FinalEmailType.No,
|
||||||
SendReminderEmails: request.SendReminderEmails
|
SendReminderEmails: request.SendReminderEmails
|
||||||
?? selectedType?.SendReminderEmails
|
?? selectedType?.SendReminderEmails
|
||||||
?? existing?.SendReminderEmails
|
?? existing?.SendReminderEmails
|
||||||
@@ -296,10 +280,7 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
ExpiresWhenDays: expiresWhenDays,
|
ExpiresWhenDays: expiresWhenDays,
|
||||||
ExpiresWarningWhenDays: expiresWarningWhenDays,
|
ExpiresWarningWhenDays: expiresWarningWhenDays,
|
||||||
ExpiresWhen: expiresWhenDays > 0 ? DateTime.Now.AddDays(expiresWhenDays) : null,
|
ExpiresWhen: expiresWhenDays > 0 ? DateTime.Now.AddDays(expiresWhenDays) : null,
|
||||||
ExpiresWarningWhen: expiresWarningWhenDays > 0 ? DateTime.Now.AddDays(expiresWarningWhenDays) : null,
|
ExpiresWarningWhen: expiresWarningWhenDays > 0 ? DateTime.Now.AddDays(expiresWarningWhenDays) : null);
|
||||||
ContractType: existing?.ContractType
|
|
||||||
?? selectedType?.ContractType
|
|
||||||
?? (int)ContractType.Contract);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string ResolveLanguage(string? preferred, string? fallback1, string? fallback2)
|
private static string ResolveLanguage(string? preferred, string? fallback1, string? fallback2)
|
||||||
@@ -317,20 +298,18 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
}
|
}
|
||||||
|
|
||||||
private sealed record EnvelopeSettings(
|
private sealed record EnvelopeSettings(
|
||||||
int? EnvelopeTypeId,
|
EnvelopeType? Type,
|
||||||
string Language,
|
string Language,
|
||||||
bool UseAccessCode,
|
bool UseAccessCode,
|
||||||
int CertificationType,
|
FinalEmailType FinalEmailToCreator,
|
||||||
int FinalEmailToCreator,
|
FinalEmailType FinalEmailToReceivers,
|
||||||
int FinalEmailToReceivers,
|
|
||||||
bool SendReminderEmails,
|
bool SendReminderEmails,
|
||||||
int FirstReminderDays,
|
int FirstReminderDays,
|
||||||
int ReminderIntervalDays,
|
int ReminderIntervalDays,
|
||||||
int ExpiresWhenDays,
|
int ExpiresWhenDays,
|
||||||
int ExpiresWarningWhenDays,
|
int ExpiresWarningWhenDays,
|
||||||
DateTime? ExpiresWhen,
|
DateTime? ExpiresWhen,
|
||||||
DateTime? ExpiresWarningWhen,
|
DateTime? ExpiresWarningWhen);
|
||||||
int ContractType);
|
|
||||||
|
|
||||||
private async Task<string> ResolveSenderReferenceAsync(Envelope envelope, CancellationToken cancel)
|
private async Task<string> ResolveSenderReferenceAsync(Envelope envelope, CancellationToken cancel)
|
||||||
{
|
{
|
||||||
@@ -444,8 +423,8 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
ElementType = 1,
|
ElementType = 1,
|
||||||
X = field.X,
|
X = field.X,
|
||||||
Y = field.Y,
|
Y = field.Y,
|
||||||
Width = 1.77,
|
Width = SignatureFieldParams.Width,
|
||||||
Height = 1.96,
|
Height = SignatureFieldParams.Height,
|
||||||
Page = field.Page,
|
Page = field.Page,
|
||||||
Required = true,
|
Required = true,
|
||||||
ReadOnly = false,
|
ReadOnly = false,
|
||||||
@@ -529,15 +508,15 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
if (!hasDocument)
|
if (!hasDocument)
|
||||||
throw new BadRequestException("Cannot send envelope without a document.");
|
throw new BadRequestException("Cannot send envelope without a document.");
|
||||||
|
|
||||||
var links = await EnvelopeReceiverRepository.Query
|
var envRcvs = await EnvelopeReceiverRepository.Query
|
||||||
.Include(er => er.Receiver)
|
.Include(er => er.Receiver)
|
||||||
.Where(er => er.EnvelopeId == envelope.Id)
|
.Where(er => er.EnvelopeId == envelope.Id)
|
||||||
.ToListAsync(cancel);
|
.ToListAsync(cancel);
|
||||||
|
|
||||||
if (links.Count == 0)
|
if (envRcvs.Count == 0)
|
||||||
throw new BadRequestException("Cannot send envelope without receivers.");
|
throw new BadRequestException("Cannot send envelope without receivers.");
|
||||||
|
|
||||||
var receiverIds = links.Select(l => l.ReceiverId).Distinct().ToList();
|
var receiverIds = envRcvs.Select(l => l.ReceiverId).Distinct().ToList();
|
||||||
var documentIds = await DocumentRepository.Query
|
var documentIds = await DocumentRepository.Query
|
||||||
.Where(d => d.EnvelopeId == envelope.Id)
|
.Where(d => d.EnvelopeId == envelope.Id)
|
||||||
.Select(d => d.Id)
|
.Select(d => d.Id)
|
||||||
@@ -550,7 +529,7 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
.Select(g => new { ReceiverId = g.Key, Count = g.Count() })
|
.Select(g => new { ReceiverId = g.Key, Count = g.Count() })
|
||||||
.ToDictionaryAsync(x => x.ReceiverId, x => x.Count, cancel);
|
.ToDictionaryAsync(x => x.ReceiverId, x => x.Count, cancel);
|
||||||
|
|
||||||
var receiversWithoutFields = links
|
var receiversWithoutFields = envRcvs
|
||||||
.Where(link => !receiverFieldCounts.TryGetValue(link.ReceiverId, out var count) || count <= 0)
|
.Where(link => !receiverFieldCounts.TryGetValue(link.ReceiverId, out var count) || count <= 0)
|
||||||
.Select(link => link.Name)
|
.Select(link => link.Name)
|
||||||
.ToList();
|
.ToList();
|
||||||
@@ -574,70 +553,38 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
Status = EnvelopeStatus.EnvelopeQueued
|
Status = EnvelopeStatus.EnvelopeQueued
|
||||||
}, cancel);
|
}, cancel);
|
||||||
|
|
||||||
await QueueInvitationEmailsAsync(envelope, links, userReference, cancel);
|
await SendInvitationEmailsAsync(envelope, envRcvs, cancel);
|
||||||
|
|
||||||
envelope.Status = EnvelopeStatus.EnvelopeQueued;
|
envelope.Status = EnvelopeStatus.EnvelopeQueued;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task QueueInvitationEmailsAsync(
|
private async Task SendInvitationEmailsAsync(
|
||||||
Envelope envelope,
|
Envelope envelope,
|
||||||
IReadOnlyCollection<EnvelopeReceiver> links,
|
IReadOnlyCollection<EnvelopeReceiver> envRcvs,
|
||||||
string senderReference,
|
|
||||||
CancellationToken cancel)
|
CancellationToken cancel)
|
||||||
{
|
{
|
||||||
var template = await EmailTemplateRepository.Query
|
foreach (var er in envRcvs)
|
||||||
.SingleOrDefaultAsync(x => x.Name == EmailTemplateType.DocumentReceived.ToString(), cancel)
|
|
||||||
?? throw new InvalidOperationException($"Email template not found: {EmailTemplateType.DocumentReceived}");
|
|
||||||
|
|
||||||
var signatureHost = await ConfigService.ReadDefaultSignatureHost();
|
|
||||||
var senderName = senderReference;
|
|
||||||
|
|
||||||
foreach (var link in links)
|
|
||||||
{
|
{
|
||||||
var receiver = link.Receiver;
|
var origin = new Uri(ReqCntxt.Origin ?? throw new InvalidOperationException($"The request origin is missing in {nameof(CreateEnvelopeCommandHandler)}."));
|
||||||
if (receiver is null || string.IsNullOrWhiteSpace(receiver.EmailAddress) || string.IsNullOrWhiteSpace(receiver.Signature))
|
try
|
||||||
continue;
|
|
||||||
|
|
||||||
var envelopeKey = (envelope.Uuid, receiver.Signature).ToEnvelopeKey();
|
|
||||||
var documentLink = $"{signatureHost.TrimEnd('/')}/envelope/login/{Uri.EscapeDataString(envelopeKey)}";
|
|
||||||
|
|
||||||
var placeholders = new Dictionary<string, string>(MailParams.Placeholders)
|
|
||||||
{
|
{
|
||||||
["[NAME_RECEIVER]"] = link.Name ?? string.Empty,
|
await EnvNtfService.Notify(er.Receiver.EmailAddress, new DocumentReceivedNotification
|
||||||
["[NAME_SENDER]"] = senderName ?? string.Empty,
|
{
|
||||||
["[DOCUMENT_TITLE]"] = envelope.Title ?? string.Empty,
|
AdvancedSignature = envelope.Type == EnvelopeType.AdvancedSignature,
|
||||||
["[MESSAGE]"] = envelope.Message ?? string.Empty,
|
DocumentTitle = envelope.Title ?? string.Empty,
|
||||||
["[LINK_TO_DOCUMENT]"] = documentLink,
|
NameReceiver = er.Name ?? string.Empty,
|
||||||
["[LINK_TO_DOCUMENT_TEXT]"] = documentLink[..Math.Min(40, documentLink.Length)] + ".."
|
EnvelopeUuid = envelope.Uuid,
|
||||||
};
|
IsReadAndConfirm = envelope.IsReadAndConfirm(),
|
||||||
|
Message = envelope.Message ?? string.Empty,
|
||||||
var subject = ReplacePlaceHolders(template.Subject, placeholders);
|
NameSender = $"{envelope.User.Prename} {envelope.User.Name}",
|
||||||
var body = ReplacePlaceHolders(template.Body, placeholders);
|
Origin = origin,
|
||||||
|
ReceiverSignature = er.Receiver.Signature,
|
||||||
var emailOut = new EmailOut
|
}, cancel);
|
||||||
|
}
|
||||||
|
catch(Exception ex)
|
||||||
{
|
{
|
||||||
EmailAddress = receiver.EmailAddress,
|
Logger.LogError(ex, "Failed to send invitation email for receiver {emailAddress} in envelope {envelopeId}.", er.Receiver.EmailAddress, envelope.Id);
|
||||||
EmailSubj = subject,
|
}
|
||||||
EmailBody = body,
|
|
||||||
AddedWhen = DateTime.Now,
|
|
||||||
AddedWho = DispatcherParams.AddedWho,
|
|
||||||
SendingProfile = DispatcherParams.SendingProfile,
|
|
||||||
ReminderTypeId = DispatcherParams.ReminderTypeId,
|
|
||||||
EmailAttmt1 = DispatcherParams.EmailAttmt1,
|
|
||||||
WfId = (int)EnvelopeStatus.MessageInvitationSent,
|
|
||||||
ReferenceString = receiver.EmailAddress,
|
|
||||||
ReferenceId = link.ReceiverId
|
|
||||||
};
|
|
||||||
|
|
||||||
await EmailOutRepository.CreateAsync(emailOut, cancel);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string ReplacePlaceHolders(string text, Dictionary<string, string> placeHolders)
|
|
||||||
{
|
|
||||||
foreach (var placeHolder in placeHolders)
|
|
||||||
text = text.Replace(placeHolder.Key, placeHolder.Value);
|
|
||||||
|
|
||||||
return text;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,9 @@
|
|||||||
using EnvelopeGenerator.Domain.Constants;
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
using EnvelopeGenerator.Application.Common.Query;
|
using EnvelopeGenerator.Application.Common.Query;
|
||||||
using EnvelopeGenerator.Application.Common.Dto;
|
using EnvelopeGenerator.Application.Common.Dto;
|
||||||
|
using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
|
||||||
|
using EnvelopeGenerator.Application.Common.Dto.History;
|
||||||
|
using EnvelopeGenerator.Application.Common.Dto.Receiver;
|
||||||
using AutoMapper;
|
using AutoMapper;
|
||||||
using DigitalData.Core.Abstraction.Application.Repository;
|
using DigitalData.Core.Abstraction.Application.Repository;
|
||||||
using EnvelopeGenerator.Domain.Entities;
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
@@ -14,6 +17,11 @@ namespace EnvelopeGenerator.Application.Envelopes.Queries;
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest<IEnumerable<EnvelopeDto>>
|
public record ReadEnvelopeQuery : EnvelopeQueryBase, IRequest<IEnumerable<EnvelopeDto>>
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public bool IncludeDocAndDocRes { get; init; } = true;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -148,8 +156,86 @@ public class ReadEnvelopeQueryHandler : IRequestHandler<ReadEnvelopeQuery, IEnum
|
|||||||
if (request is { OnlyCompleted: true })
|
if (request is { OnlyCompleted: true })
|
||||||
query = query.Where(e => Status.Completed.Contains(e.Status));
|
query = query.Where(e => Status.Completed.Contains(e.Status));
|
||||||
|
|
||||||
|
if (!request.IncludeDocAndDocRes)
|
||||||
|
{
|
||||||
|
return await query
|
||||||
|
.Select(e => new EnvelopeDto
|
||||||
|
{
|
||||||
|
Id = e.Id,
|
||||||
|
UserId = e.UserId,
|
||||||
|
Status = e.Status,
|
||||||
|
StatusName = string.Empty,
|
||||||
|
Uuid = e.Uuid,
|
||||||
|
Message = e.Message,
|
||||||
|
AddedWhen = e.AddedWhen,
|
||||||
|
ChangedWhen = e.ChangedWhen,
|
||||||
|
Title = e.Title ?? string.Empty,
|
||||||
|
Language = e.Language,
|
||||||
|
Type = e.Type,
|
||||||
|
FinalEmailToCreator = e.FinalEmailToCreator,
|
||||||
|
FinalEmailToReceivers = e.FinalEmailToReceivers,
|
||||||
|
SendReminderEmails = e.SendReminderEmails,
|
||||||
|
FirstReminderDays = e.FirstReminderDays,
|
||||||
|
ReminderIntervalDays = e.ReminderIntervalDays,
|
||||||
|
ExpiresWhenDays = e.ExpiresWhenDays,
|
||||||
|
ExpiresWarningWhenDays = e.ExpiresWarningWhenDays,
|
||||||
|
UseAccessCode = e.UseAccessCode ?? true,
|
||||||
|
TFAEnabled = e.TfaEnabled ?? false,
|
||||||
|
EnvelopeTypeTitle = e.Defaults != null ? e.Defaults.Title : null,
|
||||||
|
IsAlreadySent = false,
|
||||||
|
DocResult = null,
|
||||||
|
Documents = null,
|
||||||
|
EnvelopeReceivers = e.EnvelopeReceivers.Select(er => new EnvelopeReceiverDto
|
||||||
|
{
|
||||||
|
EnvelopeId = er.EnvelopeId,
|
||||||
|
ReceiverId = er.ReceiverId,
|
||||||
|
Sequence = er.Sequence,
|
||||||
|
Name = er.Name,
|
||||||
|
JobTitle = er.JobTitle,
|
||||||
|
CompanyName = er.CompanyName,
|
||||||
|
PrivateMessage = er.PrivateMessage,
|
||||||
|
AccessCode = er.AccessCode,
|
||||||
|
AddedWhen = er.AddedWhen,
|
||||||
|
ChangedWhen = er.ChangedWhen,
|
||||||
|
HasPhoneNumber = er.HasPhoneNumber,
|
||||||
|
Receiver = er.Receiver == null
|
||||||
|
? null
|
||||||
|
: new ReceiverDto
|
||||||
|
{
|
||||||
|
Id = er.Receiver.Id,
|
||||||
|
EmailAddress = er.Receiver.EmailAddress,
|
||||||
|
Signature = er.Receiver.Signature,
|
||||||
|
AddedWhen = er.Receiver.AddedWhen,
|
||||||
|
TfaRegDeadline = er.Receiver.TfaRegDeadline
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
Histories = e.Histories.Select(h => new HistoryDto
|
||||||
|
{
|
||||||
|
Id = h.Id,
|
||||||
|
EnvelopeId = h.EnvelopeId,
|
||||||
|
UserReference = h.UserReference,
|
||||||
|
Status = h.Status,
|
||||||
|
StatusName = null,
|
||||||
|
AddedWhen = h.AddedWhen,
|
||||||
|
ActionDate = h.ActionDate,
|
||||||
|
Comment = h.Comment,
|
||||||
|
Receiver = h.Receiver == null
|
||||||
|
? null
|
||||||
|
: new ReceiverDto
|
||||||
|
{
|
||||||
|
Id = h.Receiver.Id,
|
||||||
|
EmailAddress = h.Receiver.EmailAddress,
|
||||||
|
Signature = h.Receiver.Signature,
|
||||||
|
AddedWhen = h.Receiver.AddedWhen,
|
||||||
|
TfaRegDeadline = h.Receiver.TfaRegDeadline
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.ToListAsync(cancel);
|
||||||
|
}
|
||||||
|
|
||||||
var envelopes = await query
|
var envelopes = await query
|
||||||
.Include(e => e.Type)
|
.Include(e => e.Defaults)
|
||||||
.Include(e => e.EnvelopeReceivers).ThenInclude(er => er.Receiver)
|
.Include(e => e.EnvelopeReceivers).ThenInclude(er => er.Receiver)
|
||||||
.Include(e => e.Histories)
|
.Include(e => e.Histories)
|
||||||
.ToListAsync(cancel);
|
.ToListAsync(cancel);
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
using AutoMapper;
|
||||||
|
using DigitalData.Core.Abstraction.Application.Repository;
|
||||||
|
using EnvelopeGenerator.Application.Common.Dto;
|
||||||
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
|
using MediatR;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Envelopes.Queries;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public record ReadSignedEnvelopeQuery : IRequest<IEnumerable<EnvelopeDto>>
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public bool? Burned { get; init; } = null;
|
||||||
|
|
||||||
|
internal int? UserId { get; private set; } = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="userId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public ReadSignedEnvelopeQuery Authorized(int userId)
|
||||||
|
{
|
||||||
|
UserId = userId;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="Repo"></param>
|
||||||
|
/// <param name="Mapper"></param>
|
||||||
|
public class ReadSignedEnvelopeQueryHandler(IRepository<Envelope> Repo, IMapper Mapper) : IRequestHandler<ReadSignedEnvelopeQuery, IEnumerable<EnvelopeDto>>
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="request"></param>
|
||||||
|
/// <param name="cancel"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
/// <exception cref="NotImplementedException"></exception>
|
||||||
|
public async Task<IEnumerable<EnvelopeDto>> Handle(ReadSignedEnvelopeQuery request, CancellationToken cancel)
|
||||||
|
{
|
||||||
|
var eQuery = Repo.Query.Where(e => e.Status == Domain.Constants.EnvelopeStatus.EnvelopeCompletelySigned);
|
||||||
|
|
||||||
|
if (request.Burned is bool burned)
|
||||||
|
eQuery = burned ? eQuery.Where(e => e.DocResult != null) : eQuery.Where(e => e.DocResult == null);
|
||||||
|
|
||||||
|
if(request.UserId is int userId)
|
||||||
|
eQuery = eQuery.Where(e => e.UserId == userId);
|
||||||
|
|
||||||
|
var envelopes = await eQuery.ToListAsync(cancel);
|
||||||
|
|
||||||
|
return Mapper.Map<IEnumerable<EnvelopeDto>>(envelopes);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,109 @@
|
|||||||
|
using DigitalData.Core.Abstraction.Application.Repository;
|
||||||
|
using DigitalData.Core.Exceptions;
|
||||||
|
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
using EnvelopeGenerator.Application.Common.Query;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
|
using EnvelopeGenerator.Domain.Interfaces;
|
||||||
|
using MediatR;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.PdfSigning;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public record FinalizeEnvelopeCommand : EnvelopeQueryBase, IRequest
|
||||||
|
{
|
||||||
|
internal int? UserId { get; private set; } = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="userId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public FinalizeEnvelopeCommand Authorized(int userId)
|
||||||
|
{
|
||||||
|
UserId = userId;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public bool BurnedAllowed { get; init; } = false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public bool SaveDocResult { get; init; } = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="Repo"></param>
|
||||||
|
/// <param name="Sender"></param>
|
||||||
|
/// <param name="NtfServer"></param>
|
||||||
|
public class FinalizeEnvelopeCommandHandler(IRepository<Envelope> Repo, ISender Sender, IEnvelopeNotificationService NtfServer) : IRequestHandler<FinalizeEnvelopeCommand>
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="request"></param>
|
||||||
|
/// <param name="cancel"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
/// <exception cref="NotFoundException"></exception>
|
||||||
|
public async Task Handle(FinalizeEnvelopeCommand request, CancellationToken cancel)
|
||||||
|
{
|
||||||
|
var envelopeQuery = Repo.Query;
|
||||||
|
|
||||||
|
if (request.Id is int id)
|
||||||
|
envelopeQuery = envelopeQuery.Where(e => e.Id == id);
|
||||||
|
else if (request.Uuid is string uuid)
|
||||||
|
envelopeQuery = envelopeQuery.Where(e => e.Uuid == uuid);
|
||||||
|
|
||||||
|
var envelope = await envelopeQuery
|
||||||
|
.Include(e => e.EnvelopeReceivers).ThenInclude(er => er.Receiver)
|
||||||
|
.Include(e => e.Documents)
|
||||||
|
.SingleOrDefaultAsync(cancel)
|
||||||
|
?? throw new NotFoundException($"Envelope is not found ID: {request.Id} UUID: {request.Uuid}");
|
||||||
|
|
||||||
|
if(request.UserId is int userId && userId != envelope.UserId)
|
||||||
|
throw new InvalidOperationException($"Envelope is not owned by user ID: {request.Id} UUID: {request.Uuid}");
|
||||||
|
|
||||||
|
// already burned
|
||||||
|
if (!request.BurnedAllowed && envelope.IsBurned())
|
||||||
|
throw new InvalidOperationException($"Envelope is already burned ID: {request.Id} UUID: {request.Uuid}");
|
||||||
|
|
||||||
|
// envelope is not completely signed
|
||||||
|
if (envelope.Status!= EnvelopeStatus.EnvelopeCompletelySigned)
|
||||||
|
throw new InvalidOperationException($"Envelope status is not completely signed ID: {request.Id} UUID: {request.Uuid}");
|
||||||
|
|
||||||
|
using var docStream = await Sender.Send(new SignPdfByEnvelopeCommand()
|
||||||
|
{
|
||||||
|
Envelope = envelope
|
||||||
|
}, cancel);
|
||||||
|
|
||||||
|
if (docStream.CanSeek)
|
||||||
|
docStream.Position = 0;
|
||||||
|
|
||||||
|
using var ms = new MemoryStream();
|
||||||
|
docStream.CopyTo(ms);
|
||||||
|
byte[] doc = ms.ToArray();
|
||||||
|
|
||||||
|
foreach (var er in envelope.EnvelopeReceivers)
|
||||||
|
{
|
||||||
|
await NtfServer.Notify(er.Receiver.EmailAddress, new DocumentSignedNotification()
|
||||||
|
{
|
||||||
|
DocumentTitle = envelope.Title,
|
||||||
|
NameReceiver = er.Name,
|
||||||
|
Attachments = [($"unterzeichnetes-dokument.pdf", doc)],
|
||||||
|
IsReadAndConfirm = envelope.IsReadAndConfirm(),
|
||||||
|
}, cancel);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (request.SaveDocResult)
|
||||||
|
await Repo.UpdateAsync(e => e.DocResult = doc, e => e.Id == envelope.Id, cancel);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
using DigitalData.Core.Abstraction.Application.Repository;
|
||||||
|
using DigitalData.Core.Exceptions;
|
||||||
|
using EnvelopeGenerator.Application.Common.Query;
|
||||||
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
|
using EnvelopeGenerator.Domain.Exceptions;
|
||||||
|
using MediatR;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.PdfSigning;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public record SignPdfByEnvelopeCommand : EnvelopeQueryBase, IRequest<Stream>
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public int? ReceiverId { get; init; } = null;
|
||||||
|
|
||||||
|
internal int? UserId { get; private set; } = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="userId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public SignPdfByEnvelopeCommand Authorized(int userId)
|
||||||
|
{
|
||||||
|
UserId = userId;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal Envelope? Envelope { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public class SignPdfByEnvelopeCommandHandler(IRepository<Envelope> Repo, ISender sender) : IRequestHandler<SignPdfByEnvelopeCommand, Stream>
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="request"></param>
|
||||||
|
/// <param name="cancel"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
/// <exception cref="NotImplementedException"></exception>
|
||||||
|
public async Task<Stream> Handle(SignPdfByEnvelopeCommand request, CancellationToken cancel)
|
||||||
|
{
|
||||||
|
if (request.Envelope is null)
|
||||||
|
{
|
||||||
|
var envelopeQuery = Repo.Query;
|
||||||
|
|
||||||
|
if (request.Id is int id)
|
||||||
|
envelopeQuery = envelopeQuery.Where(e => e.Id == id);
|
||||||
|
else if (request.Uuid is string uuid)
|
||||||
|
envelopeQuery = envelopeQuery.Where(e => e.Uuid == uuid);
|
||||||
|
|
||||||
|
request.Envelope = await envelopeQuery.Include(e => e.EnvelopeReceivers).Include(e => e.Documents).SingleOrDefaultAsync(cancel)
|
||||||
|
?? throw new NotFoundException($"Envelope is not found ID: {request.Id} UUID: {request.Uuid}");
|
||||||
|
}
|
||||||
|
|
||||||
|
var envelope = request.Envelope;
|
||||||
|
|
||||||
|
if (request.UserId is int userId && userId != envelope.UserId)
|
||||||
|
throw new AuthorizationException($"Envelope is not authorized for user with Id: {request.UserId} Envelope ID: {request.Id} UUID: {request.Uuid}");
|
||||||
|
|
||||||
|
if (envelope.EnvelopeReceivers.Count == 0)
|
||||||
|
throw new NotFoundException($"Envelope has no receivers to sign ID: {request.Id} UUID: {request.Uuid}");
|
||||||
|
|
||||||
|
if(envelope.Documents.FirstOrDefault() is not Document document || document.ByteData is not byte[] byteData || byteData.Length == 0)
|
||||||
|
throw new NotFoundException($"Envelope has no documents to sign ID: {request.Id} UUID: {request.Uuid}");
|
||||||
|
|
||||||
|
Stream doc = new MemoryStream(byteData);
|
||||||
|
|
||||||
|
var eReceivers = request.ReceiverId is int receiverId
|
||||||
|
? envelope.EnvelopeReceivers.Where(e => e.ReceiverId == receiverId)
|
||||||
|
: envelope.EnvelopeReceivers;
|
||||||
|
|
||||||
|
foreach (var eReceiver in eReceivers)
|
||||||
|
{
|
||||||
|
var signedDoc = await sender.Send(new SignPdfByEnvelopeReceiverCommand()
|
||||||
|
{
|
||||||
|
EnvelopeId = eReceiver.EnvelopeId,
|
||||||
|
ReceiverId = eReceiver.ReceiverId
|
||||||
|
}, cancel);
|
||||||
|
|
||||||
|
await doc.DisposeAsync();
|
||||||
|
doc = signedDoc;
|
||||||
|
}
|
||||||
|
|
||||||
|
return doc;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,6 +5,7 @@ using EnvelopeGenerator.Application.Common.Dto;
|
|||||||
using EnvelopeGenerator.Application.Common.Enums;
|
using EnvelopeGenerator.Application.Common.Enums;
|
||||||
using EnvelopeGenerator.Application.Documents.Queries;
|
using EnvelopeGenerator.Application.Documents.Queries;
|
||||||
using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
|
using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
|
||||||
|
using EnvelopeGenerator.Application.Envelopes.Queries;
|
||||||
using EnvelopeGenerator.Domain.Entities;
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
using EnvelopeGenerator.Domain.Exceptions;
|
using EnvelopeGenerator.Domain.Exceptions;
|
||||||
using MediatR;
|
using MediatR;
|
||||||
@@ -26,6 +27,11 @@ public record SignPdfByEnvelopeReceiverCommand : IRequest<Stream>
|
|||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int ReceiverId { get; init; }
|
public int ReceiverId { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public Stream? Document { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -62,10 +68,14 @@ public class SignPdfByEnvelopeReceiverCommandHandler(IRepository<DocReceiverElem
|
|||||||
}, cancel) ?? throw new DataIntegrityException($"No secrets found for Envelope ID {request.EnvelopeId} and Receiver ID {request.ReceiverId}.");
|
}, cancel) ?? throw new DataIntegrityException($"No secrets found for Envelope ID {request.EnvelopeId} and Receiver ID {request.ReceiverId}.");
|
||||||
|
|
||||||
// read document
|
// read document
|
||||||
var unsignedDoc = await Sender.Send(new ReadDocumentQuery(EnvelopeId: request.EnvelopeId), cancel);
|
if(request.Document is null)
|
||||||
var unsignedDocBytes = unsignedDoc.ByteData ?? throw new NotFoundException($"Document not found for Envelope ID {request.EnvelopeId} and Receiver ID {request.ReceiverId}.");
|
{
|
||||||
|
var unsignedDoc = await Sender.Send(new ReadDocumentQuery(EnvelopeId: request.EnvelopeId), cancel);
|
||||||
|
var unsignedDocBytes = unsignedDoc.ByteData ?? throw new NotFoundException($"Document not found for Envelope ID {request.EnvelopeId} and Receiver ID {request.ReceiverId}.");
|
||||||
|
request.Document = new MemoryStream(unsignedDocBytes);
|
||||||
|
}
|
||||||
|
|
||||||
Stream doc = new MemoryStream(unsignedDocBytes);
|
Stream doc = request.Document;
|
||||||
|
|
||||||
// sign document for each element
|
// sign document for each element
|
||||||
foreach (var element in elementDtos)
|
foreach (var element in elementDtos)
|
||||||
|
|||||||
@@ -622,10 +622,10 @@
|
|||||||
<value>Zertifizierungstyp</value>
|
<value>Zertifizierungstyp</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="FinalEmailToCreator" xml:space="preserve">
|
<data name="FinalEmailToCreator" xml:space="preserve">
|
||||||
<value>Finale E-Mail an Ersteller</value>
|
<value>Abgeschlossenes Dokument an Ersteller</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="FinalEmailToReceivers" xml:space="preserve">
|
<data name="FinalEmailToReceivers" xml:space="preserve">
|
||||||
<value>Finale E-Mail an Empfänger</value>
|
<value>Abgeschlossenes Dokument an Empfänger</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="SendReminderEmails" xml:space="preserve">
|
<data name="SendReminderEmails" xml:space="preserve">
|
||||||
<value>Erinnerungs-E-Mails senden</value>
|
<value>Erinnerungs-E-Mails senden</value>
|
||||||
@@ -703,10 +703,19 @@
|
|||||||
<data name="ReceiverLogin_AccessCode_Placeholder" xml:space="preserve"><value>Zugangscode eingeben</value></data>
|
<data name="ReceiverLogin_AccessCode_Placeholder" xml:space="preserve"><value>Zugangscode eingeben</value></data>
|
||||||
<data name="ReceiverLogin_Description" xml:space="preserve"><value>Bitte geben Sie den Zugangscode ein, den Sie per E-Mail erhalten haben, um das Dokument sicher zu öffnen.</value></data>
|
<data name="ReceiverLogin_Description" xml:space="preserve"><value>Bitte geben Sie den Zugangscode ein, den Sie per E-Mail erhalten haben, um das Dokument sicher zu öffnen.</value></data>
|
||||||
<data name="ReceiverLogin_FooterHelp" xml:space="preserve"><value>Bei Problemen wenden Sie sich bitte an den Absender des Dokuments.</value></data>
|
<data name="ReceiverLogin_FooterHelp" xml:space="preserve"><value>Bei Problemen wenden Sie sich bitte an den Absender des Dokuments.</value></data>
|
||||||
|
<data name="ReceiverLogin_InfoTitle" xml:space="preserve"><value>Sicherheit ist uns wichtig.</value></data>
|
||||||
|
<data name="ReceiverLogin_InfoStep1" xml:space="preserve"><value>Direkt nachdem Sie den Link zum Unterzeichnen geöffnet haben, haben wir Ihnen eine zweite E-Mail gesendet.</value></data>
|
||||||
|
<data name="ReceiverLogin_InfoStep2" xml:space="preserve"><value>Darin finden Sie den Zugangscode, den Sie hier eingeben müssen.</value></data>
|
||||||
<data name="ReceiverLogin_InvalidCode_Body" xml:space="preserve"><value>Der eingegebene Code ist falsch. Bitte versuchen Sie es erneut.</value></data>
|
<data name="ReceiverLogin_InvalidCode_Body" xml:space="preserve"><value>Der eingegebene Code ist falsch. Bitte versuchen Sie es erneut.</value></data>
|
||||||
<data name="ReceiverLogin_InvalidCode_Title" xml:space="preserve"><value>Ungültiger Zugangscode.</value></data>
|
<data name="ReceiverLogin_InvalidCode_Title" xml:space="preserve"><value>Ungültiger Zugangscode.</value></data>
|
||||||
<data name="ReceiverLogin_NotFound_Body" xml:space="preserve"><value>Der angegebene Zugangscode konnte keinem Dokument zugeordnet werden. Bitte prüfen Sie den Link in Ihrer E-Mail.</value></data>
|
<data name="ReceiverLogin_NotFound_Body" xml:space="preserve"><value>Der angegebene Zugangscode konnte keinem Dokument zugeordnet werden. Bitte prüfen Sie den Link in Ihrer E-Mail.</value></data>
|
||||||
<data name="ReceiverLogin_NotFound_Title" xml:space="preserve"><value>Dokument nicht gefunden.</value></data>
|
<data name="ReceiverLogin_NotFound_Title" xml:space="preserve"><value>Dokument nicht gefunden.</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendAction" xml:space="preserve"><value>Code erneut senden</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendError" xml:space="preserve"><value>Der Zugangscode konnte nicht erneut gesendet werden. Bitte versuchen Sie es später erneut.</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendInProgress" xml:space="preserve"><value>Code wird gesendet ...</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendPrompt" xml:space="preserve"><value>Zugangscode nicht bekommen?</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendRateLimit" xml:space="preserve"><value>Sie haben soeben einen Code angefordert. Bitte warten Sie kurz und versuchen Sie es erneut.</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendSuccess" xml:space="preserve"><value>Wir haben Ihnen soeben einen neuen Zugangscode per E-Mail gesendet.</value></data>
|
||||||
<data name="ReceiverLogin_Subtitle" xml:space="preserve"><value>Sicherer Zugang mit Zugangscode</value></data>
|
<data name="ReceiverLogin_Subtitle" xml:space="preserve"><value>Sicherer Zugang mit Zugangscode</value></data>
|
||||||
<data name="ReceiverSigned_ConfirmBody" xml:space="preserve"><value>Diese Aktion kann nicht rückgängig gemacht werden. Mit der Bestätigung erklären Sie, das oben angezeigte Dokument elektronisch unterzeichnet zu haben. Das unterzeichnete Dokument wird anschließend an alle beteiligten Parteien übermittelt.</value></data>
|
<data name="ReceiverSigned_ConfirmBody" xml:space="preserve"><value>Diese Aktion kann nicht rückgängig gemacht werden. Mit der Bestätigung erklären Sie, das oben angezeigte Dokument elektronisch unterzeichnet zu haben. Das unterzeichnete Dokument wird anschließend an alle beteiligten Parteien übermittelt.</value></data>
|
||||||
<data name="ReceiverSigned_ConfirmQuestion" xml:space="preserve"><value>Möchten Sie das Dokument verbindlich unterschreiben?</value></data>
|
<data name="ReceiverSigned_ConfirmQuestion" xml:space="preserve"><value>Möchten Sie das Dokument verbindlich unterschreiben?</value></data>
|
||||||
@@ -749,7 +758,14 @@
|
|||||||
<data name="SenderEditor_PageLabel" xml:space="preserve"><value>Seite</value></data>
|
<data name="SenderEditor_PageLabel" xml:space="preserve"><value>Seite</value></data>
|
||||||
<data name="SenderEditor_PlaceSignatureField" xml:space="preserve"><value>Signaturfeld platzieren</value></data>
|
<data name="SenderEditor_PlaceSignatureField" xml:space="preserve"><value>Signaturfeld platzieren</value></data>
|
||||||
<data name="SenderEditor_RemoveAllSignatureFields" xml:space="preserve"><value>Alle Signaturfelder entfernen</value></data>
|
<data name="SenderEditor_RemoveAllSignatureFields" xml:space="preserve"><value>Alle Signaturfelder entfernen</value></data>
|
||||||
|
<data name="SenderEditor_RemoveAllSignatureFieldsConfirm" xml:space="preserve"><value>Diese Aktion entfernt alle platzierten Signaturfelder unwiderruflich. Fortfahren?</value></data>
|
||||||
<data name="SenderEditor_SelectPdf" xml:space="preserve"><value>Bitte wählen Sie eine PDF-Datei aus.</value></data>
|
<data name="SenderEditor_SelectPdf" xml:space="preserve"><value>Bitte wählen Sie eine PDF-Datei aus.</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_Message" xml:space="preserve"><value>Wollen Sie den Umschlag jetzt versenden? Hinweis: Nach der Übergabe kann der Vorgang nicht mehr bearbeitet werden.</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_Title" xml:space="preserve"><value>Umschlag jetzt versenden?</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_Note" xml:space="preserve"><value>Bitte prüfen Sie Empfänger, Signaturfelder und Einstellungen vor dem Versenden.</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_Action" xml:space="preserve"><value>Jetzt versenden</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_InProgress" xml:space="preserve"><value>Umschlag wird versendet...</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_InProgressHint" xml:space="preserve"><value>Bitte warten Sie einen Moment. Der Vorgang wird abgeschlossen.</value></data>
|
||||||
<data name="SenderEditor_Sent_Body" xml:space="preserve"><value>Der bestehende Entwurf wurde versendet.</value></data>
|
<data name="SenderEditor_Sent_Body" xml:space="preserve"><value>Der bestehende Entwurf wurde versendet.</value></data>
|
||||||
<data name="SenderEditor_Sent_Header" xml:space="preserve"><value>Umschlag gesendet</value></data>
|
<data name="SenderEditor_Sent_Header" xml:space="preserve"><value>Umschlag gesendet</value></data>
|
||||||
<data name="SenderEditor_Sent_Title" xml:space="preserve"><value>Umschlag wurde erfolgreich gesendet.</value></data>
|
<data name="SenderEditor_Sent_Title" xml:space="preserve"><value>Umschlag wurde erfolgreich gesendet.</value></data>
|
||||||
@@ -765,18 +781,27 @@
|
|||||||
<data name="SenderEditor_Validation_SignatureFieldRequired" xml:space="preserve"><value>Bitte platzieren Sie mindestens ein Signaturfeld.</value></data>
|
<data name="SenderEditor_Validation_SignatureFieldRequired" xml:space="preserve"><value>Bitte platzieren Sie mindestens ein Signaturfeld.</value></data>
|
||||||
<data name="SenderEditor_Validation_TitleRequired" xml:space="preserve"><value>Bitte geben Sie einen Titel ein.</value></data>
|
<data name="SenderEditor_Validation_TitleRequired" xml:space="preserve"><value>Bitte geben Sie einen Titel ein.</value></data>
|
||||||
<data name="SenderEditor_Validation_UploadPdf" xml:space="preserve"><value>Bitte laden Sie zuerst ein PDF-Dokument hoch.</value></data>
|
<data name="SenderEditor_Validation_UploadPdf" xml:space="preserve"><value>Bitte laden Sie zuerst ein PDF-Dokument hoch.</value></data>
|
||||||
<data name="SenderLogin_Description" xml:space="preserve"><value>Bitte melden Sie sich mit Ihren Zugangsdaten an, um auf das Sender-Dashboard zuzugreifen.</value></data>
|
<data name="SenderLogin_BackToHome" xml:space="preserve"><value>← Zurück zur Startseite</value></data>
|
||||||
|
<data name="SenderLogin_Description" xml:space="preserve"><value>Melden Sie sich mit denselben Zugangsdaten an wie an Ihrem Arbeitsplatz-PC.</value></data>
|
||||||
<data name="SenderLogin_FooterHelp" xml:space="preserve"><value>Bei Problemen wenden Sie sich bitte an den Administrator.</value></data>
|
<data name="SenderLogin_FooterHelp" xml:space="preserve"><value>Bei Problemen wenden Sie sich bitte an den Administrator.</value></data>
|
||||||
<data name="SenderLogin_InvalidCredentials_Body" xml:space="preserve"><value>Benutzername oder Passwort ist falsch. Bitte versuchen Sie es erneut.</value></data>
|
<data name="SenderLogin_InvalidCredentials_Body" xml:space="preserve"><value>Benutzername oder Passwort ist falsch. Bitte versuchen Sie es erneut.</value></data>
|
||||||
<data name="SenderLogin_InvalidCredentials_Title" xml:space="preserve"><value>Ungültige Anmeldedaten.</value></data>
|
<data name="SenderLogin_InvalidCredentials_Title" xml:space="preserve"><value>Ungültige Anmeldedaten.</value></data>
|
||||||
<data name="SenderLogin_Password_Placeholder" xml:space="preserve"><value>Passwort eingeben</value></data>
|
<data name="SenderLogin_Password_Placeholder" xml:space="preserve"><value>Passwort eingeben</value></data>
|
||||||
<data name="SenderLogin_Subtitle" xml:space="preserve"><value>Sicherer Zugang zum Sender-Dashboard</value></data>
|
<data name="SenderLogin_RequiredFields_Body" xml:space="preserve"><value>Bitte Benutzername und Passwort eingeben.</value></data>
|
||||||
<data name="SenderLogin_Title" xml:space="preserve"><value>Sender Anmeldung</value></data>
|
<data name="SenderLogin_RequiredFields_Title" xml:space="preserve"><value>Pflichtfelder fehlen.</value></data>
|
||||||
|
<data name="SenderLogin_Subtitle" xml:space="preserve"><value>Dokumente zur Unterschrift vorbereiten und versenden</value></data>
|
||||||
|
<data name="SenderLogin_Title" xml:space="preserve"><value>Anmeldung</value></data>
|
||||||
|
<data name="SenderLogin_Username_Label" xml:space="preserve"><value>Benutzername, z. B. m.mustermann</value></data>
|
||||||
|
<data name="SenderLogin_Username_Placeholder" xml:space="preserve"><value>z. B. m.mustermann</value></data>
|
||||||
<data name="SenderLogin_Username_Placeholder" xml:space="preserve"><value>Benutzername eingeben</value></data>
|
<data name="SenderLogin_Username_Placeholder" xml:space="preserve"><value>Benutzername eingeben</value></data>
|
||||||
<data name="ServerError" xml:space="preserve"><value>Serverfehler.</value></data>
|
<data name="ServerError" xml:space="preserve"><value>Serverfehler.</value></data>
|
||||||
<data name="Signed" xml:space="preserve"><value>Unterschrieben</value></data>
|
<data name="Signed" xml:space="preserve"><value>Unterschrieben</value></data>
|
||||||
<data name="SignedDocument" xml:space="preserve"><value>Signiertes Dokument</value></data>
|
<data name="SignedDocument" xml:space="preserve"><value>Signiertes Dokument</value></data>
|
||||||
<data name="System" xml:space="preserve"><value>System</value></data>
|
<data name="System" xml:space="preserve"><value>System</value></data>
|
||||||
|
<data name="SenderWizard_Step_Start" xml:space="preserve"><value>Start</value></data>
|
||||||
|
<data name="SenderWizard_DocumentUploadSimpleHint" xml:space="preserve"><value>Dokument hinzufuegen: klicken oder per Drag-and-Drop ablegen</value></data>
|
||||||
|
<data name="SenderWizard_DocumentReplaceHint" xml:space="preserve"><value>Zum Ersetzen klicken oder eine Datei auf diese Flaeche ziehen.</value></data>
|
||||||
|
<data name="SenderWizard_FinalUploadHint" xml:space="preserve"><value>Letzte Moeglichkeit im Wizard: Bitte laden Sie jetzt Ihr PDF ueber den rechten Upload-Bereich hoch. Im Editor koennen Sie spaeter ebenfalls ein Dokument hochladen oder ersetzen.</value></data>
|
||||||
<data name="UnexpectedErrorTryAgainLater" xml:space="preserve"><value>Ein unerwarteter Fehler ist aufgetreten. Bitte versuchen Sie es später erneut.</value></data>
|
<data name="UnexpectedErrorTryAgainLater" xml:space="preserve"><value>Ein unerwarteter Fehler ist aufgetreten. Bitte versuchen Sie es später erneut.</value></data>
|
||||||
<data name="UploadPdf" xml:space="preserve"><value>PDF hochladen</value></data>
|
<data name="UploadPdf" xml:space="preserve"><value>PDF hochladen</value></data>
|
||||||
<data name="UserName" xml:space="preserve"><value>Benutzername</value></data>
|
<data name="UserName" xml:space="preserve"><value>Benutzername</value></data>
|
||||||
|
|||||||
@@ -622,10 +622,10 @@
|
|||||||
<value>Certification Type</value>
|
<value>Certification Type</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="FinalEmailToCreator" xml:space="preserve">
|
<data name="FinalEmailToCreator" xml:space="preserve">
|
||||||
<value>Final Email to Creator</value>
|
<value>Completed Document to Creator</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="FinalEmailToReceivers" xml:space="preserve">
|
<data name="FinalEmailToReceivers" xml:space="preserve">
|
||||||
<value>Final Email to Receivers</value>
|
<value>Completed Document to Receivers</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="SendReminderEmails" xml:space="preserve">
|
<data name="SendReminderEmails" xml:space="preserve">
|
||||||
<value>Send Reminder Emails</value>
|
<value>Send Reminder Emails</value>
|
||||||
@@ -703,10 +703,19 @@
|
|||||||
<data name="ReceiverLogin_AccessCode_Placeholder" xml:space="preserve"><value>Enter access code</value></data>
|
<data name="ReceiverLogin_AccessCode_Placeholder" xml:space="preserve"><value>Enter access code</value></data>
|
||||||
<data name="ReceiverLogin_Description" xml:space="preserve"><value>Please enter the access code you received by email to securely open the document.</value></data>
|
<data name="ReceiverLogin_Description" xml:space="preserve"><value>Please enter the access code you received by email to securely open the document.</value></data>
|
||||||
<data name="ReceiverLogin_FooterHelp" xml:space="preserve"><value>If you have issues, please contact the document sender.</value></data>
|
<data name="ReceiverLogin_FooterHelp" xml:space="preserve"><value>If you have issues, please contact the document sender.</value></data>
|
||||||
|
<data name="ReceiverLogin_InfoTitle" xml:space="preserve"><value>Your security matters to us.</value></data>
|
||||||
|
<data name="ReceiverLogin_InfoStep1" xml:space="preserve"><value>Right after you opened the signing link, we sent you a second email.</value></data>
|
||||||
|
<data name="ReceiverLogin_InfoStep2" xml:space="preserve"><value>That email contains the access code you need to enter here.</value></data>
|
||||||
<data name="ReceiverLogin_InvalidCode_Body" xml:space="preserve"><value>The entered code is incorrect. Please try again.</value></data>
|
<data name="ReceiverLogin_InvalidCode_Body" xml:space="preserve"><value>The entered code is incorrect. Please try again.</value></data>
|
||||||
<data name="ReceiverLogin_InvalidCode_Title" xml:space="preserve"><value>Invalid access code.</value></data>
|
<data name="ReceiverLogin_InvalidCode_Title" xml:space="preserve"><value>Invalid access code.</value></data>
|
||||||
<data name="ReceiverLogin_NotFound_Body" xml:space="preserve"><value>The provided access code could not be matched to a document. Please verify the link in your email.</value></data>
|
<data name="ReceiverLogin_NotFound_Body" xml:space="preserve"><value>The provided access code could not be matched to a document. Please verify the link in your email.</value></data>
|
||||||
<data name="ReceiverLogin_NotFound_Title" xml:space="preserve"><value>Document not found.</value></data>
|
<data name="ReceiverLogin_NotFound_Title" xml:space="preserve"><value>Document not found.</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendAction" xml:space="preserve"><value>Resend code</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendError" xml:space="preserve"><value>The access code could not be resent. Please try again later.</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendInProgress" xml:space="preserve"><value>Sending code ...</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendPrompt" xml:space="preserve"><value>Did not receive the access code?</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendRateLimit" xml:space="preserve"><value>You just requested a code. Please wait a moment and try again.</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendSuccess" xml:space="preserve"><value>We just sent you a new access code by email.</value></data>
|
||||||
<data name="ReceiverLogin_Subtitle" xml:space="preserve"><value>Secure access with access code</value></data>
|
<data name="ReceiverLogin_Subtitle" xml:space="preserve"><value>Secure access with access code</value></data>
|
||||||
<data name="ReceiverSigned_ConfirmBody" xml:space="preserve"><value>This action cannot be undone. By confirming, you declare that you have electronically signed the document shown above. The signed document will then be delivered to all involved parties.</value></data>
|
<data name="ReceiverSigned_ConfirmBody" xml:space="preserve"><value>This action cannot be undone. By confirming, you declare that you have electronically signed the document shown above. The signed document will then be delivered to all involved parties.</value></data>
|
||||||
<data name="ReceiverSigned_ConfirmQuestion" xml:space="preserve"><value>Do you want to sign this document as binding?</value></data>
|
<data name="ReceiverSigned_ConfirmQuestion" xml:space="preserve"><value>Do you want to sign this document as binding?</value></data>
|
||||||
@@ -749,7 +758,14 @@
|
|||||||
<data name="SenderEditor_PageLabel" xml:space="preserve"><value>Page</value></data>
|
<data name="SenderEditor_PageLabel" xml:space="preserve"><value>Page</value></data>
|
||||||
<data name="SenderEditor_PlaceSignatureField" xml:space="preserve"><value>Place signature field</value></data>
|
<data name="SenderEditor_PlaceSignatureField" xml:space="preserve"><value>Place signature field</value></data>
|
||||||
<data name="SenderEditor_RemoveAllSignatureFields" xml:space="preserve"><value>Remove all signature fields</value></data>
|
<data name="SenderEditor_RemoveAllSignatureFields" xml:space="preserve"><value>Remove all signature fields</value></data>
|
||||||
|
<data name="SenderEditor_RemoveAllSignatureFieldsConfirm" xml:space="preserve"><value>This action will permanently remove all placed signature fields. Continue?</value></data>
|
||||||
<data name="SenderEditor_SelectPdf" xml:space="preserve"><value>Please select a PDF file.</value></data>
|
<data name="SenderEditor_SelectPdf" xml:space="preserve"><value>Please select a PDF file.</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_Message" xml:space="preserve"><value>Do you want to send the envelope now? Note: After handover, the process can no longer be edited.</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_Title" xml:space="preserve"><value>Send envelope now?</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_Note" xml:space="preserve"><value>Please review recipients, signature fields, and settings before sending.</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_Action" xml:space="preserve"><value>Send now</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_InProgress" xml:space="preserve"><value>Sending envelope...</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_InProgressHint" xml:space="preserve"><value>Please wait a moment while we complete the process.</value></data>
|
||||||
<data name="SenderEditor_Sent_Body" xml:space="preserve"><value>The existing draft has been sent.</value></data>
|
<data name="SenderEditor_Sent_Body" xml:space="preserve"><value>The existing draft has been sent.</value></data>
|
||||||
<data name="SenderEditor_Sent_Header" xml:space="preserve"><value>Envelope sent</value></data>
|
<data name="SenderEditor_Sent_Header" xml:space="preserve"><value>Envelope sent</value></data>
|
||||||
<data name="SenderEditor_Sent_Title" xml:space="preserve"><value>Envelope was sent successfully.</value></data>
|
<data name="SenderEditor_Sent_Title" xml:space="preserve"><value>Envelope was sent successfully.</value></data>
|
||||||
@@ -765,18 +781,27 @@
|
|||||||
<data name="SenderEditor_Validation_SignatureFieldRequired" xml:space="preserve"><value>Please place at least one signature field.</value></data>
|
<data name="SenderEditor_Validation_SignatureFieldRequired" xml:space="preserve"><value>Please place at least one signature field.</value></data>
|
||||||
<data name="SenderEditor_Validation_TitleRequired" xml:space="preserve"><value>Please enter a title.</value></data>
|
<data name="SenderEditor_Validation_TitleRequired" xml:space="preserve"><value>Please enter a title.</value></data>
|
||||||
<data name="SenderEditor_Validation_UploadPdf" xml:space="preserve"><value>Please upload a PDF document first.</value></data>
|
<data name="SenderEditor_Validation_UploadPdf" xml:space="preserve"><value>Please upload a PDF document first.</value></data>
|
||||||
<data name="SenderLogin_Description" xml:space="preserve"><value>Please sign in with your credentials to access the sender dashboard.</value></data>
|
<data name="SenderLogin_BackToHome" xml:space="preserve"><value>← Back to home page</value></data>
|
||||||
|
<data name="SenderLogin_Description" xml:space="preserve"><value>Sign in with the same credentials you use on your workplace PC.</value></data>
|
||||||
<data name="SenderLogin_FooterHelp" xml:space="preserve"><value>If you have issues, please contact the administrator.</value></data>
|
<data name="SenderLogin_FooterHelp" xml:space="preserve"><value>If you have issues, please contact the administrator.</value></data>
|
||||||
<data name="SenderLogin_InvalidCredentials_Body" xml:space="preserve"><value>Username or password is incorrect. Please try again.</value></data>
|
<data name="SenderLogin_InvalidCredentials_Body" xml:space="preserve"><value>Username or password is incorrect. Please try again.</value></data>
|
||||||
<data name="SenderLogin_InvalidCredentials_Title" xml:space="preserve"><value>Invalid credentials.</value></data>
|
<data name="SenderLogin_InvalidCredentials_Title" xml:space="preserve"><value>Invalid credentials.</value></data>
|
||||||
<data name="SenderLogin_Password_Placeholder" xml:space="preserve"><value>Enter password</value></data>
|
<data name="SenderLogin_Password_Placeholder" xml:space="preserve"><value>Enter password</value></data>
|
||||||
<data name="SenderLogin_Subtitle" xml:space="preserve"><value>Secure access to sender dashboard</value></data>
|
<data name="SenderLogin_RequiredFields_Body" xml:space="preserve"><value>Please enter username and password.</value></data>
|
||||||
<data name="SenderLogin_Title" xml:space="preserve"><value>Sender login</value></data>
|
<data name="SenderLogin_RequiredFields_Title" xml:space="preserve"><value>Required fields are missing.</value></data>
|
||||||
|
<data name="SenderLogin_Subtitle" xml:space="preserve"><value>Prepare and send documents for signature</value></data>
|
||||||
|
<data name="SenderLogin_Title" xml:space="preserve"><value>Sign in</value></data>
|
||||||
|
<data name="SenderLogin_Username_Label" xml:space="preserve"><value>Username, e.g. m.mustermann</value></data>
|
||||||
|
<data name="SenderLogin_Username_Placeholder" xml:space="preserve"><value>e.g. m.mustermann</value></data>
|
||||||
<data name="SenderLogin_Username_Placeholder" xml:space="preserve"><value>Enter username</value></data>
|
<data name="SenderLogin_Username_Placeholder" xml:space="preserve"><value>Enter username</value></data>
|
||||||
<data name="ServerError" xml:space="preserve"><value>Server error.</value></data>
|
<data name="ServerError" xml:space="preserve"><value>Server error.</value></data>
|
||||||
<data name="Signed" xml:space="preserve"><value>Signed</value></data>
|
<data name="Signed" xml:space="preserve"><value>Signed</value></data>
|
||||||
<data name="SignedDocument" xml:space="preserve"><value>Signed document</value></data>
|
<data name="SignedDocument" xml:space="preserve"><value>Signed document</value></data>
|
||||||
<data name="System" xml:space="preserve"><value>System</value></data>
|
<data name="System" xml:space="preserve"><value>System</value></data>
|
||||||
|
<data name="SenderWizard_Step_Start" xml:space="preserve"><value>Start</value></data>
|
||||||
|
<data name="SenderWizard_DocumentUploadSimpleHint" xml:space="preserve"><value>Add document: click or drag and drop</value></data>
|
||||||
|
<data name="SenderWizard_DocumentReplaceHint" xml:space="preserve"><value>Click to replace or drag a file onto this area.</value></data>
|
||||||
|
<data name="SenderWizard_FinalUploadHint" xml:space="preserve"><value>Last chance in the wizard: please upload your PDF now using the upload area on the right. In the editor, you can still upload or replace a document later.</value></data>
|
||||||
<data name="UnexpectedErrorTryAgainLater" xml:space="preserve"><value>An unexpected error occurred. Please try again later.</value></data>
|
<data name="UnexpectedErrorTryAgainLater" xml:space="preserve"><value>An unexpected error occurred. Please try again later.</value></data>
|
||||||
<data name="UploadPdf" xml:space="preserve"><value>Upload PDF</value></data>
|
<data name="UploadPdf" xml:space="preserve"><value>Upload PDF</value></data>
|
||||||
<data name="UserName" xml:space="preserve"><value>Username</value></data>
|
<data name="UserName" xml:space="preserve"><value>Username</value></data>
|
||||||
|
|||||||
@@ -622,10 +622,10 @@
|
|||||||
<value>Type de certification</value>
|
<value>Type de certification</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="FinalEmailToCreator" xml:space="preserve">
|
<data name="FinalEmailToCreator" xml:space="preserve">
|
||||||
<value>E-mail final au créateur</value>
|
<value>Document terminé au créateur</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="FinalEmailToReceivers" xml:space="preserve">
|
<data name="FinalEmailToReceivers" xml:space="preserve">
|
||||||
<value>E-mail final aux destinataires</value>
|
<value>Document terminé aux destinataires</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="SendReminderEmails" xml:space="preserve">
|
<data name="SendReminderEmails" xml:space="preserve">
|
||||||
<value>Envoyer des e-mails de rappel</value>
|
<value>Envoyer des e-mails de rappel</value>
|
||||||
@@ -703,10 +703,19 @@
|
|||||||
<data name="ReceiverLogin_AccessCode_Placeholder" xml:space="preserve"><value>Saisir le code d'accès</value></data>
|
<data name="ReceiverLogin_AccessCode_Placeholder" xml:space="preserve"><value>Saisir le code d'accès</value></data>
|
||||||
<data name="ReceiverLogin_Description" xml:space="preserve"><value>Veuillez saisir le code d'accès reçu par e-mail pour ouvrir le document en toute sécurité.</value></data>
|
<data name="ReceiverLogin_Description" xml:space="preserve"><value>Veuillez saisir le code d'accès reçu par e-mail pour ouvrir le document en toute sécurité.</value></data>
|
||||||
<data name="ReceiverLogin_FooterHelp" xml:space="preserve"><value>En cas de problème, veuillez contacter l'expéditeur du document.</value></data>
|
<data name="ReceiverLogin_FooterHelp" xml:space="preserve"><value>En cas de problème, veuillez contacter l'expéditeur du document.</value></data>
|
||||||
|
<data name="ReceiverLogin_InfoTitle" xml:space="preserve"><value>Votre sécurité est importante pour nous.</value></data>
|
||||||
|
<data name="ReceiverLogin_InfoStep1" xml:space="preserve"><value>Juste après avoir ouvert le lien de signature, nous vous avons envoyé un second e-mail.</value></data>
|
||||||
|
<data name="ReceiverLogin_InfoStep2" xml:space="preserve"><value>Cet e-mail contient le code d'accès que vous devez saisir ici.</value></data>
|
||||||
<data name="ReceiverLogin_InvalidCode_Body" xml:space="preserve"><value>Le code saisi est incorrect. Veuillez réessayer.</value></data>
|
<data name="ReceiverLogin_InvalidCode_Body" xml:space="preserve"><value>Le code saisi est incorrect. Veuillez réessayer.</value></data>
|
||||||
<data name="ReceiverLogin_InvalidCode_Title" xml:space="preserve"><value>Code d'accès invalide.</value></data>
|
<data name="ReceiverLogin_InvalidCode_Title" xml:space="preserve"><value>Code d'accès invalide.</value></data>
|
||||||
<data name="ReceiverLogin_NotFound_Body" xml:space="preserve"><value>Le code d'accès indiqué ne correspond à aucun document. Veuillez vérifier le lien dans votre e-mail.</value></data>
|
<data name="ReceiverLogin_NotFound_Body" xml:space="preserve"><value>Le code d'accès indiqué ne correspond à aucun document. Veuillez vérifier le lien dans votre e-mail.</value></data>
|
||||||
<data name="ReceiverLogin_NotFound_Title" xml:space="preserve"><value>Document introuvable.</value></data>
|
<data name="ReceiverLogin_NotFound_Title" xml:space="preserve"><value>Document introuvable.</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendAction" xml:space="preserve"><value>Renvoyer le code</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendError" xml:space="preserve"><value>Le code d'accès n'a pas pu être renvoyé. Veuillez réessayer plus tard.</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendInProgress" xml:space="preserve"><value>Envoi du code ...</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendPrompt" xml:space="preserve"><value>Vous n'avez pas reçu le code d'accès ?</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendRateLimit" xml:space="preserve"><value>Vous venez de demander un code. Veuillez patienter un instant puis réessayer.</value></data>
|
||||||
|
<data name="ReceiverLogin_ResendSuccess" xml:space="preserve"><value>Nous venons de vous envoyer un nouveau code d'accès par e-mail.</value></data>
|
||||||
<data name="ReceiverLogin_Subtitle" xml:space="preserve"><value>Accès sécurisé avec code d'accès</value></data>
|
<data name="ReceiverLogin_Subtitle" xml:space="preserve"><value>Accès sécurisé avec code d'accès</value></data>
|
||||||
<data name="ReceiverSigned_ConfirmBody" xml:space="preserve"><value>Cette action est irréversible. En confirmant, vous déclarez avoir signé électroniquement le document affiché ci-dessus. Le document signé sera ensuite transmis à toutes les parties concernées.</value></data>
|
<data name="ReceiverSigned_ConfirmBody" xml:space="preserve"><value>Cette action est irréversible. En confirmant, vous déclarez avoir signé électroniquement le document affiché ci-dessus. Le document signé sera ensuite transmis à toutes les parties concernées.</value></data>
|
||||||
<data name="ReceiverSigned_ConfirmQuestion" xml:space="preserve"><value>Voulez-vous signer ce document de manière contraignante ?</value></data>
|
<data name="ReceiverSigned_ConfirmQuestion" xml:space="preserve"><value>Voulez-vous signer ce document de manière contraignante ?</value></data>
|
||||||
@@ -749,7 +758,14 @@
|
|||||||
<data name="SenderEditor_PageLabel" xml:space="preserve"><value>Page</value></data>
|
<data name="SenderEditor_PageLabel" xml:space="preserve"><value>Page</value></data>
|
||||||
<data name="SenderEditor_PlaceSignatureField" xml:space="preserve"><value>Placer un champ de signature</value></data>
|
<data name="SenderEditor_PlaceSignatureField" xml:space="preserve"><value>Placer un champ de signature</value></data>
|
||||||
<data name="SenderEditor_RemoveAllSignatureFields" xml:space="preserve"><value>Supprimer tous les champs de signature</value></data>
|
<data name="SenderEditor_RemoveAllSignatureFields" xml:space="preserve"><value>Supprimer tous les champs de signature</value></data>
|
||||||
|
<data name="SenderEditor_RemoveAllSignatureFieldsConfirm" xml:space="preserve"><value>Cette action supprimera définitivement tous les champs de signature placés. Continuer?</value></data>
|
||||||
<data name="SenderEditor_SelectPdf" xml:space="preserve"><value>Veuillez sélectionner un fichier PDF.</value></data>
|
<data name="SenderEditor_SelectPdf" xml:space="preserve"><value>Veuillez sélectionner un fichier PDF.</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_Message" xml:space="preserve"><value>Voulez-vous envoyer l'enveloppe maintenant ? Remarque : après la transmission, le processus ne peut plus être modifié.</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_Title" xml:space="preserve"><value>Envoyer l'enveloppe maintenant ?</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_Note" xml:space="preserve"><value>Veuillez vérifier les destinataires, les champs de signature et les paramètres avant l'envoi.</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_Action" xml:space="preserve"><value>Envoyer maintenant</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_InProgress" xml:space="preserve"><value>Envoi de l'enveloppe...</value></data>
|
||||||
|
<data name="SenderEditor_SendConfirm_InProgressHint" xml:space="preserve"><value>Veuillez patienter un instant pendant la finalisation du traitement.</value></data>
|
||||||
<data name="SenderEditor_Sent_Body" xml:space="preserve"><value>Le brouillon existant a été envoyé.</value></data>
|
<data name="SenderEditor_Sent_Body" xml:space="preserve"><value>Le brouillon existant a été envoyé.</value></data>
|
||||||
<data name="SenderEditor_Sent_Header" xml:space="preserve"><value>Enveloppe envoyée</value></data>
|
<data name="SenderEditor_Sent_Header" xml:space="preserve"><value>Enveloppe envoyée</value></data>
|
||||||
<data name="SenderEditor_Sent_Title" xml:space="preserve"><value>L'enveloppe a été envoyée avec succès.</value></data>
|
<data name="SenderEditor_Sent_Title" xml:space="preserve"><value>L'enveloppe a été envoyée avec succès.</value></data>
|
||||||
@@ -765,18 +781,27 @@
|
|||||||
<data name="SenderEditor_Validation_SignatureFieldRequired" xml:space="preserve"><value>Veuillez placer au moins un champ de signature.</value></data>
|
<data name="SenderEditor_Validation_SignatureFieldRequired" xml:space="preserve"><value>Veuillez placer au moins un champ de signature.</value></data>
|
||||||
<data name="SenderEditor_Validation_TitleRequired" xml:space="preserve"><value>Veuillez saisir un titre.</value></data>
|
<data name="SenderEditor_Validation_TitleRequired" xml:space="preserve"><value>Veuillez saisir un titre.</value></data>
|
||||||
<data name="SenderEditor_Validation_UploadPdf" xml:space="preserve"><value>Veuillez d'abord téléverser un document PDF.</value></data>
|
<data name="SenderEditor_Validation_UploadPdf" xml:space="preserve"><value>Veuillez d'abord téléverser un document PDF.</value></data>
|
||||||
<data name="SenderLogin_Description" xml:space="preserve"><value>Veuillez vous connecter avec vos identifiants pour accéder au tableau de bord expéditeur.</value></data>
|
<data name="SenderLogin_BackToHome" xml:space="preserve"><value>← Retour à la page d'accueil</value></data>
|
||||||
|
<data name="SenderLogin_Description" xml:space="preserve"><value>Connectez-vous avec les mêmes identifiants que sur votre PC professionnel.</value></data>
|
||||||
<data name="SenderLogin_FooterHelp" xml:space="preserve"><value>En cas de problème, veuillez contacter l'administrateur.</value></data>
|
<data name="SenderLogin_FooterHelp" xml:space="preserve"><value>En cas de problème, veuillez contacter l'administrateur.</value></data>
|
||||||
<data name="SenderLogin_InvalidCredentials_Body" xml:space="preserve"><value>Le nom d'utilisateur ou le mot de passe est incorrect. Veuillez réessayer.</value></data>
|
<data name="SenderLogin_InvalidCredentials_Body" xml:space="preserve"><value>Le nom d'utilisateur ou le mot de passe est incorrect. Veuillez réessayer.</value></data>
|
||||||
<data name="SenderLogin_InvalidCredentials_Title" xml:space="preserve"><value>Identifiants invalides.</value></data>
|
<data name="SenderLogin_InvalidCredentials_Title" xml:space="preserve"><value>Identifiants invalides.</value></data>
|
||||||
<data name="SenderLogin_Password_Placeholder" xml:space="preserve"><value>Saisir le mot de passe</value></data>
|
<data name="SenderLogin_Password_Placeholder" xml:space="preserve"><value>Saisir le mot de passe</value></data>
|
||||||
<data name="SenderLogin_Subtitle" xml:space="preserve"><value>Accès sécurisé au tableau de bord expéditeur</value></data>
|
<data name="SenderLogin_RequiredFields_Body" xml:space="preserve"><value>Veuillez saisir le nom d'utilisateur et le mot de passe.</value></data>
|
||||||
<data name="SenderLogin_Title" xml:space="preserve"><value>Connexion expéditeur</value></data>
|
<data name="SenderLogin_RequiredFields_Title" xml:space="preserve"><value>Champs obligatoires manquants.</value></data>
|
||||||
|
<data name="SenderLogin_Subtitle" xml:space="preserve"><value>Préparer et envoyer des documents à signer</value></data>
|
||||||
|
<data name="SenderLogin_Title" xml:space="preserve"><value>Connexion</value></data>
|
||||||
|
<data name="SenderLogin_Username_Label" xml:space="preserve"><value>Nom d'utilisateur, p. ex. m.mustermann</value></data>
|
||||||
|
<data name="SenderLogin_Username_Placeholder" xml:space="preserve"><value>p. ex. m.mustermann</value></data>
|
||||||
<data name="SenderLogin_Username_Placeholder" xml:space="preserve"><value>Saisir le nom d'utilisateur</value></data>
|
<data name="SenderLogin_Username_Placeholder" xml:space="preserve"><value>Saisir le nom d'utilisateur</value></data>
|
||||||
<data name="ServerError" xml:space="preserve"><value>Erreur serveur.</value></data>
|
<data name="ServerError" xml:space="preserve"><value>Erreur serveur.</value></data>
|
||||||
<data name="Signed" xml:space="preserve"><value>Signé</value></data>
|
<data name="Signed" xml:space="preserve"><value>Signé</value></data>
|
||||||
<data name="SignedDocument" xml:space="preserve"><value>Document signé</value></data>
|
<data name="SignedDocument" xml:space="preserve"><value>Document signé</value></data>
|
||||||
<data name="System" xml:space="preserve"><value>Système</value></data>
|
<data name="System" xml:space="preserve"><value>Système</value></data>
|
||||||
|
<data name="SenderWizard_Step_Start" xml:space="preserve"><value>Démarrer</value></data>
|
||||||
|
<data name="SenderWizard_DocumentUploadSimpleHint" xml:space="preserve"><value>Ajouter un document : cliquer ou glisser-deposer</value></data>
|
||||||
|
<data name="SenderWizard_DocumentReplaceHint" xml:space="preserve"><value>Cliquez pour remplacer ou glissez un fichier sur cette zone.</value></data>
|
||||||
|
<data name="SenderWizard_FinalUploadHint" xml:space="preserve"><value>Derniere possibilite dans l'assistant : veuillez televerser votre PDF maintenant via la zone d'upload a droite. Dans l'editeur, vous pourrez encore televerser ou remplacer un document plus tard.</value></data>
|
||||||
<data name="UnexpectedErrorTryAgainLater" xml:space="preserve"><value>Une erreur inattendue s'est produite. Veuillez réessayer plus tard.</value></data>
|
<data name="UnexpectedErrorTryAgainLater" xml:space="preserve"><value>Une erreur inattendue s'est produite. Veuillez réessayer plus tard.</value></data>
|
||||||
<data name="UploadPdf" xml:space="preserve"><value>Téléverser un PDF</value></data>
|
<data name="UploadPdf" xml:space="preserve"><value>Téléverser un PDF</value></data>
|
||||||
<data name="UserName" xml:space="preserve"><value>Nom d'utilisateur</value></data>
|
<data name="UserName" xml:space="preserve"><value>Nom d'utilisateur</value></data>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ using DigitalData.Core.Abstraction.Application.DTO;
|
|||||||
using EnvelopeGenerator.Application.Common.Dto;
|
using EnvelopeGenerator.Application.Common.Dto;
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
|
using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Application.Services;
|
namespace EnvelopeGenerator.Application.Services;
|
||||||
|
|
||||||
@@ -14,7 +15,7 @@ namespace EnvelopeGenerator.Application.Services;
|
|||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Obsolete("Use MediatR")]
|
[Obsolete("Use MediatR")]
|
||||||
public class EnvelopeTypeService : BasicCRUDService<IEnvelopeTypeRepository, EnvelopeTypeDto, EnvelopeType, int>, IEnvelopeTypeService
|
public class EnvelopeTypeService : BasicCRUDService<IEnvelopeTypeRepository, EnvelopeTypeDefaultsDto, EnvelopeTypeDefaults, EnvelopeType>, IEnvelopeTypeService
|
||||||
{
|
{
|
||||||
private static readonly Guid CacheKey = Guid.NewGuid();
|
private static readonly Guid CacheKey = Guid.NewGuid();
|
||||||
|
|
||||||
@@ -36,8 +37,8 @@ public class EnvelopeTypeService : BasicCRUDService<IEnvelopeTypeRepository, Env
|
|||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public override async Task<DataResult<IEnumerable<EnvelopeTypeDto>>> ReadAllAsync()
|
public override async Task<DataResult<IEnumerable<EnvelopeTypeDefaultsDto>>> ReadAllAsync()
|
||||||
=> await _cache.GetOrCreateAsync(CacheKey, async entry => await base.ReadAllAsync())
|
=> await _cache.GetOrCreateAsync(CacheKey, async entry => await base.ReadAllAsync())
|
||||||
?? Result.Fail<IEnumerable<EnvelopeTypeDto>>().Notice(LogLevel.Error, Flag.NotFound, "No cached envelope types are available in the database. If you have added any envelope types after the server started, please restart the server.");
|
?? Result.Fail<IEnumerable<EnvelopeTypeDefaultsDto>>().Notice(LogLevel.Error, Flag.NotFound, "No cached envelope types are available in the database. If you have added any envelope types after the server started, please restart the server.");
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -72,7 +72,7 @@ Public Class EnvelopeModel
|
|||||||
|
|
||||||
oEnvelope.Documents = DocumentModel.List(oEnvelope.Id)
|
oEnvelope.Documents = DocumentModel.List(oEnvelope.Id)
|
||||||
oEnvelope.Histories = HistoryModel.List(oEnvelope.Id)
|
oEnvelope.Histories = HistoryModel.List(oEnvelope.Id)
|
||||||
oEnvelope.Type = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId)
|
oEnvelope.Defaults = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId)
|
||||||
|
|
||||||
Return oEnvelope
|
Return oEnvelope
|
||||||
End Function
|
End Function
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ Public Class EnvelopeTypeModel
|
|||||||
MyBase.New(pState)
|
MyBase.New(pState)
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Function ToEnvelopeType(pRow As DataRow) As EnvelopeType
|
Private Function ToEnvelopeType(pRow As DataRow) As EnvelopeTypeDefaults
|
||||||
Return New EnvelopeType() With {
|
Return New EnvelopeTypeDefaults() With {
|
||||||
.Id = pRow.ItemEx("GUID", 0),
|
.Id = pRow.ItemEx("GUID", 0),
|
||||||
.Title = pRow.ItemEx("TITLE", ""),
|
.Title = pRow.ItemEx("TITLE", ""),
|
||||||
.UseAccessCode = pRow.ItemEx("USE_ACCESS_CODE", False),
|
.UseAccessCode = pRow.ItemEx("USE_ACCESS_CODE", False),
|
||||||
@@ -27,7 +27,7 @@ Public Class EnvelopeTypeModel
|
|||||||
}
|
}
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
Public Function GetById(pEnvelopeTypeId As Integer) As EnvelopeType
|
Public Function GetById(pEnvelopeTypeId As Integer) As EnvelopeTypeDefaults
|
||||||
Dim oSql As String = $"SELECT * FROM TBSIG_ENVELOPE_TYPE WHERE GUID = {pEnvelopeTypeId}"
|
Dim oSql As String = $"SELECT * FROM TBSIG_ENVELOPE_TYPE WHERE GUID = {pEnvelopeTypeId}"
|
||||||
Dim oTable As DataTable = Database.GetDatatable(oSql)
|
Dim oTable As DataTable = Database.GetDatatable(oSql)
|
||||||
|
|
||||||
@@ -39,7 +39,7 @@ Public Class EnvelopeTypeModel
|
|||||||
Return ToEnvelopeType(oRow)
|
Return ToEnvelopeType(oRow)
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
Public Function List() As IEnumerable(Of EnvelopeType)
|
Public Function List() As IEnumerable(Of EnvelopeTypeDefaults)
|
||||||
Dim oSql As String = $"SELECT * FROM TBSIG_ENVELOPE_TYPE"
|
Dim oSql As String = $"SELECT * FROM TBSIG_ENVELOPE_TYPE"
|
||||||
Dim oTable As DataTable = Database.GetDatatable(oSql)
|
Dim oTable As DataTable = Database.GetDatatable(oSql)
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
namespace EnvelopeGenerator.Domain.Constants
|
#if NETFRAMEWORK
|
||||||
|
namespace EnvelopeGenerator.Domain.Constants
|
||||||
{
|
{
|
||||||
public enum CertificationType
|
public enum CertificationType
|
||||||
{
|
{
|
||||||
AdvancedElectronicSignature = 1
|
AdvancedElectronicSignature = 1,
|
||||||
// ElectronicSignature = 1
|
ElectronicSignature = 2
|
||||||
// QualifiedSignature = 2
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
namespace EnvelopeGenerator.Domain.Constants
|
#if NETFRAMEWORK
|
||||||
|
namespace EnvelopeGenerator.Domain.Constants
|
||||||
{
|
{
|
||||||
public enum ContractType
|
public enum ContractType
|
||||||
{
|
{
|
||||||
@@ -6,3 +7,4 @@
|
|||||||
ReadAndSign = 2
|
ReadAndSign = 2
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
@@ -67,7 +67,7 @@ namespace EnvelopeGenerator.Domain.Constants
|
|||||||
{
|
{
|
||||||
public static bool IsActive(this EnvelopeStatus status)
|
public static bool IsActive(this EnvelopeStatus status)
|
||||||
{
|
{
|
||||||
return status >= EnvelopeStatus.EnvelopeCreated && status < EnvelopeStatus.EnvelopePartlySigned;
|
return status >= EnvelopeStatus.EnvelopeCreated && status <= EnvelopeStatus.EnvelopePartlySigned;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool IsCompleted(this EnvelopeStatus status)
|
public static bool IsCompleted(this EnvelopeStatus status)
|
||||||
|
|||||||
40
EnvelopeGenerator.Domain/Constants/EnvelopeType.cs
Normal file
40
EnvelopeGenerator.Domain/Constants/EnvelopeType.cs
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
#if NETFRAMEWORK
|
||||||
|
using System;
|
||||||
|
using System.Linq;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
using EnvelopeGenerator.Domain.Exceptions;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Domain.Constants
|
||||||
|
{
|
||||||
|
public enum EnvelopeType
|
||||||
|
{
|
||||||
|
SimpleSignature = 1,
|
||||||
|
ReadAndConfirm = 2,
|
||||||
|
AdvancedSignature = 3
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class EnvelopeTypeExtensions
|
||||||
|
{
|
||||||
|
public static EnvelopeType ToEnvelopeType(this int envelopeTypeId)
|
||||||
|
{
|
||||||
|
if (!Enum.IsDefined(typeof(EnvelopeType), envelopeTypeId))
|
||||||
|
{
|
||||||
|
#if NETFRAMEWORK
|
||||||
|
var values = Enum.GetValues(typeof(EnvelopeType)).Cast<EnvelopeType>();
|
||||||
|
#else
|
||||||
|
var values = Enum.GetValues<EnvelopeType>();
|
||||||
|
#endif
|
||||||
|
var validValues = string.Join(", ", values.Select(value => $"{(int)value} = {value}"));
|
||||||
|
|
||||||
|
throw new DataIntegrityException(
|
||||||
|
$"Invalid EnvelopeTypeId '{envelopeTypeId}' for envelope. " +
|
||||||
|
$"Valid {nameof(EnvelopeType)} values are: [{validValues}]. " +
|
||||||
|
"This indicates a data integrity issue: the envelope may have been " +
|
||||||
|
"created or updated with an invalid EnvelopeType in the database.");
|
||||||
|
}
|
||||||
|
|
||||||
|
return (EnvelopeType)Enum.ToObject(typeof(EnvelopeType), envelopeTypeId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -30,7 +30,7 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
SendReminderEmails = false;
|
SendReminderEmails = false;
|
||||||
FirstReminderDays = 0;
|
FirstReminderDays = 0;
|
||||||
ReminderIntervalDays = 0;
|
ReminderIntervalDays = 0;
|
||||||
CertificationType = (int)Constants.CertificationType.AdvancedElectronicSignature;
|
CertificationType = Constants.CertificationType.AdvancedElectronicSignature;
|
||||||
UseAccessCode = false;
|
UseAccessCode = false;
|
||||||
Documents = Enumerable.Empty<Document>().ToList();
|
Documents = Enumerable.Empty<Document>().ToList();
|
||||||
Histories = Enumerable.Empty<History>().ToList();
|
Histories = Enumerable.Empty<History>().ToList();
|
||||||
@@ -82,8 +82,11 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
[Column("COMMENT", TypeName = "nvarchar(128)")]
|
[Column("COMMENT", TypeName = "nvarchar(128)")]
|
||||||
public string Comment { get; set; }
|
public string Comment { get; set; }
|
||||||
|
|
||||||
|
#if NETFRAMEWORK
|
||||||
|
|
||||||
[Column("CONTRACT_TYPE")]
|
[Column("CONTRACT_TYPE")]
|
||||||
public int? ContractType { get; set; }
|
public ContractType? ContractType { get; set; }
|
||||||
|
#endif
|
||||||
|
|
||||||
#if NETFRAMEWORK
|
#if NETFRAMEWORK
|
||||||
[NotMapped]
|
[NotMapped]
|
||||||
@@ -103,24 +106,32 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
public int? ReminderIntervalDays { get; set; }
|
public int? ReminderIntervalDays { get; set; }
|
||||||
|
|
||||||
[Column("ENVELOPE_TYPE")]
|
[Column("ENVELOPE_TYPE")]
|
||||||
public int? EnvelopeTypeId { get; set; }
|
#if NET
|
||||||
|
|
||||||
|
public EnvelopeType? Type { get; set; }
|
||||||
|
#elif NETFRAMEWORK
|
||||||
|
public int EnvelopeTypeId { get; set; }
|
||||||
|
#endif
|
||||||
|
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
[NotMapped]
|
[NotMapped]
|
||||||
[Obsolete("Use EnvelopeGenerator.Domain.Interfaces.EnvelopeExtensions.IsReadAndConfirm extension method instead.")]
|
[Obsolete("Use EnvelopeGenerator.Domain.Interfaces.EnvelopeExtensions.IsReadAndConfirm extension method instead.")]
|
||||||
public bool ReadOnly => this.IsReadAndConfirm();
|
public bool ReadOnly => this.IsReadAndConfirm();
|
||||||
|
|
||||||
|
#if NETFRAMEWORK
|
||||||
|
|
||||||
[Column("CERTIFICATION_TYPE")]
|
[Column("CERTIFICATION_TYPE")]
|
||||||
public int? CertificationType { get; set; }
|
public CertificationType? CertificationType { get; set; }
|
||||||
|
#endif
|
||||||
|
|
||||||
[Column("USE_ACCESS_CODE")]
|
[Column("USE_ACCESS_CODE")]
|
||||||
public bool? UseAccessCode { get; set; }
|
public bool? UseAccessCode { get; set; }
|
||||||
|
|
||||||
[Column("FINAL_EMAIL_TO_CREATOR")]
|
[Column("FINAL_EMAIL_TO_CREATOR")]
|
||||||
public int? FinalEmailToCreator { get; set; }
|
public FinalEmailType? FinalEmailToCreator { get; set; }
|
||||||
|
|
||||||
[Column("FINAL_EMAIL_TO_RECEIVERS")]
|
[Column("FINAL_EMAIL_TO_RECEIVERS")]
|
||||||
public int? FinalEmailToReceivers { get; set; }
|
public FinalEmailType? FinalEmailToReceivers { get; set; }
|
||||||
|
|
||||||
[Column("EXPIRES_WHEN_DAYS")]
|
[Column("EXPIRES_WHEN_DAYS")]
|
||||||
public int? ExpiresWhenDays { get; set; }
|
public int? ExpiresWhenDays { get; set; }
|
||||||
@@ -129,7 +140,11 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
public int? ExpiresWarningWhenDays { get; set; }
|
public int? ExpiresWarningWhenDays { get; set; }
|
||||||
|
|
||||||
[ForeignKey("UserId")]
|
[ForeignKey("UserId")]
|
||||||
public User User { get; set; }
|
public User
|
||||||
|
#if nullable
|
||||||
|
?
|
||||||
|
#endif
|
||||||
|
User { get; set; }
|
||||||
|
|
||||||
[Column("TFA_ENABLED")]
|
[Column("TFA_ENABLED")]
|
||||||
public bool? TfaEnabled { get; set; }
|
public bool? TfaEnabled { get; set; }
|
||||||
@@ -137,7 +152,6 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
= false;
|
= false;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
[NotMapped]
|
|
||||||
[Column("DOC_RESULT")]
|
[Column("DOC_RESULT")]
|
||||||
public byte[]
|
public byte[]
|
||||||
#if nullable
|
#if nullable
|
||||||
@@ -146,12 +160,12 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
DocResult
|
DocResult
|
||||||
{ get; set; }
|
{ get; set; }
|
||||||
|
|
||||||
[ForeignKey("EnvelopeTypeId")]
|
[ForeignKey("Type")]
|
||||||
public virtual EnvelopeType
|
public virtual EnvelopeTypeDefaults
|
||||||
#if nullable
|
#if nullable
|
||||||
?
|
?
|
||||||
#endif
|
#endif
|
||||||
Type
|
Defaults
|
||||||
{ get; set; }
|
{ get; set; }
|
||||||
|
|
||||||
#if NETFRAMEWORK
|
#if NETFRAMEWORK
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
using System.ComponentModel.DataAnnotations.Schema;
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
#if NETFRAMEWORK
|
#if NETFRAMEWORK
|
||||||
using System;
|
using System;
|
||||||
#endif
|
#endif
|
||||||
@@ -7,12 +9,20 @@ using System;
|
|||||||
namespace EnvelopeGenerator.Domain.Entities
|
namespace EnvelopeGenerator.Domain.Entities
|
||||||
{
|
{
|
||||||
[Table("TBSIG_ENVELOPE_TYPE", Schema = "dbo")]
|
[Table("TBSIG_ENVELOPE_TYPE", Schema = "dbo")]
|
||||||
public class EnvelopeType
|
public class EnvelopeTypeDefaults
|
||||||
{
|
{
|
||||||
|
#if NET
|
||||||
|
|
||||||
|
[Key]
|
||||||
|
[Column("GUID")]
|
||||||
|
public EnvelopeType Id { get; set; }
|
||||||
|
#elif NETFRAMEWORK
|
||||||
|
|
||||||
[Key]
|
[Key]
|
||||||
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
|
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
|
||||||
[Column("GUID")]
|
[Column("GUID")]
|
||||||
public int Id { get; set; } = 0;
|
public int Id { get; set; } = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
[Column("TITLE", TypeName = "nvarchar(128)")]
|
[Column("TITLE", TypeName = "nvarchar(128)")]
|
||||||
@@ -24,17 +34,19 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
[Column("EXPIRES_DAYS")]
|
[Column("EXPIRES_DAYS")]
|
||||||
public int? ExpiresDays { get; set; }
|
public int? ExpiresDays { get; set; }
|
||||||
|
|
||||||
|
#if NETFRAMEWORK
|
||||||
[Column("CERTIFICATION_TYPE")]
|
[Column("CERTIFICATION_TYPE")]
|
||||||
public Constants.CertificationType? CertificationType { get; set; }
|
public CertificationType? CertificationType { get; set; }
|
||||||
|
#endif
|
||||||
|
|
||||||
[Column("USE_ACCESS_CODE")]
|
[Column("USE_ACCESS_CODE")]
|
||||||
public bool? UseAccessCode { get; set; }
|
public bool? UseAccessCode { get; set; }
|
||||||
|
|
||||||
[Column("FINAL_EMAIL_TO_CREATOR")]
|
[Column("FINAL_EMAIL_TO_CREATOR")]
|
||||||
public Constants.FinalEmailType? FinalEmailToCreator { get; set; }
|
public FinalEmailType? FinalEmailToCreator { get; set; }
|
||||||
|
|
||||||
[Column("FINAL_EMAIL_TO_RECEIVERS")]
|
[Column("FINAL_EMAIL_TO_RECEIVERS")]
|
||||||
public Constants.FinalEmailType? FinalEmailToReceivers { get; set; }
|
public FinalEmailType? FinalEmailToReceivers { get; set; }
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
[Column("ADDED_WHEN", TypeName = "datetime")]
|
[Column("ADDED_WHEN", TypeName = "datetime")]
|
||||||
@@ -55,8 +67,10 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
[Column("REMINDER_INTERVAL_DAYS")]
|
[Column("REMINDER_INTERVAL_DAYS")]
|
||||||
public int? ReminderIntervalDays { get; set; }
|
public int? ReminderIntervalDays { get; set; }
|
||||||
|
|
||||||
|
#if NETFRAMEWORK
|
||||||
[Column("CONTRACT_TYPE")]
|
[Column("CONTRACT_TYPE")]
|
||||||
public int? ContractType { get; set; }
|
public ContractType? ContractType { get; set; }
|
||||||
|
#endif
|
||||||
|
|
||||||
[NotMapped]
|
[NotMapped]
|
||||||
public bool TFA_Enabled { get; set; } = false;
|
public bool TFA_Enabled { get; set; } = false;
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
#if NETFRAMEWORK
|
||||||
|
using System;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Domain.Exceptions
|
||||||
|
{
|
||||||
|
public class AuthorizationException : Exception
|
||||||
|
{
|
||||||
|
public AuthorizationException(string message) : base(message)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public AuthorizationException()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,5 +9,9 @@ namespace EnvelopeGenerator.Domain.Exceptions
|
|||||||
public DataIntegrityException(string message) : base(message)
|
public DataIntegrityException(string message) : base(message)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public DataIntegrityException() : base()
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +1,53 @@
|
|||||||
namespace EnvelopeGenerator.Domain.Interfaces
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
using EnvelopeGenerator.Domain.Exceptions;
|
||||||
|
#if NETFRAMEWORK
|
||||||
|
using System;
|
||||||
|
using System.Linq;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Domain.Interfaces
|
||||||
{
|
{
|
||||||
public interface IEnvelope
|
public interface IEnvelope
|
||||||
{
|
{
|
||||||
int? EnvelopeTypeId { get; set; }
|
#if NET
|
||||||
|
|
||||||
|
public EnvelopeType? Type { get; set; }
|
||||||
|
#elif NETFRAMEWORK
|
||||||
|
int EnvelopeTypeId { get; set; }
|
||||||
|
#endif
|
||||||
|
|
||||||
|
byte[]
|
||||||
|
#if nullable
|
||||||
|
?
|
||||||
|
#endif
|
||||||
|
DocResult { get; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class EnvelopeExtensions
|
public static class EnvelopeExtensions
|
||||||
{
|
{
|
||||||
public static bool IsReadAndConfirm(this IEnvelope envelope)
|
public static bool IsReadAndConfirm(this IEnvelope envelope)
|
||||||
{
|
{
|
||||||
return envelope.EnvelopeTypeId == 2;
|
#if NET
|
||||||
|
|
||||||
|
return envelope.Type == EnvelopeType.ReadAndConfirm;
|
||||||
|
#elif NETFRAMEWORK
|
||||||
|
return envelope.EnvelopeTypeId == (int)EnvelopeType.ReadAndConfirm;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool IsReadAndSign(this IEnvelope envelope)
|
public static bool IsReadAndSign(this IEnvelope envelope)
|
||||||
{
|
{
|
||||||
return envelope.EnvelopeTypeId != 2;
|
#if NET
|
||||||
|
|
||||||
|
return envelope.Type != EnvelopeType.ReadAndConfirm;
|
||||||
|
#elif NETFRAMEWORK
|
||||||
|
return envelope.EnvelopeTypeId != (int)EnvelopeType.ReadAndConfirm;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool IsBurned(this IEnvelope envelope)
|
||||||
|
{
|
||||||
|
return envelope.DocResult != null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -295,10 +295,10 @@
|
|||||||
<value>Use Access Code</value>
|
<value>Use Access Code</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="FinalEmailToCreator" xml:space="preserve">
|
<data name="FinalEmailToCreator" xml:space="preserve">
|
||||||
<value>Final Email to Creator</value>
|
<value>Completed Document to Creator</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="FinalEmailToReceivers" xml:space="preserve">
|
<data name="FinalEmailToReceivers" xml:space="preserve">
|
||||||
<value>Final Email to Receivers</value>
|
<value>Completed Document to Receivers</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="SendReminderEmails" xml:space="preserve">
|
<data name="SendReminderEmails" xml:space="preserve">
|
||||||
<value>Send Reminder Emails</value>
|
<value>Send Reminder Emails</value>
|
||||||
|
|||||||
@@ -132,10 +132,10 @@
|
|||||||
<value>Utiliser un code d'acces</value>
|
<value>Utiliser un code d'acces</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="FinalEmailToCreator" xml:space="preserve">
|
<data name="FinalEmailToCreator" xml:space="preserve">
|
||||||
<value>E-mail final au createur</value>
|
<value>Document termine au createur</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="FinalEmailToReceivers" xml:space="preserve">
|
<data name="FinalEmailToReceivers" xml:space="preserve">
|
||||||
<value>E-mail final aux destinataires</value>
|
<value>Document termine aux destinataires</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="SendReminderEmails" xml:space="preserve">
|
<data name="SendReminderEmails" xml:space="preserve">
|
||||||
<value>Envoyer des e-mails de rappel</value>
|
<value>Envoyer des e-mails de rappel</value>
|
||||||
|
|||||||
@@ -298,10 +298,10 @@
|
|||||||
<value>Zugriffscode verwenden</value>
|
<value>Zugriffscode verwenden</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="FinalEmailToCreator" xml:space="preserve">
|
<data name="FinalEmailToCreator" xml:space="preserve">
|
||||||
<value>Finale E-Mail an Ersteller</value>
|
<value>Abgeschlossenes Dokument an Ersteller</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="FinalEmailToReceivers" xml:space="preserve">
|
<data name="FinalEmailToReceivers" xml:space="preserve">
|
||||||
<value>Finale E-Mail an Empfänger</value>
|
<value>Abgeschlossenes Dokument an Empfänger</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="SendReminderEmails" xml:space="preserve">
|
<data name="SendReminderEmails" xml:space="preserve">
|
||||||
<value>Erinnerungs-E-Mails senden</value>
|
<value>Erinnerungs-E-Mails senden</value>
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ Public Class frmEnvelopeMainData
|
|||||||
Private Property EnvelopeTypeModel As EnvelopeTypeModel
|
Private Property EnvelopeTypeModel As EnvelopeTypeModel
|
||||||
|
|
||||||
<Bindable(True)>
|
<Bindable(True)>
|
||||||
Private Property EnvelopeType As New EnvelopeType
|
Private Property EnvelopeType As New EnvelopeTypeDefaults
|
||||||
|
|
||||||
Public Property State As State
|
Public Property State As State
|
||||||
|
|
||||||
@@ -68,14 +68,14 @@ Public Class frmEnvelopeMainData
|
|||||||
chked_2Faktor.EditValue = DEF_TF_ENABLED
|
chked_2Faktor.EditValue = DEF_TF_ENABLED
|
||||||
|
|
||||||
Else
|
Else
|
||||||
If IsNothing(Envelope.Type) Then
|
If IsNothing(Envelope.Defaults) Then
|
||||||
Envelope.Type = EnvelopeType
|
Envelope.Defaults = EnvelopeType
|
||||||
End If
|
End If
|
||||||
If Envelope.Type.ContractType = 0 Then
|
If Envelope.Defaults.ContractType = 0 Then
|
||||||
cmbEnvelopeType.EditValue = EnvelopeType
|
cmbEnvelopeType.EditValue = EnvelopeType
|
||||||
Else
|
Else
|
||||||
' This will trigger loading values from the type
|
' This will trigger loading values from the type
|
||||||
cmbEnvelopeType.EditValue = Envelope.Type
|
cmbEnvelopeType.EditValue = Envelope.Defaults
|
||||||
' cmbEnvelopeType.SelectedIndex = Convert.ToInt32(Envelope.Type) - 1
|
' cmbEnvelopeType.SelectedIndex = Convert.ToInt32(Envelope.Type) - 1
|
||||||
' cmbEnvelopeType.SelectedIndex = Envelope.Type.Id - 1
|
' cmbEnvelopeType.SelectedIndex = Envelope.Type.Id - 1
|
||||||
' cmbEnvelopeType.SelectedItem = cmbEnvelopeType.Properties.Items.Cast(Of Type).Where(Function(i) i.Id = Envelope.Type.Id).SingleOrDefault()
|
' cmbEnvelopeType.SelectedItem = cmbEnvelopeType.Properties.Items.Cast(Of Type).Where(Function(i) i.Id = Envelope.Type.Id).SingleOrDefault()
|
||||||
@@ -121,12 +121,12 @@ Public Class frmEnvelopeMainData
|
|||||||
Return
|
Return
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Dim oEnvelopeType = DirectCast(cmbEnvelopeType.EditValue, EnvelopeType)
|
Dim oEnvelopeType = DirectCast(cmbEnvelopeType.EditValue, EnvelopeTypeDefaults)
|
||||||
If IsNothing(oEnvelopeType) Then
|
If IsNothing(oEnvelopeType) Then
|
||||||
oEnvelopeType = EnvelopeType
|
oEnvelopeType = EnvelopeType
|
||||||
End If
|
End If
|
||||||
Envelope.Title = txtTitle.EditValue.ToString
|
Envelope.Title = txtTitle.EditValue.ToString
|
||||||
Envelope.Type = oEnvelopeType
|
Envelope.Defaults = oEnvelopeType
|
||||||
Envelope.EnvelopeTypeId = IIf(IsNothing(oEnvelopeType), 0, oEnvelopeType.Id)
|
Envelope.EnvelopeTypeId = IIf(IsNothing(oEnvelopeType), 0, oEnvelopeType.Id)
|
||||||
Envelope.CertificationType = cmbCertificationType.SelectedIndex + 1
|
Envelope.CertificationType = cmbCertificationType.SelectedIndex + 1
|
||||||
Envelope.Language = cmbLanguage.EditValue
|
Envelope.Language = cmbLanguage.EditValue
|
||||||
@@ -162,7 +162,7 @@ Public Class frmEnvelopeMainData
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub cmbContractType_SelectedValueChanged(sender As Object, e As EventArgs) Handles cmbEnvelopeType.SelectedValueChanged
|
Private Sub cmbContractType_SelectedValueChanged(sender As Object, e As EventArgs) Handles cmbEnvelopeType.SelectedValueChanged
|
||||||
Dim oSelectedType As EnvelopeType = cmbEnvelopeType.SelectedItem
|
Dim oSelectedType As EnvelopeTypeDefaults = cmbEnvelopeType.SelectedItem
|
||||||
|
|
||||||
If oSelectedType Is Nothing Then
|
If oSelectedType Is Nothing Then
|
||||||
Exit Sub
|
Exit Sub
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
using EnvelopeGenerator.Application.Common.Configurations;
|
using DocumentService.Client.Configuration;
|
||||||
|
using DocumentService.Client.Extensions;
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
||||||
using EnvelopeGenerator.Infrastructure.Crypt.Services;
|
using EnvelopeGenerator.Infrastructure.Crypt.Services;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Crypt.DependencyInjection;
|
namespace EnvelopeGenerator.Infrastructure.Crypt.DependencyInjection;
|
||||||
|
|
||||||
@@ -11,16 +11,13 @@ public static class ServiceCollectionExtensions
|
|||||||
{
|
{
|
||||||
public static IServiceCollection AddCryptInfrastructure(this IServiceCollection services, IConfiguration configuration)
|
public static IServiceCollection AddCryptInfrastructure(this IServiceCollection services, IConfiguration configuration)
|
||||||
{
|
{
|
||||||
services
|
var baseUrl = configuration["DocumentService:BaseUrl"]
|
||||||
.AddOptions<Pkcs11Options>()
|
?? throw new InvalidOperationException("DocumentService:BaseUrl is not configured.");
|
||||||
.Bind(configuration.GetSection(Pkcs11Options.SectionName))
|
|
||||||
.ValidateDataAnnotations()
|
services.AddDocumentServiceClients(options => options.BaseUrl = baseUrl);
|
||||||
.ValidateOnStart();
|
|
||||||
|
|
||||||
services.AddSingleton<IPdfDigitalSignatureService, PdfDigitalSignatureService>();
|
services.AddSingleton<IPdfDigitalSignatureService, PdfDigitalSignatureService>();
|
||||||
services.AddSingleton<Pkcs11SelfTestStatusStore>();
|
|
||||||
services.AddSingleton<IPkcs11SelfTestStatusProvider>(sp => sp.GetRequiredService<Pkcs11SelfTestStatusStore>());
|
|
||||||
services.AddHostedService<Pkcs11StartupSelfTestHostedService>();
|
|
||||||
return services;
|
return services;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,29 +7,12 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="DevExpress.Document.Processor" Version="25.2.3" />
|
<PackageReference Include="DocumentService.Client" Version="1.3.2" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.6" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.10" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.6" />
|
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.6" />
|
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
|
|
||||||
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.6" />
|
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
|
|
||||||
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.6" />
|
|
||||||
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.6" />
|
|
||||||
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.6" />
|
|
||||||
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.6" />
|
|
||||||
<PackageReference Include="Pkcs11Interop" Version="5.3.0" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
|
<ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="resources\pkcs11\**\*">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
<TargetPath>pkcs11\%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
using DevExpress.Pdf;
|
|
||||||
using EnvelopeGenerator.Application.Common.Enums;
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Crypt.Helper;
|
|
||||||
|
|
||||||
public static class PdfCertificationLevelExtensions
|
|
||||||
{
|
|
||||||
public static PdfCertificationLevel ToDevExpress(this PdfSignatureCertificationLevel value) => value switch
|
|
||||||
{
|
|
||||||
PdfSignatureCertificationLevel.NoChangesAllowed => PdfCertificationLevel.NoChangesAllowed,
|
|
||||||
PdfSignatureCertificationLevel.FillForms => PdfCertificationLevel.FillForms,
|
|
||||||
PdfSignatureCertificationLevel.NoCertification => PdfCertificationLevel.NoCertification,
|
|
||||||
PdfSignatureCertificationLevel.FillFormsAndAnnotate => PdfCertificationLevel.FillFormsAndAnnotate,
|
|
||||||
_ => throw new ArgumentOutOfRangeException(nameof(value), value, null),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,631 +1,77 @@
|
|||||||
using DevExpress.Office.DigitalSignatures;
|
using DocumentService.Client.Interfaces;
|
||||||
using DevExpress.Pdf;
|
using DocumentService.Client.Models.Requests;
|
||||||
using DigitalData.Core.Exceptions;
|
|
||||||
using EnvelopeGenerator.Application.Common.Configurations;
|
|
||||||
using EnvelopeGenerator.Application.Common.Dto;
|
using EnvelopeGenerator.Application.Common.Dto;
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
||||||
using EnvelopeGenerator.Infrastructure.Crypt.Helper;
|
using ClientCertLevel = DocumentService.Client.Models.Requests.PdfSignatureCertificationLevel;
|
||||||
using Microsoft.Extensions.Options;
|
using ClientCoordUnit = DocumentService.Client.Models.Requests.PdfSignatureCoordinateUnit;
|
||||||
using System.Formats.Asn1;
|
using ClientCoordOrigin = DocumentService.Client.Models.Requests.PdfSignatureCoordinateOrigin;
|
||||||
using System.IO;
|
|
||||||
using System.Security.Cryptography;
|
|
||||||
using System.Security.Cryptography.Pkcs;
|
|
||||||
using System.Security.Cryptography.X509Certificates;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.RegularExpressions;
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Crypt.Services;
|
namespace EnvelopeGenerator.Infrastructure.Crypt.Services;
|
||||||
|
|
||||||
public sealed class PdfDigitalSignatureService(IOptions<Pkcs11Options> options) : IPdfDigitalSignatureService
|
/// <summary>
|
||||||
|
/// Proxy that forwards PDF signing to the remote DocumentService API via <see cref="IPdfSignatureClient"/>.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class PdfDigitalSignatureService(IPdfSignatureClient signatureClient) : IPdfDigitalSignatureService
|
||||||
{
|
{
|
||||||
private static readonly Regex SignatureReasonMetaRegex = new(@"\|\s*SFMETA:v1;deid=(?<deid>\d+);sha256=(?<sha>[A-Fa-f0-9]{64})$", RegexOptions.CultureInvariant | RegexOptions.Compiled);
|
public async Task SignPdfAsync(Stream inputPdf, Stream outputPdf, PdfSignOptionsDto? options = null, Stream? image = null, CancellationToken cancellationToken = default)
|
||||||
|
|
||||||
public async Task SignPdfAsync(Stream inputPdf, Stream outputPdf, PdfSignOptionsDto request, Stream? image = null, CancellationToken cancellationToken = default)
|
|
||||||
{
|
{
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
|
||||||
|
|
||||||
var (workingInput, ownsWorkingInput) = await EnsureSeekableInputAsync(inputPdf, cancellationToken);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
workingInput.Position = 0;
|
|
||||||
var sourceHashHex = Convert.ToHexString(await SHA256.HashDataAsync(workingInput, cancellationToken));
|
|
||||||
workingInput.Position = 0;
|
|
||||||
|
|
||||||
var pkcs11Options = options.Value;
|
|
||||||
|
|
||||||
var reasonWithMeta = BuildReasonWithMeta(request.Reason ?? pkcs11Options.DefaultReason, request.DocumentElementId, sourceHashHex);
|
|
||||||
|
|
||||||
using var signer = new PdfDocumentSigner(workingInput);
|
|
||||||
|
|
||||||
var digestCalculator = new DigestCalculator(HashAlgorithmType.SHA256);
|
|
||||||
var signerInfo = new ExternalSignerInfo(PdfSignatureType.Pkcs7, 32768, digestCalculator);
|
|
||||||
|
|
||||||
var builder = request.Appearance is null ? new PdfDeferredSignatureBuilder(signerInfo) : new (signerInfo, new PdfSignatureFieldInfo(request.Appearance.PageNumber)
|
|
||||||
{
|
|
||||||
Name = $"Sig_{DateTimeOffset.UtcNow:yyyyMMddHHmmssfff}",
|
|
||||||
SignatureBounds = BuildSignatureBounds(request.Appearance, workingInput)
|
|
||||||
});
|
|
||||||
|
|
||||||
builder.Name = request.Name;
|
|
||||||
builder.Reason = reasonWithMeta;
|
|
||||||
builder.Location = request.Location;
|
|
||||||
builder.ContactInfo = BuildContactInfo(request.Email, request.Phone);
|
|
||||||
builder.SigningTime = pkcs11Options.UseUtcSigningTime ? DateTimeOffset.UtcNow : DateTimeOffset.Now;
|
|
||||||
builder.ApplicationName = pkcs11Options.ApplicationName;
|
|
||||||
builder.CertificationLevel = request.CertificationLevel.ToDevExpress();
|
|
||||||
|
|
||||||
if (request.Appearance is not null)
|
|
||||||
{
|
|
||||||
var fColor = request.Appearance.Font.Color;
|
|
||||||
var font = new PdfSignatureFontSettings(request.Appearance.Font.FamilyName)
|
|
||||||
{
|
|
||||||
Size = request.Appearance.Font.Size,
|
|
||||||
Color = new PdfRGBColor(fColor.R / 255.0, fColor.G / 255.0, fColor.B / 255.0),
|
|
||||||
Bold = false,
|
|
||||||
Italic = true
|
|
||||||
};
|
|
||||||
|
|
||||||
var appearance = new PdfSignatureAppearance
|
|
||||||
{
|
|
||||||
ShowLabels = request.Appearance.ShowLabels,
|
|
||||||
ShowName = request.Appearance.ShowName,
|
|
||||||
ShowDate = request.Appearance.ShowDate,
|
|
||||||
ShowReason = request.Appearance.ShowReason,
|
|
||||||
ShowLocation = request.Appearance.ShowLocation,
|
|
||||||
ShowDistinguishedName = request.Appearance.ShowDistinguishedName,
|
|
||||||
DateTimeFormat = request.Appearance.DateTimeFormat,
|
|
||||||
SignatureDetailsFont = font,
|
|
||||||
SignatureNameFont = font,
|
|
||||||
AppearanceType = PdfSignatureAppearanceType.Image,
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
if (image is not null)
|
|
||||||
using (var memoryStream = new MemoryStream())
|
|
||||||
{
|
|
||||||
image.CopyTo(memoryStream);
|
|
||||||
var bytes = memoryStream.ToArray();
|
|
||||||
appearance.SetBackgroundImageData(bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
builder.SetSignatureAppearance(appearance);
|
|
||||||
}
|
|
||||||
else if (image is not null)
|
|
||||||
throw new BadRequestException("Signature appearance is not specified, but signature image is provided.");
|
|
||||||
|
|
||||||
var deferredSigner = signer.SignDeferred(builder);
|
|
||||||
var externalSigner = new Pkcs11ExternalSigner(pkcs11Options);
|
|
||||||
deferredSigner.Sign(outputPdf, externalSigner.BuildSignature(deferredSigner.HashValue, digestCalculator.AlgorithmOid));
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
if (ownsWorkingInput)
|
|
||||||
await workingInput.DisposeAsync();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static PdfRectangle BuildSignatureBounds(PdfSignatureAppearanceDto appearance, Stream inputPdf)
|
|
||||||
{
|
|
||||||
var left = appearance.Left;
|
|
||||||
var bottom = appearance.Bottom;
|
|
||||||
var width = appearance.Width;
|
|
||||||
var height = appearance.Height;
|
|
||||||
|
|
||||||
if (appearance.CoordinateUnit == PdfSignatureCoordinateUnit.Inch)
|
|
||||||
{
|
|
||||||
left *= 72.0;
|
|
||||||
bottom *= 72.0;
|
|
||||||
width *= 72.0;
|
|
||||||
height *= 72.0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (width <= 0 || height <= 0)
|
|
||||||
throw new BadRequestException("Signature appearance width and height must be greater than zero.");
|
|
||||||
|
|
||||||
if (appearance.CoordinateOrigin == PdfSignatureCoordinateOrigin.TopLeft)
|
|
||||||
{
|
|
||||||
var pageHeight = GetPageHeightInPoints(inputPdf, appearance.PageNumber);
|
|
||||||
bottom = pageHeight - bottom - height;
|
|
||||||
}
|
|
||||||
|
|
||||||
return new PdfRectangle(left, bottom, left + width, bottom + height);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static double GetPageHeightInPoints(Stream inputPdf, int pageNumber)
|
|
||||||
{
|
|
||||||
if (pageNumber <= 0)
|
|
||||||
throw new BadRequestException("Signature page number must be greater than zero.");
|
|
||||||
|
|
||||||
var previousPosition = inputPdf.CanSeek ? inputPdf.Position : 0;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (inputPdf.CanSeek)
|
|
||||||
inputPdf.Position = 0;
|
|
||||||
|
|
||||||
using var processor = new PdfDocumentProcessor();
|
|
||||||
processor.LoadDocument(inputPdf);
|
|
||||||
|
|
||||||
var pageCount = processor.Document.Pages.Count;
|
|
||||||
if (pageNumber > pageCount)
|
|
||||||
throw new BadRequestException($"Signature page number {pageNumber} is out of range. Document has {pageCount} page(s).");
|
|
||||||
|
|
||||||
return processor.Document.Pages[pageNumber - 1].CropBox.Height;
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
if (inputPdf.CanSeek)
|
|
||||||
inputPdf.Position = previousPosition;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//TODO: verify and optimize (remove memory stream etc.) the check algortihm
|
|
||||||
public async Task<PdfSignatureCheckResultDto> CheckPdfSignatureAsync(Stream inputPdf, CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
|
||||||
|
|
||||||
var pdfBytes = await ReadAllBytesAsync(inputPdf, cancellationToken);
|
var pdfBytes = await ReadAllBytesAsync(inputPdf, cancellationToken);
|
||||||
|
var imageBytes = image is null ? null : await ReadAllBytesAsync(image, cancellationToken);
|
||||||
|
|
||||||
using var pdfStream = new MemoryStream(pdfBytes);
|
using var signed = await signatureClient.SignAsync(pdfBytes, Map(options), imageBytes, cancellationToken);
|
||||||
using var signer = new PdfDocumentSigner(inputPdf);
|
await signed.CopyToAsync(outputPdf, cancellationToken);
|
||||||
var signatures = signer.GetSignatureInfo();
|
|
||||||
var byteRanges = ParseByteRanges(pdfBytes);
|
|
||||||
|
|
||||||
if (signatures is null || signatures.Count == 0)
|
|
||||||
{
|
|
||||||
return new PdfSignatureCheckResultDto(
|
|
||||||
Signed: false,
|
|
||||||
Signatures: []);
|
|
||||||
}
|
|
||||||
|
|
||||||
var items = new List<PdfSignatureCheckItemDto>(signatures.Count);
|
|
||||||
|
|
||||||
for (var i = 0; i < signatures.Count; i++)
|
|
||||||
{
|
|
||||||
var signature = signatures[i];
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var pkcs7 = signer.GetPdfPkcs7Signature(signature.FieldName);
|
|
||||||
bool valid = pkcs7.VerifySignature();
|
|
||||||
var byteRange = i < byteRanges.Count ? byteRanges[i] : null;
|
|
||||||
var coversWholeDocument = CoversWholeDocument(byteRange, pdfBytes.LongLength);
|
|
||||||
var certificate = pkcs7.GetSignatureCertificate();
|
|
||||||
var issuedTo = ParsePrincipal(certificate?.Subject);
|
|
||||||
var issuedBy = ParsePrincipal(certificate?.Issuer);
|
|
||||||
var reasonMeta = ParseReasonMeta(signature.Reason);
|
|
||||||
var contact = ParseContactInfo(signature.ContactInfo);
|
|
||||||
|
|
||||||
items.Add(new PdfSignatureCheckItemDto(
|
|
||||||
CoversWholeDoc: coversWholeDocument,
|
|
||||||
Reason: signature.Reason,
|
|
||||||
BusinessReason: reasonMeta.BusinessReason,
|
|
||||||
Location: signature.Location,
|
|
||||||
DeclaredName: signature.SignerName,
|
|
||||||
ContactInfo: signature.ContactInfo,
|
|
||||||
Email: contact.Email,
|
|
||||||
Phone: contact.Phone,
|
|
||||||
DigestAlgorithm: InferDigestAlgorithm(certificate),
|
|
||||||
SignatureAlgorithm: InferSignatureAlgorithm(certificate),
|
|
||||||
SignerName: issuedTo.CommonName ?? signature.SignerName,
|
|
||||||
Issuer: issuedBy.Full,
|
|
||||||
SerialNumber: ToColonSerial(certificate?.SerialNumber),
|
|
||||||
ValidFrom: certificate is null ? null : new DateTimeOffset(certificate.NotBefore).ToUniversalTime(),
|
|
||||||
ValidTo: certificate is null ? null : new DateTimeOffset(certificate.NotAfter).ToUniversalTime(),
|
|
||||||
ExpiryCheckedAgainst: "now",
|
|
||||||
Certificates: [BuildCertificateInfo(certificate, DateTimeOffset.UtcNow)],
|
|
||||||
Unchanged: valid && coversWholeDocument,
|
|
||||||
FieldName: signature.FieldName,
|
|
||||||
IsCryptographicallyValid: valid,
|
|
||||||
SigningTime: signature.SigningTime?.ToUniversalTime().ToString("O"),
|
|
||||||
Filter: signature.Filter,
|
|
||||||
SubFilter: signature.SubFilter,
|
|
||||||
ApplicationName: null,
|
|
||||||
DocumentElementId: reasonMeta.DocumentElementId,
|
|
||||||
OriginalDocumentSha256: reasonMeta.OriginalDocumentSha256,
|
|
||||||
MessageDigestHex: TryExtractMessageDigestHex(signature.Contents),
|
|
||||||
Error: null));
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
var reasonMeta = ParseReasonMeta(signature.Reason);
|
|
||||||
var contact = ParseContactInfo(signature.ContactInfo);
|
|
||||||
|
|
||||||
items.Add(new PdfSignatureCheckItemDto(
|
|
||||||
CoversWholeDoc: false,
|
|
||||||
Reason: signature.Reason,
|
|
||||||
BusinessReason: reasonMeta.BusinessReason,
|
|
||||||
Location: signature.Location,
|
|
||||||
DeclaredName: signature.SignerName,
|
|
||||||
ContactInfo: signature.ContactInfo,
|
|
||||||
Email: contact.Email,
|
|
||||||
Phone: contact.Phone,
|
|
||||||
DigestAlgorithm: null,
|
|
||||||
SignatureAlgorithm: null,
|
|
||||||
SignerName: signature.SignerName,
|
|
||||||
Issuer: null,
|
|
||||||
SerialNumber: null,
|
|
||||||
ValidFrom: null,
|
|
||||||
ValidTo: null,
|
|
||||||
ExpiryCheckedAgainst: "now",
|
|
||||||
Certificates: [],
|
|
||||||
Unchanged: false,
|
|
||||||
FieldName: signature.FieldName,
|
|
||||||
IsCryptographicallyValid: false,
|
|
||||||
SigningTime: signature.SigningTime?.ToUniversalTime().ToString("O"),
|
|
||||||
Filter: signature.Filter,
|
|
||||||
SubFilter: signature.SubFilter,
|
|
||||||
ApplicationName: null,
|
|
||||||
DocumentElementId: reasonMeta.DocumentElementId,
|
|
||||||
OriginalDocumentSha256: reasonMeta.OriginalDocumentSha256,
|
|
||||||
MessageDigestHex: null,
|
|
||||||
Error: ex.Message));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return new PdfSignatureCheckResultDto(
|
|
||||||
Signed: true,
|
|
||||||
Signatures: items);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static async Task<(Stream Stream, bool OwnsStream)> EnsureSeekableInputAsync(Stream input, CancellationToken cancellationToken)
|
public Task<PdfSignatureCheckResultDto> CheckPdfSignatureAsync(Stream inputPdf, CancellationToken cancellationToken = default)
|
||||||
|
=> throw new NotSupportedException("Signature checking is handled by DocumentService and is not available through this proxy.");
|
||||||
|
|
||||||
|
private static SignPdfOptions Map(PdfSignOptionsDto? o) => new()
|
||||||
{
|
{
|
||||||
if (input.CanSeek)
|
DocumentElementId = o?.DocumentElementId ?? 0,
|
||||||
|
Name = o?.Name ?? string.Empty,
|
||||||
|
Reason = o?.Reason,
|
||||||
|
Location = o?.Location,
|
||||||
|
Email = o?.Email,
|
||||||
|
Phone = o?.Phone,
|
||||||
|
ApplicationName = o?.ApplicationName,
|
||||||
|
CertificationLevel = (ClientCertLevel)(o?.CertificationLevel ?? EnvelopeGenerator.Application.Common.Enums.PdfSignatureCertificationLevel.NoCertification),
|
||||||
|
Appearance = o?.Appearance is null ? null : MapAppearance(o.Appearance)
|
||||||
|
};
|
||||||
|
|
||||||
|
private static PdfSignatureAppearance MapAppearance(PdfSignatureAppearanceDto a) => new()
|
||||||
|
{
|
||||||
|
PageNumber = a.PageNumber,
|
||||||
|
Left = a.Left,
|
||||||
|
Bottom = a.Bottom,
|
||||||
|
Width = a.Width,
|
||||||
|
Height = a.Height,
|
||||||
|
ShowLabels = a.ShowLabels,
|
||||||
|
ShowName = a.ShowName,
|
||||||
|
ShowDate = a.ShowDate,
|
||||||
|
ShowReason = a.ShowReason,
|
||||||
|
ShowLocation = a.ShowLocation,
|
||||||
|
ShowDistinguishedName = a.ShowDistinguishedName,
|
||||||
|
DateTimeFormat = a.DateTimeFormat,
|
||||||
|
CoordinateUnit = (ClientCoordUnit)a.CoordinateUnit,
|
||||||
|
CoordinateOrigin = (ClientCoordOrigin)a.CoordinateOrigin,
|
||||||
|
Font = new PdfSignatureFont
|
||||||
{
|
{
|
||||||
input.Position = 0;
|
FamilyName = a.Font.FamilyName,
|
||||||
return (input, false);
|
Size = a.Font.Size,
|
||||||
|
IsBold = a.Font.IsBold,
|
||||||
|
IsItalic = a.Font.IsItalic,
|
||||||
|
IsUnderline = a.Font.IsUnderline,
|
||||||
|
Color = new PdfSignatureColor { R = a.Font.Color.R, G = a.Font.Color.G, B = a.Font.Color.B }
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
var buffered = new MemoryStream();
|
private static async Task<byte[]> ReadAllBytesAsync(Stream stream, CancellationToken cancellationToken)
|
||||||
await input.CopyToAsync(buffered, cancellationToken);
|
|
||||||
buffered.Position = 0;
|
|
||||||
return (buffered, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task<byte[]> ReadAllBytesAsync(Stream input, CancellationToken cancellationToken)
|
|
||||||
{
|
{
|
||||||
if (input is MemoryStream memory && memory.TryGetBuffer(out var buffer))
|
if (stream is MemoryStream memory && memory.TryGetBuffer(out var buffer))
|
||||||
return buffer.AsSpan(0, (int)memory.Length).ToArray();
|
return buffer.AsSpan(0, (int)memory.Length).ToArray();
|
||||||
|
|
||||||
if (input.CanSeek)
|
using var copy = new MemoryStream();
|
||||||
input.Position = 0;
|
await stream.CopyToAsync(copy, cancellationToken);
|
||||||
|
return copy.ToArray();
|
||||||
using var ms = new MemoryStream();
|
|
||||||
await input.CopyToAsync(ms, cancellationToken);
|
|
||||||
return ms.ToArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static PdfSignatureCertificateInfoDto BuildCertificateInfo(X509Certificate2? certificate, DateTimeOffset now)
|
|
||||||
{
|
|
||||||
if (certificate is null)
|
|
||||||
{
|
|
||||||
return new PdfSignatureCertificateInfoDto(
|
|
||||||
IssuedTo: new PdfSignaturePrincipalDto(null, null, null, null),
|
|
||||||
IssuedBy: new PdfSignaturePrincipalDto(null, null, null, null),
|
|
||||||
SerialNumber: null,
|
|
||||||
ValidFrom: null,
|
|
||||||
ValidTo: null,
|
|
||||||
SelfSigned: false,
|
|
||||||
Expired: false,
|
|
||||||
NotYetValid: false,
|
|
||||||
IsSigner: true,
|
|
||||||
Version: null,
|
|
||||||
KeyAlgorithm: null,
|
|
||||||
SignatureAlgorithm: null,
|
|
||||||
Pem: null,
|
|
||||||
KeySizeBits: null);
|
|
||||||
}
|
|
||||||
|
|
||||||
var issuedTo = ParsePrincipal(certificate.Subject);
|
|
||||||
var issuedBy = ParsePrincipal(certificate.Issuer);
|
|
||||||
var validFrom = new DateTimeOffset(certificate.NotBefore).ToUniversalTime();
|
|
||||||
var validTo = new DateTimeOffset(certificate.NotAfter).ToUniversalTime();
|
|
||||||
|
|
||||||
return new PdfSignatureCertificateInfoDto(
|
|
||||||
IssuedTo: issuedTo,
|
|
||||||
IssuedBy: issuedBy,
|
|
||||||
SerialNumber: ToColonSerial(certificate.SerialNumber),
|
|
||||||
ValidFrom: validFrom,
|
|
||||||
ValidTo: validTo,
|
|
||||||
SelfSigned: string.Equals(certificate.Subject, certificate.Issuer, StringComparison.OrdinalIgnoreCase),
|
|
||||||
Expired: validTo < now,
|
|
||||||
NotYetValid: validFrom > now,
|
|
||||||
IsSigner: true,
|
|
||||||
Version: certificate.Version,
|
|
||||||
KeyAlgorithm: certificate.PublicKey.Oid?.FriendlyName ?? certificate.PublicKey.Oid?.Value,
|
|
||||||
SignatureAlgorithm: certificate.SignatureAlgorithm.FriendlyName ?? certificate.SignatureAlgorithm.Value,
|
|
||||||
Pem: ToPem(certificate.RawData),
|
|
||||||
KeySizeBits: TryGetKeySize(certificate, out var keySize) ? keySize : null);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static bool TryGetKeySize(X509Certificate2 certificate, out int keySize)
|
|
||||||
{
|
|
||||||
keySize = 0;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
using var rsa = certificate.GetRSAPublicKey();
|
|
||||||
|
|
||||||
if (rsa is null)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
keySize = rsa.KeySize;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
catch (CryptographicException)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string? InferDigestAlgorithm(X509Certificate2? certificate)
|
|
||||||
{
|
|
||||||
if (certificate?.SignatureAlgorithm is null)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
var source = (certificate.SignatureAlgorithm.FriendlyName ?? certificate.SignatureAlgorithm.Value ?? string.Empty).ToUpperInvariant();
|
|
||||||
if (source.Contains("SHA512", StringComparison.Ordinal)) return "SHA-512";
|
|
||||||
if (source.Contains("SHA384", StringComparison.Ordinal)) return "SHA-384";
|
|
||||||
if (source.Contains("SHA256", StringComparison.Ordinal)) return "SHA-256";
|
|
||||||
if (source.Contains("SHA1", StringComparison.Ordinal)) return "SHA-1";
|
|
||||||
return certificate.SignatureAlgorithm.FriendlyName ?? certificate.SignatureAlgorithm.Value;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string? InferSignatureAlgorithm(X509Certificate2? certificate)
|
|
||||||
{
|
|
||||||
var oidName = certificate?.PublicKey.Oid?.FriendlyName?.ToUpperInvariant();
|
|
||||||
if (oidName is not null && oidName.Contains("RSA", StringComparison.Ordinal))
|
|
||||||
return "RSA";
|
|
||||||
if (oidName is not null && oidName.Contains("ECDSA", StringComparison.Ordinal))
|
|
||||||
return "ECDSA";
|
|
||||||
return certificate?.PublicKey.Oid?.FriendlyName ?? certificate?.PublicKey.Oid?.Value;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static PdfSignaturePrincipalDto ParsePrincipal(string? dn)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrWhiteSpace(dn))
|
|
||||||
return new PdfSignaturePrincipalDto(null, null, null, dn);
|
|
||||||
|
|
||||||
string? commonName = null;
|
|
||||||
string? organization = null;
|
|
||||||
string? country = null;
|
|
||||||
|
|
||||||
foreach (var part in dn.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries))
|
|
||||||
{
|
|
||||||
var equalsIndex = part.IndexOf('=');
|
|
||||||
if (equalsIndex <= 0 || equalsIndex >= part.Length - 1)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
var key = part[..equalsIndex].Trim();
|
|
||||||
var value = part[(equalsIndex + 1)..].Trim();
|
|
||||||
|
|
||||||
if (key.Equals("CN", StringComparison.OrdinalIgnoreCase)) commonName = value;
|
|
||||||
else if (key.Equals("O", StringComparison.OrdinalIgnoreCase)) organization = value;
|
|
||||||
else if (key.Equals("C", StringComparison.OrdinalIgnoreCase)) country = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
return new PdfSignaturePrincipalDto(commonName, organization, country, dn);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string? ToColonSerial(string? raw)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrWhiteSpace(raw))
|
|
||||||
return null;
|
|
||||||
|
|
||||||
var normalized = raw.Replace(":", string.Empty, StringComparison.Ordinal).Trim();
|
|
||||||
if (normalized.Length % 2 != 0)
|
|
||||||
return normalized;
|
|
||||||
|
|
||||||
return string.Join(':', Enumerable.Range(0, normalized.Length / 2).Select(i => normalized.Substring(i * 2, 2).ToUpperInvariant()));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string ToPem(byte[] der)
|
|
||||||
{
|
|
||||||
var base64 = Convert.ToBase64String(der, Base64FormattingOptions.InsertLineBreaks);
|
|
||||||
var sb = new StringBuilder();
|
|
||||||
sb.AppendLine("-----BEGIN CERTIFICATE-----");
|
|
||||||
sb.AppendLine(base64);
|
|
||||||
sb.Append("-----END CERTIFICATE-----");
|
|
||||||
return sb.ToString();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string? TryExtractMessageDigestHex(byte[]? signatureContents)
|
|
||||||
{
|
|
||||||
if (signatureContents is null || signatureContents.Length == 0)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var cms = new SignedCms();
|
|
||||||
cms.Decode(signatureContents);
|
|
||||||
|
|
||||||
var signerInfo = cms.SignerInfos.Count > 0 ? cms.SignerInfos[0] : null;
|
|
||||||
if (signerInfo is null)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
foreach (CryptographicAttributeObject attr in signerInfo.SignedAttributes)
|
|
||||||
{
|
|
||||||
if (!string.Equals(attr.Oid?.Value, "1.2.840.113549.1.9.4", StringComparison.Ordinal))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
foreach (var value in attr.Values)
|
|
||||||
{
|
|
||||||
var octets = TryReadOctetString(value.RawData);
|
|
||||||
if (octets is not null && octets.Length > 0)
|
|
||||||
return Convert.ToHexString(octets);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static byte[]? TryReadOctetString(byte[] rawData)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var reader = new AsnReader(rawData, AsnEncodingRules.BER);
|
|
||||||
var octets = reader.ReadOctetString();
|
|
||||||
if (reader.HasData)
|
|
||||||
return null;
|
|
||||||
return octets;
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static List<long[]> ParseByteRanges(byte[] pdfBytes)
|
|
||||||
{
|
|
||||||
var text = Encoding.Latin1.GetString(pdfBytes);
|
|
||||||
var matches = Regex.Matches(text, @"/ByteRange\s*\[(?<values>[\d\s]+)\]", RegexOptions.CultureInvariant);
|
|
||||||
var ranges = new List<long[]>(matches.Count);
|
|
||||||
|
|
||||||
foreach (Match match in matches)
|
|
||||||
{
|
|
||||||
var raw = match.Groups["values"].Value;
|
|
||||||
var parts = raw.Split((char[]?)null, StringSplitOptions.RemoveEmptyEntries);
|
|
||||||
var values = new long[parts.Length];
|
|
||||||
var ok = true;
|
|
||||||
|
|
||||||
for (var i = 0; i < parts.Length; i++)
|
|
||||||
{
|
|
||||||
if (!long.TryParse(parts[i], out values[i]))
|
|
||||||
{
|
|
||||||
ok = false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ok && values.Length >= 4 && values.Length % 2 == 0)
|
|
||||||
ranges.Add(values);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ranges;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static bool CoversWholeDocument(long[]? byteRange, long fileLength)
|
|
||||||
{
|
|
||||||
if (byteRange is null || byteRange.Length < 4 || byteRange.Length % 2 != 0)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (byteRange[0] != 0)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
long previousEnd = -1;
|
|
||||||
for (var i = 0; i < byteRange.Length; i += 2)
|
|
||||||
{
|
|
||||||
var start = byteRange[i];
|
|
||||||
var length = byteRange[i + 1];
|
|
||||||
if (start < 0 || length < 0)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
var end = start + length;
|
|
||||||
if (previousEnd > start)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
previousEnd = end;
|
|
||||||
}
|
|
||||||
|
|
||||||
return previousEnd == fileLength;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static long GetSignedRevisionLength(long[] byteRange)
|
|
||||||
{
|
|
||||||
if (byteRange.Length < 2)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
var start = byteRange[^2];
|
|
||||||
var length = byteRange[^1];
|
|
||||||
if (start < 0 || length < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
return start + length;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string BuildReasonWithMeta(string? businessReason, long documentElementId, string sourceHashHex)
|
|
||||||
{
|
|
||||||
var trimmedReason = string.IsNullOrWhiteSpace(businessReason) ? null : businessReason.Trim();
|
|
||||||
var prefix = string.IsNullOrWhiteSpace(trimmedReason) ? string.Empty : trimmedReason + " ";
|
|
||||||
return $"{prefix}| SFMETA:v1;deid={documentElementId};sha256={sourceHashHex}";
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string? BuildContactInfo(string? email, string? phone)
|
|
||||||
{
|
|
||||||
var normalizedEmail = string.IsNullOrWhiteSpace(email) ? null : email.Trim();
|
|
||||||
var normalizedPhone = string.IsNullOrWhiteSpace(phone) ? null : phone.Trim();
|
|
||||||
|
|
||||||
if (normalizedEmail is null && normalizedPhone is null)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
if (normalizedEmail is null)
|
|
||||||
return $"tel:{normalizedPhone}";
|
|
||||||
|
|
||||||
if (normalizedPhone is null)
|
|
||||||
return $"mailto:{normalizedEmail}";
|
|
||||||
|
|
||||||
return $"mailto:{normalizedEmail};tel:{normalizedPhone}";
|
|
||||||
}
|
|
||||||
|
|
||||||
private static (string? Email, string? Phone) ParseContactInfo(string? contactInfo)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrWhiteSpace(contactInfo))
|
|
||||||
return (null, null);
|
|
||||||
|
|
||||||
string? email = null;
|
|
||||||
string? phone = null;
|
|
||||||
|
|
||||||
foreach (var part in contactInfo.Split(';', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries))
|
|
||||||
{
|
|
||||||
if (part.StartsWith("mailto:", StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
email = part[7..].Trim();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (part.StartsWith("tel:", StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
phone = part[4..].Trim();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (email is null && part.Contains('@', StringComparison.Ordinal))
|
|
||||||
{
|
|
||||||
email = part.Trim();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (phone is null)
|
|
||||||
phone = part.Trim();
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
string.IsNullOrWhiteSpace(email) ? null : email,
|
|
||||||
string.IsNullOrWhiteSpace(phone) ? null : phone);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static (string? BusinessReason, long? DocumentElementId, string? OriginalDocumentSha256) ParseReasonMeta(string? reason)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrWhiteSpace(reason))
|
|
||||||
return (reason, null, null);
|
|
||||||
|
|
||||||
var match = SignatureReasonMetaRegex.Match(reason);
|
|
||||||
if (!match.Success)
|
|
||||||
return (reason, null, null);
|
|
||||||
|
|
||||||
var businessReason = reason[..match.Index].Trim();
|
|
||||||
if (string.IsNullOrWhiteSpace(businessReason))
|
|
||||||
businessReason = null;
|
|
||||||
|
|
||||||
long? parsedDocumentElementId = long.TryParse(match.Groups["deid"].Value, out var deid) ? deid : null;
|
|
||||||
|
|
||||||
return (
|
|
||||||
businessReason,
|
|
||||||
parsedDocumentElementId,
|
|
||||||
match.Groups["sha"].Value.ToUpperInvariant());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
using System.Security.Cryptography;
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Crypt.Services;
|
|
||||||
|
|
||||||
internal static class Pkcs11DigestInfoBuilder
|
|
||||||
{
|
|
||||||
public static byte[] Build(byte[] hash, HashAlgorithmName hashAlgorithm)
|
|
||||||
{
|
|
||||||
byte[] prefix = hashAlgorithm.Name switch
|
|
||||||
{
|
|
||||||
"SHA256" =>
|
|
||||||
[
|
|
||||||
0x30, 0x31,
|
|
||||||
0x30, 0x0d,
|
|
||||||
0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01,
|
|
||||||
0x05, 0x00,
|
|
||||||
0x04, 0x20
|
|
||||||
],
|
|
||||||
"SHA384" =>
|
|
||||||
[
|
|
||||||
0x30, 0x41,
|
|
||||||
0x30, 0x0d,
|
|
||||||
0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02,
|
|
||||||
0x05, 0x00,
|
|
||||||
0x04, 0x30
|
|
||||||
],
|
|
||||||
"SHA512" =>
|
|
||||||
[
|
|
||||||
0x30, 0x51,
|
|
||||||
0x30, 0x0d,
|
|
||||||
0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03,
|
|
||||||
0x05, 0x00,
|
|
||||||
0x04, 0x40
|
|
||||||
],
|
|
||||||
_ => throw new NotSupportedException($"Hash algorithm '{hashAlgorithm.Name}' is not supported.")
|
|
||||||
};
|
|
||||||
|
|
||||||
var digestInfo = new byte[prefix.Length + hash.Length];
|
|
||||||
Buffer.BlockCopy(prefix, 0, digestInfo, 0, prefix.Length);
|
|
||||||
Buffer.BlockCopy(hash, 0, digestInfo, prefix.Length, hash.Length);
|
|
||||||
return digestInfo;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
using EnvelopeGenerator.Application.Common.Configurations;
|
|
||||||
using DevExpress.Office.DigitalSignatures;
|
|
||||||
using DevExpress.Pdf;
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Crypt.Services;
|
|
||||||
|
|
||||||
internal sealed class Pkcs11ExternalSigner(Pkcs11Options options) : Pkcs7SignerBase
|
|
||||||
{
|
|
||||||
private readonly Pkcs11PdfSigningRsa rsa = new(options);
|
|
||||||
private readonly DigestCalculator digestCalculator = new(HashAlgorithmType.SHA256);
|
|
||||||
private readonly IReadOnlyList<byte[]> certificates = [ReadCertificateBytesWithFallback(options)];
|
|
||||||
|
|
||||||
protected override IDigestCalculator DigestCalculator => digestCalculator;
|
|
||||||
|
|
||||||
protected override string SigningAlgorithmOID => "1.2.840.113549.1.1.1";
|
|
||||||
|
|
||||||
protected override IEnumerable<byte[]> GetCertificates() => certificates;
|
|
||||||
|
|
||||||
protected override byte[] SignDigest(byte[] digest)
|
|
||||||
{
|
|
||||||
return rsa.SignHash(digest, System.Security.Cryptography.HashAlgorithmName.SHA256, System.Security.Cryptography.RSASignaturePadding.Pkcs1);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static byte[] ReadCertificateBytesWithFallback(Pkcs11Options options)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return Pkcs11SessionRunner.Run(options, session =>
|
|
||||||
{
|
|
||||||
var attrs = new List<Net.Pkcs11Interop.HighLevelAPI.IObjectAttribute>
|
|
||||||
{
|
|
||||||
session.Factories.ObjectAttributeFactory.Create(Net.Pkcs11Interop.Common.CKA.CKA_CLASS, Net.Pkcs11Interop.Common.CKO.CKO_CERTIFICATE),
|
|
||||||
session.Factories.ObjectAttributeFactory.Create(Net.Pkcs11Interop.Common.CKA.CKA_LABEL, options.CertificateLabel)
|
|
||||||
};
|
|
||||||
|
|
||||||
var handles = session.FindAllObjects(attrs);
|
|
||||||
if (handles.Count == 0)
|
|
||||||
throw new InvalidOperationException($"Certificate '{options.CertificateLabel}' not found in token.");
|
|
||||||
|
|
||||||
var values = session.GetAttributeValue(handles[0], new List<Net.Pkcs11Interop.Common.CKA> { Net.Pkcs11Interop.Common.CKA.CKA_VALUE });
|
|
||||||
return values[0].GetValueAsByteArray();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
catch when (Pkcs11ToolBridge.IsAvailable(options))
|
|
||||||
{
|
|
||||||
return Pkcs11ToolBridge.ReadCertificateBytes(options);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,119 +0,0 @@
|
|||||||
using EnvelopeGenerator.Application.Common.Configurations;
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Crypt.Services;
|
|
||||||
|
|
||||||
internal static class Pkcs11InteropBootstrap
|
|
||||||
{
|
|
||||||
private static readonly object Sync = new();
|
|
||||||
private static bool Initialized;
|
|
||||||
private const string ProxyRelativePath = "pkcs11\\windows\\proxy\\libpkcs11-proxy.dll";
|
|
||||||
private const string ToolRelativePath = "pkcs11\\windows\\opensc\\tools\\pkcs11-tool.exe";
|
|
||||||
|
|
||||||
public static void EnsureLoaded(Pkcs11Options options)
|
|
||||||
{
|
|
||||||
if (Initialized)
|
|
||||||
return;
|
|
||||||
|
|
||||||
lock (Sync)
|
|
||||||
{
|
|
||||||
if (Initialized)
|
|
||||||
return;
|
|
||||||
|
|
||||||
var libraryPath = ResolveLibraryPath(options);
|
|
||||||
var toolPath = ResolveToolPath(options);
|
|
||||||
options.SetResolvedPaths(libraryPath, toolPath);
|
|
||||||
|
|
||||||
EnsureNativeDependencySearchPath(options.ResolvedLibraryPath);
|
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(options.ProxySocket))
|
|
||||||
{
|
|
||||||
Environment.SetEnvironmentVariable("PKCS11_PROXY_SOCKET", options.ProxySocket);
|
|
||||||
Environment.SetEnvironmentVariable("PKCS11_DAEMON_SOCKET", options.ProxySocket);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(options.ResolvedToolPath))
|
|
||||||
{
|
|
||||||
var toolDir = Path.GetDirectoryName(options.ResolvedToolPath);
|
|
||||||
if (!string.IsNullOrWhiteSpace(toolDir))
|
|
||||||
EnsurePathContains(toolDir);
|
|
||||||
}
|
|
||||||
|
|
||||||
WarmupWithPkcs11Tool(options);
|
|
||||||
Initialized = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string ResolveLibraryPath(Pkcs11Options options)
|
|
||||||
{
|
|
||||||
var assetsRoot = string.IsNullOrWhiteSpace(options.AssetsRootPath)
|
|
||||||
? AppContext.BaseDirectory
|
|
||||||
: options.AssetsRootPath;
|
|
||||||
|
|
||||||
var resolved = Path.Combine(assetsRoot, ProxyRelativePath);
|
|
||||||
if (File.Exists(resolved))
|
|
||||||
return resolved;
|
|
||||||
|
|
||||||
throw new FileNotFoundException($"PKCS#11 proxy module not found. Checked path: {resolved}", resolved);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string? ResolveToolPath(Pkcs11Options options)
|
|
||||||
{
|
|
||||||
var assetsRoot = string.IsNullOrWhiteSpace(options.AssetsRootPath)
|
|
||||||
? AppContext.BaseDirectory
|
|
||||||
: options.AssetsRootPath;
|
|
||||||
|
|
||||||
var resolved = Path.Combine(assetsRoot, ToolRelativePath);
|
|
||||||
if (File.Exists(resolved))
|
|
||||||
return resolved;
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void WarmupWithPkcs11Tool(Pkcs11Options options)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrWhiteSpace(options.ResolvedToolPath))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!File.Exists(options.ResolvedToolPath))
|
|
||||||
return;
|
|
||||||
|
|
||||||
var process = new System.Diagnostics.Process
|
|
||||||
{
|
|
||||||
StartInfo = new System.Diagnostics.ProcessStartInfo
|
|
||||||
{
|
|
||||||
FileName = options.ResolvedToolPath,
|
|
||||||
Arguments = $"--module \"{options.ResolvedLibraryPath}\" -L",
|
|
||||||
UseShellExecute = false,
|
|
||||||
RedirectStandardOutput = true,
|
|
||||||
RedirectStandardError = true,
|
|
||||||
CreateNoWindow = true
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
process.Start();
|
|
||||||
process.WaitForExit(15000);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void EnsureNativeDependencySearchPath(string libraryPath)
|
|
||||||
{
|
|
||||||
var directory = Path.GetDirectoryName(libraryPath);
|
|
||||||
if (string.IsNullOrWhiteSpace(directory))
|
|
||||||
return;
|
|
||||||
|
|
||||||
EnsurePathContains(directory);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void EnsurePathContains(string directory)
|
|
||||||
{
|
|
||||||
var currentPath = Environment.GetEnvironmentVariable("PATH") ?? string.Empty;
|
|
||||||
var entries = currentPath.Split(';', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
|
|
||||||
if (entries.Any(p => string.Equals(p, directory, StringComparison.OrdinalIgnoreCase)))
|
|
||||||
return;
|
|
||||||
|
|
||||||
var updatedPath = string.IsNullOrWhiteSpace(currentPath)
|
|
||||||
? directory
|
|
||||||
: directory + ";" + currentPath;
|
|
||||||
|
|
||||||
Environment.SetEnvironmentVariable("PATH", updatedPath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
using EnvelopeGenerator.Application.Common.Configurations;
|
|
||||||
using Net.Pkcs11Interop.Common;
|
|
||||||
using Net.Pkcs11Interop.HighLevelAPI;
|
|
||||||
using System.Security.Cryptography;
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Crypt.Services;
|
|
||||||
|
|
||||||
internal sealed class Pkcs11PdfSigningRsa(Pkcs11Options options) : RSA
|
|
||||||
{
|
|
||||||
public override int KeySize
|
|
||||||
{
|
|
||||||
get => KeySizeValue;
|
|
||||||
set => KeySizeValue = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override KeySizes[] LegalKeySizes => [new(1024, 8192, 8)];
|
|
||||||
public override string? KeyExchangeAlgorithm => "RSA";
|
|
||||||
public override string SignatureAlgorithm => "RSA";
|
|
||||||
|
|
||||||
public override byte[] SignHash(byte[] hash, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding)
|
|
||||||
{
|
|
||||||
if (padding != RSASignaturePadding.Pkcs1)
|
|
||||||
throw new NotSupportedException("Only RSA PKCS#1 v1.5 padding is supported.");
|
|
||||||
|
|
||||||
byte[] digestInfo = Pkcs11DigestInfoBuilder.Build(hash, hashAlgorithm);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return Pkcs11SessionRunner.Run(options, session =>
|
|
||||||
{
|
|
||||||
var attrs = new List<IObjectAttribute>
|
|
||||||
{
|
|
||||||
session.Factories.ObjectAttributeFactory.Create(CKA.CKA_CLASS, CKO.CKO_PRIVATE_KEY),
|
|
||||||
session.Factories.ObjectAttributeFactory.Create(CKA.CKA_LABEL, options.PrivateKeyLabel)
|
|
||||||
};
|
|
||||||
|
|
||||||
var handles = session.FindAllObjects(attrs);
|
|
||||||
if (handles.Count == 0)
|
|
||||||
throw new InvalidOperationException($"Private key '{options.PrivateKeyLabel}' not found in token.");
|
|
||||||
|
|
||||||
var mechanism = session.Factories.MechanismFactory.Create(CKM.CKM_RSA_PKCS);
|
|
||||||
return session.Sign(mechanism, handles[0], digestInfo);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
catch when (Pkcs11ToolBridge.IsAvailable(options))
|
|
||||||
{
|
|
||||||
return Pkcs11ToolBridge.SignDigestInfo(options, digestInfo);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool VerifyHash(byte[] hash, byte[] signature, HashAlgorithmName hashAlgorithm, RSASignaturePadding padding)
|
|
||||||
=> throw new NotSupportedException();
|
|
||||||
|
|
||||||
public override byte[] Decrypt(byte[] data, RSAEncryptionPadding padding)
|
|
||||||
=> throw new NotSupportedException();
|
|
||||||
|
|
||||||
public override byte[] Encrypt(byte[] data, RSAEncryptionPadding padding)
|
|
||||||
=> throw new NotSupportedException();
|
|
||||||
|
|
||||||
public override RSAParameters ExportParameters(bool includePrivateParameters)
|
|
||||||
=> throw new NotSupportedException();
|
|
||||||
|
|
||||||
public override void ImportParameters(RSAParameters parameters)
|
|
||||||
=> throw new NotSupportedException();
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
using EnvelopeGenerator.Application.Common.Dto;
|
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
|
||||||
using System.Threading;
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Crypt.Services;
|
|
||||||
|
|
||||||
internal sealed class Pkcs11SelfTestStatusStore : IPkcs11SelfTestStatusProvider
|
|
||||||
{
|
|
||||||
private Pkcs11SelfTestStatusDto _status = new(
|
|
||||||
Completed: false,
|
|
||||||
Success: false,
|
|
||||||
Mode: "pending",
|
|
||||||
Summary: "PKCS#11 startup self-test has not run yet.",
|
|
||||||
CheckedAtUtc: null,
|
|
||||||
InteropError: null,
|
|
||||||
ToolError: null);
|
|
||||||
|
|
||||||
public Pkcs11SelfTestStatusDto GetStatus() => Volatile.Read(ref _status);
|
|
||||||
|
|
||||||
public void SetStatus(Pkcs11SelfTestStatusDto status)
|
|
||||||
{
|
|
||||||
Volatile.Write(ref _status, status);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,124 +0,0 @@
|
|||||||
using EnvelopeGenerator.Application.Common.Configurations;
|
|
||||||
using Net.Pkcs11Interop.Common;
|
|
||||||
using Net.Pkcs11Interop.HighLevelAPI;
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Crypt.Services;
|
|
||||||
|
|
||||||
internal static class Pkcs11SessionRunner
|
|
||||||
{
|
|
||||||
public static T Run<T>(Pkcs11Options options, Func<ISession, T> action)
|
|
||||||
{
|
|
||||||
Pkcs11InteropBootstrap.EnsureLoaded(options);
|
|
||||||
|
|
||||||
var factories = new Pkcs11InteropFactories();
|
|
||||||
using var pkcs11 = LoadLibraryWithFallback(factories, options.ResolvedLibraryPath, options.ProxySocket);
|
|
||||||
var slot = ResolveSlot(pkcs11.GetSlotList(SlotsType.WithTokenPresent), options);
|
|
||||||
|
|
||||||
using var session = slot.OpenSession(SessionType.ReadOnly);
|
|
||||||
session.Login(CKU.CKU_USER, options.UserPin);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return action(session);
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
session.Logout();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static IPkcs11Library LoadLibraryWithFallback(Pkcs11InteropFactories factories, string libraryPath, string? proxySocket)
|
|
||||||
{
|
|
||||||
List<Exception> errors = [];
|
|
||||||
foreach (string candidate in BuildLibraryCandidates(libraryPath))
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return factories.Pkcs11LibraryFactory.LoadPkcs11Library(factories, candidate, AppType.MultiThreaded);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
errors.Add(new InvalidOperationException($"{candidate} | MultiThreaded+WithFunctionList", ex));
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return factories.Pkcs11LibraryFactory.LoadPkcs11Library(factories, candidate, AppType.SingleThreaded);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
errors.Add(new InvalidOperationException($"{candidate} | SingleThreaded+WithFunctionList", ex));
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return factories.Pkcs11LibraryFactory.LoadPkcs11Library(factories, candidate, AppType.MultiThreaded, InitType.WithoutFunctionList);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
errors.Add(new InvalidOperationException($"{candidate} | MultiThreaded+WithoutFunctionList", ex));
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return factories.Pkcs11LibraryFactory.LoadPkcs11Library(factories, candidate, AppType.SingleThreaded, InitType.WithoutFunctionList);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
errors.Add(new InvalidOperationException($"{candidate} | SingleThreaded+WithoutFunctionList", ex));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var socketInfo = string.IsNullOrWhiteSpace(proxySocket) ? "<empty>" : proxySocket;
|
|
||||||
throw new AggregateException($"Unable to initialize PKCS#11 library '{libraryPath}' with any supported initialization mode. PKCS11_PROXY_SOCKET={socketInfo}", errors);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static IEnumerable<string> BuildLibraryCandidates(string configuredPath)
|
|
||||||
{
|
|
||||||
var unique = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
|
|
||||||
{
|
|
||||||
configuredPath
|
|
||||||
};
|
|
||||||
|
|
||||||
var directory = Path.GetDirectoryName(configuredPath);
|
|
||||||
if (!string.IsNullOrWhiteSpace(directory))
|
|
||||||
{
|
|
||||||
string[] alternates =
|
|
||||||
[
|
|
||||||
"client.dll",
|
|
||||||
"pkcs11-proxy.dll",
|
|
||||||
"libpkcs11-proxy.dll"
|
|
||||||
];
|
|
||||||
|
|
||||||
foreach (var fileName in alternates)
|
|
||||||
{
|
|
||||||
var candidate = Path.Combine(directory, fileName);
|
|
||||||
if (File.Exists(candidate))
|
|
||||||
unique.Add(candidate);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return unique;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static ISlot ResolveSlot(IEnumerable<ISlot> slots, Pkcs11Options options)
|
|
||||||
{
|
|
||||||
if (options.SlotId.HasValue)
|
|
||||||
{
|
|
||||||
var bySlotId = slots.FirstOrDefault(s => s.SlotId == options.SlotId.Value);
|
|
||||||
if (bySlotId is not null)
|
|
||||||
return bySlotId;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(options.TokenLabel))
|
|
||||||
{
|
|
||||||
var byTokenLabel = slots.FirstOrDefault(s =>
|
|
||||||
string.Equals(s.GetTokenInfo().Label?.Trim(), options.TokenLabel.Trim(), StringComparison.Ordinal));
|
|
||||||
|
|
||||||
if (byTokenLabel is not null)
|
|
||||||
return byTokenLabel;
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new InvalidOperationException("Unable to resolve PKCS#11 slot. Check Crypt:Pkcs11:SlotId / TokenLabel.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,112 +0,0 @@
|
|||||||
using EnvelopeGenerator.Application.Common.Configurations;
|
|
||||||
using EnvelopeGenerator.Application.Common.Dto;
|
|
||||||
using Microsoft.Extensions.Hosting;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
using Net.Pkcs11Interop.Common;
|
|
||||||
using Net.Pkcs11Interop.HighLevelAPI;
|
|
||||||
using System.Security.Cryptography;
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Crypt.Services;
|
|
||||||
|
|
||||||
internal sealed class Pkcs11StartupSelfTestHostedService(
|
|
||||||
IOptions<Pkcs11Options> options,
|
|
||||||
Pkcs11SelfTestStatusStore statusStore,
|
|
||||||
ILogger<Pkcs11StartupSelfTestHostedService> logger) : IHostedService
|
|
||||||
{
|
|
||||||
public Task StartAsync(CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
var pkcs11 = options.Value;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
RunInteropProbe(pkcs11);
|
|
||||||
statusStore.SetStatus(new Pkcs11SelfTestStatusDto(
|
|
||||||
Completed: true,
|
|
||||||
Success: true,
|
|
||||||
Mode: "interop",
|
|
||||||
Summary: "PKCS#11 startup self-test succeeded via interop.",
|
|
||||||
CheckedAtUtc: DateTimeOffset.UtcNow,
|
|
||||||
InteropError: null,
|
|
||||||
ToolError: null));
|
|
||||||
logger.LogInformation("PKCS#11 startup self-test succeeded (mode=interop, library={LibraryPath}, proxy={ProxySocket}).", pkcs11.ResolvedLibraryPath, pkcs11.ProxySocket);
|
|
||||||
return Task.CompletedTask;
|
|
||||||
}
|
|
||||||
catch (Exception interopEx) when (Pkcs11ToolBridge.IsAvailable(pkcs11))
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
RunToolProbe(pkcs11);
|
|
||||||
statusStore.SetStatus(new Pkcs11SelfTestStatusDto(
|
|
||||||
Completed: true,
|
|
||||||
Success: true,
|
|
||||||
Mode: "pkcs11-tool",
|
|
||||||
Summary: "PKCS#11 interop failed, tool fallback succeeded.",
|
|
||||||
CheckedAtUtc: DateTimeOffset.UtcNow,
|
|
||||||
InteropError: interopEx.Message,
|
|
||||||
ToolError: null));
|
|
||||||
logger.LogWarning(interopEx, "PKCS#11 interop self-test failed, but tool fallback is healthy (mode=pkcs11-tool, tool={ToolPath}).", pkcs11.ResolvedToolPath);
|
|
||||||
return Task.CompletedTask;
|
|
||||||
}
|
|
||||||
catch (Exception toolEx)
|
|
||||||
{
|
|
||||||
statusStore.SetStatus(new Pkcs11SelfTestStatusDto(
|
|
||||||
Completed: true,
|
|
||||||
Success: false,
|
|
||||||
Mode: "failed",
|
|
||||||
Summary: "PKCS#11 startup self-test failed for both interop and tool fallback.",
|
|
||||||
CheckedAtUtc: DateTimeOffset.UtcNow,
|
|
||||||
InteropError: interopEx.Message,
|
|
||||||
ToolError: toolEx.Message));
|
|
||||||
logger.LogError(toolEx, "PKCS#11 startup self-test failed for both interop and tool fallback. library={LibraryPath}, proxy={ProxySocket}, tool={ToolPath}", pkcs11.ResolvedLibraryPath, pkcs11.ProxySocket, pkcs11.ResolvedToolPath);
|
|
||||||
return Task.CompletedTask;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
statusStore.SetStatus(new Pkcs11SelfTestStatusDto(
|
|
||||||
Completed: true,
|
|
||||||
Success: false,
|
|
||||||
Mode: "failed",
|
|
||||||
Summary: "PKCS#11 startup self-test failed via interop and no tool fallback is available.",
|
|
||||||
CheckedAtUtc: DateTimeOffset.UtcNow,
|
|
||||||
InteropError: ex.Message,
|
|
||||||
ToolError: null));
|
|
||||||
logger.LogError(ex, "PKCS#11 startup self-test failed (mode=interop, no fallback available). library={LibraryPath}, proxy={ProxySocket}", pkcs11.ResolvedLibraryPath, pkcs11.ProxySocket);
|
|
||||||
return Task.CompletedTask;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
|
||||||
|
|
||||||
private static void RunInteropProbe(Pkcs11Options options)
|
|
||||||
{
|
|
||||||
Pkcs11SessionRunner.Run(options, session =>
|
|
||||||
{
|
|
||||||
EnsureObjectExists(session, CKO.CKO_CERTIFICATE, options.CertificateLabel, "certificate");
|
|
||||||
EnsureObjectExists(session, CKO.CKO_PRIVATE_KEY, options.PrivateKeyLabel, "private key");
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void RunToolProbe(Pkcs11Options options)
|
|
||||||
{
|
|
||||||
_ = Pkcs11ToolBridge.ReadCertificateBytes(options);
|
|
||||||
var testDigest = SHA256.HashData([1, 2, 3, 4]);
|
|
||||||
var digestInfo = Pkcs11DigestInfoBuilder.Build(testDigest, HashAlgorithmName.SHA256);
|
|
||||||
_ = Pkcs11ToolBridge.SignDigestInfo(options, digestInfo);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void EnsureObjectExists(ISession session, CKO objectClass, string label, string objectType)
|
|
||||||
{
|
|
||||||
var attrs = new List<IObjectAttribute>
|
|
||||||
{
|
|
||||||
session.Factories.ObjectAttributeFactory.Create(CKA.CKA_CLASS, objectClass),
|
|
||||||
session.Factories.ObjectAttributeFactory.Create(CKA.CKA_LABEL, label)
|
|
||||||
};
|
|
||||||
|
|
||||||
var handles = session.FindAllObjects(attrs);
|
|
||||||
if (handles.Count == 0)
|
|
||||||
throw new InvalidOperationException($"PKCS#11 {objectType} '{label}' not found in token.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,147 +0,0 @@
|
|||||||
using EnvelopeGenerator.Application.Common.Configurations;
|
|
||||||
using System.Diagnostics;
|
|
||||||
using System.Security.Cryptography;
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Crypt.Services;
|
|
||||||
|
|
||||||
internal static class Pkcs11ToolBridge
|
|
||||||
{
|
|
||||||
public static bool IsAvailable(Pkcs11Options options)
|
|
||||||
{
|
|
||||||
return !string.IsNullOrWhiteSpace(options.ResolvedToolPath) && File.Exists(options.ResolvedToolPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static byte[] ReadCertificateBytes(Pkcs11Options options)
|
|
||||||
{
|
|
||||||
EnsureAvailable(options);
|
|
||||||
|
|
||||||
var outputFile = Path.Combine(Path.GetTempPath(), $"pkcs11-cert-{Guid.NewGuid():N}.der");
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var args = CreateBaseArgs(options);
|
|
||||||
args.Add("--read-object");
|
|
||||||
args.Add("--type");
|
|
||||||
args.Add("cert");
|
|
||||||
args.Add("--label");
|
|
||||||
args.Add(options.CertificateLabel);
|
|
||||||
args.Add("--output-file");
|
|
||||||
args.Add(outputFile);
|
|
||||||
|
|
||||||
Execute(options, args);
|
|
||||||
return File.ReadAllBytes(outputFile);
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
DeleteIfExists(outputFile);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static byte[] SignDigestInfo(Pkcs11Options options, byte[] digestInfo)
|
|
||||||
{
|
|
||||||
EnsureAvailable(options);
|
|
||||||
|
|
||||||
var inputFile = Path.Combine(Path.GetTempPath(), $"pkcs11-sign-in-{Guid.NewGuid():N}.bin");
|
|
||||||
var outputFile = Path.Combine(Path.GetTempPath(), $"pkcs11-sign-out-{Guid.NewGuid():N}.bin");
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
File.WriteAllBytes(inputFile, digestInfo);
|
|
||||||
|
|
||||||
var args = CreateBaseArgs(options);
|
|
||||||
args.Add("--sign");
|
|
||||||
args.Add("--mechanism");
|
|
||||||
args.Add("RSA-PKCS");
|
|
||||||
args.Add("--type");
|
|
||||||
args.Add("privkey");
|
|
||||||
args.Add("--label");
|
|
||||||
args.Add(options.PrivateKeyLabel);
|
|
||||||
args.Add("--input-file");
|
|
||||||
args.Add(inputFile);
|
|
||||||
args.Add("--output-file");
|
|
||||||
args.Add(outputFile);
|
|
||||||
|
|
||||||
Execute(options, args);
|
|
||||||
return File.ReadAllBytes(outputFile);
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
DeleteIfExists(inputFile);
|
|
||||||
DeleteIfExists(outputFile);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static List<string> CreateBaseArgs(Pkcs11Options options)
|
|
||||||
{
|
|
||||||
var args = new List<string>
|
|
||||||
{
|
|
||||||
"--module",
|
|
||||||
options.ResolvedLibraryPath,
|
|
||||||
"--login",
|
|
||||||
"--pin",
|
|
||||||
options.UserPin
|
|
||||||
};
|
|
||||||
|
|
||||||
if (options.SlotId.HasValue)
|
|
||||||
{
|
|
||||||
args.Add("--slot");
|
|
||||||
args.Add(options.SlotId.Value.ToString());
|
|
||||||
}
|
|
||||||
else if (!string.IsNullOrWhiteSpace(options.TokenLabel))
|
|
||||||
{
|
|
||||||
args.Add("--token-label");
|
|
||||||
args.Add(options.TokenLabel);
|
|
||||||
}
|
|
||||||
|
|
||||||
return args;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void Execute(Pkcs11Options options, IReadOnlyList<string> arguments)
|
|
||||||
{
|
|
||||||
var process = new Process
|
|
||||||
{
|
|
||||||
StartInfo = new ProcessStartInfo
|
|
||||||
{
|
|
||||||
FileName = options.ResolvedToolPath!,
|
|
||||||
UseShellExecute = false,
|
|
||||||
RedirectStandardOutput = true,
|
|
||||||
RedirectStandardError = true,
|
|
||||||
CreateNoWindow = true
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
foreach (var argument in arguments)
|
|
||||||
process.StartInfo.ArgumentList.Add(argument);
|
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(options.ProxySocket))
|
|
||||||
{
|
|
||||||
process.StartInfo.Environment["PKCS11_PROXY_SOCKET"] = options.ProxySocket;
|
|
||||||
process.StartInfo.Environment["PKCS11_DAEMON_SOCKET"] = options.ProxySocket;
|
|
||||||
}
|
|
||||||
|
|
||||||
process.Start();
|
|
||||||
|
|
||||||
string stdOut = process.StandardOutput.ReadToEnd();
|
|
||||||
string stdErr = process.StandardError.ReadToEnd();
|
|
||||||
|
|
||||||
if (!process.WaitForExit(30000))
|
|
||||||
{
|
|
||||||
try { process.Kill(entireProcessTree: true); } catch { }
|
|
||||||
throw new TimeoutException($"pkcs11-tool timed out. Args: {string.Join(' ', process.StartInfo.ArgumentList)}");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (process.ExitCode != 0)
|
|
||||||
throw new InvalidOperationException($"pkcs11-tool failed with exit code {process.ExitCode}. StdOut: {stdOut} StdErr: {stdErr}");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void EnsureAvailable(Pkcs11Options options)
|
|
||||||
{
|
|
||||||
if (!IsAvailable(options))
|
|
||||||
throw new InvalidOperationException("pkcs11-tool is not available at resolved pkcs11 assets path.");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void DeleteIfExists(string path)
|
|
||||||
{
|
|
||||||
if (File.Exists(path))
|
|
||||||
File.Delete(path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,301 +0,0 @@
|
|||||||
# FES Signature Infrastructure Plan
|
|
||||||
|
|
||||||
## 1. Goal
|
|
||||||
|
|
||||||
Build a reusable and modular cryptography infrastructure in `EnvelopeGenerator.Infrastructure.Crypt` to support FES (Advanced Electronic Signature) workflows.
|
|
||||||
|
|
||||||
This module must:
|
|
||||||
|
|
||||||
- use PKCS#11 providers (SoftHSMv2 first, real HSM later),
|
|
||||||
- stay independent from UI/API concerns,
|
|
||||||
- expose clean interfaces to `Application` layer use-cases,
|
|
||||||
- support future extensions (timestamping, certificate chain validation, multiple key algorithms).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 2. Context and Constraints
|
|
||||||
|
|
||||||
1. SoftHSMv2 is **not** a REST service. It is a PKCS#11 module loaded as a native library.
|
|
||||||
2. `EnvelopeGenerator.Server` is presentation only; cryptographic implementation belongs to infrastructure.
|
|
||||||
3. Clean Architecture boundaries must be respected:
|
|
||||||
- `Application` depends on abstractions.
|
|
||||||
- `Infrastructure.Crypt` implements abstractions.
|
|
||||||
4. Initial target framework is `net8.0`.
|
|
||||||
5. We need production-ready behavior, not only PoC signing.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 3. High-Level Design
|
|
||||||
|
|
||||||
## 3.1 Architecture slice
|
|
||||||
|
|
||||||
- **Application layer (contracts/use-cases):**
|
|
||||||
- request signing hash/document,
|
|
||||||
- request certificate/public key material,
|
|
||||||
- request verification,
|
|
||||||
- consume signature evidence result.
|
|
||||||
|
|
||||||
- **Infrastructure.Crypt layer (this project):**
|
|
||||||
- PKCS#11 session handling,
|
|
||||||
- key/certificate object discovery,
|
|
||||||
- hash signing operations,
|
|
||||||
- local cryptographic verification,
|
|
||||||
- certificate parsing helpers,
|
|
||||||
- error normalization.
|
|
||||||
|
|
||||||
## 3.2 Provider model
|
|
||||||
|
|
||||||
Define provider-agnostic APIs and add one concrete provider first:
|
|
||||||
|
|
||||||
- `Pkcs11SignatureProvider` (primary)
|
|
||||||
- future providers:
|
|
||||||
- `RemoteSigningProvider` (if a dedicated signing gateway is introduced)
|
|
||||||
- `MockSignatureProvider` (for deterministic test scenarios)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 4. Deliverables (Phase by Phase)
|
|
||||||
|
|
||||||
## Phase 0 - Contracts and Domain Language
|
|
||||||
|
|
||||||
Create neutral models and interfaces in `Infrastructure.Crypt` (or shared abstractions if needed later):
|
|
||||||
|
|
||||||
- `SigningAlgorithm` (enum/value object)
|
|
||||||
- `Pkcs11ProviderOptions`
|
|
||||||
- `KeyLocator` (label/id/slot/token selectors)
|
|
||||||
- `SignHashRequest`
|
|
||||||
- `SignHashResult`
|
|
||||||
- `VerifySignatureRequest`
|
|
||||||
- `VerifySignatureResult`
|
|
||||||
- `CertificateDescriptor`
|
|
||||||
- `SignatureEvidence` (technical evidence payload)
|
|
||||||
|
|
||||||
Interfaces:
|
|
||||||
|
|
||||||
- `ISignatureProvider`
|
|
||||||
- `ICertificateProvider`
|
|
||||||
- `ISignatureVerifier`
|
|
||||||
- `ICryptographicHealthCheck`
|
|
||||||
|
|
||||||
Acceptance criteria:
|
|
||||||
|
|
||||||
- no dependency on ASP.NET types,
|
|
||||||
- no UI/API naming leakage,
|
|
||||||
- all model names are business-neutral.
|
|
||||||
|
|
||||||
## Phase 1 - PKCS#11 Core Adapter (SoftHSM-ready)
|
|
||||||
|
|
||||||
Implement:
|
|
||||||
|
|
||||||
- `Pkcs11LibraryLoader`
|
|
||||||
- `Pkcs11SessionFactory`
|
|
||||||
- `Pkcs11ObjectFinder`
|
|
||||||
- `Pkcs11SignatureProvider`
|
|
||||||
- `Pkcs11CertificateProvider`
|
|
||||||
|
|
||||||
Capabilities:
|
|
||||||
|
|
||||||
1. load module path from options (`libsofthsm2.so` or proxy module when required),
|
|
||||||
2. enumerate slots/tokens,
|
|
||||||
3. open read-write session,
|
|
||||||
4. login with user pin,
|
|
||||||
5. find private key by label/id,
|
|
||||||
6. sign digest with selected mechanism,
|
|
||||||
7. read certificate object by label/id.
|
|
||||||
|
|
||||||
Acceptance criteria:
|
|
||||||
|
|
||||||
- deterministic disposal of sessions,
|
|
||||||
- no leaked native handles,
|
|
||||||
- detailed typed errors (not raw exception strings only).
|
|
||||||
|
|
||||||
## Phase 2 - Verification and Certificate Utilities
|
|
||||||
|
|
||||||
Implement:
|
|
||||||
|
|
||||||
- `DefaultSignatureVerifier`
|
|
||||||
- `X509CertificateParser`
|
|
||||||
- optional `CertificateChainValidator` (toggleable)
|
|
||||||
|
|
||||||
Capabilities:
|
|
||||||
|
|
||||||
1. verify signature using returned certificate/public key,
|
|
||||||
2. expose certificate metadata (`thumbprint`, `subject`, `issuer`, `notBefore`, `notAfter`),
|
|
||||||
3. map validation failures into stable error codes.
|
|
||||||
|
|
||||||
Acceptance criteria:
|
|
||||||
|
|
||||||
- same request yields same verification outcome,
|
|
||||||
- invalid signature returns structured negative result.
|
|
||||||
|
|
||||||
## Phase 3 - Evidence Builder
|
|
||||||
|
|
||||||
Implement:
|
|
||||||
|
|
||||||
- `SignatureEvidenceBuilder`
|
|
||||||
|
|
||||||
Evidence payload should contain:
|
|
||||||
|
|
||||||
- transaction/correlation id,
|
|
||||||
- algorithm,
|
|
||||||
- hash metadata,
|
|
||||||
- key locator snapshot (safe subset),
|
|
||||||
- certificate fingerprint and subject,
|
|
||||||
- sign timestamp (UTC),
|
|
||||||
- verification outcome,
|
|
||||||
- provider type (`PKCS11`).
|
|
||||||
|
|
||||||
Acceptance criteria:
|
|
||||||
|
|
||||||
- no secret values in evidence (pin, private key id internals),
|
|
||||||
- evidence serializable for storage/audit.
|
|
||||||
|
|
||||||
## Phase 4 - Dependency Injection Module
|
|
||||||
|
|
||||||
Implement:
|
|
||||||
|
|
||||||
- `CryptInfrastructureDependencyInjection` extension methods
|
|
||||||
|
|
||||||
Methods:
|
|
||||||
|
|
||||||
- `AddCryptInfrastructure(...)`
|
|
||||||
- `AddPkcs11Provider(...)`
|
|
||||||
|
|
||||||
Acceptance criteria:
|
|
||||||
|
|
||||||
- one-line registration from composition root,
|
|
||||||
- options validation on startup.
|
|
||||||
|
|
||||||
## Phase 5 - Test Suite (`EnvelopeGenerator.Tests`)
|
|
||||||
|
|
||||||
Add test categories for `net8.0`:
|
|
||||||
|
|
||||||
1. `Unit`:
|
|
||||||
- request validation,
|
|
||||||
- algorithm mapping,
|
|
||||||
- evidence building,
|
|
||||||
- error mapping.
|
|
||||||
2. `Integration` (conditional/manual profile):
|
|
||||||
- SoftHSM slot listing,
|
|
||||||
- login,
|
|
||||||
- sign hash,
|
|
||||||
- verify,
|
|
||||||
- certificate read.
|
|
||||||
|
|
||||||
Acceptance criteria:
|
|
||||||
|
|
||||||
- unit tests run in CI without native SoftHSM,
|
|
||||||
- integration tests run when module path + pins are provided via environment variables.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 5. Proposed Project Structure
|
|
||||||
|
|
||||||
```text
|
|
||||||
EnvelopeGenerator.Infrastructure.Crypt/
|
|
||||||
Abstractions/
|
|
||||||
ISignatureProvider.cs
|
|
||||||
ICertificateProvider.cs
|
|
||||||
ISignatureVerifier.cs
|
|
||||||
ICryptographicHealthCheck.cs
|
|
||||||
Models/
|
|
||||||
SigningAlgorithm.cs
|
|
||||||
SignHashRequest.cs
|
|
||||||
SignHashResult.cs
|
|
||||||
VerifySignatureRequest.cs
|
|
||||||
VerifySignatureResult.cs
|
|
||||||
SignatureEvidence.cs
|
|
||||||
CertificateDescriptor.cs
|
|
||||||
KeyLocator.cs
|
|
||||||
Options/
|
|
||||||
Pkcs11ProviderOptions.cs
|
|
||||||
Pkcs11/
|
|
||||||
Pkcs11LibraryLoader.cs
|
|
||||||
Pkcs11SessionFactory.cs
|
|
||||||
Pkcs11ObjectFinder.cs
|
|
||||||
Pkcs11SignatureProvider.cs
|
|
||||||
Pkcs11CertificateProvider.cs
|
|
||||||
Verification/
|
|
||||||
DefaultSignatureVerifier.cs
|
|
||||||
X509CertificateParser.cs
|
|
||||||
Evidence/
|
|
||||||
SignatureEvidenceBuilder.cs
|
|
||||||
DependencyInjection/
|
|
||||||
CryptInfrastructureDependencyInjection.cs
|
|
||||||
Exceptions/
|
|
||||||
CryptographicOperationException.cs
|
|
||||||
Pkcs11ProviderException.cs
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 6. Configuration Strategy
|
|
||||||
|
|
||||||
Use options (bound from host config) with environment override support:
|
|
||||||
|
|
||||||
- `Crypt:Provider = PKCS11`
|
|
||||||
- `Crypt:Pkcs11:AssetsRootPath` (base path that contains bundled `pkcs11` assets)
|
|
||||||
- `Crypt:Pkcs11:SlotId` or token selectors
|
|
||||||
- `Crypt:Pkcs11:UserPin` (from secret store/env, not plain committed value)
|
|
||||||
- `Crypt:Pkcs11:PrivateKeyLabel`
|
|
||||||
- `Crypt:Pkcs11:CertificateLabel`
|
|
||||||
- `Crypt:Pkcs11:LoginType`
|
|
||||||
|
|
||||||
Validation rules:
|
|
||||||
|
|
||||||
- resolved module path must exist under configured/default assets root,
|
|
||||||
- at least one key locator required,
|
|
||||||
- pin required for signing operations.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 7. Error Model
|
|
||||||
|
|
||||||
Define stable error codes to prevent provider-specific leakage:
|
|
||||||
|
|
||||||
- `CRYPT_PROVIDER_UNAVAILABLE`
|
|
||||||
- `CRYPT_SLOT_NOT_FOUND`
|
|
||||||
- `CRYPT_LOGIN_FAILED`
|
|
||||||
- `CRYPT_KEY_NOT_FOUND`
|
|
||||||
- `CRYPT_CERT_NOT_FOUND`
|
|
||||||
- `CRYPT_SIGN_FAILED`
|
|
||||||
- `CRYPT_VERIFY_FAILED`
|
|
||||||
|
|
||||||
Map low-level exceptions to these codes with safe diagnostics.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 8. Non-Functional Requirements
|
|
||||||
|
|
||||||
1. **Security:** never log pins or raw private key handles.
|
|
||||||
2. **Reliability:** deterministic cleanup (`IDisposable`/`IAsyncDisposable`).
|
|
||||||
3. **Observability:** structured logs with correlation id.
|
|
||||||
4. **Performance:** avoid repeated login per operation when a safe session strategy is available.
|
|
||||||
5. **Extensibility:** algorithm/provider mapping must be open for extension.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 9. Implementation Order (Small Tasks)
|
|
||||||
|
|
||||||
1. Add models + interfaces.
|
|
||||||
2. Add options + validators.
|
|
||||||
3. Add PKCS#11 low-level loader/session wrappers.
|
|
||||||
4. Implement `Pkcs11SignatureProvider` for hash signing.
|
|
||||||
5. Implement certificate retrieval.
|
|
||||||
6. Implement verifier.
|
|
||||||
7. Implement evidence builder.
|
|
||||||
8. Add DI registration extension.
|
|
||||||
9. Add unit tests.
|
|
||||||
10. Add optional integration tests (SoftHSM profile).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 10. Definition of Done
|
|
||||||
|
|
||||||
Done means:
|
|
||||||
|
|
||||||
1. `Infrastructure.Crypt` exposes generic cryptographic services usable by Application use-cases.
|
|
||||||
2. SoftHSM-backed PKCS#11 sign/verify path works in integration tests.
|
|
||||||
3. All sensitive configuration is externalized.
|
|
||||||
4. Structured error codes are returned for expected failure scenarios.
|
|
||||||
5. Documentation exists for host registration and required settings.
|
|
||||||
@@ -1,228 +0,0 @@
|
|||||||
# FES (Advanced Electronic Signature) Summary and Integration Plan - EN
|
|
||||||
|
|
||||||
This document summarizes the shared diagram flow (`Ablauf SignFlow Unternehmenszertifikat`) and provides a small-step integration plan for the `EnvelopeGenerator` solution.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 1) Simplified flow summary
|
|
||||||
|
|
||||||
Flow logic:
|
|
||||||
|
|
||||||
1. The sender uploads a document and defines signers.
|
|
||||||
2. If a valid company certificate already exists in HSM, it is used with the company key pair.
|
|
||||||
3. If no valid company certificate exists, CA issuance/renewal flow is required.
|
|
||||||
4. The signer receives an e-mail with a signing link.
|
|
||||||
5. The signer completes SMS OTP (2FA) and performs UI signature interaction.
|
|
||||||
6. Backend computes the hash for the current signing stage and sends it to HSM.
|
|
||||||
7. HSM signs the hash with the private key and returns signature + certificate context.
|
|
||||||
8. Backend embeds digital signature and certificate into PDF and writes audit trail.
|
|
||||||
9. After all signers complete, the final artifact is archived.
|
|
||||||
10. The final signed document is distributed to signers.
|
|
||||||
|
|
||||||
Important: The visible UI signature is not yet the legal electronic signature. The legal signature is produced in backend+HSM steps.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 2) Relation to current codebase (as-is)
|
|
||||||
|
|
||||||
- `EnvelopeGenerator.Server` is the presentation layer host (Blazor + API hosting).
|
|
||||||
- Business flow is handled in `Application` via MediatR pipelines.
|
|
||||||
- Current receiver flow is centered around UI overlay/signature capture.
|
|
||||||
- Missing FES core: PKCS#11 hash-sign-verify + certificate-based PDF embedding pipeline.
|
|
||||||
|
|
||||||
Critical deployment fact:
|
|
||||||
|
|
||||||
- `EnvelopeGenerator.Server` is planned to run on Windows.
|
|
||||||
- SoftHSM is currently planned to run on Linux.
|
|
||||||
- A Windows process cannot directly load Linux PKCS#11 module (`libsofthsm2.so`).
|
|
||||||
- Therefore, architecture must include a compatibility bridge (service or proxy) unless HSM/SoftHSM is local to Windows.
|
|
||||||
|
|
||||||
Conclusion: FES is not a replacement of the current flow; it is a cryptographic hardening layer behind it.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 3) Why SoftHSM tests are foundational
|
|
||||||
|
|
||||||
The tests defined in `SOFTHSM_TEST_KILAVUZU_TR.md` are the technical prerequisite for FES:
|
|
||||||
|
|
||||||
- `slots/login` -> HSM connectivity and authentication
|
|
||||||
- `certificate` -> certificate retrieval path
|
|
||||||
- `sign` -> hash signing with private key
|
|
||||||
- `verify` -> signature and certificate consistency validation
|
|
||||||
|
|
||||||
Without these tests passing, diagram steps 6-8 should not go live.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 4) Target architecture (clean architecture aligned)
|
|
||||||
|
|
||||||
### Deployment topology options (must choose one)
|
|
||||||
|
|
||||||
1. **Linux signing service (recommended)**
|
|
||||||
- Windows `EnvelopeGenerator.Server` calls Linux signing API over HTTPS.
|
|
||||||
- Linux signing service performs PKCS#11 operations against SoftHSM.
|
|
||||||
- Private keys never leave Linux/HSM boundary.
|
|
||||||
|
|
||||||
2. **PKCS#11 proxy bridge**
|
|
||||||
- Windows host loads a Windows PKCS#11 proxy client DLL.
|
|
||||||
- Proxy forwards PKCS#11 operations to Linux side connected to SoftHSM.
|
|
||||||
|
|
||||||
3. **Windows-local SoftHSM (dev/test)**
|
|
||||||
- SoftHSM also installed on Windows and used locally.
|
|
||||||
- Useful for local testing, not preferred production topology.
|
|
||||||
|
|
||||||
Decision note:
|
|
||||||
|
|
||||||
- For production-critical FES, choose option 1 by default unless enterprise HSM policy requires option 2.
|
|
||||||
- Keep option 3 for development convenience only.
|
|
||||||
|
|
||||||
### Layer responsibilities
|
|
||||||
|
|
||||||
- `EnvelopeGenerator.Server`:
|
|
||||||
- API endpoints, auth orchestration, input validation.
|
|
||||||
- FES branch routing: standard-sign path vs external signing-service/proxy path.
|
|
||||||
- No private-key material handling.
|
|
||||||
|
|
||||||
- `EnvelopeGenerator.Application`:
|
|
||||||
- Use cases such as `SignWithHsmCommand`.
|
|
||||||
- MediatR pipeline orchestration for status/history/audit.
|
|
||||||
- FES evidence model aggregation (ip/email/phone/user-agent/otp proof/timestamps).
|
|
||||||
|
|
||||||
- `EnvelopeGenerator.Infrastructure`:
|
|
||||||
- Implementations for `IPkcs11Service`, `IPdfSignatureService`, `ITimestampService`.
|
|
||||||
- Pkcs11Interop integration and cryptographic operations.
|
|
||||||
- Optional client for Linux signing service if topology option 1 is selected.
|
|
||||||
|
|
||||||
- `Domain`:
|
|
||||||
- Signature evidence and audit-trail models.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 5) Small-step integration plan
|
|
||||||
|
|
||||||
## Phase 0 - Scope and contracts
|
|
||||||
|
|
||||||
1. Finalize signing algorithms (for example `SHA256_RSA_PKCS`).
|
|
||||||
2. Confirm strategy: company certificate vs signer-specific certificate.
|
|
||||||
3. Freeze mandatory audit fields:
|
|
||||||
- identity, OTP proof, IP, user-agent, transaction id, timestamps, hash metadata.
|
|
||||||
4. Freeze deployment topology decision:
|
|
||||||
- option 1 (Linux signing service), option 2 (PKCS#11 proxy), or option 3 (Windows-local SoftHSM).
|
|
||||||
5. Define production host mapping:
|
|
||||||
- where `EnvelopeGenerator.Server` runs,
|
|
||||||
- where HSM/SoftHSM runs,
|
|
||||||
- where certificate lifecycle is managed.
|
|
||||||
|
|
||||||
Deliverable: Technical decision record (ADR-style markdown).
|
|
||||||
|
|
||||||
## Phase 1 - PKCS#11 connector (infrastructure)
|
|
||||||
|
|
||||||
1. Define `IPkcs11Service` interface.
|
|
||||||
2. Add `Pkcs11Interop` implementation.
|
|
||||||
3. Add config model:
|
|
||||||
- library path, slot, token label, key label, certificate label.
|
|
||||||
4. Ensure secure secret handling for PIN.
|
|
||||||
5. Ensure host-compatible module loading:
|
|
||||||
- Windows server must load Windows DLL,
|
|
||||||
- Linux server must load Linux `.so`.
|
|
||||||
|
|
||||||
Deliverable: Testable PKCS#11 service with health/slot/login/sign/verify capabilities.
|
|
||||||
|
|
||||||
## Phase 1.5 - Cross-host bridge implementation
|
|
||||||
|
|
||||||
1. If option 1 selected:
|
|
||||||
- implement Linux signing service API contract (`/sign`, `/certificate`, `/health`),
|
|
||||||
- implement authenticated HTTP client in `EnvelopeGenerator.Server`.
|
|
||||||
2. If option 2 selected:
|
|
||||||
- install/configure PKCS#11 proxy client DLL on Windows,
|
|
||||||
- install/configure proxy server on Linux and bind to SoftHSM.
|
|
||||||
|
|
||||||
Deliverable: Windows-to-Linux signing communication path proven end-to-end.
|
|
||||||
|
|
||||||
## Phase 2 - Application use case
|
|
||||||
|
|
||||||
1. Add `SignDocumentHashCommand` (or equivalent).
|
|
||||||
2. Pipeline flow:
|
|
||||||
- compute/receive hash,
|
|
||||||
- sign with HSM,
|
|
||||||
- attach certificate context,
|
|
||||||
- verify,
|
|
||||||
- produce evidence object.
|
|
||||||
3. Add resilient error mapping and retry strategy.
|
|
||||||
|
|
||||||
Deliverable: HSM signing use case in Application layer.
|
|
||||||
|
|
||||||
## Phase 3 - PDF signature embedding
|
|
||||||
|
|
||||||
1. Implement PDF signature embedding via `IPdfSignatureService`.
|
|
||||||
2. Build signer-specific audit-trail pages.
|
|
||||||
3. Append all audit pages to final PDF artifact.
|
|
||||||
|
|
||||||
Deliverable: Signed PDF with certificate context and audit trail pages.
|
|
||||||
|
|
||||||
## Phase 4 - Presentation/API integration
|
|
||||||
|
|
||||||
1. Integrate FES option into submit flow (feature flag guarded).
|
|
||||||
2. Add operational endpoints:
|
|
||||||
- HSM health/check
|
|
||||||
- signature evidence query (restricted roles)
|
|
||||||
3. Keep DTOs safe; avoid exposing sensitive cryptographic material.
|
|
||||||
4. In `SignatureController.Submit`, add FES branch that sends signing payload + audit context to selected signing backend.
|
|
||||||
|
|
||||||
Deliverable: API-level orchestration with minimal UI disruption.
|
|
||||||
|
|
||||||
## Phase 5 - Audit, archive, distribution
|
|
||||||
|
|
||||||
1. Persist signature evidence records.
|
|
||||||
2. Include hash/cert metadata in archival package.
|
|
||||||
3. Add signed artifact reference to distribution e-mails.
|
|
||||||
|
|
||||||
Deliverable: Alignment with diagram steps 9-10.
|
|
||||||
|
|
||||||
## Phase 6 - Testing and operations
|
|
||||||
|
|
||||||
1. Postman collection + Newman automation.
|
|
||||||
2. Positive/negative matrix:
|
|
||||||
- wrong pin, wrong slot, missing cert, expired cert, HSM timeout.
|
|
||||||
3. Observability:
|
|
||||||
- structured logs, correlation id, latency metrics.
|
|
||||||
|
|
||||||
Deliverable: Production readiness checklist.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 6) Transition strategy from test API to production flow
|
|
||||||
|
|
||||||
1. Keep `/api/pkcs11-test/*` only for non-production.
|
|
||||||
2. In production, use the same internal services through business endpoints only.
|
|
||||||
3. Roll out by feature flag:
|
|
||||||
- `FesEnabled=false` initially
|
|
||||||
- pilot sender group
|
|
||||||
- full rollout
|
|
||||||
|
|
||||||
4. Keep explicit environment matrix:
|
|
||||||
- local dev (option 3),
|
|
||||||
- integration/staging (option 1 or 2),
|
|
||||||
- production (option 1 or 2 only).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 7) Risks and mitigations
|
|
||||||
|
|
||||||
- Certificate expiry risk -> proactive monitoring and renewal alerting.
|
|
||||||
- HSM connectivity risk -> retry policy, circuit breaker, fallback queue.
|
|
||||||
- PIN/secret exposure risk -> vault-backed secrets and rotation policy.
|
|
||||||
- Verification failure risk -> block PDF sealing and move envelope to technical hold state.
|
|
||||||
- Cross-host connectivity risk -> mTLS/JWT auth + timeout/retry/circuit breaker + health probe.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 8) Short done checklist
|
|
||||||
|
|
||||||
- [ ] PKCS#11 service interface + implementation
|
|
||||||
- [ ] Application command + pipeline behaviors
|
|
||||||
- [ ] PDF signature embedding
|
|
||||||
- [ ] Audit-trail generation
|
|
||||||
- [ ] API integration + feature flag
|
|
||||||
- [ ] Postman/Newman regression suite
|
|
||||||
- [ ] Operational runbook and alerting rules
|
|
||||||
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,84 +0,0 @@
|
|||||||
10/6/26, 10:46 PM
|
|
||||||
|
|
||||||
Test SoftHSM : SWINFRA-54
|
|
||||||
|
|
||||||
Projects / Infrastruktur Software / Issues /
|
|
||||||
|
|
||||||
Enter search…
|
|
||||||
|
|
||||||
SWINFRA-54
|
|
||||||
|
|
||||||
All…
|
|
||||||
|
|
||||||
Created by Marvin Kamm 3 months ago
|
|
||||||
|
|
||||||
Visible to issue readers 1
|
|
||||||
|
|
||||||
Updated by Matthias Dewald about 1 month ago
|
|
||||||
|
|
||||||
# **Test SoftHSM**
|
|
||||||
|
|
||||||
Project Priorität Status **SWI** Infrastruktur Softwa H Hoch O Offen re… Bearbeiter Fälligkeit Projekteinfluss MD _ ? ? Matthias Dewald Kein fälligkeit Kein projektbezug Boards No visible boards
|
|
||||||
|
|
||||||
Bitte eine Test-VM mit der Software SoftHSM bereitstellen.
|
|
||||||
|
|
||||||
Laut Info von @Henning Emrich soll die Installation unter Debian Linux deutlich einfacher sein, als unter Windows. Bitte prüfen.
|
|
||||||
|
|
||||||
@Hakan Tek & @OlgunR
|
|
||||||
|
|
||||||
Sollen bitte die API Ansteuerung testen
|
|
||||||
|
|
||||||
FYI
|
|
||||||
|
|
||||||
@Marlon Schreiber @Jan-Ulrich Hoss @Henning Emrich @Hakan Tek @OlgunR
|
|
||||||
|
|
||||||
**Attachments** 1
|
|
||||||
|
|
||||||
Files Attached to Comments
|
|
||||||
|
|
||||||
**PDF**
|
|
||||||
|
|
||||||
Ablauf SignFlow Un ternehme… 83 kB
|
|
||||||
|
|
||||||
MD _ **Matthias Dewald** Commented 3 months ago Ist für Dienstag 30.6 10:00 Uhr Eingeplant
|
|
||||||
|
|
||||||
HT **Hakan Tek** Commented 3 months ago
|
|
||||||
|
|
||||||
Für die Integration auf der .NET-Seite können wir die Pkcs11Interop-Bibliothek und die entsprechende DevExpress-Infrastruktur verwenden. @OlgunR, falls du noch weitere Vorschläge hast, füge sie bitte hinzu. @Marvin Kamm, @Henning Emrich, @Matthias Dewald, um mit den Tests beginnen zu können, benötigen wir die entsprechenden Verbindungsdaten für SoftHSM (Slot-ID, PIN, Bibliothekspfad usw.).
|
|
||||||
|
|
||||||
FYI
|
|
||||||
|
|
||||||
@Marlon Schreiber @Jan-Ulrich Hoss
|
|
||||||
|
|
||||||
bugtracker.dd:8080/issue/SWINFRA-54/Test-SoftHSM
|
|
||||||
|
|
||||||
1/2
|
|
||||||
|
|
||||||
10/6/26, 10:46 PM
|
|
||||||
|
|
||||||
Test SoftHSM : SWINFRA-54
|
|
||||||
|
|
||||||
MD
|
|
||||||
|
|
||||||
## **Matthias Dewald** Commented 3 months ago
|
|
||||||
|
|
||||||
Hallo zusammen, SoftHSM ist auf der 172.24.12.64 installiert:
|
|
||||||
|
|
||||||
Der Proxy läuft auf Port 5657 und erwartet Verbindungen über die Proxy-Bibliothek (libpkcs11-proxy.so)
|
|
||||||
|
|
||||||
@Hakan Tek Bitte testen
|
|
||||||
|
|
||||||
MD
|
|
||||||
|
|
||||||
## **Matthias Dewald** Commented about 1 month ago
|
|
||||||
|
|
||||||
Ablauf SignFlow Unternehmenszertifikat.drawio.pdf
|
|
||||||
|
|
||||||
**PDF**
|
|
||||||
|
|
||||||
Ablauf SignFlow Un ternehme… 83 kB
|
|
||||||
|
|
||||||
bugtracker.dd:8080/issue/SWINFRA-54/Test-SoftHSM
|
|
||||||
|
|
||||||
2/2
|
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
namespace EnvelopeGenerator.Infrastructure.Notification.Configuration;
|
||||||
|
|
||||||
|
public enum ConsumerType
|
||||||
|
{
|
||||||
|
API,
|
||||||
|
RabbitMQ
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
using DigitalData.MessagingService.RabbitMQ;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Infrastructure.Notification.Configuration;
|
||||||
|
|
||||||
|
public class NotificationOptions
|
||||||
|
{
|
||||||
|
public const string SectionName = "Notification";
|
||||||
|
|
||||||
|
public ConsumerType ConsumerType { get; set; }
|
||||||
|
|
||||||
|
public string? ApiUrl { get; set; }
|
||||||
|
|
||||||
|
public string SenderEmail { get; set; } = null!;
|
||||||
|
|
||||||
|
public RabbitMqConnectionConfiguration? RabbitMQ { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
using DigitalData.MessagingService.Client;
|
||||||
|
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
using EnvelopeGenerator.Infrastructure.Notification.Configuration;
|
||||||
|
using Microsoft.Extensions.Configuration;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Infrastructure.Notification;
|
||||||
|
|
||||||
|
public static class DependencyInjection
|
||||||
|
{
|
||||||
|
public static IServiceCollection AddNotificationInfrastructure(this IServiceCollection services, IConfiguration configuration, string sectionName = NotificationOptions.SectionName)
|
||||||
|
{
|
||||||
|
var ntfConfiguration = configuration.GetSection(sectionName);
|
||||||
|
services.Configure<NotificationOptions>(ntfConfiguration);
|
||||||
|
|
||||||
|
var options = ntfConfiguration.Get<NotificationOptions>()
|
||||||
|
?? throw new InvalidOperationException(
|
||||||
|
$"Failed to bind configuration section '{sectionName}' to {nameof(NotificationOptions)}. Ensure the section exists and is correctly configured.");
|
||||||
|
|
||||||
|
switch (options.ConsumerType)
|
||||||
|
{
|
||||||
|
case ConsumerType.API:
|
||||||
|
if (options.ApiUrl is string apiUrl)
|
||||||
|
services.AddMessagingServiceHttpClient(opt =>
|
||||||
|
{
|
||||||
|
opt.BaseAddress = new Uri(apiUrl);
|
||||||
|
// Additional configuration for the MessagingServiceHttpClient can be added here if needed
|
||||||
|
});
|
||||||
|
else
|
||||||
|
throw new InvalidOperationException(
|
||||||
|
$"MessagingServiceApiUrl must be provided when ClientType is set to Api in the '{sectionName}' configuration section.");
|
||||||
|
break;
|
||||||
|
case ConsumerType.RabbitMQ:
|
||||||
|
if (options.RabbitMQ is null)
|
||||||
|
throw new InvalidOperationException(
|
||||||
|
$"Missing RabbitMQ configuration. " +
|
||||||
|
$"When ConsumerType is set to RabbitMQ, '{sectionName}:{nameof(NotificationOptions.RabbitMQ)}' must be configured.");
|
||||||
|
|
||||||
|
services.AddMessagingServiceClient(
|
||||||
|
configuration,
|
||||||
|
rabbitMqConnectionSectionName: $"{sectionName}:{nameof(NotificationOptions.RabbitMQ)}");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new InvalidOperationException(
|
||||||
|
$"Unsupported ConsumerType '{options.ConsumerType}' in the '{sectionName}' configuration section.");
|
||||||
|
}
|
||||||
|
|
||||||
|
services.AddScoped<IEnvelopeNotificationService, EnvelopeNotificationService>();
|
||||||
|
return services;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>net8.0;</TargetFrameworks>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<LangVersion>latest</LangVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="DigitalData.MessagingService.Client" Version="3.0.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.10" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
using DigitalData.MessagingService.Application.Common.Dto;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Infrastructure.Notification;
|
||||||
|
|
||||||
|
public static class EnvelopeNotificationExtensions
|
||||||
|
{
|
||||||
|
public static EmailAttachmentDto ToEmailAttachmentDto(this (string FileName, byte[] Content) attachment) => new()
|
||||||
|
{
|
||||||
|
FileName = attachment.FileName,
|
||||||
|
Content = attachment.Content
|
||||||
|
};
|
||||||
|
|
||||||
|
public static IEnumerable<EmailAttachmentDto> ToEmailAttachmentDto(this IEnumerable<(string FileName, byte[] Content)> attachments)
|
||||||
|
=> attachments.Select(ToEmailAttachmentDto);
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
using DigitalData.Core.Abstraction.Application.Repository;
|
||||||
|
using DigitalData.MessagingService.Application.Common.Interfaces;
|
||||||
|
using DigitalData.MessagingService.Application.EmailSending.Commands;
|
||||||
|
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
|
using EnvelopeGenerator.Domain.Exceptions;
|
||||||
|
using EnvelopeGenerator.Infrastructure.Notification.Configuration;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Infrastructure.Notification;
|
||||||
|
|
||||||
|
public class EnvelopeNotificationService(IRepository<EmailTemplate> TempRepo, IMessagingServiceClient MsgClient, IOptions<NotificationOptions> ntfOpt) : IEnvelopeNotificationService
|
||||||
|
{
|
||||||
|
private readonly NotificationOptions NtfOpt = ntfOpt.Value;
|
||||||
|
|
||||||
|
private async Task<EmailTemplate> GetTemplateAsync(EmailTemplateType templateType, CancellationToken cancel = default)
|
||||||
|
{
|
||||||
|
return await TempRepo.Where(t => t.Name == templateType.ToString()).FirstOrDefaultAsync(cancel)
|
||||||
|
?? throw new DataIntegrityException($"{templateType} email template not found");
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task Notify<TEnvelopeNotificationBase>(string receiverEmail, TEnvelopeNotificationBase notification, CancellationToken cancel = default)
|
||||||
|
where TEnvelopeNotificationBase : EnvelopeNotificationBase
|
||||||
|
{
|
||||||
|
var template = await GetTemplateAsync(notification.GetTemplateType(), cancel);
|
||||||
|
|
||||||
|
// create email command
|
||||||
|
var mail = new PublishEmailViaSmtpCommand()
|
||||||
|
{
|
||||||
|
Body = template.Body.ReplacePlaceholders(notification),
|
||||||
|
Subject = template.Subject.ReplacePlaceholders(notification),
|
||||||
|
Recipients = [receiverEmail],
|
||||||
|
Sender = NtfOpt.SenderEmail.ToSender(),
|
||||||
|
IsHtml = true
|
||||||
|
};
|
||||||
|
|
||||||
|
// add attachments if any
|
||||||
|
if(notification.Attachments?.Any() ?? false)
|
||||||
|
mail = mail.WithAttachments(notification.Attachments.ToEmailAttachmentDto());
|
||||||
|
|
||||||
|
await MsgClient.SendAsync(mail, cancel);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
using System.Collections.Concurrent;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Infrastructure.Notification;
|
||||||
|
|
||||||
|
public static class ReplacePlaceholderExtensions
|
||||||
|
{
|
||||||
|
private sealed record PlaceholderProperty(string Placeholder, PropertyInfo Property);
|
||||||
|
|
||||||
|
private static readonly ConcurrentDictionary<Type, PlaceholderProperty[]> PropertyCache = new();
|
||||||
|
|
||||||
|
public static string ReplacePlaceholders(this string template, object data)
|
||||||
|
{
|
||||||
|
var properties = PropertyCache.GetOrAdd(data.GetType(), CreatePlaceholderProperties);
|
||||||
|
|
||||||
|
foreach (var item in properties)
|
||||||
|
{
|
||||||
|
var value = item.Property.GetValue(data)?.ToString() ?? string.Empty;
|
||||||
|
template = template.Replace(
|
||||||
|
item.Placeholder,
|
||||||
|
value,
|
||||||
|
StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
return template;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PlaceholderProperty[] CreatePlaceholderProperties(
|
||||||
|
Type type)
|
||||||
|
{
|
||||||
|
return [.. type
|
||||||
|
.GetProperties(BindingFlags.Public | BindingFlags.Instance)
|
||||||
|
.Where(p => p.CanRead && p.GetIndexParameters().Length == 0)
|
||||||
|
.Select(p => new PlaceholderProperty(
|
||||||
|
$"[{ToCapitalSnakeCase(p.Name)}]",
|
||||||
|
p))];
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string ToCapitalSnakeCase(string name)
|
||||||
|
{
|
||||||
|
return Regex.Replace(
|
||||||
|
Regex.Replace(name, @"([A-Z]+)([A-Z][a-z])", "$1_$2"),
|
||||||
|
@"([a-z0-9])([A-Z])",
|
||||||
|
"$1_$2").ToUpperInvariant();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -57,7 +57,7 @@ public abstract class EGDbContextBase : DbContext
|
|||||||
|
|
||||||
public DbSet<History> EnvelopeHistories { get; set; }
|
public DbSet<History> EnvelopeHistories { get; set; }
|
||||||
|
|
||||||
public DbSet<EnvelopeType> EnvelopeTypes { get; set; }
|
public DbSet<EnvelopeTypeDefaults> EnvelopeTypes { get; set; }
|
||||||
|
|
||||||
public DbSet<Receiver> Receivers { get; set; }
|
public DbSet<Receiver> Receivers { get; set; }
|
||||||
|
|
||||||
@@ -233,7 +233,7 @@ public abstract class EGDbContextBase : DbContext
|
|||||||
AddTrigger<History>();
|
AddTrigger<History>();
|
||||||
AddTrigger<EnvelopeReceiver>();
|
AddTrigger<EnvelopeReceiver>();
|
||||||
AddTrigger<EnvelopeReceiverReadOnly>();
|
AddTrigger<EnvelopeReceiverReadOnly>();
|
||||||
AddTrigger<EnvelopeType>();
|
AddTrigger<EnvelopeTypeDefaults>();
|
||||||
AddTrigger<Receiver>();
|
AddTrigger<Receiver>();
|
||||||
#if NET
|
#if NET
|
||||||
AddTrigger<EmailOut>();
|
AddTrigger<EmailOut>();
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
#if NET
|
#if NET
|
||||||
using Dapper;
|
using Dapper;
|
||||||
using DigitalData.UserManager.Application.Contracts.Repositories;
|
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
|
using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
|
||||||
using EnvelopeGenerator.Application.Common.SQL;
|
using EnvelopeGenerator.Application.Common.SQL;
|
||||||
using EnvelopeGenerator.Domain.Entities;
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
using Microsoft.Data.SqlClient;
|
using Microsoft.Data.SqlClient;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
|
|
||||||
@@ -12,13 +12,11 @@ namespace EnvelopeGenerator.Infrastructure.Executor;
|
|||||||
|
|
||||||
public class EnvelopeExecutor : SQLExecutor, IEnvelopeExecutor
|
public class EnvelopeExecutor : SQLExecutor, IEnvelopeExecutor
|
||||||
{
|
{
|
||||||
[Obsolete("Use IRepository")]
|
private readonly EGDbContext _dbContext;
|
||||||
private readonly IUserRepository _userRepository;
|
|
||||||
|
|
||||||
[Obsolete("Use IRepository")]
|
public EnvelopeExecutor(IServiceProvider provider, IOptions<SQLExecutorParams> sqlExecutorParamsOptions, EGDbContext dbContext) : base(provider, sqlExecutorParamsOptions)
|
||||||
public EnvelopeExecutor(IServiceProvider provider, IOptions<SQLExecutorParams> sqlExecutorParamsOptions, IUserRepository userRepository) : base(provider, sqlExecutorParamsOptions)
|
|
||||||
{
|
{
|
||||||
_userRepository = userRepository;
|
_dbContext = dbContext;
|
||||||
}
|
}
|
||||||
|
|
||||||
[Obsolete("Use IRepository")]
|
[Obsolete("Use IRepository")]
|
||||||
@@ -33,7 +31,9 @@ public class EnvelopeExecutor : SQLExecutor, IEnvelopeExecutor
|
|||||||
?? throw new InvalidOperationException($"Envelope creation failed. Parameters:" +
|
?? throw new InvalidOperationException($"Envelope creation failed. Parameters:" +
|
||||||
$"userId={userId}, title='{title}', message='{message}', tfaEnabled={tfaEnabled}.");
|
$"userId={userId}, title='{title}', message='{message}', tfaEnabled={tfaEnabled}.");
|
||||||
|
|
||||||
envelope.User = await _userRepository.ReadByIdAsync(envelope.UserId);
|
envelope.User = await _dbContext.Users
|
||||||
|
.AsNoTracking()
|
||||||
|
.FirstOrDefaultAsync(x => x.Id == envelope.UserId, cancellation);
|
||||||
|
|
||||||
return envelope;
|
return envelope;
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,813 +0,0 @@
|
|||||||
#if NET
|
|
||||||
using System;
|
|
||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Migrations
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public partial class InitialCreate : Migration
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.EnsureSchema(
|
|
||||||
name: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBDD_CLIENT_USER",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
USER_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
CLIENT_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
COMMENT = table.Column<string>(type: "nvarchar(max)", nullable: true),
|
|
||||||
ADDED_WHO = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
|
|
||||||
ADDED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBDD_CLIENT_USER", x => x.GUID);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBDD_GROUPS",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
Name = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
|
|
||||||
AD_SYNC = table.Column<bool>(type: "bit", nullable: false),
|
|
||||||
Internal = table.Column<bool>(type: "bit", nullable: false),
|
|
||||||
Active = table.Column<bool>(type: "bit", nullable: false),
|
|
||||||
Comment = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true),
|
|
||||||
ECM_FK_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
ADDED_WHO = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
|
|
||||||
CHANGED_WHO = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
|
|
||||||
ADDED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
CHANGED_WHEN = table.Column<DateTime>(type: "datetime", nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBDD_GROUPS", x => x.GUID);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBDD_MODULES",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
Name = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
|
|
||||||
SHORT_NAME = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBDD_MODULES", x => x.GUID);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBDD_USER",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
PRENAME = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
|
|
||||||
NAME = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
|
|
||||||
USERNAME = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
|
|
||||||
SHORTNAME = table.Column<string>(type: "nvarchar(30)", maxLength: 30, nullable: true),
|
|
||||||
EMAIL = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
|
|
||||||
LANGUAGE = table.Column<string>(type: "nvarchar(5)", maxLength: 5, nullable: false),
|
|
||||||
COMMENT = table.Column<string>(type: "nvarchar(500)", maxLength: 500, nullable: true),
|
|
||||||
DELETED = table.Column<bool>(type: "bit", nullable: false),
|
|
||||||
DATE_FORMAT = table.Column<string>(type: "nvarchar(10)", maxLength: 10, nullable: false),
|
|
||||||
ACTIVE = table.Column<bool>(type: "bit", nullable: false),
|
|
||||||
GENERAL_VIEWER = table.Column<string>(type: "nvarchar(30)", maxLength: 30, nullable: false),
|
|
||||||
WAN_ENVIRONMENT = table.Column<bool>(type: "bit", nullable: false),
|
|
||||||
USERID_FK_INT_ECM = table.Column<int>(type: "int", nullable: false),
|
|
||||||
DELETED_WHEN = table.Column<DateTime>(type: "datetime2", nullable: false),
|
|
||||||
DELETED_WHO = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
|
|
||||||
ADDED_WHO = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
|
|
||||||
CHANGED_WHO = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
|
|
||||||
ADDED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
CHANGED_WHEN = table.Column<DateTime>(type: "datetime", nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBDD_USER", x => x.GUID);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBEMLP_EMAIL_OUT",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
REMINDER_TYPE_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
SENDING_PROFILE = table.Column<int>(type: "int", nullable: false),
|
|
||||||
REFERENCE_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
REFERENCE_STRING = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true),
|
|
||||||
ENTITY_ID = table.Column<int>(type: "int", nullable: true),
|
|
||||||
WF_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
WF_REFERENCE = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true),
|
|
||||||
EMAIL_ADRESS = table.Column<string>(type: "varchar(1000)", maxLength: 1000, nullable: false),
|
|
||||||
EMAIL_SUBJ = table.Column<string>(type: "varchar(500)", maxLength: 500, nullable: false),
|
|
||||||
EMAIL_BODY = table.Column<string>(type: "varchar(max)", nullable: false),
|
|
||||||
EMAIL_ATTMT1 = table.Column<string>(type: "varchar(512)", maxLength: 512, nullable: true),
|
|
||||||
EMAIL_SENT = table.Column<DateTime>(type: "datetime2", nullable: true),
|
|
||||||
COMMENT = table.Column<string>(type: "varchar(500)", maxLength: 500, nullable: true),
|
|
||||||
ADDED_WHO = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false),
|
|
||||||
CHANGED_WHO = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true),
|
|
||||||
CHANGED_WHEN = table.Column<DateTime>(type: "datetime2", nullable: true),
|
|
||||||
ERROR_TIMESTAMP = table.Column<DateTime>(type: "datetime2", nullable: true),
|
|
||||||
ERROR_MSG = table.Column<string>(type: "varchar(900)", maxLength: 900, nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBEMLP_EMAIL_OUT", x => x.GUID);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBSIG_CONFIG",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
SENDING_PROFILE = table.Column<int>(type: "int", nullable: false),
|
|
||||||
SIGNATURE_HOST = table.Column<string>(type: "nvarchar(128)", nullable: false),
|
|
||||||
EXTERNAL_PROGRAM_NAME = table.Column<string>(type: "nvarchar(30)", nullable: true),
|
|
||||||
EXPORT_PATH = table.Column<string>(type: "nvarchar(256)", nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBSIG_EMAIL_TEMPLATE",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
NAME = table.Column<string>(type: "nvarchar(64)", nullable: true),
|
|
||||||
BODY = table.Column<string>(type: "nvarchar(max)", nullable: true),
|
|
||||||
SUBJECT = table.Column<string>(type: "nvarchar(512)", nullable: true),
|
|
||||||
ADDED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
CHANGED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBSIG_EMAIL_TEMPLATE", x => x.GUID);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBSIG_ENVELOPE_CERTIFICATE",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
ENVELOPE_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
ENVELOPE_UUID = table.Column<string>(type: "nvarchar(36)", nullable: false),
|
|
||||||
ENVELOPE_SUBJECT = table.Column<string>(type: "nvarchar(512)", nullable: false),
|
|
||||||
CREATOR_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
CREATOR_NAME = table.Column<string>(type: "nvarchar(128)", nullable: false),
|
|
||||||
CREATOR_EMAIL = table.Column<string>(type: "nvarchar(128)", nullable: false),
|
|
||||||
ENVELOPE_STATUS = table.Column<int>(type: "int", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBSIG_ENVELOPE_CERTIFICATE", x => x.GUID);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBSIG_ENVELOPE_TYPE",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
TITLE = table.Column<string>(type: "nvarchar(128)", nullable: false),
|
|
||||||
LANGUAGE = table.Column<string>(type: "nvarchar(5)", nullable: true),
|
|
||||||
EXPIRES_DAYS = table.Column<int>(type: "int", nullable: false),
|
|
||||||
CERTIFICATION_TYPE = table.Column<int>(type: "int", nullable: false),
|
|
||||||
USE_ACCESS_CODE = table.Column<bool>(type: "bit", nullable: false),
|
|
||||||
FINAL_EMAIL_TO_CREATOR = table.Column<int>(type: "int", nullable: false),
|
|
||||||
FINAL_EMAIL_TO_RECEIVERS = table.Column<int>(type: "int", nullable: false),
|
|
||||||
ADDED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
CHANGED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
EXPIRES_WARNING_DAYS = table.Column<int>(type: "int", nullable: false),
|
|
||||||
SEND_REMINDER_EMAILS = table.Column<bool>(type: "bit", nullable: false),
|
|
||||||
FIRST_REMINDER_DAYS = table.Column<int>(type: "int", nullable: false),
|
|
||||||
REMINDER_INTERVAL_DAYS = table.Column<int>(type: "int", nullable: false),
|
|
||||||
CONTRACT_TYPE = table.Column<int>(type: "int", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBSIG_ENVELOPE_TYPE", x => x.GUID);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBDD_GROUPS_USER",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
USER_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
GROUP_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
Comment = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true),
|
|
||||||
ADDED_WHO = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
|
|
||||||
CHANGED_WHO = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
|
|
||||||
ADDED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
CHANGED_WHEN = table.Column<DateTime>(type: "datetime", nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBDD_GROUPS_USER", x => x.GUID);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBDD_GROUPS_USER_TBDD_GROUPS_GROUP_ID",
|
|
||||||
column: x => x.GROUP_ID,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBDD_GROUPS",
|
|
||||||
principalColumn: "GUID",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBDD_GROUPS_USER_TBDD_USER_USER_ID",
|
|
||||||
column: x => x.USER_ID,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBDD_USER",
|
|
||||||
principalColumn: "GUID",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBDD_USER_MODULES",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
USER_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
MODULE_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
COMMENT = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true),
|
|
||||||
ADDED_WHO = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
|
|
||||||
CHANGED_WHO = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBDD_USER_MODULES", x => x.GUID);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBDD_USER_MODULES_TBDD_MODULES_MODULE_ID",
|
|
||||||
column: x => x.MODULE_ID,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBDD_MODULES",
|
|
||||||
principalColumn: "GUID",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBDD_USER_MODULES_TBDD_USER_USER_ID",
|
|
||||||
column: x => x.USER_ID,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBDD_USER",
|
|
||||||
principalColumn: "GUID",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBDD_USER_REPRESENTATION",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
USER_ID = table.Column<int>(type: "int", nullable: true),
|
|
||||||
REPR_GROUP = table.Column<int>(type: "int", nullable: true),
|
|
||||||
GROUP_ID = table.Column<int>(type: "int", nullable: true),
|
|
||||||
REPR_USER = table.Column<int>(type: "int", nullable: true),
|
|
||||||
VALID_FROM = table.Column<DateTime>(type: "datetime2", nullable: true),
|
|
||||||
VALID_TO = table.Column<DateTime>(type: "datetime2", nullable: true),
|
|
||||||
ADDED_WHO = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
|
|
||||||
CHANGED_WHO = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
|
|
||||||
ADDED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
CHANGED_WHEN = table.Column<DateTime>(type: "datetime", nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBDD_USER_REPRESENTATION", x => x.GUID);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBDD_USER_REPRESENTATION_TBDD_GROUPS_GROUP_ID",
|
|
||||||
column: x => x.GROUP_ID,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBDD_GROUPS",
|
|
||||||
principalColumn: "GUID");
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBDD_USER_REPRESENTATION_TBDD_GROUPS_REPR_GROUP",
|
|
||||||
column: x => x.REPR_GROUP,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBDD_GROUPS",
|
|
||||||
principalColumn: "GUID");
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBDD_USER_REPRESENTATION_TBDD_USER_REPR_USER",
|
|
||||||
column: x => x.REPR_USER,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBDD_USER",
|
|
||||||
principalColumn: "GUID");
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBDD_USER_REPRESENTATION_TBDD_USER_USER_ID",
|
|
||||||
column: x => x.USER_ID,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBDD_USER",
|
|
||||||
principalColumn: "GUID");
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBSIG_ENVELOPE",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
USER_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
STATUS = table.Column<int>(type: "int", nullable: false),
|
|
||||||
ENVELOPE_UUID = table.Column<string>(type: "nvarchar(36)", nullable: false),
|
|
||||||
MESSAGE = table.Column<string>(type: "nvarchar(max)", nullable: true),
|
|
||||||
EXPIRES_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
EXPIRES_WARNING_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
ADDED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
CHANGED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
TITLE = table.Column<string>(type: "nvarchar(128)", nullable: true),
|
|
||||||
CONTRACT_TYPE = table.Column<int>(type: "int", nullable: false),
|
|
||||||
LANGUAGE = table.Column<string>(type: "nvarchar(5)", nullable: true),
|
|
||||||
SEND_REMINDER_EMAILS = table.Column<bool>(type: "bit", nullable: false),
|
|
||||||
FIRST_REMINDER_DAYS = table.Column<int>(type: "int", nullable: false),
|
|
||||||
REMINDER_INTERVAL_DAYS = table.Column<int>(type: "int", nullable: false),
|
|
||||||
ENVELOPE_TYPE = table.Column<int>(type: "int", nullable: false),
|
|
||||||
CERTIFICATION_TYPE = table.Column<int>(type: "int", nullable: false),
|
|
||||||
USE_ACCESS_CODE = table.Column<bool>(type: "bit", nullable: false),
|
|
||||||
FINAL_EMAIL_TO_CREATOR = table.Column<int>(type: "int", nullable: false),
|
|
||||||
FINAL_EMAIL_TO_RECEIVERS = table.Column<int>(type: "int", nullable: false),
|
|
||||||
EXPIRES_WHEN_DAYS = table.Column<int>(type: "int", nullable: false),
|
|
||||||
EXPIRES_WARNING_WHEN_DAYS = table.Column<int>(type: "int", nullable: false),
|
|
||||||
TFA_ENABLED = table.Column<bool>(type: "bit", nullable: false),
|
|
||||||
DOC_RESULT = table.Column<byte[]>(type: "varbinary(max)", nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBSIG_ENVELOPE", x => x.GUID);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBSIG_ENVELOPE_TBDD_USER_USER_ID",
|
|
||||||
column: x => x.USER_ID,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBDD_USER",
|
|
||||||
principalColumn: "GUID",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBSIG_ENVELOPE_TBSIG_ENVELOPE_TYPE_ENVELOPE_TYPE",
|
|
||||||
column: x => x.ENVELOPE_TYPE,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBSIG_ENVELOPE_TYPE",
|
|
||||||
principalColumn: "GUID",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBSIG_ENVELOPE_DOCUMENT",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
ENVELOPE_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
ADDED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
BYTE_DATA = table.Column<byte[]>(type: "varbinary(max)", nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBSIG_ENVELOPE_DOCUMENT", x => x.GUID);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBSIG_ENVELOPE_DOCUMENT_TBSIG_ENVELOPE_ENVELOPE_ID",
|
|
||||||
column: x => x.ENVELOPE_ID,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBSIG_ENVELOPE",
|
|
||||||
principalColumn: "GUID",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBSIG_RECEIVER",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
EMAIL_ADDRESS = table.Column<string>(type: "nvarchar(250)", maxLength: 250, nullable: false),
|
|
||||||
SIGNATURE = table.Column<string>(type: "nvarchar(64)", nullable: false),
|
|
||||||
ADDED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
TOTP_SECRET_KEY = table.Column<string>(type: "nvarchar(MAX)", nullable: true),
|
|
||||||
TFA_REG_DEADLINE = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
EnvelopeId = table.Column<int>(type: "int", nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBSIG_RECEIVER", x => x.GUID);
|
|
||||||
table.UniqueConstraint("AK_TBSIG_RECEIVER_EMAIL_ADDRESS", x => x.EMAIL_ADDRESS);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBSIG_RECEIVER_TBSIG_ENVELOPE_EnvelopeId",
|
|
||||||
column: x => x.EnvelopeId,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBSIG_ENVELOPE",
|
|
||||||
principalColumn: "GUID");
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBSIG_DOCUMENT_RECEIVER_ELEMENT",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
DOCUMENT_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
RECEIVER_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
ELEMENT_TYPE = table.Column<int>(type: "int", nullable: false),
|
|
||||||
POSITION_X = table.Column<double>(type: "float", nullable: false),
|
|
||||||
POSITION_Y = table.Column<double>(type: "float", nullable: false),
|
|
||||||
WIDTH = table.Column<double>(type: "float", nullable: false),
|
|
||||||
HEIGHT = table.Column<double>(type: "float", nullable: false),
|
|
||||||
PAGE = table.Column<int>(type: "int", nullable: false),
|
|
||||||
REQUIRED = table.Column<bool>(type: "bit", nullable: false),
|
|
||||||
TOOLTIP = table.Column<string>(type: "nvarchar(max)", nullable: true),
|
|
||||||
READ_ONLY = table.Column<bool>(type: "bit", nullable: false),
|
|
||||||
ANNOTATION_INDEX = table.Column<int>(type: "int", nullable: false),
|
|
||||||
ADDED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
CHANGED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBSIG_DOCUMENT_RECEIVER_ELEMENT", x => x.GUID);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBSIG_DOCUMENT_RECEIVER_ELEMENT_TBSIG_ENVELOPE_DOCUMENT_DOCUMENT_ID",
|
|
||||||
column: x => x.DOCUMENT_ID,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBSIG_ENVELOPE_DOCUMENT",
|
|
||||||
principalColumn: "GUID",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBSIG_DOCUMENT_RECEIVER_ELEMENT_TBSIG_RECEIVER_RECEIVER_ID",
|
|
||||||
column: x => x.RECEIVER_ID,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBSIG_RECEIVER",
|
|
||||||
principalColumn: "GUID",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBSIG_DOCUMENT_STATUS",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<int>(type: "int", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
ENVELOPE_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
RECEIVER_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
STATUS = table.Column<int>(type: "int", nullable: false),
|
|
||||||
STATUS_CHANGED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
VALUE = table.Column<string>(type: "nvarchar(max)", nullable: true),
|
|
||||||
ADDED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
CHANGED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBSIG_DOCUMENT_STATUS", x => x.GUID);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBSIG_DOCUMENT_STATUS_TBSIG_ENVELOPE_ENVELOPE_ID",
|
|
||||||
column: x => x.ENVELOPE_ID,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBSIG_ENVELOPE",
|
|
||||||
principalColumn: "GUID",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBSIG_DOCUMENT_STATUS_TBSIG_RECEIVER_RECEIVER_ID",
|
|
||||||
column: x => x.RECEIVER_ID,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBSIG_RECEIVER",
|
|
||||||
principalColumn: "GUID",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBSIG_ENVELOPE_HISTORY",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<long>(type: "bigint", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
ENVELOPE_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
USER_REFERENCE = table.Column<string>(type: "nvarchar(128)", nullable: false),
|
|
||||||
STATUS = table.Column<int>(type: "int", nullable: false),
|
|
||||||
ADDED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
ACTION_DATE = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
COMMENT = table.Column<string>(type: "nvarchar(max)", nullable: true),
|
|
||||||
SenderId = table.Column<int>(type: "int", nullable: true),
|
|
||||||
ReceiverId = table.Column<int>(type: "int", nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBSIG_ENVELOPE_HISTORY", x => x.GUID);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBSIG_ENVELOPE_HISTORY_TBDD_USER_SenderId",
|
|
||||||
column: x => x.SenderId,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBDD_USER",
|
|
||||||
principalColumn: "GUID");
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBSIG_ENVELOPE_HISTORY_TBSIG_ENVELOPE_ENVELOPE_ID",
|
|
||||||
column: x => x.ENVELOPE_ID,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBSIG_ENVELOPE",
|
|
||||||
principalColumn: "GUID",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBSIG_ENVELOPE_HISTORY_TBSIG_RECEIVER_ReceiverId",
|
|
||||||
column: x => x.ReceiverId,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBSIG_RECEIVER",
|
|
||||||
principalColumn: "GUID");
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBSIG_ENVELOPE_RECEIVER",
|
|
||||||
schema: "dbo",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
ENVELOPE_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
RECEIVER_ID = table.Column<int>(type: "int", nullable: false),
|
|
||||||
SEQUENCE = table.Column<int>(type: "int", nullable: false),
|
|
||||||
NAME = table.Column<string>(type: "nvarchar(128)", nullable: true),
|
|
||||||
JOB_TITLE = table.Column<string>(type: "nvarchar(128)", nullable: true),
|
|
||||||
COMPANY_NAME = table.Column<string>(type: "nvarchar(128)", nullable: true),
|
|
||||||
PRIVATE_MESSAGE = table.Column<string>(type: "nvarchar(max)", nullable: true),
|
|
||||||
ACCESS_CODE = table.Column<string>(type: "nvarchar(64)", nullable: true),
|
|
||||||
ADDED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
CHANGED_WHEN = table.Column<DateTime>(type: "datetime", nullable: false),
|
|
||||||
PHONE_NUMBER = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBSIG_ENVELOPE_RECEIVER", x => new { x.ENVELOPE_ID, x.RECEIVER_ID });
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBSIG_ENVELOPE_RECEIVER_TBSIG_ENVELOPE_ENVELOPE_ID",
|
|
||||||
column: x => x.ENVELOPE_ID,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBSIG_ENVELOPE",
|
|
||||||
principalColumn: "GUID",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBSIG_ENVELOPE_RECEIVER_TBSIG_RECEIVER_RECEIVER_ID",
|
|
||||||
column: x => x.RECEIVER_ID,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBSIG_RECEIVER",
|
|
||||||
principalColumn: "GUID",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "TBSIG_ENVELOPE_RECEIVER_READ_ONLY",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
GUID = table.Column<long>(type: "bigint", nullable: false)
|
|
||||||
.Annotation("SqlServer:Identity", "1, 1"),
|
|
||||||
ENVELOPE_ID = table.Column<long>(type: "bigint", nullable: false),
|
|
||||||
RECEIVER_MAIL = table.Column<string>(type: "nvarchar(250)", maxLength: 250, nullable: false),
|
|
||||||
DATE_VALID = table.Column<DateTime>(type: "datetime2", nullable: false),
|
|
||||||
ADDED_WHO = table.Column<string>(type: "nvarchar(250)", maxLength: 250, nullable: false),
|
|
||||||
ADDED_WHEN = table.Column<DateTime>(type: "datetime2", nullable: false),
|
|
||||||
CHANGED_WHO = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
|
|
||||||
CHANGED_WHEN = table.Column<DateTime>(type: "datetime2", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_TBSIG_ENVELOPE_RECEIVER_READ_ONLY", x => x.GUID);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_TBSIG_ENVELOPE_RECEIVER_READ_ONLY_TBSIG_RECEIVER_ADDED_WHO",
|
|
||||||
column: x => x.ADDED_WHO,
|
|
||||||
principalSchema: "dbo",
|
|
||||||
principalTable: "TBSIG_RECEIVER",
|
|
||||||
principalColumn: "EMAIL_ADDRESS",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBDD_GROUPS_USER_GROUP_ID",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBDD_GROUPS_USER",
|
|
||||||
column: "GROUP_ID");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBDD_GROUPS_USER_USER_ID",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBDD_GROUPS_USER",
|
|
||||||
column: "USER_ID");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBDD_USER_MODULES_MODULE_ID",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBDD_USER_MODULES",
|
|
||||||
column: "MODULE_ID");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBDD_USER_MODULES_USER_ID",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBDD_USER_MODULES",
|
|
||||||
column: "USER_ID");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBDD_USER_REPRESENTATION_GROUP_ID",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBDD_USER_REPRESENTATION",
|
|
||||||
column: "GROUP_ID");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBDD_USER_REPRESENTATION_REPR_GROUP",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBDD_USER_REPRESENTATION",
|
|
||||||
column: "REPR_GROUP");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBDD_USER_REPRESENTATION_REPR_USER",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBDD_USER_REPRESENTATION",
|
|
||||||
column: "REPR_USER");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBDD_USER_REPRESENTATION_USER_ID",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBDD_USER_REPRESENTATION",
|
|
||||||
column: "USER_ID");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBSIG_DOCUMENT_RECEIVER_ELEMENT_DOCUMENT_ID",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBSIG_DOCUMENT_RECEIVER_ELEMENT",
|
|
||||||
column: "DOCUMENT_ID");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBSIG_DOCUMENT_RECEIVER_ELEMENT_RECEIVER_ID",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBSIG_DOCUMENT_RECEIVER_ELEMENT",
|
|
||||||
column: "RECEIVER_ID");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBSIG_DOCUMENT_STATUS_ENVELOPE_ID",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBSIG_DOCUMENT_STATUS",
|
|
||||||
column: "ENVELOPE_ID");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBSIG_DOCUMENT_STATUS_RECEIVER_ID",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBSIG_DOCUMENT_STATUS",
|
|
||||||
column: "RECEIVER_ID");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBSIG_ENVELOPE_ENVELOPE_TYPE",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBSIG_ENVELOPE",
|
|
||||||
column: "ENVELOPE_TYPE");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBSIG_ENVELOPE_USER_ID",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBSIG_ENVELOPE",
|
|
||||||
column: "USER_ID");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBSIG_ENVELOPE_DOCUMENT_ENVELOPE_ID",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBSIG_ENVELOPE_DOCUMENT",
|
|
||||||
column: "ENVELOPE_ID");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBSIG_ENVELOPE_HISTORY_ENVELOPE_ID",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBSIG_ENVELOPE_HISTORY",
|
|
||||||
column: "ENVELOPE_ID");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBSIG_ENVELOPE_HISTORY_ReceiverId",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBSIG_ENVELOPE_HISTORY",
|
|
||||||
column: "ReceiverId");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBSIG_ENVELOPE_HISTORY_SenderId",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBSIG_ENVELOPE_HISTORY",
|
|
||||||
column: "SenderId");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBSIG_ENVELOPE_RECEIVER_RECEIVER_ID",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBSIG_ENVELOPE_RECEIVER",
|
|
||||||
column: "RECEIVER_ID");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBSIG_ENVELOPE_RECEIVER_READ_ONLY_ADDED_WHO",
|
|
||||||
table: "TBSIG_ENVELOPE_RECEIVER_READ_ONLY",
|
|
||||||
column: "ADDED_WHO");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_TBSIG_RECEIVER_EnvelopeId",
|
|
||||||
schema: "dbo",
|
|
||||||
table: "TBSIG_RECEIVER",
|
|
||||||
column: "EnvelopeId");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBDD_CLIENT_USER",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBDD_GROUPS_USER",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBDD_USER_MODULES",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBDD_USER_REPRESENTATION",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBEMLP_EMAIL_OUT");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBSIG_CONFIG",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBSIG_DOCUMENT_RECEIVER_ELEMENT",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBSIG_DOCUMENT_STATUS",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBSIG_EMAIL_TEMPLATE",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBSIG_ENVELOPE_CERTIFICATE",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBSIG_ENVELOPE_HISTORY",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBSIG_ENVELOPE_RECEIVER",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBSIG_ENVELOPE_RECEIVER_READ_ONLY");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBDD_MODULES",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBDD_GROUPS",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBSIG_ENVELOPE_DOCUMENT",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBSIG_RECEIVER",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBSIG_ENVELOPE",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBDD_USER",
|
|
||||||
schema: "dbo");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "TBSIG_ENVELOPE_TYPE",
|
|
||||||
schema: "dbo");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -2,11 +2,12 @@
|
|||||||
using DigitalData.Core.Infrastructure;
|
using DigitalData.Core.Infrastructure;
|
||||||
using EnvelopeGenerator.Domain.Entities;
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
|
using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Repositories;
|
namespace EnvelopeGenerator.Infrastructure.Repositories;
|
||||||
|
|
||||||
[Obsolete("Use IRepository")]
|
[Obsolete("Use IRepository")]
|
||||||
public class EnvelopeTypeRepository : CRUDRepository<EnvelopeType, int, EGDbContext>, IEnvelopeTypeRepository
|
public class EnvelopeTypeRepository : CRUDRepository<EnvelopeTypeDefaults, EnvelopeType, EGDbContext>, IEnvelopeTypeRepository
|
||||||
{
|
{
|
||||||
public EnvelopeTypeRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeTypes)
|
public EnvelopeTypeRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeTypes)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
-- Original email template: DocumentAccessCodeReceived (GUID 5)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:32:15
|
||||||
|
-- Subject: Zugriffscode für Dokument erhalten: ''[DOCUMENT_TITLE]''
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_RECEIVER],<br />
|
||||||
|
<br /><B><I>
|
||||||
|
[NAME_SENDER]</I></B> hat Ihnen ein Dokument zum [SIGNATURE_TYPE] gesendet. <br />
|
||||||
|
<br />
|
||||||
|
Verwenden Sie den folgenden Zugriffscode, um das Dokument einzusehen:<br />
|
||||||
|
<br />
|
||||||
|
[DOCUMENT_ACCESS_CODE]<br />
|
||||||
|
<br />
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
|
WHERE GUID = 5;
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
-- Original email template: DocumentCompleted (GUID 4)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:29:55
|
||||||
|
-- Subject: Umschlag abgeschlossen: ''[DOCUMENT_TITLE]''
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_RECEIVER],<br />
|
||||||
|
<br />
|
||||||
|
Der Vorgang <B><I>''[DOCUMENT_TITLE]''</I></B> wurde erfolgreich abgeschlossen.<br />
|
||||||
|
<br />
|
||||||
|
Sie erhalten das Dokument mit einem detaillierten Ergebnisbericht als Anhang zu dieser Email.<br />
|
||||||
|
<br />
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
|
WHERE GUID = 4;
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
-- Original email template: DocumentDeleted (GUID 2)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:23:45
|
||||||
|
-- Subject: Umschlag zurückgezogen: ''[DOCUMENT_TITLE]''
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_RECEIVER],<br />
|
||||||
|
<br /><B><I>
|
||||||
|
[NAME_SENDER]</I></B> hat den Umschlag <B><I>''[DOCUMENT_TITLE]''</I></B> gelöscht/zurückgezogen.<br /><p>
|
||||||
|
Begründung: <br /> <I>[REASON]</I> <p>
|
||||||
|
<br />
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
-- Original email template: DocumentReceived (GUID 1, de-DE)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:06:07
|
||||||
|
-- Subject: Dokument erhalten: ''[DOCUMENT_TITLE]''
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_RECEIVER],<br />
|
||||||
|
<br /><B><I>
|
||||||
|
[NAME_SENDER]</I></B> hat Ihnen ein Dokument zum [SIGNATURE_TYPE] gesendet.<br />
|
||||||
|
<br />
|
||||||
|
Über den folgenden Link können Sie das Dokument einsehen[DOCUMENT_PROCESS]: <a href="[LINK_TO_DOCUMENT]">[LINK_TO_DOCUMENT_TEXT]</a><br />
|
||||||
|
<br />
|
||||||
|
[MESSAGE]<br />
|
||||||
|
<br />
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
|
WHERE GUID = 1;
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user