Compare commits
70 Commits
cc4a7d8c20
...
feat/blazo
| Author | SHA1 | Date | |
|---|---|---|---|
| 8a6120ff96 | |||
| 5b90c02a1f | |||
| 4da21133a6 | |||
| 8ee3ae55d9 | |||
| d30a42238f | |||
| bb371ad6af | |||
| 54105b2be8 | |||
| 72a2a23f0a | |||
| 4ce9b77a71 | |||
| dab573d6d7 | |||
| dfcf197deb | |||
| df825b521c | |||
| a545c15aed | |||
| e36f816f35 | |||
| 75bda545a8 | |||
| 0b9abc8fc1 | |||
| e5475fa155 | |||
| 4619440fd7 | |||
| e40cd56590 | |||
| fe219f58c2 | |||
| 48bbadc906 | |||
| 8d9480ed71 | |||
| d24049cc02 | |||
|
|
8655d84ed5 | ||
|
|
caae986b2d | ||
|
|
af28844714 | ||
|
|
8257ed573d | ||
|
|
93488ba83e | ||
|
|
4aa889f178 | ||
|
|
60d7043164 | ||
|
|
7aa9853756 | ||
|
|
0a544cfe85 | ||
|
|
4f3c66b4f7 | ||
|
|
7271a92d32 | ||
|
|
c7275ad966 | ||
|
|
bf8115259a | ||
|
|
590ab9bf02 | ||
|
|
45377ea61c | ||
|
|
b5748550d1 | ||
| 64c018b92e | |||
| 176672d7eb | |||
| 05d54e87c3 | |||
| 06c2a07fbc | |||
| 7cb1546934 | |||
| 60db762bcc | |||
| 5e840db04c | |||
| e724a74f9c | |||
| 48b7afcdc1 | |||
| 717da90c01 | |||
| 8054bb377d | |||
| 200258ff73 | |||
| fa73d939b5 | |||
| ca9e25abcb | |||
| 82831991b0 | |||
|
|
260e8d53ba | ||
|
|
0fd174ee0c | ||
|
|
ab4cd7c254 | ||
| 1f5468b1ac | |||
| b20aafe7a5 | |||
| 466d0a3a7a | |||
| 7281cb47c3 | |||
| eb5db3d6be | |||
| 8a534b84d0 | |||
| c523153654 | |||
| 82c85643c8 | |||
| 69892d566c | |||
| 2f41348c59 | |||
| 0d56ac7448 | |||
| 18a563ecd1 | |||
| 73df248d15 |
@@ -1,5 +1,6 @@
|
||||
using DigitalData.Core.Abstraction.Application.DTO;
|
||||
using DigitalData.Core.Exceptions;
|
||||
using EnvelopeGenerator.Application.Common.Dto;
|
||||
using EnvelopeGenerator.Application.Common.Extensions;
|
||||
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
||||
using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
|
||||
@@ -7,11 +8,13 @@ using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
|
||||
using EnvelopeGenerator.Application.Histories.Queries;
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
using EnvelopeGenerator.API.Extensions;
|
||||
using EnvelopeGenerator.API.Models;
|
||||
using MediatR;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using System.Dynamic;
|
||||
|
||||
namespace EnvelopeGenerator.API.Controllers;
|
||||
|
||||
@@ -115,4 +118,127 @@ public class AnnotationController : ControllerBase
|
||||
_logger.LogNotice(histRes.Notices);
|
||||
return StatusCode(500, histRes.Messages);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns the signature placeholders (id, page, x, y, width, height)
|
||||
/// the authenticated receiver must sign on the current envelope.
|
||||
/// Used by the Blazor receiver UI to render a custom signature overlay
|
||||
/// on top of the DevExpress PDF viewer.
|
||||
/// </summary>
|
||||
[Authorize(Policy = AuthPolicy.Receiver)]
|
||||
[HttpGet("elements")]
|
||||
public async Task<IActionResult> GetElements(CancellationToken cancel)
|
||||
{
|
||||
var signature = User.GetReceiverSignatureOfReceiver();
|
||||
var uuid = User.GetEnvelopeUuidOfReceiver();
|
||||
|
||||
var envelopeReceiver = await _mediator.ReadEnvelopeReceiverAsync(uuid, signature, cancel)
|
||||
?? throw new NotFoundException("Envelope receiver is not found.");
|
||||
|
||||
var elements = envelopeReceiver.Envelope?.Documents?.FirstOrDefault()?.Elements
|
||||
?? Enumerable.Empty<Application.Common.Dto.SignatureDto>();
|
||||
|
||||
// Only expose what the overlay needs (no internal columns).
|
||||
var payload = elements
|
||||
.Where(e => e.ReceiverId == envelopeReceiver.ReceiverId)
|
||||
.Select(e => new
|
||||
{
|
||||
id = e.Id,
|
||||
page = e.Page,
|
||||
x = e.X,
|
||||
y = e.Y,
|
||||
width = e.Width,
|
||||
height = e.Height,
|
||||
required = e.Required,
|
||||
tooltip = e.Tooltip,
|
||||
});
|
||||
|
||||
return Ok(payload);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Signs the document for the authenticated receiver using a Blazor /
|
||||
/// DevExpress friendly payload (one PNG image per placeholder, plus
|
||||
/// optional position / city per placeholder).
|
||||
///
|
||||
/// Internally produces a <see cref="PsPdfKitAnnotation"/> wrapping a
|
||||
/// list of <see cref="AnnotationCreateDto"/> entries so that the
|
||||
/// existing notification pipeline (mail / status / annotation persistence)
|
||||
/// is fully reused. The Instant JSON is left blank because the Blazor
|
||||
/// pipeline does not depend on PSPDFKit-side rendering.
|
||||
/// </summary>
|
||||
[Authorize(Policy = AuthPolicy.Receiver)]
|
||||
[HttpPost("blazor")]
|
||||
public async Task<IActionResult> SignBlazor([FromBody] BlazorSignaturePayload payload, CancellationToken cancel)
|
||||
{
|
||||
if (payload is null || payload.Signatures.Count == 0)
|
||||
return BadRequest();
|
||||
|
||||
var signature = User.GetReceiverSignatureOfReceiver();
|
||||
var uuid = User.GetEnvelopeUuidOfReceiver();
|
||||
|
||||
var envelopeReceiver = await _mediator.ReadEnvelopeReceiverAsync(uuid, signature, cancel)
|
||||
?? throw new NotFoundException("Envelope receiver is not found.");
|
||||
|
||||
if (await _mediator.IsSignedAsync(uuid, signature, cancel))
|
||||
return Problem(statusCode: StatusCodes.Status409Conflict);
|
||||
|
||||
if (await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
|
||||
return Problem(statusCode: StatusCodes.Status423Locked);
|
||||
|
||||
// Build a structured AnnotationCreateDto list out of the lightweight
|
||||
// payload. One DTO per (element, kind) tuple, mirroring how the legacy
|
||||
// PSPDFKit pipeline produced multiple form fields per placeholder.
|
||||
var structured = new List<AnnotationCreateDto>();
|
||||
foreach (var entry in payload.Signatures)
|
||||
{
|
||||
structured.Add(new AnnotationCreateDto
|
||||
{
|
||||
ElementId = entry.ElementId,
|
||||
Name = $"{entry.ElementId}#signature",
|
||||
Type = "signature",
|
||||
Value = entry.SignatureDataUrl,
|
||||
});
|
||||
if (!string.IsNullOrWhiteSpace(entry.Position))
|
||||
{
|
||||
structured.Add(new AnnotationCreateDto
|
||||
{
|
||||
ElementId = entry.ElementId,
|
||||
Name = $"{entry.ElementId}#position",
|
||||
Type = "position",
|
||||
Value = entry.Position!,
|
||||
});
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(entry.City))
|
||||
{
|
||||
structured.Add(new AnnotationCreateDto
|
||||
{
|
||||
ElementId = entry.ElementId,
|
||||
Name = $"{entry.ElementId}#city",
|
||||
Type = "city",
|
||||
Value = entry.City!,
|
||||
});
|
||||
}
|
||||
structured.Add(new AnnotationCreateDto
|
||||
{
|
||||
ElementId = entry.ElementId,
|
||||
Name = $"{entry.ElementId}#date",
|
||||
Type = "date",
|
||||
Value = entry.SignedAt.ToString("o"),
|
||||
});
|
||||
}
|
||||
|
||||
// No PSPDFKit Instant JSON for the Blazor flow — pass an empty object.
|
||||
var psPdfKitAnnotation = new PsPdfKitAnnotation(new ExpandoObject(), structured);
|
||||
|
||||
var docSignedNotification = await _mediator
|
||||
.ReadEnvelopeReceiverAsync(uuid, signature, cancel)
|
||||
.ToDocSignedNotification(psPdfKitAnnotation)
|
||||
?? throw new NotFoundException("Envelope receiver is not found.");
|
||||
|
||||
await _mediator.PublishSafely(docSignedNotification, cancel);
|
||||
await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
|
||||
|
||||
return Ok();
|
||||
}
|
||||
}
|
||||
|
||||
407
EnvelopeGenerator.API/Controllers/ReceiverAuthController.cs
Normal file
407
EnvelopeGenerator.API/Controllers/ReceiverAuthController.cs
Normal file
@@ -0,0 +1,407 @@
|
||||
using EnvelopeGenerator.API.Models;
|
||||
using EnvelopeGenerator.Application.Common.Extensions;
|
||||
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
||||
using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
using EnvelopeGenerator.API.Extensions;
|
||||
using MediatR;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using OtpNet;
|
||||
|
||||
namespace EnvelopeGenerator.API.Controllers;
|
||||
|
||||
/// <summary>
|
||||
/// REST-API für den Empfänger-Authentifizierungs-Flow.
|
||||
///
|
||||
/// Entspricht der Logik in EnvelopeGenerator.Web.Controllers.EnvelopeController
|
||||
/// (Main + LogInEnvelope), aber gibt JSON statt Views zurück.
|
||||
///
|
||||
/// Der Blazor-Client (ReceiverUI) ruft diese Endpunkte auf.
|
||||
///
|
||||
/// FLOW:
|
||||
/// 1. Client ruft GET /api/receiverauth/{key}/status → Prüft Status
|
||||
/// 2. Client ruft POST /api/receiverauth/{key}/access-code → Sendet AccessCode
|
||||
/// 3. Client ruft POST /api/receiverauth/{key}/tfa → Sendet TFA-Code
|
||||
///
|
||||
/// Nach erfolgreicher Authentifizierung wird ein Cookie gesetzt (SignInEnvelopeAsync).
|
||||
/// Danach kann der Client die Dokument-Daten über die bestehenden Envelope-Endpunkte laden.
|
||||
/// </summary>
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
public class ReceiverAuthController : ControllerBase
|
||||
{
|
||||
private readonly ILogger<ReceiverAuthController> _logger;
|
||||
private readonly IMediator _mediator;
|
||||
private readonly IEnvelopeReceiverService _envRcvService;
|
||||
private readonly IEnvelopeHistoryService _historyService;
|
||||
private readonly IAuthenticator _authenticator;
|
||||
private readonly IReceiverService _rcvService;
|
||||
private readonly IEnvelopeSmsHandler _envSmsHandler;
|
||||
|
||||
public ReceiverAuthController(
|
||||
ILogger<ReceiverAuthController> logger,
|
||||
IMediator mediator,
|
||||
IEnvelopeReceiverService envRcvService,
|
||||
IEnvelopeHistoryService historyService,
|
||||
IAuthenticator authenticator,
|
||||
IReceiverService rcvService,
|
||||
IEnvelopeSmsHandler envSmsHandler)
|
||||
{
|
||||
_logger = logger;
|
||||
_mediator = mediator;
|
||||
_envRcvService = envRcvService;
|
||||
_historyService = historyService;
|
||||
_authenticator = authenticator;
|
||||
_rcvService = rcvService;
|
||||
_envSmsHandler = envSmsHandler;
|
||||
}
|
||||
|
||||
// ══════════════════════════════════════════════════════════════
|
||||
// ENDPUNKT 1: STATUS PRÜFEN
|
||||
// Entspricht: Web.EnvelopeController.Main()
|
||||
// ══════════════════════════════════════════════════════════════
|
||||
|
||||
/// <summary>
|
||||
/// Prüft den aktuellen Status eines Umschlags für den Empfänger.
|
||||
/// Entscheidet ob: NotFound, Rejected, Signed, AccessCode nötig, oder direkt anzeigen.
|
||||
/// </summary>
|
||||
/// <param name="key">Der EnvelopeReceiver-Key aus der URL (Base64-kodiert)</param>
|
||||
/// <param name="cancel">Cancellation-Token</param>
|
||||
/// <returns>ReceiverAuthResponse mit dem aktuellen Status</returns>
|
||||
[HttpGet("{key}/status")]
|
||||
public async Task<IActionResult> GetStatus([FromRoute] string key, CancellationToken cancel)
|
||||
{
|
||||
try
|
||||
{
|
||||
// ── Key dekodieren ──
|
||||
if (!key.TryDecode(out var decoded))
|
||||
return NotFound(new ReceiverAuthResponse { Status = "not_found" });
|
||||
|
||||
// ── ReadOnly-Links ──
|
||||
if (decoded.GetEncodeType() == EncodeType.EnvelopeReceiverReadOnly)
|
||||
{
|
||||
return Ok(new ReceiverAuthResponse
|
||||
{
|
||||
Status = "show_document",
|
||||
ReadOnly = true
|
||||
});
|
||||
}
|
||||
|
||||
// ── EnvelopeReceiver laden (Light-Query: ohne Documents/Elements) ──
|
||||
var er = await _mediator.Send(
|
||||
new ReadEnvelopeReceiverLightQuery { Key = key }, cancel);
|
||||
if (er is null)
|
||||
return NotFound(new ReceiverAuthResponse { Status = "not_found" });
|
||||
|
||||
// ── Abgelehnt? ──
|
||||
var rejRcvrs = await _historyService.ReadRejectingReceivers(er.Envelope!.Id);
|
||||
if (rejRcvrs.Any())
|
||||
{
|
||||
await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
|
||||
return Ok(new ReceiverAuthResponse
|
||||
{
|
||||
Status = "rejected",
|
||||
Title = er.Envelope.Title,
|
||||
SenderEmail = er.Envelope.User?.Email
|
||||
});
|
||||
}
|
||||
|
||||
// ── Bereits signiert? ──
|
||||
if (await _historyService.IsSigned(
|
||||
envelopeId: er.Envelope.Id,
|
||||
userReference: er.Receiver!.EmailAddress))
|
||||
{
|
||||
await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
|
||||
return Ok(new ReceiverAuthResponse
|
||||
{
|
||||
Status = "already_signed",
|
||||
Title = er.Envelope.Title,
|
||||
SenderEmail = er.Envelope.User?.Email
|
||||
});
|
||||
}
|
||||
|
||||
// ── Kein AccessCode nötig? → Direkt SignIn ──
|
||||
if (!er.Envelope.UseAccessCode)
|
||||
{
|
||||
(string? uuid, string? signature) = decoded.ParseEnvelopeReceiverId();
|
||||
var erSecretRes = await _envRcvService.ReadWithSecretByUuidSignatureAsync(
|
||||
uuid: uuid!, signature: signature!);
|
||||
|
||||
if (erSecretRes.IsFailed)
|
||||
return NotFound(new ReceiverAuthResponse { Status = "not_found" });
|
||||
|
||||
await HttpContext.SignInEnvelopeAsync(erSecretRes.Data, Role.ReceiverFull);
|
||||
|
||||
return Ok(new ReceiverAuthResponse
|
||||
{
|
||||
Status = "show_document",
|
||||
Title = er.Envelope.Title,
|
||||
Message = er.Envelope.Message,
|
||||
SenderEmail = er.Envelope.User?.Email,
|
||||
ReadOnly = er.Envelope.ReadOnly
|
||||
});
|
||||
}
|
||||
|
||||
// ── AccessCode nötig ──
|
||||
// HINWEIS: Die E-Mail mit dem AccessCode wird NICHT hier gesendet.
|
||||
// Das passiert bereits im Web-Projekt, wenn der Link generiert wird.
|
||||
// Der Blazor-Flow übernimmt erst NACH dem E-Mail-Versand.
|
||||
bool accessCodeAlreadyRequested = await _historyService.AccessCodeAlreadyRequested(
|
||||
envelopeId: er.Envelope.Id,
|
||||
userReference: er.Receiver.EmailAddress);
|
||||
|
||||
if (!accessCodeAlreadyRequested)
|
||||
{
|
||||
// AccessCode wurde noch nie angefordert — das bedeutet der Empfänger
|
||||
// kommt zum ersten Mal. Wir zeichnen es auf, aber die E-Mail
|
||||
// wurde bereits vom Web-Projekt gesendet.
|
||||
await _historyService.RecordAsync(
|
||||
er.EnvelopeId, er.Receiver.EmailAddress, EnvelopeStatus.AccessCodeRequested);
|
||||
}
|
||||
|
||||
// ── Prüfe ob der Nutzer bereits eingeloggt ist ──
|
||||
if (User.IsInRole(Role.ReceiverFull))
|
||||
{
|
||||
return Ok(new ReceiverAuthResponse
|
||||
{
|
||||
Status = "show_document",
|
||||
Title = er.Envelope.Title,
|
||||
Message = er.Envelope.Message,
|
||||
SenderEmail = er.Envelope.User?.Email,
|
||||
ReadOnly = er.Envelope.ReadOnly
|
||||
});
|
||||
}
|
||||
|
||||
return Ok(new ReceiverAuthResponse
|
||||
{
|
||||
Status = "requires_access_code",
|
||||
Title = er.Envelope.Title,
|
||||
SenderEmail = er.Envelope.User?.Email,
|
||||
TfaEnabled = er.Envelope.TFAEnabled,
|
||||
HasPhoneNumber = er.HasPhoneNumber
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error checking status for key {Key}", key);
|
||||
return StatusCode(500, new ReceiverAuthResponse
|
||||
{
|
||||
Status = "error",
|
||||
ErrorMessage = "Ein unerwarteter Fehler ist aufgetreten."
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// ══════════════════════════════════════════════════════════════
|
||||
// ENDPUNKT 2: ACCESS-CODE PRÜFEN
|
||||
// ══════════════════════════════════════════════════════════════
|
||||
|
||||
/// <summary>
|
||||
/// Prüft den eingegebenen Zugangscode.
|
||||
/// Bei Erfolg: SignIn oder TFA-Weiterleitung.
|
||||
/// Bei Fehler: Fehlermeldung zurückgeben.
|
||||
/// </summary>
|
||||
[HttpPost("{key}/access-code")]
|
||||
public async Task<IActionResult> SubmitAccessCode(
|
||||
[FromRoute] string key,
|
||||
[FromBody] AccessCodeRequest request,
|
||||
CancellationToken cancel)
|
||||
{
|
||||
try
|
||||
{
|
||||
// ── Key dekodieren + Daten laden ──
|
||||
(string? uuid, string? signature) = key.DecodeEnvelopeReceiverId();
|
||||
if (uuid is null || signature is null)
|
||||
return NotFound(new ReceiverAuthResponse { Status = "not_found" });
|
||||
|
||||
var erSecretRes = await _envRcvService.ReadWithSecretByUuidSignatureAsync(
|
||||
uuid: uuid, signature: signature);
|
||||
|
||||
if (erSecretRes.IsFailed)
|
||||
return NotFound(new ReceiverAuthResponse { Status = "not_found" });
|
||||
|
||||
var erSecret = erSecretRes.Data;
|
||||
|
||||
// ── AccessCode prüfen ──
|
||||
if (erSecret.AccessCode != request.AccessCode)
|
||||
{
|
||||
await _historyService.RecordAsync(
|
||||
erSecret.EnvelopeId,
|
||||
erSecret.Receiver!.EmailAddress,
|
||||
EnvelopeStatus.AccessCodeIncorrect);
|
||||
|
||||
return Unauthorized(new ReceiverAuthResponse
|
||||
{
|
||||
Status = "requires_access_code",
|
||||
Title = erSecret.Envelope!.Title,
|
||||
SenderEmail = erSecret.Envelope.User?.Email,
|
||||
TfaEnabled = erSecret.Envelope.TFAEnabled,
|
||||
HasPhoneNumber = erSecret.HasPhoneNumber,
|
||||
ErrorMessage = "Falscher Zugangscode."
|
||||
});
|
||||
}
|
||||
|
||||
// ── AccessCode korrekt ──
|
||||
await _historyService.RecordAsync(
|
||||
erSecret.EnvelopeId,
|
||||
erSecret.Receiver!.EmailAddress,
|
||||
EnvelopeStatus.AccessCodeCorrect);
|
||||
|
||||
// ── TFA erforderlich? ──
|
||||
if (erSecret.Envelope!.TFAEnabled)
|
||||
{
|
||||
var rcv = erSecret.Receiver;
|
||||
if (rcv.TotpSecretkey is null)
|
||||
{
|
||||
rcv.TotpSecretkey = _authenticator.GenerateTotpSecretKey();
|
||||
await _rcvService.UpdateAsync(rcv);
|
||||
}
|
||||
|
||||
await HttpContext.SignInEnvelopeAsync(erSecret, Role.ReceiverTFA);
|
||||
|
||||
if (request.PreferSms)
|
||||
{
|
||||
var (smsRes, expiration) = await _envSmsHandler.SendTotpAsync(erSecret);
|
||||
|
||||
return Ok(new ReceiverAuthResponse
|
||||
{
|
||||
Status = "requires_tfa",
|
||||
TfaType = "sms",
|
||||
TfaExpiration = expiration,
|
||||
Title = erSecret.Envelope.Title,
|
||||
SenderEmail = erSecret.Envelope.User?.Email,
|
||||
HasPhoneNumber = erSecret.HasPhoneNumber
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
return Ok(new ReceiverAuthResponse
|
||||
{
|
||||
Status = "requires_tfa",
|
||||
TfaType = "authenticator",
|
||||
Title = erSecret.Envelope.Title,
|
||||
SenderEmail = erSecret.Envelope.User?.Email,
|
||||
HasPhoneNumber = erSecret.HasPhoneNumber
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// ── Kein TFA → Direkt SignIn ──
|
||||
await HttpContext.SignInEnvelopeAsync(erSecret, Role.ReceiverFull);
|
||||
|
||||
return Ok(new ReceiverAuthResponse
|
||||
{
|
||||
Status = "show_document",
|
||||
Title = erSecret.Envelope.Title,
|
||||
Message = erSecret.Envelope.Message,
|
||||
SenderEmail = erSecret.Envelope.User?.Email,
|
||||
ReadOnly = erSecret.Envelope.ReadOnly
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error submitting access code for key {Key}", key);
|
||||
return StatusCode(500, new ReceiverAuthResponse
|
||||
{
|
||||
Status = "error",
|
||||
ErrorMessage = "Ein unerwarteter Fehler ist aufgetreten."
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// ══════════════════════════════════════════════════════════════
|
||||
// ENDPUNKT 3: TFA-CODE PRÜFEN
|
||||
// ══════════════════════════════════════════════════════════════
|
||||
|
||||
/// <summary>
|
||||
/// Prüft den TFA-Code (SMS oder Authenticator).
|
||||
/// Setzt voraus, dass der Nutzer bereits mit ReceiverTFA-Rolle eingeloggt ist.
|
||||
/// </summary>
|
||||
[HttpPost("{key}/tfa")]
|
||||
public async Task<IActionResult> SubmitTfaCode(
|
||||
[FromRoute] string key,
|
||||
[FromBody] TfaCodeRequest request,
|
||||
CancellationToken cancel)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!User.IsInRole(Role.ReceiverTFA))
|
||||
return Unauthorized(new ReceiverAuthResponse
|
||||
{
|
||||
Status = "requires_access_code",
|
||||
ErrorMessage = "Bitte zuerst den Zugangscode eingeben."
|
||||
});
|
||||
|
||||
(string? uuid, string? signature) = key.DecodeEnvelopeReceiverId();
|
||||
if (uuid is null || signature is null)
|
||||
return NotFound(new ReceiverAuthResponse { Status = "not_found" });
|
||||
|
||||
var erSecretRes = await _envRcvService.ReadWithSecretByUuidSignatureAsync(
|
||||
uuid: uuid, signature: signature);
|
||||
|
||||
if (erSecretRes.IsFailed)
|
||||
return NotFound(new ReceiverAuthResponse { Status = "not_found" });
|
||||
|
||||
var erSecret = erSecretRes.Data;
|
||||
|
||||
if (erSecret.Receiver!.TotpSecretkey is null)
|
||||
{
|
||||
_logger.LogError("TotpSecretkey is null for receiver {Signature}", signature);
|
||||
return StatusCode(500, new ReceiverAuthResponse
|
||||
{
|
||||
Status = "error",
|
||||
ErrorMessage = "TFA-Konfiguration fehlt."
|
||||
});
|
||||
}
|
||||
|
||||
bool codeValid;
|
||||
|
||||
if (request.Type == "sms")
|
||||
{
|
||||
codeValid = _envSmsHandler.VerifyTotp(request.Code, erSecret.Receiver.TotpSecretkey);
|
||||
}
|
||||
else
|
||||
{
|
||||
codeValid = _authenticator.VerifyTotp(
|
||||
request.Code,
|
||||
erSecret.Receiver.TotpSecretkey,
|
||||
window: VerificationWindow.RfcSpecifiedNetworkDelay);
|
||||
}
|
||||
|
||||
if (!codeValid)
|
||||
{
|
||||
return Unauthorized(new ReceiverAuthResponse
|
||||
{
|
||||
Status = "requires_tfa",
|
||||
TfaType = request.Type,
|
||||
Title = erSecret.Envelope!.Title,
|
||||
SenderEmail = erSecret.Envelope.User?.Email,
|
||||
HasPhoneNumber = erSecret.HasPhoneNumber,
|
||||
ErrorMessage = "Falscher Code."
|
||||
});
|
||||
}
|
||||
|
||||
await HttpContext.SignInEnvelopeAsync(erSecret, Role.ReceiverFull);
|
||||
|
||||
return Ok(new ReceiverAuthResponse
|
||||
{
|
||||
Status = "show_document",
|
||||
Title = erSecret.Envelope!.Title,
|
||||
Message = erSecret.Envelope.Message,
|
||||
SenderEmail = erSecret.Envelope.User?.Email,
|
||||
ReadOnly = erSecret.Envelope.ReadOnly
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error submitting TFA code for key {Key}", key);
|
||||
return StatusCode(500, new ReceiverAuthResponse
|
||||
{
|
||||
Status = "error",
|
||||
ErrorMessage = "Ein unerwarteter Fehler ist aufgetreten."
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
42
EnvelopeGenerator.API/Models/BlazorSignaturePayload.cs
Normal file
42
EnvelopeGenerator.API/Models/BlazorSignaturePayload.cs
Normal file
@@ -0,0 +1,42 @@
|
||||
namespace EnvelopeGenerator.API.Models;
|
||||
|
||||
/// <summary>
|
||||
/// Lightweight payload used by the Blazor receiver UI to submit signatures.
|
||||
/// Each entry corresponds to one signature placeholder rendered as an
|
||||
/// overlay on top of the DevExpress PDF viewer.
|
||||
///
|
||||
/// The legacy MVC flow ships a full PSPDFKit InstantJSON payload via
|
||||
/// <see cref="EnvelopeGenerator.Application.Common.Notifications.DocSigned.PsPdfKitAnnotation"/>.
|
||||
/// That format is browser-library specific. The Blazor client uses a
|
||||
/// transport-neutral DTO instead: only what the server actually needs
|
||||
/// to persist the signed document (image + metadata per placeholder).
|
||||
///
|
||||
/// Conversion to the internal <c>PsPdfKitAnnotation</c> happens inside
|
||||
/// <see cref="EnvelopeGenerator.API.Controllers.AnnotationController"/>.
|
||||
/// </summary>
|
||||
public class BlazorSignaturePayload
|
||||
{
|
||||
/// <summary>The receiver-specific signed placeholders for this envelope.</summary>
|
||||
public List<BlazorSignatureEntry> Signatures { get; set; } = new();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A single signed placeholder.
|
||||
/// </summary>
|
||||
public class BlazorSignatureEntry
|
||||
{
|
||||
/// <summary>The receiver's <c>DocumentReceiverElement.Id</c> being signed.</summary>
|
||||
public int ElementId { get; set; }
|
||||
|
||||
/// <summary>Signature image as a data URL (e.g. "data:image/png;base64,...").</summary>
|
||||
public string SignatureDataUrl { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>Optional position / job title entered by the receiver.</summary>
|
||||
public string? Position { get; set; }
|
||||
|
||||
/// <summary>Optional city / location entered by the receiver.</summary>
|
||||
public string? City { get; set; }
|
||||
|
||||
/// <summary>Capture timestamp (client local time).</summary>
|
||||
public DateTime SignedAt { get; set; }
|
||||
}
|
||||
78
EnvelopeGenerator.API/Models/ReceiverAuthResponse.cs
Normal file
78
EnvelopeGenerator.API/Models/ReceiverAuthResponse.cs
Normal file
@@ -0,0 +1,78 @@
|
||||
namespace EnvelopeGenerator.API.Models;
|
||||
|
||||
/// <summary>
|
||||
/// Einheitliche Antwort des ReceiverAuthControllers.
|
||||
///
|
||||
/// WARUM ein einziges Response-Objekt für alle Endpunkte?
|
||||
/// - Der Client braucht nur ein Format zu verstehen
|
||||
/// - Der Status-String bestimmt, welche Felder relevant sind
|
||||
/// - Entspricht dem, was der Web-Controller bisher über ViewData verteilt hat
|
||||
///
|
||||
/// Status-Werte und was sie bedeuten:
|
||||
/// - "requires_access_code" → AccessCode-Eingabe zeigen
|
||||
/// - "requires_tfa" → TFA-Code-Eingabe zeigen (nach AccessCode)
|
||||
/// - "show_document" → Dokument laden und anzeigen
|
||||
/// - "already_signed" → Info-Seite "Bereits unterschrieben"
|
||||
/// - "rejected" → Info-Seite "Abgelehnt"
|
||||
/// - "not_found" → Fehler-Seite "Nicht gefunden"
|
||||
/// - "expired" → Fehler-Seite "Link abgelaufen"
|
||||
/// </summary>
|
||||
public class ReceiverAuthResponse
|
||||
{
|
||||
/// <summary>Aktueller Status des Empfänger-Flows</summary>
|
||||
public required string Status { get; init; }
|
||||
|
||||
/// <summary>Titel des Umschlags (z.B. "Vertragsdokument")</summary>
|
||||
public string? Title { get; init; }
|
||||
|
||||
/// <summary>Nachricht des Absenders</summary>
|
||||
public string? Message { get; init; }
|
||||
|
||||
/// <summary>E-Mail des Absenders (für Rückfragen-Hinweis)</summary>
|
||||
public string? SenderEmail { get; init; }
|
||||
|
||||
/// <summary>Name des Empfängers</summary>
|
||||
public string? ReceiverName { get; init; }
|
||||
|
||||
/// <summary>Ob TFA für diesen Umschlag aktiviert ist</summary>
|
||||
public bool TfaEnabled { get; init; }
|
||||
|
||||
/// <summary>Ob der Empfänger eine Telefonnummer hat (für SMS-TFA)</summary>
|
||||
public bool HasPhoneNumber { get; init; }
|
||||
|
||||
/// <summary>Ob das Dokument nur gelesen werden soll (ReadAndConfirm)</summary>
|
||||
public bool ReadOnly { get; init; }
|
||||
|
||||
/// <summary>TFA-Typ: "sms" oder "authenticator" (wenn Status = "requires_tfa")</summary>
|
||||
public string? TfaType { get; init; }
|
||||
|
||||
/// <summary>Ablaufzeit des SMS-Codes (für Countdown-Timer)</summary>
|
||||
public DateTime? TfaExpiration { get; init; }
|
||||
|
||||
/// <summary>Fehlermeldung (z.B. "Falscher Zugangscode")</summary>
|
||||
public string? ErrorMessage { get; init; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Request-Body für POST /api/receiverauth/{key}/access-code
|
||||
/// </summary>
|
||||
public class AccessCodeRequest
|
||||
{
|
||||
/// <summary>Der vom Empfänger eingegebene Zugangscode</summary>
|
||||
public required string AccessCode { get; init; }
|
||||
|
||||
/// <summary>Ob SMS statt Authenticator bevorzugt wird</summary>
|
||||
public bool PreferSms { get; init; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Request-Body für POST /api/receiverauth/{key}/tfa
|
||||
/// </summary>
|
||||
public class TfaCodeRequest
|
||||
{
|
||||
/// <summary>Der eingegebene TFA-Code (6-stellig)</summary>
|
||||
public required string Code { get; init; }
|
||||
|
||||
/// <summary>"sms" oder "authenticator"</summary>
|
||||
public required string Type { get; init; }
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
namespace EnvelopeGenerator.Application.Common;
|
||||
|
||||
// TODO: merge other cache keys here as well, e.g. for templates, etc.
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public static class CacheKey
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public static readonly Guid DefaultConfig = Guid.NewGuid();
|
||||
}
|
||||
@@ -8,11 +8,6 @@ namespace EnvelopeGenerator.Application.Common.Dto;
|
||||
[ApiExplorerSettings(IgnoreApi = true)]
|
||||
public class ConfigDto
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets or sets the default document path.
|
||||
/// </summary>
|
||||
public string? DocumentPath { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the sending profile identifier.
|
||||
/// </summary>
|
||||
@@ -32,29 +27,4 @@ public class ConfigDto
|
||||
/// Gets or sets the path where exports will be saved.
|
||||
/// </summary>
|
||||
public string? ExportPath { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the creation timestamp.
|
||||
/// </summary>
|
||||
public DateTime AddedWhen { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the last update timestamp.
|
||||
/// </summary>
|
||||
public DateTime? ChangedWhen { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the legacy tinyint GUID field.
|
||||
/// </summary>
|
||||
public byte Guid { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets whether default TFA is enabled.
|
||||
/// </summary>
|
||||
public bool DefTfaEnabled { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets whether default TFA uses phone.
|
||||
/// </summary>
|
||||
public bool DefTfaWithPhone { get; set; }
|
||||
}
|
||||
@@ -44,16 +44,6 @@ public record EnvelopeDto : IEnvelope
|
||||
[TemplatePlaceholder("[MESSAGE]")]
|
||||
public string Message { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public DateTime? ExpiresWhen { get; set; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public DateTime? ExpiresWarningWhen { get; set; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
@@ -70,11 +60,6 @@ public record EnvelopeDto : IEnvelope
|
||||
[TemplatePlaceholder("[DOCUMENT_TITLE]")]
|
||||
public string Title { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// Default value is string.Empty
|
||||
/// </summary>
|
||||
public string? Comment { get; set; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
@@ -85,30 +70,17 @@ public record EnvelopeDto : IEnvelope
|
||||
/// </summary>
|
||||
public string Language { get; set; } = "de-DE";
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public bool SendReminderEmails { get; set; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public int? FirstReminderDays { get; set; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public int? ReminderIntervalDays { get; set; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public int? EnvelopeTypeId { get; set; }
|
||||
|
||||
// TODO: use ReadAndConfirm property name
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public bool ReadOnly => EnvelopeTypeId == 2;
|
||||
[Obsolete("Use EnvelopeExtensions.IsReadAndConfirm extension metot instead.")]
|
||||
public bool ReadOnly => this.IsReadAndConfirm();
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
@@ -120,26 +92,6 @@ public record EnvelopeDto : IEnvelope
|
||||
/// </summary>
|
||||
public bool UseAccessCode { get; set; } = true;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public int? FinalEmailToCreator { get; set; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public int? FinalEmailToReceivers { get; set; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public int? ExpiresWhenDays { get; set; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public int? ExpiresWarningWhenDays { get; set; }
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
|
||||
@@ -13,12 +13,12 @@ public static class AutoMapperAuditingExtensions
|
||||
/// </summary>
|
||||
public static IMappingExpression<TSource, TDestination> MapAddedWhen<TSource, TDestination>(this IMappingExpression<TSource, TDestination> expression)
|
||||
where TDestination : IHasAddedWhen
|
||||
=> expression.ForMember(dest => dest.AddedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));
|
||||
=> expression.ForMember(dest => dest.AddedWhen, opt => opt.MapFrom(_ => DateTime.Now));
|
||||
|
||||
/// <summary>
|
||||
/// Maps <see cref="IHasChangedWhen.ChangedWhen"/> to the current UTC time.
|
||||
/// </summary>
|
||||
public static IMappingExpression<TSource, TDestination> MapChangedWhen<TSource, TDestination>(this IMappingExpression<TSource, TDestination> expression)
|
||||
where TDestination : IHasChangedWhen
|
||||
=> expression.ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));
|
||||
=> expression.ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(_ => DateTime.Now));
|
||||
}
|
||||
@@ -113,7 +113,7 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
|
||||
EmailAddress = notification.EmailAddress,
|
||||
EmailBody = temp.Body,
|
||||
EmailSubj = temp.Subject,
|
||||
AddedWhen = DateTime.UtcNow,
|
||||
AddedWhen = DateTime.Now,
|
||||
AddedWho = DispatcherParams.AddedWho,
|
||||
SendingProfile = DispatcherParams.SendingProfile,
|
||||
ReminderTypeId = DispatcherParams.ReminderTypeId,
|
||||
|
||||
@@ -1,69 +0,0 @@
|
||||
using AutoMapper;
|
||||
using DigitalData.Core.Abstraction.Application.Repository;
|
||||
using DigitalData.Core.Exceptions;
|
||||
using EnvelopeGenerator.Application.Common;
|
||||
using EnvelopeGenerator.Application.Common.Dto;
|
||||
using EnvelopeGenerator.Domain.Entities;
|
||||
using MediatR;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Caching.Distributed;
|
||||
using Microsoft.Extensions.Caching.Memory;
|
||||
|
||||
namespace EnvelopeGenerator.Application.Configuration.Queries;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public record ReadDefaultConfigQuery : IRequest<ConfigDto>
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public bool EnforceSingleResult { get; init; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public class ReadDefaultConfigQueryHandler : IRequestHandler<ReadDefaultConfigQuery, ConfigDto>
|
||||
{
|
||||
private readonly IRepository<Config> _repo;
|
||||
|
||||
private readonly IMapper _mapper;
|
||||
|
||||
private readonly IMemoryCache _cache;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="repo"></param>
|
||||
/// <param name="mapper"></param>
|
||||
/// <param name="cache"></param>
|
||||
public ReadDefaultConfigQueryHandler(IRepository<Config> repo, IMapper mapper, IMemoryCache cache)
|
||||
{
|
||||
_repo = repo;
|
||||
_mapper = mapper;
|
||||
_cache = cache;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="request"></param>
|
||||
/// <param name="cancel"></param>
|
||||
/// <returns></returns>
|
||||
/// <exception cref="InvalidOperationException"></exception>
|
||||
public async Task<ConfigDto> Handle(ReadDefaultConfigQuery request, CancellationToken cancel)
|
||||
{
|
||||
var config = await _cache.GetOrCreateAsync(CacheKey.DefaultConfig, entry =>
|
||||
{
|
||||
entry.AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(30);
|
||||
return request.EnforceSingleResult
|
||||
? _repo.Query.SingleOrDefaultAsync(cancel)
|
||||
: _repo.Query.FirstOrDefaultAsync(cancel)
|
||||
?? throw new NotFoundException("Default configuration could not be found. Ensure at least one configuration record exists in the database.");
|
||||
});
|
||||
|
||||
return _mapper.Map<ConfigDto>(config);
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,7 @@ public class MappingProfile : Profile
|
||||
CreateMap<UpdateDocStatusCommand, DocumentStatus>()
|
||||
.ForMember(dest => dest.Envelope, opt => opt.Ignore())
|
||||
.ForMember(dest => dest.Receiver, opt => opt.Ignore())
|
||||
.ForMember(dest => dest.StatusChangedWhen, opt => opt.MapFrom(src => DateTime.UtcNow))
|
||||
.ForMember(dest => dest.StatusChangedWhen, opt => opt.MapFrom(src => DateTime.Now))
|
||||
.MapChangedWhen();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
using AutoMapper;
|
||||
using DigitalData.Core.Abstraction.Application.Repository;
|
||||
using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
|
||||
using EnvelopeGenerator.Application.Common.Extensions;
|
||||
using EnvelopeGenerator.Application.Common.Query;
|
||||
using EnvelopeGenerator.Application.Envelopes.Queries;
|
||||
using EnvelopeGenerator.Application.Receivers.Queries;
|
||||
using EnvelopeGenerator.Domain.Entities;
|
||||
using MediatR;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
|
||||
|
||||
/// <summary>
|
||||
/// Leichte Variante von <see cref="ReadEnvelopeReceiverQuery"/>:
|
||||
/// Lädt NUR Envelope (mit Histories + User) und Receiver.
|
||||
/// Lädt NICHT Documents/Elements.
|
||||
///
|
||||
/// Verwendung: Status-Prüfungen wo keine Dokument-Daten benötigt werden
|
||||
/// (z.B. ReceiverAuthController.GetStatus).
|
||||
/// </summary>
|
||||
public record ReadEnvelopeReceiverLightQuery
|
||||
: EnvelopeReceiverQueryBase<ReadEnvelopeQuery, ReadReceiverQuery>, IRequest<EnvelopeReceiverDto?>;
|
||||
|
||||
/// <summary>
|
||||
/// Handler für <see cref="ReadEnvelopeReceiverLightQuery"/>.
|
||||
/// </summary>
|
||||
public class ReadEnvelopeReceiverLightQueryHandler
|
||||
: IRequestHandler<ReadEnvelopeReceiverLightQuery, EnvelopeReceiverDto?>
|
||||
{
|
||||
private readonly IRepository<EnvelopeReceiver> _repo;
|
||||
private readonly IMapper _mapper;
|
||||
|
||||
/// <summary>
|
||||
/// Konstruktor.
|
||||
/// </summary>
|
||||
/// <param name="repo">EnvelopeReceiver-Repository</param>
|
||||
/// <param name="mapper">AutoMapper</param>
|
||||
public ReadEnvelopeReceiverLightQueryHandler(IRepository<EnvelopeReceiver> repo, IMapper mapper)
|
||||
{
|
||||
_repo = repo;
|
||||
_mapper = mapper;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Lädt einen EnvelopeReceiver ohne Documents/Elements.
|
||||
/// </summary>
|
||||
public async Task<EnvelopeReceiverDto?> Handle(ReadEnvelopeReceiverLightQuery request, CancellationToken cancel)
|
||||
{
|
||||
var envRcv = await _repo.Query
|
||||
.Where(request, notnull: false)
|
||||
.AsNoTracking()
|
||||
.Include(er => er.Envelope).ThenInclude(e => e!.Histories)
|
||||
.Include(er => er.Envelope).ThenInclude(e => e!.User)
|
||||
.Include(er => er.Receiver)
|
||||
.FirstOrDefaultAsync(cancel);
|
||||
|
||||
return envRcv is null ? null : _mapper.Map<EnvelopeReceiverDto>(envRcv);
|
||||
}
|
||||
}
|
||||
@@ -34,7 +34,7 @@ public record CreateHistoryCommand : EnvelopeReceiverQueryBase, IRequest<History
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public DateTime AddedWhen { get; } = DateTime.UtcNow;
|
||||
public DateTime AddedWhen { get; } = DateTime.Now;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
|
||||
@@ -448,7 +448,7 @@
|
||||
<value>Document has been reset.</value>
|
||||
</data>
|
||||
<data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
|
||||
<value>Document successfully red and confirmed!</value>
|
||||
<value>Document successfully read and confirmed!</value>
|
||||
</data>
|
||||
<data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
|
||||
<value>You have read and confirmed the document. You will receive a written confirmation afterwards.</value>
|
||||
|
||||
@@ -7,7 +7,6 @@ using Microsoft.Extensions.Logging;
|
||||
using EnvelopeGenerator.Application.Common.Dto;
|
||||
using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
|
||||
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
||||
using EnvelopeGenerator.Application.Common;
|
||||
|
||||
namespace EnvelopeGenerator.Application.Services;
|
||||
|
||||
@@ -17,6 +16,8 @@ namespace EnvelopeGenerator.Application.Services;
|
||||
[Obsolete("Use MediatR")]
|
||||
public class ConfigService : ReadService<IConfigRepository, ConfigDto, Config, int>, IConfigService
|
||||
{
|
||||
private static readonly Guid DefaultConfigCacheId = Guid.NewGuid();
|
||||
|
||||
private readonly IMemoryCache _cache;
|
||||
|
||||
private readonly ILogger<ConfigService> _logger;
|
||||
@@ -61,7 +62,7 @@ public class ConfigService : ReadService<IConfigRepository, ConfigDto, Config, i
|
||||
/// </exception>
|
||||
public async Task<ConfigDto> ReadDefaultAsync()
|
||||
{
|
||||
var config = await _cache.GetOrCreateAsync(CacheKey.DefaultConfig, _ => ReadFirstAsync().ThenAsync(
|
||||
var config = await _cache.GetOrCreateAsync(DefaultConfigCacheId, _ => ReadFirstAsync().ThenAsync(
|
||||
Success: config => config,
|
||||
Fail: (mssg, ntc) =>
|
||||
{
|
||||
|
||||
@@ -487,10 +487,6 @@
|
||||
<Project>{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}</Project>
|
||||
<Name>EnvelopeGenerator.CommonServices</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\EnvelopeGenerator.CommonServices\EnvelopeGenerator.CommonServices.vbproj">
|
||||
<Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
|
||||
<Name>EnvelopeGenerator.CommonServices</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj">
|
||||
<Project>{4f32a98d-e6f0-4a09-bd97-1cf26107e837}</Project>
|
||||
<Name>EnvelopeGenerator.Domain</Name>
|
||||
|
||||
12
EnvelopeGenerator.BBTests/frmFinalizePDF.Designer.vb
generated
12
EnvelopeGenerator.BBTests/frmFinalizePDF.Designer.vb
generated
@@ -27,6 +27,7 @@ Partial Class frmFinalizePDF
|
||||
Me.Label2 = New System.Windows.Forms.Label()
|
||||
Me.Button1 = New System.Windows.Forms.Button()
|
||||
Me.Button2 = New System.Windows.Forms.Button()
|
||||
Me.Button3 = New System.Windows.Forms.Button()
|
||||
Me.txtResult = New System.Windows.Forms.TextBox()
|
||||
Me.txtEnvelope = New System.Windows.Forms.TextBox()
|
||||
Me.SuspendLayout()
|
||||
@@ -75,6 +76,15 @@ Partial Class frmFinalizePDF
|
||||
Me.Button2.Text = "Merge Json"
|
||||
Me.Button2.UseVisualStyleBackColor = True
|
||||
'
|
||||
'Button3
|
||||
'
|
||||
Me.Button3.Location = New System.Drawing.Point(15, 160)
|
||||
Me.Button3.Name = "Button3"
|
||||
Me.Button3.Size = New System.Drawing.Size(166, 23)
|
||||
Me.Button3.TabIndex = 5
|
||||
Me.Button3.Text = "Full Finalize Test"
|
||||
Me.Button3.UseVisualStyleBackColor = True
|
||||
'
|
||||
'txtResult
|
||||
'
|
||||
Me.txtResult.Location = New System.Drawing.Point(333, 12)
|
||||
@@ -97,6 +107,7 @@ Partial Class frmFinalizePDF
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
Me.ClientSize = New System.Drawing.Size(800, 450)
|
||||
Me.Controls.Add(Me.txtResult)
|
||||
Me.Controls.Add(Me.Button3)
|
||||
Me.Controls.Add(Me.Button2)
|
||||
Me.Controls.Add(Me.Button1)
|
||||
Me.Controls.Add(Me.Label2)
|
||||
@@ -116,5 +127,6 @@ Partial Class frmFinalizePDF
|
||||
Friend WithEvents Label2 As Label
|
||||
Friend WithEvents Button1 As Button
|
||||
Friend WithEvents Button2 As Button
|
||||
Friend WithEvents Button3 As Button
|
||||
Friend WithEvents txtResult As TextBox
|
||||
End Class
|
||||
|
||||
@@ -8,6 +8,8 @@ Imports Newtonsoft.Json.Linq
|
||||
Imports EnvelopeGenerator.Infrastructure
|
||||
Imports Microsoft.EntityFrameworkCore
|
||||
Imports DigitalData.Core.Abstractions
|
||||
Imports DigitalData.Core.Abstraction.Application.Repository
|
||||
Imports EnvelopeGenerator.Domain.Entities
|
||||
|
||||
Public Class frmFinalizePDF
|
||||
Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;" + "Encrypt=True;TrustServerCertificate=True;"
|
||||
@@ -124,4 +126,86 @@ Public Class frmFinalizePDF
|
||||
|
||||
txtResult.Text = oJObject1.ToString()
|
||||
End Sub
|
||||
|
||||
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
|
||||
Try
|
||||
Dim envelopeId As Integer = CInt(txtEnvelope.Text)
|
||||
Dim log As New System.Text.StringBuilder()
|
||||
|
||||
' 1. Load annotation JSON data (same as Service)
|
||||
Dim oTable = LoadAnnotationDataForEnvelope()
|
||||
Dim oJsonList = oTable.Rows.
|
||||
Cast(Of DataRow).
|
||||
Select(Function(r As DataRow) r.Item("VALUE").ToString()).
|
||||
ToList()
|
||||
log.AppendLine($"Annotation JSON count: {oJsonList.Count}")
|
||||
|
||||
' 2. Load document bytes (same as Service)
|
||||
Dim oBuffer As Byte() = ReadEnvelope(envelopeId)
|
||||
log.AppendLine($"Document bytes: {oBuffer.Length}")
|
||||
|
||||
' 3. Check what BurnAnnotsToPDF will do internally
|
||||
Using scope = Factory.Shared.ScopeFactory.CreateScope()
|
||||
Dim envRepo = scope.ServiceProvider.Repository(Of Envelope)()
|
||||
Dim envelope = envRepo.Where(Function(env) env.Id = envelopeId).FirstOrDefault()
|
||||
|
||||
If envelope Is Nothing Then
|
||||
log.AppendLine("ERROR: Envelope not found in EF Core!")
|
||||
txtResult.Text = log.ToString()
|
||||
Return
|
||||
End If
|
||||
|
||||
log.AppendLine($"Envelope found: Id={envelope.Id}, EnvelopeTypeId={envelope.EnvelopeTypeId}")
|
||||
log.AppendLine($"ReadOnly (IsReadAndConfirm): {envelope.ReadOnly}")
|
||||
|
||||
If envelope.ReadOnly Then
|
||||
log.AppendLine(">>> EARLY RETURN: ReadOnly=True, original PDF returned without burning")
|
||||
txtResult.Text = log.ToString()
|
||||
Return
|
||||
End If
|
||||
|
||||
Dim sigRepo = scope.ServiceProvider.Repository(Of Signature)()
|
||||
Dim elements = sigRepo _
|
||||
.Where(Function(sig) sig.Document.EnvelopeId = envelopeId) _
|
||||
.Include(Function(sig) sig.Annotations) _
|
||||
.ToList()
|
||||
|
||||
log.AppendLine($"Elements (Signature) count: {elements.Count}")
|
||||
|
||||
If elements.Any() Then
|
||||
log.AppendLine(">>> PATH: BurnElementAnnotsToPDF (new element-based path)")
|
||||
For Each elem In elements
|
||||
Dim annotCount = If(elem.Annotations IsNot Nothing, elem.Annotations.Count(), 0)
|
||||
log.AppendLine($" Element Id={elem.Id}, Page={elem.Page}, X={elem.X}, Y={elem.Y}, W={elem.Width}, H={elem.Height}, Annotations={annotCount}")
|
||||
If elem.Annotations IsNot Nothing Then
|
||||
For Each annot In elem.Annotations
|
||||
log.AppendLine($" Annot: Name={annot.Name}, Type={annot.Type}, X={annot.X}, Y={annot.Y}, W={annot.Width}, H={annot.Height}")
|
||||
Next
|
||||
End If
|
||||
Next
|
||||
Else
|
||||
log.AppendLine(">>> PATH: BurnInstantJSONAnnotsToPDF (old JSON-based path)")
|
||||
End If
|
||||
End Using
|
||||
|
||||
' 4. Actually call BurnAnnotsToPDF (same as Service)
|
||||
log.AppendLine("")
|
||||
log.AppendLine("Calling BurnAnnotsToPDF...")
|
||||
Dim oNewBuffer = PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, envelopeId)
|
||||
log.AppendLine($"Result bytes: {oNewBuffer.Length}")
|
||||
log.AppendLine($"Same as input: {oBuffer.Length = oNewBuffer.Length AndAlso oBuffer.SequenceEqual(oNewBuffer)}")
|
||||
|
||||
' 5. Write output
|
||||
Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
|
||||
Dim oNewPath = Path.Combine(desktopPath, $"E{txtEnvelope.Text}_FullTest.burned.pdf")
|
||||
File.WriteAllBytes(oNewPath, oNewBuffer)
|
||||
log.AppendLine($"Output: {oNewPath}")
|
||||
|
||||
txtResult.Text = log.ToString()
|
||||
Process.Start(oNewPath)
|
||||
|
||||
Catch ex As Exception
|
||||
txtResult.Text = $"ERROR: {ex.Message}{vbCrLf}{vbCrLf}{ex.ToString()}"
|
||||
End Try
|
||||
End Sub
|
||||
End Class
|
||||
@@ -15,13 +15,13 @@
|
||||
<package id="DigitalData.Modules.Messaging" version="1.9.8" targetFramework="net462" />
|
||||
<package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
|
||||
<package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
|
||||
<package id="EntityFramework" version="6.5.1" targetFramework="net462" />
|
||||
<package id="EntityFramework" version="6.4.4" targetFramework="net462" />
|
||||
<package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" />
|
||||
<package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net462" />
|
||||
<package id="GdPicture" version="14.3.3" targetFramework="net462" />
|
||||
<package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
|
||||
<package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
|
||||
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
|
||||
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
|
||||
<package id="Microsoft.Bcl.Cryptography" version="9.0.0" targetFramework="net462" />
|
||||
<package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net462" />
|
||||
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
|
||||
@@ -62,10 +62,10 @@
|
||||
<package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
|
||||
<package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
|
||||
<package id="S22.Imap" version="3.6.0.0" targetFramework="net462" />
|
||||
<package id="System.Buffers" version="4.6.1" targetFramework="net462" />
|
||||
<package id="System.Buffers" version="4.6.0" targetFramework="net462" />
|
||||
<package id="System.ClientModel" version="1.8.0" targetFramework="net462" />
|
||||
<package id="System.CodeDom" version="9.0.0" targetFramework="net462" />
|
||||
<package id="System.Collections.Immutable" version="9.0.0" targetFramework="net462" />
|
||||
<package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
|
||||
<package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
|
||||
<package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net462" />
|
||||
<package id="System.Data.Common" version="4.3.0" targetFramework="net462" />
|
||||
<package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
|
||||
@@ -74,23 +74,23 @@
|
||||
<package id="System.Formats.Asn1" version="10.0.3" targetFramework="net462" />
|
||||
<package id="System.IdentityModel.Tokens.Jwt" version="7.7.1" targetFramework="net462" />
|
||||
<package id="System.IO.FileSystem.AccessControl" version="5.0.0" targetFramework="net462" />
|
||||
<package id="System.IO.Packaging" version="9.0.0" targetFramework="net462" />
|
||||
<package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
|
||||
<package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" />
|
||||
<package id="System.Management" version="9.0.0" targetFramework="net462" />
|
||||
<package id="System.Memory" version="4.6.3" targetFramework="net462" />
|
||||
<package id="System.Management" version="8.0.0" targetFramework="net462" />
|
||||
<package id="System.Memory" version="4.6.0" targetFramework="net462" />
|
||||
<package id="System.Memory.Data" version="8.0.1" targetFramework="net462" />
|
||||
<package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net462" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net462" />
|
||||
<package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
|
||||
<package id="System.Security.AccessControl" version="6.0.1" targetFramework="net462" />
|
||||
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
|
||||
<package id="System.Security.Cryptography.Cng" version="5.0.0" targetFramework="net462" />
|
||||
<package id="System.Security.Cryptography.Pkcs" version="9.0.0" targetFramework="net462" />
|
||||
<package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
|
||||
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
|
||||
<package id="System.Security.Cryptography.ProtectedData" version="4.5.0" targetFramework="net462" />
|
||||
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net462" />
|
||||
<package id="System.Text.Encodings.Web" version="9.0.0" targetFramework="net462" />
|
||||
<package id="System.Text.Json" version="9.0.0" targetFramework="net462" />
|
||||
<package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
|
||||
<package id="System.Text.Json" version="8.0.6" targetFramework="net462" />
|
||||
<package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net462" />
|
||||
<package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net462" />
|
||||
<package id="System.ValueTuple" version="4.6.1" targetFramework="net462" />
|
||||
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
|
||||
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
|
||||
</packages>
|
||||
@@ -15,6 +15,7 @@ Imports DigitalData.Core.Abstraction.Application
|
||||
Imports EnvelopeGenerator.Infrastructure
|
||||
Imports Microsoft.EntityFrameworkCore
|
||||
Imports DigitalData.Core.Abstractions
|
||||
Imports EnvelopeGenerator.Domain.Interfaces
|
||||
|
||||
Namespace Jobs
|
||||
Public Class FinalizeDocumentJob
|
||||
@@ -230,6 +231,29 @@ Namespace Jobs
|
||||
|
||||
Return Task.FromResult(True)
|
||||
End Function
|
||||
|
||||
#Region "From BBTests"
|
||||
Private Function ReadEnvelope(pEnvID As Integer) As Byte()
|
||||
Dim strSql As String = "Select [BYTE_DATA] from [TBSIG_ENVELOPE_DOCUMENT] WHERE ENVELOPE_ID = " & pEnvID
|
||||
Dim obyteDB = Database.GetScalarValue(strSql)
|
||||
If Not IsDBNull(obyteDB) Then
|
||||
Dim fileData As Byte() = DirectCast(Database.GetScalarValue(strSql), Byte())
|
||||
If fileData IsNot Nothing Then
|
||||
Return fileData
|
||||
End If
|
||||
End If
|
||||
|
||||
Throw New InvalidOperationException($"Byte data is null. Envelope ID: {pEnvID}")
|
||||
|
||||
End Function
|
||||
|
||||
Private Function LoadAnnotationDataForEnvelope(pEnvID As Integer) As DataTable
|
||||
Dim oSql = $"SELECT VALUE FROM [TBSIG_DOCUMENT_STATUS] WHERE ENVELOPE_ID = {pEnvID}"
|
||||
Return Database.GetDatatable(oSql)
|
||||
|
||||
End Function
|
||||
#End Region
|
||||
|
||||
Private Sub Update_File_DB(pFilePath As String, pEnvelopeID As Long)
|
||||
Dim SqlCom As SqlCommand
|
||||
Dim imageData As Byte()
|
||||
@@ -327,7 +351,7 @@ Namespace Jobs
|
||||
Logger.Warn($"No SendFinalEmailToCreator - oMailToCreator [{oMailToCreator}] <> [{FinalEmailType.No}] ")
|
||||
End If
|
||||
|
||||
If oMailToReceivers <> FinalEmailType.No Then
|
||||
If oMailToReceivers <> FinalEmailType.No And pEnvelope.IsReadAndSign() Then
|
||||
Logger.Debug("Sending emails to receivers..")
|
||||
SendFinalEmailToReceivers(pEnvelope) ', pAttachment
|
||||
Else
|
||||
@@ -418,7 +442,18 @@ Namespace Jobs
|
||||
End Try
|
||||
End If
|
||||
|
||||
Return PDFBurner.BurnAnnotsToPDF(oInputDocumentBuffer, oAnnotations, pEnvelopeData.EnvelopeId)
|
||||
#Region "From BBTests"
|
||||
Dim oTable = LoadAnnotationDataForEnvelope(pEnvelopeId)
|
||||
Dim oJsonList = oTable.Rows.
|
||||
Cast(Of DataRow).
|
||||
Select(Function(r As DataRow) r.Item("VALUE").ToString()).
|
||||
ToList()
|
||||
|
||||
Dim oBuffer As Byte() = ReadEnvelope(pEnvelopeId)
|
||||
|
||||
#End Region
|
||||
|
||||
Return PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, pEnvelopeId)
|
||||
End Function
|
||||
|
||||
Private Function GetEnvelopeData(pEnvelopeId As Integer) As EnvelopeData
|
||||
|
||||
@@ -85,16 +85,37 @@ Namespace Jobs.FinalizeDocument
|
||||
|
||||
'Add annotations
|
||||
For Each element In elements
|
||||
If element Is Nothing Then
|
||||
Continue For
|
||||
End If
|
||||
|
||||
Dim elementAnnotations = If(element.Annotations, Enumerable.Empty(Of ElementAnnotation)())
|
||||
If Not elementAnnotations.Any() Then
|
||||
Continue For
|
||||
End If
|
||||
|
||||
Dim frameX = (element.Left - 0.7 - margin)
|
||||
|
||||
Dim frame = element.Annotations.FirstOrDefault(Function(a) a.Name = "frame")
|
||||
Dim frame = elementAnnotations.FirstOrDefault(Function(a) a.Name = "frame")
|
||||
Dim frameY = element.Top - 0.5 - margin
|
||||
Dim frameYShift = frame.Y - frameY * inchFactor
|
||||
Dim frameXShift = frame.X - frameX * inchFactor
|
||||
Dim frameYShift As Double = 0
|
||||
Dim frameXShift As Double = 0
|
||||
|
||||
If frame IsNot Nothing Then
|
||||
frameYShift = frame.Y - frameY * inchFactor
|
||||
frameXShift = frame.X - frameX * inchFactor
|
||||
End If
|
||||
|
||||
For Each annot In elementAnnotations
|
||||
If annot Is Nothing Then
|
||||
Continue For
|
||||
End If
|
||||
|
||||
Dim yOffsetofFF As Double = 0
|
||||
If Not String.IsNullOrEmpty(annot.Name) Then
|
||||
yOffsetsOfFF.TryGetValue(annot.Name, yOffsetofFF)
|
||||
End If
|
||||
|
||||
For Each annot In element.Annotations
|
||||
Dim yOffsetofFF As Double = If(yOffsetsOfFF.TryGetValue(annot.Name, yOffsetofFF), yOffsetofFF, 0)
|
||||
Dim y = frameY + yOffsetofFF
|
||||
|
||||
If annot.Type = AnnotationType.FormField Then
|
||||
|
||||
@@ -56,7 +56,7 @@ Public Class PDFMerger
|
||||
|
||||
' Convert to PDF/A
|
||||
oMergedPDF.ConvertToPDFA(oFinalStream, PDFAConformanceLevel, ALLOW_VECTORIZATION, ALLOW_RASTERIZATION)
|
||||
oStatus = oDocumentPDF.GetStat()
|
||||
oStatus = oMergedPDF.GetStat()
|
||||
If oStatus <> GdPictureStatus.OK Then
|
||||
Throw New MergeDocumentException($"Document could not be converted to PDF/A: {oStatus}")
|
||||
End If
|
||||
|
||||
@@ -270,12 +270,26 @@ Public Class ReceiverModel
|
||||
Private Function GetSignedDate(pEmailAddress As String, pEnvelopeId As Integer) As Date
|
||||
Try
|
||||
Dim oStatusInt As Integer = EnvelopeStatus.DocumentSigned
|
||||
Return Database.GetScalarValue($"SELECT ACTION_DATE FROM [DD_ECM].[dbo].[TBSIG_ENVELOPE_HISTORY] WHERE ENVELOPE_ID = {pEnvelopeId}
|
||||
Dim value = Database.GetScalarValue($"SELECT ACTION_DATE FROM [DD_ECM].[dbo].[TBSIG_ENVELOPE_HISTORY] WHERE ENVELOPE_ID = {pEnvelopeId}
|
||||
And USER_REFERENCE = '{pEmailAddress}' AND [STATUS] = {oStatusInt}")
|
||||
|
||||
If value Is Nothing OrElse value Is DBNull.Value Then
|
||||
Return DateTime.MinValue
|
||||
End If
|
||||
|
||||
If TypeOf value Is DateTime Then
|
||||
Return DirectCast(value, DateTime)
|
||||
End If
|
||||
|
||||
Dim parsedDate As DateTime
|
||||
If DateTime.TryParse(value.ToString(), parsedDate) Then
|
||||
Return parsedDate
|
||||
End If
|
||||
|
||||
Return DateTime.MinValue
|
||||
Catch ex As Exception
|
||||
Logger.Error(ex)
|
||||
Return Nothing
|
||||
Return DateTime.MinValue
|
||||
End Try
|
||||
End Function
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
'------------------------------------------------------------------------------
|
||||
' <auto-generated>
|
||||
' Dieser Code wurde von einem Tool generiert.
|
||||
' Laufzeitversion:4.0.30319.42000
|
||||
' This code was generated by a tool.
|
||||
' Runtime Version:4.0.30319.42000
|
||||
'
|
||||
' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
||||
' der Code erneut generiert wird.
|
||||
' Changes to this file may cause incorrect behavior and will be lost if
|
||||
' the code is regenerated.
|
||||
' </auto-generated>
|
||||
'------------------------------------------------------------------------------
|
||||
|
||||
@@ -15,12 +15,12 @@ Imports System
|
||||
|
||||
Namespace My.Resources
|
||||
|
||||
'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
|
||||
'-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
|
||||
'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
|
||||
'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
|
||||
'This class was auto-generated by the StronglyTypedResourceBuilder
|
||||
'class via a tool like ResGen or Visual Studio.
|
||||
'To add or remove a member, edit your .ResX file then rerun ResGen
|
||||
'with the /str option, or rebuild your VS project.
|
||||
'''<summary>
|
||||
''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
|
||||
''' A strongly-typed resource class, for looking up localized strings, etc.
|
||||
'''</summary>
|
||||
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
@@ -37,7 +37,7 @@ Namespace My.Resources
|
||||
End Sub
|
||||
|
||||
'''<summary>
|
||||
''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
|
||||
''' Returns the cached ResourceManager instance used by this class.
|
||||
'''</summary>
|
||||
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
|
||||
Public Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
|
||||
@@ -51,8 +51,8 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
|
||||
''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
|
||||
''' Overrides the current thread's CurrentUICulture property for all
|
||||
''' resource lookups using this strongly typed resource class.
|
||||
'''</summary>
|
||||
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
|
||||
Public Shared Property Culture() As Global.System.Globalization.CultureInfo
|
||||
@@ -65,7 +65,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Zugriffscode korrekt eingegeben ähnelt.
|
||||
''' Looks up a localized string similar to Zugriffscode korrekt eingegeben.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property AccessCodeCorrect() As String
|
||||
Get
|
||||
@@ -74,7 +74,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Zugriffscode falsch eingegeben ähnelt.
|
||||
''' Looks up a localized string similar to Zugriffscode falsch eingegeben.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property AccessCodeIncorrect() As String
|
||||
Get
|
||||
@@ -83,7 +83,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Zugriffscode angefordert ähnelt.
|
||||
''' Looks up a localized string similar to Zugriffscode angefordert.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property AccessCodeRequested() As String
|
||||
Get
|
||||
@@ -92,7 +92,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Fortgeschrittene Elektronische Signatur ähnelt.
|
||||
''' Looks up a localized string similar to Fortgeschrittene Elektronische Signatur.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property AdvancedElectronicSignature() As String
|
||||
Get
|
||||
@@ -101,7 +101,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Abgeschlossen ähnelt.
|
||||
''' Looks up a localized string similar to Abgeschlossen.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property Completed() As String
|
||||
Get
|
||||
@@ -110,7 +110,16 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Vollständig Signiert ähnelt.
|
||||
''' Looks up a localized string similar to Vollständig bestätigt.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property CompletelyConfirmed() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("CompletelyConfirmed", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Vollständig signiert.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property CompletelySigned() As String
|
||||
Get
|
||||
@@ -119,7 +128,25 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Vertrag ähnelt.
|
||||
''' Looks up a localized string similar to Lesebestätigung.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property Confirmation() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("Confirmation", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Gelesen und Bestätigt.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property Confirmed() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("Confirmed", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Vertrag.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property Contract() As String
|
||||
Get
|
||||
@@ -128,7 +155,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Erstellt ähnelt.
|
||||
''' Looks up a localized string similar to Erstellt.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property Created() As String
|
||||
Get
|
||||
@@ -137,7 +164,16 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Dokument Rotation geändert ähnelt.
|
||||
''' Looks up a localized string similar to Dokument gelesen und bestätigt.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property DocumentConfirmed() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("DocumentConfirmed", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Dokument Rotation geändert.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property DocumentMod_Rotation() As String
|
||||
Get
|
||||
@@ -146,7 +182,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Dokument geöffnet ähnelt.
|
||||
''' Looks up a localized string similar to Dokument geöffnet.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property DocumentOpened() As String
|
||||
Get
|
||||
@@ -155,7 +191,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Unterzeichnung abgelehnt ähnelt.
|
||||
''' Looks up a localized string similar to Unterzeichnung abgelehnt.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property DocumentRejected() As String
|
||||
Get
|
||||
@@ -164,7 +200,16 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Dokument unterzeichnet ähnelt.
|
||||
''' Looks up a localized string similar to Lesebestätigung abgelehnt.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property DocumentRejectedRaC() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("DocumentRejectedRaC", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Dokument unterzeichnet.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property DocumentSigned() As String
|
||||
Get
|
||||
@@ -173,7 +218,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Entwurf ähnelt.
|
||||
''' Looks up a localized string similar to Entwurf.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property Draft() As String
|
||||
Get
|
||||
@@ -182,7 +227,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Archiviert ähnelt.
|
||||
''' Looks up a localized string similar to Archiviert.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property EnvelopeArchived() As String
|
||||
Get
|
||||
@@ -191,7 +236,16 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Vollständig signiert ähnelt.
|
||||
''' Looks up a localized string similar to Vollständig bestätigt.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property EnvelopeCompletelyConfirmed() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("EnvelopeCompletelyConfirmed", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Vollständig signiert.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property EnvelopeCompletelySigned() As String
|
||||
Get
|
||||
@@ -200,7 +254,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Umschlag Erstellt ähnelt.
|
||||
''' Looks up a localized string similar to Umschlag Erstellt.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property EnvelopeCreated() As String
|
||||
Get
|
||||
@@ -209,7 +263,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Umschlag Gelöscht ähnelt.
|
||||
''' Looks up a localized string similar to Umschlag Gelöscht.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property EnvelopeDeleted() As String
|
||||
Get
|
||||
@@ -218,7 +272,16 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt.
|
||||
''' Looks up a localized string similar to Teil-Bestätigt.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property EnvelopePartlyConfirmed() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("EnvelopePartlyConfirmed", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Teil-Signiert.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property EnvelopePartlySigned() As String
|
||||
Get
|
||||
@@ -227,7 +290,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Umschlag in Queue ähnelt.
|
||||
''' Looks up a localized string similar to Umschlag in Queue.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property EnvelopeQueued() As String
|
||||
Get
|
||||
@@ -236,7 +299,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Umschlag abgelehnt ähnelt.
|
||||
''' Looks up a localized string similar to Umschlag abgelehnt.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property EnvelopeRejected() As String
|
||||
Get
|
||||
@@ -245,7 +308,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Signierungszertifikat erstellt ähnelt.
|
||||
''' Looks up a localized string similar to Signierungszertifikat erstellt.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property EnvelopeReportCreated() As String
|
||||
Get
|
||||
@@ -254,7 +317,16 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Gespeichert ähnelt.
|
||||
''' Looks up a localized string similar to Lesebestätigungszertifikat erstellt.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property EnvelopeReportCreatedRaC() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("EnvelopeReportCreatedRaC", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Gespeichert.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property EnvelopeSaved() As String
|
||||
Get
|
||||
@@ -263,7 +335,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Gesendet ähnelt.
|
||||
''' Looks up a localized string similar to Gesendet.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property EnvelopeSent() As String
|
||||
Get
|
||||
@@ -272,7 +344,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Umschlag zurückgezogen ähnelt.
|
||||
''' Looks up a localized string similar to Umschlag zurückgezogen.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property EnvelopeWithdrawn() As String
|
||||
Get
|
||||
@@ -281,7 +353,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Zugriffscode versendet ähnelt.
|
||||
''' Looks up a localized string similar to Zugriffscode versendet.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property MessageAccessCodeSent() As String
|
||||
Get
|
||||
@@ -290,7 +362,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Abschlussemail versendet ähnelt.
|
||||
''' Looks up a localized string similar to Abschlussemail versendet.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property MessageCompletionSent() As String
|
||||
Get
|
||||
@@ -299,7 +371,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Signaturbestätigung versendet ähnelt.
|
||||
''' Looks up a localized string similar to Signaturbestätigung versendet.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property MessageConfirmationSent() As String
|
||||
Get
|
||||
@@ -308,7 +380,16 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Löschinformation versendet ähnelt.
|
||||
''' Looks up a localized string similar to Lesebestätigung versendet.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property MessageConfirmationSentRaC() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("MessageConfirmationSentRaC", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Löschinformation versendet.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property MessageDeletionSent() As String
|
||||
Get
|
||||
@@ -317,7 +398,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Dokumentenlink versendet ähnelt.
|
||||
''' Looks up a localized string similar to Dokumentenlink versendet.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property MessageInvitationSent() As String
|
||||
Get
|
||||
@@ -326,7 +407,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Nein ähnelt.
|
||||
''' Looks up a localized string similar to Nein.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property No() As String
|
||||
Get
|
||||
@@ -335,7 +416,16 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt.
|
||||
''' Looks up a localized string similar to Teil-Bestätigt.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property PartlyConfirmed() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("PartlyConfirmed", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Teil-Signiert.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property PartlySigned() As String
|
||||
Get
|
||||
@@ -344,7 +434,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Qualifizierte Signatur ähnelt.
|
||||
''' Looks up a localized string similar to Qualifizierte Signatur.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property QualifiedSignature() As String
|
||||
Get
|
||||
@@ -353,7 +443,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Arbeitsanweisung ähnelt.
|
||||
''' Looks up a localized string similar to Lesebestätigung.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property ReadAndSign() As String
|
||||
Get
|
||||
@@ -362,7 +452,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren! ähnelt.
|
||||
''' Looks up a localized string similar to Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren!.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property ResetTOTPUser() As String
|
||||
Get
|
||||
@@ -371,7 +461,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Gespeichert ähnelt.
|
||||
''' Looks up a localized string similar to Gespeichert.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property Saved() As String
|
||||
Get
|
||||
@@ -380,7 +470,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Gesendet ähnelt.
|
||||
''' Looks up a localized string similar to Gesendet.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property Sent() As String
|
||||
Get
|
||||
@@ -389,7 +479,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Signatur ähnelt.
|
||||
''' Looks up a localized string similar to Signatur.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property Signature() As String
|
||||
Get
|
||||
@@ -398,7 +488,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Signatur bestätigt ähnelt.
|
||||
''' Looks up a localized string similar to Abschluss bestätigt.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property SignatureConfirmed() As String
|
||||
Get
|
||||
@@ -407,7 +497,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Signiert ähnelt.
|
||||
''' Looks up a localized string similar to Signiert.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property Signed() As String
|
||||
Get
|
||||
@@ -416,7 +506,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Erfolgreich! Dialog wird geschlossen. ähnelt.
|
||||
''' Looks up a localized string similar to Erfolgreich! Dialog wird geschlossen..
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property Success_FormClose() As String
|
||||
Get
|
||||
@@ -425,7 +515,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Unsigniert ähnelt.
|
||||
''' Looks up a localized string similar to Unsigniert.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property Unsigned() As String
|
||||
Get
|
||||
@@ -434,7 +524,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Ja ähnelt.
|
||||
''' Looks up a localized string similar to Ja.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property Yes() As String
|
||||
Get
|
||||
@@ -443,7 +533,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Ja, mit Anhang ähnelt.
|
||||
''' Looks up a localized string similar to Ja, mit Anhang.
|
||||
'''</summary>
|
||||
Public Shared ReadOnly Property YesWithAttachment() As String
|
||||
Get
|
||||
|
||||
@@ -132,12 +132,27 @@
|
||||
<data name="Completed" xml:space="preserve">
|
||||
<value>Completed</value>
|
||||
</data>
|
||||
<data name="CompletelyConfirmed" xml:space="preserve">
|
||||
<value>Completely confirmed</value>
|
||||
</data>
|
||||
<data name="CompletelySigned" xml:space="preserve">
|
||||
<value>Completely signed</value>
|
||||
</data>
|
||||
<data name="Confirmation" xml:space="preserve">
|
||||
<value>Read Confirmation</value>
|
||||
</data>
|
||||
<data name="Confirmed" xml:space="preserve">
|
||||
<value>Read and signed</value>
|
||||
</data>
|
||||
<data name="Contract" xml:space="preserve">
|
||||
<value>Contract</value>
|
||||
</data>
|
||||
<data name="Created" xml:space="preserve">
|
||||
<value>Created</value>
|
||||
</data>
|
||||
<data name="DocumentConfirmed" xml:space="preserve">
|
||||
<value>Document read and confirmed</value>
|
||||
</data>
|
||||
<data name="DocumentMod_Rotation" xml:space="preserve">
|
||||
<value>Document rotation adapted</value>
|
||||
</data>
|
||||
@@ -147,6 +162,9 @@
|
||||
<data name="DocumentRejected" xml:space="preserve">
|
||||
<value>Signing rejected</value>
|
||||
</data>
|
||||
<data name="DocumentRejectedRaC" xml:space="preserve">
|
||||
<value>Read confirmation rejected</value>
|
||||
</data>
|
||||
<data name="DocumentSigned" xml:space="preserve">
|
||||
<value>Document signed</value>
|
||||
</data>
|
||||
@@ -156,6 +174,9 @@
|
||||
<data name="EnvelopeArchived" xml:space="preserve">
|
||||
<value>Archived</value>
|
||||
</data>
|
||||
<data name="EnvelopeCompletelyConfirmed" xml:space="preserve">
|
||||
<value>Completely confirmed</value>
|
||||
</data>
|
||||
<data name="EnvelopeCompletelySigned" xml:space="preserve">
|
||||
<value>Completely signed</value>
|
||||
</data>
|
||||
@@ -165,8 +186,11 @@
|
||||
<data name="EnvelopeDeleted" xml:space="preserve">
|
||||
<value>Envelope Deleted</value>
|
||||
</data>
|
||||
<data name="EnvelopePartlyConfirmed" xml:space="preserve">
|
||||
<value>Partially confirmed</value>
|
||||
</data>
|
||||
<data name="EnvelopePartlySigned" xml:space="preserve">
|
||||
<value>Partly signed</value>
|
||||
<value>Partially signed</value>
|
||||
</data>
|
||||
<data name="EnvelopeQueued" xml:space="preserve">
|
||||
<value>Envelope Queued</value>
|
||||
@@ -177,6 +201,9 @@
|
||||
<data name="EnvelopeReportCreated" xml:space="preserve">
|
||||
<value>Signature certificate created</value>
|
||||
</data>
|
||||
<data name="EnvelopeReportCreatedRaC" xml:space="preserve">
|
||||
<value>Read Confirmation Certificate Created</value>
|
||||
</data>
|
||||
<data name="EnvelopeSaved" xml:space="preserve">
|
||||
<value>Saved</value>
|
||||
</data>
|
||||
@@ -195,6 +222,9 @@
|
||||
<data name="MessageConfirmationSent" xml:space="preserve">
|
||||
<value>Confirmation Sent</value>
|
||||
</data>
|
||||
<data name="MessageConfirmationSentRaC" xml:space="preserve">
|
||||
<value>Read Confirmation Sent</value>
|
||||
</data>
|
||||
<data name="MessageDeletionSent" xml:space="preserve">
|
||||
<value>Deletion Notice Sent</value>
|
||||
</data>
|
||||
@@ -204,6 +234,12 @@
|
||||
<data name="No" xml:space="preserve">
|
||||
<value>No</value>
|
||||
</data>
|
||||
<data name="PartlyConfirmed" xml:space="preserve">
|
||||
<value>Partially confirmed</value>
|
||||
</data>
|
||||
<data name="PartlySigned" xml:space="preserve">
|
||||
<value>Partially signed</value>
|
||||
</data>
|
||||
<data name="QualifiedSignature" xml:space="preserve">
|
||||
<value>Qualified Signature</value>
|
||||
</data>
|
||||
@@ -223,7 +259,7 @@
|
||||
<value>Signature</value>
|
||||
</data>
|
||||
<data name="SignatureConfirmed" xml:space="preserve">
|
||||
<value>Signature confirmed</value>
|
||||
<value>Finalization confirmed</value>
|
||||
</data>
|
||||
<data name="Signed" xml:space="preserve">
|
||||
<value>Signed</value>
|
||||
|
||||
@@ -132,8 +132,17 @@
|
||||
<data name="Completed" xml:space="preserve">
|
||||
<value>Abgeschlossen</value>
|
||||
</data>
|
||||
<data name="CompletelyConfirmed" xml:space="preserve">
|
||||
<value>Vollständig bestätigt</value>
|
||||
</data>
|
||||
<data name="CompletelySigned" xml:space="preserve">
|
||||
<value>Vollständig Signiert</value>
|
||||
<value>Vollständig signiert</value>
|
||||
</data>
|
||||
<data name="Confirmation" xml:space="preserve">
|
||||
<value>Lesebestätigung</value>
|
||||
</data>
|
||||
<data name="Confirmed" xml:space="preserve">
|
||||
<value>Gelesen und Bestätigt</value>
|
||||
</data>
|
||||
<data name="Contract" xml:space="preserve">
|
||||
<value>Vertrag</value>
|
||||
@@ -141,6 +150,9 @@
|
||||
<data name="Created" xml:space="preserve">
|
||||
<value>Erstellt</value>
|
||||
</data>
|
||||
<data name="DocumentConfirmed" xml:space="preserve">
|
||||
<value>Dokument gelesen und bestätigt</value>
|
||||
</data>
|
||||
<data name="DocumentMod_Rotation" xml:space="preserve">
|
||||
<value>Dokument Rotation geändert</value>
|
||||
</data>
|
||||
@@ -150,6 +162,9 @@
|
||||
<data name="DocumentRejected" xml:space="preserve">
|
||||
<value>Unterzeichnung abgelehnt</value>
|
||||
</data>
|
||||
<data name="DocumentRejectedRaC" xml:space="preserve">
|
||||
<value>Lesebestätigung abgelehnt</value>
|
||||
</data>
|
||||
<data name="DocumentSigned" xml:space="preserve">
|
||||
<value>Dokument unterzeichnet</value>
|
||||
</data>
|
||||
@@ -159,6 +174,9 @@
|
||||
<data name="EnvelopeArchived" xml:space="preserve">
|
||||
<value>Archiviert</value>
|
||||
</data>
|
||||
<data name="EnvelopeCompletelyConfirmed" xml:space="preserve">
|
||||
<value>Vollständig bestätigt</value>
|
||||
</data>
|
||||
<data name="EnvelopeCompletelySigned" xml:space="preserve">
|
||||
<value>Vollständig signiert</value>
|
||||
</data>
|
||||
@@ -168,6 +186,9 @@
|
||||
<data name="EnvelopeDeleted" xml:space="preserve">
|
||||
<value>Umschlag Gelöscht</value>
|
||||
</data>
|
||||
<data name="EnvelopePartlyConfirmed" xml:space="preserve">
|
||||
<value>Teil-Bestätigt</value>
|
||||
</data>
|
||||
<data name="EnvelopePartlySigned" xml:space="preserve">
|
||||
<value>Teil-Signiert</value>
|
||||
</data>
|
||||
@@ -180,6 +201,9 @@
|
||||
<data name="EnvelopeReportCreated" xml:space="preserve">
|
||||
<value>Signierungszertifikat erstellt</value>
|
||||
</data>
|
||||
<data name="EnvelopeReportCreatedRaC" xml:space="preserve">
|
||||
<value>Lesebestätigungszertifikat erstellt</value>
|
||||
</data>
|
||||
<data name="EnvelopeSaved" xml:space="preserve">
|
||||
<value>Gespeichert</value>
|
||||
</data>
|
||||
@@ -198,6 +222,9 @@
|
||||
<data name="MessageConfirmationSent" xml:space="preserve">
|
||||
<value>Signaturbestätigung versendet</value>
|
||||
</data>
|
||||
<data name="MessageConfirmationSentRaC" xml:space="preserve">
|
||||
<value>Lesebestätigung versendet</value>
|
||||
</data>
|
||||
<data name="MessageDeletionSent" xml:space="preserve">
|
||||
<value>Löschinformation versendet</value>
|
||||
</data>
|
||||
@@ -207,6 +234,9 @@
|
||||
<data name="No" xml:space="preserve">
|
||||
<value>Nein</value>
|
||||
</data>
|
||||
<data name="PartlyConfirmed" xml:space="preserve">
|
||||
<value>Teil-Bestätigt</value>
|
||||
</data>
|
||||
<data name="PartlySigned" xml:space="preserve">
|
||||
<value>Teil-Signiert</value>
|
||||
</data>
|
||||
@@ -214,7 +244,7 @@
|
||||
<value>Qualifizierte Signatur</value>
|
||||
</data>
|
||||
<data name="ReadAndSign" xml:space="preserve">
|
||||
<value>Arbeitsanweisung</value>
|
||||
<value>Lesebestätigung</value>
|
||||
</data>
|
||||
<data name="ResetTOTPUser" xml:space="preserve">
|
||||
<value>Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren!</value>
|
||||
@@ -229,7 +259,7 @@
|
||||
<value>Signatur</value>
|
||||
</data>
|
||||
<data name="SignatureConfirmed" xml:space="preserve">
|
||||
<value>Signatur bestätigt</value>
|
||||
<value>Abschluss bestätigt</value>
|
||||
</data>
|
||||
<data name="Signed" xml:space="preserve">
|
||||
<value>Signiert</value>
|
||||
|
||||
@@ -1,17 +1,11 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
#if NETFRAMEWORK
|
||||
using System;
|
||||
#endif
|
||||
|
||||
namespace EnvelopeGenerator.Domain.Entities
|
||||
{
|
||||
[Table("TBSIG_CONFIG", Schema = "dbo")]
|
||||
public class Config
|
||||
{
|
||||
[Column("DOCUMENT_PATH", TypeName = "nvarchar(256)")]
|
||||
public string DocumentPath { get; set; }
|
||||
|
||||
[Column("SENDING_PROFILE", TypeName = "int")]
|
||||
[Required]
|
||||
public int SendingProfile { get; set; }
|
||||
@@ -25,24 +19,5 @@ namespace EnvelopeGenerator.Domain.Entities
|
||||
|
||||
[Column("EXPORT_PATH", TypeName = "nvarchar(256)")]
|
||||
public string ExportPath { get; set; }
|
||||
|
||||
[Column("ADDED_WHEN", TypeName = "datetime")]
|
||||
[Required]
|
||||
public DateTime AddedWhen { get; set; }
|
||||
|
||||
[Column("CHANGED_WHEN", TypeName = "datetime")]
|
||||
public DateTime? ChangedWhen { get; set; }
|
||||
|
||||
[Column("GUID", TypeName = "tinyint")]
|
||||
[Required]
|
||||
public byte Guid { get; set; }
|
||||
|
||||
[Column("DEF_TFA_ENABLED", TypeName = "bit")]
|
||||
[Required]
|
||||
public bool DefTfaEnabled { get; set; }
|
||||
|
||||
[Column("DEF_TFA_WITH_PHONE", TypeName = "bit")]
|
||||
[Required]
|
||||
public bool DefTfaWithPhone { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -35,7 +35,6 @@ namespace EnvelopeGenerator.Domain.Entities
|
||||
[Column("STATUS")]
|
||||
public Constants.DocumentStatus Status { get; set; }
|
||||
|
||||
[Required]
|
||||
[Column("STATUS_CHANGED_WHEN", TypeName = "datetime")]
|
||||
public DateTime? StatusChangedWhen { get; set; }
|
||||
|
||||
|
||||
@@ -76,14 +76,11 @@ namespace EnvelopeGenerator.Domain.Entities
|
||||
#if nullable
|
||||
?
|
||||
#endif
|
||||
Title { get; set; }
|
||||
Title
|
||||
{ get; set; }
|
||||
|
||||
[Column("COMMENT", TypeName = "nvarchar(128)")]
|
||||
public string
|
||||
#if nullable
|
||||
?
|
||||
#endif
|
||||
Comment { get; set; }
|
||||
public string Comment { get; set; }
|
||||
|
||||
[Column("CONTRACT_TYPE")]
|
||||
public int? ContractType { get; set; }
|
||||
|
||||
@@ -4,9 +4,6 @@ using System.ComponentModel;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using EnvelopeGenerator.Domain.Interfaces.Auditing;
|
||||
#if NET
|
||||
using System.Text.Json.Serialization;
|
||||
#endif
|
||||
#if NETFRAMEWORK
|
||||
using System.Collections.Generic;
|
||||
#endif
|
||||
@@ -112,25 +109,22 @@ namespace EnvelopeGenerator.Domain.Entities
|
||||
#if nullable
|
||||
?
|
||||
#endif
|
||||
Receiver { get; set; }
|
||||
Receiver
|
||||
{ get; set; }
|
||||
|
||||
public virtual IEnumerable<ElementAnnotation>
|
||||
#if nullable
|
||||
?
|
||||
#endif
|
||||
Annotations { get; set; }
|
||||
Annotations
|
||||
{ get; set; }
|
||||
|
||||
#if NET
|
||||
[JsonIgnore]
|
||||
#endif
|
||||
#if NETFRAMEWORK
|
||||
[NotMapped]
|
||||
public double Top => Math.Round(Y, 5);
|
||||
|
||||
|
||||
#if NET
|
||||
[JsonIgnore]
|
||||
#endif
|
||||
[NotMapped]
|
||||
public double Left => Math.Round(X, 5);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -11,5 +11,10 @@
|
||||
{
|
||||
return envelope.EnvelopeTypeId == 2;
|
||||
}
|
||||
|
||||
public static bool IsReadAndSign(this IEnvelope envelope)
|
||||
{
|
||||
return envelope.EnvelopeTypeId != 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
200
EnvelopeGenerator.Domain/Resources/Model.Designer.cs
generated
200
EnvelopeGenerator.Domain/Resources/Model.Designer.cs
generated
@@ -1,10 +1,10 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// Dieser Code wurde von einem Tool generiert.
|
||||
// Laufzeitversion:4.0.30319.42000
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:4.0.30319.42000
|
||||
//
|
||||
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
||||
// der Code erneut generiert wird.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
@@ -13,12 +13,12 @@ namespace My.Resources {
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
|
||||
/// A strongly-typed resource class, for looking up localized strings, etc.
|
||||
/// </summary>
|
||||
// Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
|
||||
// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
|
||||
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
|
||||
// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
|
||||
// This class was auto-generated by the StronglyTypedResourceBuilder
|
||||
// class via a tool like ResGen or Visual Studio.
|
||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||
// with the /str option, or rebuild your VS project.
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
@@ -33,7 +33,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
|
||||
/// Returns the cached ResourceManager instance used by this class.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
public static global::System.Resources.ResourceManager ResourceManager {
|
||||
@@ -47,8 +47,8 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
|
||||
/// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
|
||||
/// Overrides the current thread's CurrentUICulture property for all
|
||||
/// resource lookups using this strongly typed resource class.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
public static global::System.Globalization.CultureInfo Culture {
|
||||
@@ -61,7 +61,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Zugriffscode korrekt eingegeben ähnelt.
|
||||
/// Looks up a localized string similar to Zugriffscode korrekt eingegeben.
|
||||
/// </summary>
|
||||
public static string AccessCodeCorrect {
|
||||
get {
|
||||
@@ -70,7 +70,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Zugriffscode falsch eingegeben ähnelt.
|
||||
/// Looks up a localized string similar to Zugriffscode falsch eingegeben.
|
||||
/// </summary>
|
||||
public static string AccessCodeIncorrect {
|
||||
get {
|
||||
@@ -79,7 +79,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Zugriffscode angefordert ähnelt.
|
||||
/// Looks up a localized string similar to Zugriffscode angefordert.
|
||||
/// </summary>
|
||||
public static string AccessCodeRequested {
|
||||
get {
|
||||
@@ -88,7 +88,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Fortgeschrittene Elektronische Signatur ähnelt.
|
||||
/// Looks up a localized string similar to Fortgeschrittene Elektronische Signatur.
|
||||
/// </summary>
|
||||
public static string AdvancedElectronicSignature {
|
||||
get {
|
||||
@@ -97,7 +97,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Abgeschlossen ähnelt.
|
||||
/// Looks up a localized string similar to Abgeschlossen.
|
||||
/// </summary>
|
||||
public static string Completed {
|
||||
get {
|
||||
@@ -106,7 +106,16 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Vollständig Signiert ähnelt.
|
||||
/// Looks up a localized string similar to Vollständig bestätigt.
|
||||
/// </summary>
|
||||
public static string CompletelyConfirmed {
|
||||
get {
|
||||
return ResourceManager.GetString("CompletelyConfirmed", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Vollständig signiert.
|
||||
/// </summary>
|
||||
public static string CompletelySigned {
|
||||
get {
|
||||
@@ -115,7 +124,25 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Vertrag ähnelt.
|
||||
/// Looks up a localized string similar to Lesebestätigung.
|
||||
/// </summary>
|
||||
public static string Confirmation {
|
||||
get {
|
||||
return ResourceManager.GetString("Confirmation", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Gelesen und bestätigt.
|
||||
/// </summary>
|
||||
public static string Confirmed {
|
||||
get {
|
||||
return ResourceManager.GetString("Confirmed", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Vertrag.
|
||||
/// </summary>
|
||||
public static string Contract {
|
||||
get {
|
||||
@@ -124,7 +151,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Erstellt ähnelt.
|
||||
/// Looks up a localized string similar to Erstellt.
|
||||
/// </summary>
|
||||
public static string Created {
|
||||
get {
|
||||
@@ -133,7 +160,16 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Dokument Rotation geändert ähnelt.
|
||||
/// Looks up a localized string similar to Dokument gelesen und bestätigt.
|
||||
/// </summary>
|
||||
public static string DocumentConfirmed {
|
||||
get {
|
||||
return ResourceManager.GetString("DocumentConfirmed", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Dokument Rotation geändert.
|
||||
/// </summary>
|
||||
public static string DocumentMod_Rotation {
|
||||
get {
|
||||
@@ -142,7 +178,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Dokument geöffnet ähnelt.
|
||||
/// Looks up a localized string similar to Dokument geöffnet.
|
||||
/// </summary>
|
||||
public static string DocumentOpened {
|
||||
get {
|
||||
@@ -151,7 +187,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Unterzeichnung abgelehnt ähnelt.
|
||||
/// Looks up a localized string similar to Unterzeichnung abgelehnt.
|
||||
/// </summary>
|
||||
public static string DocumentRejected {
|
||||
get {
|
||||
@@ -160,7 +196,16 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Dokument unterzeichnet ähnelt.
|
||||
/// Looks up a localized string similar to Lesebestätigung abgelehnt.
|
||||
/// </summary>
|
||||
public static string DocumentRejectedRaC {
|
||||
get {
|
||||
return ResourceManager.GetString("DocumentRejectedRaC", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Dokument unterzeichnet.
|
||||
/// </summary>
|
||||
public static string DocumentSigned {
|
||||
get {
|
||||
@@ -169,7 +214,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Entwurf ähnelt.
|
||||
/// Looks up a localized string similar to Entwurf.
|
||||
/// </summary>
|
||||
public static string Draft {
|
||||
get {
|
||||
@@ -178,7 +223,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Archiviert ähnelt.
|
||||
/// Looks up a localized string similar to Archiviert.
|
||||
/// </summary>
|
||||
public static string EnvelopeArchived {
|
||||
get {
|
||||
@@ -187,7 +232,16 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Vollständig signiert ähnelt.
|
||||
/// Looks up a localized string similar to Vollständig gelesen und bestätigt.
|
||||
/// </summary>
|
||||
public static string EnvelopeCompletelyConfirmed {
|
||||
get {
|
||||
return ResourceManager.GetString("EnvelopeCompletelyConfirmed", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Vollständig signiert.
|
||||
/// </summary>
|
||||
public static string EnvelopeCompletelySigned {
|
||||
get {
|
||||
@@ -196,7 +250,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Umschlag Erstellt ähnelt.
|
||||
/// Looks up a localized string similar to Umschlag Erstellt.
|
||||
/// </summary>
|
||||
public static string EnvelopeCreated {
|
||||
get {
|
||||
@@ -205,7 +259,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Umschlag Gelöscht ähnelt.
|
||||
/// Looks up a localized string similar to Umschlag Gelöscht.
|
||||
/// </summary>
|
||||
public static string EnvelopeDeleted {
|
||||
get {
|
||||
@@ -214,7 +268,16 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt.
|
||||
/// Looks up a localized string similar to Teil-Bestätigt.
|
||||
/// </summary>
|
||||
public static string EnvelopePartlyConfirmed {
|
||||
get {
|
||||
return ResourceManager.GetString("EnvelopePartlyConfirmed", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Teil-Signiert.
|
||||
/// </summary>
|
||||
public static string EnvelopePartlySigned {
|
||||
get {
|
||||
@@ -223,7 +286,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Umschlag in Queue ähnelt.
|
||||
/// Looks up a localized string similar to Umschlag in Queue.
|
||||
/// </summary>
|
||||
public static string EnvelopeQueued {
|
||||
get {
|
||||
@@ -232,7 +295,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Umschlag abgelehnt ähnelt.
|
||||
/// Looks up a localized string similar to Umschlag abgelehnt.
|
||||
/// </summary>
|
||||
public static string EnvelopeRejected {
|
||||
get {
|
||||
@@ -241,7 +304,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Signierungszertifikat erstellt ähnelt.
|
||||
/// Looks up a localized string similar to Signierungszertifikat erstellt.
|
||||
/// </summary>
|
||||
public static string EnvelopeReportCreated {
|
||||
get {
|
||||
@@ -250,7 +313,16 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Gespeichert ähnelt.
|
||||
/// Looks up a localized string similar to Lesebestätigungszertifikat erstellt.
|
||||
/// </summary>
|
||||
public static string EnvelopeReportCreatedRaC {
|
||||
get {
|
||||
return ResourceManager.GetString("EnvelopeReportCreatedRaC", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Gespeichert.
|
||||
/// </summary>
|
||||
public static string EnvelopeSaved {
|
||||
get {
|
||||
@@ -259,7 +331,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Gesendet ähnelt.
|
||||
/// Looks up a localized string similar to Gesendet.
|
||||
/// </summary>
|
||||
public static string EnvelopeSent {
|
||||
get {
|
||||
@@ -268,7 +340,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Umschlag zurückgezogen ähnelt.
|
||||
/// Looks up a localized string similar to Umschlag zurückgezogen.
|
||||
/// </summary>
|
||||
public static string EnvelopeWithdrawn {
|
||||
get {
|
||||
@@ -277,7 +349,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Zugriffscode versendet ähnelt.
|
||||
/// Looks up a localized string similar to Zugriffscode versendet.
|
||||
/// </summary>
|
||||
public static string MessageAccessCodeSent {
|
||||
get {
|
||||
@@ -286,7 +358,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Abschlussemail versendet ähnelt.
|
||||
/// Looks up a localized string similar to Abschlussemail versendet.
|
||||
/// </summary>
|
||||
public static string MessageCompletionSent {
|
||||
get {
|
||||
@@ -295,7 +367,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Signaturbestätigung versendet ähnelt.
|
||||
/// Looks up a localized string similar to Abschlussbestätigung versendet.
|
||||
/// </summary>
|
||||
public static string MessageConfirmationSent {
|
||||
get {
|
||||
@@ -304,7 +376,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Löschinformation versendet ähnelt.
|
||||
/// Looks up a localized string similar to Löschinformation versendet.
|
||||
/// </summary>
|
||||
public static string MessageDeletionSent {
|
||||
get {
|
||||
@@ -313,7 +385,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Dokumentenlink versendet ähnelt.
|
||||
/// Looks up a localized string similar to Dokumentenlink versendet.
|
||||
/// </summary>
|
||||
public static string MessageInvitationSent {
|
||||
get {
|
||||
@@ -322,7 +394,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Nein ähnelt.
|
||||
/// Looks up a localized string similar to Nein.
|
||||
/// </summary>
|
||||
public static string No {
|
||||
get {
|
||||
@@ -331,7 +403,16 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt.
|
||||
/// Looks up a localized string similar to Teil-Bestätigt.
|
||||
/// </summary>
|
||||
public static string PartlyConfirmed {
|
||||
get {
|
||||
return ResourceManager.GetString("PartlyConfirmed", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Teil-Signiert.
|
||||
/// </summary>
|
||||
public static string PartlySigned {
|
||||
get {
|
||||
@@ -340,7 +421,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Qualifizierte Signatur ähnelt.
|
||||
/// Looks up a localized string similar to Qualifizierte Signatur.
|
||||
/// </summary>
|
||||
public static string QualifiedSignature {
|
||||
get {
|
||||
@@ -349,7 +430,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Arbeitsanweisung ähnelt.
|
||||
/// Looks up a localized string similar to Lesebestätigung.
|
||||
/// </summary>
|
||||
public static string ReadAndSign {
|
||||
get {
|
||||
@@ -358,7 +439,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren! ähnelt.
|
||||
/// Looks up a localized string similar to Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren!.
|
||||
/// </summary>
|
||||
public static string ResetTOTPUser {
|
||||
get {
|
||||
@@ -367,7 +448,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Gespeichert ähnelt.
|
||||
/// Looks up a localized string similar to Gespeichert.
|
||||
/// </summary>
|
||||
public static string Saved {
|
||||
get {
|
||||
@@ -376,7 +457,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Gesendet ähnelt.
|
||||
/// Looks up a localized string similar to Gesendet.
|
||||
/// </summary>
|
||||
public static string Sent {
|
||||
get {
|
||||
@@ -385,7 +466,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Signatur ähnelt.
|
||||
/// Looks up a localized string similar to Signatur.
|
||||
/// </summary>
|
||||
public static string Signature {
|
||||
get {
|
||||
@@ -394,7 +475,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Signatur bestätigt ähnelt.
|
||||
/// Looks up a localized string similar to Abschluss bestätigt.
|
||||
/// </summary>
|
||||
public static string SignatureConfirmed {
|
||||
get {
|
||||
@@ -403,7 +484,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Signiert ähnelt.
|
||||
/// Looks up a localized string similar to Signiert.
|
||||
/// </summary>
|
||||
public static string Signed {
|
||||
get {
|
||||
@@ -412,7 +493,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Erfolgreich! Dialog wird geschlossen. ähnelt.
|
||||
/// Looks up a localized string similar to Erfolgreich! Dialog wird geschlossen..
|
||||
/// </summary>
|
||||
public static string Success_FormClose {
|
||||
get {
|
||||
@@ -421,7 +502,16 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Unsigniert ähnelt.
|
||||
/// Looks up a localized string similar to Unbestätigt.
|
||||
/// </summary>
|
||||
public static string Unconfirmed {
|
||||
get {
|
||||
return ResourceManager.GetString("Unconfirmed", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Unsigniert.
|
||||
/// </summary>
|
||||
public static string Unsigned {
|
||||
get {
|
||||
@@ -430,7 +520,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Ja ähnelt.
|
||||
/// Looks up a localized string similar to Ja.
|
||||
/// </summary>
|
||||
public static string Yes {
|
||||
get {
|
||||
@@ -439,7 +529,7 @@ namespace My.Resources {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Zeichenfolge, die Ja, mit Anhang ähnelt.
|
||||
/// Looks up a localized string similar to Ja, mit Anhang.
|
||||
/// </summary>
|
||||
public static string YesWithAttachment {
|
||||
get {
|
||||
|
||||
@@ -132,15 +132,27 @@
|
||||
<data name="Completed" xml:space="preserve">
|
||||
<value>Completed</value>
|
||||
</data>
|
||||
<data name="CompletelyConfirmed" xml:space="preserve">
|
||||
<value>Completely confirmed</value>
|
||||
</data>
|
||||
<data name="CompletelySigned" xml:space="preserve">
|
||||
<value>Completely signed</value>
|
||||
</data>
|
||||
<data name="Confirmation" xml:space="preserve">
|
||||
<value>Read Confirmation</value>
|
||||
</data>
|
||||
<data name="Confirmed" xml:space="preserve">
|
||||
<value>Read and signed</value>
|
||||
</data>
|
||||
<data name="Contract" xml:space="preserve">
|
||||
<value>Contract</value>
|
||||
</data>
|
||||
<data name="Created" xml:space="preserve">
|
||||
<value>Created</value>
|
||||
</data>
|
||||
<data name="DocumentConfirmed" xml:space="preserve">
|
||||
<value>Document read and signed</value>
|
||||
</data>
|
||||
<data name="DocumentMod_Rotation" xml:space="preserve">
|
||||
<value>Document rotation adapted</value>
|
||||
</data>
|
||||
@@ -150,6 +162,9 @@
|
||||
<data name="DocumentRejected" xml:space="preserve">
|
||||
<value>Signing rejected</value>
|
||||
</data>
|
||||
<data name="DocumentRejectedRaC" xml:space="preserve">
|
||||
<value>Read confirmation rejected</value>
|
||||
</data>
|
||||
<data name="DocumentSigned" xml:space="preserve">
|
||||
<value>Document signed</value>
|
||||
</data>
|
||||
@@ -159,6 +174,9 @@
|
||||
<data name="EnvelopeArchived" xml:space="preserve">
|
||||
<value>Archived</value>
|
||||
</data>
|
||||
<data name="EnvelopeCompletelyConfirmed" xml:space="preserve">
|
||||
<value>Completely confirmed</value>
|
||||
</data>
|
||||
<data name="EnvelopeCompletelySigned" xml:space="preserve">
|
||||
<value>Completely signed</value>
|
||||
</data>
|
||||
@@ -168,8 +186,11 @@
|
||||
<data name="EnvelopeDeleted" xml:space="preserve">
|
||||
<value>Envelope Deleted</value>
|
||||
</data>
|
||||
<data name="EnvelopePartlyConfirmed" xml:space="preserve">
|
||||
<value>Partially confirmed</value>
|
||||
</data>
|
||||
<data name="EnvelopePartlySigned" xml:space="preserve">
|
||||
<value>Partly signed</value>
|
||||
<value>Partially signed</value>
|
||||
</data>
|
||||
<data name="EnvelopeQueued" xml:space="preserve">
|
||||
<value>Envelope Queued</value>
|
||||
@@ -180,6 +201,9 @@
|
||||
<data name="EnvelopeReportCreated" xml:space="preserve">
|
||||
<value>Signature certificate created</value>
|
||||
</data>
|
||||
<data name="EnvelopeReportCreatedRaC" xml:space="preserve">
|
||||
<value>Read confirmartion certificate created</value>
|
||||
</data>
|
||||
<data name="EnvelopeSaved" xml:space="preserve">
|
||||
<value>Saved</value>
|
||||
</data>
|
||||
@@ -196,7 +220,7 @@
|
||||
<value>Final email sent</value>
|
||||
</data>
|
||||
<data name="MessageConfirmationSent" xml:space="preserve">
|
||||
<value>Confirmation Sent</value>
|
||||
<value>Finalization Confirmation Sent</value>
|
||||
</data>
|
||||
<data name="MessageDeletionSent" xml:space="preserve">
|
||||
<value>Deletion Notice Sent</value>
|
||||
@@ -207,6 +231,12 @@
|
||||
<data name="No" xml:space="preserve">
|
||||
<value>No</value>
|
||||
</data>
|
||||
<data name="PartlyConfirmed" xml:space="preserve">
|
||||
<value>Partially confirmed</value>
|
||||
</data>
|
||||
<data name="PartlySigned" xml:space="preserve">
|
||||
<value>Partially signed</value>
|
||||
</data>
|
||||
<data name="QualifiedSignature" xml:space="preserve">
|
||||
<value>Qualified Signature</value>
|
||||
</data>
|
||||
@@ -226,7 +256,7 @@
|
||||
<value>Signature</value>
|
||||
</data>
|
||||
<data name="SignatureConfirmed" xml:space="preserve">
|
||||
<value>Signature confirmed</value>
|
||||
<value>Finalization confirmed</value>
|
||||
</data>
|
||||
<data name="Signed" xml:space="preserve">
|
||||
<value>Signed</value>
|
||||
@@ -234,6 +264,9 @@
|
||||
<data name="Success_FormClose" xml:space="preserve">
|
||||
<value>Successful! Dialog is closed.successful! Dialog is closed.</value>
|
||||
</data>
|
||||
<data name="Unconfirmed" xml:space="preserve">
|
||||
<value>Unconfirmed</value>
|
||||
</data>
|
||||
<data name="Unsigned" xml:space="preserve">
|
||||
<value>Unsigned</value>
|
||||
</data>
|
||||
|
||||
@@ -132,8 +132,17 @@
|
||||
<data name="Completed" xml:space="preserve">
|
||||
<value>Abgeschlossen</value>
|
||||
</data>
|
||||
<data name="CompletelyConfirmed" xml:space="preserve">
|
||||
<value>Vollständig bestätigt</value>
|
||||
</data>
|
||||
<data name="CompletelySigned" xml:space="preserve">
|
||||
<value>Vollständig Signiert</value>
|
||||
<value>Vollständig signiert</value>
|
||||
</data>
|
||||
<data name="Confirmation" xml:space="preserve">
|
||||
<value>Lesebestätigung</value>
|
||||
</data>
|
||||
<data name="Confirmed" xml:space="preserve">
|
||||
<value>Gelesen und bestätigt</value>
|
||||
</data>
|
||||
<data name="Contract" xml:space="preserve">
|
||||
<value>Vertrag</value>
|
||||
@@ -141,6 +150,9 @@
|
||||
<data name="Created" xml:space="preserve">
|
||||
<value>Erstellt</value>
|
||||
</data>
|
||||
<data name="DocumentConfirmed" xml:space="preserve">
|
||||
<value>Dokument gelesen und bestätigt</value>
|
||||
</data>
|
||||
<data name="DocumentMod_Rotation" xml:space="preserve">
|
||||
<value>Dokument Rotation geändert</value>
|
||||
</data>
|
||||
@@ -150,6 +162,9 @@
|
||||
<data name="DocumentRejected" xml:space="preserve">
|
||||
<value>Unterzeichnung abgelehnt</value>
|
||||
</data>
|
||||
<data name="DocumentRejectedRaC" xml:space="preserve">
|
||||
<value>Lesebestätigung abgelehnt</value>
|
||||
</data>
|
||||
<data name="DocumentSigned" xml:space="preserve">
|
||||
<value>Dokument unterzeichnet</value>
|
||||
</data>
|
||||
@@ -159,6 +174,9 @@
|
||||
<data name="EnvelopeArchived" xml:space="preserve">
|
||||
<value>Archiviert</value>
|
||||
</data>
|
||||
<data name="EnvelopeCompletelyConfirmed" xml:space="preserve">
|
||||
<value>Vollständig gelesen und bestätigt</value>
|
||||
</data>
|
||||
<data name="EnvelopeCompletelySigned" xml:space="preserve">
|
||||
<value>Vollständig signiert</value>
|
||||
</data>
|
||||
@@ -168,6 +186,9 @@
|
||||
<data name="EnvelopeDeleted" xml:space="preserve">
|
||||
<value>Umschlag Gelöscht</value>
|
||||
</data>
|
||||
<data name="EnvelopePartlyConfirmed" xml:space="preserve">
|
||||
<value>Teil-Bestätigt</value>
|
||||
</data>
|
||||
<data name="EnvelopePartlySigned" xml:space="preserve">
|
||||
<value>Teil-Signiert</value>
|
||||
</data>
|
||||
@@ -180,6 +201,9 @@
|
||||
<data name="EnvelopeReportCreated" xml:space="preserve">
|
||||
<value>Signierungszertifikat erstellt</value>
|
||||
</data>
|
||||
<data name="EnvelopeReportCreatedRaC" xml:space="preserve">
|
||||
<value>Lesebestätigungszertifikat erstellt</value>
|
||||
</data>
|
||||
<data name="EnvelopeSaved" xml:space="preserve">
|
||||
<value>Gespeichert</value>
|
||||
</data>
|
||||
@@ -196,7 +220,7 @@
|
||||
<value>Abschlussemail versendet</value>
|
||||
</data>
|
||||
<data name="MessageConfirmationSent" xml:space="preserve">
|
||||
<value>Signaturbestätigung versendet</value>
|
||||
<value>Abschlussbestätigung versendet</value>
|
||||
</data>
|
||||
<data name="MessageDeletionSent" xml:space="preserve">
|
||||
<value>Löschinformation versendet</value>
|
||||
@@ -207,6 +231,9 @@
|
||||
<data name="No" xml:space="preserve">
|
||||
<value>Nein</value>
|
||||
</data>
|
||||
<data name="PartlyConfirmed" xml:space="preserve">
|
||||
<value>Teil-Bestätigt</value>
|
||||
</data>
|
||||
<data name="PartlySigned" xml:space="preserve">
|
||||
<value>Teil-Signiert</value>
|
||||
</data>
|
||||
@@ -214,7 +241,7 @@
|
||||
<value>Qualifizierte Signatur</value>
|
||||
</data>
|
||||
<data name="ReadAndSign" xml:space="preserve">
|
||||
<value>Arbeitsanweisung</value>
|
||||
<value>Lesebestätigung</value>
|
||||
</data>
|
||||
<data name="ResetTOTPUser" xml:space="preserve">
|
||||
<value>Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren!</value>
|
||||
@@ -229,7 +256,7 @@
|
||||
<value>Signatur</value>
|
||||
</data>
|
||||
<data name="SignatureConfirmed" xml:space="preserve">
|
||||
<value>Signatur bestätigt</value>
|
||||
<value>Abschluss bestätigt</value>
|
||||
</data>
|
||||
<data name="Signed" xml:space="preserve">
|
||||
<value>Signiert</value>
|
||||
@@ -237,6 +264,9 @@
|
||||
<data name="Success_FormClose" xml:space="preserve">
|
||||
<value>Erfolgreich! Dialog wird geschlossen.</value>
|
||||
</data>
|
||||
<data name="Unconfirmed" xml:space="preserve">
|
||||
<value>Unbestätigt</value>
|
||||
</data>
|
||||
<data name="Unsigned" xml:space="preserve">
|
||||
<value>Unsigniert</value>
|
||||
</data>
|
||||
|
||||
@@ -47,6 +47,8 @@ public abstract class EGDbContextBase : DbContext
|
||||
|
||||
public DbSet<Signature> DocumentReceiverElements { get; set; }
|
||||
|
||||
public DbSet<ElementAnnotation> DocumentReceiverElementAnnotations { get; set; }
|
||||
|
||||
public DbSet<DocumentStatus> DocumentStatus { get; set; }
|
||||
|
||||
public DbSet<EmailTemplate> EmailTemplate { get; set; }
|
||||
|
||||
@@ -105,17 +105,13 @@ namespace EnvelopeGenerator.PdfEditor
|
||||
public Pdf<TInputStream, TOutputStream> Background<TSignature>(IEnumerable<TSignature> signatures, double widthPx = 1.9500000000000002, double heightPx = 2.52)
|
||||
where TSignature : ISignature
|
||||
{
|
||||
// once per page
|
||||
Page(page =>
|
||||
{
|
||||
var canvas = new PdfCanvas(page);
|
||||
canvas.ConcatMatrix(1, 0, 0, -1, 0, page.GetPageSize().GetHeight());
|
||||
});
|
||||
|
||||
foreach (var signature in signatures)
|
||||
Page(signature.Page, page =>
|
||||
{
|
||||
var canvas = new PdfCanvas(page);
|
||||
canvas.SaveState();
|
||||
canvas.ConcatMatrix(1, 0, 0, -1, 0, page.GetPageSize().GetHeight());
|
||||
|
||||
double inchFactor = 72;
|
||||
double magin = .2;
|
||||
double x = (signature.X - .7 - magin) * inchFactor;
|
||||
@@ -134,6 +130,8 @@ namespace EnvelopeGenerator.PdfEditor
|
||||
canvas.SetFillColor(new DeviceRgb(204, 202, 198))
|
||||
.Rectangle(x, y + height - bottomLineLength, width, bottomLineLength)
|
||||
.Fill();
|
||||
|
||||
canvas.RestoreState();
|
||||
});
|
||||
|
||||
return this;
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
||||
@@ -23,15 +23,15 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.2.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.4.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
@@ -39,7 +39,7 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
@@ -51,7 +51,7 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
@@ -135,7 +135,7 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Formats.Asn1" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
@@ -17,7 +17,8 @@
|
||||
<TargetFrameworkProfile />
|
||||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
<PublishUrl>publish\</PublishUrl>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<PublishUrl>P:\Install .Net\0 DD - Smart UP\signFLOW\Finalization\%24%28Version%29\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
<UpdateEnabled>false</UpdateEnabled>
|
||||
@@ -27,10 +28,11 @@
|
||||
<UpdatePeriodically>false</UpdatePeriodically>
|
||||
<UpdateRequired>false</UpdateRequired>
|
||||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<AutorunEnabled>true</AutorunEnabled>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<PublishWizardCompleted>true</PublishWizardCompleted>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
@@ -65,6 +67,18 @@
|
||||
<PropertyGroup>
|
||||
<OptionInfer>On</OptionInfer>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ManifestCertificateThumbprint>905CDA07C40CC715F90A2F2A0C5C0E5BAACE138B</ManifestCertificateThumbprint>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ManifestKeyFile>EnvelopeGenerator.Service_TemporaryKey.pfx</ManifestKeyFile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<GenerateManifests>true</GenerateManifests>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SignManifests>true</SignManifests>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\BouncyCastle.Cryptography.2.6.2\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
|
||||
@@ -212,8 +226,8 @@
|
||||
<HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
|
||||
<Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
|
||||
@@ -221,6 +235,9 @@
|
||||
<Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||
<Reference Include="System.Configuration" />
|
||||
<Reference Include="System.Configuration.Install" />
|
||||
@@ -234,18 +251,18 @@
|
||||
<HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Management" />
|
||||
<Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
|
||||
<Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Numerics" />
|
||||
<Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
|
||||
<Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.Remoting" />
|
||||
<Reference Include="System.Runtime.Serialization" />
|
||||
@@ -258,15 +275,15 @@
|
||||
<Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
|
||||
<Reference Include="System.Text.Json, Version=8.0.0.6, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Text.Json.8.0.6\lib\net462\System.Text.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
|
||||
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Transactions" />
|
||||
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
|
||||
<Reference Include="System.ValueTuple, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.ValueTuple.4.6.1\lib\net462\System.ValueTuple.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="System.Core" />
|
||||
@@ -274,6 +291,63 @@
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="WindowsBase" />
|
||||
<Reference Include="Microsoft.Data.SqlClient, Version=6.0.0.0, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Data.SqlClient.6.1.4\lib\net462\Microsoft.Data.SqlClient.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="DigitalData.Core.Abstraction.Application, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.6.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.EntityFrameworkCore.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.EntityFrameworkCore.Relational, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.EntityFrameworkCore.Relational.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.EntityFrameworkCore.SqlServer, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.EntityFrameworkCore.SqlServer.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.SqlServer.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.8.0.1\lib\net462\Microsoft.Extensions.Caching.Memory.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Extensions.Configuration, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Extensions.Configuration.7.0.0\lib\net462\Microsoft.Extensions.Configuration.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Extensions.Configuration.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Extensions.Configuration.Binder, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Extensions.Configuration.Binder.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Extensions.Logging, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Extensions.Logging.7.0.0\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Extensions.Options, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Extensions.Options.8.0.2\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.7.0.0\lib\net462\Microsoft.Extensions.Options.ConfigurationExtensions.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.Extensions.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Microsoft.Extensions.Primitives.8.0.0\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Data.Common, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Import Include="Microsoft.VisualBasic" />
|
||||
@@ -337,6 +411,7 @@
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="EnvelopeGenerator.Service_TemporaryKey.pfx" />
|
||||
<None Include="My Project\Application.myapp">
|
||||
<Generator>MyApplicationCodeGenerator</Generator>
|
||||
<LastGenOutput>Application.Designer.vb</LastGenOutput>
|
||||
@@ -380,6 +455,8 @@
|
||||
<Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
|
||||
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets'))" />
|
||||
</Target>
|
||||
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
|
||||
<Import Project="..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets')" />
|
||||
</Project>
|
||||
@@ -1,6 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="AutoMapper" version="10.1.1" targetFramework="net462" />
|
||||
<package id="BouncyCastle.Cryptography" version="2.6.2" targetFramework="net462" />
|
||||
<package id="DigitalData.Core.Abstraction.Application" version="1.6.0" targetFramework="net462" />
|
||||
<package id="DigitalData.Core.Abstractions" version="4.3.0" targetFramework="net462" />
|
||||
<package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net48" />
|
||||
<package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net48" />
|
||||
@@ -11,11 +13,26 @@
|
||||
<package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net48" />
|
||||
<package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net48" />
|
||||
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net48" />
|
||||
<package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net462" />
|
||||
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
|
||||
<package id="Microsoft.Data.SqlClient" version="6.1.4" targetFramework="net462" />
|
||||
<package id="Microsoft.Data.SqlClient.SNI" version="6.0.2" targetFramework="net462" />
|
||||
<package id="Microsoft.EntityFrameworkCore" version="3.1.32" targetFramework="net462" />
|
||||
<package id="Microsoft.EntityFrameworkCore.Abstractions" version="3.1.32" targetFramework="net462" />
|
||||
<package id="Microsoft.EntityFrameworkCore.Relational" version="3.1.32" targetFramework="net462" />
|
||||
<package id="Microsoft.EntityFrameworkCore.SqlServer" version="3.1.32" targetFramework="net462" />
|
||||
<package id="Microsoft.Extensions.Caching.Abstractions" version="8.0.0" targetFramework="net462" />
|
||||
<package id="Microsoft.Extensions.Caching.Memory" version="8.0.1" targetFramework="net462" />
|
||||
<package id="Microsoft.Extensions.Configuration" version="7.0.0" targetFramework="net462" />
|
||||
<package id="Microsoft.Extensions.Configuration.Abstractions" version="7.0.0" targetFramework="net462" />
|
||||
<package id="Microsoft.Extensions.Configuration.Binder" version="7.0.0" targetFramework="net462" />
|
||||
<package id="Microsoft.Extensions.DependencyInjection" version="7.0.0" targetFramework="net462" />
|
||||
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.2" targetFramework="net462" />
|
||||
<package id="Microsoft.Extensions.Logging" version="7.0.0" targetFramework="net462" />
|
||||
<package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.3" targetFramework="net462" />
|
||||
<package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net48" />
|
||||
<package id="Microsoft.Extensions.Options" version="8.0.2" targetFramework="net462" />
|
||||
<package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="7.0.0" targetFramework="net462" />
|
||||
<package id="Microsoft.Extensions.Primitives" version="8.0.0" targetFramework="net462" />
|
||||
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
|
||||
<package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net48" />
|
||||
<package id="NLog" version="5.0.5" targetFramework="net461" />
|
||||
@@ -24,18 +41,20 @@
|
||||
<package id="protobuf-net.Core" version="3.2.46" targetFramework="net48" />
|
||||
<package id="Quartz" version="3.15.0" targetFramework="net462" />
|
||||
<package id="RtfPipe" version="2.0.7677.4303" targetFramework="net48" />
|
||||
<package id="System.Buffers" version="4.6.0" targetFramework="net48" />
|
||||
<package id="System.Buffers" version="4.6.1" targetFramework="net462" />
|
||||
<package id="System.CodeDom" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Collections.Immutable" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net48" />
|
||||
<package id="System.Data.Odbc" version="6.0.1" targetFramework="net48" />
|
||||
<package id="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net462" />
|
||||
<package id="System.IO.Packaging" version="8.0.1" targetFramework="net48" />
|
||||
<package id="System.Management" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Memory" version="4.6.0" targetFramework="net48" />
|
||||
<package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net48" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net48" />
|
||||
<package id="System.Memory" version="4.6.3" targetFramework="net462" />
|
||||
<package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net462" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net462" />
|
||||
<package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net48" />
|
||||
<package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net48" />
|
||||
<package id="System.Text.Json" version="8.0.5" targetFramework="net48" />
|
||||
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
|
||||
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" requireReinstallation="true" />
|
||||
<package id="System.Text.Json" version="8.0.6" targetFramework="net48" />
|
||||
<package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net462" />
|
||||
<package id="System.ValueTuple" version="4.6.1" targetFramework="net462" />
|
||||
</packages>
|
||||
@@ -1,32 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
|
||||
<PackageReference Include="GdPicture" Version="14.3.3" />
|
||||
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.17" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.17" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="Quartz" Version="3.8.0" />
|
||||
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="8.0.16" />
|
||||
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
|
||||
<ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
|
||||
<ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Controllers\" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -1,12 +0,0 @@
|
||||
namespace EnvelopeGenerator.ServiceHost.Exceptions;
|
||||
|
||||
public class BurnAnnotationException : ApplicationException
|
||||
{
|
||||
public BurnAnnotationException(string message) : base(message)
|
||||
{
|
||||
}
|
||||
|
||||
public BurnAnnotationException(string message, Exception innerException) : base(message, innerException)
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
namespace EnvelopeGenerator.ServiceHost.Exceptions;
|
||||
|
||||
public class CreateReportException : ApplicationException
|
||||
{
|
||||
public CreateReportException(string message) : base(message)
|
||||
{
|
||||
}
|
||||
|
||||
public CreateReportException(string message, Exception innerException) : base(message, innerException)
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
namespace EnvelopeGenerator.ServiceHost.Exceptions;
|
||||
|
||||
public class ExportDocumentException : ApplicationException
|
||||
{
|
||||
public ExportDocumentException(string message) : base(message)
|
||||
{
|
||||
}
|
||||
|
||||
public ExportDocumentException(string message, Exception innerException) : base(message, innerException)
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
namespace EnvelopeGenerator.ServiceHost.Exceptions;
|
||||
|
||||
public class MergeDocumentException : ApplicationException
|
||||
{
|
||||
public MergeDocumentException(string message) : base(message)
|
||||
{
|
||||
}
|
||||
|
||||
public MergeDocumentException(string message, Exception innerException) : base(message, innerException)
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
using System.Data;
|
||||
|
||||
namespace EnvelopeGenerator.ServiceHost.Extensions;
|
||||
|
||||
public static class DataRowExtensions
|
||||
{
|
||||
public static T ItemEx<T>(this DataRow row, string columnName, T defaultValue)
|
||||
{
|
||||
if (!row.Table.Columns.Contains(columnName))
|
||||
{
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
var value = row[columnName];
|
||||
if (value is DBNull or null)
|
||||
{
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
return (T)Convert.ChangeType(value, typeof(T));
|
||||
}
|
||||
|
||||
public static string ItemEx(this DataRow row, string columnName, string defaultValue)
|
||||
{
|
||||
return row.ItemEx<string>(columnName, defaultValue);
|
||||
}
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
using DigitalData.Modules.Database;
|
||||
using EnvelopeGenerator.ServiceHost.Jobs;
|
||||
using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
|
||||
using GdPicture14;
|
||||
using Microsoft.Extensions.Options;
|
||||
|
||||
namespace EnvelopeGenerator.ServiceHost.Extensions;
|
||||
|
||||
public static class DependencyInjection
|
||||
{
|
||||
[Obsolete("Check obsoleted services")]
|
||||
public static IServiceCollection AddFinalizeDocumentJob(this IServiceCollection services, IConfiguration configuration)
|
||||
{
|
||||
services.Configure<WorkerOptions>(configuration.GetSection(nameof(WorkerOptions)));
|
||||
services.AddSingleton<FinalizeDocumentJob>();
|
||||
services.AddScoped<ActionService>();
|
||||
services.AddSingleton<TempFiles>();
|
||||
services.AddScoped<PDFBurner>();
|
||||
services.AddScoped<PDFMerger>();
|
||||
services.AddScoped<ReportModel>();
|
||||
services.AddSingleton<State>();
|
||||
services.AddScoped<MSSQLServer>();
|
||||
|
||||
//TODO: Check lifetime of services. They might be singleton or scoped.
|
||||
services.AddTransient<GdViewer>();
|
||||
// Add LicenseManager
|
||||
services.AddTransient(provider =>
|
||||
{
|
||||
var options = provider.GetRequiredService<IOptions<WorkerOptions>>().Value;
|
||||
var licenseManager = new LicenseManager();
|
||||
licenseManager.RegisterKEY(options.GdPictureLicenseKey);
|
||||
return licenseManager;
|
||||
});
|
||||
services.AddTransient<AnnotationManager>();
|
||||
|
||||
return services;
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
using EnvelopeGenerator.ServiceHost.Extensions;
|
||||
|
||||
namespace EnvelopeGenerator.ServiceHost.Extensions;
|
||||
|
||||
public static class LoggerExtensions
|
||||
{
|
||||
public static void LogError(this ILogger logger, Exception exception)
|
||||
{
|
||||
logger.LogError(exception, "{message}", exception.Message);
|
||||
}
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
using DigitalData.Core.Abstraction.Application.Repository;
|
||||
using EnvelopeGenerator.Domain.Entities;
|
||||
|
||||
namespace EnvelopeGenerator.ServiceHost.Jobs;
|
||||
|
||||
/// <summary>
|
||||
/// migrate from EnvelopeGenerator.CommonServices.Services.ActionService
|
||||
/// </summary>
|
||||
[Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
|
||||
public class ActionService(IRepository<History> histRepo)
|
||||
{
|
||||
[Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
|
||||
public bool CreateReport(Envelope envelope, CancellationToken cancel = default)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
|
||||
public bool FinalizeEnvelope(Envelope envelope, CancellationToken cancel = default)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
|
||||
public bool CompleteEnvelope(Envelope envelope, CancellationToken cancel = default)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[Obsolete("This is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
|
||||
public bool CompleteEnvelope(Envelope envelope, Receiver receiver, CancellationToken cancel = default)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
@@ -1,430 +0,0 @@
|
||||
using System.Collections.Immutable;
|
||||
using System.Drawing;
|
||||
using EnvelopeGenerator.Domain.Entities;
|
||||
using EnvelopeGenerator.Infrastructure;
|
||||
using EnvelopeGenerator.PdfEditor;
|
||||
using EnvelopeGenerator.ServiceHost.Exceptions;
|
||||
using GdPicture14;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
|
||||
|
||||
//TODO: check if licence manager is needed as a dependency to
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="workerOptions"></param>
|
||||
/// <param name="context2"></param>
|
||||
/// <param name="logger2"></param>
|
||||
/// <param name="licenseManager"></param>
|
||||
/// <param name="annotationManager2"></param>
|
||||
public class PDFBurner(IOptions<WorkerOptions> workerOptions, EGDbContext context, ILogger<PDFBurner> logger, LicenseManager licenseManager, AnnotationManager manager)
|
||||
{
|
||||
private readonly WorkerOptions.PDFBurnerOptions _options = workerOptions.Value.PdfBurner;
|
||||
|
||||
public byte[] BurnAnnotsToPDF(byte[] sourceBuffer, List<string> instantJsonList, int envelopeId)
|
||||
{
|
||||
var envelope = context.Envelopes.FirstOrDefault(env => env.Id == envelopeId);
|
||||
if (envelope is null)
|
||||
{
|
||||
throw new BurnAnnotationException($"Envelope with Id {envelopeId} not found.");
|
||||
}
|
||||
|
||||
if (envelope.ReadOnly)
|
||||
{
|
||||
return sourceBuffer;
|
||||
}
|
||||
|
||||
var elements = context.DocumentReceiverElements
|
||||
.Where(sig => sig.Document.EnvelopeId == envelopeId)
|
||||
.Include(sig => sig.Annotations)
|
||||
.ToList();
|
||||
|
||||
return elements.Any()
|
||||
? BurnElementAnnotsToPDF(sourceBuffer, elements)
|
||||
: BurnInstantJSONAnnotsToPDF(sourceBuffer, instantJsonList);
|
||||
}
|
||||
|
||||
public byte[] BurnElementAnnotsToPDF(byte[] sourceBuffer, List<Signature> elements)
|
||||
{
|
||||
using (var doc = Pdf.FromMemory(sourceBuffer))
|
||||
{
|
||||
sourceBuffer = doc.Background(elements, 1.9500000000000002 * 0.93, 2.52 * 0.67).ExportStream().ToArray();
|
||||
|
||||
using var sourceStream = new MemoryStream(sourceBuffer);
|
||||
var result = manager.InitFromStream(sourceStream);
|
||||
if (result != GdPictureStatus.OK)
|
||||
{
|
||||
throw new BurnAnnotationException($"Could not open document for burning: [{result}]");
|
||||
}
|
||||
|
||||
var margin = 0.2;
|
||||
var inchFactor = 72d;
|
||||
|
||||
var keys = new[] { "position", "city", "date" };
|
||||
var unitYOffsets = 0.2;
|
||||
var yOffsetsOfFF = keys
|
||||
.Select((k, i) => new { Key = k, Value = unitYOffsets * i + 1 })
|
||||
.ToDictionary(x => x.Key, x => x.Value);
|
||||
|
||||
foreach (var element in elements)
|
||||
{
|
||||
var frameX = element.Left - 0.7 - margin;
|
||||
|
||||
var frame = element.Annotations.FirstOrDefault(a => a.Name == "frame");
|
||||
var frameY = element.Top - 0.5 - margin;
|
||||
var frameYShift = (frame?.Y ?? 0) - frameY * inchFactor;
|
||||
var frameXShift = (frame?.X ?? 0) - frameX * inchFactor;
|
||||
|
||||
foreach (var annot in element.Annotations)
|
||||
{
|
||||
var yOffsetOfFF = yOffsetsOfFF.TryGetValue(annot.Name, out var offset) ? offset : 0;
|
||||
var y = frameY + yOffsetOfFF;
|
||||
|
||||
if (annot.Type == AnnotationType.FormField)
|
||||
{
|
||||
AddFormFieldValue(annot.X / inchFactor, y, annot.Width / inchFactor, annot.Height / inchFactor, element.Page, annot.Value);
|
||||
}
|
||||
else if (annot.Type == AnnotationType.Image)
|
||||
{
|
||||
AddImageAnnotation(
|
||||
annot.X / inchFactor,
|
||||
annot.Name == "signature" ? (annot.Y - frameYShift) / inchFactor : y,
|
||||
annot.Width / inchFactor,
|
||||
annot.Height / inchFactor,
|
||||
element.Page,
|
||||
annot.Value);
|
||||
}
|
||||
else if (annot.Type == AnnotationType.Ink)
|
||||
{
|
||||
AddInkAnnotation(element.Page, annot.Value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
using var newStream = new MemoryStream();
|
||||
result = manager.SaveDocumentToPDF(newStream);
|
||||
if (result != GdPictureStatus.OK)
|
||||
{
|
||||
throw new BurnAnnotationException($"Could not save document to stream: [{result}]");
|
||||
}
|
||||
|
||||
manager.Close();
|
||||
|
||||
return newStream.ToArray();
|
||||
}
|
||||
}
|
||||
|
||||
public byte[] BurnInstantJSONAnnotsToPDF(byte[] sourceBuffer, List<string> instantJsonList)
|
||||
{
|
||||
using var sourceStream = new MemoryStream(sourceBuffer);
|
||||
var result = manager.InitFromStream(sourceStream);
|
||||
if (result != GdPictureStatus.OK)
|
||||
{
|
||||
throw new BurnAnnotationException($"Could not open document for burning: [{result}]");
|
||||
}
|
||||
|
||||
foreach (var json in instantJsonList)
|
||||
{
|
||||
try
|
||||
{
|
||||
AddInstantJSONAnnotationToPDF(json);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogWarning("Error in AddInstantJSONAnnotationToPDF - oJson: ");
|
||||
logger.LogWarning(json);
|
||||
throw new BurnAnnotationException("Adding Annotation failed", ex);
|
||||
}
|
||||
}
|
||||
|
||||
result = manager.BurnAnnotationsToPage(RemoveInitialAnnots: true, VectorMode: true);
|
||||
if (result != GdPictureStatus.OK)
|
||||
{
|
||||
throw new BurnAnnotationException($"Could not burn annotations to file: [{result}]");
|
||||
}
|
||||
|
||||
using var newStream = new MemoryStream();
|
||||
result = manager.SaveDocumentToPDF(newStream);
|
||||
if (result != GdPictureStatus.OK)
|
||||
{
|
||||
throw new BurnAnnotationException($"Could not save document to stream: [{result}]");
|
||||
}
|
||||
|
||||
manager.Close();
|
||||
|
||||
return newStream.ToArray();
|
||||
}
|
||||
|
||||
private void AddInstantJSONAnnotationToPDF(string instantJson)
|
||||
{
|
||||
var annotationData = JsonConvert.DeserializeObject<AnnotationData>(instantJson);
|
||||
if (annotationData is null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
annotationData.annotations.Reverse();
|
||||
|
||||
foreach (var annotation in annotationData.annotations)
|
||||
{
|
||||
logger.LogDebug("Adding AnnotationID: " + annotation.id);
|
||||
|
||||
switch (annotation.type)
|
||||
{
|
||||
case AnnotationType.Image:
|
||||
AddImageAnnotation(annotation, annotationData.attachments);
|
||||
break;
|
||||
case AnnotationType.Ink:
|
||||
AddInkAnnotation(annotation);
|
||||
break;
|
||||
case AnnotationType.Widget:
|
||||
var formFieldValue = annotationData.formFieldValues.FirstOrDefault(fv => fv.name == annotation.id);
|
||||
if (formFieldValue is not null && !_options.IgnoredLabels.Contains(formFieldValue.value))
|
||||
{
|
||||
AddFormFieldValue(annotation, formFieldValue);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void AddImageAnnotation(double x, double y, double width, double height, int page, string base64)
|
||||
{
|
||||
manager.SelectPage(page);
|
||||
manager.AddEmbeddedImageAnnotFromBase64(base64, (float) x, (float) y, (float) width, (float) height);
|
||||
}
|
||||
|
||||
private void AddImageAnnotation(Annotation annotation, Dictionary<string, Attachment> attachments)
|
||||
{
|
||||
var attachment = attachments.Where(a => a.Key == annotation.imageAttachmentId).SingleOrDefault();
|
||||
|
||||
var bounds = annotation.bbox.Select(ToInches).ToList();
|
||||
|
||||
var x = bounds[0];
|
||||
var y = bounds[1];
|
||||
var width = bounds[2];
|
||||
var height = bounds[3];
|
||||
|
||||
manager.SelectPage(annotation.pageIndex + 1);
|
||||
manager.AddEmbeddedImageAnnotFromBase64(attachment.Value.binary, (float) x, (float) y, (float) width, (float) height);
|
||||
}
|
||||
|
||||
private void AddInkAnnotation(int page, string value)
|
||||
{
|
||||
var ink = JsonConvert.DeserializeObject<Ink>(value);
|
||||
if (ink is null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var segments = ink.lines.points;
|
||||
var color = ColorTranslator.FromHtml(ink.strokeColor);
|
||||
manager.SelectPage(page);
|
||||
|
||||
foreach (var segment in segments)
|
||||
{
|
||||
var points = segment.Select(ToPointF).ToArray();
|
||||
manager.AddFreeHandAnnot(color, points);
|
||||
}
|
||||
}
|
||||
|
||||
private void AddInkAnnotation(Annotation annotation)
|
||||
{
|
||||
var segments = annotation.lines.points;
|
||||
var color = ColorTranslator.FromHtml(annotation.strokeColor);
|
||||
manager.SelectPage(annotation.pageIndex + 1);
|
||||
|
||||
foreach (var segment in segments)
|
||||
{
|
||||
var points = segment.Select(ToPointF).ToArray();
|
||||
manager.AddFreeHandAnnot(color, points);
|
||||
}
|
||||
}
|
||||
|
||||
private void AddFormFieldValue(double x, double y, double width, double height, int page, string value)
|
||||
{
|
||||
manager.SelectPage(page);
|
||||
|
||||
var annot = manager.AddTextAnnot((float) x, (float) y, (float) width, (float) height, value);
|
||||
annot.FontName = _options.FontName;
|
||||
annot.FontSize = _options.FontSize;
|
||||
annot.FontStyle = _options.FontStyle;
|
||||
manager.SaveAnnotationsToPage();
|
||||
}
|
||||
|
||||
private void AddFormFieldValue(Annotation annotation, FormFieldValue formFieldValue)
|
||||
{
|
||||
var ffIndex = EGName.Index[annotation.egName];
|
||||
|
||||
var bounds = annotation.bbox.Select(ToInches).ToList();
|
||||
|
||||
var x = bounds[0];
|
||||
var y = bounds[1] + _options.YOffset * ffIndex + _options.TopMargin;
|
||||
var width = bounds[2];
|
||||
var height = bounds[3];
|
||||
|
||||
manager.SelectPage(annotation.pageIndex + 1);
|
||||
var annot = manager.AddTextAnnot((float) x, (float) y, (float) width, (float) height, formFieldValue.value);
|
||||
annot.FontName = _options.FontName;
|
||||
annot.FontSize = _options.FontSize;
|
||||
annot.FontStyle = _options.FontStyle;
|
||||
manager.SaveAnnotationsToPage();
|
||||
}
|
||||
|
||||
private static PointF ToPointF(List<float> points)
|
||||
{
|
||||
var convertedPoints = points.Select(ToInches).ToList();
|
||||
return new PointF(convertedPoints[0], convertedPoints[1]);
|
||||
}
|
||||
|
||||
private static double ToInches(double value) => value / 72;
|
||||
|
||||
private static float ToInches(float value) => value / 72;
|
||||
|
||||
internal static class AnnotationType
|
||||
{
|
||||
public const string Image = "pspdfkit/image";
|
||||
public const string Ink = "pspdfkit/ink";
|
||||
public const string Widget = "pspdfkit/widget";
|
||||
public const string FormField = "pspdfkit/form-field-value";
|
||||
}
|
||||
|
||||
internal class AnnotationData
|
||||
{
|
||||
public List<Annotation> annotations { get; set; } = new();
|
||||
|
||||
public IEnumerable<List<Annotation>> AnnotationsByReceiver => annotations
|
||||
.Where(annot => annot.hasStructuredID)
|
||||
.GroupBy(a => a.receiverId)
|
||||
.Select(g => g.ToList());
|
||||
|
||||
public IEnumerable<List<Annotation>> UnstructuredAnnotations => annotations
|
||||
.Where(annot => !annot.hasStructuredID)
|
||||
.GroupBy(a => a.receiverId)
|
||||
.Select(g => g.ToList());
|
||||
|
||||
public Dictionary<string, Attachment> attachments { get; set; } = new();
|
||||
public List<FormFieldValue> formFieldValues { get; set; } = new();
|
||||
}
|
||||
|
||||
internal class Annotation
|
||||
{
|
||||
private string? _id;
|
||||
|
||||
public int envelopeId;
|
||||
public int receiverId;
|
||||
public int index;
|
||||
public string egName = EGName.NoName;
|
||||
public bool hasStructuredID;
|
||||
|
||||
public bool isLabel
|
||||
{
|
||||
get
|
||||
{
|
||||
if (string.IsNullOrEmpty(egName))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
var parts = egName.Split('_');
|
||||
return parts.Length > 1 && parts[1] == "label";
|
||||
}
|
||||
}
|
||||
|
||||
public string id
|
||||
{
|
||||
get => _id ?? string.Empty;
|
||||
set
|
||||
{
|
||||
_id = value;
|
||||
|
||||
if (string.IsNullOrWhiteSpace(_id))
|
||||
{
|
||||
throw new BurnAnnotationException("The identifier of annotation is null or empty.");
|
||||
}
|
||||
|
||||
var parts = value.Split('#');
|
||||
|
||||
if (parts.Length != 4)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!int.TryParse(parts[0], out envelopeId))
|
||||
{
|
||||
throw new BurnAnnotationException($"The envelope ID of annotation is not integer. Id: {_id}");
|
||||
}
|
||||
|
||||
if (!int.TryParse(parts[1], out receiverId))
|
||||
{
|
||||
throw new BurnAnnotationException($"The receiver ID of annotation is not integer. Id: {_id}");
|
||||
}
|
||||
|
||||
if (!int.TryParse(parts[2], out index))
|
||||
{
|
||||
throw new BurnAnnotationException($"The index of annotation is not integer. Id: {_id}");
|
||||
}
|
||||
|
||||
egName = parts[3];
|
||||
|
||||
hasStructuredID = true;
|
||||
}
|
||||
}
|
||||
|
||||
public List<double> bbox { get; set; } = new();
|
||||
|
||||
public string type { get; set; } = string.Empty;
|
||||
|
||||
public bool isSignature { get; set; }
|
||||
|
||||
public string imageAttachmentId { get; set; } = string.Empty;
|
||||
|
||||
public Lines lines { get; set; } = new();
|
||||
|
||||
public int pageIndex { get; set; }
|
||||
|
||||
public string strokeColor { get; set; } = string.Empty;
|
||||
}
|
||||
|
||||
internal class Ink
|
||||
{
|
||||
public Lines lines { get; set; } = new();
|
||||
|
||||
public string strokeColor { get; set; } = string.Empty;
|
||||
}
|
||||
|
||||
public class EGName
|
||||
{
|
||||
public static readonly string NoName = Guid.NewGuid().ToString();
|
||||
public static readonly string Seal = "signature";
|
||||
|
||||
public static readonly ImmutableDictionary<string, int> Index = new Dictionary<string, int>
|
||||
{
|
||||
{ NoName, 0 },
|
||||
{ Seal, 0 },
|
||||
{ "position", 1 },
|
||||
{ "city", 2 },
|
||||
{ "date", 3 }
|
||||
}.ToImmutableDictionary();
|
||||
}
|
||||
|
||||
internal class Lines
|
||||
{
|
||||
public List<List<List<float>>> points { get; set; } = new();
|
||||
}
|
||||
|
||||
internal class Attachment
|
||||
{
|
||||
public string binary { get; set; } = string.Empty;
|
||||
public string contentType { get; set; } = string.Empty;
|
||||
}
|
||||
|
||||
internal class FormFieldValue
|
||||
{
|
||||
public string name { get; set; } = string.Empty;
|
||||
public string value { get; set; } = string.Empty;
|
||||
}
|
||||
}
|
||||
@@ -1,61 +0,0 @@
|
||||
using EnvelopeGenerator.ServiceHost.Exceptions;
|
||||
using GdPicture14;
|
||||
using Microsoft.Extensions.Options;
|
||||
|
||||
namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
|
||||
|
||||
public class PDFMerger
|
||||
{
|
||||
private readonly AnnotationManager _manager;
|
||||
private readonly LicenseManager _licenseManager;
|
||||
|
||||
private const bool AllowRasterization = true;
|
||||
private const bool AllowVectorization = true;
|
||||
|
||||
private readonly PdfConversionConformance _pdfaConformanceLevel = PdfConversionConformance.PDF_A_1b;
|
||||
|
||||
public PDFMerger(LicenseManager licenseManager, AnnotationManager annotationManager)
|
||||
{
|
||||
_licenseManager = licenseManager;
|
||||
_manager = annotationManager;
|
||||
}
|
||||
|
||||
public byte[] MergeDocuments(byte[] document, byte[] report)
|
||||
{
|
||||
using var documentStream = new MemoryStream(document);
|
||||
using var reportStream = new MemoryStream(report);
|
||||
using var finalStream = new MemoryStream();
|
||||
using var documentPdf = new GdPicturePDF();
|
||||
using var reportPdf = new GdPicturePDF();
|
||||
|
||||
documentPdf.LoadFromStream(documentStream, true);
|
||||
var status = documentPdf.GetStat();
|
||||
if (status != GdPictureStatus.OK)
|
||||
{
|
||||
throw new MergeDocumentException($"Document could not be loaded: {status}");
|
||||
}
|
||||
|
||||
reportPdf.LoadFromStream(reportStream, true);
|
||||
status = reportPdf.GetStat();
|
||||
if (status != GdPictureStatus.OK)
|
||||
{
|
||||
throw new MergeDocumentException($"Report could not be loaded: {status}");
|
||||
}
|
||||
|
||||
var mergedPdf = documentPdf.Merge2Documents(documentPdf, reportPdf);
|
||||
status = mergedPdf.GetStat();
|
||||
if (status != GdPictureStatus.OK)
|
||||
{
|
||||
throw new MergeDocumentException($"Documents could not be merged: {status}");
|
||||
}
|
||||
|
||||
mergedPdf.ConvertToPDFA(finalStream, _pdfaConformanceLevel, AllowVectorization, AllowRasterization);
|
||||
status = documentPdf.GetStat();
|
||||
if (status != GdPictureStatus.OK)
|
||||
{
|
||||
throw new MergeDocumentException($"Document could not be converted to PDF/A: {status}");
|
||||
}
|
||||
|
||||
return finalStream.ToArray();
|
||||
}
|
||||
}
|
||||
@@ -1,102 +0,0 @@
|
||||
using System.Data;
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
using EnvelopeGenerator.Domain.Entities;
|
||||
using EnvelopeGenerator.ServiceHost.Exceptions;
|
||||
using EnvelopeGenerator.ServiceHost.Extensions;
|
||||
|
||||
namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
|
||||
|
||||
[Obsolete("Instead of ReportModel create and use EnvelopeReport mediator queries")]
|
||||
public class ReportCreator(ReportModel ReportModel, ILogger<ReportCreator> Logger)
|
||||
{
|
||||
[Obsolete("Solve the spaghetti...")]
|
||||
private Envelope? _envelope;
|
||||
|
||||
[Obsolete("Instead of ReportModel create and use EnvelopeReport mediator queries and solve this spaghetti...")]
|
||||
public byte[] CreateReport(Envelope envelope)
|
||||
{
|
||||
try
|
||||
{
|
||||
Logger.LogDebug("Loading report data..");
|
||||
var table = ReportModel.List(envelope.Id);
|
||||
var items = GetReportSource(table);
|
||||
|
||||
_envelope = envelope;
|
||||
|
||||
if (items.Count == 0)
|
||||
{
|
||||
throw new CreateReportException("No report data found!");
|
||||
}
|
||||
|
||||
Logger.LogDebug("Creating report with [{count}] items..", items.Count);
|
||||
var buffer = DoCreateReport(items);
|
||||
Logger.LogDebug("Report created!");
|
||||
|
||||
return buffer;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex);
|
||||
throw new CreateReportException("Could not prepare report data!", ex);
|
||||
}
|
||||
}
|
||||
|
||||
private List<ReportItem> GetReportSource(DataTable dataTable)
|
||||
{
|
||||
Logger.LogDebug("Preparing report data");
|
||||
return dataTable.Rows
|
||||
.Cast<DataRow>()
|
||||
.Select(ToReportItem)
|
||||
.OrderByDescending(r => r.ItemDate)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
private byte[] DoCreateReport(List<ReportItem> reportItems)
|
||||
{
|
||||
var items = reportItems.Select(MergeEnvelope).ToList();
|
||||
var source = new ReportSource { Items = items };
|
||||
var report = new rptEnvelopeHistory { DataSource = source, DataMember = "Items" };
|
||||
|
||||
Logger.LogDebug("Creating report in memory..");
|
||||
report.CreateDocument();
|
||||
|
||||
Logger.LogDebug("Exporting report to stream..");
|
||||
using var stream = new MemoryStream();
|
||||
report.ExportToPdf(stream);
|
||||
|
||||
Logger.LogDebug("Writing report to buffer..");
|
||||
return stream.ToArray();
|
||||
}
|
||||
|
||||
[Obsolete("Solve this spaghetti...")]
|
||||
private ReportItem MergeEnvelope(ReportItem item)
|
||||
{
|
||||
if (item.Envelope is null)
|
||||
{
|
||||
item.Envelope = _envelope;
|
||||
}
|
||||
|
||||
return item;
|
||||
}
|
||||
|
||||
private ReportItem ToReportItem(DataRow row)
|
||||
{
|
||||
try
|
||||
{
|
||||
return new ReportItem
|
||||
{
|
||||
EnvelopeId = row.ItemEx("ENVELOPE_ID", 0),
|
||||
EnvelopeTitle = row.ItemEx("HEAD_TITLE", string.Empty),
|
||||
EnvelopeSubject = row.ItemEx("HEAD_SUBJECT", string.Empty),
|
||||
ItemDate = row.ItemEx("POS_WHEN", DateTime.MinValue),
|
||||
ItemStatus = (EnvelopeStatus)row.ItemEx("POS_STATUS", 0),
|
||||
ItemUserReference = row.ItemEx("POS_WHO", string.Empty)
|
||||
};
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError(ex);
|
||||
throw new CreateReportException("Could not read data from database!", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
using EnvelopeGenerator.Domain.Entities;
|
||||
|
||||
namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
|
||||
|
||||
public class ReportItem
|
||||
{
|
||||
public Envelope? Envelope { get; set; }
|
||||
public int EnvelopeId { get; set; }
|
||||
public string EnvelopeTitle { get; set; } = string.Empty;
|
||||
public string EnvelopeSubject { get; set; } = string.Empty;
|
||||
|
||||
public EnvelopeStatus ItemStatus { get; set; }
|
||||
|
||||
public string ItemStatusTranslated => ItemStatus.ToString();
|
||||
|
||||
public string ItemUserReference { get; set; } = string.Empty;
|
||||
public DateTime ItemDate { get; set; }
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
|
||||
|
||||
public class ReportSource
|
||||
{
|
||||
public List<ReportItem> Items { get; set; } = new();
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
using System.IO;
|
||||
|
||||
namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
|
||||
|
||||
public class rptEnvelopeHistory
|
||||
{
|
||||
public object? DataSource { get; set; }
|
||||
public string? DataMember { get; set; }
|
||||
|
||||
public void CreateDocument()
|
||||
{
|
||||
}
|
||||
|
||||
public void ExportToPdf(Stream stream)
|
||||
{
|
||||
stream.Write(Array.Empty<byte>(), 0, 0);
|
||||
}
|
||||
}
|
||||
@@ -1,326 +0,0 @@
|
||||
using System.Data;
|
||||
using DigitalData.Modules.Database;
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
using EnvelopeGenerator.Domain.Entities;
|
||||
using EnvelopeGenerator.ServiceHost.Exceptions;
|
||||
using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
|
||||
using GdPicture14;
|
||||
using Microsoft.Data.SqlClient;
|
||||
using Microsoft.Extensions.Options;
|
||||
using EnvelopeGenerator.ServiceHost.Extensions;
|
||||
using MediatR;
|
||||
using EnvelopeGenerator.Application.Configuration.Queries;
|
||||
using EnvelopeGenerator.Application.Common.Dto;
|
||||
using EnvelopeGenerator.Application.Envelopes.Queries;
|
||||
using DigitalData.Core.Abstraction.Application.Repository;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace EnvelopeGenerator.ServiceHost.Jobs;
|
||||
|
||||
[Obsolete("ActionService is a placeholder service added by copilot. Migrate the actual logic from CommonServices.Jobs")]
|
||||
public class FinalizeDocumentJob(IOptions<WorkerOptions> options, IConfiguration config, ILogger<FinalizeDocumentJob> logger, TempFiles tempFiles, ActionService actionService, PDFBurner pdfBurner, PDFMerger pdfMerger, ReportCreator reportCreator, ReportModel _reportModel, MSSQLServer _database, GdViewer? _gdViewer, LicenseManager licenseManager, IMediator mediator, IRepository<Envelope> envRepo)
|
||||
{
|
||||
private readonly WorkerOptions _options = options.Value;
|
||||
|
||||
private ConfigDto? _config;
|
||||
|
||||
private const int CompleteWaitTime = 1;
|
||||
private string _parentFolderUid = string.Empty;
|
||||
|
||||
private sealed class EnvelopeData
|
||||
{
|
||||
public int EnvelopeId { get; set; }
|
||||
public string EnvelopeUuid { get; set; } = string.Empty;
|
||||
public string DocumentPath { get; set; } = string.Empty;
|
||||
public List<string> AnnotationData { get; set; } = new();
|
||||
public byte[]? DocAsByte { get; set; }
|
||||
}
|
||||
|
||||
public async Task ExecuteAsync(CancellationToken cancel = default)
|
||||
{
|
||||
var gdPictureKey = _options.GdPictureLicenseKey;
|
||||
tempFiles.Create();
|
||||
var jobId = typeof(FinalizeDocumentJob).FullName;
|
||||
logger.LogDebug("Starting job {jobId}", jobId);
|
||||
|
||||
_config = await mediator.Send(new ReadDefaultConfigQuery(), cancel);
|
||||
|
||||
var envelopes = await envRepo
|
||||
.Where(e => e.Status == EnvelopeStatus.EnvelopeCompletelySigned
|
||||
&& e.ChangedWhen.HasValue
|
||||
&& EF.Functions.DateDiffMinute(e.ChangedWhen.Value, DateTime.Now) >= CompleteWaitTime)
|
||||
.OrderBy(e => e.Id)
|
||||
.ToListAsync(cancel);
|
||||
|
||||
if (envelopes.Count > 0)
|
||||
logger.LogInformation("Found [{count}] completed envelopes.", envelopes.Count);
|
||||
|
||||
var total = envelopes.Count;
|
||||
var current = 1;
|
||||
|
||||
foreach (var envelope in envelopes)
|
||||
{
|
||||
try
|
||||
{
|
||||
var envelopeData = GetEnvelopeData(envelope.Id);
|
||||
|
||||
if (envelopeData is null)
|
||||
{
|
||||
logger.LogWarning("EnvelopeData could not be loaded for Id [{id}]!", envelope.Id);
|
||||
throw new ArgumentNullException(nameof(EnvelopeData));
|
||||
}
|
||||
|
||||
logger.LogDebug("Burning Annotations to pdf ...");
|
||||
var burnedDocument = BurnAnnotationsToPdf(envelopeData);
|
||||
if (burnedDocument is null)
|
||||
{
|
||||
logger.LogWarning("Document could not be finalized!");
|
||||
throw new ApplicationException("Document could not be finalized");
|
||||
}
|
||||
|
||||
if (actionService?.CreateReport(envelope) == false)
|
||||
{
|
||||
logger.LogWarning("Document Report could not be created!");
|
||||
throw new ApplicationException("Document Report could not be created");
|
||||
}
|
||||
|
||||
logger.LogDebug("Creating report..");
|
||||
var report = reportCreator!.CreateReport(envelope);
|
||||
logger.LogDebug("Report created!");
|
||||
|
||||
logger.LogDebug("Merging documents ...");
|
||||
var mergedDocument = pdfMerger!.MergeDocuments(burnedDocument, report);
|
||||
logger.LogDebug("Documents merged!");
|
||||
|
||||
var outputDirectoryPath = Path.Combine(_config.ExportPath, _parentFolderUid);
|
||||
logger.LogDebug("oOutputDirectoryPath is {outputDirectoryPath}", outputDirectoryPath);
|
||||
if (!Directory.Exists(outputDirectoryPath))
|
||||
{
|
||||
logger.LogDebug("Directory not existing. Creating ... ");
|
||||
Directory.CreateDirectory(outputDirectoryPath);
|
||||
}
|
||||
|
||||
var outputFilePath = Path.Combine(outputDirectoryPath, $"{envelope.Uuid}.pdf");
|
||||
logger.LogDebug("Writing finalized Pdf to disk..");
|
||||
logger.LogInformation("Output path is [{outputFilePath}]", outputFilePath);
|
||||
|
||||
try
|
||||
{
|
||||
File.WriteAllBytes(outputFilePath, mergedDocument);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogWarning("Could not export final document to disk!");
|
||||
throw new ExportDocumentException("Could not export final document to disk!", ex);
|
||||
}
|
||||
|
||||
logger.LogDebug("Writing EB-bytes to database...");
|
||||
UpdateFileDb(outputFilePath, envelope.Id);
|
||||
|
||||
if (!SendFinalEmails(envelope))
|
||||
{
|
||||
throw new ApplicationException("Final emails could not be sent!");
|
||||
}
|
||||
|
||||
logger.LogInformation("Report-mails successfully sent!");
|
||||
|
||||
logger.LogDebug("Setting envelope status..");
|
||||
if (actionService?.FinalizeEnvelope(envelope) == false)
|
||||
{
|
||||
logger.LogWarning("Envelope could not be finalized!");
|
||||
throw new ApplicationException("Envelope could not be finalized");
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError(ex);
|
||||
logger.LogWarning(ex, "Unhandled exception while working envelope [{id}]", envelope.Id);
|
||||
}
|
||||
|
||||
current += 1;
|
||||
logger.LogInformation("Envelope [{id}] finalized!", envelope.Id);
|
||||
}
|
||||
|
||||
logger.LogDebug("Completed job {jobId} successfully!", jobId);
|
||||
}
|
||||
|
||||
private void UpdateFileDb(string filePath, long envelopeId)
|
||||
{
|
||||
try
|
||||
{
|
||||
var imageData = ReadFile(filePath);
|
||||
if (imageData is null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var query = $"UPDATE TBSIG_ENVELOPE SET DOC_RESULT = @ImageData WHERE GUID = {envelopeId}";
|
||||
using var command = new SqlCommand(query, _database!.GetConnection);
|
||||
command.Parameters.Add(new SqlParameter("@ImageData", imageData));
|
||||
command.ExecuteNonQuery();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError(ex);
|
||||
}
|
||||
}
|
||||
|
||||
private static byte[]? ReadFile(string path)
|
||||
{
|
||||
var fileInfo = new FileInfo(path);
|
||||
var numBytes = fileInfo.Length;
|
||||
using var stream = new FileStream(path, FileMode.Open, FileAccess.Read);
|
||||
using var reader = new BinaryReader(stream);
|
||||
return reader.ReadBytes((int)numBytes);
|
||||
}
|
||||
|
||||
private bool SendFinalEmails(Envelope envelope)
|
||||
{
|
||||
var mailToCreator = (FinalEmailType)(envelope.FinalEmailToCreator ?? 0);
|
||||
var mailToReceivers = (FinalEmailType)(envelope.FinalEmailToReceivers ?? 0);
|
||||
|
||||
if (mailToCreator != FinalEmailType.No)
|
||||
{
|
||||
logger?.LogDebug("Sending email to creator ...");
|
||||
SendFinalEmailToCreator(envelope, mailToCreator);
|
||||
}
|
||||
else
|
||||
{
|
||||
logger?.LogWarning("No SendFinalEmailToCreator - oMailToCreator [{0}] <> [{1}] ", mailToCreator, FinalEmailType.No);
|
||||
}
|
||||
|
||||
if (mailToReceivers != FinalEmailType.No)
|
||||
{
|
||||
logger?.LogDebug("Sending emails to receivers..");
|
||||
SendFinalEmailToReceivers(envelope, mailToReceivers);
|
||||
}
|
||||
else
|
||||
{
|
||||
logger?.LogWarning("No SendFinalEmailToReceivers - oMailToCreator [{0}] <> [{1}] ", mailToReceivers, FinalEmailType.No);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private bool SendFinalEmailToCreator(Envelope envelope, FinalEmailType mailToCreator)
|
||||
{
|
||||
var includeAttachment = SendFinalEmailWithAttachment(mailToCreator);
|
||||
logger?.LogDebug("Attachment included: [{0}]", includeAttachment);
|
||||
|
||||
if (actionService?.CompleteEnvelope(envelope) == false)
|
||||
{
|
||||
logger?.LogError(new Exception("CompleteEnvelope failed"), "Envelope could not be completed for receiver [{0}]", envelope.User?.Email);
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private bool SendFinalEmailToReceivers(Envelope envelope, FinalEmailType mailToReceivers)
|
||||
{
|
||||
var includeAttachment = SendFinalEmailWithAttachment(mailToReceivers);
|
||||
logger?.LogDebug("Attachment included: [{0}]", includeAttachment);
|
||||
|
||||
foreach (var receiver in envelope.EnvelopeReceivers ?? Enumerable.Empty<EnvelopeReceiver>())
|
||||
{
|
||||
if (actionService?.CompleteEnvelope(envelope, receiver.Receiver) == false)
|
||||
{
|
||||
logger?.LogError(new Exception("CompleteEnvelope failed"), "Envelope could not be completed for receiver [{0}]", receiver.Receiver?.EmailAddress);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private static bool SendFinalEmailWithAttachment(FinalEmailType type)
|
||||
{
|
||||
return type == FinalEmailType.YesWithAttachment;
|
||||
}
|
||||
|
||||
private byte[] BurnAnnotationsToPdf(EnvelopeData envelopeData)
|
||||
{
|
||||
var envelopeId = envelopeData.EnvelopeId;
|
||||
|
||||
logger?.LogInformation("Burning [{0}] signatures", envelopeData.AnnotationData.Count);
|
||||
var annotations = envelopeData.AnnotationData;
|
||||
var inputPath = string.Empty;
|
||||
if (envelopeData.DocAsByte is null)
|
||||
{
|
||||
inputPath = envelopeData.DocumentPath;
|
||||
logger?.LogInformation("Input path: [{0}]", inputPath);
|
||||
}
|
||||
else
|
||||
{
|
||||
logger?.LogDebug("we got bytes..");
|
||||
inputPath = _config!.DocumentPath;
|
||||
logger?.LogDebug("oInputPath: {0}", _config.DocumentPath);
|
||||
}
|
||||
|
||||
if (envelopeData.DocAsByte is null)
|
||||
{
|
||||
var directorySource = Path.GetDirectoryName(inputPath) ?? string.Empty;
|
||||
var split = directorySource.Split('\\');
|
||||
_parentFolderUid = split[^1];
|
||||
}
|
||||
else
|
||||
{
|
||||
_parentFolderUid = envelopeData.EnvelopeUuid;
|
||||
}
|
||||
|
||||
logger?.LogInformation("ParentFolderUID: [{0}]", _parentFolderUid);
|
||||
byte[] inputDocumentBuffer;
|
||||
if (envelopeData.DocAsByte is not null)
|
||||
{
|
||||
inputDocumentBuffer = envelopeData.DocAsByte;
|
||||
}
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
inputDocumentBuffer = File.ReadAllBytes(inputPath);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
throw new BurnAnnotationException("Source document could not be read from disk!", ex);
|
||||
}
|
||||
}
|
||||
|
||||
return pdfBurner!.BurnAnnotsToPDF(inputDocumentBuffer, annotations, envelopeId);
|
||||
}
|
||||
|
||||
private EnvelopeData? GetEnvelopeData(int envelopeId)
|
||||
{
|
||||
var sql = $"SELECT T.GUID, T.ENVELOPE_UUID, T.ENVELOPE_TYPE, T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T\n JOIN TBSIG_ENVELOPE_DOCUMENT T2 ON T.GUID = T2.ENVELOPE_ID\n WHERE T.GUID = {envelopeId}";
|
||||
var table = _database!.GetDatatable(sql);
|
||||
var row = table.Rows.Cast<DataRow>().SingleOrDefault();
|
||||
if (row is null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var annotationData = GetAnnotationData(envelopeId);
|
||||
var data = new EnvelopeData
|
||||
{
|
||||
EnvelopeId = envelopeId,
|
||||
DocumentPath = row.ItemEx("FILEPATH", string.Empty),
|
||||
AnnotationData = annotationData,
|
||||
DocAsByte = row.Field<byte[]?>("BYTE_DATA"),
|
||||
EnvelopeUuid = row.ItemEx("ENVELOPE_UUID", string.Empty)
|
||||
};
|
||||
|
||||
logger?.LogDebug("Document path: [{0}]", data.DocumentPath);
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
private List<string> GetAnnotationData(int envelopeId)
|
||||
{
|
||||
var sql = $"SELECT VALUE FROM TBSIG_DOCUMENT_STATUS WHERE ENVELOPE_ID = {envelopeId}";
|
||||
var table = _database!.GetDatatable(sql);
|
||||
|
||||
return table.Rows.Cast<DataRow>()
|
||||
.Select(r => r.ItemEx("VALUE", string.Empty))
|
||||
.ToList();
|
||||
}
|
||||
}
|
||||
@@ -1,60 +0,0 @@
|
||||
using System.Data;
|
||||
using Microsoft.Data.SqlClient;
|
||||
|
||||
namespace DigitalData.Modules.Database;
|
||||
|
||||
public class MSSQLServer(IConfiguration configuration)
|
||||
{
|
||||
private readonly string _connectionString = configuration.GetConnectionString("Default")
|
||||
?? throw new InvalidOperationException("Connection string 'Default' not found.");
|
||||
|
||||
public static string DecryptConnectionString(string connectionString) => connectionString;
|
||||
|
||||
public SqlConnection GetConnection
|
||||
{
|
||||
get
|
||||
{
|
||||
var connection = new SqlConnection(_connectionString);
|
||||
if (connection.State != ConnectionState.Open)
|
||||
{
|
||||
connection.Open();
|
||||
}
|
||||
|
||||
return connection;
|
||||
}
|
||||
}
|
||||
|
||||
public DataTable GetDatatable(string sql)
|
||||
{
|
||||
using var connection = new SqlConnection(_connectionString);
|
||||
using var command = new SqlCommand(sql, connection);
|
||||
using var adapter = new SqlDataAdapter(command);
|
||||
var table = new DataTable();
|
||||
adapter.Fill(table);
|
||||
return table;
|
||||
}
|
||||
|
||||
public object? GetScalarValue(string sql)
|
||||
{
|
||||
using var connection = new SqlConnection(_connectionString);
|
||||
using var command = new SqlCommand(sql, connection);
|
||||
connection.Open();
|
||||
return command.ExecuteScalar();
|
||||
}
|
||||
|
||||
public bool ExecuteNonQuery(string sql)
|
||||
{
|
||||
using var connection = new SqlConnection(_connectionString);
|
||||
using var command = new SqlCommand(sql, connection);
|
||||
connection.Open();
|
||||
return command.ExecuteNonQuery() > 0;
|
||||
}
|
||||
|
||||
public bool ExecuteNonQuery(SqlCommand command)
|
||||
{
|
||||
using var connection = new SqlConnection(_connectionString);
|
||||
command.Connection = connection;
|
||||
connection.Open();
|
||||
return command.ExecuteNonQuery() > 0;
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
using DigitalData.Modules.Database;
|
||||
using System.Data;
|
||||
|
||||
namespace EnvelopeGenerator.ServiceHost.Jobs;
|
||||
|
||||
[Obsolete("Create and use EnvelopeReport mediator queries")]
|
||||
public class ReportModel(MSSQLServer Database)
|
||||
{
|
||||
[Obsolete("Create and use EnvelopeReport mediator queries")]
|
||||
public DataTable List(int envelopeId)
|
||||
{
|
||||
var sql = $"SELECT * FROM VWSIG_ENVELOPE_REPORT WHERE ENVELOPE_ID = {envelopeId}";
|
||||
return Database.GetDatatable(sql);
|
||||
}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
using DigitalData.Modules.Database;
|
||||
using EnvelopeGenerator.Domain.Entities;
|
||||
|
||||
namespace EnvelopeGenerator.ServiceHost.Jobs;
|
||||
|
||||
[Obsolete("Use DbContext")]
|
||||
public class State
|
||||
{
|
||||
public int UserId { get; set; }
|
||||
public FormUser? User { get; set; }
|
||||
public Config? Config { get; set; }
|
||||
public MSSQLServer? Database { get; set; }
|
||||
}
|
||||
@@ -1,84 +0,0 @@
|
||||
using EnvelopeGenerator.ServiceHost.Extensions;
|
||||
|
||||
namespace EnvelopeGenerator.ServiceHost.Jobs;
|
||||
|
||||
[Obsolete("Use memory cache instead of temp files.")]
|
||||
public class TempFiles
|
||||
{
|
||||
|
||||
[Obsolete("Use memory cache instead of temp files.")]
|
||||
public string TempPath { get; }
|
||||
|
||||
private readonly ILogger<TempFiles> _logger;
|
||||
|
||||
|
||||
[Obsolete("Use memory cache instead of temp files.")]
|
||||
public TempFiles(ILogger<TempFiles> logger)
|
||||
{
|
||||
_logger = logger;
|
||||
var tempDirectoryPath = Path.GetTempPath();
|
||||
TempPath = Path.Combine(tempDirectoryPath, "EnvelopeGenerator");
|
||||
}
|
||||
|
||||
|
||||
[Obsolete("Use memory cache instead of temp files.")]
|
||||
public bool Create()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!Directory.Exists(TempPath))
|
||||
{
|
||||
Directory.CreateDirectory(TempPath);
|
||||
}
|
||||
else
|
||||
{
|
||||
CleanUpFiles();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
[Obsolete("Use memory cache instead of temp files.")]
|
||||
private bool CleanUpFiles()
|
||||
{
|
||||
try
|
||||
{
|
||||
foreach (var fileItem in Directory.GetFiles(TempPath))
|
||||
{
|
||||
_logger.LogDebug("Deleting tempPath-file: {fileItem} ...", fileItem);
|
||||
File.Delete(fileItem);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
[Obsolete("Use memory cache instead of temp files.")]
|
||||
public bool CleanUp()
|
||||
{
|
||||
try
|
||||
{
|
||||
_logger.LogDebug("Deleting tempPath-Data: {TempPath} ...", TempPath);
|
||||
Directory.Delete(TempPath, true);
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
using EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument;
|
||||
using System.Drawing;
|
||||
|
||||
namespace EnvelopeGenerator.ServiceHost.Jobs;
|
||||
|
||||
public class WorkerOptions
|
||||
{
|
||||
public string GdPictureLicenseKey { get; set; } = null!;
|
||||
|
||||
[Obsolete("Use ILogger.")]
|
||||
public bool Debug { get; set; }
|
||||
|
||||
public PDFBurnerOptions PdfBurner { get; set; } = new();
|
||||
|
||||
public record PDFBurnerOptions
|
||||
{
|
||||
public List<string> IgnoredLabels { get; set; } = ["Date", "Datum", "ZIP", "PLZ", "Place", "Ort", "Position", "Stellung"];
|
||||
|
||||
public double TopMargin { get; set; } = 0.1;
|
||||
|
||||
public double YOffset { get; set; } = -0.3;
|
||||
|
||||
public string FontName { get; set; } = "Arial";
|
||||
|
||||
public int FontSize { get; set; } = 8;
|
||||
|
||||
public FontStyle FontStyle { get; set; } = FontStyle.Italic;
|
||||
}
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
using EnvelopeGenerator.ServiceHost;
|
||||
using EnvelopeGenerator.ServiceHost.Extensions;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
// Add services to the container.
|
||||
|
||||
builder.Services.AddControllers();
|
||||
builder.Services.AddFinalizeDocumentJob(builder.Configuration);
|
||||
builder.Services.AddHostedService<Worker>();
|
||||
|
||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen();
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
// Configure the HTTP request pipeline.
|
||||
if (app.Environment.IsDevelopment())
|
||||
{
|
||||
app.UseSwagger();
|
||||
app.UseSwaggerUI();
|
||||
}
|
||||
|
||||
app.UseHttpsRedirection();
|
||||
|
||||
app.UseAuthorization();
|
||||
|
||||
app.MapControllers();
|
||||
|
||||
app.Run();
|
||||
@@ -1,41 +0,0 @@
|
||||
{
|
||||
"$schema": "http://json.schemastore.org/launchsettings.json",
|
||||
"iisSettings": {
|
||||
"windowsAuthentication": false,
|
||||
"anonymousAuthentication": true,
|
||||
"iisExpress": {
|
||||
"applicationUrl": "http://localhost:27420",
|
||||
"sslPort": 44372
|
||||
}
|
||||
},
|
||||
"profiles": {
|
||||
"http": {
|
||||
"commandName": "Project",
|
||||
"dotnetRunMessages": true,
|
||||
"launchBrowser": true,
|
||||
"launchUrl": "swagger",
|
||||
"applicationUrl": "http://localhost:5088",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"https": {
|
||||
"commandName": "Project",
|
||||
"dotnetRunMessages": true,
|
||||
"launchBrowser": true,
|
||||
"launchUrl": "swagger",
|
||||
"applicationUrl": "https://localhost:7234;http://localhost:5088",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"IIS Express": {
|
||||
"commandName": "IISExpress",
|
||||
"launchBrowser": true,
|
||||
"launchUrl": "swagger",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
using EnvelopeGenerator.ServiceHost.Jobs;
|
||||
|
||||
namespace EnvelopeGenerator.ServiceHost;
|
||||
|
||||
public class Worker : BackgroundService
|
||||
{
|
||||
private readonly ILogger<Worker> _logger;
|
||||
private readonly int _delayMilliseconds;
|
||||
private readonly FinalizeDocumentJob _finalizeDocumentJob;
|
||||
|
||||
public Worker(ILogger<Worker> logger, IConfiguration configuration, FinalizeDocumentJob finalizeDocumentJob)
|
||||
{
|
||||
_logger = logger;
|
||||
_delayMilliseconds = Math.Max(1, configuration.GetValue("Worker:DelayMilliseconds", 1000));
|
||||
_finalizeDocumentJob = finalizeDocumentJob;
|
||||
}
|
||||
|
||||
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
||||
{
|
||||
while (!stoppingToken.IsCancellationRequested)
|
||||
{
|
||||
if (_logger.IsEnabled(LogLevel.Information))
|
||||
{
|
||||
_logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
|
||||
}
|
||||
|
||||
await _finalizeDocumentJob.ExecuteAsync(stoppingToken);
|
||||
await Task.Delay(_delayMilliseconds, stoppingToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -215,7 +215,7 @@ public static class Extensions
|
||||
Title = faker.Lorem.Paragraph(faker.Random.Number(1, 2)),
|
||||
Message = faker.Lorem.Paragraph(faker.Random.Number(2, 5)),
|
||||
TfaEnabled = tfaEnabled,
|
||||
AddedWhen = DateTime.UtcNow,
|
||||
AddedWhen = DateTime.Now,
|
||||
CertificationType = (int)CertificationType.AdvancedElectronicSignature,
|
||||
UseAccessCode = false,
|
||||
ContractType = (int)ContractType.Contract,
|
||||
@@ -273,9 +273,9 @@ public static class Extensions
|
||||
EnvelopeId = envelopeId,
|
||||
ReceiverId = receiverId,
|
||||
Status = ReceiverStatus.Unsigned,
|
||||
AddedWhen = DateTime.UtcNow,
|
||||
AddedWhen = DateTime.Now,
|
||||
AccessCode = faker.Random.Number(1000, 9999).ToString(),
|
||||
ChangedWhen = DateTime.UtcNow,
|
||||
ChangedWhen = DateTime.Now,
|
||||
CompanyName = faker.Company.CompanyName(),
|
||||
JobTitle = faker.Name.JobTitle(),
|
||||
Name = faker.Name.FullName(),
|
||||
|
||||
17
EnvelopeGenerator.Tests/Domain/ConstantsTests.cs
Normal file
17
EnvelopeGenerator.Tests/Domain/ConstantsTests.cs
Normal file
@@ -0,0 +1,17 @@
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace EnvelopeGenerator.Tests.Domain;
|
||||
|
||||
public class ConstantsTests
|
||||
{
|
||||
[TestCase(EnvelopeSigningType.ReadAndSign, EnvelopeSigningType.ReadAndSign)]
|
||||
[TestCase(EnvelopeSigningType.WetSignature, EnvelopeSigningType.WetSignature)]
|
||||
[TestCase((EnvelopeSigningType)5, EnvelopeSigningType.WetSignature)]
|
||||
public void Normalize_ReturnsExpectedValue(EnvelopeSigningType input, EnvelopeSigningType expected)
|
||||
{
|
||||
var normalized = input.Normalize();
|
||||
|
||||
Assert.That(normalized, Is.EqualTo(expected));
|
||||
}
|
||||
}
|
||||
@@ -53,8 +53,4 @@
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Domain\" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -6,6 +6,7 @@ using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
|
||||
using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
|
||||
using EnvelopeGenerator.Application.Histories.Queries;
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
using EnvelopeGenerator.Domain.Interfaces;
|
||||
using EnvelopeGenerator.Web.Extensions;
|
||||
using MediatR;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
@@ -65,7 +66,7 @@ public class AnnotationController : ControllerBase
|
||||
// Again check if receiver has already signed
|
||||
if (await _mediator.IsSignedAsync(uuid, signature, cancel))
|
||||
return Problem(statusCode: 409);
|
||||
else if (await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
|
||||
else if (er.Envelope.IsReadAndSign() && await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
|
||||
return Problem(statusCode: 423);
|
||||
|
||||
var docSignedNotification = await _mediator
|
||||
@@ -80,6 +81,7 @@ public class AnnotationController : ControllerBase
|
||||
return Ok();
|
||||
}
|
||||
|
||||
//TODO: add logic to check if it is already rejected or signed
|
||||
[Authorize(Roles = Role.ReceiverFull)]
|
||||
[HttpPost("reject")]
|
||||
[Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
|
||||
@@ -100,7 +102,7 @@ public class AnnotationController : ControllerBase
|
||||
if (envRcvRes.IsFailed)
|
||||
{
|
||||
_logger.LogNotice(envRcvRes.Notices);
|
||||
return Unauthorized("you are not authirized");
|
||||
return Unauthorized();
|
||||
}
|
||||
|
||||
var histRes = await _histService.RecordAsync(envRcvRes.Data.EnvelopeId, userReference: mail, EnvelopeStatus.DocumentRejected, comment: reason);
|
||||
|
||||
@@ -7,6 +7,7 @@ using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
||||
using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
|
||||
using EnvelopeGenerator.Application.Resources;
|
||||
using EnvelopeGenerator.Domain.Constants;
|
||||
using EnvelopeGenerator.Domain.Interfaces;
|
||||
using EnvelopeGenerator.PdfEditor;
|
||||
using EnvelopeGenerator.Web.Extensions;
|
||||
using EnvelopeGenerator.Web.Models;
|
||||
@@ -78,13 +79,18 @@ public class EnvelopeController : ViewControllerBase
|
||||
return this.ViewEnvelopeNotFound();
|
||||
|
||||
#region Rejected or Signed
|
||||
//check rejection
|
||||
var rejRcvrs = await _historyService.ReadRejectingReceivers(er.Envelope!.Id);
|
||||
if (rejRcvrs.Any())
|
||||
{
|
||||
await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
|
||||
ViewBag.IsExt = !rejRcvrs.Contains(er.Receiver); //external if the current user is not rejected
|
||||
return View("EnvelopeRejected", er);
|
||||
var isExt = !rejRcvrs.Where(rcv => rcv.Id == er.Receiver!.Id).Any(); //external if the current user is not rejected
|
||||
|
||||
if (er.Envelope.IsReadAndSign() || !isExt)
|
||||
{
|
||||
//TODO: Normally assigned to the isExt variable. However, since the relevant keys are not defined in the resx files, it was assigned false. Fix this.
|
||||
ViewBag.IsExt = true;
|
||||
return View("EnvelopeRejected", er);
|
||||
}
|
||||
}
|
||||
|
||||
//check if it has already signed
|
||||
@@ -162,13 +168,19 @@ public class EnvelopeController : ViewControllerBase
|
||||
}
|
||||
var er_secret = er_secret_res.Data;
|
||||
|
||||
//check rejection
|
||||
var rejRcvrs = await _historyService.ReadRejectingReceivers(er_secret.Envelope!.Id);
|
||||
if (rejRcvrs.Any())
|
||||
{
|
||||
await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
|
||||
ViewBag.IsExt = !rejRcvrs.Contains(er_secret.Receiver); //external if the current user is not rejected
|
||||
return View("EnvelopeRejected", er_secret);
|
||||
var isExt = !rejRcvrs.Where(rcv => rcv.Id == er_secret.Receiver!.Id).Any(); //external if the current user is not rejected
|
||||
|
||||
//check rejection if the envelope is read-and-sign or non-external (internal)
|
||||
if (er_secret.Envelope.IsReadAndSign() || !isExt)
|
||||
{
|
||||
//TODO: Normally assigned to the isExt variable. However, since the relevant keys are not defined in the resx files, it was assigned false. Fix this.
|
||||
ViewBag.IsExt = true;
|
||||
return View("EnvelopeRejected", er_secret);
|
||||
}
|
||||
}
|
||||
|
||||
// show envelope if already logged in
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
|
||||
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<PackageId>EnvelopeGenerator.Web</PackageId>
|
||||
@@ -12,9 +12,9 @@
|
||||
<PackageTags>digital data envelope generator web</PackageTags>
|
||||
<Description>EnvelopeGenerator.Web is an ASP.NET MVC application developed to manage signing processes. It uses Entity Framework Core (EF Core) for database operations. The user interface for signing processes is developed with Razor View Engine (.cshtml files) and JavaScript under wwwroot, integrated with PSPDFKit. This integration allows users to view and sign documents seamlessly.</Description>
|
||||
<ApplicationIcon>Assets\icon.ico</ApplicationIcon>
|
||||
<Version>3.12.0</Version> <!-- NuGet package version -->
|
||||
<AssemblyVersion>3.12.0.0</AssemblyVersion> <!-- Assembly version for API compatibility -->
|
||||
<FileVersion>3.12.0.0</FileVersion> <!-- Windows file version -->
|
||||
<Version>3.12.3</Version> <!-- NuGet package version -->
|
||||
<AssemblyVersion>3.12.3.0</AssemblyVersion> <!-- Assembly version for API compatibility -->
|
||||
<FileVersion>3.12.3.0</FileVersion> <!-- Windows file version -->
|
||||
<Copyright>Copyright © 2025 Digital Data GmbH. All rights reserved.</Copyright>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -626,7 +626,6 @@
|
||||
<None Include="wwwroot\lib\bootstrap-icons\icons\clipboard2-pulse.svg" />
|
||||
<None Include="wwwroot\lib\bootstrap-icons\icons\clipboard2-x-fill.svg" />
|
||||
<None Include="wwwroot\lib\bootstrap-icons\icons\clipboard2-x.svg" />
|
||||
<None Include="wwwroot\lib\bootstrap-icons\icons\clipboard2.svg" />
|
||||
<None Include="wwwroot\lib\bootstrap-icons\icons\clock-fill.svg" />
|
||||
<None Include="wwwroot\lib\bootstrap-icons\icons\clock-history.svg" />
|
||||
<None Include="wwwroot\lib\bootstrap-icons\icons\clock.svg" />
|
||||
@@ -2093,6 +2092,31 @@
|
||||
<None Include="wwwroot\lib\bootstrap-icons\icons\zoom-out.svg" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
|
||||
<PackageReference Include="BuildBundlerMinifier2022" Version="2.9.11" />
|
||||
<PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
|
||||
<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
|
||||
<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
|
||||
<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.20" />
|
||||
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="NLog" Version="5.2.8" />
|
||||
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.4" />
|
||||
<PackageReference Include="Quartz" Version="3.7.0" />
|
||||
<PackageReference Include="Quartz.AspNetCore" Version="3.7.0" />
|
||||
<PackageReference Include="Quartz.Plugins" Version="3.7.0" />
|
||||
<PackageReference Include="Quartz.Serialization.Json" Version="3.7.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
|
||||
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
|
||||
<PackageReference Include="System.DirectoryServices" Version="7.0.1" />
|
||||
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
|
||||
<PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.1" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
|
||||
<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
|
||||
<PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
|
||||
<PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
|
||||
|
||||
@@ -35,7 +35,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Tests", "
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.API", "EnvelopeGenerator.API\EnvelopeGenerator.API.csproj", "{EC768913-6270-14F4-1DD3-69C87A659462}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.ServiceHost", "EnvelopeGenerator.ServiceHost\EnvelopeGenerator.ServiceHost.csproj", "{5DD82482-E560-405F-BF55-04D647B05BEF}"
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "receiverUI", "receiverUI", "{73D8F466-90AA-4F95-9BD1-7CDBB8565162}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.ReceiverUI.Web", "receiverUI\EnvelopeGenerator.ReceiverUI.Web\EnvelopeGenerator.ReceiverUI.Web\EnvelopeGenerator.ReceiverUI.Web.csproj", "{AAD4720E-D175-44B5-B431-DB0BA636CD20}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.ReceiverUI.Web.Client", "receiverUI\EnvelopeGenerator.ReceiverUI.Web\EnvelopeGenerator.ReceiverUI.Web.Client\EnvelopeGenerator.ReceiverUI.Web.Client.csproj", "{5D97B2C2-E19B-4958-81E1-38864EC88FEB}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
@@ -87,10 +91,14 @@ Global
|
||||
{EC768913-6270-14F4-1DD3-69C87A659462}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{EC768913-6270-14F4-1DD3-69C87A659462}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{EC768913-6270-14F4-1DD3-69C87A659462}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5DD82482-E560-405F-BF55-04D647B05BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5DD82482-E560-405F-BF55-04D647B05BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5DD82482-E560-405F-BF55-04D647B05BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5DD82482-E560-405F-BF55-04D647B05BEF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{AAD4720E-D175-44B5-B431-DB0BA636CD20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{AAD4720E-D175-44B5-B431-DB0BA636CD20}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{AAD4720E-D175-44B5-B431-DB0BA636CD20}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{AAD4720E-D175-44B5-B431-DB0BA636CD20}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5D97B2C2-E19B-4958-81E1-38864EC88FEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5D97B2C2-E19B-4958-81E1-38864EC88FEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5D97B2C2-E19B-4958-81E1-38864EC88FEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5D97B2C2-E19B-4958-81E1-38864EC88FEB}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@@ -110,7 +118,9 @@ Global
|
||||
{211619F5-AE25-4BA5-A552-BACAFE0632D3} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB}
|
||||
{224C4845-1CDE-22B7-F3A9-1FF9297F70E8} = {0CBC2432-A561-4440-89BC-671B66A24146}
|
||||
{EC768913-6270-14F4-1DD3-69C87A659462} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
|
||||
{5DD82482-E560-405F-BF55-04D647B05BEF} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
|
||||
{73D8F466-90AA-4F95-9BD1-7CDBB8565162} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
|
||||
{AAD4720E-D175-44B5-B431-DB0BA636CD20} = {73D8F466-90AA-4F95-9BD1-7CDBB8565162}
|
||||
{5D97B2C2-E19B-4958-81E1-38864EC88FEB} = {73D8F466-90AA-4F95-9BD1-7CDBB8565162}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {73E60370-756D-45AD-A19A-C40A02DACCC7}
|
||||
|
||||
22
receiverUI/.github/copilot-instructions.md
vendored
Normal file
22
receiverUI/.github/copilot-instructions.md
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
---
|
||||
description: 'Answer questions about DevExpress UI Components and their APIs using the dxdocs server'
|
||||
---
|
||||
|
||||
You are a .NET programmer and DevExpress products expert.
|
||||
|
||||
You are tasked with answering questions about DevExpress components and their APIs using dxdocs MCP server tools.
|
||||
|
||||
For **ANY** question about DevExpress components, use the dxdocs server to construct your answer.
|
||||
|
||||
## Workflow:
|
||||
1. **Call devexpress_docs_search** to obtain help topics related to the user question
|
||||
2. **Call devexpress_docs_get_content** to fetch and read most relevant help topics
|
||||
3. **Reflect on obtained content** and how it relates to the question
|
||||
4. **Provide a comprehensive answer** based solely on retrieved information
|
||||
|
||||
## Constraints:
|
||||
- **Use devexpress_docs_search only once per question** to avoid redundant queries
|
||||
- When answering questions, **use only information obtained from MCP server tools**
|
||||
- **Include code examples** when available in the documentation
|
||||
- **Reference specific DevExpress controls and properties** mentioned in the documentation
|
||||
- **Invoke version-specific MCP tools** (for example, dxdocs25_1) if a user specifies a version (for example, v25.1)
|
||||
12
receiverUI/.mcp.json
Normal file
12
receiverUI/.mcp.json
Normal file
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"servers": {
|
||||
"dxdocs": {
|
||||
"url": "https://api.devexpress.com/mcp/docs",
|
||||
"type": "http"
|
||||
},
|
||||
"dxdocs25_1": {
|
||||
"url": "https://api.devexpress.com/mcp/docs?v=25.1",
|
||||
"type": "http"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,126 @@
|
||||
namespace EnvelopeGenerator.ReceiverUI.Web.Client.Api.Models;
|
||||
|
||||
/// <summary>
|
||||
/// Client-side DTOs for envelope display. These mirror the server-side
|
||||
/// EnvelopeReceiverDto / EnvelopeDto / DocumentDto used by the existing
|
||||
/// API endpoints, but expose only the fields the receiver UI actually needs.
|
||||
/// JSON serialization is camelCase by default (System.Text.Json).
|
||||
/// </summary>
|
||||
public class EnvelopeReceiverDto
|
||||
{
|
||||
public long EnvelopeId { get; set; }
|
||||
public long ReceiverId { get; set; }
|
||||
public string? Name { get; set; }
|
||||
public bool HasPhoneNumber { get; set; }
|
||||
public EnvelopeDto? Envelope { get; set; }
|
||||
public ReceiverDto? Receiver { get; set; }
|
||||
}
|
||||
|
||||
public class EnvelopeDto
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public string? Uuid { get; set; }
|
||||
public string? Title { get; set; }
|
||||
public string? Message { get; set; }
|
||||
public bool ReadOnly { get; set; }
|
||||
public bool UseAccessCode { get; set; }
|
||||
public bool TFAEnabled { get; set; }
|
||||
public DateTime AddedWhen { get; set; }
|
||||
public SenderUserDto? User { get; set; }
|
||||
public List<DocumentDto>? Documents { get; set; }
|
||||
}
|
||||
|
||||
public class SenderUserDto
|
||||
{
|
||||
public string? Email { get; set; }
|
||||
public string? Prename { get; set; }
|
||||
public string? Name { get; set; }
|
||||
}
|
||||
|
||||
public class ReceiverDto
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public string? EmailAddress { get; set; }
|
||||
public string? Signature { get; set; }
|
||||
public string? Prename { get; set; }
|
||||
public string? Name { get; set; }
|
||||
}
|
||||
|
||||
public class DocumentDto
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public string? Name { get; set; }
|
||||
public List<DocumentElementDto>? Elements { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Signature placement on a PDF document. Pixel/inch units follow the same
|
||||
/// convention as the legacy PSPDFKit pipeline.
|
||||
/// </summary>
|
||||
public class DocumentElementDto
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public int Page { get; set; }
|
||||
public double Left { get; set; }
|
||||
public double Top { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Body for <c>POST /api/readonly</c> (share read-only link with another e-mail).
|
||||
/// </summary>
|
||||
public class ReadOnlyShareRequest
|
||||
{
|
||||
public string ReceiverMail { get; set; } = string.Empty;
|
||||
public DateTime DateValid { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returned by <c>GET /api/annotation/elements</c>. Each item describes a
|
||||
/// signature placeholder the authenticated receiver must sign on the
|
||||
/// current envelope. Coordinates are in PDF points relative to the page.
|
||||
/// </summary>
|
||||
public class SignatureElementDto
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public int Page { get; set; }
|
||||
public double X { get; set; }
|
||||
public double Y { get; set; }
|
||||
public double Width { get; set; }
|
||||
public double Height { get; set; }
|
||||
public bool Required { get; set; }
|
||||
public string? Tooltip { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Body of <c>POST /api/annotation/blazor</c> — mirrors the API-side
|
||||
/// <c>BlazorSignaturePayload</c>.
|
||||
/// </summary>
|
||||
public class BlazorSignaturePayload
|
||||
{
|
||||
public List<BlazorSignatureEntry> Signatures { get; set; } = new();
|
||||
}
|
||||
|
||||
public class BlazorSignatureEntry
|
||||
{
|
||||
public int ElementId { get; set; }
|
||||
/// <summary>Image as data URL (e.g. <c>data:image/png;base64,...</c>).</summary>
|
||||
public string SignatureDataUrl { get; set; } = string.Empty;
|
||||
public string? Position { get; set; }
|
||||
public string? City { get; set; }
|
||||
public DateTime SignedAt { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Response of <c>GET /api/tfa/{envelopeReceiverId}</c>. The API serializes
|
||||
/// the anonymous type in <c>TfaRegistrationController.RegisterAsync</c>; the
|
||||
/// shape mirrored here is the camelCased JSON that crosses the wire.
|
||||
/// </summary>
|
||||
public class TfaRegistrationResponse
|
||||
{
|
||||
public int EnvelopeId { get; set; }
|
||||
public string? Uuid { get; set; }
|
||||
public string? Signature { get; set; }
|
||||
public DateTime? TfaRegDeadline { get; set; }
|
||||
/// <summary>Base64-encoded PNG suitable for <c>data:image/png;base64,...</c>.</summary>
|
||||
public string? TotpQR64 { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
namespace EnvelopeGenerator.ReceiverUI.Web.Client.Api.Models;
|
||||
|
||||
/// <summary>
|
||||
/// Mirrors <c>EnvelopeGenerator.API.Models.ReceiverAuthResponse</c>.
|
||||
/// The Status string determines which fields are relevant.
|
||||
/// Possible values:
|
||||
/// requires_access_code, requires_tfa, show_document,
|
||||
/// already_signed, rejected, not_found, expired, error.
|
||||
/// </summary>
|
||||
public class ReceiverAuthResponse
|
||||
{
|
||||
public string Status { get; set; } = string.Empty;
|
||||
public string? Title { get; set; }
|
||||
public string? Message { get; set; }
|
||||
public string? SenderEmail { get; set; }
|
||||
public string? ReceiverName { get; set; }
|
||||
public bool TfaEnabled { get; set; }
|
||||
public bool HasPhoneNumber { get; set; }
|
||||
public bool ReadOnly { get; set; }
|
||||
|
||||
/// <summary>"sms" or "authenticator" when Status == "requires_tfa".</summary>
|
||||
public string? TfaType { get; set; }
|
||||
public DateTime? TfaExpiration { get; set; }
|
||||
public string? ErrorMessage { get; set; }
|
||||
}
|
||||
|
||||
public class AccessCodeRequest
|
||||
{
|
||||
public string AccessCode { get; set; } = string.Empty;
|
||||
public bool PreferSms { get; set; }
|
||||
}
|
||||
|
||||
public class TfaCodeRequest
|
||||
{
|
||||
public string Code { get; set; } = string.Empty;
|
||||
/// <summary>"sms" or "authenticator".</summary>
|
||||
public string Type { get; set; } = "authenticator";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Status strings returned by <see cref="ReceiverAuthResponse.Status"/>.
|
||||
/// </summary>
|
||||
public static class ReceiverAuthStatus
|
||||
{
|
||||
public const string RequiresAccessCode = "requires_access_code";
|
||||
public const string RequiresTfa = "requires_tfa";
|
||||
public const string ShowDocument = "show_document";
|
||||
public const string AlreadySigned = "already_signed";
|
||||
public const string Rejected = "rejected";
|
||||
public const string NotFound = "not_found";
|
||||
public const string Expired = "expired";
|
||||
public const string Error = "error";
|
||||
}
|
||||
@@ -0,0 +1,214 @@
|
||||
using System.Net;
|
||||
using System.Net.Http.Json;
|
||||
using EnvelopeGenerator.ReceiverUI.Web.Client.Api.Models;
|
||||
|
||||
namespace EnvelopeGenerator.ReceiverUI.Web.Client.Api;
|
||||
|
||||
/// <summary>
|
||||
/// Typed HTTP client for the EnvelopeGenerator receiver API.
|
||||
/// All endpoints are routed through the BFF (same origin), so the
|
||||
/// authentication cookie set by the API is automatically attached
|
||||
/// by the browser to every request issued by the injected HttpClient.
|
||||
/// </summary>
|
||||
public class ReceiverApiClient
|
||||
{
|
||||
private readonly HttpClient _http;
|
||||
private readonly ILogger<ReceiverApiClient> _logger;
|
||||
|
||||
public ReceiverApiClient(HttpClient http, ILogger<ReceiverApiClient> logger)
|
||||
{
|
||||
_http = http;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
// ?? Receiver Auth ????????????????????????????????????????????????
|
||||
|
||||
public Task<ReceiverAuthResponse?> GetStatusAsync(string envelopeKey, CancellationToken ct = default)
|
||||
=> GetAuthAsync($"api/receiverauth/{Uri.EscapeDataString(envelopeKey)}/status", ct);
|
||||
|
||||
public Task<ReceiverAuthResponse?> SubmitAccessCodeAsync(string envelopeKey, AccessCodeRequest req, CancellationToken ct = default)
|
||||
=> PostAuthAsync($"api/receiverauth/{Uri.EscapeDataString(envelopeKey)}/access-code", req, ct);
|
||||
|
||||
public Task<ReceiverAuthResponse?> SubmitTfaCodeAsync(string envelopeKey, TfaCodeRequest req, CancellationToken ct = default)
|
||||
=> PostAuthAsync($"api/receiverauth/{Uri.EscapeDataString(envelopeKey)}/tfa", req, ct);
|
||||
|
||||
// ?? Envelope Receiver ????????????????????????????????????????????
|
||||
|
||||
public async Task<EnvelopeReceiverDto?> GetEnvelopeReceiverAsync(string envelopeKey, CancellationToken ct = default)
|
||||
{
|
||||
var res = await _http.GetAsync($"api/envelopereceiver/{Uri.EscapeDataString(envelopeKey)}", ct);
|
||||
if (!res.IsSuccessStatusCode)
|
||||
return null;
|
||||
return await res.Content.ReadFromJsonAsync<EnvelopeReceiverDto>(cancellationToken: ct);
|
||||
}
|
||||
|
||||
/// <summary>Downloads the document bytes for the receiver to display in a PDF viewer.</summary>
|
||||
public async Task<byte[]?> GetDocumentAsync(string envelopeKey, CancellationToken ct = default)
|
||||
{
|
||||
var res = await _http.GetAsync($"api/document/{Uri.EscapeDataString(envelopeKey)}", ct);
|
||||
if (!res.IsSuccessStatusCode)
|
||||
return null;
|
||||
return await res.Content.ReadAsByteArrayAsync(ct);
|
||||
}
|
||||
|
||||
// ?? Annotation / Sign / Reject ???????????????????????????????????
|
||||
|
||||
/// <summary>
|
||||
/// Returns the signature placeholders the authenticated receiver must sign.
|
||||
/// </summary>
|
||||
public async Task<List<SignatureElementDto>> GetSignatureElementsAsync(CancellationToken ct = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
return await _http.GetFromJsonAsync<List<SignatureElementDto>>("api/annotation/elements", ct)
|
||||
?? new List<SignatureElementDto>();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogWarning(ex, "Failed to fetch signature elements.");
|
||||
return new List<SignatureElementDto>();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Submits the signed envelope using the Blazor-friendly endpoint.
|
||||
/// </summary>
|
||||
public async Task<HttpStatusCode> SignBlazorAsync(BlazorSignaturePayload payload, CancellationToken ct = default)
|
||||
{
|
||||
var res = await _http.PostAsJsonAsync("api/annotation/blazor", payload, ct);
|
||||
return res.StatusCode;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Fetches the TOTP QR code + registration deadline for the given
|
||||
/// envelope-receiver key (encoded uuid+signature). The API generates
|
||||
/// a fresh secret on first call and persists it server-side.
|
||||
/// </summary>
|
||||
public async Task<(TfaRegistrationResponse? Data, HttpStatusCode Status)> GetTfaRegistrationAsync(string envelopeReceiverId, CancellationToken ct = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
var res = await _http.GetAsync($"api/tfa/{Uri.EscapeDataString(envelopeReceiverId)}", ct);
|
||||
if (!res.IsSuccessStatusCode)
|
||||
return (null, res.StatusCode);
|
||||
var data = await res.Content.ReadFromJsonAsync<TfaRegistrationResponse>(cancellationToken: ct);
|
||||
return (data, res.StatusCode);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogWarning(ex, "Failed to fetch TFA registration for {Key}", envelopeReceiverId);
|
||||
return (null, HttpStatusCode.InternalServerError);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Submits the signed annotations payload. Returns the HTTP status code.</summary>
|
||||
public async Task<HttpStatusCode> SignAsync<TPayload>(TPayload? payload, CancellationToken ct = default)
|
||||
{
|
||||
var res = payload is null
|
||||
? await _http.PostAsync("api/annotation", content: null, ct)
|
||||
: await _http.PostAsJsonAsync("api/annotation", payload, ct);
|
||||
return res.StatusCode;
|
||||
}
|
||||
|
||||
public async Task<bool> RejectAsync(string reason, CancellationToken ct = default)
|
||||
{
|
||||
var res = await _http.PostAsJsonAsync("api/annotation/reject", reason, ct);
|
||||
return res.IsSuccessStatusCode;
|
||||
}
|
||||
|
||||
// ?? Read-only share ??????????????????????????????????????????????
|
||||
|
||||
public async Task<bool> ShareReadOnlyAsync(ReadOnlyShareRequest req, CancellationToken ct = default)
|
||||
{
|
||||
var res = await _http.PostAsJsonAsync("api/readonly", req, ct);
|
||||
return res.IsSuccessStatusCode;
|
||||
}
|
||||
|
||||
// ?? Auth (logout) ????????????????????????????????????????????????
|
||||
|
||||
public async Task<bool> LogoutAsync(CancellationToken ct = default)
|
||||
{
|
||||
var res = await _http.PostAsync("auth/logout", content: null, ct);
|
||||
return res.IsSuccessStatusCode;
|
||||
}
|
||||
|
||||
// ?? Localization ?????????????????????????????????????????????????
|
||||
|
||||
public async Task<Dictionary<string, string>?> GetLocalizationStringsAsync(CancellationToken ct = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
return await _http.GetFromJsonAsync<Dictionary<string, string>>("api/Localization", ct);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogWarning(ex, "Failed to fetch localization strings.");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public async Task SetLanguageAsync(string language, CancellationToken ct = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
await _http.PostAsync($"api/Localization/lang?language={Uri.EscapeDataString(language)}", content: null, ct);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogWarning(ex, "Failed to set language to {Lang}.", language);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns the currently selected language code (e.g. "de", "en"), or
|
||||
/// <c>null</c> if no language cookie has been set yet (the API answers
|
||||
/// with HTTP 404 in that case).
|
||||
/// </summary>
|
||||
public async Task<string?> GetLanguageAsync(CancellationToken ct = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
var res = await _http.GetAsync("api/Localization/lang", ct);
|
||||
if (!res.IsSuccessStatusCode)
|
||||
return null;
|
||||
return (await res.Content.ReadAsStringAsync(ct))?.Trim('"');
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogWarning(ex, "Failed to read current language.");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// ?? Helpers ??????????????????????????????????????????????????????
|
||||
|
||||
private async Task<ReceiverAuthResponse?> GetAuthAsync(string url, CancellationToken ct)
|
||||
{
|
||||
var res = await _http.GetAsync(url, ct);
|
||||
return await ReadAuthAsync(res, ct);
|
||||
}
|
||||
|
||||
private async Task<ReceiverAuthResponse?> PostAuthAsync<TReq>(string url, TReq body, CancellationToken ct)
|
||||
{
|
||||
var res = await _http.PostAsJsonAsync(url, body, ct);
|
||||
return await ReadAuthAsync(res, ct);
|
||||
}
|
||||
|
||||
private static async Task<ReceiverAuthResponse?> ReadAuthAsync(HttpResponseMessage res, CancellationToken ct)
|
||||
{
|
||||
// ReceiverAuthController returns a ReceiverAuthResponse body for both
|
||||
// 2xx and known error statuses (401/404/500). We always try to deserialize.
|
||||
try
|
||||
{
|
||||
return await res.Content.ReadFromJsonAsync<ReceiverAuthResponse>(cancellationToken: ct);
|
||||
}
|
||||
catch
|
||||
{
|
||||
return new ReceiverAuthResponse
|
||||
{
|
||||
Status = ReceiverAuthStatus.Error,
|
||||
ErrorMessage = $"Unexpected response ({(int)res.StatusCode})."
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
@@ -0,0 +1,37 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
|
||||
<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
|
||||
<MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessage);WASM0001</MSBuildWarningsAsMessages>
|
||||
<!-- Required so that native assets (libSkiaSharp, libHarfBuzzSharp) from
|
||||
SkiaSharp.NativeAssets.WebAssembly / HarfBuzzSharp.NativeAssets.WebAssembly
|
||||
are statically linked into the WASM runtime. Without this the
|
||||
DevExpress PDF SkiaRenderer throws DllNotFoundException: libSkiaSharp.
|
||||
Requires the "wasm-tools" workload: dotnet workload install wasm-tools -->
|
||||
<!--<WasmBuildNative>false</WasmBuildNative>-->
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="DevExpress.Blazor" Version="25.2.*" />
|
||||
<PackageReference Include="DevExpress.Blazor.PdfViewer" Version="25.2.*" />
|
||||
<PackageReference Include="DevExpress.Pdf.SkiaRenderer" Version="25.2.*" />
|
||||
<PackageReference Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="8.3.1.2" />
|
||||
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.119.1" />
|
||||
<PackageReference Include="DevExpress.AIIntegration.Blazor" Version="25.2.*" />
|
||||
<PackageReference Include="DevExpress.AIIntegration.OpenAI" Version="25.2.*" />
|
||||
|
||||
<PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.5" />
|
||||
<PackageReference Include="Microsoft.Extensions.AI" Version="9.7.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.7.1-preview.1.25365.4" />
|
||||
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.20" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Documents\Invoice.pdf" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -0,0 +1,38 @@
|
||||
@inherits DrawerStateComponentBase
|
||||
|
||||
<div class="drawer-container">
|
||||
<DxDrawer PanelWidth="@PanelWidth"
|
||||
CssClass="@(CssClass + " mobile")"
|
||||
Mode="DrawerMode.Overlap"
|
||||
IsOpen="@ToggledDrawer"
|
||||
BodyTemplate="BodyTemplate"
|
||||
HeaderTemplate="HeaderTemplate"
|
||||
FooterTemplate="FooterTemplate"
|
||||
ApplyBackgroundShading="false"
|
||||
ClosedCssClass="panel-closed">
|
||||
<TargetContent>
|
||||
<DxDrawer PanelWidth="@PanelWidth"
|
||||
CssClass="@CssClass"
|
||||
Mode="DrawerMode.Shrink"
|
||||
IsOpen="@(!ToggledDrawer)"
|
||||
BodyTemplate="BodyTemplate"
|
||||
HeaderTemplate="HeaderTemplate"
|
||||
FooterTemplate="FooterTemplate"
|
||||
OpenCssClass="panel-open">
|
||||
<TargetContent>
|
||||
<div class="navigation-drawer-shading"></div>
|
||||
@TargetContent
|
||||
</TargetContent>
|
||||
</DxDrawer>
|
||||
</TargetContent>
|
||||
</DxDrawer>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
[Parameter] public string? CssClass { get; set; }
|
||||
[Parameter] public string? PanelWidth { get; set; }
|
||||
[Parameter] public RenderFragment? TargetContent { get; set; }
|
||||
[Parameter] public RenderFragment? BodyTemplate { get; set; }
|
||||
[Parameter] public RenderFragment? HeaderTemplate { get; set; }
|
||||
[Parameter] public RenderFragment? FooterTemplate { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
.drawer-container {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.navigation-drawer-shading {
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
transition: ease 300ms;
|
||||
transition-property: opacity, visibility;
|
||||
visibility: visible;
|
||||
width: 100%;
|
||||
z-index: 99;
|
||||
background-color: var(--dxds-color-surface-backdrop-default-rest);
|
||||
}
|
||||
|
||||
.navigation-drawer.mobile.panel-closed .navigation-drawer-shading {
|
||||
opacity: 0;
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
::deep .navigation-drawer > .dxbl-drawer-panel {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
::deep .navigation-drawer.mobile > .dxbl-drawer-panel {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.navigation-drawer-shading {
|
||||
display: none;
|
||||
}
|
||||
|
||||
::deep .panel-open:not(.mobile) .nav-buttons-container .menu-button {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
::deep .navigation-drawer > .dxbl-drawer-panel {
|
||||
display: none;
|
||||
}
|
||||
|
||||
::deep .navigation-drawer.mobile > .dxbl-drawer-panel {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.navigation-drawer-shading {
|
||||
display: block;
|
||||
}
|
||||
|
||||
::deep .panel-open:not(.mobile) .nav-buttons-container .menu-button {
|
||||
display: flex;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
@inherits DrawerStateLayoutComponentBase
|
||||
@inject NavigationManager NavigationManager
|
||||
|
||||
<div class="page">
|
||||
<Drawer CssClass="navigation-drawer" PanelWidth="240px">
|
||||
<HeaderTemplate>
|
||||
<div class="navigation-drawer-header">
|
||||
<NavLink href="@AddDrawerStateToUrl("/")">
|
||||
<img class="logo" src="images/logo.svg" alt="DevExpress logo" />
|
||||
</NavLink>
|
||||
<NavLink aria-label="Close menu" href="@AddDrawerStateToUrlToggled(LocalPath)">
|
||||
<DxButton aria-label="Close menu" RenderStyle="ButtonRenderStyle.Light" RenderStyleMode="ButtonRenderStyleMode.Text" CssClass="btn-icon-only" IconCssClass="@(ToggledDrawer ? "icon icon-close" : "icon icon-menu")"></DxButton>
|
||||
</NavLink>
|
||||
</div>
|
||||
</HeaderTemplate>
|
||||
<BodyTemplate>
|
||||
<div class="w-100">
|
||||
<NavMenu></NavMenu>
|
||||
</div>
|
||||
</BodyTemplate>
|
||||
<FooterTemplate>
|
||||
<div class="navigation-drawer-footer">
|
||||
<NavLink href="https://docs.devexpress.com/Blazor/400725/blazor-components" class="button-link">
|
||||
<DxButton Text="Docs" RenderStyle="ButtonRenderStyle.Light" RenderStyleMode="ButtonRenderStyleMode.Text" IconCssClass="icon icon-docs"></DxButton>
|
||||
</NavLink>
|
||||
<NavLink href="https://demos.devexpress.com/blazor/" class="button-link">
|
||||
<DxButton Text="Demos" RenderStyle="ButtonRenderStyle.Light" RenderStyleMode="ButtonRenderStyleMode.Text" IconCssClass="icon icon-demos"></DxButton>
|
||||
</NavLink>
|
||||
</div>
|
||||
</FooterTemplate>
|
||||
<TargetContent>
|
||||
<div class="drawer-content">
|
||||
<div class="nav-buttons-container">
|
||||
<NavLink aria-label="Open menu" href="@AddDrawerStateToUrlToggled(LocalPath)" class="menu-button">
|
||||
<DxButton aria-label="Open menu" RenderStyle="ButtonRenderStyle.Secondary" RenderStyleMode="ButtonRenderStyleMode.Text" CssClass="btn-icon-only" IconCssClass="icon icon-menu"></DxButton>
|
||||
</NavLink>
|
||||
@if (LocalPath != "/") {
|
||||
<NavLink href="@AddDrawerStateToUrl("/")" class="button-link">
|
||||
<DxButton Text="Back to Home" RenderStyle="ButtonRenderStyle.Secondary" RenderStyleMode="ButtonRenderStyleMode.Text" CssClass="back-button" IconCssClass="icon icon-back"></DxButton>
|
||||
</NavLink>
|
||||
}
|
||||
</div>
|
||||
<div class="page-content-container">
|
||||
@Body
|
||||
</div>
|
||||
</div>
|
||||
</TargetContent>
|
||||
</Drawer>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
string LocalPath => new Uri(NavigationManager.Uri).LocalPath;
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
.page {
|
||||
height: 100%;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
::deep .navigation-drawer {
|
||||
--dxbl-drawer-panel-body-padding-x: 0;
|
||||
--dxbl-drawer-panel-body-padding-y: 1rem;
|
||||
--dxbl-drawer-panel-footer-bg: none;
|
||||
--dxbl-drawer-panel-header-bg: none;
|
||||
--dxbl-drawer-separator-border-width: 0;
|
||||
}
|
||||
|
||||
::deep .navigation-drawer > .dxbl-drawer-panel {
|
||||
background-image: linear-gradient(180deg, var(--dxds-color-surface-primary-default-rest) 0%, var(--dxds-primary-170) 150%);
|
||||
}
|
||||
|
||||
.navigation-drawer-header {
|
||||
align-items: center;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
padding: 1.375rem 0.375rem;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.navigation-drawer-header .logo {
|
||||
height: 1.5rem;
|
||||
width: 9rem;
|
||||
}
|
||||
|
||||
.navigation-drawer-footer {
|
||||
display: flex;
|
||||
justify-content: space-evenly;
|
||||
padding-bottom: 0.875rem;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.drawer-content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
overflow: auto;
|
||||
padding: 2rem 1.5rem 1.5rem 1.5rem;
|
||||
}
|
||||
|
||||
.nav-buttons-container {
|
||||
align-items: center;
|
||||
display: flex;
|
||||
gap: 0.625rem;
|
||||
min-height: 2rem;
|
||||
}
|
||||
|
||||
::deep .nav-buttons-container > a {
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
::deep .nav-buttons-container .back-button {
|
||||
padding-left: 0;
|
||||
padding-right: 0.25rem;
|
||||
}
|
||||
|
||||
.page-content-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex-grow: 1;
|
||||
min-height: 0;
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
@inject NavigationManager NavigationManager
|
||||
@implements IDisposable
|
||||
|
||||
<div>
|
||||
<DxMenu Orientation="@Orientation.Vertical" CssClass="menu">
|
||||
<Items>
|
||||
<DxMenuItem NavigateUrl="/samples" Text="Samples" CssClass="@MenuItemCssClass("/samples")" IconCssClass="icon icon-home"></DxMenuItem>
|
||||
<DxMenuItem NavigateUrl="/counter" Text="Counter" CssClass="@MenuItemCssClass("/counter")" IconCssClass="icon icon-counter"></DxMenuItem>
|
||||
<DxMenuItem NavigateUrl="/weather" Text="Weather" CssClass="@MenuItemCssClass("/weather")" IconCssClass="icon icon-weather"></DxMenuItem>
|
||||
<DxMenuItem NavigateUrl="/pdfviewer" Text="PDF Viewer" CssClass="@MenuItemCssClass("/pdfviewer")" IconCssClass="icon icon-pdf-viewer"></DxMenuItem>
|
||||
</Items>
|
||||
</DxMenu>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private string? currentLocalPath;
|
||||
|
||||
protected override void OnInitialized() {
|
||||
currentLocalPath = new Uri(NavigationManager.Uri).LocalPath;
|
||||
NavigationManager.LocationChanged += OnLocationChanged;
|
||||
}
|
||||
|
||||
private void OnLocationChanged(object? sender, LocationChangedEventArgs e) {
|
||||
currentLocalPath = new Uri(NavigationManager.Uri).LocalPath;
|
||||
InvokeAsync(StateHasChanged);
|
||||
}
|
||||
|
||||
private string? MenuItemCssClass(string itemPath) {
|
||||
return string.Equals(currentLocalPath, itemPath, StringComparison.OrdinalIgnoreCase) ? "menu-item-active" : null;
|
||||
}
|
||||
|
||||
public void Dispose() {
|
||||
NavigationManager.LocationChanged -= OnLocationChanged;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
::deep .menu {
|
||||
--dxbl-menu-bottom-left-border-radius: 0;
|
||||
--dxbl-menu-bottom-right-border-radius: 0;
|
||||
--dxbl-menu-top-left-border-radius: 0;
|
||||
--dxbl-menu-top-right-border-radius: 0;
|
||||
--dxbl-menu-item-padding-x: 1.125rem;
|
||||
--dxbl-menu-item-padding-y: 0.5rem;
|
||||
--dxbl-menu-item-color: var(--dxds-color-content-neutral-default-static-dark-rest);
|
||||
--dxbl-menu-item-image-color: var(--dxds-color-content-neutral-default-static-dark-rest);
|
||||
--dxbl-menu-item-hover-bg: rgb(from var(--dxds-color-surface-neutral-default-static-light-rest) r g b / 0.15);
|
||||
--dxbl-menu-item-hover-color: var(--dxds-color-content-neutral-default-static-dark-hovered);
|
||||
--dxbl-menu-item-hover-image-color: var(--dxds-color-content-neutral-default-static-dark-hovered);
|
||||
|
||||
background: none;
|
||||
}
|
||||
|
||||
::deep .menu.display-mobile {
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
|
||||
::deep .menu-item-active {
|
||||
background-color: rgb(from var(--dxds-color-surface-neutral-default-static-light-rest) r g b / 0.05);
|
||||
}
|
||||
@@ -0,0 +1,116 @@
|
||||
@inherits LayoutComponentBase
|
||||
@implements IDisposable
|
||||
@inject LocalizationService Loc
|
||||
@inject NavigationManager Nav
|
||||
@inject IJSRuntime JS
|
||||
|
||||
@*
|
||||
Layout for the receiver-facing pages migrated from EnvelopeGenerator.Web.
|
||||
Mirrors the legacy MVC <body> structure: page content + sticky footer
|
||||
with copyright link, language switcher and privacy link.
|
||||
|
||||
Cookie consent is reimplemented in Blazor (localStorage-backed) because
|
||||
ASP.NET Core's <ITrackingConsentFeature> only works on the server side
|
||||
and is awkward to integrate with InteractiveAuto rendering.
|
||||
*@
|
||||
|
||||
<div class="receiver-shell">
|
||||
|
||||
@* Main page content *@
|
||||
<main role="main" class="flex-grow-1">
|
||||
@Body
|
||||
</main>
|
||||
|
||||
@* Cookie consent banner (Blazor counterpart of _CookieConsentPartial). *@
|
||||
@if (_consentVisible)
|
||||
{
|
||||
<div class="receiver-cookie-banner" role="alertdialog" aria-live="polite">
|
||||
<span>@Loc["CookieConsentMessage"]</span>
|
||||
<DxButton Text="@Loc["Accept"]"
|
||||
RenderStyle="ButtonRenderStyle.Primary"
|
||||
Click="AcceptCookiesAsync" />
|
||||
</div>
|
||||
}
|
||||
|
||||
@* Footer (copyright + language switcher + privacy). *@
|
||||
<footer class="receiver-footer">
|
||||
<span>
|
||||
© SignFlow 2023-@DateTime.Now.Year
|
||||
<a href="https://digitaldata.works" target="_blank" rel="noopener">Digital Data GmbH</a>
|
||||
</span>
|
||||
|
||||
<div class="d-flex align-items-center gap-2">
|
||||
<select class="language-switcher" value="@_currentLang" @onchange="OnLanguageChangedAsync">
|
||||
@foreach (var (lang, native, _) in LocalizationService.SupportedLanguages)
|
||||
{
|
||||
<option value="@lang" selected="@(lang == _currentLang)">@native</option>
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<a href="@($"/privacy-policy.{_currentLang}.html")" target="_blank" rel="noopener">
|
||||
@Loc["Privacy"]
|
||||
</a>
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private string _currentLang = "de";
|
||||
private bool _consentVisible;
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
Loc.Changed += OnLocChanged;
|
||||
await Loc.EnsureLoadedAsync();
|
||||
_currentLang = Loc.CurrentLanguage ?? "de";
|
||||
}
|
||||
|
||||
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||
{
|
||||
if (!firstRender) return;
|
||||
// Probe localStorage on the client only — InteractiveAuto means
|
||||
// the server prerender runs without a browser, so JS interop is
|
||||
// unavailable until the first client render.
|
||||
try
|
||||
{
|
||||
var accepted = await JS.InvokeAsync<string?>("localStorage.getItem", "receiver.cookie-consent");
|
||||
_consentVisible = accepted != "1";
|
||||
StateHasChanged();
|
||||
}
|
||||
catch
|
||||
{
|
||||
// No-op: server prerender (JS unavailable) keeps the banner hidden.
|
||||
}
|
||||
}
|
||||
|
||||
private async Task AcceptCookiesAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
await JS.InvokeVoidAsync("localStorage.setItem", "receiver.cookie-consent", "1");
|
||||
}
|
||||
catch { /* ignore */ }
|
||||
_consentVisible = false;
|
||||
}
|
||||
|
||||
private async Task OnLanguageChangedAsync(ChangeEventArgs e)
|
||||
{
|
||||
var code = e.Value?.ToString();
|
||||
if (string.IsNullOrEmpty(code) || code == _currentLang)
|
||||
return;
|
||||
|
||||
_currentLang = code;
|
||||
await Loc.ChangeLanguageAsync(code);
|
||||
// Force a full reload so ASP.NET Core localization middleware
|
||||
// picks up the new culture for any subsequent SSR / API calls.
|
||||
Nav.NavigateTo(Nav.Uri, forceLoad: true);
|
||||
}
|
||||
|
||||
private void OnLocChanged()
|
||||
{
|
||||
_currentLang = Loc.CurrentLanguage ?? _currentLang;
|
||||
InvokeAsync(StateHasChanged);
|
||||
}
|
||||
|
||||
public void Dispose() => Loc.Changed -= OnLocChanged;
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
@page "/counter"
|
||||
|
||||
<PageTitle>Counter</PageTitle>
|
||||
|
||||
<h1>Counter</h1>
|
||||
|
||||
<div class="counter-block">
|
||||
<div class="counter-content">
|
||||
<div class="counter-count">
|
||||
@currentCount
|
||||
</div>
|
||||
current count
|
||||
</div>
|
||||
<DxButton Click="IncrementCount">Click me</DxButton>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private int currentCount;
|
||||
|
||||
private void IncrementCount()
|
||||
{
|
||||
currentCount++;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
.counter-block {
|
||||
align-items: center;
|
||||
border-radius: 1rem;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 1.5rem;
|
||||
height: 17rem;
|
||||
justify-content: center;
|
||||
padding: 2.5rem 1.5rem 1.5rem;
|
||||
width: 16.875rem;
|
||||
border: 1px solid var(--dxds-color-border-neutral-default-rest);
|
||||
}
|
||||
|
||||
.counter-block .counter-content {
|
||||
align-items: center;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.counter-block .counter-count {
|
||||
font-size: 7.5rem;
|
||||
font-weight: 400;
|
||||
line-height: 7.75rem;
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
@page "/samples"
|
||||
|
||||
<PageTitle>Welcome</PageTitle>
|
||||
|
||||
<div class="main-content">
|
||||
<DxGridLayout CssClass="index-gridlayout">
|
||||
<Rows>
|
||||
<DxGridLayoutRow Height="auto" Areas="header"></DxGridLayoutRow>
|
||||
<DxGridLayoutRow Height="auto" Areas="tiles"></DxGridLayoutRow>
|
||||
</Rows>
|
||||
<Items>
|
||||
<DxGridLayoutItem Area="header" CssClass="title">
|
||||
<Template>
|
||||
<div class="title-header-text">Hello World!</div>
|
||||
<div class="title-content-text">Welcome to your new DevExpress Blazor Application</div>
|
||||
</Template>
|
||||
</DxGridLayoutItem>
|
||||
<DxGridLayoutItem Area="tiles" CssClass="tiles">
|
||||
<Template>
|
||||
<IndexTile NavigateUrl="/counter" Title="Counter" Description="Count mouse clicks and track the total." IconCssClass="icon-counter" />
|
||||
<IndexTile NavigateUrl="/weather" Title="Weather" Description="See a 5-day temperature and weather conditions forecast." IconCssClass="icon-weather" />
|
||||
<IndexTile NavigateUrl="/pdfviewer" Title="PDF Viewer" Description="Load PDF files and view them in the web browser." IconCssClass="icon-pdf-viewer" />
|
||||
</Template>
|
||||
</DxGridLayoutItem>
|
||||
</Items>
|
||||
</DxGridLayout>
|
||||
</div>
|
||||
@@ -0,0 +1,31 @@
|
||||
::deep .index-gridlayout {
|
||||
container-type: inline-size;
|
||||
height: auto;
|
||||
margin-top: auto;
|
||||
margin-bottom: auto;
|
||||
padding-bottom: 9rem;
|
||||
}
|
||||
|
||||
::deep .title {
|
||||
padding-bottom: 3rem;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
::deep .tiles {
|
||||
--tile-column-count: 4;
|
||||
|
||||
display: grid;
|
||||
gap: 1rem;
|
||||
grid-template-columns: repeat(var(--tile-column-count), max-content);
|
||||
justify-content: center;
|
||||
|
||||
@container (max-width: 60.5rem) {
|
||||
--tile-column-count: 3;
|
||||
}
|
||||
@container (max-width: 45.125rem) {
|
||||
--tile-column-count: 2;
|
||||
}
|
||||
@container (max-width: 29.75rem) {
|
||||
--tile-column-count: 1;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
@inherits DrawerStateComponentBase
|
||||
|
||||
<div class="tile">
|
||||
<NavLink href="@AddDrawerStateToUrl(NavigateUrl)">
|
||||
<DxGridLayout CssClass="tile-content" ColumnSpacing="0.75rem" RowSpacing="0.75rem">
|
||||
<Rows>
|
||||
<DxGridLayoutRow Areas="icon title" Height="auto" />
|
||||
<DxGridLayoutRow Areas="description description" Height="auto" />
|
||||
</Rows>
|
||||
<Columns>
|
||||
<DxGridLayoutColumn Width="auto" />
|
||||
<DxGridLayoutColumn />
|
||||
</Columns>
|
||||
<Items>
|
||||
<DxGridLayoutItem Area="icon" CssClass="tile-icon">
|
||||
<Template>
|
||||
<div class="@("icon " + IconCssClass)" aria-hidden="true"></div>
|
||||
</Template>
|
||||
</DxGridLayoutItem>
|
||||
<DxGridLayoutItem Area="title" CssClass="tile-title">
|
||||
<Template>
|
||||
@Title
|
||||
</Template>
|
||||
</DxGridLayoutItem>
|
||||
<DxGridLayoutItem Area="description" CssClass="tile-description">
|
||||
<Template>
|
||||
@Description
|
||||
</Template>
|
||||
</DxGridLayoutItem>
|
||||
</Items>
|
||||
</DxGridLayout>
|
||||
</NavLink>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
[Parameter] public string NavigateUrl { get; set; } = string.Empty;
|
||||
[Parameter] public string? Title { get; set; }
|
||||
[Parameter] public string? Description { get; set; }
|
||||
[Parameter] public string? IconCssClass { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
.tile {
|
||||
border-radius: 0.75rem;
|
||||
height: 7.5rem;
|
||||
transition: box-shadow 0.2s;
|
||||
width: 14.375rem;
|
||||
border: 1px solid var(--dxds-color-border-neutral-default-rest);
|
||||
}
|
||||
|
||||
.tile:hover {
|
||||
box-shadow: 0 4px 8px 0 rgba(170, 170, 170, 0.24), 0 0 2px 0 rgba(170, 170, 170, 0.2);
|
||||
}
|
||||
|
||||
.tile ::deep > a {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
::deep .tile-content {
|
||||
padding: 1rem;
|
||||
}
|
||||
|
||||
::deep .tile-icon {
|
||||
border-radius: 0.375rem;
|
||||
height: 2.75rem;
|
||||
padding: 0.75rem;
|
||||
width: 2.75rem;
|
||||
border: 1px solid var(--dxds-color-border-neutral-default-rest);
|
||||
}
|
||||
|
||||
::deep .tile-title {
|
||||
align-self: center;
|
||||
color: var(--dxds-color-content-neutral-default-rest);
|
||||
font-size: var(--dxds-font-size-base-md);
|
||||
font-weight: var(--dxds-font-weight-base-strong);
|
||||
letter-spacing: var(--dxds-letter-spacing-base-md);
|
||||
line-height: var(--dxds-line-height-base-md);
|
||||
}
|
||||
|
||||
::deep .tile-description {
|
||||
color: var(--dxds-color-content-neutral-subdued-rest);
|
||||
font-size: var(--dxds-font-size-base-sm);
|
||||
font-weight: var(--dxds-font-weight-base-default);
|
||||
letter-spacing: var(--dxds-letter-spacing-base-sm);
|
||||
line-height: var(--dxds-line-height-base-sm);
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
@page "/pdfviewer"
|
||||
|
||||
<PageTitle>PDF Viewer</PageTitle>
|
||||
|
||||
<h1>PDF Viewer</h1>
|
||||
|
||||
<DxPdfViewer CssClass="h-100 w-100" DocumentContent="DocumentContent" ZoomLevel="1" />
|
||||
|
||||
@code {
|
||||
byte[]? DocumentContent { get; set; }
|
||||
|
||||
protected override async Task OnInitializedAsync() {
|
||||
await base.OnInitializedAsync();
|
||||
|
||||
await using Stream stream =
|
||||
System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("EnvelopeGenerator.ReceiverUI.Web.Client.Documents.Invoice.pdf")
|
||||
?? throw new InvalidOperationException("Resource not found.");
|
||||
using MemoryStream ms = new();
|
||||
await stream.CopyToAsync(ms);
|
||||
DocumentContent = ms.ToArray();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
@page "/envelope-expired"
|
||||
@layout EnvelopeGenerator.ReceiverUI.Web.Client.Layout.ReceiverLayout
|
||||
@rendermode InteractiveAuto
|
||||
@inject LocalizationService Loc
|
||||
|
||||
@*
|
||||
Counterpart of Views/Envelope/EnvelopeExpired.cshtml.
|
||||
*@
|
||||
|
||||
<PageTitle>@Loc["Expired"]</PageTitle>
|
||||
|
||||
<div class="page container p-5">
|
||||
<header class="text-center">
|
||||
<div class="icon expired"></div>
|
||||
<h1>@Loc["Expired"]</h1>
|
||||
</header>
|
||||
<section class="text-center">
|
||||
<p>@Loc["DocumentSharingPeriodExpired"]</p>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
protected override async Task OnInitializedAsync() => await Loc.EnsureLoadedAsync();
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
@page "/envelopekey/{*Path}"
|
||||
@layout EnvelopeGenerator.ReceiverUI.Web.Client.Layout.ReceiverLayout
|
||||
@rendermode InteractiveAuto
|
||||
@inject NavigationManager Nav
|
||||
|
||||
@*
|
||||
Counterpart of EnvelopeKeyRedirController:
|
||||
/EnvelopeKey/{*path} ? /envelope/{path}
|
||||
Preserves backwards compatibility with links generated by older e-mails.
|
||||
*@
|
||||
|
||||
@code {
|
||||
[Parameter] public string? Path { get; set; }
|
||||
|
||||
protected override void OnInitialized()
|
||||
{
|
||||
var target = "/envelope/" + (Path ?? string.Empty).TrimStart('/');
|
||||
Nav.NavigateTo(target, replace: true);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,229 @@
|
||||
@implements IDisposable
|
||||
@inject ReceiverApiClient Api
|
||||
@inject ReceiverAuthState State
|
||||
@inject LocalizationService Loc
|
||||
|
||||
@*
|
||||
Counterpart of EnvelopeGenerator.Web/Views/Envelope/EnvelopeLocked.cshtml.
|
||||
|
||||
Renders one of three input modes based on the current auth state:
|
||||
|
||||
• Status == requires_access_code
|
||||
? AccessCode input (+ optional "2FA per SMS" toggle)
|
||||
|
||||
• Status == requires_tfa, TfaType == "sms"
|
||||
? SMS code input + countdown until TfaExpiration
|
||||
|
||||
• Status == requires_tfa, TfaType == "authenticator"
|
||||
? Authenticator code input + "set up authenticator" link
|
||||
|
||||
On submit, the matching ReceiverApiClient method is invoked. The fresh
|
||||
response replaces ReceiverAuthState.Current; the parent EnvelopePage
|
||||
re-renders and either shows the document or navigates to a terminal page.
|
||||
*@
|
||||
|
||||
<div class="page container py-4 px-4">
|
||||
|
||||
@* — Welcome banner (custom company image is added in Phase 6) — *@
|
||||
<header class="text-center">
|
||||
<div class="header-1 alert alert-secondary" role="alert">
|
||||
<h3 class="text">@Loc["WelcomeToTheESignPortal"]</h3>
|
||||
</div>
|
||||
|
||||
<div class="icon locked @(IsTfa ? "tfa" : "") mt-4 mb-1">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" fill="currentColor"
|
||||
class="bi bi-shield-lock" viewBox="0 0 16 16">
|
||||
<path d="M5.338 1.59a61 61 0 0 0-2.837.856.48.48 0 0 0-.328.39c-.554 4.157.726 7.19 2.253 9.188a10.7 10.7 0 0 0 2.287 2.233c.346.244.652.42.893.533q.18.085.293.118a1 1 0 0 0 .101.025 1 1 0 0 0 .1-.025q.114-.034.294-.118c.24-.113.547-.29.893-.533a10.7 10.7 0 0 0 2.287-2.233c1.527-1.997 2.807-5.031 2.253-9.188a.48.48 0 0 0-.328-.39c-.651-.213-1.75-.56-2.837-.855C9.552 1.29 8.531 1.067 8 1.067c-.53 0-1.552.223-2.662.524zM5.072.56C6.157.265 7.31 0 8 0s1.843.265 2.928.56c1.11.3 2.229.655 2.887.87a1.54 1.54 0 0 1 1.044 1.262c.596 4.477-.787 7.795-2.465 9.99a11.8 11.8 0 0 1-2.517 2.453 7 7 0 0 1-1.048.625c-.28.132-.581.24-.829.24s-.548-.108-.829-.24a7 7 0 0 1-1.048-.625 11.8 11.8 0 0 1-2.517-2.453C1.928 10.487.545 7.169 1.141 2.692A1.54 1.54 0 0 1 2.185 1.43 63 63 0 0 1 5.072.56" />
|
||||
<path d="M9.5 6.5a1.5 1.5 0 0 1-1 1.415l.385 1.99a.5.5 0 0 1-.491.595h-.788a.5.5 0 0 1-.49-.595l.384-1.99a1.5 1.5 0 1 1 2-1.415" />
|
||||
</svg>
|
||||
</div>
|
||||
<h1>@Loc[$"LockedTitle{CodeKey}"]</h1>
|
||||
</header>
|
||||
|
||||
@* — "Set up authenticator" hint, shown only on the authenticator step — *@
|
||||
@if (IsAuthenticator)
|
||||
{
|
||||
<section class="text-center">
|
||||
<p class="m-0 p-0">
|
||||
@Loc["AuthenticatorSetup_Prefix"]
|
||||
<a class="icon-link m-0 p-0" href="@($"/tfa/{EnvelopeKey}")" target="_blank" style="text-decoration:none">
|
||||
@Loc["AuthenticatorSetup_Link"] <i class="bi bi-box-arrow-up-right"></i>
|
||||
</a>
|
||||
@Loc["AuthenticatorSetup_Suffix"]
|
||||
</p>
|
||||
</section>
|
||||
}
|
||||
|
||||
<section class="text-center">
|
||||
<p>@Loc[$"LockedBody{CodeKey}"]</p>
|
||||
</section>
|
||||
|
||||
<div class="row m-0 p-0">
|
||||
<div class="access-code-panel justify-content-center align-items-center p-0 m-0">
|
||||
<EditForm Model="this" OnValidSubmit="HandleSubmit" Context="editContext"
|
||||
id="form-access-code" class="form form-floating mb-0">
|
||||
<div class="form-floating access-code-form-floating">
|
||||
|
||||
<input id="access_code" type="password" class="form-control"
|
||||
placeholder="@Loc[$"LockedCodeLabel{CodeKey}"]"
|
||||
@bind="Code" @bind:event="oninput"
|
||||
disabled="@_submitting" required />
|
||||
<label for="access_code">@Loc[$"LockedCodeLabel{CodeKey}"]</label>
|
||||
|
||||
<DxButton SubmitFormOnClick="true" Enabled="@(!_submitting)"
|
||||
RenderStyle="ButtonRenderStyle.Primary"
|
||||
CssClass="btn btn-primary">
|
||||
<span class="material-symbols-outlined">login</span>
|
||||
</DxButton>
|
||||
|
||||
@if (ShowSmsToggle)
|
||||
{
|
||||
<div class="form-check form-switch tfa-sms">
|
||||
<input class="form-check-input" type="checkbox" role="switch"
|
||||
id="flexSwitchCheckChecked"
|
||||
@bind="PreferSms"
|
||||
disabled="@(!State.Current!.HasPhoneNumber)" />
|
||||
<label class="form-check-label" for="flexSwitchCheckChecked">2FA per SMS</label>
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (IsSms && _smsRemaining is not null)
|
||||
{
|
||||
<div id="sms-timer" class="alert alert-primary" role="alert">@_smsRemaining</div>
|
||||
}
|
||||
</div>
|
||||
</EditForm>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if (!string.IsNullOrEmpty(State.Current?.ErrorMessage))
|
||||
{
|
||||
<div id="access-code-error-message" class="alert alert-danger row" role="alert">
|
||||
@State.Current.ErrorMessage
|
||||
</div>
|
||||
}
|
||||
|
||||
<section class="no-receiver-explanation text-center">
|
||||
<details>
|
||||
<summary>@Loc[$"LockedFooterTitle{CodeKey}"]</summary>
|
||||
<p>
|
||||
@Loc.Format($"LockedFooterBody{CodeKey}",
|
||||
State.Current?.SenderEmail ?? string.Empty,
|
||||
$"Envelope - {State.Current?.Title}",
|
||||
string.Empty)
|
||||
</p>
|
||||
</details>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
[Parameter] public string EnvelopeKey { get; set; } = string.Empty;
|
||||
|
||||
private string Code { get; set; } = string.Empty;
|
||||
private bool PreferSms { get; set; }
|
||||
private bool _submitting;
|
||||
private System.Threading.Timer? _smsTimer;
|
||||
private string? _smsRemaining;
|
||||
|
||||
// — Mode helpers ????????????????????????????????????????????????
|
||||
private bool IsAccessCodeStep => State.Current?.Status == ReceiverAuthStatus.RequiresAccessCode;
|
||||
private bool IsTfa => State.Current?.Status == ReceiverAuthStatus.RequiresTfa;
|
||||
private bool IsSms => IsTfa && State.Current?.TfaType == "sms";
|
||||
private bool IsAuthenticator => IsTfa && State.Current?.TfaType == "authenticator";
|
||||
|
||||
/// <summary>
|
||||
/// Mirrors the legacy view's "codeKeyName" suffix used to pick the right
|
||||
/// resource string ("LockedTitleAccess", "LockedTitleSms", ...).
|
||||
/// </summary>
|
||||
private string CodeKey => IsSms ? "Sms" : IsAuthenticator ? "Authenticator" : "Access";
|
||||
|
||||
private bool ShowSmsToggle =>
|
||||
IsAccessCodeStep
|
||||
&& (State.Current?.TfaEnabled ?? false);
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
await Loc.EnsureLoadedAsync();
|
||||
State.Changed += OnStateChanged;
|
||||
ResetSmsTimer();
|
||||
}
|
||||
|
||||
private void OnStateChanged()
|
||||
{
|
||||
ResetSmsTimer();
|
||||
InvokeAsync(StateHasChanged);
|
||||
}
|
||||
|
||||
private async Task HandleSubmit()
|
||||
{
|
||||
if (_submitting || string.IsNullOrWhiteSpace(Code))
|
||||
return;
|
||||
|
||||
_submitting = true;
|
||||
try
|
||||
{
|
||||
ReceiverAuthResponse? res;
|
||||
if (IsAccessCodeStep)
|
||||
{
|
||||
res = await Api.SubmitAccessCodeAsync(EnvelopeKey, new AccessCodeRequest
|
||||
{
|
||||
AccessCode = Code,
|
||||
PreferSms = PreferSms
|
||||
});
|
||||
}
|
||||
else // TFA step
|
||||
{
|
||||
res = await Api.SubmitTfaCodeAsync(EnvelopeKey, new TfaCodeRequest
|
||||
{
|
||||
Code = Code,
|
||||
Type = State.Current?.TfaType ?? "authenticator"
|
||||
});
|
||||
}
|
||||
|
||||
Code = string.Empty;
|
||||
State.Set(EnvelopeKey, res);
|
||||
}
|
||||
finally
|
||||
{
|
||||
_submitting = false;
|
||||
}
|
||||
}
|
||||
|
||||
// — SMS countdown ???????????????????????????????????????????????
|
||||
private void ResetSmsTimer()
|
||||
{
|
||||
_smsTimer?.Dispose();
|
||||
_smsTimer = null;
|
||||
_smsRemaining = null;
|
||||
|
||||
if (!IsSms || State.Current?.TfaExpiration is not DateTime exp)
|
||||
return;
|
||||
|
||||
UpdateRemaining(exp);
|
||||
_smsTimer = new System.Threading.Timer(_ =>
|
||||
{
|
||||
UpdateRemaining(exp);
|
||||
InvokeAsync(StateHasChanged);
|
||||
}, null, 1000, 1000);
|
||||
}
|
||||
|
||||
private void UpdateRemaining(DateTime expiration)
|
||||
{
|
||||
var diff = expiration - DateTime.Now;
|
||||
if (diff <= TimeSpan.Zero)
|
||||
{
|
||||
_smsRemaining = "00:00";
|
||||
_smsTimer?.Dispose();
|
||||
_smsTimer = null;
|
||||
return;
|
||||
}
|
||||
_smsRemaining = $"{(int)diff.TotalMinutes:00}:{diff.Seconds:00}";
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
State.Changed -= OnStateChanged;
|
||||
_smsTimer?.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
@page "/envelope-not-found"
|
||||
@layout EnvelopeGenerator.ReceiverUI.Web.Client.Layout.ReceiverLayout
|
||||
@rendermode InteractiveAuto
|
||||
@inject LocalizationService Loc
|
||||
|
||||
@*
|
||||
Counterpart of the "EnvelopeNotFound" view (rendered by
|
||||
EnvelopeGenerator.Web.Extensions.ViewExtensions.ViewEnvelopeNotFound()).
|
||||
*@
|
||||
|
||||
<PageTitle>@Loc["EnvelopeNotFoundTitle"]</PageTitle>
|
||||
|
||||
<div class="page container p-5">
|
||||
<header class="text-center">
|
||||
<h1>@Loc["EnvelopeNotFoundTitle"]</h1>
|
||||
</header>
|
||||
<section class="text-center">
|
||||
<p>@Loc["EnvelopeNotFoundBody"]</p>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
protected override async Task OnInitializedAsync() => await Loc.EnsureLoadedAsync();
|
||||
}
|
||||
@@ -0,0 +1,110 @@
|
||||
@page "/envelope/{Key}"
|
||||
@layout EnvelopeGenerator.ReceiverUI.Web.Client.Layout.ReceiverLayout
|
||||
@rendermode InteractiveAuto
|
||||
@inject ReceiverApiClient Api
|
||||
@inject ReceiverAuthState State
|
||||
@inject LocalizationService Loc
|
||||
@inject NavigationManager Nav
|
||||
|
||||
@*
|
||||
Counterpart of EnvelopeGenerator.Web/Controllers/EnvelopeController.Main.
|
||||
|
||||
Behavior:
|
||||
1. Calls GET /api/receiverauth/{key}/status.
|
||||
2. Routes to a sub-view based on the response Status:
|
||||
- requires_access_code / requires_tfa ? EnvelopeLockedView (Phase 3)
|
||||
- show_document ? ShowEnvelopeView (Phase 4)
|
||||
- already_signed ? /envelope-signed
|
||||
- rejected ? /envelope-rejected
|
||||
- not_found ? /envelope-not-found
|
||||
- expired ? /envelope-expired
|
||||
- error ? inline error banner
|
||||
|
||||
Sub-views are simple placeholders here; they are filled with real UI
|
||||
in later phases. The routing skeleton just needs to compile and
|
||||
transition correctly.
|
||||
*@
|
||||
|
||||
<PageTitle>@(Auth?.Title ?? Loc["SignDoc"])</PageTitle>
|
||||
|
||||
@if (_loading)
|
||||
{
|
||||
<div class="page container p-5 text-center">
|
||||
<DxLoadingPanel Visible="true" IsContentBlocked="false" ApplyBackgroundShading="false" />
|
||||
</div>
|
||||
}
|
||||
else if (Auth is null)
|
||||
{
|
||||
<div class="page container p-5 text-center">
|
||||
<p class="alert alert-danger">@Loc["UnexpectedErrorTitle"]</p>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (Auth.Status)
|
||||
{
|
||||
case ReceiverAuthStatus.RequiresAccessCode:
|
||||
case ReceiverAuthStatus.RequiresTfa:
|
||||
<EnvelopeLockedView EnvelopeKey="@Key" />
|
||||
break;
|
||||
|
||||
case ReceiverAuthStatus.ShowDocument:
|
||||
<ShowEnvelopeView EnvelopeKey="@Key" />
|
||||
break;
|
||||
|
||||
default:
|
||||
<div class="page container p-5 text-center">
|
||||
<p class="alert alert-warning">@(Auth.ErrorMessage ?? Loc["UnexpectedErrorTitle"])</p>
|
||||
</div>
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@code {
|
||||
[Parameter] public string Key { get; set; } = string.Empty;
|
||||
|
||||
private bool _loading = true;
|
||||
private ReceiverAuthResponse? Auth => State.Current;
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
await Loc.EnsureLoadedAsync();
|
||||
State.Changed += OnStateChanged;
|
||||
}
|
||||
|
||||
protected override async Task OnParametersSetAsync()
|
||||
{
|
||||
// Re-fetch status if the route key changed or no response loaded yet.
|
||||
if (State.EnvelopeKey != Key || State.Current is null)
|
||||
{
|
||||
_loading = true;
|
||||
var res = await Api.GetStatusAsync(Key);
|
||||
State.Set(Key, res);
|
||||
RedirectIfTerminal(res);
|
||||
_loading = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
_loading = false;
|
||||
}
|
||||
}
|
||||
|
||||
private void RedirectIfTerminal(ReceiverAuthResponse? res)
|
||||
{
|
||||
if (res is null) return;
|
||||
var target = res.Status switch
|
||||
{
|
||||
ReceiverAuthStatus.AlreadySigned => "/envelope-signed",
|
||||
ReceiverAuthStatus.Rejected => "/envelope-rejected",
|
||||
ReceiverAuthStatus.NotFound => "/envelope-not-found",
|
||||
ReceiverAuthStatus.Expired => "/envelope-expired",
|
||||
_ => null
|
||||
};
|
||||
if (target is not null)
|
||||
Nav.NavigateTo(target, replace: true);
|
||||
}
|
||||
|
||||
private void OnStateChanged() => InvokeAsync(StateHasChanged);
|
||||
|
||||
public void Dispose() => State.Changed -= OnStateChanged;
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
@page "/envelope-rejected"
|
||||
@layout EnvelopeGenerator.ReceiverUI.Web.Client.Layout.ReceiverLayout
|
||||
@rendermode InteractiveAuto
|
||||
@inject ReceiverAuthState State
|
||||
@inject LocalizationService Loc
|
||||
|
||||
@*
|
||||
Counterpart of Views/Envelope/EnvelopeRejected.cshtml.
|
||||
Reads envelope title / sender info from the cached auth response,
|
||||
which is populated by EnvelopePage before navigation occurs.
|
||||
*@
|
||||
|
||||
<PageTitle>@Loc["DocRejected"]</PageTitle>
|
||||
|
||||
<div class="page container p-5">
|
||||
<header class="text-center">
|
||||
<div class="icon rejected"></div>
|
||||
<h1>@Loc["RejectionInfo1"]</h1>
|
||||
</header>
|
||||
<section class="text-center">
|
||||
<small class="text-body-secondary">
|
||||
@(Loc["RejectionInfo2"])
|
||||
</small>
|
||||
@if (State.Current is not null)
|
||||
{
|
||||
<p class="mt-3">
|
||||
<strong>@State.Current.Title</strong>
|
||||
@if (!string.IsNullOrEmpty(State.Current.SenderEmail))
|
||||
{
|
||||
<span> — <a href="mailto:@State.Current.SenderEmail">@State.Current.SenderEmail</a></span>
|
||||
}
|
||||
</p>
|
||||
}
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
protected override async Task OnInitializedAsync() => await Loc.EnsureLoadedAsync();
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
@page "/envelope-signed"
|
||||
@layout EnvelopeGenerator.ReceiverUI.Web.Client.Layout.ReceiverLayout
|
||||
@rendermode InteractiveAuto
|
||||
@inject LocalizationService Loc
|
||||
|
||||
@*
|
||||
Counterpart of Views/Envelope/EnvelopeSigned.cshtml.
|
||||
Full styling (icon + section card) is migrated in Phase 6.
|
||||
*@
|
||||
|
||||
<PageTitle>@Loc["DocumentSuccessfullySigned"]</PageTitle>
|
||||
|
||||
<div class="page container p-5">
|
||||
<header class="text-center">
|
||||
<div class="icon signed">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" fill="currentColor"
|
||||
class="bi bi-check2-circle" viewBox="0 0 16 16">
|
||||
<path d="M2.5 8a5.5 5.5 0 0 1 8.25-4.764.5.5 0 0 0 .5-.866A6.5 6.5 0 1 0 14.5 8a.5.5 0 0 0-1 0 5.5 5.5 0 1 1-11 0z" />
|
||||
<path d="M15.354 3.354a.5.5 0 0 0-.708-.708L8 9.293 5.354 6.646a.5.5 0 1 0-.708.708l3 3a.5.5 0 0 0 .708 0l7-7z" />
|
||||
</svg>
|
||||
</div>
|
||||
<h1>@Loc["DocumentSuccessfullySigned"]</h1>
|
||||
</header>
|
||||
<section class="text-center">
|
||||
<p>@Loc["DocumentSignedConfirmationMessage"]</p>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
protected override async Task OnInitializedAsync() => await Loc.EnsureLoadedAsync();
|
||||
}
|
||||
@@ -0,0 +1,88 @@
|
||||
@page "/error404"
|
||||
@layout EnvelopeGenerator.ReceiverUI.Web.Client.Layout.ReceiverLayout
|
||||
@rendermode InteractiveAuto
|
||||
@inject LocalizationService Loc
|
||||
@inject NavigationManager Nav
|
||||
@inject IJSRuntime JS
|
||||
|
||||
@*
|
||||
Counterpart of HomeController.Error404 ? Views/Shared/_Error.cshtml.
|
||||
|
||||
The legacy view fully replaces the document with a black-space themed
|
||||
layout. In Blazor we keep the receiver layout intact (so the user can
|
||||
still reach the language switcher) and only scope error-space.css to
|
||||
this page via <HeadContent>. JS animation (visor + cord) is initialized
|
||||
once after the canvas elements are in the DOM.
|
||||
*@
|
||||
|
||||
<HeadContent>
|
||||
<link rel="stylesheet" href="/css/error-space.css" />
|
||||
</HeadContent>
|
||||
|
||||
<PageTitle>404</PageTitle>
|
||||
|
||||
<div class="error-space-stage" style="position:relative; height:80vh; overflow:hidden">
|
||||
<div class="moon"></div>
|
||||
<div class="moon__crater moon__crater1"></div>
|
||||
<div class="moon__crater moon__crater2"></div>
|
||||
<div class="moon__crater moon__crater3"></div>
|
||||
|
||||
<div class="star star1"></div>
|
||||
<div class="star star2"></div>
|
||||
<div class="star star3"></div>
|
||||
<div class="star star4"></div>
|
||||
<div class="star star5"></div>
|
||||
|
||||
<div class="error">
|
||||
<div class="error__title">404</div>
|
||||
<div class="error__subtitle">@Loc["PageNotFound"]</div>
|
||||
<div class="error__description">@Loc["PageNotFoundDescription"]</div>
|
||||
<a href="/" class="error__button error__button--active">@Loc["Home"]</a>
|
||||
</div>
|
||||
|
||||
<div class="astronaut">
|
||||
<div class="astronaut__backpack"></div>
|
||||
<div class="astronaut__body"></div>
|
||||
<div class="astronaut__body__chest"></div>
|
||||
<div class="astronaut__arm-left1"></div>
|
||||
<div class="astronaut__arm-left2"></div>
|
||||
<div class="astronaut__arm-right1"></div>
|
||||
<div class="astronaut__arm-right2"></div>
|
||||
<div class="astronaut__arm-thumb-left"></div>
|
||||
<div class="astronaut__arm-thumb-right"></div>
|
||||
<div class="astronaut__leg-left"></div>
|
||||
<div class="astronaut__leg-right"></div>
|
||||
<div class="astronaut__foot-left"></div>
|
||||
<div class="astronaut__foot-right"></div>
|
||||
<div class="astronaut__wrist-left"></div>
|
||||
<div class="astronaut__wrist-right"></div>
|
||||
|
||||
<div class="astronaut__cord">
|
||||
<canvas id="cord" height="500" width="500"></canvas>
|
||||
</div>
|
||||
|
||||
<div class="astronaut__head">
|
||||
<canvas id="visor" width="60" height="60"></canvas>
|
||||
<div class="astronaut__head-visor-flare1"></div>
|
||||
<div class="astronaut__head-visor-flare2"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
protected override async Task OnInitializedAsync() => await Loc.EnsureLoadedAsync();
|
||||
|
||||
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||
{
|
||||
if (!firstRender) return;
|
||||
try
|
||||
{
|
||||
const string js = "if (!window.__errSpaceLoaded) { window.__errSpaceLoaded = true; var s = document.createElement('script'); s.src = '/js/error-space.js'; document.body.appendChild(s); }";
|
||||
await JS.InvokeVoidAsync("eval", js);
|
||||
}
|
||||
catch
|
||||
{
|
||||
// Animation is purely decorative — failing to load it is fine.
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
@page "/"
|
||||
@layout EnvelopeGenerator.ReceiverUI.Web.Client.Layout.ReceiverLayout
|
||||
@rendermode InteractiveAuto
|
||||
@inject LocalizationService Loc
|
||||
|
||||
<PageTitle>@Loc["Home"]</PageTitle>
|
||||
|
||||
@*
|
||||
Counterpart of EnvelopeGenerator.Web/Views/Home/Main.cshtml.
|
||||
|
||||
The legacy view animates the description with typed.js. The Blazor
|
||||
version omits the typewriter effect because it adds another JS
|
||||
dependency for marginal value; the static description is shown
|
||||
instead. Custom company / app logos are loaded from /img/ if
|
||||
available, otherwise gracefully hidden via onerror.
|
||||
*@
|
||||
|
||||
<div class="page container py-4 px-4">
|
||||
<header class="text-center">
|
||||
<div class="header-1 alert alert-secondary" role="alert">
|
||||
<h3 class="text">@Loc["WelcomeToTheESignPortal"]</h3>
|
||||
<img class="dd-locked-logo" src="/img/company.svg"
|
||||
onerror="this.style.display='none'" alt="" />
|
||||
</div>
|
||||
<div class="icon mt-4 mb-1">
|
||||
<img class="signFlow-logo" src="/img/sign_flow_horizontal.svg"
|
||||
onerror="this.style.display='none'" alt="signFLOW" />
|
||||
</div>
|
||||
</header>
|
||||
<section class="text-center">
|
||||
<div class="alert alert-light" role="alert">
|
||||
<p class="home-description">@Loc["HomePageDescription"]</p>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
await Loc.EnsureLoadedAsync();
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user