Compare commits
59 Commits
04cea1ca4b
...
refactor/w
| Author | SHA1 | Date | |
|---|---|---|---|
| 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 | |||
| b9cd629766 | |||
| e729adb441 | |||
| 67d0b07926 | |||
| 780277d656 | |||
| 635d5d8278 | |||
| f1c8e223dd | |||
| 31bf64a6f2 | |||
| 93142a56f7 | |||
| 64baef907c | |||
| 232b341894 | |||
| 57a08e8a89 | |||
| 198eabcbae | |||
| 6dfcc1b2be |
55
AGENTS.md
55
AGENTS.md
@@ -48,6 +48,16 @@ This section explains every markdown file in the repo: what it contains, why it
|
|||||||
- Implementing sender-side PDF.js overlay (signature field placement) — the receiver side is the reference implementation
|
- Implementing sender-side PDF.js overlay (signature field placement) — the receiver side is the reference implementation
|
||||||
**Maintenance:** Update when `pdf-viewer.js` API changes, new JS interop functions are added, or the signing flow is modified.
|
**Maintenance:** Update when `pdf-viewer.js` API changes, new JS interop functions are added, or the signing flow is modified.
|
||||||
|
|
||||||
|
#### `DATABASE_STRUCTURE_CONTEXT.md`
|
||||||
|
**What:** Deep DB documentation for the envelope domain. Includes table/column snapshot, entity-to-table mapping, EF relationship/constraint map, stored procedure behavior + call sites, and trigger behavior + wiring path.
|
||||||
|
**Why it exists:** DB is centralized and can evolve independently; this file preserves migration-critical data semantics when historical DB context is hard to recover.
|
||||||
|
**When you need it:**
|
||||||
|
- Planning or reviewing DB/schema changes
|
||||||
|
- Debugging status transitions/history side effects
|
||||||
|
- Tracing where `PRSIG_*` procedures or DB triggers affect app behavior
|
||||||
|
- Reconciling Domain entities with physical SQL schema
|
||||||
|
**Maintenance:** Refresh on each DB migration, trigger/procedure change, or significant Domain/EGDbContext model change.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
### Deployment Docs
|
### Deployment Docs
|
||||||
@@ -268,6 +278,7 @@ Manual testing workflow:
|
|||||||
|
|
||||||
## Technical Debt TODOs
|
## Technical Debt TODOs
|
||||||
|
|
||||||
|
- **CRITICAL (Licensing / pre-commercial release):** Remove all `SixLabors.ImageSharp` and `QRCoder-ImageSharp` package dependencies from production/runtime projects before commercial release. Replace remaining QR/image paths with permissive-license alternatives (no copyleft/share-source obligations), run repo-wide package audit (`*.csproj`), and add CI guardrails to block reintroduction.
|
||||||
- Refactor `EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeSenderPage.razor` to reduce complexity.
|
- Refactor `EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeSenderPage.razor` to reduce complexity.
|
||||||
- Move sender dashboard business/status logic into dedicated services and extension methods (for example effective status resolution, tab classification, receiver signed/rejected detection, and grid-layout filter sanitation).
|
- Move sender dashboard business/status logic into dedicated services and extension methods (for example effective status resolution, tab classification, receiver signed/rejected detection, and grid-layout filter sanitation).
|
||||||
- Keep `EnvelopeSenderPage.razor` focused on UI composition/state orchestration; avoid embedding heavy domain logic directly in the Razor component.
|
- Keep `EnvelopeSenderPage.razor` focused on UI composition/state orchestration; avoid embedding heavy domain logic directly in the Razor component.
|
||||||
@@ -293,11 +304,51 @@ Manual testing workflow:
|
|||||||
**Key Tables:**
|
**Key Tables:**
|
||||||
- `TBSIG_ENVELOPE` - Envelope metadata
|
- `TBSIG_ENVELOPE` - Envelope metadata
|
||||||
- `TBSIG_ENVELOPE_RECEIVER` - Receiver assignments
|
- `TBSIG_ENVELOPE_RECEIVER` - Receiver assignments
|
||||||
- `TBSIG_DOC_RECEIVER_ELEMENT` - Signature fields (X, Y in INCHES)
|
- `TBSIG_DOCUMENT_RECEIVER_ELEMENT` - Signature fields (X, Y in INCHES)
|
||||||
- `TBSIG_RECEIVER` - Receiver registry
|
- `TBSIG_RECEIVER` - Receiver registry
|
||||||
- `TBSIG_DOCUMENT` - PDF binary data
|
- `TBSIG_ENVELOPE_DOCUMENT` - PDF binary data
|
||||||
- `TBSIG_ENVELOPE_HISTORY` - Audit trail
|
- `TBSIG_ENVELOPE_HISTORY` - Audit trail
|
||||||
|
|
||||||
|
### Data Structure (Domain + EGDbContext)
|
||||||
|
|
||||||
|
Use this as the canonical quick map before touching sender/receiver workflow code.
|
||||||
|
|
||||||
|
#### Core Aggregate Shape
|
||||||
|
- `Envelope` (`TBSIG_ENVELOPE`) is the root aggregate for sending workflow.
|
||||||
|
- `Envelope -> Documents` is `1:N` via `Document.EnvelopeId` (`TBSIG_ENVELOPE_DOCUMENT`).
|
||||||
|
- `Envelope -> Histories` is `1:N` via `History.EnvelopeId` (`TBSIG_ENVELOPE_HISTORY`).
|
||||||
|
- `Envelope <-> Receiver` is `N:N` through `EnvelopeReceiver` (`TBSIG_ENVELOPE_RECEIVER`, composite PK `{EnvelopeId, ReceiverId}`).
|
||||||
|
- `Document -> DocReceiverElement` is `1:N` via `DocReceiverElement.DocumentId` (`TBSIG_DOCUMENT_RECEIVER_ELEMENT`).
|
||||||
|
- `DocReceiverElement -> ElementAnnotation` is `1:N` via `ElementAnnotation.ElementId` (`TBSIG_DOCUMENT_RECEIVER_ELEMENT_ANNOTATION`).
|
||||||
|
|
||||||
|
#### Status and Tracking Entities
|
||||||
|
- `DocumentStatus` (`TBSIG_DOCUMENT_STATUS`) links `EnvelopeId + ReceiverId` and stores receiver-level signing state.
|
||||||
|
- `History` stores timeline events (`EnvelopeStatus`) with polymorphic `UserReference` lookup semantics.
|
||||||
|
- `EnvelopeReceiverReadOnly` (`TBSIG_ENVELOPE_RECEIVER_READ_ONLY`) stores temporary read-only delegation with validity window (`DateValid`).
|
||||||
|
|
||||||
|
#### Important Constraints From `EGDbContext`
|
||||||
|
- `Envelope.Uuid` has a unique index.
|
||||||
|
- `Receiver.Signature` has a unique index.
|
||||||
|
- `Receiver.EmailAddress` has a unique index.
|
||||||
|
- `EnvelopeReceiver` uses composite primary key: `{ EnvelopeId, ReceiverId }`.
|
||||||
|
- `History.UserReference` is mapped conditionally (`IsMigration == false`) to:
|
||||||
|
- `Receiver.EmailAddress` (`History.Receiver`)
|
||||||
|
- `User.Email` from UserManager (`History.Sender`)
|
||||||
|
- `EnvelopeReceiverReadOnly.AddedWho` maps to `Receiver.EmailAddress` (principal key mapping, not receiver GUID).
|
||||||
|
|
||||||
|
#### Coordinate-Critical Fields
|
||||||
|
- Signature placement is persisted in `DocReceiverElement` as `X`, `Y`, `Width`, `Height`, `Page`.
|
||||||
|
- These coordinates are in INCHES (not PDF points, not pixels).
|
||||||
|
|
||||||
|
#### Cross-Module Tables in Same Context
|
||||||
|
- `EGDbContext` also includes UserManager entities: `User`, `Group`, `Module`, `GroupOfUser`, `ModuleOfUser`, `UserRep`, and `ClientUser`.
|
||||||
|
- Mail dispatcher entity `EmailOut` is also registered under `#if NET` and trigger-configurable.
|
||||||
|
|
||||||
|
#### Trigger-Aware Model Notes
|
||||||
|
- Trigger names are injected from `DbTriggerParams` in appsettings and applied via `ToTable(tb => tb.HasTrigger(...))`.
|
||||||
|
- Current trigger registration is explicit (`AddTrigger<T>()` calls), not attribute/reflection driven.
|
||||||
|
- Do not remove trigger mappings casually; this project depends on DB-side automation/audit behavior.
|
||||||
|
|
||||||
## DevExpress
|
## DevExpress
|
||||||
|
|
||||||
**License:** Commercial (v25.2.3)
|
**License:** Commercial (v25.2.3)
|
||||||
|
|||||||
384
DATABASE_STRUCTURE_CONTEXT.md
Normal file
384
DATABASE_STRUCTURE_CONTEXT.md
Normal file
@@ -0,0 +1,384 @@
|
|||||||
|
# Database Structure Context
|
||||||
|
|
||||||
|
## Why this file exists
|
||||||
|
|
||||||
|
This is the deep-dive DB reference for migration work when schema can change and old DB knowledge may be lost.
|
||||||
|
|
||||||
|
- Scope: `EnvelopeGenerator.Domain` entities + `EnvelopeGenerator.Infrastructure/EGDbContext.cs` + live DB metadata snapshot from `DD_ECM`.
|
||||||
|
- Goal: make schema transitions predictable (what exists, how it is linked, where logic executes).
|
||||||
|
- Safety: all DB checks used read-only `SELECT` metadata queries; no data mutation.
|
||||||
|
|
||||||
|
## Snapshot metadata
|
||||||
|
|
||||||
|
- Source DB: `DD_ECM` on `SDD-VHP04-SQL19\DD_TESTING01`
|
||||||
|
- Snapshot date: `2026-10-20`
|
||||||
|
- App context: `EnvelopeGenerator.Infrastructure/EGDbContext.cs`
|
||||||
|
|
||||||
|
## Fast navigation
|
||||||
|
|
||||||
|
- High-level aggregate map: `AGENTS.md` -> `Database` section
|
||||||
|
- EF model config source: `EnvelopeGenerator.Infrastructure/EGDbContext.cs`
|
||||||
|
- Stored procedure wrappers:
|
||||||
|
- `EnvelopeGenerator.Application/Common/SQL/EnvelopeCreateReadSQL.cs`
|
||||||
|
- `EnvelopeGenerator.Application/Common/SQL/EnvelopeReceiverAddReadSQL.cs`
|
||||||
|
- `EnvelopeGenerator.Application/Common/SQL/DocumentCreateReadSQL.cs`
|
||||||
|
- Direct SQL execution in controller:
|
||||||
|
- `EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeReceiverController.cs`
|
||||||
|
|
||||||
|
## Core data model (ER-level)
|
||||||
|
|
||||||
|
- `Envelope` (`TBSIG_ENVELOPE`) is root aggregate.
|
||||||
|
- `Envelope (1) -> (N) Document` via `TBSIG_ENVELOPE_DOCUMENT.ENVELOPE_ID`.
|
||||||
|
- `Envelope (1) -> (N) History` via `TBSIG_ENVELOPE_HISTORY.ENVELOPE_ID`.
|
||||||
|
- `Envelope (N) <-> (N) Receiver` through `EnvelopeReceiver` (`TBSIG_ENVELOPE_RECEIVER`, composite PK `{ENVELOPE_ID, RECEIVER_ID}`).
|
||||||
|
- `Document (1) -> (N) DocReceiverElement` via `TBSIG_DOCUMENT_RECEIVER_ELEMENT.DOCUMENT_ID`.
|
||||||
|
- `DocReceiverElement (1) -> (N) ElementAnnotation` via `TBSIG_DOCUMENT_RECEIVER_ELEMENT_ANNOTATION.ELEMENT_ID`.
|
||||||
|
- `DocumentStatus` links `Envelope + Receiver` state in `TBSIG_DOCUMENT_STATUS`.
|
||||||
|
|
||||||
|
## Entity <-> table mapping (code-level)
|
||||||
|
|
||||||
|
| Entity | Table | PK in code | PK in DB | Important relation notes |
|
||||||
|
|---|---|---|---|---|
|
||||||
|
| `Envelope` | `TBSIG_ENVELOPE` | `Id` | `GUID` | Has `Documents`, `Histories`, `EnvelopeReceivers`; unique index on `Uuid` configured in EF |
|
||||||
|
| `EnvelopeReceiver` | `TBSIG_ENVELOPE_RECEIVER` | `{EnvelopeId, ReceiverId}` | `{ENVELOPE_ID, RECEIVER_ID}` | DB also has `GUID` identity (not modeled as entity PK) |
|
||||||
|
| `Document` | `TBSIG_ENVELOPE_DOCUMENT` | `Id` | `GUID` | FK `ENVELOPE_ID` |
|
||||||
|
| `DocReceiverElement` | `TBSIG_DOCUMENT_RECEIVER_ELEMENT` | `Id` | `GUID` | Coordinates persisted here (`POSITION_X/Y`, `WIDTH`, `HEIGHT`, `PAGE`) |
|
||||||
|
| `ElementAnnotation` | `TBSIG_DOCUMENT_RECEIVER_ELEMENT_ANNOTATION` | `Id` | `GUID` | FK `ELEMENT_ID` |
|
||||||
|
| `DocumentStatus` | `TBSIG_DOCUMENT_STATUS` | `Id` | `GUID` | FK `ENVELOPE_ID`, `RECEIVER_ID` |
|
||||||
|
| `History` | `TBSIG_ENVELOPE_HISTORY` | `Id` | `GUID` | `USER_REFERENCE` maps to `Receiver.EmailAddress` and `User.Email` when `IsMigration == false` |
|
||||||
|
| `Receiver` | `TBSIG_RECEIVER` | `Id` | `GUID` | Unique indexes in code: `Signature`, `EmailAddress` |
|
||||||
|
| `EnvelopeReceiverReadOnly` | `TBSIG_ENVELOPE_RECEIVER_READ_ONLY` | `Id` | `GUID` | `AddedWho` is FK-like mapping to `Receiver.EmailAddress` |
|
||||||
|
| `EnvelopeType` | `TBSIG_ENVELOPE_TYPE` | `Id` | `GUID` | Used as optional envelope defaults/template |
|
||||||
|
| `EmailTemplate` | `TBSIG_EMAIL_TEMPLATE` | `Id` | `GUID` | Trigger-managed `CHANGED_WHEN` |
|
||||||
|
| `EmailOut` (legacy/bridge) | `TBEMLP_EMAIL_OUT` | `Id` | `GUID` | Internal/obsolete domain class, still registered for DB access |
|
||||||
|
|
||||||
|
## Physical schema snapshot (table/column level)
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
- Format per column: `COLUMN_NAME TYPE NULLABLE`.
|
||||||
|
- This section reflects live DB metadata at snapshot time.
|
||||||
|
|
||||||
|
### `TBSIG_ENVELOPE`
|
||||||
|
|
||||||
|
- `GUID int NOT NULL`
|
||||||
|
- `USER_ID int NOT NULL`
|
||||||
|
- `STATUS int NOT NULL`
|
||||||
|
- `ENVELOPE_UUID nvarchar(36) NOT NULL`
|
||||||
|
- `MESSAGE nvarchar(max) NOT NULL`
|
||||||
|
- `EXPIRES_WHEN datetime NULL`
|
||||||
|
- `EXPIRES_WARNING_WHEN datetime NULL`
|
||||||
|
- `VERIFICATION_TYPE tinyint NOT NULL`
|
||||||
|
- `TITLE nvarchar(128) NULL`
|
||||||
|
- `CONTRACT_TYPE int NULL`
|
||||||
|
- `LANGUAGE nvarchar(5) NULL`
|
||||||
|
- `SEND_REMINDER_EMAILS bit NULL`
|
||||||
|
- `FIRST_REMINDER_DAYS int NULL`
|
||||||
|
- `REMINDER_INTERVAL_DAYS int NULL`
|
||||||
|
- `ENVELOPE_TYPE int NULL`
|
||||||
|
- `CERTIFICATION_TYPE int NULL`
|
||||||
|
- `USE_ACCESS_CODE bit NULL`
|
||||||
|
- `FINAL_EMAIL_TO_CREATOR int NULL`
|
||||||
|
- `FINAL_EMAIL_TO_RECEIVERS int NULL`
|
||||||
|
- `EXPIRES_WHEN_DAYS int NULL`
|
||||||
|
- `EXPIRES_WARNING_WHEN_DAYS int NULL`
|
||||||
|
- `TFA_ENABLED bit NOT NULL`
|
||||||
|
- `DOC_RESULT varbinary(max) NULL`
|
||||||
|
- `LANG_CODE varchar(5) NOT NULL`
|
||||||
|
- `SOURCE varchar(10) NOT NULL`
|
||||||
|
- `COMMENT varchar(128) NULL`
|
||||||
|
- `ADDED_WHEN datetime NOT NULL`
|
||||||
|
- `CHANGED_WHEN datetime NULL`
|
||||||
|
|
||||||
|
### `TBSIG_ENVELOPE_RECEIVER`
|
||||||
|
|
||||||
|
- `ENVELOPE_ID int NOT NULL`
|
||||||
|
- `RECEIVER_ID int NOT NULL`
|
||||||
|
- `SEQUENCE int NOT NULL`
|
||||||
|
- `NAME nvarchar(128) NULL`
|
||||||
|
- `JOB_TITLE nvarchar(128) NULL`
|
||||||
|
- `COMPANY_NAME nvarchar(128) NULL`
|
||||||
|
- `PRIVATE_MESSAGE nvarchar(max) NULL`
|
||||||
|
- `ACCESS_CODE nvarchar(64) NULL`
|
||||||
|
- `ADDED_WHEN datetime NOT NULL`
|
||||||
|
- `CHANGED_WHEN datetime NULL`
|
||||||
|
- `GUID bigint NOT NULL`
|
||||||
|
- `PHONE_NUMBER varchar(20) NULL`
|
||||||
|
- `PARENT_ENVELOPE_RECEIVER_ID int NOT NULL`
|
||||||
|
|
||||||
|
### `TBSIG_ENVELOPE_DOCUMENT`
|
||||||
|
|
||||||
|
- `GUID int NOT NULL`
|
||||||
|
- `ENVELOPE_ID int NOT NULL`
|
||||||
|
- `FILENAME nvarchar(256) NOT NULL`
|
||||||
|
- `FILEPATH nvarchar(256) NOT NULL`
|
||||||
|
- `ADDED_WHEN datetime NOT NULL`
|
||||||
|
- `FILENAME_ORIGINAL nvarchar(256) NULL`
|
||||||
|
- `BYTE_DATA varbinary(max) NULL`
|
||||||
|
|
||||||
|
### `TBSIG_DOCUMENT_RECEIVER_ELEMENT`
|
||||||
|
|
||||||
|
- `GUID int NOT NULL`
|
||||||
|
- `DOCUMENT_ID int NOT NULL`
|
||||||
|
- `RECEIVER_ID int NOT NULL`
|
||||||
|
- `ELEMENT_TYPE int NOT NULL`
|
||||||
|
- `POSITION_X float NOT NULL`
|
||||||
|
- `POSITION_Y float NOT NULL`
|
||||||
|
- `WIDTH float NOT NULL`
|
||||||
|
- `HEIGHT float NOT NULL`
|
||||||
|
- `PAGE int NOT NULL`
|
||||||
|
- `REQUIRED bit NOT NULL`
|
||||||
|
- `TOOLTIP nvarchar(512) NULL`
|
||||||
|
- `READ_ONLY bit NOT NULL`
|
||||||
|
- `ANNOTATION_INDEX int NOT NULL`
|
||||||
|
- `ADDED_WHEN datetime NOT NULL`
|
||||||
|
- `CHANGED_WHEN datetime NULL`
|
||||||
|
- `CHANGED_WHO nvarchar(100) NULL`
|
||||||
|
- `FULL_NAME nvarchar(100) NULL`
|
||||||
|
- `POSITION nvarchar(100) NULL`
|
||||||
|
- `PLACE nvarchar(100) NULL`
|
||||||
|
- `INK varbinary(max) NULL`
|
||||||
|
|
||||||
|
### `TBSIG_DOCUMENT_RECEIVER_ELEMENT_ANNOTATION`
|
||||||
|
|
||||||
|
- `GUID bigint NOT NULL`
|
||||||
|
- `ELEMENT_ID int NOT NULL`
|
||||||
|
- `NAME nvarchar(100) NOT NULL`
|
||||||
|
- `VALUE nvarchar(max) NOT NULL`
|
||||||
|
- `ADDED_WHEN datetime NOT NULL`
|
||||||
|
- `CHANGED_WHEN datetime NULL`
|
||||||
|
- `CHANGED_WHO nvarchar(100) NULL`
|
||||||
|
- `TYPE nvarchar(50) NOT NULL`
|
||||||
|
- `POSITION_X float NULL`
|
||||||
|
- `POSITION_Y float NULL`
|
||||||
|
- `WIDTH float NULL`
|
||||||
|
- `HEIGHT float NULL`
|
||||||
|
|
||||||
|
### `TBSIG_DOCUMENT_STATUS`
|
||||||
|
|
||||||
|
- `GUID int NOT NULL`
|
||||||
|
- `ENVELOPE_ID int NOT NULL`
|
||||||
|
- `RECEIVER_ID int NOT NULL`
|
||||||
|
- `STATUS int NOT NULL`
|
||||||
|
- `STATUS_CHANGED_WHEN datetime NULL`
|
||||||
|
- `VALUE nvarchar(max) NULL`
|
||||||
|
- `ADDED_WHEN datetime NOT NULL`
|
||||||
|
- `CHANGED_WHEN datetime NULL`
|
||||||
|
|
||||||
|
### `TBSIG_ENVELOPE_HISTORY`
|
||||||
|
|
||||||
|
- `GUID bigint NOT NULL`
|
||||||
|
- `ENVELOPE_ID int NOT NULL`
|
||||||
|
- `USER_REFERENCE nvarchar(128) NOT NULL`
|
||||||
|
- `STATUS int NOT NULL`
|
||||||
|
- `ADDED_WHEN datetime NOT NULL`
|
||||||
|
- `ACTION_DATE datetime NULL`
|
||||||
|
- `COMMENT nvarchar(max) NULL`
|
||||||
|
|
||||||
|
### `TBSIG_RECEIVER`
|
||||||
|
|
||||||
|
- `GUID int NOT NULL`
|
||||||
|
- `EMAIL_ADDRESS nvarchar(128) NOT NULL`
|
||||||
|
- `SIGNATURE nvarchar(64) NOT NULL`
|
||||||
|
- `ADDED_WHEN datetime NOT NULL`
|
||||||
|
- `TOTP_SECRET_KEY nvarchar(max) NULL`
|
||||||
|
- `TFA_REG_DEADLINE datetime NULL`
|
||||||
|
- `CULTURE nvarchar(10) NULL`
|
||||||
|
|
||||||
|
### `TBSIG_ENVELOPE_RECEIVER_READ_ONLY`
|
||||||
|
|
||||||
|
- `GUID bigint NOT NULL`
|
||||||
|
- `ENVELOPE_ID bigint NOT NULL`
|
||||||
|
- `RECEIVER_MAIL nvarchar(250) NOT NULL`
|
||||||
|
- `DATE_VALID date NOT NULL`
|
||||||
|
- `ADDED_WHO varchar(100) NOT NULL`
|
||||||
|
- `ADDED_WHEN datetime NULL`
|
||||||
|
- `CHANGED_WHO varchar(100) NULL`
|
||||||
|
- `CHANGED_WHEN datetime NULL`
|
||||||
|
|
||||||
|
### `TBSIG_ENVELOPE_TYPE`
|
||||||
|
|
||||||
|
- `GUID int NOT NULL`
|
||||||
|
- `TITLE nvarchar(128) NOT NULL`
|
||||||
|
- `LANGUAGE nvarchar(5) NOT NULL`
|
||||||
|
- `EXPIRES_DAYS int NULL`
|
||||||
|
- `CERTIFICATION_TYPE int NULL`
|
||||||
|
- `USE_ACCESS_CODE bit NULL`
|
||||||
|
- `FINAL_EMAIL_TO_CREATOR int NULL`
|
||||||
|
- `FINAL_EMAIL_TO_RECEIVERS int NULL`
|
||||||
|
- `ADDED_WHEN datetime NOT NULL`
|
||||||
|
- `CHANGED_WHEN datetime NULL`
|
||||||
|
- `EXPIRES_WARNING_DAYS int NULL`
|
||||||
|
- `SEND_REMINDER_EMAILS bit NULL`
|
||||||
|
- `FIRST_REMINDER_DAYS int NULL`
|
||||||
|
- `REMINDER_INTERVAL_DAYS int NULL`
|
||||||
|
- `CONTRACT_TYPE int NULL`
|
||||||
|
|
||||||
|
### `TBSIG_EMAIL_TEMPLATE`
|
||||||
|
|
||||||
|
- `GUID int NOT NULL`
|
||||||
|
- `NAME nvarchar(64) NULL`
|
||||||
|
- `BODY nvarchar(max) NULL`
|
||||||
|
- `SUBJECT nvarchar(512) NULL`
|
||||||
|
- `ADDED_WHEN datetime NOT NULL`
|
||||||
|
- `CHANGED_WHEN datetime NULL`
|
||||||
|
- `LANG_CODE varchar(5) NOT NULL`
|
||||||
|
|
||||||
|
### `TBEMLP_EMAIL_OUT`
|
||||||
|
|
||||||
|
- `GUID int NOT NULL`
|
||||||
|
- `REMINDER_TYPE_ID int NOT NULL`
|
||||||
|
- `SENDING_PROFILE int NOT NULL`
|
||||||
|
- `REFERENCE_ID int NOT NULL`
|
||||||
|
- `REFERENCE_STRING varchar(200) NULL`
|
||||||
|
- `ENTITY_ID int NULL`
|
||||||
|
- `WF_ID int NOT NULL`
|
||||||
|
- `WF_REFERENCE varchar(200) NULL`
|
||||||
|
- `EMAIL_ADRESS varchar(1000) NOT NULL`
|
||||||
|
- `EMAIL_SUBJ varchar(500) NOT NULL`
|
||||||
|
- `EMAIL_BODY varchar(max) NOT NULL`
|
||||||
|
- `EMAIL_ATTMT1 varchar(512) NULL`
|
||||||
|
- `EMAIL_SENT datetime NULL`
|
||||||
|
- `COMMENT varchar(500) NULL`
|
||||||
|
- `ADDED_WHO varchar(50) NOT NULL`
|
||||||
|
- `ADDED_WHEN datetime NULL`
|
||||||
|
- `CHANGED_WHO varchar(50) NULL`
|
||||||
|
- `CHANGED_WHEN datetime NULL`
|
||||||
|
- `ERROR_TIMESTAMP datetime NULL`
|
||||||
|
- `ERROR_MSG varchar(900) NULL`
|
||||||
|
- `ATTACHMENT1_BYTES varbinary(max) NULL`
|
||||||
|
- `ATT1_RELATED_ID bigint NULL`
|
||||||
|
- `ATT1_REL_TYPE varchar(20) NULL`
|
||||||
|
|
||||||
|
## Constraints and indexes (relevant)
|
||||||
|
|
||||||
|
From EF + DB metadata snapshot:
|
||||||
|
|
||||||
|
- `TBSIG_ENVELOPE`: PK `PK_TBSIG_ENVELOPE (GUID)`.
|
||||||
|
- `TBSIG_ENVELOPE_RECEIVER`: composite PK `PK_TBSIG_ENVELOPE_RECEIVER (ENVELOPE_ID, RECEIVER_ID)`.
|
||||||
|
- `TBSIG_DOCUMENT_RECEIVER_ELEMENT`: PK `GUID`, plus unique key `UQTBSIG_DOCUMENT_RECEIVER_ELEMENT_DocID_PosX_PosY (DOCUMENT_ID, POSITION_X, POSITION_Y)`.
|
||||||
|
- `TBSIG_RECEIVER`: PK `GUID`, unique key `UQTBSIG_RECEIVER (EMAIL_ADDRESS)`.
|
||||||
|
- `TBEMLP_EMAIL_OUT`: PK `GUID`, FK `FK_TBEMLP_EMAIL_OUT_SENDING_PROFILE`.
|
||||||
|
|
||||||
|
## Stored procedures: behavior and code call sites
|
||||||
|
|
||||||
|
### Active in .NET code path
|
||||||
|
|
||||||
|
1) `PRSIG_API_CREATE_ENVELOPE`
|
||||||
|
- Purpose: creates envelope row (`STATUS=1002`, `SOURCE='API'`, defaults) and returns `ENVELOPE_UUID` via output.
|
||||||
|
- DB writes: `TBSIG_ENVELOPE`.
|
||||||
|
- Called by:
|
||||||
|
- SQL template `EnvelopeGenerator.Application/Common/SQL/EnvelopeCreateReadSQL.cs`
|
||||||
|
- executor `EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs`
|
||||||
|
- used in `EnvelopeReceiverController.CreateAsync` and `CreateEnvelopeReceiverCommandHandler`.
|
||||||
|
|
||||||
|
2) `PRSIG_API_CREATE_RECEIVER`
|
||||||
|
- Purpose: upserts `TBSIG_RECEIVER` by email, adds envelope assignment row with generated access code.
|
||||||
|
- DB writes: `TBSIG_RECEIVER`, `TBSIG_ENVELOPE_RECEIVER`.
|
||||||
|
- Called by:
|
||||||
|
- SQL template `EnvelopeGenerator.Application/Common/SQL/EnvelopeReceiverAddReadSQL.cs`
|
||||||
|
- executor `EnvelopeGenerator.Infrastructure/Executor/EnvelopeReceiverExecutor.cs`
|
||||||
|
- used in `EnvelopeReceiverController.CreateAsync` and `CreateEnvelopeReceiverCommandHandler`.
|
||||||
|
|
||||||
|
3) `PRSIG_API_ADD_DOC`
|
||||||
|
- Purpose: stores one document for envelope if absent; returns doc id.
|
||||||
|
- DB writes: `TBSIG_ENVELOPE_DOCUMENT`.
|
||||||
|
- Called by:
|
||||||
|
- SQL template `EnvelopeGenerator.Application/Common/SQL/DocumentCreateReadSQL.cs`
|
||||||
|
- executor `EnvelopeGenerator.Infrastructure/Executor/DocumentExecutor.cs`
|
||||||
|
- used in `EnvelopeReceiverController.CreateAsync`.
|
||||||
|
|
||||||
|
4) `PRSIG_API_ADD_DOC_RECEIVER_ELEM`
|
||||||
|
- Purpose: inserts signature element record if `(DOC_ID, RECEIVER_ID)` pair does not exist.
|
||||||
|
- DB writes: `TBSIG_DOCUMENT_RECEIVER_ELEMENT`.
|
||||||
|
- Called directly by:
|
||||||
|
- `EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeReceiverController.cs`
|
||||||
|
|
||||||
|
5) `PRSIG_API_ADD_HISTORY_STATE`
|
||||||
|
- Purpose: appends history row with status and user reference.
|
||||||
|
- DB writes: `TBSIG_ENVELOPE_HISTORY`.
|
||||||
|
- Called directly by:
|
||||||
|
- `EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeReceiverController.cs`
|
||||||
|
|
||||||
|
### Legacy/other path references in repo
|
||||||
|
|
||||||
|
- `PRSIG_GET_ENVELOPES_FOR_USER` and `PRSIG_GET_CLOSED_ENVELOPES_FOR_USER` are called in legacy VB path:
|
||||||
|
- `EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb`
|
||||||
|
|
||||||
|
- `PRSIG_API_WITHDRAW_ENVELOPE` exists in DB snapshot but no active `.cs` call site found in current server flow.
|
||||||
|
|
||||||
|
## Trigger behavior and where they are wired
|
||||||
|
|
||||||
|
## How trigger names are wired in app
|
||||||
|
|
||||||
|
- Config source: `EnvelopeGenerator.Server/EnvelopeGenerator.Server/appsettings.json` -> `DbTriggerParams`.
|
||||||
|
- DI binding: `EnvelopeGenerator.Infrastructure/DependencyInjection.cs` (`AddDbTriggerParams`).
|
||||||
|
- Model binding: `EnvelopeGenerator.Infrastructure/EGDbContext.cs` -> `AddTrigger<T>()` -> `ToTable(tb => tb.HasTrigger(triggerName))`.
|
||||||
|
|
||||||
|
### Trigger definitions observed in DB snapshot
|
||||||
|
|
||||||
|
1) `TBSIG_DOCUMENT_RECEIVER_ELEMENT_AFT_INS`
|
||||||
|
- Fires on insert of `TBSIG_DOCUMENT_RECEIVER_ELEMENT`.
|
||||||
|
- Normalizes/rewrites `POSITION_X`, `POSITION_Y` and sets `CHANGED_WHO='TBSIG_DOC_REC_EL_AFT_INS'`.
|
||||||
|
|
||||||
|
2) `TBSIG_DOCUMENT_RECEIVER_ELEMENT_AFT_UPD`
|
||||||
|
- Fires on update of `TBSIG_DOCUMENT_RECEIVER_ELEMENT`.
|
||||||
|
- Rewrites coordinates and `CHANGED_WHO='TBSIG_DOC_REC_EL_AFT_UPD'` except when `CHANGED_WHO='OFFSET_Y_POS'`.
|
||||||
|
|
||||||
|
3) `TBSIG_ENVELOPE_HISTORY_AFT_INS`
|
||||||
|
- Fires on history insert.
|
||||||
|
- Central state machine side-effects:
|
||||||
|
- syncs `TBSIG_ENVELOPE.STATUS` for selected `100x` states,
|
||||||
|
- on `1003` applies Y-offset update to receiver elements,
|
||||||
|
- on `2005` calculates partial/fully signed and may insert follow-up `1006` history,
|
||||||
|
- on `2007` (type-dependent reject path) writes rejection emails into `TBEMLP_EMAIL_OUT` and updates envelope rejected state,
|
||||||
|
- on `3001` invitation-message counting can move envelope to `1004`.
|
||||||
|
|
||||||
|
4) `TBSIG_EMAIL_TEMPLATE_AFT_UPD`
|
||||||
|
- Fires on update of `TBSIG_EMAIL_TEMPLATE`.
|
||||||
|
- Sets `CHANGED_WHEN = GETDATE()`.
|
||||||
|
|
||||||
|
5) `TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD`
|
||||||
|
- Fires on update of `TBSIG_ENVELOPE_RECEIVER_READ_ONLY`.
|
||||||
|
- Updates config timestamp row (`TBSIG_CONFIG.GUID = 1`).
|
||||||
|
|
||||||
|
6) `TBEMLP_EMAIL_OUT_AFT_UPD`
|
||||||
|
- Fires on update of `TBEMLP_EMAIL_OUT`.
|
||||||
|
- When `EMAIL_SENT` changes and `WF_ID in (3001..3005)`, writes corresponding history entries to `TBSIG_ENVELOPE_HISTORY`.
|
||||||
|
|
||||||
|
### Trigger mismatch alert (important)
|
||||||
|
|
||||||
|
- `DbTriggerParams` contains `TBEMLP_EMAIL_OUT_AFT_INS`, but this trigger was not found in the snapshot DB (`ExistsInDb = 0`).
|
||||||
|
- `TBEMLP_EMAIL_OUT_AFT_UPD` exists and is active.
|
||||||
|
|
||||||
|
This should be treated as environment drift and validated before migrations.
|
||||||
|
|
||||||
|
## Known model-vs-DB drift risks
|
||||||
|
|
||||||
|
These are not necessarily bugs, but they are migration risk hotspots:
|
||||||
|
|
||||||
|
- `Receiver.EmailAddress` is `[StringLength(250)]` in entity, DB column is `nvarchar(128)`.
|
||||||
|
- `EnvelopeReceiverReadOnly.AddedWho` entity expects `nvarchar(250)`, DB column is `varchar(100)`.
|
||||||
|
- `EnvelopeReceiver` entity does not model DB columns `GUID` and `PARENT_ENVELOPE_RECEIVER_ID`.
|
||||||
|
- `Envelope` entity does not explicitly model some DB columns (`VERIFICATION_TYPE`, `LANG_CODE`, `SOURCE`).
|
||||||
|
- `EmailOut` entity has `[NotMapped] AddedWhen`, while DB has `ADDED_WHEN` column.
|
||||||
|
|
||||||
|
Before schema changes, reconcile these deltas intentionally (either mapping update or documented accepted divergence).
|
||||||
|
|
||||||
|
## Migration-safe operating rules
|
||||||
|
|
||||||
|
- Do not rely on implicit trigger behavior; document expected side effects in feature code touching history/status flows.
|
||||||
|
- Any change to `TBSIG_ENVELOPE_HISTORY` semantics requires trigger impact review first.
|
||||||
|
- Keep `DbTriggerParams` synchronized with actual DB trigger inventory per environment.
|
||||||
|
- For stored procedure changes, update both:
|
||||||
|
- SQL wrapper templates (`Application/Common/SQL/*`)
|
||||||
|
- direct SQL callers in controllers/executors.
|
||||||
|
|
||||||
|
## Refresh checklist (read-only)
|
||||||
|
|
||||||
|
Run these metadata checks before/after DB migration:
|
||||||
|
|
||||||
|
1. Column inventory per table (`INFORMATION_SCHEMA.COLUMNS`).
|
||||||
|
2. Constraint inventory (`INFORMATION_SCHEMA.TABLE_CONSTRAINTS` + `KEY_COLUMN_USAGE`).
|
||||||
|
3. Trigger inventory (`sys.triggers`) and definitions (`OBJECT_DEFINITION`).
|
||||||
|
4. Stored procedure inventory (`sys.procedures`) and definitions (`OBJECT_DEFINITION`).
|
||||||
|
5. Repo call-site grep for `PRSIG_` names to detect dead or missing integration points.
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
namespace EnvelopeGenerator.Application.Common.Configurations;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public class ESignParams
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required string ApplicationName { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string DefaultReason { get; set; } = string.Empty;
|
||||||
|
}
|
||||||
@@ -1,99 +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;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Optional global default certification level used when request-level options do not specify a value.
|
|
||||||
/// </summary>
|
|
||||||
public PdfSignatureCertificationLevel? DefaultCertificationLevel { get; set; }
|
|
||||||
}
|
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
@@ -1,12 +1,14 @@
|
|||||||
using EnvelopeGenerator.Domain.Constants;
|
using EnvelopeGenerator.Application.Common.Dto.Receiver;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
using EnvelopeGenerator.Domain.Interfaces;
|
using EnvelopeGenerator.Domain.Interfaces;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Application.Common.Dto;
|
namespace EnvelopeGenerator.Application.Common.Dto;
|
||||||
|
|
||||||
|
// TODO: Add the “Reason” property and integrate with UI and the digital signature process.
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Data Transfer Object representing a positioned element assigned to a document receiver.
|
/// Data Transfer Object representing a positioned element assigned to a document receiver.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class DocReceiverElementDto : IDocReceiverElement
|
public class DocReceiverElementDto : IDocReceiverElement, ISignatureInkPayload
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the unique identifier of the element.
|
/// Gets or sets the unique identifier of the element.
|
||||||
@@ -18,11 +20,21 @@ public class DocReceiverElementDto : IDocReceiverElement
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public int DocumentId { get; set; }
|
public int DocumentId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public virtual DocumentDto? Document { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the identifier of the receiver.
|
/// Gets or sets the identifier of the receiver.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int ReceiverId { get; set; }
|
public int ReceiverId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public virtual ReceiverDto? Receiver { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the type of the element.
|
/// Gets or sets the type of the element.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -122,4 +134,41 @@ public class DocReceiverElementDto : IDocReceiverElement
|
|||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public byte[]? Ink { get; set; }
|
public byte[]? Ink { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Returns the stored signature bytes as an image payload with detected MIME type.
|
||||||
|
/// </summary>
|
||||||
|
/// <exception cref="InvalidOperationException">Thrown when signature image bytes do not exist.</exception>
|
||||||
|
public (byte[] Bytes, string ContentType, string FileExtension) ToImage()
|
||||||
|
{
|
||||||
|
if (Ink is not { Length: > 0 })
|
||||||
|
throw new InvalidOperationException("Signature image (Ink) does not exist.");
|
||||||
|
|
||||||
|
if (HasPrefix(Ink, 0x89, 0x50, 0x4E, 0x47))
|
||||||
|
return (Ink, "image/png", ".png");
|
||||||
|
|
||||||
|
if (HasPrefix(Ink, 0xFF, 0xD8, 0xFF))
|
||||||
|
return (Ink, "image/jpeg", ".jpg");
|
||||||
|
|
||||||
|
if (HasPrefix(Ink, 0x52, 0x49, 0x46, 0x46) &&
|
||||||
|
Ink.Length >= 12 &&
|
||||||
|
Ink[8] == 0x57 && Ink[9] == 0x45 && Ink[10] == 0x42 && Ink[11] == 0x50)
|
||||||
|
return (Ink, "image/webp", ".webp");
|
||||||
|
|
||||||
|
return (Ink, "application/octet-stream", ".bin");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool HasPrefix(byte[] data, params byte[] prefix)
|
||||||
|
{
|
||||||
|
if (data.Length < prefix.Length)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
for (var i = 0; i < prefix.Length; i++)
|
||||||
|
{
|
||||||
|
if (data[i] != prefix[i])
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -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; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ public record EnvelopeDto : IEnvelope
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? ContractType { get; set; }
|
public ContractType? ContractType { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Default value is 'de-DE'
|
/// Default value is 'de-DE'
|
||||||
@@ -84,7 +84,7 @@ public record EnvelopeDto : IEnvelope
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? CertificationType { get; set; }
|
public CertificationType? CertificationType { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
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.
|
||||||
@@ -28,7 +30,7 @@ public class EnvelopeTypeDto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the certification type identifier.
|
/// Gets or sets the certification type identifier.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? CertificationType { get; set; }
|
public CertificationType? 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.
|
||||||
@@ -78,5 +80,5 @@ public class EnvelopeTypeDto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the contract type associated with the envelope type.
|
/// Gets or sets the contract type associated with the envelope type.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? ContractType { get; set; }
|
public ContractType? ContractType { get; set; }
|
||||||
}
|
}
|
||||||
@@ -2,14 +2,53 @@ using EnvelopeGenerator.Application.Common.Enums;
|
|||||||
|
|
||||||
namespace EnvelopeGenerator.Application.Common.Dto;
|
namespace EnvelopeGenerator.Application.Common.Dto;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public sealed record PdfSignOptionsDto
|
public sealed record PdfSignOptionsDto
|
||||||
{
|
{
|
||||||
public string? UUID { get; set; }
|
/// <summary>
|
||||||
public string? Name { get; set; }
|
///
|
||||||
public string? Reason { get; set; }
|
/// </summary>
|
||||||
public string? Location { get; set; }
|
public long DocumentElementId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string Name { get; set; } = null!;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string Reason { get; set; } = null!;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string Location { get; set; } = null!;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public string? Email { get; set; }
|
public string? Email { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public string? Phone { get; set; }
|
public string? Phone { get; set; }
|
||||||
public string? ApplicationName { get; set; }
|
|
||||||
public PdfSignatureCertificationLevel? CertificationLevel { get; set; }
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string ApplicationName { get; set; } = null!;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public PdfSignatureCertificationLevel CertificationLevel { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public PdfSignatureAppearanceDto? Appearance { get; set; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,96 @@
|
|||||||
|
namespace EnvelopeGenerator.Application.Common.Dto;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public enum PdfSignatureCoordinateUnit
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
Point = 0,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
Inch = 1
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public enum PdfSignatureCoordinateOrigin
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
BottomLeft = 0,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
TopLeft = 1
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="PageNumber"></param>
|
||||||
|
/// <param name="Left"></param>
|
||||||
|
/// <param name="Bottom"></param>
|
||||||
|
/// <param name="Width"></param>
|
||||||
|
/// <param name="Height"></param>
|
||||||
|
/// <param name="ShowLabels"></param>
|
||||||
|
/// <param name="ShowName"></param>
|
||||||
|
/// <param name="ShowDate"></param>
|
||||||
|
/// <param name="ShowReason"></param>
|
||||||
|
/// <param name="ShowLocation"></param>
|
||||||
|
/// <param name="ShowDistinguishedName"></param>
|
||||||
|
/// <param name="DateTimeFormat"></param>
|
||||||
|
/// <param name="CoordinateUnit"></param>
|
||||||
|
/// <param name="CoordinateOrigin"></param>
|
||||||
|
public sealed record PdfSignatureAppearanceDto(
|
||||||
|
int PageNumber,
|
||||||
|
double Left,
|
||||||
|
double Bottom,
|
||||||
|
double Width,
|
||||||
|
double Height,
|
||||||
|
bool ShowLabels = false,
|
||||||
|
bool ShowName = false,
|
||||||
|
bool ShowDate = false,
|
||||||
|
bool ShowReason = false,
|
||||||
|
bool ShowLocation = false,
|
||||||
|
bool ShowDistinguishedName = false,
|
||||||
|
string DateTimeFormat = "dd.MM.yyyy HH:mm:ss zzz",
|
||||||
|
PdfSignatureCoordinateUnit CoordinateUnit = PdfSignatureCoordinateUnit.Point,
|
||||||
|
PdfSignatureCoordinateOrigin CoordinateOrigin = PdfSignatureCoordinateOrigin.BottomLeft)
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="FamilyName"></param>
|
||||||
|
/// <param name="Size"></param>
|
||||||
|
/// <param name="IsBold"></param>
|
||||||
|
/// <param name="IsItalic"></param>
|
||||||
|
/// <param name="IsUnderline"></param>
|
||||||
|
public sealed record FontDto(string FamilyName = "Helvetica", float Size = 10, bool IsBold = false, bool IsItalic = false, bool IsUnderline = false)
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public RgbaColorDto Color { get; init; } = new();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="R"></param>
|
||||||
|
/// <param name="G"></param>
|
||||||
|
/// <param name="B"></param>
|
||||||
|
public sealed record RgbaColorDto(double R = 0, double G = 0, double B = 0);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public FontDto Font { get; init; } = new();
|
||||||
|
}
|
||||||
@@ -47,7 +47,7 @@ public sealed record PdfSignatureCheckItemDto(
|
|||||||
string? Filter,
|
string? Filter,
|
||||||
string? SubFilter,
|
string? SubFilter,
|
||||||
string? ApplicationName,
|
string? ApplicationName,
|
||||||
string? UUID,
|
long? DocumentElementId,
|
||||||
string? OriginalDocumentSha256,
|
string? OriginalDocumentSha256,
|
||||||
string? MessageDigestHex,
|
string? MessageDigestHex,
|
||||||
string? Error);
|
string? Error);
|
||||||
|
|||||||
@@ -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);
|
|
||||||
@@ -1,9 +1,27 @@
|
|||||||
namespace EnvelopeGenerator.Application.Common.Enums;
|
namespace EnvelopeGenerator.Application.Common.Enums;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public enum PdfSignatureCertificationLevel
|
public enum PdfSignatureCertificationLevel
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// All changes are allowed
|
||||||
|
/// </summary>
|
||||||
NoCertification = 0,
|
NoCertification = 0,
|
||||||
NoChangesAllowed = 1,
|
|
||||||
FormFillingAndSigning = 2,
|
/// <summary>
|
||||||
FormFillingAndAnnotations = 3
|
/// No changes are allowed
|
||||||
|
/// </summary>
|
||||||
|
NoChangesAllowed,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Allows users to fill in forms and sign the document.
|
||||||
|
/// </summary>
|
||||||
|
FillForms,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Allows users to fill in forms, create, modify and delete annotations, and sign the document.
|
||||||
|
/// </summary>
|
||||||
|
FillFormsAndAnnotate
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,66 @@
|
|||||||
|
using DigitalData.Core.Exceptions;
|
||||||
using EnvelopeGenerator.Application.Common.Dto;
|
using EnvelopeGenerator.Application.Common.Dto;
|
||||||
|
using EnvelopeGenerator.Domain.Interfaces;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Application.Common.Interfaces.Doc;
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Doc;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public interface IPdfPageImageRenderer
|
public interface IPdfPageImageRenderer
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="pdfBytes"></param>
|
||||||
|
/// <param name="cancellationToken"></param>
|
||||||
|
/// <returns></returns>
|
||||||
Task<IReadOnlyList<PdfPageImageDto>> RenderPagesAsImagesAsync(byte[] pdfBytes, CancellationToken cancellationToken = default);
|
Task<IReadOnlyList<PdfPageImageDto>> RenderPagesAsImagesAsync(byte[] pdfBytes, CancellationToken cancellationToken = default);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="element"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Stream ComposeSignaturePreviewPng(ISignatureInkPayload element);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="bytes"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public bool IsSupportedImageFormat(byte[] bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public static class PdfPageImageRendererExtensions
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="renderer"></param>
|
||||||
|
/// <param name="inkBytes"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
/// <exception cref="BadRequestException"></exception>
|
||||||
|
public static byte[] EnsureSupportedImageBytes(this IPdfPageImageRenderer renderer, byte[] inkBytes)
|
||||||
|
{
|
||||||
|
if (!renderer.IsSupportedImageFormat(inkBytes))
|
||||||
|
throw new BadRequestException("Only PNG and JPEG signature formats are supported.");
|
||||||
|
|
||||||
|
return inkBytes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static byte[] ComposeSignaturePreviewPngBytes(this IPdfPageImageRenderer renderer, ISignatureInkPayload element)
|
||||||
|
{
|
||||||
|
using var stream = renderer.ComposeSignaturePreviewPng(element);
|
||||||
|
|
||||||
|
if (stream is MemoryStream memoryStream)
|
||||||
|
return memoryStream.ToArray();
|
||||||
|
|
||||||
|
using var copy = new MemoryStream();
|
||||||
|
stream.CopyTo(copy);
|
||||||
|
return copy.ToArray();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public interface IRequestContext
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
string? Origin { get; }
|
||||||
|
}
|
||||||
@@ -14,18 +14,9 @@ public interface IPdfDigitalSignatureService
|
|||||||
/// <param name="inputPdf">Source PDF content stream.</param>
|
/// <param name="inputPdf">Source PDF content stream.</param>
|
||||||
/// <param name="outputPdf">Destination stream for signed PDF output.</param>
|
/// <param name="outputPdf">Destination stream for signed PDF output.</param>
|
||||||
/// <param name="options">Optional signing options that map to PDF signature metadata fields.</param>
|
/// <param name="options">Optional signing options that map to PDF signature metadata fields.</param>
|
||||||
|
/// <param name="image">Optional image stream for signature appearance.</param>
|
||||||
/// <param name="cancellationToken">Cancellation token for cooperative cancellation.</param>
|
/// <param name="cancellationToken">Cancellation token for cooperative cancellation.</param>
|
||||||
Task SignPdfAsync(Stream inputPdf, Stream outputPdf, PdfSignOptionsDto? options = null, CancellationToken cancellationToken = default);
|
Task SignPdfAsync(Stream inputPdf, Stream outputPdf, PdfSignOptionsDto? options = null, Stream? image = null, CancellationToken cancellationToken = default);
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Applies multiple signatures to the provided PDF in sequence and returns
|
|
||||||
/// the final signed PDF document.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="inputPdf">Source PDF content stream.</param>
|
|
||||||
/// <param name="outputPdf">Destination stream for signed PDF output.</param>
|
|
||||||
/// <param name="optionsList">Ordered signing options; one signature is applied per item.</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token for cooperative cancellation.</param>
|
|
||||||
Task SignPdfAsync(Stream inputPdf, Stream outputPdf, IReadOnlyList<PdfSignOptionsDto> optionsList, CancellationToken cancellationToken = default);
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Checks whether the provided PDF contains signature field(s) and whether
|
/// Checks whether the provided PDF contains signature field(s) and whether
|
||||||
@@ -35,13 +26,4 @@ public interface IPdfDigitalSignatureService
|
|||||||
/// <param name="cancellationToken">Cancellation token for cooperative cancellation.</param>
|
/// <param name="cancellationToken">Cancellation token for cooperative cancellation.</param>
|
||||||
/// <returns>A structured result containing signature presence and per-signature details.</returns>
|
/// <returns>A structured result containing signature presence and per-signature details.</returns>
|
||||||
Task<PdfSignatureCheckResultDto> CheckPdfSignatureAsync(Stream inputPdf, CancellationToken cancellationToken = default);
|
Task<PdfSignatureCheckResultDto> CheckPdfSignatureAsync(Stream inputPdf, CancellationToken cancellationToken = default);
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Extracts the original signed revision from a signed PDF.
|
|
||||||
/// For multi-revision files this returns the first signed revision bytes.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="inputPdf">Signed PDF content stream.</param>
|
|
||||||
/// <param name="outputPdf">Destination stream for original revision output.</param>
|
|
||||||
/// <param name="cancellationToken">Cancellation token for cooperative cancellation.</param>
|
|
||||||
Task ExtractOriginalPdfAsync(Stream inputPdf, Stream outputPdf, CancellationToken cancellationToken = default);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
using EnvelopeGenerator.Application.Common.Dto;
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
|
|
||||||
|
|
||||||
public interface IPkcs11SelfTestStatusProvider
|
|
||||||
{
|
|
||||||
Pkcs11SelfTestStatusDto GetStatus();
|
|
||||||
}
|
|
||||||
@@ -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,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;
|
||||||
|
}
|
||||||
@@ -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
|
||||||
|
|||||||
@@ -49,8 +49,10 @@ public static class DependencyInjection
|
|||||||
|
|
||||||
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.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
|
||||||
|
|||||||
@@ -14,6 +14,15 @@ namespace EnvelopeGenerator.Application.DocReceiverElements.Queries;
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public record ReadDocReceiverElementQuery : EnvelopeReceiverQueryBase, IRequest<IEnumerable<DocReceiverElementDto>>
|
public record ReadDocReceiverElementQuery : EnvelopeReceiverQueryBase, IRequest<IEnumerable<DocReceiverElementDto>>
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public int? Id { get; set; } = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public bool IncludeDocument { get; set; } = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -47,7 +56,10 @@ public class ReadDocReceiverElementQueryHandler : IRequestHandler<ReadDocReceive
|
|||||||
{
|
{
|
||||||
var q = _repository.Query;
|
var q = _repository.Query;
|
||||||
|
|
||||||
if(request.Envelope.Id is int envelopeId)
|
if (request.Id is not null)
|
||||||
|
q = q.Where(e => e.Id == request.Id);
|
||||||
|
|
||||||
|
if (request.Envelope.Id is int envelopeId)
|
||||||
q = q.Where(e => e.Document.EnvelopeId == envelopeId);
|
q = q.Where(e => e.Document.EnvelopeId == envelopeId);
|
||||||
|
|
||||||
if (request.Envelope.Uuid is string envelopeUuid)
|
if (request.Envelope.Uuid is string envelopeUuid)
|
||||||
@@ -59,6 +71,9 @@ public class ReadDocReceiverElementQueryHandler : IRequestHandler<ReadDocReceive
|
|||||||
if (request.Receiver.Signature is string signature)
|
if (request.Receiver.Signature is string signature)
|
||||||
q = q.Where(e => e.Receiver.Signature == signature);
|
q = q.Where(e => e.Receiver.Signature == signature);
|
||||||
|
|
||||||
|
if( request.IncludeDocument)
|
||||||
|
q = q.Include(e => e.Document);
|
||||||
|
|
||||||
var elements = await q.ToListAsync(cancellationToken);
|
var elements = await q.ToListAsync(cancellationToken);
|
||||||
|
|
||||||
return _mapper.Map<IEnumerable<DocReceiverElementDto>>(elements);
|
return _mapper.Map<IEnumerable<DocReceiverElementDto>>(elements);
|
||||||
|
|||||||
@@ -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,
|
||||||
|
})
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
using MediatR;
|
using MediatR;
|
||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
|
namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands.CreateEnvelopeReceiver;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Befehl zur Erstellung eines Umschlags.
|
/// Befehl zur Erstellung eines Umschlags.
|
||||||
@@ -4,7 +4,7 @@ using MediatR;
|
|||||||
using EnvelopeGenerator.Application.Common.Dto.Receiver;
|
using EnvelopeGenerator.Application.Common.Dto.Receiver;
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
|
using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
|
namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands.CreateEnvelopeReceiver;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Handles the creation of an envelope along with its associated document and recipients.
|
/// Handles the creation of an envelope along with its associated document and recipients.
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using EnvelopeGenerator.Application.Common.Dto;
|
using EnvelopeGenerator.Application.Common.Dto;
|
||||||
using EnvelopeGenerator.Application.Common.Dto.Receiver;
|
using EnvelopeGenerator.Application.Common.Dto.Receiver;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
|
namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands.CreateEnvelopeReceiver;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -21,7 +21,24 @@ namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
|
|||||||
/// </remarks>
|
/// </remarks>
|
||||||
public record ReadEnvelopeReceiverSecretQuery
|
public record ReadEnvelopeReceiverSecretQuery
|
||||||
: EnvelopeReceiverQueryBase<ReadEnvelopeQuery, ReadReceiverQuery>,
|
: EnvelopeReceiverQueryBase<ReadEnvelopeQuery, ReadReceiverQuery>,
|
||||||
IRequest<EnvelopeReceiverSecretDto?>;
|
IRequest<EnvelopeReceiverSecretDto?>
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public ReadEnvelopeReceiverSecretQuery() { }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="envelopeId"></param>
|
||||||
|
/// <param name="receiverId"></param>
|
||||||
|
public ReadEnvelopeReceiverSecretQuery(int envelopeId, int receiverId)
|
||||||
|
{
|
||||||
|
Envelope.Id = envelopeId;
|
||||||
|
Receiver.Id = receiverId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Extension methods for dispatching <see cref="ReadEnvelopeReceiverSecretQuery"/> via <see cref="IMediator"/>.
|
/// Extension methods for dispatching <see cref="ReadEnvelopeReceiverSecretQuery"/> via <see cref="IMediator"/>.
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ public class ReadEnvelopeTypesQueryHandler : IRequestHandler<ReadEnvelopeTypesQu
|
|||||||
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,
|
CertificationType = t.CertificationType,
|
||||||
UseAccessCode = t.UseAccessCode,
|
UseAccessCode = t.UseAccessCode,
|
||||||
FinalEmailToCreator = (int?)t.FinalEmailToCreator,
|
FinalEmailToCreator = (int?)t.FinalEmailToCreator,
|
||||||
FinalEmailToReceivers = (int?)t.FinalEmailToReceivers,
|
FinalEmailToReceivers = (int?)t.FinalEmailToReceivers,
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using EnvelopeGenerator.Application.Common.Dto;
|
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;
|
||||||
@@ -35,7 +36,7 @@ public record CreateEnvelopeCommand : IRequest<EnvelopeDto?>
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Zertifizierungstyp fuer den Signaturprozess.
|
/// Zertifizierungstyp fuer den Signaturprozess.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? CertificationType { get; set; }
|
public CertificationType? CertificationType { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Finale E-Mail-Einstellung fuer den Ersteller.
|
/// Finale E-Mail-Einstellung fuer den Ersteller.
|
||||||
@@ -129,10 +130,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<EnvelopeType> EnvelopeTypeRepository => Provider.GetRequiredService<IRepository<EnvelopeType>>();
|
||||||
|
|
||||||
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>
|
||||||
///
|
///
|
||||||
@@ -230,7 +228,7 @@ 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)
|
||||||
@@ -268,9 +266,9 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
Language: ResolveLanguage(request.Language, selectedType?.Language, existing?.Language),
|
Language: ResolveLanguage(request.Language, selectedType?.Language, existing?.Language),
|
||||||
UseAccessCode: useAccessCode,
|
UseAccessCode: useAccessCode,
|
||||||
CertificationType: request.CertificationType
|
CertificationType: request.CertificationType
|
||||||
?? (int?)selectedType?.CertificationType
|
?? selectedType?.CertificationType
|
||||||
?? existing?.CertificationType
|
?? existing?.CertificationType
|
||||||
?? (int)CertificationType.AdvancedElectronicSignature,
|
?? CertificationType.AdvancedElectronicSignature,
|
||||||
FinalEmailToCreator: request.FinalEmailToCreator
|
FinalEmailToCreator: request.FinalEmailToCreator
|
||||||
?? (int?)selectedType?.FinalEmailToCreator
|
?? (int?)selectedType?.FinalEmailToCreator
|
||||||
?? existing?.FinalEmailToCreator
|
?? existing?.FinalEmailToCreator
|
||||||
@@ -299,7 +297,7 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
ExpiresWarningWhen: expiresWarningWhenDays > 0 ? DateTime.Now.AddDays(expiresWarningWhenDays) : null,
|
ExpiresWarningWhen: expiresWarningWhenDays > 0 ? DateTime.Now.AddDays(expiresWarningWhenDays) : null,
|
||||||
ContractType: existing?.ContractType
|
ContractType: existing?.ContractType
|
||||||
?? selectedType?.ContractType
|
?? selectedType?.ContractType
|
||||||
?? (int)ContractType.Contract);
|
?? ContractType.Contract);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string ResolveLanguage(string? preferred, string? fallback1, string? fallback2)
|
private static string ResolveLanguage(string? preferred, string? fallback1, string? fallback2)
|
||||||
@@ -320,7 +318,7 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
int? EnvelopeTypeId,
|
int? EnvelopeTypeId,
|
||||||
string Language,
|
string Language,
|
||||||
bool UseAccessCode,
|
bool UseAccessCode,
|
||||||
int CertificationType,
|
CertificationType CertificationType,
|
||||||
int FinalEmailToCreator,
|
int FinalEmailToCreator,
|
||||||
int FinalEmailToReceivers,
|
int FinalEmailToReceivers,
|
||||||
bool SendReminderEmails,
|
bool SendReminderEmails,
|
||||||
@@ -330,7 +328,7 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
int ExpiresWarningWhenDays,
|
int ExpiresWarningWhenDays,
|
||||||
DateTime? ExpiresWhen,
|
DateTime? ExpiresWhen,
|
||||||
DateTime? ExpiresWarningWhen,
|
DateTime? ExpiresWarningWhen,
|
||||||
int ContractType);
|
ContractType ContractType);
|
||||||
|
|
||||||
private async Task<string> ResolveSenderReferenceAsync(Envelope envelope, CancellationToken cancel)
|
private async Task<string> ResolveSenderReferenceAsync(Envelope envelope, CancellationToken cancel)
|
||||||
{
|
{
|
||||||
@@ -444,8 +442,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 +527,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 +548,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 +572,39 @@ 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 advancedSignature = envelope.CertificationType == CertificationType.AdvancedElectronicSignature;
|
||||||
if (receiver is null || string.IsNullOrWhiteSpace(receiver.EmailAddress) || string.IsNullOrWhiteSpace(receiver.Signature))
|
var origin = new Uri(ReqCntxt.Origin ?? throw new InvalidOperationException($"The request origin is missing in {nameof(CreateEnvelopeCommandHandler)}."));
|
||||||
continue;
|
try
|
||||||
|
|
||||||
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,
|
|
||||||
["[MESSAGE]"] = envelope.Message ?? string.Empty,
|
|
||||||
["[LINK_TO_DOCUMENT]"] = documentLink,
|
|
||||||
["[LINK_TO_DOCUMENT_TEXT]"] = documentLink[..Math.Min(40, documentLink.Length)] + ".."
|
|
||||||
};
|
|
||||||
|
|
||||||
var subject = ReplacePlaceHolders(template.Subject, placeholders);
|
|
||||||
var body = ReplacePlaceHolders(template.Body, placeholders);
|
|
||||||
|
|
||||||
var emailOut = new EmailOut
|
|
||||||
{
|
{
|
||||||
EmailAddress = receiver.EmailAddress,
|
AdvancedSignature = advancedSignature,
|
||||||
EmailSubj = subject,
|
DocumentTitle = envelope.Title ?? string.Empty,
|
||||||
EmailBody = body,
|
NameReceiver = er.Name ?? string.Empty,
|
||||||
AddedWhen = DateTime.Now,
|
EnvelopeUuid = envelope.Uuid,
|
||||||
AddedWho = DispatcherParams.AddedWho,
|
IsReadAndConfirm = envelope.IsReadAndConfirm(),
|
||||||
SendingProfile = DispatcherParams.SendingProfile,
|
Message = envelope.Message ?? string.Empty,
|
||||||
ReminderTypeId = DispatcherParams.ReminderTypeId,
|
NameSender = $"{envelope.User.Prename} {envelope.User.Name}",
|
||||||
EmailAttmt1 = DispatcherParams.EmailAttmt1,
|
Origin = origin,
|
||||||
WfId = (int)EnvelopeStatus.MessageInvitationSent,
|
ReceiverSignature = er.Receiver.Signature,
|
||||||
ReferenceString = receiver.EmailAddress,
|
}, cancel);
|
||||||
ReferenceId = link.ReceiverId
|
}
|
||||||
};
|
catch(Exception ex)
|
||||||
|
{
|
||||||
await EmailOutRepository.CreateAsync(emailOut, cancel);
|
Logger.LogError(ex, "Failed to send invitation email for receiver {emailAddress} in envelope {envelopeId}.", er.Receiver.EmailAddress, envelope.Id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string ReplacePlaceHolders(string text, Dictionary<string, string> placeHolders)
|
|
||||||
{
|
|
||||||
foreach (var placeHolder in placeHolders)
|
|
||||||
text = text.Replace(placeHolder.Key, placeHolder.Value);
|
|
||||||
|
|
||||||
return text;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
using AutoMapper;
|
using AutoMapper;
|
||||||
using EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
|
using EnvelopeGenerator.Application.EnvelopeReceivers.Commands.CreateEnvelopeReceiver;
|
||||||
using EnvelopeGenerator.Application.Envelopes.Commands;
|
using EnvelopeGenerator.Application.Envelopes.Commands;
|
||||||
using EnvelopeGenerator.Domain.Entities;
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
|
|
||||||
|
|||||||
@@ -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,6 +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,
|
||||||
|
ContractType = e.ContractType,
|
||||||
|
Language = e.Language,
|
||||||
|
EnvelopeTypeId = e.EnvelopeTypeId,
|
||||||
|
CertificationType = e.CertificationType,
|
||||||
|
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.Type != null ? e.Type.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.Type)
|
||||||
.Include(e => e.EnvelopeReceivers).ThenInclude(er => er.Receiver)
|
.Include(e => e.EnvelopeReceivers).ThenInclude(er => er.Receiver)
|
||||||
|
|||||||
@@ -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,133 @@
|
|||||||
|
using DigitalData.Core.Exceptions;
|
||||||
|
using EnvelopeGenerator.Application.Common.Configurations;
|
||||||
|
using EnvelopeGenerator.Application.Common.Dto;
|
||||||
|
using EnvelopeGenerator.Application.Common.Enums;
|
||||||
|
using EnvelopeGenerator.Application.Common.Interfaces.Doc;
|
||||||
|
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
||||||
|
using EnvelopeGenerator.Application.DocReceiverElements.Queries;
|
||||||
|
using MediatR;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.PdfSigning;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public record SignPdfByElementCommand : IRequest<Stream>
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public DocReceiverElementDto? Element { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public int? ElementId { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Custom document
|
||||||
|
/// </summary>
|
||||||
|
public Stream? Document { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string? Phone { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string? Reason { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public PdfSignatureCertificationLevel CertificationLevel { get; init; } = PdfSignatureCertificationLevel.NoChangesAllowed;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="signService"></param>
|
||||||
|
/// <param name="imgRenderer"></param>
|
||||||
|
/// <param name="options"></param>
|
||||||
|
public class SignPdfCommandHandler(ISender sender, IPdfDigitalSignatureService signService, IPdfPageImageRenderer imgRenderer, IOptionsMonitor<ESignParams> options) : IRequestHandler<SignPdfByElementCommand, Stream>
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="request"></param>
|
||||||
|
/// <param name="cancellationToken"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public async Task<Stream> Handle(SignPdfByElementCommand request, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
|
// ensure element
|
||||||
|
if (request.Element is null)
|
||||||
|
{
|
||||||
|
var elements = await sender.Send(new ReadDocReceiverElementQuery()
|
||||||
|
{
|
||||||
|
Id = request.ElementId!,
|
||||||
|
IncludeDocument = request.Document is null
|
||||||
|
}, cancellationToken);
|
||||||
|
|
||||||
|
request.Element = elements.FirstOrDefault() ?? throw new NotFoundException($"Element with ID {request.ElementId} not found."); ;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ensure document
|
||||||
|
if(request.Document is null)
|
||||||
|
{
|
||||||
|
if (request.Element?.Document?.ByteData is not { Length: > 0 })
|
||||||
|
throw new NotFoundException("Document data is missing or empty.");
|
||||||
|
|
||||||
|
request.Document = new MemoryStream(request.Element.Document.ByteData);
|
||||||
|
}
|
||||||
|
|
||||||
|
ValidateAfterDataIsComplete(request);
|
||||||
|
|
||||||
|
// create signature image from element
|
||||||
|
var img = imgRenderer.ComposeSignaturePreviewPng(request.Element);
|
||||||
|
|
||||||
|
// sign pdf
|
||||||
|
var outputPdf = new MemoryStream();
|
||||||
|
|
||||||
|
await signService.SignPdfAsync(
|
||||||
|
inputPdf: request.Document,
|
||||||
|
outputPdf: outputPdf,
|
||||||
|
options: new PdfSignOptionsDto
|
||||||
|
{
|
||||||
|
Name = request.Element.FullName!,
|
||||||
|
Location = request.Element.Position!,
|
||||||
|
Phone = request.Phone,
|
||||||
|
Reason = request.Reason ?? options.CurrentValue.DefaultReason,
|
||||||
|
Email = request.Element.Receiver!.EmailAddress,
|
||||||
|
ApplicationName = options.CurrentValue.ApplicationName,
|
||||||
|
DocumentElementId = request.Element.Id,
|
||||||
|
|
||||||
|
CertificationLevel = request.CertificationLevel,
|
||||||
|
Appearance = new PdfSignatureAppearanceDto(
|
||||||
|
PageNumber: request.Element.Page,
|
||||||
|
Left: request.Element.Left,
|
||||||
|
Bottom: request.Element.Y,
|
||||||
|
Width: request.Element.Width,
|
||||||
|
Height: request.Element.Height,
|
||||||
|
CoordinateUnit: PdfSignatureCoordinateUnit.Inch,
|
||||||
|
CoordinateOrigin: PdfSignatureCoordinateOrigin.TopLeft)
|
||||||
|
},
|
||||||
|
image: img,
|
||||||
|
cancellationToken: cancellationToken);
|
||||||
|
|
||||||
|
return outputPdf;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ValidateAfterDataIsComplete(SignPdfByElementCommand request)
|
||||||
|
{
|
||||||
|
if(request.Element!.FullName is null)
|
||||||
|
throw new BadRequestException($"Document is not signed. FullName is required. Element ID: {request.Element.Id}");
|
||||||
|
else if(request.Element.Position is null)
|
||||||
|
throw new BadRequestException($"Document is not signed. Position is required. Element ID: {request.Element.Id}");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
using FluentValidation;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.PdfSigning;
|
||||||
|
|
||||||
|
public class SignPdfByElementCommandValidator : AbstractValidator<SignPdfByElementCommand>
|
||||||
|
{
|
||||||
|
public SignPdfByElementCommandValidator()
|
||||||
|
{
|
||||||
|
RuleFor(x => x)
|
||||||
|
.Must(x => (x.Element is not null) ^ x.ElementId.HasValue)
|
||||||
|
.WithMessage("Exactly one of Element or ElementId must be provided.");
|
||||||
|
|
||||||
|
RuleFor(x => x.ElementId)
|
||||||
|
.GreaterThan(0)
|
||||||
|
.When(x => x.ElementId.HasValue)
|
||||||
|
.WithMessage("ElementId must be greater than 0.");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
using AutoMapper;
|
||||||
|
using DigitalData.Core.Abstraction.Application.Repository;
|
||||||
|
using DigitalData.Core.Exceptions;
|
||||||
|
using EnvelopeGenerator.Application.Common.Dto;
|
||||||
|
using EnvelopeGenerator.Application.Common.Enums;
|
||||||
|
using EnvelopeGenerator.Application.Documents.Queries;
|
||||||
|
using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
|
||||||
|
using EnvelopeGenerator.Application.Envelopes.Queries;
|
||||||
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
|
using EnvelopeGenerator.Domain.Exceptions;
|
||||||
|
using MediatR;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.PdfSigning;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public record SignPdfByEnvelopeReceiverCommand : IRequest<Stream>
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public int EnvelopeId { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public int ReceiverId { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public Stream? Document { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public class SignPdfByEnvelopeReceiverCommandHandler(IRepository<DocReceiverElement> Repo, IMapper Mapper, ISender Sender) : IRequestHandler<SignPdfByEnvelopeReceiverCommand, Stream>
|
||||||
|
{
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="request"></param>
|
||||||
|
/// <param name="cancel"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
/// <exception cref="NotFoundException"></exception>
|
||||||
|
public async Task<Stream> Handle(SignPdfByEnvelopeReceiverCommand request, CancellationToken cancel)
|
||||||
|
{
|
||||||
|
cancel.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
|
// read elements
|
||||||
|
var elements = await Repo.Where(el => el.ReceiverId == request.ReceiverId && el.Document.EnvelopeId == request.EnvelopeId)
|
||||||
|
.Include(e => e.Receiver)
|
||||||
|
.ToListAsync(cancel) ?? throw new NotFoundException($"No elements found for Envelope ID {request.EnvelopeId} and Receiver ID {request.ReceiverId}.");
|
||||||
|
var elementDtos = Mapper.Map<List<DocReceiverElementDto>>(elements)
|
||||||
|
.OrderBy(e => e.Page)
|
||||||
|
.ThenBy(e => e.Id)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
// read secrets for phone number
|
||||||
|
var erSecrets = await Sender.Send(new ReadEnvelopeReceiverSecretQuery()
|
||||||
|
{
|
||||||
|
Envelope = new() { Id = request.EnvelopeId },
|
||||||
|
Receiver = new() { Id = request.ReceiverId }
|
||||||
|
}, cancel) ?? throw new DataIntegrityException($"No secrets found for Envelope ID {request.EnvelopeId} and Receiver ID {request.ReceiverId}.");
|
||||||
|
|
||||||
|
// read document
|
||||||
|
if(request.Document is null)
|
||||||
|
{
|
||||||
|
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 = request.Document;
|
||||||
|
|
||||||
|
// sign document for each element
|
||||||
|
foreach (var element in elementDtos)
|
||||||
|
{
|
||||||
|
var lastElement = element == elementDtos.Last();
|
||||||
|
|
||||||
|
var signedDoc = await Sender.Send(new SignPdfByElementCommand
|
||||||
|
{
|
||||||
|
Document = doc,
|
||||||
|
Element = element,
|
||||||
|
CertificationLevel = lastElement ? PdfSignatureCertificationLevel.NoChangesAllowed : PdfSignatureCertificationLevel.FillFormsAndAnnotate,
|
||||||
|
Phone = erSecrets.PhoneNumber
|
||||||
|
}, cancel);
|
||||||
|
|
||||||
|
await doc.DisposeAsync();
|
||||||
|
doc = signedDoc;
|
||||||
|
}
|
||||||
|
|
||||||
|
return doc;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,8 +2,7 @@
|
|||||||
{
|
{
|
||||||
public enum CertificationType
|
public enum CertificationType
|
||||||
{
|
{
|
||||||
AdvancedElectronicSignature = 1
|
AdvancedElectronicSignature = 1,
|
||||||
// ElectronicSignature = 1
|
ElectronicSignature = 2
|
||||||
// QualifiedSignature = 2
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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)
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ using System.Collections.Generic;
|
|||||||
namespace EnvelopeGenerator.Domain.Entities
|
namespace EnvelopeGenerator.Domain.Entities
|
||||||
{
|
{
|
||||||
[Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
|
[Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
|
||||||
public class DocReceiverElement : IDocReceiverElement, IHasReceiver, IHasAddedWhen, IUpdateAuditable
|
public class DocReceiverElement : IDocReceiverElement, ISignatureInkPayload, IHasReceiver, IHasAddedWhen, IUpdateAuditable
|
||||||
{
|
{
|
||||||
public DocReceiverElement()
|
public DocReceiverElement()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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();
|
||||||
@@ -83,7 +83,7 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
public string Comment { get; set; }
|
public string Comment { get; set; }
|
||||||
|
|
||||||
[Column("CONTRACT_TYPE")]
|
[Column("CONTRACT_TYPE")]
|
||||||
public int? ContractType { get; set; }
|
public ContractType? ContractType { get; set; }
|
||||||
|
|
||||||
#if NETFRAMEWORK
|
#if NETFRAMEWORK
|
||||||
[NotMapped]
|
[NotMapped]
|
||||||
@@ -111,7 +111,7 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
public bool ReadOnly => this.IsReadAndConfirm();
|
public bool ReadOnly => this.IsReadAndConfirm();
|
||||||
|
|
||||||
[Column("CERTIFICATION_TYPE")]
|
[Column("CERTIFICATION_TYPE")]
|
||||||
public int? CertificationType { get; set; }
|
public CertificationType? CertificationType { get; set; }
|
||||||
|
|
||||||
[Column("USE_ACCESS_CODE")]
|
[Column("USE_ACCESS_CODE")]
|
||||||
public bool? UseAccessCode { get; set; }
|
public bool? UseAccessCode { get; set; }
|
||||||
@@ -129,7 +129,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 +141,6 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
= false;
|
= false;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
[NotMapped]
|
|
||||||
[Column("DOC_RESULT")]
|
[Column("DOC_RESULT")]
|
||||||
public byte[]
|
public byte[]
|
||||||
#if nullable
|
#if nullable
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -56,7 +58,7 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
public int? ReminderIntervalDays { get; set; }
|
public int? ReminderIntervalDays { get; set; }
|
||||||
|
|
||||||
[Column("CONTRACT_TYPE")]
|
[Column("CONTRACT_TYPE")]
|
||||||
public int? ContractType { get; set; }
|
public ContractType? ContractType { get; set; }
|
||||||
|
|
||||||
[NotMapped]
|
[NotMapped]
|
||||||
public bool TFA_Enabled { get; set; } = false;
|
public bool TFA_Enabled { get; set; } = false;
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>net462;net7.0;net8.0;net9.0</TargetFrameworks>
|
<TargetFrameworks>net462;net7.0;net8.0;net9.0</TargetFrameworks>
|
||||||
|
<LangVersion>latest</LangVersion>
|
||||||
<AssemblyVersion>1.4.0</AssemblyVersion>
|
<AssemblyVersion>1.4.0</AssemblyVersion>
|
||||||
<FileVersion>1.4.0</FileVersion>
|
<FileVersion>1.4.0</FileVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -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()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
#if NETFRAMEWORK
|
||||||
|
using System;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Domain.Exceptions
|
||||||
|
{
|
||||||
|
public class DataIntegrityException : Exception
|
||||||
|
{
|
||||||
|
public DataIntegrityException(string message) : base(message)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public DataIntegrityException() : base()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,6 +3,12 @@
|
|||||||
public interface IEnvelope
|
public interface IEnvelope
|
||||||
{
|
{
|
||||||
int? EnvelopeTypeId { get; set; }
|
int? EnvelopeTypeId { get; set; }
|
||||||
|
|
||||||
|
byte[]
|
||||||
|
#if nullable
|
||||||
|
?
|
||||||
|
#endif
|
||||||
|
DocResult { get; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class EnvelopeExtensions
|
public static class EnvelopeExtensions
|
||||||
@@ -16,5 +22,10 @@
|
|||||||
{
|
{
|
||||||
return envelope.EnvelopeTypeId != 2;
|
return envelope.EnvelopeTypeId != 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static bool IsBurned(this IEnvelope envelope)
|
||||||
|
{
|
||||||
|
return envelope.DocResult != null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
28
EnvelopeGenerator.Domain/Interfaces/ISignatureInkPayload.cs
Normal file
28
EnvelopeGenerator.Domain/Interfaces/ISignatureInkPayload.cs
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
#if NETFRAMEWORK
|
||||||
|
using System;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Domain.Interfaces
|
||||||
|
{
|
||||||
|
public interface ISignatureInkPayload
|
||||||
|
{
|
||||||
|
#if nullable
|
||||||
|
byte[]? Ink { get; }
|
||||||
|
|
||||||
|
string? FullName { get; }
|
||||||
|
|
||||||
|
string? Position { get; }
|
||||||
|
|
||||||
|
string? Place { get; }
|
||||||
|
#else
|
||||||
|
byte[] Ink { get; }
|
||||||
|
|
||||||
|
string FullName { get; }
|
||||||
|
|
||||||
|
string Position { get; }
|
||||||
|
|
||||||
|
string Place { get; }
|
||||||
|
#endif
|
||||||
|
DateTime? ChangedWhen { get; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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,617 +1,77 @@
|
|||||||
using EnvelopeGenerator.Application.Common.Configurations;
|
using DocumentService.Client.Interfaces;
|
||||||
|
using DocumentService.Client.Models.Requests;
|
||||||
using EnvelopeGenerator.Application.Common.Dto;
|
using EnvelopeGenerator.Application.Common.Dto;
|
||||||
using EnvelopeGenerator.Application.Common.Enums;
|
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
||||||
using DevExpress.Office.DigitalSignatures;
|
using ClientCertLevel = DocumentService.Client.Models.Requests.PdfSignatureCertificationLevel;
|
||||||
using DevExpress.Pdf;
|
using ClientCoordUnit = DocumentService.Client.Models.Requests.PdfSignatureCoordinateUnit;
|
||||||
using Microsoft.Extensions.Options;
|
using ClientCoordOrigin = DocumentService.Client.Models.Requests.PdfSignatureCoordinateOrigin;
|
||||||
using System.Formats.Asn1;
|
|
||||||
using System.Security.Cryptography.Pkcs;
|
|
||||||
using System.Security.Cryptography;
|
|
||||||
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;doc=(?<doc>[0-9a-fA-F-]{36});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? optionsModel = null, CancellationToken cancellationToken = default)
|
|
||||||
{
|
{
|
||||||
ArgumentNullException.ThrowIfNull(inputPdf);
|
var pdfBytes = await ReadAllBytesAsync(inputPdf, cancellationToken);
|
||||||
ArgumentNullException.ThrowIfNull(outputPdf);
|
var imageBytes = image is null ? null : await ReadAllBytesAsync(image, cancellationToken);
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
|
||||||
|
|
||||||
var (workingInput, ownsWorkingInput) = await EnsureSeekableInputAsync(inputPdf, cancellationToken);
|
using var signed = await signatureClient.SignAsync(pdfBytes, Map(options), imageBytes, cancellationToken);
|
||||||
|
await signed.CopyToAsync(outputPdf, cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
try
|
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()
|
||||||
{
|
{
|
||||||
workingInput.Position = 0;
|
DocumentElementId = o?.DocumentElementId ?? 0,
|
||||||
var sourceHashHex = Convert.ToHexString(await SHA256.HashDataAsync(workingInput, cancellationToken));
|
Name = o?.Name ?? string.Empty,
|
||||||
workingInput.Position = 0;
|
Reason = o?.Reason,
|
||||||
|
Location = o?.Location,
|
||||||
var pkcs11Options = options.Value;
|
Email = o?.Email,
|
||||||
var request = optionsModel ?? new PdfSignOptionsDto();
|
Phone = o?.Phone,
|
||||||
var uuid = ResolveUuid(request.UUID);
|
ApplicationName = o?.ApplicationName,
|
||||||
var reasonWithMeta = BuildReasonWithMeta(request.Reason ?? pkcs11Options.DefaultReason, uuid, sourceHashHex);
|
CertificationLevel = (ClientCertLevel)(o?.CertificationLevel ?? EnvelopeGenerator.Application.Common.Enums.PdfSignatureCertificationLevel.NoCertification),
|
||||||
|
Appearance = o?.Appearance is null ? null : MapAppearance(o.Appearance)
|
||||||
using var signer = new PdfDocumentSigner(workingInput);
|
|
||||||
|
|
||||||
var digestCalculator = new DigestCalculator(HashAlgorithmType.SHA256);
|
|
||||||
var signerInfo = new ExternalSignerInfo(PdfSignatureType.Pkcs7, 32768, digestCalculator);
|
|
||||||
var signatureFieldInfo = new PdfSignatureFieldInfo(1)
|
|
||||||
{
|
|
||||||
Name = $"Sig_{DateTimeOffset.UtcNow:yyyyMMddHHmmss}"
|
|
||||||
};
|
};
|
||||||
|
|
||||||
var builder = new PdfDeferredSignatureBuilder(signerInfo, signatureFieldInfo)
|
private static PdfSignatureAppearance MapAppearance(PdfSignatureAppearanceDto a) => new()
|
||||||
{
|
{
|
||||||
Name = request.Name ?? pkcs11Options.CertificateLabel,
|
PageNumber = a.PageNumber,
|
||||||
Reason = reasonWithMeta,
|
Left = a.Left,
|
||||||
Location = request.Location,
|
Bottom = a.Bottom,
|
||||||
ContactInfo = BuildContactInfo(request.Email, request.Phone),
|
Width = a.Width,
|
||||||
SigningTime = pkcs11Options.UseUtcSigningTime ? DateTimeOffset.UtcNow : DateTimeOffset.Now,
|
Height = a.Height,
|
||||||
ApplicationName = pkcs11Options.ApplicationName,
|
ShowLabels = a.ShowLabels,
|
||||||
CertificationLevel = ToDevExpressCertificationLevel(request.CertificationLevel)
|
ShowName = a.ShowName,
|
||||||
?? ToDevExpressCertificationLevel(pkcs11Options.DefaultCertificationLevel)
|
ShowDate = a.ShowDate,
|
||||||
?? PdfCertificationLevel.NoCertification
|
ShowReason = a.ShowReason,
|
||||||
|
ShowLocation = a.ShowLocation,
|
||||||
|
ShowDistinguishedName = a.ShowDistinguishedName,
|
||||||
|
DateTimeFormat = a.DateTimeFormat,
|
||||||
|
CoordinateUnit = (ClientCoordUnit)a.CoordinateUnit,
|
||||||
|
CoordinateOrigin = (ClientCoordOrigin)a.CoordinateOrigin,
|
||||||
|
Font = new PdfSignatureFont
|
||||||
|
{
|
||||||
|
FamilyName = a.Font.FamilyName,
|
||||||
|
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 deferredSigner = signer.SignDeferred(builder);
|
private static async Task<byte[]> ReadAllBytesAsync(Stream stream, CancellationToken cancellationToken)
|
||||||
var externalSigner = new Pkcs11ExternalSigner(pkcs11Options);
|
|
||||||
deferredSigner.Sign(outputPdf, externalSigner.BuildSignature(deferredSigner.HashValue, digestCalculator.AlgorithmOid));
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
{
|
||||||
if (ownsWorkingInput)
|
if (stream is MemoryStream memory && memory.TryGetBuffer(out var buffer))
|
||||||
await workingInput.DisposeAsync();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task SignPdfAsync(Stream inputPdf, Stream outputPdf, IReadOnlyList<PdfSignOptionsDto> optionsList, CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
ArgumentNullException.ThrowIfNull(inputPdf);
|
|
||||||
ArgumentNullException.ThrowIfNull(outputPdf);
|
|
||||||
ArgumentNullException.ThrowIfNull(optionsList);
|
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
|
||||||
|
|
||||||
if (optionsList.Count == 0)
|
|
||||||
{
|
|
||||||
await inputPdf.CopyToAsync(outputPdf, cancellationToken);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var (currentInput, ownsCurrentInput) = await EnsureSeekableInputAsync(inputPdf, cancellationToken);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
for (var i = 0; i < optionsList.Count; i++)
|
|
||||||
{
|
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
|
||||||
var isLast = i == optionsList.Count - 1;
|
|
||||||
|
|
||||||
if (isLast)
|
|
||||||
{
|
|
||||||
await SignPdfAsync(currentInput, outputPdf, optionsList[i], cancellationToken);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
var intermediateOutput = new MemoryStream();
|
|
||||||
await SignPdfAsync(currentInput, intermediateOutput, optionsList[i], cancellationToken);
|
|
||||||
|
|
||||||
if (ownsCurrentInput)
|
|
||||||
await currentInput.DisposeAsync();
|
|
||||||
|
|
||||||
intermediateOutput.Position = 0;
|
|
||||||
currentInput = intermediateOutput;
|
|
||||||
ownsCurrentInput = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
if (ownsCurrentInput)
|
|
||||||
await currentInput.DisposeAsync();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<PdfSignatureCheckResultDto> CheckPdfSignatureAsync(Stream inputPdf, CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
ArgumentNullException.ThrowIfNull(inputPdf);
|
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
|
||||||
|
|
||||||
var pdfBytes = await ReadAllBytesAsync(inputPdf, cancellationToken);
|
|
||||||
|
|
||||||
using var pdfStream = new MemoryStream(pdfBytes);
|
|
||||||
using var signer = new PdfDocumentSigner(pdfStream);
|
|
||||||
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,
|
|
||||||
UUID: reasonMeta.UUID,
|
|
||||||
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,
|
|
||||||
UUID: reasonMeta.UUID,
|
|
||||||
OriginalDocumentSha256: reasonMeta.OriginalDocumentSha256,
|
|
||||||
MessageDigestHex: null,
|
|
||||||
Error: ex.Message));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return new PdfSignatureCheckResultDto(
|
|
||||||
Signed: true,
|
|
||||||
Signatures: items);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task ExtractOriginalPdfAsync(Stream inputPdf, Stream outputPdf, CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
ArgumentNullException.ThrowIfNull(inputPdf);
|
|
||||||
ArgumentNullException.ThrowIfNull(outputPdf);
|
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
|
||||||
|
|
||||||
var pdfBytes = await ReadAllBytesAsync(inputPdf, cancellationToken);
|
|
||||||
|
|
||||||
var byteRanges = ParseByteRanges(pdfBytes);
|
|
||||||
if (byteRanges.Count == 0)
|
|
||||||
{
|
|
||||||
await outputPdf.WriteAsync(pdfBytes, cancellationToken);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var revisionLength = byteRanges
|
|
||||||
.Select(GetSignedRevisionLength)
|
|
||||||
.Where(x => x > 0)
|
|
||||||
.DefaultIfEmpty(pdfBytes.LongLength)
|
|
||||||
.Min();
|
|
||||||
|
|
||||||
if (revisionLength > pdfBytes.LongLength)
|
|
||||||
throw new InvalidOperationException("Invalid ByteRange in signed PDF.");
|
|
||||||
|
|
||||||
await outputPdf.WriteAsync(pdfBytes.AsMemory(0, (int)revisionLength), cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async Task<(Stream Stream, bool OwnsStream)> EnsureSeekableInputAsync(Stream input, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
if (input.CanSeek)
|
|
||||||
{
|
|
||||||
input.Position = 0;
|
|
||||||
return (input, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
var buffered = new MemoryStream();
|
|
||||||
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))
|
|
||||||
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));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static int? TryGetKeySize(X509Certificate2 certificate)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return certificate.PublicKey.Key.KeySize;
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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 PdfCertificationLevel? ToDevExpressCertificationLevel(PdfSignatureCertificationLevel? value)
|
|
||||||
{
|
|
||||||
return value is null ? null : (PdfCertificationLevel)(int)value.Value;
|
|
||||||
}
|
|
||||||
|
|
||||||
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 ResolveUuid(string? uuid)
|
|
||||||
{
|
|
||||||
return Guid.TryParse(uuid, out var parsed)
|
|
||||||
? parsed.ToString()
|
|
||||||
: Guid.NewGuid().ToString();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string BuildReasonWithMeta(string? businessReason, string uuid, string sourceHashHex)
|
|
||||||
{
|
|
||||||
var trimmedReason = string.IsNullOrWhiteSpace(businessReason) ? null : businessReason.Trim();
|
|
||||||
var prefix = string.IsNullOrWhiteSpace(trimmedReason) ? string.Empty : trimmedReason + " ";
|
|
||||||
return $"{prefix}| SFMETA:v1;doc={uuid};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, string? UUID, 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;
|
|
||||||
|
|
||||||
return (
|
|
||||||
businessReason,
|
|
||||||
match.Groups["doc"].Value,
|
|
||||||
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
|
|
||||||
|
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
using DevExpress.Drawing;
|
using DevExpress.Drawing;
|
||||||
using DevExpress.Pdf;
|
using DevExpress.Pdf;
|
||||||
|
using DigitalData.Core.Exceptions;
|
||||||
using EnvelopeGenerator.Application.Common.Dto;
|
using EnvelopeGenerator.Application.Common.Dto;
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.Doc;
|
using EnvelopeGenerator.Application.Common.Interfaces.Doc;
|
||||||
|
using EnvelopeGenerator.Domain.Interfaces;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Doc;
|
namespace EnvelopeGenerator.Infrastructure.Doc;
|
||||||
|
|
||||||
@@ -54,4 +56,125 @@ public class PdfPageImageRenderer : IPdfPageImageRenderer
|
|||||||
|
|
||||||
return Task.FromResult<IReadOnlyList<PdfPageImageDto>>(results);
|
return Task.FromResult<IReadOnlyList<PdfPageImageDto>>(results);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Stream ComposeSignaturePreviewPng(ISignatureInkPayload element)
|
||||||
|
{
|
||||||
|
const double sigW = 1.77 * 72;
|
||||||
|
const double sigH = 1.96 * 72;
|
||||||
|
const double imgRatio = 0.52;
|
||||||
|
const double lineH = 11.5;
|
||||||
|
const double bgPad = 3.0;
|
||||||
|
const double padding = 3.0;
|
||||||
|
|
||||||
|
var date = element.ChangedWhen!.Value.ToString("dd.MM.yyyy");
|
||||||
|
var position = string.IsNullOrWhiteSpace(element.Position) ? null : element.Position.Trim();
|
||||||
|
|
||||||
|
var x = bgPad;
|
||||||
|
var y = bgPad;
|
||||||
|
var imgH = sigH * imgRatio;
|
||||||
|
var lineY = y + imgH + 1.0;
|
||||||
|
var textY = lineY + 1.5;
|
||||||
|
var row1Y = textY;
|
||||||
|
var row2Y = row1Y + lineH;
|
||||||
|
var row3Y = position is null ? row2Y : row2Y + lineH;
|
||||||
|
var contentBottom = row3Y + lineH;
|
||||||
|
var pageWidth = sigW + (bgPad * 2);
|
||||||
|
var pageHeight = contentBottom + bgPad;
|
||||||
|
|
||||||
|
var inkBytes = this.EnsureSupportedImageBytes(element.Ink!);
|
||||||
|
|
||||||
|
using var processor = new PdfDocumentProcessor();
|
||||||
|
processor.CreateEmptyDocument();
|
||||||
|
var page = processor.AddNewPage(new PdfRectangle(0, 0, pageWidth, pageHeight));
|
||||||
|
|
||||||
|
using var graphics = processor.CreateGraphics();
|
||||||
|
|
||||||
|
using var bgBrush = new DXSolidBrush(System.Drawing.Color.FromArgb(255, 255, 253, 240));
|
||||||
|
using var linePen = new DXPen(System.Drawing.Color.FromArgb(180, 100, 100, 120), 0.5f);
|
||||||
|
using var nameBrush = new DXSolidBrush(System.Drawing.Color.FromArgb(255, 20, 20, 20));
|
||||||
|
using var infoBrush = new DXSolidBrush(System.Drawing.Color.FromArgb(255, 80, 80, 80));
|
||||||
|
|
||||||
|
var fontBold = new DXFont("Arial", 7.5f, DXFontStyle.Bold);
|
||||||
|
var fontNormal = new DXFont("Arial", 6.5f, DXFontStyle.Regular);
|
||||||
|
|
||||||
|
graphics.FillRectangle(bgBrush, new System.Drawing.RectangleF(0, 0, (float)pageWidth, (float)pageHeight));
|
||||||
|
|
||||||
|
var imageArea = new System.Drawing.RectangleF((float)x, (float)y, (float)sigW, (float)imgH);
|
||||||
|
var imageRect = FitImageContain(imageArea, inkBytes);
|
||||||
|
graphics.DrawImage(inkBytes, imageRect);
|
||||||
|
|
||||||
|
graphics.DrawLine(linePen, (float)(x + 2), (float)lineY, (float)(x + sigW - 2), (float)lineY);
|
||||||
|
|
||||||
|
graphics.DrawString(
|
||||||
|
element.FullName!.Trim(),
|
||||||
|
fontBold,
|
||||||
|
nameBrush,
|
||||||
|
new System.Drawing.RectangleF((float)(x + padding), (float)row1Y, (float)(sigW - (padding * 2)), (float)lineH));
|
||||||
|
|
||||||
|
if (position is not null)
|
||||||
|
{
|
||||||
|
graphics.DrawString(
|
||||||
|
position,
|
||||||
|
fontNormal,
|
||||||
|
infoBrush,
|
||||||
|
new System.Drawing.RectangleF((float)(x + padding), (float)row2Y, (float)(sigW - (padding * 2)), (float)lineH));
|
||||||
|
}
|
||||||
|
|
||||||
|
graphics.DrawString(
|
||||||
|
$"{element.Place!.Trim()}, {date}",
|
||||||
|
fontNormal,
|
||||||
|
infoBrush,
|
||||||
|
new System.Drawing.RectangleF((float)(x + padding), (float)row3Y, (float)(sigW - (padding * 2)), (float)lineH));
|
||||||
|
|
||||||
|
graphics.AddToPageForeground(page, 72, 72);
|
||||||
|
|
||||||
|
using var pdfStream = new MemoryStream();
|
||||||
|
processor.SaveDocument(pdfStream);
|
||||||
|
pdfStream.Position = 0;
|
||||||
|
|
||||||
|
using var rasterProcessor = new PdfDocumentProcessor();
|
||||||
|
rasterProcessor.LoadDocument(pdfStream);
|
||||||
|
|
||||||
|
var renderOptions = PdfPageRenderingParameters.CreateWithResolution(400f);
|
||||||
|
using DXBitmap bitmap = rasterProcessor.CreateDXBitmap(1, renderOptions);
|
||||||
|
var pngStream = new MemoryStream();
|
||||||
|
bitmap.Save(pngStream, DXImageFormat.Png);
|
||||||
|
pngStream.Position = 0;
|
||||||
|
return pngStream;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static System.Drawing.RectangleF FitImageContain(System.Drawing.RectangleF area, byte[] imageBytes)
|
||||||
|
{
|
||||||
|
using var imageStream = new MemoryStream(imageBytes, writable: false);
|
||||||
|
using var image = DXImage.FromStream(imageStream);
|
||||||
|
|
||||||
|
if (image.Width <= 0 || image.Height <= 0)
|
||||||
|
return area;
|
||||||
|
|
||||||
|
var scale = Math.Min(area.Width / image.Width, area.Height / image.Height);
|
||||||
|
var drawW = image.Width * scale;
|
||||||
|
var drawH = image.Height * scale;
|
||||||
|
var drawX = area.X + ((area.Width - drawW) / 2f);
|
||||||
|
var drawY = area.Y + ((area.Height - drawH) / 2f);
|
||||||
|
|
||||||
|
return new System.Drawing.RectangleF(drawX, drawY, drawW, drawH);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="bytes"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public bool IsSupportedImageFormat(byte[] bytes)
|
||||||
|
{
|
||||||
|
var isPng = bytes.Length >= 4 &&
|
||||||
|
bytes[0] == 0x89 && bytes[1] == 0x50 && bytes[2] == 0x4E && bytes[3] == 0x47;
|
||||||
|
if (isPng)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
var isJpeg = bytes.Length >= 3 &&
|
||||||
|
bytes[0] == 0xFF && bytes[1] == 0xD8 && bytes[2] == 0xFF;
|
||||||
|
return isJpeg;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,49 @@
|
|||||||
|
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 not null)
|
||||||
|
services.AddMessagingServiceClient(ntfConfiguration, nameof(options.RabbitMQ));
|
||||||
|
else
|
||||||
|
throw new InvalidOperationException(
|
||||||
|
$"Missing RabbitMQ connection configuration." +
|
||||||
|
$"When ClientType is set to RabbitMQ, a valid RabbitMQ configuration must be provided in the '{sectionName}' configuration section.");
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
-- Original email template: DocumentRejected_ADM (GUID 6)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:33:34
|
||||||
|
-- Subject: ''[DOCUMENT_TITLE]'' - Vorgang zurückgezogen
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_SENDER],<p><B><I>[NAME_RECEIVER]</I></B> hat den Umschlag <B><I>''[DOCUMENT_TITLE]''</I></B> mit folgendem Grund abgelehnt: <p>
|
||||||
|
[REASON]
|
||||||
|
<p>Der Umschlag wurde auf den Status Rejected gesetzt. <p>
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
|
WHERE GUID = 6;
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
-- Original email template: DocumentRejected_REC_2 (GUID 10)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:37:12
|
||||||
|
-- Subject: ''[DOCUMENT_TITLE]'' - Vorgang abgelehnt.
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_RECEIVER],
|
||||||
|
<p>Der Vorgang <B><I>''[DOCUMENT_TITLE]''</I></B> wurde durch einen anderen Vertragspartner abgelehnt.<p> Der Absender <B><I>[NAME_SENDER]</I></B> wird sich bei Bedarf mit Ihnen in Verbindung setzen. <p>
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
|
WHERE GUID = 10;
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
-- Original email template: DocumentRejected_REC (GUID 9)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:34:21
|
||||||
|
-- Subject: ''[DOCUMENT_TITLE]'' - Bestätigung der Ablehnung
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_RECEIVER],
|
||||||
|
<p>Hiermit bestätigen wir Ihnen die Ablehnung des Vorgangs <B><I>''[DOCUMENT_TITLE]''</I></B>!<p>Der Absender <B><I>[NAME_SENDER]</I></B> wurde über die Ablehnung informiert. <p>
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
|
WHERE GUID = 9;
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
-- Original email template: DocumentShared (GUID 11)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:42:51
|
||||||
|
-- Subject: Dokument geteilt: ''[DOCUMENT_TITLE]''
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag,<br /> <br /><B><I> [NAME_RECEIVER]</I></B> hat Ihnen ein Dokument zum Ansehen gesendet.<br /> <br /> Über den folgenden Link können Sie das Dokument einsehen: <a href="[LINK_TO_DOCUMENT]">[LINK_TO_DOCUMENT_TEXT]</a><br /> <br /> <br /> Mit freundlichen Grüßen<br /> <br /> [NAME_PORTAL]'
|
||||||
|
WHERE GUID = 11;
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
-- Original email template: DocumentSigned (GUID 3)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:25:45
|
||||||
|
-- Subject: Dokument [RECEIVER_ACTION]: ''[DOCUMENT_TITLE]''
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_RECEIVER],<br />
|
||||||
|
<br />
|
||||||
|
hiermit bestätigen wir Ihnen die erfolgreiche [FINAL_STATUS] für den Vorgang <B><I>''[DOCUMENT_TITLE]''</I></B>.<br />
|
||||||
|
Wenn alle [FINAL_ACTION] haben, erhalten Sie ebenfalls per E-Mail ein abgeschlossenes Exemplar mit entsprechendem Zertifikat!
|
||||||
|
<br />
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
|
WHERE GUID = 3;
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
-- Original email template: TotpSecret (GUID 12)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:44:44
|
||||||
|
-- Subject: 2-Faktor-Authentifizierung QR-Code
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag,<br /> <br />Sie können auf Ihren Zwei-Faktor-Authentifizierungscode zugreifen, indem Sie den unten stehenden QR-Code mit einer beliebigen Authentifizierungs-App auf Ihrem Telefon scannen (Google Authenticator, Microsoft Authenticator usw.). Dieser Code ist bis zum [TFA_EXPIRATION] gültig.<br /> <br /> <img src="data:image/png;base64,[TFA_QR_CODE]" style="width: 13rem; height: 13rem;"><br /> <br />
|
||||||
|
<br /> Mit freundlichen Grüßen<br /> <br /> [NAME_PORTAL]'
|
||||||
|
WHERE GUID = 12;
|
||||||
@@ -5,6 +5,7 @@
|
|||||||
@using EnvelopeGenerator.Domain.Resources
|
@using EnvelopeGenerator.Domain.Resources
|
||||||
@using EnvelopeGenerator.Server.Client.Components.Sender.ReceiverSuggestionFilter
|
@using EnvelopeGenerator.Server.Client.Components.Sender.ReceiverSuggestionFilter
|
||||||
@using EnvelopeGenerator.Server.Client.Services
|
@using EnvelopeGenerator.Server.Client.Services
|
||||||
|
@using MudBlazor
|
||||||
@using Microsoft.AspNetCore.Components.Forms
|
@using Microsoft.AspNetCore.Components.Forms
|
||||||
@using Microsoft.Extensions.Localization
|
@using Microsoft.Extensions.Localization
|
||||||
@inject IStringLocalizer<Model> ModelLocalizer
|
@inject IStringLocalizer<Model> ModelLocalizer
|
||||||
@@ -27,28 +28,23 @@
|
|||||||
<div class="sender-create-wizard"
|
<div class="sender-create-wizard"
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
@onkeydown="OnWizardKeyDownAsync">
|
@onkeydown="OnWizardKeyDownAsync">
|
||||||
<div class="sender-create-wizard__progress">
|
<MudPaper Class="sender-create-wizard__stepper-shell" Elevation="0">
|
||||||
<div class="sender-create-wizard__progress-track"></div>
|
<MudStepper Vertical="true"
|
||||||
|
NonLinear="false"
|
||||||
|
ShowResetButton="false"
|
||||||
|
ActiveIndex="@_currentStep"
|
||||||
|
Class="sender-create-wizard__stepper">
|
||||||
|
<ChildContent>
|
||||||
@for (var step = 0; step < TotalSteps; step++)
|
@for (var step = 0; step < TotalSteps; step++)
|
||||||
{
|
{
|
||||||
var isActive = step == _currentStep;
|
var stepIndex = step;
|
||||||
var isDone = step < _currentStep;
|
|
||||||
<div class="sender-create-wizard__step @(isActive ? "sender-create-wizard__step--active" : string.Empty) @(isDone ? "sender-create-wizard__step--done" : string.Empty)">
|
|
||||||
<span class="sender-create-wizard__step-index">@(step + 1)</span>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="sender-create-wizard__meta">
|
<MudStep Title="@GetStepTitle(stepIndex)">
|
||||||
<div class="sender-create-wizard__title">@CurrentStepTitle</div>
|
<div class="sender-create-wizard__stepper-description">@GetStepDescription(stepIndex)</div>
|
||||||
<div class="sender-create-wizard__description">@CurrentStepDescription</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@if (!string.IsNullOrWhiteSpace(_validationMessage))
|
@if (stepIndex == _currentStep)
|
||||||
{
|
{
|
||||||
<div class="sender-create-wizard__validation">@_validationMessage</div>
|
<div class="sender-create-wizard__step-content">
|
||||||
}
|
|
||||||
|
|
||||||
@if (_currentStep == 0)
|
@if (_currentStep == 0)
|
||||||
{
|
{
|
||||||
<div class="sender-create-wizard__form-grid">
|
<div class="sender-create-wizard__form-grid">
|
||||||
@@ -78,7 +74,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
else if (_currentStep == 1)
|
else if (_currentStep == 3)
|
||||||
{
|
{
|
||||||
<div class="sender-create-wizard__form-grid">
|
<div class="sender-create-wizard__form-grid">
|
||||||
<div class="sender-create-wizard__field sender-create-wizard__field--full">
|
<div class="sender-create-wizard__field sender-create-wizard__field--full">
|
||||||
@@ -118,9 +114,8 @@
|
|||||||
<div class="sender-create-wizard__field">
|
<div class="sender-create-wizard__field">
|
||||||
<label class="sender-create-wizard__label">@L("CertificationType", "Zertifizierung")</label>
|
<label class="sender-create-wizard__label">@L("CertificationType", "Zertifizierung")</label>
|
||||||
<select @bind="_certificationType" class="sender-create-wizard__select">
|
<select @bind="_certificationType" class="sender-create-wizard__select">
|
||||||
<option value="1">@L("AdvancedElectronicSignature", "Advanced Electronic Signature")</option>
|
<option value="@CertificationType.AdvancedElectronicSignature">@L("AdvancedElectronicSignature", "Advanced Electronic Signature")</option>
|
||||||
<option value="2">@L("ElectronicSignature", "Electronic Signature")</option>
|
<option value="@CertificationType.ElectronicSignature">@L("ElectronicSignature", "Electronic Signature")</option>
|
||||||
<option value="3">@L("QualifiedSignature", "Qualified Signature")</option>
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -193,7 +188,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
else if (_currentStep == 3)
|
else if (_currentStep == 1)
|
||||||
{
|
{
|
||||||
<div class="sender-create-wizard__suggestions">
|
<div class="sender-create-wizard__suggestions">
|
||||||
<div class="sender-create-wizard__suggestions-title">@L("SenderWizard_RecentReceivers", "Zuletzt verwendete Empfänger")</div>
|
<div class="sender-create-wizard__suggestions-title">@L("SenderWizard_RecentReceivers", "Zuletzt verwendete Empfänger")</div>
|
||||||
@@ -356,6 +351,19 @@
|
|||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
}
|
||||||
|
</MudStep>
|
||||||
|
}
|
||||||
|
</ChildContent>
|
||||||
|
</MudStepper>
|
||||||
|
</MudPaper>
|
||||||
|
|
||||||
|
@if (!string.IsNullOrWhiteSpace(_validationMessage))
|
||||||
|
{
|
||||||
|
<div class="sender-create-wizard__validation">@_validationMessage</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
</div>
|
||||||
</BodyContentTemplate>
|
</BodyContentTemplate>
|
||||||
<FooterContentTemplate>
|
<FooterContentTemplate>
|
||||||
<div class="sender-create-wizard__footer">
|
<div class="sender-create-wizard__footer">
|
||||||
@@ -421,7 +429,7 @@
|
|||||||
private string _language = "de-DE";
|
private string _language = "de-DE";
|
||||||
private bool _useAccessCode;
|
private bool _useAccessCode;
|
||||||
private bool _tfaEnabled;
|
private bool _tfaEnabled;
|
||||||
private int _certificationType = (int)CertificationType.AdvancedElectronicSignature;
|
private CertificationType _certificationType = CertificationType.AdvancedElectronicSignature;
|
||||||
private int _finalEmailToCreator = (int)FinalEmailType.No;
|
private int _finalEmailToCreator = (int)FinalEmailType.No;
|
||||||
private int _finalEmailToReceivers = (int)FinalEmailType.No;
|
private int _finalEmailToReceivers = (int)FinalEmailType.No;
|
||||||
private bool _sendReminderEmails;
|
private bool _sendReminderEmails;
|
||||||
@@ -457,7 +465,7 @@
|
|||||||
|
|
||||||
private bool IsFirstStep => _currentStep <= 0;
|
private bool IsFirstStep => _currentStep <= 0;
|
||||||
private bool IsLastStep => _currentStep >= TotalSteps - 1;
|
private bool IsLastStep => _currentStep >= TotalSteps - 1;
|
||||||
private bool CanSkipCurrentStep => _currentStep == 1;
|
private bool CanSkipCurrentStep => _currentStep == 3;
|
||||||
|
|
||||||
private IReadOnlyList<RecentReceiverSuggestionDto> FilteredRecentSuggestions =>
|
private IReadOnlyList<RecentReceiverSuggestionDto> FilteredRecentSuggestions =>
|
||||||
BuildFilteredRecentSuggestions();
|
BuildFilteredRecentSuggestions();
|
||||||
@@ -466,22 +474,26 @@
|
|||||||
? $"data:application/pdf;base64,{Convert.ToBase64String(_documentBytes)}"
|
? $"data:application/pdf;base64,{Convert.ToBase64String(_documentBytes)}"
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
private string CurrentStepTitle => _currentStep switch
|
private string CurrentStepTitle => GetStepTitle(_currentStep);
|
||||||
|
|
||||||
|
private string CurrentStepDescription => GetStepDescription(_currentStep);
|
||||||
|
|
||||||
|
private string GetStepTitle(int step) => step switch
|
||||||
{
|
{
|
||||||
0 => L("SenderWizard_Step_Basics", "Grunddaten"),
|
0 => L("SenderWizard_Step_Basics", "Grunddaten"),
|
||||||
1 => L("SenderWizard_Step_Message", "Nachricht und Optionen"),
|
1 => L("SenderWizard_Step_Receivers", "Empfänger"),
|
||||||
2 => L("SenderEditor_EnvelopeSettings", "Envelope-Einstellungen"),
|
2 => L("SenderEditor_EnvelopeSettings", "Envelope-Einstellungen"),
|
||||||
3 => L("SenderWizard_Step_Receivers", "Empfänger"),
|
3 => L("SenderWizard_Step_Message", "Nachricht und Optionen"),
|
||||||
4 => L("SenderWizard_Step_Document", "Dokument"),
|
4 => L("SenderWizard_Step_Document", "Dokument"),
|
||||||
_ => L("SenderWizard_Step_Basics", "Grunddaten")
|
_ => L("SenderWizard_Step_Basics", "Grunddaten")
|
||||||
};
|
};
|
||||||
|
|
||||||
private string CurrentStepDescription => _currentStep switch
|
private string GetStepDescription(int step) => step switch
|
||||||
{
|
{
|
||||||
0 => L("SenderWizard_Step_Basics_Desc", "Starten Sie mit den Pflichtangaben für den Umschlag."),
|
0 => L("SenderWizard_Step_Basics_Desc", "Starten Sie mit den Pflichtangaben für den Umschlag."),
|
||||||
1 => L("SenderWizard_Step_Message_Desc", "Fügen Sie optionale Nachricht und Einstellungen hinzu."),
|
1 => L("SenderWizard_Step_Receivers_Desc", "Definieren Sie die Empfänger für den Signaturprozess."),
|
||||||
2 => L("SenderWizard_Step_Settings_Desc", "Konfigurieren Sie Sicherheits-, Erinnerungs- und Ablaufoptionen."),
|
2 => L("SenderWizard_Step_Settings_Desc", "Konfigurieren Sie Sicherheits-, Erinnerungs- und Ablaufoptionen."),
|
||||||
3 => L("SenderWizard_Step_Receivers_Desc", "Definieren Sie die Empfänger für den Signaturprozess."),
|
3 => L("SenderWizard_Step_Message_Desc", "Fügen Sie optionale Nachricht und Einstellungen hinzu."),
|
||||||
4 => L("SenderWizard_Step_Document_Desc", "Laden Sie das Dokument hoch und platzieren Sie Signaturfelder."),
|
4 => L("SenderWizard_Step_Document_Desc", "Laden Sie das Dokument hoch und platzieren Sie Signaturfelder."),
|
||||||
_ => L("SenderWizard_Step_Basics_Desc", "Starten Sie mit den Pflichtangaben für den Umschlag.")
|
_ => L("SenderWizard_Step_Basics_Desc", "Starten Sie mit den Pflichtangaben für den Umschlag.")
|
||||||
};
|
};
|
||||||
@@ -704,7 +716,7 @@
|
|||||||
{
|
{
|
||||||
_currentStep++;
|
_currentStep++;
|
||||||
|
|
||||||
if (_currentStep == 3)
|
if (_currentStep == 1)
|
||||||
await EnsureRecentSuggestionsLoadedAsync();
|
await EnsureRecentSuggestionsLoadedAsync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -798,10 +810,10 @@
|
|||||||
if (!string.Equals(args.Key, "Enter", StringComparison.OrdinalIgnoreCase))
|
if (!string.Equals(args.Key, "Enter", StringComparison.OrdinalIgnoreCase))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (_currentStep == 1)
|
if (_currentStep == 3)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (_currentStep == 3 && (!string.IsNullOrWhiteSpace(_receiverName) || !string.IsNullOrWhiteSpace(_receiverEmail)))
|
if (_currentStep == 1 && (!string.IsNullOrWhiteSpace(_receiverName) || !string.IsNullOrWhiteSpace(_receiverEmail)))
|
||||||
{
|
{
|
||||||
await AddReceiver();
|
await AddReceiver();
|
||||||
return;
|
return;
|
||||||
@@ -895,7 +907,7 @@
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_currentStep == 3)
|
if (_currentStep == 1)
|
||||||
{
|
{
|
||||||
if (_receivers.Count == 0)
|
if (_receivers.Count == 0)
|
||||||
{
|
{
|
||||||
@@ -1116,7 +1128,7 @@
|
|||||||
_language = "de-DE";
|
_language = "de-DE";
|
||||||
_useAccessCode = false;
|
_useAccessCode = false;
|
||||||
_tfaEnabled = false;
|
_tfaEnabled = false;
|
||||||
_certificationType = (int)CertificationType.AdvancedElectronicSignature;
|
_certificationType = CertificationType.AdvancedElectronicSignature;
|
||||||
_finalEmailToCreator = (int)FinalEmailType.No;
|
_finalEmailToCreator = (int)FinalEmailType.No;
|
||||||
_finalEmailToReceivers = (int)FinalEmailType.No;
|
_finalEmailToReceivers = (int)FinalEmailType.No;
|
||||||
_sendReminderEmails = false;
|
_sendReminderEmails = false;
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Server.Client.Components.Sender;
|
namespace EnvelopeGenerator.Server.Client.Components.Sender;
|
||||||
|
|
||||||
public sealed record CreateEnvelopeWizardResult(
|
public sealed record CreateEnvelopeWizardResult(
|
||||||
@@ -7,7 +9,7 @@ public sealed record CreateEnvelopeWizardResult(
|
|||||||
string Language,
|
string Language,
|
||||||
bool UseAccessCode,
|
bool UseAccessCode,
|
||||||
bool TFAEnabled,
|
bool TFAEnabled,
|
||||||
int CertificationType,
|
CertificationType CertificationType,
|
||||||
int FinalEmailToCreator,
|
int FinalEmailToCreator,
|
||||||
int FinalEmailToReceivers,
|
int FinalEmailToReceivers,
|
||||||
bool SendReminderEmails,
|
bool SendReminderEmails,
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="MudBlazor" Version="8.0.0" />
|
||||||
<PackageReference Include="DevExpress.Blazor.PdfViewer" Version="25.2.3" />
|
<PackageReference Include="DevExpress.Blazor.PdfViewer" Version="25.2.3" />
|
||||||
<PackageReference Include="DevExpress.Blazor.Reporting.JSBasedControls" Version="25.2.3" />
|
<PackageReference Include="DevExpress.Blazor.Reporting.JSBasedControls" Version="25.2.3" />
|
||||||
<PackageReference Include="DevExpress.Blazor.Reporting.Viewer" Version="25.2.3" />
|
<PackageReference Include="DevExpress.Blazor.Reporting.Viewer" Version="25.2.3" />
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
</main>
|
</main>
|
||||||
<footer class="receiver-footer">
|
<footer class="receiver-footer">
|
||||||
<div class="receiver-footer__left">
|
<div class="receiver-footer__left">
|
||||||
<span>© SignFlow 2023-2024 <a href="https://digitaldata.works" target="_blank" rel="noopener">Digital Data GmbH</a></span>
|
<span>© signFLOW 2023-2024 <a href="https://digitaldata.works" target="_blank" rel="noopener">Digital Data GmbH</a></span>
|
||||||
<span class="receiver-footer__sep">|</span>
|
<span class="receiver-footer__sep">|</span>
|
||||||
<a href="@GetPrivacyPolicyPath()" target="_blank" rel="noopener">@L("PrivacyPolicy", "Datenschutz")</a>
|
<a href="@GetPrivacyPolicyPath()" target="_blank" rel="noopener">@L("PrivacyPolicy", "Datenschutz")</a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
}
|
}
|
||||||
<div>
|
<div>
|
||||||
<h1 class="home-hero-header__title">SignFlow</h1>
|
<h1 class="home-hero-header__title">signFLOW</h1>
|
||||||
<p class="home-hero-header__subtitle">@L("Index_Subtitle", "Willkommen im eSign-Portal")</p>
|
<p class="home-hero-header__subtitle">@L("Index_Subtitle", "Willkommen im eSign-Portal")</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -7,11 +7,12 @@
|
|||||||
@using EnvelopeGenerator.Application.Resources
|
@using EnvelopeGenerator.Application.Resources
|
||||||
@using EnvelopeGenerator.Domain.Constants
|
@using EnvelopeGenerator.Domain.Constants
|
||||||
@using EnvelopeGenerator.Domain.Resources
|
@using EnvelopeGenerator.Domain.Resources
|
||||||
|
@using EnvelopeGenerator.Application.Common.Configurations
|
||||||
@using EnvelopeGenerator.Server.Client.Components.PdfEditor
|
@using EnvelopeGenerator.Server.Client.Components.PdfEditor
|
||||||
@using EnvelopeGenerator.Server.Client.Services
|
@using EnvelopeGenerator.Server.Client.Services
|
||||||
@using Microsoft.AspNetCore.WebUtilities
|
|
||||||
@using Microsoft.AspNetCore.Components.Forms
|
@using Microsoft.AspNetCore.Components.Forms
|
||||||
@using Microsoft.Extensions.Localization
|
@using Microsoft.Extensions.Localization
|
||||||
|
@using Microsoft.Extensions.Options
|
||||||
@inject IJSRuntime JSRuntime
|
@inject IJSRuntime JSRuntime
|
||||||
@inject NavigationManager NavigationManager
|
@inject NavigationManager NavigationManager
|
||||||
@inject AppVersionService AppVersion
|
@inject AppVersionService AppVersion
|
||||||
@@ -19,23 +20,19 @@
|
|||||||
@inject DocumentService DocumentService
|
@inject DocumentService DocumentService
|
||||||
@inject PdfRenderService PdfRenderService
|
@inject PdfRenderService PdfRenderService
|
||||||
@inject ReceiverService ReceiverService
|
@inject ReceiverService ReceiverService
|
||||||
|
@inject EnvelopeReceiverService EnvelopeReceiverService
|
||||||
@inject EnvelopeService EnvelopeService
|
@inject EnvelopeService EnvelopeService
|
||||||
@inject EnvelopeTypeService EnvelopeTypeService
|
@inject EnvelopeTypeService EnvelopeTypeService
|
||||||
@inject CreateEnvelopeBootstrapStorageService CreateEnvelopeBootstrapStorageService
|
|
||||||
@inject AuthService AuthService
|
@inject AuthService AuthService
|
||||||
@inject IStringLocalizer<Resource> UiLocalizer
|
@inject IStringLocalizer<Resource> UiLocalizer
|
||||||
@inject IStringLocalizer<Model> ModelLocalizer
|
@inject IStringLocalizer<Model> ModelLocalizer
|
||||||
|
@inject IOptionsMonitor<SignatureFieldParams> SignatureFieldOptions
|
||||||
|
|
||||||
<link href="_content/DevExpress.Blazor.Themes/blazing-berry.bs5.min.css" rel="stylesheet" />
|
<link href="_content/DevExpress.Blazor.Themes/blazing-berry.bs5.min.css" rel="stylesheet" />
|
||||||
<link href="_content/DevExpress.Blazor.Viewer/css/dx-blazor-viewer-components.bs5.css" rel="stylesheet" />
|
<link href="_content/DevExpress.Blazor.Viewer/css/dx-blazor-viewer-components.bs5.css" rel="stylesheet" />
|
||||||
<link href="@AppVersion.GetVersionedUrl("css/envelope-viewer.css")" rel="stylesheet" />
|
<link href="@AppVersion.GetVersionedUrl("css/envelope-viewer.css")" rel="stylesheet" />
|
||||||
<script src="@AppVersion.GetVersionedUrl("js/envelope-editor.js")"></script>
|
<script src="@AppVersion.GetVersionedUrl("js/envelope-editor.js")"></script>
|
||||||
|
|
||||||
<DxLoadingPanel Visible="@IsBootstrapLoading"
|
|
||||||
IsContentBlocked="true"
|
|
||||||
ApplyBackgroundShading="true"
|
|
||||||
IndicatorAreaVisible="true"
|
|
||||||
Text='@L("SenderEditor_BootstrapLoadingHint", "Der Umschlag wird vorbereitet und die Daten werden uebernommen.")'>
|
|
||||||
<div class="envelope-viewer-layout">
|
<div class="envelope-viewer-layout">
|
||||||
|
|
||||||
@* ── Action Bar ── *@
|
@* ── Action Bar ── *@
|
||||||
@@ -126,9 +123,8 @@
|
|||||||
<div class="sender-settings-field">
|
<div class="sender-settings-field">
|
||||||
<label class="sender-settings-label">@L("CertificationType", "Zertifizierung")</label>
|
<label class="sender-settings-label">@L("CertificationType", "Zertifizierung")</label>
|
||||||
<select @bind="_certificationType" class="sender-settings-select">
|
<select @bind="_certificationType" class="sender-settings-select">
|
||||||
<option value="1">@L("AdvancedElectronicSignature", "Advanced Electronic Signature")</option>
|
<option value="@CertificationType.AdvancedElectronicSignature">@L("AdvancedElectronicSignature", "Advanced Electronic Signature")</option>
|
||||||
<option value="2">@L("ElectronicSignature", "Electronic Signature")</option>
|
<option value="@CertificationType.ElectronicSignature">@L("ElectronicSignature", "Electronic Signature")</option>
|
||||||
<option value="3">@L("QualifiedSignature", "Qualified Signature")</option>
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -196,44 +192,33 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="sender-receivers-panel">
|
<div class="sender-receivers-panel">
|
||||||
<div class="sender-receivers-panel__header">
|
<div class="sender-receivers-list">
|
||||||
<div class="sender-receivers-panel__title-wrap">
|
<button class="pdf-toolbar__btn pdf-toolbar__btn--signature-change sender-toolbar-action-btn sender-receivers-list__add-btn"
|
||||||
<span class="sender-receivers-panel__title">@L("Receiver", "Empfänger")</span>
|
|
||||||
<span class="sender-receivers-panel__count">@_receivers.Count</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button class="pdf-toolbar__btn pdf-toolbar__btn--signature-change sender-toolbar-action-btn"
|
|
||||||
@onclick="OpenAddReceiverPopup"
|
@onclick="OpenAddReceiverPopup"
|
||||||
title='@L("AddReceiver", "Empfänger hinzufügen")'>
|
title='@L("AddReceiver", "Empfänger hinzufügen")'>
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16">
|
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16">
|
||||||
<path d="M8 1a.5.5 0 0 1 .5.5v6h6a.5.5 0 0 1 0 1h-6v6a.5.5 0 0 1-1 0v-6h-6a.5.5 0 0 1 0-1h6v-6A.5.5 0 0 1 8 1z" />
|
<path d="M8 1a.5.5 0 0 1 .5.5v6h6a.5.5 0 0 1 0 1h-6v6a.5.5 0 0 1-1 0v-6h-6a.5.5 0 0 1 0-1h6v-6A.5.5 0 0 1 8 1z" />
|
||||||
</svg>
|
</svg>
|
||||||
<span class="pdf-toolbar__btn-text">@L("AddReceiver", "Empfänger hinzufügen")</span>
|
<span class="sender-receivers-list__add-text">@L("AddReceiver", "Empfänger hinzufügen")</span>
|
||||||
|
<span class="badge rounded-pill text-bg-primary sender-receivers-list__count">@_receivers.Count</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
|
||||||
|
|
||||||
@if (_receivers.Count == 0)
|
|
||||||
{
|
|
||||||
<div class="sender-receivers-panel__empty">
|
|
||||||
@L("SenderEditor_NoReceiversAdded", "Noch keine Empfänger hinzugefügt.")
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<div class="sender-receivers-list">
|
|
||||||
@foreach (var receiver in _receivers)
|
@foreach (var receiver in _receivers)
|
||||||
{
|
{
|
||||||
<div class="sender-receiver-chip" style="--receiver-color:@receiver.Color;">
|
<div class="sender-receiver-chip" style="--receiver-color:@receiver.Color;">
|
||||||
<div class="sender-receiver-chip__body">
|
<div class="sender-receiver-chip__body">
|
||||||
<div class="sender-receiver-chip__name">@receiver.FullName</div>
|
<div class="sender-receiver-chip__email" title="@receiver.FullName">@receiver.Email</div>
|
||||||
<div class="sender-receiver-chip__email">@receiver.Email</div>
|
|
||||||
@if (!string.IsNullOrWhiteSpace(receiver.PhoneNumber))
|
|
||||||
{
|
|
||||||
<div class="sender-receiver-chip__phone">@receiver.PhoneNumber</div>
|
|
||||||
}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button class="pdf-toolbar__btn pdf-toolbar__btn--signature-change sender-toolbar-action-btn sender-toolbar-action-btn--compact sender-receiver-chip__place-btn
|
<button class="pdf-toolbar__btn pdf-toolbar__btn--reset sender-toolbar-action-btn sender-toolbar-action-btn--compact sender-receiver-chip__action sender-receiver-chip__remove-btn"
|
||||||
|
@onclick="() => RemoveReceiverAsync(receiver)"
|
||||||
|
title='@L("Delete", "Loeschen")'>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16">
|
||||||
|
<path d="M4 4L12 12M12 4L4 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" />
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button class="pdf-toolbar__btn pdf-toolbar__btn--signature-change sender-toolbar-action-btn sender-toolbar-action-btn--compact sender-receiver-chip__action sender-receiver-chip__place-btn
|
||||||
@(_pendingReceiverForPlacement?.Id == receiver.Id ? "sender-receiver-chip__place-btn--active" : "sender-receiver-chip__place-btn--idle")"
|
@(_pendingReceiverForPlacement?.Id == receiver.Id ? "sender-receiver-chip__place-btn--active" : "sender-receiver-chip__place-btn--idle")"
|
||||||
@onclick="() => ActivatePlacementForReceiver(receiver)"
|
@onclick="() => ActivatePlacementForReceiver(receiver)"
|
||||||
style="--receiver-color:@receiver.Color;"
|
style="--receiver-color:@receiver.Color;"
|
||||||
@@ -241,11 +226,16 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16">
|
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16">
|
||||||
<path d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10z" />
|
<path d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10z" />
|
||||||
</svg>
|
</svg>
|
||||||
<span class="pdf-toolbar__btn-text">@L("SenderEditor_AddSignature", "Signatur hinzufügen")</span>
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@if (_receivers.Count == 0)
|
||||||
|
{
|
||||||
|
<div class="sender-receivers-panel__empty">
|
||||||
|
@L("SenderEditor_NoReceiversAdded", "Noch keine Empfänger hinzugefügt.")
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -431,7 +421,6 @@
|
|||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</DxLoadingPanel>
|
|
||||||
|
|
||||||
<DxPopup @bind-Visible="_receiverPopupVisible"
|
<DxPopup @bind-Visible="_receiverPopupVisible"
|
||||||
HeaderText='@L("AddReceiver", "Empfänger hinzufügen")'
|
HeaderText='@L("AddReceiver", "Empfänger hinzufügen")'
|
||||||
@@ -596,13 +585,11 @@
|
|||||||
[SupplyParameterFromQuery(Name = "envelopeId")]
|
[SupplyParameterFromQuery(Name = "envelopeId")]
|
||||||
public int? EnvelopeId { get; set; }
|
public int? EnvelopeId { get; set; }
|
||||||
|
|
||||||
[SupplyParameterFromQuery(Name = "bootstrapToken")]
|
// ── Signature field size (configurable) ──
|
||||||
public string? BootstrapToken { get; set; }
|
double SigWidthInches => SignatureFieldOptions.CurrentValue.Width;
|
||||||
|
double SigHeightInches => SignatureFieldOptions.CurrentValue.Height;
|
||||||
// ── Constants ──
|
double SigWidthPt => SigWidthInches * 72.0;
|
||||||
// Signature field size in PDF points (fixed): 1.77" × 1.96"
|
double SigHeightPt => SigHeightInches * 72.0;
|
||||||
const double SigWidthPt = 1.77 * 72; // 127.44 pt
|
|
||||||
const double SigHeightPt = 1.96 * 72; // 141.12 pt
|
|
||||||
|
|
||||||
// CssClass for JS click coordinate helper
|
// CssClass for JS click coordinate helper
|
||||||
const string ViewerCssClass = "sender-editor-pdf-viewer";
|
const string ViewerCssClass = "sender-editor-pdf-viewer";
|
||||||
@@ -617,10 +604,7 @@
|
|||||||
int _pageCount;
|
int _pageCount;
|
||||||
List<PdfPageImageDto> _pagePreviews = [];
|
List<PdfPageImageDto> _pagePreviews = [];
|
||||||
int? _loadedEnvelopeId;
|
int? _loadedEnvelopeId;
|
||||||
int? _editingEnvelopeId;
|
|
||||||
bool _isLoadingEnvelopeForEdit;
|
bool _isLoadingEnvelopeForEdit;
|
||||||
bool _bootstrapApplied;
|
|
||||||
string? _pendingBootstrapToken;
|
|
||||||
|
|
||||||
List<SignatureFieldDraft> _signatureFields = [];
|
List<SignatureFieldDraft> _signatureFields = [];
|
||||||
ReceiverDraft? _pendingReceiverForPlacement; // Set when user clicks "Signatur hinzufügen"
|
ReceiverDraft? _pendingReceiverForPlacement; // Set when user clicks "Signatur hinzufügen"
|
||||||
@@ -641,7 +625,6 @@
|
|||||||
string _saveSuccessTitle = "Vorgang erfolgreich abgeschlossen.";
|
string _saveSuccessTitle = "Vorgang erfolgreich abgeschlossen.";
|
||||||
string _saveSuccessBody = string.Empty;
|
string _saveSuccessBody = string.Empty;
|
||||||
bool _saveNavigateToDashboard = false;
|
bool _saveNavigateToDashboard = false;
|
||||||
bool _saveDraftAfterBootstrap;
|
|
||||||
|
|
||||||
// ── Envelope metadata ──
|
// ── Envelope metadata ──
|
||||||
string _envelopeTitle = string.Empty;
|
string _envelopeTitle = string.Empty;
|
||||||
@@ -653,7 +636,7 @@
|
|||||||
string _language = "de-DE";
|
string _language = "de-DE";
|
||||||
bool _useAccessCode;
|
bool _useAccessCode;
|
||||||
bool _tfaEnabled;
|
bool _tfaEnabled;
|
||||||
int _certificationType = (int)CertificationType.AdvancedElectronicSignature;
|
CertificationType _certificationType = CertificationType.AdvancedElectronicSignature;
|
||||||
int _finalEmailToCreator = (int)FinalEmailType.No;
|
int _finalEmailToCreator = (int)FinalEmailType.No;
|
||||||
int _finalEmailToReceivers = (int)FinalEmailType.No;
|
int _finalEmailToReceivers = (int)FinalEmailType.No;
|
||||||
bool _sendReminderEmails;
|
bool _sendReminderEmails;
|
||||||
@@ -675,9 +658,6 @@
|
|||||||
|
|
||||||
static readonly System.ComponentModel.DataAnnotations.EmailAddressAttribute ReceiverEmailValidator = new();
|
static readonly System.ComponentModel.DataAnnotations.EmailAddressAttribute ReceiverEmailValidator = new();
|
||||||
|
|
||||||
bool IsEditMode => EnvelopeId.HasValue && EnvelopeId.Value > 0;
|
|
||||||
bool IsBootstrapLoading => !IsEditMode && !_bootstrapApplied;
|
|
||||||
|
|
||||||
// ── Lifecycle ──
|
// ── Lifecycle ──
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
@@ -692,12 +672,6 @@
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
_envelopeTypes = (await EnvelopeTypeService.GetAsync()).ToList();
|
_envelopeTypes = (await EnvelopeTypeService.GetAsync()).ToList();
|
||||||
|
|
||||||
if (!IsEditMode && _selectedEnvelopeTypeId is null && _envelopeTypes.Count > 0)
|
|
||||||
{
|
|
||||||
_selectedEnvelopeTypeId = _envelopeTypes[0].Id;
|
|
||||||
ApplyEnvelopeTypeDefaults(_envelopeTypes[0]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -708,95 +682,14 @@
|
|||||||
|
|
||||||
protected override async Task OnParametersSetAsync()
|
protected override async Task OnParametersSetAsync()
|
||||||
{
|
{
|
||||||
if (EnvelopeId.HasValue && EnvelopeId.Value > 0)
|
if (!EnvelopeId.HasValue || EnvelopeId.Value <= 0)
|
||||||
_editingEnvelopeId = EnvelopeId.Value;
|
|
||||||
|
|
||||||
if (IsEditMode && _loadedEnvelopeId != EnvelopeId)
|
|
||||||
{
|
|
||||||
await LoadEnvelopeForEditAsync(EnvelopeId!.Value);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (IsEditMode || _bootstrapApplied)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (string.IsNullOrWhiteSpace(BootstrapToken))
|
|
||||||
{
|
{
|
||||||
NavigationManager.NavigateTo("/sender", replace: true);
|
NavigationManager.NavigateTo("/sender", replace: true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
_pendingBootstrapToken = BootstrapToken;
|
if (_loadedEnvelopeId != EnvelopeId && !_isLoadingEnvelopeForEdit)
|
||||||
}
|
await LoadEnvelopeForEditAsync(EnvelopeId.Value);
|
||||||
|
|
||||||
async Task TryApplyBootstrapAsync(string token)
|
|
||||||
{
|
|
||||||
var payload = await CreateEnvelopeBootstrapStorageService.ConsumeAsync(token);
|
|
||||||
_bootstrapApplied = true;
|
|
||||||
|
|
||||||
if (payload is null)
|
|
||||||
{
|
|
||||||
NavigationManager.NavigateTo("/sender", replace: true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_envelopeTitle = payload.Title ?? string.Empty;
|
|
||||||
_envelopeMessage = payload.Message ?? string.Empty;
|
|
||||||
_selectedEnvelopeTypeId = payload.EnvelopeTypeId;
|
|
||||||
_language = string.IsNullOrWhiteSpace(payload.Language) ? "de-DE" : payload.Language;
|
|
||||||
_useAccessCode = payload.UseAccessCode;
|
|
||||||
_tfaEnabled = payload.TFAEnabled;
|
|
||||||
_certificationType = payload.CertificationType;
|
|
||||||
_finalEmailToCreator = payload.FinalEmailToCreator;
|
|
||||||
_finalEmailToReceivers = payload.FinalEmailToReceivers;
|
|
||||||
_sendReminderEmails = payload.SendReminderEmails;
|
|
||||||
_firstReminderDays = payload.FirstReminderDays;
|
|
||||||
_reminderIntervalDays = payload.ReminderIntervalDays;
|
|
||||||
_expiresWhenDays = payload.ExpiresWhenDays;
|
|
||||||
_expiresWarningWhenDays = payload.ExpiresWarningWhenDays;
|
|
||||||
NormalizeSettings();
|
|
||||||
|
|
||||||
_receivers = payload.Receivers
|
|
||||||
.Select((receiver, index) => new ReceiverDraft(
|
|
||||||
Guid.NewGuid(),
|
|
||||||
receiver.FullName,
|
|
||||||
receiver.EmailAddress,
|
|
||||||
string.Empty,
|
|
||||||
ReceiverPalette[index % ReceiverPalette.Length]))
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
_originalPdfBytes = payload.DocumentBytes;
|
|
||||||
_fileName = string.IsNullOrWhiteSpace(payload.DocumentFileName) ? "document.pdf" : payload.DocumentFileName;
|
|
||||||
_pdfLoaded = _originalPdfBytes is { Length: > 0 };
|
|
||||||
|
|
||||||
_signatureFields.Clear();
|
|
||||||
_pendingReceiverForPlacement = null;
|
|
||||||
|
|
||||||
_saveDraftAfterBootstrap = true;
|
|
||||||
|
|
||||||
if (_pdfLoaded && _originalPdfBytes is not null)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
_pagePreviews = (await PdfRenderService.RenderPagesAsync(_originalPdfBytes))
|
|
||||||
.OrderBy(p => p.PageNumber)
|
|
||||||
.ToList();
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Logger.LogWarning(ex, "Failed to render bootstrap PDF previews.");
|
|
||||||
_pagePreviews = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
_pageCount = _pagePreviews.Count > 0
|
|
||||||
? _pagePreviews.Count
|
|
||||||
: EstimatePdfPageCount(_originalPdfBytes) ?? 1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
_pagePreviews = [];
|
|
||||||
_pageCount = 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override async Task OnAfterRenderAsync(bool firstRender)
|
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||||
@@ -806,26 +699,6 @@
|
|||||||
_isPageReady = true;
|
_isPageReady = true;
|
||||||
await InvokeAsync(StateHasChanged);
|
await InvokeAsync(StateHasChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!OperatingSystem.IsBrowser())
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!IsEditMode && !_bootstrapApplied && !string.IsNullOrWhiteSpace(_pendingBootstrapToken))
|
|
||||||
{
|
|
||||||
var token = _pendingBootstrapToken;
|
|
||||||
_pendingBootstrapToken = null;
|
|
||||||
await TryApplyBootstrapAsync(token);
|
|
||||||
await InvokeAsync(StateHasChanged);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_saveDraftAfterBootstrap && !_isSaving)
|
|
||||||
{
|
|
||||||
_saveDraftAfterBootstrap = false;
|
|
||||||
await SaveDraftAndStayOnEditorAsync();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async Task LoadEnvelopeForEditAsync(int envelopeId)
|
async Task LoadEnvelopeForEditAsync(int envelopeId)
|
||||||
@@ -853,7 +726,7 @@
|
|||||||
if (_tfaEnabled)
|
if (_tfaEnabled)
|
||||||
_useAccessCode = true;
|
_useAccessCode = true;
|
||||||
|
|
||||||
_certificationType = envelope.CertificationType ?? (int)CertificationType.AdvancedElectronicSignature;
|
_certificationType = envelope.CertificationType ?? CertificationType.AdvancedElectronicSignature;
|
||||||
_finalEmailToCreator = envelope.FinalEmailToCreator ?? (int)FinalEmailType.No;
|
_finalEmailToCreator = envelope.FinalEmailToCreator ?? (int)FinalEmailType.No;
|
||||||
_finalEmailToReceivers = envelope.FinalEmailToReceivers ?? (int)FinalEmailType.No;
|
_finalEmailToReceivers = envelope.FinalEmailToReceivers ?? (int)FinalEmailType.No;
|
||||||
|
|
||||||
@@ -869,12 +742,17 @@
|
|||||||
_receivers = envelopeReceivers
|
_receivers = envelopeReceivers
|
||||||
.Select((er, index) => new ReceiverDraft(
|
.Select((er, index) => new ReceiverDraft(
|
||||||
Guid.NewGuid(),
|
Guid.NewGuid(),
|
||||||
|
er.ReceiverId,
|
||||||
er.Name ?? er.Receiver?.EmailAddress ?? $"Receiver {er.ReceiverId}",
|
er.Name ?? er.Receiver?.EmailAddress ?? $"Receiver {er.ReceiverId}",
|
||||||
er.Receiver?.EmailAddress ?? string.Empty,
|
er.Receiver?.EmailAddress ?? string.Empty,
|
||||||
string.Empty,
|
string.Empty,
|
||||||
ReceiverPalette[index % ReceiverPalette.Length]))
|
ReceiverPalette[index % ReceiverPalette.Length]))
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
var receiverDraftByReceiverId = _receivers
|
||||||
|
.Where(r => r.ReceiverId.HasValue)
|
||||||
|
.ToDictionary(r => r.ReceiverId!.Value, r => r);
|
||||||
|
|
||||||
var receiverById = envelopeReceivers.ToDictionary(er => er.ReceiverId, er => er);
|
var receiverById = envelopeReceivers.ToDictionary(er => er.ReceiverId, er => er);
|
||||||
var colorByEmail = _receivers
|
var colorByEmail = _receivers
|
||||||
.Where(r => !string.IsNullOrWhiteSpace(r.Email))
|
.Where(r => !string.IsNullOrWhiteSpace(r.Email))
|
||||||
@@ -896,10 +774,17 @@
|
|||||||
? receiverColor
|
? receiverColor
|
||||||
: ReceiverPalette[Math.Abs(element.ReceiverId) % ReceiverPalette.Length];
|
: ReceiverPalette[Math.Abs(element.ReceiverId) % ReceiverPalette.Length];
|
||||||
|
|
||||||
|
var receiverDraft = receiverDraftByReceiverId.TryGetValue(element.ReceiverId, out var draft)
|
||||||
|
? draft
|
||||||
|
: _receivers.FirstOrDefault(r =>
|
||||||
|
(!string.IsNullOrWhiteSpace(receiverEmail) && string.Equals(r.Email, receiverEmail, StringComparison.OrdinalIgnoreCase))
|
||||||
|
|| string.Equals(r.FullName, receiverName, StringComparison.OrdinalIgnoreCase));
|
||||||
|
|
||||||
return new SignatureFieldDraft(
|
return new SignatureFieldDraft(
|
||||||
XPt: element.X * 72.0,
|
XPt: element.X * 72.0,
|
||||||
YPt: element.Y * 72.0,
|
YPt: element.Y * 72.0,
|
||||||
Page: element.Page,
|
Page: element.Page,
|
||||||
|
ReceiverDraftId: receiverDraft?.Id ?? Guid.Empty,
|
||||||
ReceiverName: receiverName,
|
ReceiverName: receiverName,
|
||||||
Color: color);
|
Color: color);
|
||||||
})
|
})
|
||||||
@@ -935,7 +820,6 @@
|
|||||||
_fileName = $"Envelope-{envelopeId}.pdf";
|
_fileName = $"Envelope-{envelopeId}.pdf";
|
||||||
_pendingReceiverForPlacement = null;
|
_pendingReceiverForPlacement = null;
|
||||||
_loadedEnvelopeId = envelopeId;
|
_loadedEnvelopeId = envelopeId;
|
||||||
_editingEnvelopeId = envelopeId;
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -1135,6 +1019,7 @@
|
|||||||
XPt: xPt,
|
XPt: xPt,
|
||||||
YPt: yPt,
|
YPt: yPt,
|
||||||
Page: page1Based,
|
Page: page1Based,
|
||||||
|
ReceiverDraftId: _pendingReceiverForPlacement.Id,
|
||||||
ReceiverName: _pendingReceiverForPlacement.FullName,
|
ReceiverName: _pendingReceiverForPlacement.FullName,
|
||||||
Color: _pendingReceiverForPlacement.Color);
|
Color: _pendingReceiverForPlacement.Color);
|
||||||
|
|
||||||
@@ -1237,9 +1122,8 @@
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var previousEnvelopeId = EnvelopeId;
|
|
||||||
var command = BuildCreateEnvelopeCommand(send: false);
|
var command = BuildCreateEnvelopeCommand(send: false);
|
||||||
Logger.LogInformation("[SenderEditor] Saving draft. EnvelopeId={EnvelopeId} IsEditMode={IsEditMode}", command.EnvelopeId, IsEditMode);
|
Logger.LogInformation("[SenderEditor] Saving draft. EnvelopeId={EnvelopeId}", command.EnvelopeId);
|
||||||
var result = await EnvelopeService.UpsertAsync(command);
|
var result = await EnvelopeService.UpsertAsync(command);
|
||||||
|
|
||||||
if (result is null)
|
if (result is null)
|
||||||
@@ -1247,16 +1131,9 @@
|
|||||||
|
|
||||||
EnvelopeId = result.Id;
|
EnvelopeId = result.Id;
|
||||||
_loadedEnvelopeId = result.Id;
|
_loadedEnvelopeId = result.Id;
|
||||||
_editingEnvelopeId = result.Id;
|
|
||||||
|
|
||||||
if (navigateToDashboard)
|
if (navigateToDashboard)
|
||||||
{
|
|
||||||
NavigationManager.NavigateTo("/sender", forceLoad: false);
|
NavigationManager.NavigateTo("/sender", forceLoad: false);
|
||||||
}
|
|
||||||
else if (previousEnvelopeId != result.Id)
|
|
||||||
{
|
|
||||||
NavigationManager.NavigateTo($"/sender/editor?envelopeId={result.Id}", forceLoad: false);
|
|
||||||
}
|
|
||||||
|
|
||||||
return result.Id;
|
return result.Id;
|
||||||
}
|
}
|
||||||
@@ -1274,12 +1151,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async Task SaveDraftAndStayOnEditorAsync()
|
|
||||||
{
|
|
||||||
Logger.LogInformation("[SenderEditor] Trigger bootstrap draft save.");
|
|
||||||
await SaveDraftCoreAsync(navigateToDashboard: false);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Send envelope ──
|
// ── Send envelope ──
|
||||||
async Task SendAsync()
|
async Task SendAsync()
|
||||||
{
|
{
|
||||||
@@ -1319,7 +1190,7 @@
|
|||||||
|
|
||||||
// Warn if any receiver has no signature field, but don't block
|
// Warn if any receiver has no signature field, but don't block
|
||||||
var receiversWithoutField = _receivers
|
var receiversWithoutField = _receivers
|
||||||
.Where(r => !_signatureFields.Any(f => f.ReceiverName == r.FullName))
|
.Where(r => !_signatureFields.Any(f => f.ReceiverDraftId == r.Id))
|
||||||
.ToList();
|
.ToList();
|
||||||
if (receiversWithoutField.Count > 0)
|
if (receiversWithoutField.Count > 0)
|
||||||
{
|
{
|
||||||
@@ -1334,21 +1205,10 @@
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var envelopeId = _editingEnvelopeId
|
var envelopeId = EnvelopeId ?? _loadedEnvelopeId;
|
||||||
?? EnvelopeId
|
|
||||||
?? _loadedEnvelopeId
|
|
||||||
?? GetEnvelopeIdFromCurrentUri();
|
|
||||||
|
|
||||||
if (!envelopeId.HasValue || envelopeId.Value <= 0)
|
if (!envelopeId.HasValue || envelopeId.Value <= 0)
|
||||||
{
|
throw new InvalidOperationException("Envelope id is missing for send.");
|
||||||
var saveResult = await EnvelopeService.UpsertAsync(BuildCreateEnvelopeCommand(send: false))
|
|
||||||
?? throw new InvalidOperationException("Draft save did not return a result.");
|
|
||||||
|
|
||||||
envelopeId = saveResult.Id;
|
|
||||||
EnvelopeId = saveResult.Id;
|
|
||||||
_loadedEnvelopeId = saveResult.Id;
|
|
||||||
_editingEnvelopeId = saveResult.Id;
|
|
||||||
}
|
|
||||||
|
|
||||||
var sendResult = await EnvelopeService.UpsertAsync(BuildCreateEnvelopeCommand(send: true) with { EnvelopeId = envelopeId })
|
var sendResult = await EnvelopeService.UpsertAsync(BuildCreateEnvelopeCommand(send: true) with { EnvelopeId = envelopeId })
|
||||||
?? throw new InvalidOperationException("Send did not return a result.");
|
?? throw new InvalidOperationException("Send did not return a result.");
|
||||||
@@ -1379,13 +1239,10 @@
|
|||||||
{
|
{
|
||||||
NormalizeSettings();
|
NormalizeSettings();
|
||||||
|
|
||||||
var envelopeId = _editingEnvelopeId
|
var envelopeId = EnvelopeId ?? _loadedEnvelopeId;
|
||||||
?? EnvelopeId
|
|
||||||
?? _loadedEnvelopeId
|
|
||||||
?? GetEnvelopeIdFromCurrentUri();
|
|
||||||
|
|
||||||
if (IsEditMode && envelopeId is null)
|
if (envelopeId is null)
|
||||||
throw new InvalidOperationException("Edit mode envelope id is missing.");
|
throw new InvalidOperationException("Envelope id is missing.");
|
||||||
|
|
||||||
var docBase64 = _originalPdfBytes is { Length: > 0 }
|
var docBase64 = _originalPdfBytes is { Length: > 0 }
|
||||||
? Convert.ToBase64String(_originalPdfBytes)
|
? Convert.ToBase64String(_originalPdfBytes)
|
||||||
@@ -1394,7 +1251,7 @@
|
|||||||
var receiverCommands = _receivers.Select(receiver =>
|
var receiverCommands = _receivers.Select(receiver =>
|
||||||
{
|
{
|
||||||
var fields = _signatureFields
|
var fields = _signatureFields
|
||||||
.Where(f => f.ReceiverName == receiver.FullName)
|
.Where(f => f.ReceiverDraftId == receiver.Id)
|
||||||
.Select(f => new CreateEnvelopeFieldDto(
|
.Select(f => new CreateEnvelopeFieldDto(
|
||||||
X: f.XPt / 72.0,
|
X: f.XPt / 72.0,
|
||||||
Y: f.YPt / 72.0,
|
Y: f.YPt / 72.0,
|
||||||
@@ -1473,28 +1330,6 @@
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
int? GetEnvelopeIdFromCurrentUri()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var uri = NavigationManager.ToAbsoluteUri(NavigationManager.Uri);
|
|
||||||
if (string.IsNullOrWhiteSpace(uri.Query))
|
|
||||||
return null;
|
|
||||||
|
|
||||||
var query = QueryHelpers.ParseQuery(uri.Query);
|
|
||||||
if (!query.TryGetValue("envelopeId", out var raw))
|
|
||||||
return null;
|
|
||||||
|
|
||||||
return int.TryParse(raw.ToString(), out var id) && id > 0
|
|
||||||
? id
|
|
||||||
: null;
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Receiver popup ──
|
// ── Receiver popup ──
|
||||||
void OpenAddReceiverPopup()
|
void OpenAddReceiverPopup()
|
||||||
{
|
{
|
||||||
@@ -1656,18 +1491,49 @@
|
|||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
_receivers.Add(new ReceiverDraft(Guid.NewGuid(), fullName, email, phoneNumber,
|
_receivers.Add(new ReceiverDraft(Guid.NewGuid(), null, fullName, email, phoneNumber,
|
||||||
ReceiverPalette[_receivers.Count % ReceiverPalette.Length]));
|
ReceiverPalette[_receivers.Count % ReceiverPalette.Length]));
|
||||||
CloseAddReceiverPopup();
|
CloseAddReceiverPopup();
|
||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async Task RemoveReceiverAsync(ReceiverDraft receiver)
|
||||||
|
{
|
||||||
|
if (_isSaving)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var envelopeId = EnvelopeId ?? _loadedEnvelopeId;
|
||||||
|
|
||||||
|
if (envelopeId is int persistedEnvelopeId && persistedEnvelopeId > 0 && receiver.ReceiverId is int persistedReceiverId && persistedReceiverId > 0)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await EnvelopeReceiverService.DeleteAsync(persistedEnvelopeId, persistedReceiverId);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.LogError(ex, "[SenderEditor] Failed to remove receiver {ReceiverId} from envelope {EnvelopeId}", persistedReceiverId, persistedEnvelopeId);
|
||||||
|
_saveErrorMessage = string.Format(
|
||||||
|
L("SenderEditor_RemoveReceiverError", "Empfaenger konnte nicht entfernt werden: {0}"),
|
||||||
|
ex.Message);
|
||||||
|
_savePopupVisible = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_receivers.RemoveAll(r => r.Id == receiver.Id);
|
||||||
|
_signatureFields.RemoveAll(f => f.ReceiverDraftId == receiver.Id);
|
||||||
|
|
||||||
|
if (_pendingReceiverForPlacement?.Id == receiver.Id)
|
||||||
|
_pendingReceiverForPlacement = null;
|
||||||
|
}
|
||||||
|
|
||||||
// ── Models ──
|
// ── Models ──
|
||||||
record SignatureFieldDraft(double XPt, double YPt, int Page, string ReceiverName, string Color);
|
record SignatureFieldDraft(double XPt, double YPt, int Page, Guid ReceiverDraftId, string ReceiverName, string Color);
|
||||||
|
|
||||||
record NormalisedCoords(double NormX, double NormY, int PageIndex);
|
record NormalisedCoords(double NormX, double NormY, int PageIndex);
|
||||||
|
|
||||||
record ReceiverDraft(Guid Id, string FullName, string Email, string PhoneNumber, string Color);
|
record ReceiverDraft(Guid Id, int? ReceiverId, string FullName, string Email, string PhoneNumber, string Color);
|
||||||
|
|
||||||
// ── Receiver colour palette (cycles when > 8 receivers) ──
|
// ── Receiver colour palette (cycles when > 8 receivers) ──
|
||||||
static readonly string[] ReceiverPalette =
|
static readonly string[] ReceiverPalette =
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
@using EnvelopeGenerator.Server.Client.Services
|
@using EnvelopeGenerator.Server.Client.Services
|
||||||
@using EnvelopeGenerator.Application.Common.Dto
|
@using EnvelopeGenerator.Application.Common.Dto
|
||||||
@using EnvelopeGenerator.Application.Common.Dto.History
|
@using EnvelopeGenerator.Application.Common.Dto.History
|
||||||
|
@using EnvelopeGenerator.Application.Envelopes.Commands
|
||||||
@using EnvelopeGenerator.Application.Resources
|
@using EnvelopeGenerator.Application.Resources
|
||||||
@using EnvelopeGenerator.Domain.Resources
|
@using EnvelopeGenerator.Domain.Resources
|
||||||
@using EnvelopeGenerator.Server.Client.Components.Sender
|
@using EnvelopeGenerator.Server.Client.Components.Sender
|
||||||
@@ -19,7 +20,8 @@
|
|||||||
@inject EnvelopeGenerator.Server.Client.Services.ThemeService ThemeService
|
@inject EnvelopeGenerator.Server.Client.Services.ThemeService ThemeService
|
||||||
@inject EnvelopeGenerator.Server.Client.Services.UserPreferencesService UserPreferencesService
|
@inject EnvelopeGenerator.Server.Client.Services.UserPreferencesService UserPreferencesService
|
||||||
@inject EnvelopeGenerator.Server.Client.Services.CustomImagesService CustomImagesService
|
@inject EnvelopeGenerator.Server.Client.Services.CustomImagesService CustomImagesService
|
||||||
@inject EnvelopeGenerator.Server.Client.Services.CreateEnvelopeBootstrapStorageService CreateEnvelopeBootstrapStorageService
|
@inject EnvelopeGenerator.Server.Client.Services.PdfSignatureService PdfSignatureService
|
||||||
|
@inject EnvelopeGenerator.Server.Client.Services.EnvelopeReceiverService EnvelopeReceiverService
|
||||||
@inject ILogger<SenderPage> Logger
|
@inject ILogger<SenderPage> Logger
|
||||||
@inject NavigationManager Navigation
|
@inject NavigationManager Navigation
|
||||||
@inject IJSRuntime JSRuntime
|
@inject IJSRuntime JSRuntime
|
||||||
@@ -319,6 +321,7 @@
|
|||||||
var isSigned = IsReceiverSigned(envelope, receiver);
|
var isSigned = IsReceiverSigned(envelope, receiver);
|
||||||
var accessCode = receiver.AccessCode;
|
var accessCode = receiver.AccessCode;
|
||||||
var hasAccessCode = !string.IsNullOrWhiteSpace(accessCode);
|
var hasAccessCode = !string.IsNullOrWhiteSpace(accessCode);
|
||||||
|
var hasReceiverEnvelopeUrl = CanOpenReceiverEnvelopeUrl(envelope, receiver);
|
||||||
}
|
}
|
||||||
<span class="receiver-badge receiver-badge--@(isRejected ? "unsigned" : (isSigned ? "signed" : "unsigned"))" style="min-width: 100px;">
|
<span class="receiver-badge receiver-badge--@(isRejected ? "unsigned" : (isSigned ? "signed" : "unsigned"))" style="min-width: 100px;">
|
||||||
@if (isRejected)
|
@if (isRejected)
|
||||||
@@ -364,6 +367,19 @@
|
|||||||
<path d="M10 1.5A1.5 1.5 0 0 1 11.5 3v1H13A1.5 1.5 0 0 1 14.5 5.5v8A1.5 1.5 0 0 1 13 15H5A1.5 1.5 0 0 1 3.5 13.5V12H3A1.5 1.5 0 0 1 1.5 10.5v-8A1.5 1.5 0 0 1 3 1h7zm.5 2A.5.5 0 0 0 10 3H3a.5.5 0 0 0-.5.5v7A.5.5 0 0 0 3 11h.5V5.5A1.5 1.5 0 0 1 5 4h5.5v-.5zM5 5a.5.5 0 0 0-.5.5v8a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5v-8A.5.5 0 0 0 13 5H5z"/>
|
<path d="M10 1.5A1.5 1.5 0 0 1 11.5 3v1H13A1.5 1.5 0 0 1 14.5 5.5v8A1.5 1.5 0 0 1 13 15H5A1.5 1.5 0 0 1 3.5 13.5V12H3A1.5 1.5 0 0 1 1.5 10.5v-8A1.5 1.5 0 0 1 3 1h7zm.5 2A.5.5 0 0 0 10 3H3a.5.5 0 0 0-.5.5v7A.5.5 0 0 0 3 11h.5V5.5A1.5 1.5 0 0 1 5 4h5.5v-.5zM5 5a.5.5 0 0 0-.5.5v8a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5v-8A.5.5 0 0 0 13 5H5z"/>
|
||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
|
@if (_canUseReceiverEnvelopeUrl)
|
||||||
|
{
|
||||||
|
<button type="button"
|
||||||
|
class="sender-access-code__copy"
|
||||||
|
disabled="@(!hasReceiverEnvelopeUrl)"
|
||||||
|
@onclick='() => OpenReceiverEnvelopeUrlAsync(envelope, receiver)'
|
||||||
|
title="@L("Open", "Open")">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16" aria-hidden="true">
|
||||||
|
<path fill-rule="evenodd" d="M6.364 13.5a1.5 1.5 0 0 1-1.5-1.5V4a1.5 1.5 0 0 1 1.5-1.5h4a.5.5 0 0 1 0 1h-4a.5.5 0 0 0-.5.5v8a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5v-4a.5.5 0 0 1 1 0v4a1.5 1.5 0 0 1-1.5 1.5h-8z"/>
|
||||||
|
<path fill-rule="evenodd" d="M8.5 1a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 .5.5v5a.5.5 0 0 1-1 0V2.707L8.854 7.354a.5.5 0 1 1-.708-.708L12.793 2H9a.5.5 0 0 1-.5-.5z"/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -424,7 +440,7 @@
|
|||||||
|
|
||||||
@* ── PDF Vorschau Popup ────────────────────────────────────────────────── *@
|
@* ── PDF Vorschau Popup ────────────────────────────────────────────────── *@
|
||||||
<DxPopup @bind-Visible="@_previewVisible"
|
<DxPopup @bind-Visible="@_previewVisible"
|
||||||
HeaderText="@($"{L("Preview", "Vorschau")} — {_selectedEnvelope?.Title} (#{_selectedEnvelope?.Id})")"
|
HeaderText="@($"{(_activeTab == "completed" && _selectedEnvelope?.Status == EnvelopeStatus.EnvelopeCompletelySigned ? L("SignedPdf", "Signiertes PDF") : L("Preview", "Vorschau"))} — {_selectedEnvelope?.Title} (#{_selectedEnvelope?.Id})")"
|
||||||
Width="80vw"
|
Width="80vw"
|
||||||
MaxWidth="80vw"
|
MaxWidth="80vw"
|
||||||
Height="90vh"
|
Height="90vh"
|
||||||
@@ -543,6 +559,7 @@
|
|||||||
private string _activeTab = "active";
|
private string _activeTab = "active";
|
||||||
private bool _isLoading = true;
|
private bool _isLoading = true;
|
||||||
private bool _isLoggingOut = false;
|
private bool _isLoggingOut = false;
|
||||||
|
private bool _canUseReceiverEnvelopeUrl = false;
|
||||||
private string? _errorMessage;
|
private string? _errorMessage;
|
||||||
private DxGrid? _grid;
|
private DxGrid? _grid;
|
||||||
|
|
||||||
@@ -602,6 +619,8 @@
|
|||||||
try { await ThemeService.LoadFromServerAsync(); }
|
try { await ThemeService.LoadFromServerAsync(); }
|
||||||
catch { /* swallow — default theme remains active */ }
|
catch { /* swallow — default theme remains active */ }
|
||||||
|
|
||||||
|
_canUseReceiverEnvelopeUrl = await EnvelopeReceiverService.GetReceiverEnvelopeUrlFeatureEnabledAsync();
|
||||||
|
|
||||||
// Load logo config — authenticated, so this should succeed
|
// Load logo config — authenticated, so this should succeed
|
||||||
var logos = await CustomImagesService.GetAsync();
|
var logos = await CustomImagesService.GetAsync();
|
||||||
_appLogo = logos.App;
|
_appLogo = logos.App;
|
||||||
@@ -628,7 +647,7 @@
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_allEnvelopes = await EnvelopeService.GetAsync() ?? [];
|
_allEnvelopes = await EnvelopeService.GetAsync(includeDocAndDocRes: false) ?? [];
|
||||||
|
|
||||||
// Split into active and completed based on effective status
|
// Split into active and completed based on effective status
|
||||||
// (history-aware: rejected envelopes should not stay in active tab).
|
// (history-aware: rejected envelopes should not stay in active tab).
|
||||||
@@ -725,29 +744,44 @@
|
|||||||
|
|
||||||
async Task StartEditorFromWizardAsync(CreateEnvelopeWizardResult result)
|
async Task StartEditorFromWizardAsync(CreateEnvelopeWizardResult result)
|
||||||
{
|
{
|
||||||
var payload = new CreateEnvelopeBootstrapPayload(
|
var docBase64 = result.DocumentBytes is { Length: > 0 }
|
||||||
Title: result.Title,
|
? Convert.ToBase64String(result.DocumentBytes)
|
||||||
Message: result.Message,
|
: null;
|
||||||
EnvelopeTypeId: result.EnvelopeTypeId,
|
|
||||||
Language: result.Language,
|
|
||||||
UseAccessCode: result.UseAccessCode,
|
|
||||||
TFAEnabled: result.TFAEnabled,
|
|
||||||
CertificationType: result.CertificationType,
|
|
||||||
FinalEmailToCreator: result.FinalEmailToCreator,
|
|
||||||
FinalEmailToReceivers: result.FinalEmailToReceivers,
|
|
||||||
SendReminderEmails: result.SendReminderEmails,
|
|
||||||
FirstReminderDays: result.FirstReminderDays,
|
|
||||||
ReminderIntervalDays: result.ReminderIntervalDays,
|
|
||||||
ExpiresWhenDays: result.ExpiresWhenDays,
|
|
||||||
ExpiresWarningWhenDays: result.ExpiresWarningWhenDays,
|
|
||||||
Receivers: result.Receivers
|
|
||||||
.Select(x => new CreateEnvelopeBootstrapReceiver(x.FullName, x.EmailAddress))
|
|
||||||
.ToList(),
|
|
||||||
DocumentBytes: result.DocumentBytes,
|
|
||||||
DocumentFileName: result.DocumentFileName);
|
|
||||||
|
|
||||||
var token = await CreateEnvelopeBootstrapStorageService.StoreAsync(payload);
|
var command = new CreateEnvelopeCommand
|
||||||
Navigation.NavigateTo($"/sender/editor?bootstrapToken={token}");
|
{
|
||||||
|
EnvelopeTypeId = result.EnvelopeTypeId,
|
||||||
|
Title = result.Title,
|
||||||
|
Message = result.Message,
|
||||||
|
Language = string.IsNullOrWhiteSpace(result.Language) ? "de-DE" : result.Language,
|
||||||
|
UseAccessCode = result.UseAccessCode,
|
||||||
|
TFAEnabled = result.TFAEnabled,
|
||||||
|
CertificationType = result.CertificationType,
|
||||||
|
FinalEmailToCreator = result.FinalEmailToCreator,
|
||||||
|
FinalEmailToReceivers = result.FinalEmailToReceivers,
|
||||||
|
SendReminderEmails = result.SendReminderEmails,
|
||||||
|
FirstReminderDays = result.FirstReminderDays,
|
||||||
|
ReminderIntervalDays = result.ReminderIntervalDays,
|
||||||
|
ExpiresWhenDays = result.ExpiresWhenDays,
|
||||||
|
ExpiresWarningWhenDays = result.ExpiresWarningWhenDays,
|
||||||
|
Send = false,
|
||||||
|
Document = string.IsNullOrWhiteSpace(docBase64) ? null : new CreateEnvelopeDocumentDto(docBase64),
|
||||||
|
Receivers = result.Receivers
|
||||||
|
.Select(x => new CreateEnvelopeReceiverDto(x.EmailAddress, x.FullName, null, []))
|
||||||
|
.ToList()
|
||||||
|
};
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var envelope = await EnvelopeService.UpsertAsync(command)
|
||||||
|
?? throw new InvalidOperationException("Envelope creation returned no result.");
|
||||||
|
Navigation.NavigateTo($"/sender/editor?envelopeId={envelope.Id}");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.LogError(ex, "Failed to create envelope from wizard.");
|
||||||
|
_errorMessage = ex.Message;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void EditEnvelope()
|
void EditEnvelope()
|
||||||
@@ -986,6 +1020,35 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async Task OpenReceiverEnvelopeUrlAsync(EnvelopeDto envelope, EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver.EnvelopeReceiverDto receiver)
|
||||||
|
{
|
||||||
|
if (!_canUseReceiverEnvelopeUrl)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!CanOpenReceiverEnvelopeUrl(envelope, receiver))
|
||||||
|
return;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var receiverEnvelopeUrl = await EnvelopeReceiverService.GetReceiverEnvelopeUrlAsync(
|
||||||
|
envelope.Uuid,
|
||||||
|
receiver.Receiver!.Signature!);
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(receiverEnvelopeUrl))
|
||||||
|
return;
|
||||||
|
|
||||||
|
await JSRuntime.InvokeVoidAsync("open", receiverEnvelopeUrl, "_blank", "noopener,noreferrer");
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
await JSRuntime.InvokeVoidAsync("console.warn", "[Sender] Failed to open receiver envelope URL.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool CanOpenReceiverEnvelopeUrl(EnvelopeDto envelope, EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver.EnvelopeReceiverDto receiver)
|
||||||
|
=> !string.IsNullOrWhiteSpace(envelope.Uuid)
|
||||||
|
&& !string.IsNullOrWhiteSpace(receiver.Receiver?.Signature);
|
||||||
|
|
||||||
void OnCustomizeElement(GridCustomizeElementEventArgs e)
|
void OnCustomizeElement(GridCustomizeElementEventArgs e)
|
||||||
{
|
{
|
||||||
// Future: Add custom row coloring based on status if needed
|
// Future: Add custom row coloring based on status if needed
|
||||||
@@ -1024,12 +1087,14 @@
|
|||||||
|
|
||||||
private async Task OpenPreviewAsync(EnvelopeDto envelope)
|
private async Task OpenPreviewAsync(EnvelopeDto envelope)
|
||||||
{
|
{
|
||||||
|
var showSigned = _activeTab == "completed" && envelope.Status == EnvelopeStatus.EnvelopeCompletelySigned;
|
||||||
|
|
||||||
// Unmount the viewer first — let the previous instance fully dispose
|
// Unmount the viewer first — let the previous instance fully dispose
|
||||||
_previewViewerMounted = false;
|
_previewViewerMounted = false;
|
||||||
_previewPdfBytes = null;
|
_previewPdfBytes = null;
|
||||||
_previewPageCount = 0;
|
_previewPageCount = 0;
|
||||||
_previewPagePreviews = [];
|
_previewPagePreviews = [];
|
||||||
_previewFileName = $"envelope-{envelope.Id}.pdf";
|
_previewFileName = showSigned ? $"envelope-{envelope.Id}-signed.pdf" : $"envelope-{envelope.Id}.pdf";
|
||||||
_previewErrorMessage = null;
|
_previewErrorMessage = null;
|
||||||
_previewLoading = true;
|
_previewLoading = true;
|
||||||
_previewVisible = true;
|
_previewVisible = true;
|
||||||
@@ -1037,7 +1102,10 @@
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_previewPdfBytes = await DocumentService.GetSenderDocumentBytesByEnvelopeIdAsync(envelope.Id);
|
_previewPdfBytes = showSigned
|
||||||
|
? await PdfSignatureService.GetSignedPdfAsync(envelope.Id)
|
||||||
|
: await DocumentService.GetSenderDocumentBytesByEnvelopeIdAsync(envelope.Id);
|
||||||
|
|
||||||
if (_previewPdfBytes is null || _previewPdfBytes.Length == 0)
|
if (_previewPdfBytes is null || _previewPdfBytes.Length == 0)
|
||||||
{
|
{
|
||||||
_previewErrorMessage = L("DocumentCouldNotBeLoaded", "Dokument konnte nicht geladen werden");
|
_previewErrorMessage = L("DocumentCouldNotBeLoaded", "Dokument konnte nicht geladen werden");
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user