Compare commits
18 Commits
91e90b322b
...
refactor/w
| Author | SHA1 | Date | |
|---|---|---|---|
| 0cf603fc79 | |||
| e3d2225a44 | |||
| 595bbf3f25 | |||
| ee7d01ed7f | |||
| 85104511fd | |||
| 1b87528cca | |||
| 2913514da8 | |||
| ce7e70162b | |||
| 5e00b6e9ec | |||
| f0b4c8d00c | |||
| abf616c115 | |||
| 42585e1f2c | |||
| ff10fc6b0a | |||
| 7222f7e9a7 | |||
| d913b949e0 | |||
| a35e05d016 | |||
| 8aabc3e233 | |||
| 8b7f99eb76 |
@@ -62,7 +62,7 @@ public record EnvelopeDto : IEnvelope
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? ContractType { get; set; }
|
public ContractType? ContractType { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Default value is 'de-DE'
|
/// Default value is 'de-DE'
|
||||||
|
|||||||
@@ -80,5 +80,5 @@ public class EnvelopeTypeDto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the contract type associated with the envelope type.
|
/// Gets or sets the contract type associated with the envelope type.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? ContractType { get; set; }
|
public ContractType? ContractType { get; set; }
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public interface IRequestContext
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
string? Origin { get; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
using EnvelopeGenerator.Application.Common.Extensions;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public record DocumentReceivedNotification : EnvelopeNotificationBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required string DocumentTitle { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required string NameReceiver { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required string NameSender { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [SIGNATURE_TYPE]
|
||||||
|
/// </summary>
|
||||||
|
public required bool IsReadAndConfirm { private get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string SignatureType => IsReadAndConfirm ? "Signieren" : "Lesen und bestätigen";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required bool AdvancedSignature { private get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string DocumentProcess => AdvancedSignature ? " und elektronisch unterschreiben" : string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required Uri Origin { private get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required string EnvelopeUuid { private get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required string ReceiverSignature { private get; init; }
|
||||||
|
|
||||||
|
private Uri EnvelopeURL => new(Origin, $"Envelope/{(EnvelopeUuid, ReceiverSignature).ToEnvelopeKey()}");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string LinkToDocument => EnvelopeURL.AbsoluteUri;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string LinkToDocumentText
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
var urlText = EnvelopeURL.ToString();
|
||||||
|
return $"{urlText[..Math.Min(urlText.Length, 40)]}..";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public required string Message { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string NamePortal { get; set; } = "signFLOW Portal";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public override EmailTemplateType GetTemplateType()
|
||||||
|
{
|
||||||
|
return EmailTemplateType.DocumentReceived;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,9 +1,11 @@
|
|||||||
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public record DocumentSignedNotification
|
public record DocumentSignedNotification : EnvelopeNotificationBase
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
@@ -23,7 +25,27 @@ public record DocumentSignedNotification
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public required byte[] Attachment { get; init; }
|
public required bool IsReadAndConfirm { private get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string ReceiverAction => IsReadAndConfirm ? "bestätigt" : "unterschrieben";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string FinalStatus => IsReadAndConfirm ? "Lesebestätigung" : "Signatur";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string FinalAction => IsReadAndConfirm ? "Empfänger bestätigt" : "Vertragspartner unterzeichnet";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public override EmailTemplateType GetTemplateType() => EmailTemplateType.DocumentSigned;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public abstract record EnvelopeNotificationBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public abstract EmailTemplateType GetTemplateType();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public IReadOnlyList<(string FileName, byte[] Content)>? Attachments { get; init; }
|
||||||
|
}
|
||||||
@@ -8,9 +8,11 @@ public interface IEnvelopeNotificationService
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="email"></param>
|
/// <typeparam name="TEnvelopeNotificationBase"></typeparam>
|
||||||
/// <param name="documentSigned"></param>
|
/// <param name="receiverEmail"></param>
|
||||||
|
/// <param name="notification"></param>
|
||||||
/// <param name="cancel"></param>
|
/// <param name="cancel"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public Task Notify(string email, DocumentSignedNotification documentSigned, CancellationToken cancel = default);
|
public Task Notify<TEnvelopeNotificationBase>(string receiverEmail, TEnvelopeNotificationBase notification, CancellationToken cancel = default)
|
||||||
|
where TEnvelopeNotificationBase : EnvelopeNotificationBase;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
|
using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
|
||||||
using EnvelopeGenerator.Application.Common.Configurations;
|
using EnvelopeGenerator.Application.Common.Configurations;
|
||||||
using EnvelopeGenerator.Application.Common.Extensions;
|
using EnvelopeGenerator.Application.Common.Extensions;
|
||||||
|
using EnvelopeGenerator.Application.Common.Notifications.EnvelopeDeleted;
|
||||||
using EnvelopeGenerator.Domain.Constants;
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
using EnvelopeGenerator.Domain.Entities;
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
using MediatR;
|
using MediatR;
|
||||||
@@ -96,6 +97,10 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
|
|||||||
/// <exception cref="NotImplementedException"></exception>
|
/// <exception cref="NotImplementedException"></exception>
|
||||||
public virtual async Task Handle(TNotification notification, CancellationToken cancel)
|
public virtual async Task Handle(TNotification notification, CancellationToken cancel)
|
||||||
{
|
{
|
||||||
|
// do not send email if the envelope is deleted and the status is less than or equal to EnvelopeSaved
|
||||||
|
if (notification is EnvelopeDeletedNotification delNot && delNot.Envelope.Status <= EnvelopeStatus.EnvelopeSaved)
|
||||||
|
return;
|
||||||
|
|
||||||
var placeHolders = CreatePlaceHolders(notification);
|
var placeHolders = CreatePlaceHolders(notification);
|
||||||
|
|
||||||
var temp = await TempRepo
|
var temp = await TempRepo
|
||||||
|
|||||||
@@ -130,10 +130,27 @@ public record CreateEnvelopeCommand : IRequest<EnvelopeDto?>
|
|||||||
public bool UseSQLExecutor { get; set; } = true;
|
public bool UseSQLExecutor { get; set; } = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="DataAsBase64"></param>
|
||||||
public record CreateEnvelopeDocumentDto(string DataAsBase64);
|
public record CreateEnvelopeDocumentDto(string DataAsBase64);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="X"></param>
|
||||||
|
/// <param name="Y"></param>
|
||||||
|
/// <param name="Page"></param>
|
||||||
public record CreateEnvelopeFieldDto(double X, double Y, int Page);
|
public record CreateEnvelopeFieldDto(double X, double Y, int Page);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="EmailAddress"></param>
|
||||||
|
/// <param name="Name"></param>
|
||||||
|
/// <param name="PhoneNumber"></param>
|
||||||
|
/// <param name="Fields"></param>
|
||||||
public record CreateEnvelopeReceiverDto(
|
public record CreateEnvelopeReceiverDto(
|
||||||
string EmailAddress,
|
string EmailAddress,
|
||||||
string? Name,
|
string? Name,
|
||||||
|
|||||||
@@ -1,70 +1,66 @@
|
|||||||
using AutoMapper;
|
using AutoMapper;
|
||||||
using MediatR;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
using DigitalData.Core.Abstraction.Application.Repository;
|
using DigitalData.Core.Abstraction.Application.Repository;
|
||||||
using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
|
|
||||||
using DigitalData.Core.Exceptions;
|
using DigitalData.Core.Exceptions;
|
||||||
using EnvelopeGenerator.Domain.Entities;
|
using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
|
||||||
using EnvelopeGenerator.Application.Common.Dto;
|
using DigitalData.UserManager.Domain.Entities;
|
||||||
using EnvelopeGenerator.Application.Common.Configurations;
|
using EnvelopeGenerator.Application.Common.Configurations;
|
||||||
|
using EnvelopeGenerator.Application.Common.Dto;
|
||||||
using EnvelopeGenerator.Application.Common.Extensions;
|
using EnvelopeGenerator.Application.Common.Extensions;
|
||||||
|
using EnvelopeGenerator.Application.Common.Interfaces;
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
using EnvelopeGenerator.Application.Common.Interfaces.Services;
|
||||||
|
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
|
using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
|
||||||
using EnvelopeGenerator.Application.Histories.Commands;
|
using EnvelopeGenerator.Application.Histories.Commands;
|
||||||
using EnvelopeGenerator.Domain.Constants;
|
|
||||||
using EnvelopeGenerator.Domain;
|
using EnvelopeGenerator.Domain;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
|
using EnvelopeGenerator.Domain.Interfaces;
|
||||||
|
using MediatR;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Application.Envelopes.Commands;
|
namespace EnvelopeGenerator.Application.Envelopes.Commands;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeCommand, EnvelopeDto?>
|
/// <param name="Provider"></param>
|
||||||
|
/// <param name="Mapper"></param>
|
||||||
|
/// <param name="EnvNtfService"></param>
|
||||||
|
/// <param name="ReqCntxt"></param>
|
||||||
|
/// <param name="Logger"></param>
|
||||||
|
public class CreateEnvelopeCommandHandler(IServiceProvider Provider, IMapper Mapper, IEnvelopeNotificationService EnvNtfService, IRequestContext ReqCntxt, ILogger<CreateEnvelopeCommandHandler> Logger) : IRequestHandler<CreateEnvelopeCommand, EnvelopeDto?>
|
||||||
{
|
{
|
||||||
private readonly IServiceProvider _provider;
|
private IEnvelopeExecutor Executor => Provider.GetRequiredService<IEnvelopeExecutor>();
|
||||||
|
|
||||||
private IEnvelopeExecutor Executor => _provider.GetRequiredService<IEnvelopeExecutor>();
|
private IRepository<Envelope> Repository => Provider.GetRequiredService<IRepository<Envelope>>();
|
||||||
|
|
||||||
private IRepository<Envelope> Repository => _provider.GetRequiredService<IRepository<Envelope>>();
|
private IRepository<Document> DocumentRepository => Provider.GetRequiredService<IRepository<Document>>();
|
||||||
|
|
||||||
private IRepository<Document> DocumentRepository => _provider.GetRequiredService<IRepository<Document>>();
|
private IRepository<EnvelopeReceiver> EnvelopeReceiverRepository => Provider.GetRequiredService<IRepository<EnvelopeReceiver>>();
|
||||||
|
|
||||||
private IRepository<EnvelopeReceiver> EnvelopeReceiverRepository => _provider.GetRequiredService<IRepository<EnvelopeReceiver>>();
|
private IRepository<EnvelopeType> EnvelopeTypeRepository => Provider.GetRequiredService<IRepository<EnvelopeType>>();
|
||||||
|
|
||||||
private IRepository<EnvelopeType> EnvelopeTypeRepository => _provider.GetRequiredService<IRepository<EnvelopeType>>();
|
private IRepository<Receiver> ReceiverRepository => Provider.GetRequiredService<IRepository<Receiver>>();
|
||||||
|
|
||||||
private IRepository<Receiver> ReceiverRepository => _provider.GetRequiredService<IRepository<Receiver>>();
|
private IRepository<DocReceiverElement> DocReceiverElementRepository => Provider.GetRequiredService<IRepository<DocReceiverElement>>();
|
||||||
|
|
||||||
private IRepository<DocReceiverElement> DocReceiverElementRepository => _provider.GetRequiredService<IRepository<DocReceiverElement>>();
|
private IRepository<EmailTemplate> EmailTemplateRepository => Provider.GetRequiredService<IRepository<EmailTemplate>>();
|
||||||
|
|
||||||
private IRepository<EmailTemplate> EmailTemplateRepository => _provider.GetRequiredService<IRepository<EmailTemplate>>();
|
private IRepository<EmailOut> EmailOutRepository => Provider.GetRequiredService<IRepository<EmailOut>>();
|
||||||
|
|
||||||
private IRepository<EmailOut> EmailOutRepository => _provider.GetRequiredService<IRepository<EmailOut>>();
|
private MailParams MailParams => Provider.GetRequiredService<IOptions<MailParams>>().Value;
|
||||||
|
|
||||||
private MailParams MailParams => _provider.GetRequiredService<IOptions<MailParams>>().Value;
|
private DispatcherParams DispatcherParams => Provider.GetRequiredService<IOptions<DispatcherParams>>().Value;
|
||||||
|
|
||||||
private DispatcherParams DispatcherParams => _provider.GetRequiredService<IOptions<DispatcherParams>>().Value;
|
private SignatureFieldParams SignatureFieldParams => Provider.GetRequiredService<IOptionsMonitor<SignatureFieldParams>>().CurrentValue;
|
||||||
|
|
||||||
private SignatureFieldParams SignatureFieldParams => _provider.GetRequiredService<IOptionsMonitor<SignatureFieldParams>>().CurrentValue;
|
[Obsolete("Use IConfigService instead.")]
|
||||||
|
private IConfigService ConfigService => Provider.GetRequiredService<IConfigService>();
|
||||||
|
|
||||||
private IConfigService ConfigService => _provider.GetRequiredService<IConfigService>();
|
private IMediator Mediator => Provider.GetRequiredService<IMediator>();
|
||||||
|
|
||||||
private IMediator Mediator => _provider.GetRequiredService<IMediator>();
|
|
||||||
|
|
||||||
private readonly IMapper _mapper;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
///
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="provider"></param>
|
|
||||||
/// <param name="mapper"></param>
|
|
||||||
public CreateEnvelopeCommandHandler(IServiceProvider provider, IMapper mapper)
|
|
||||||
{
|
|
||||||
_provider = provider;
|
|
||||||
_mapper = mapper;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
@@ -232,7 +228,7 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
.ThenInclude(er => er.Receiver)
|
.ThenInclude(er => er.Receiver)
|
||||||
.FirstAsync(e => e.Id == envelope.Id, cancel);
|
.FirstAsync(e => e.Id == envelope.Id, cancel);
|
||||||
|
|
||||||
return _mapper.Map<EnvelopeDto>(envelope);
|
return Mapper.Map<EnvelopeDto>(envelope);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<EnvelopeSettings> ResolveEnvelopeSettingsAsync(CreateEnvelopeCommand request, Envelope? existing, CancellationToken cancel)
|
private async Task<EnvelopeSettings> ResolveEnvelopeSettingsAsync(CreateEnvelopeCommand request, Envelope? existing, CancellationToken cancel)
|
||||||
@@ -301,7 +297,7 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
ExpiresWarningWhen: expiresWarningWhenDays > 0 ? DateTime.Now.AddDays(expiresWarningWhenDays) : null,
|
ExpiresWarningWhen: expiresWarningWhenDays > 0 ? DateTime.Now.AddDays(expiresWarningWhenDays) : null,
|
||||||
ContractType: existing?.ContractType
|
ContractType: existing?.ContractType
|
||||||
?? selectedType?.ContractType
|
?? selectedType?.ContractType
|
||||||
?? (int)ContractType.Contract);
|
?? ContractType.Contract);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string ResolveLanguage(string? preferred, string? fallback1, string? fallback2)
|
private static string ResolveLanguage(string? preferred, string? fallback1, string? fallback2)
|
||||||
@@ -332,7 +328,7 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
int ExpiresWarningWhenDays,
|
int ExpiresWarningWhenDays,
|
||||||
DateTime? ExpiresWhen,
|
DateTime? ExpiresWhen,
|
||||||
DateTime? ExpiresWarningWhen,
|
DateTime? ExpiresWarningWhen,
|
||||||
int ContractType);
|
ContractType ContractType);
|
||||||
|
|
||||||
private async Task<string> ResolveSenderReferenceAsync(Envelope envelope, CancellationToken cancel)
|
private async Task<string> ResolveSenderReferenceAsync(Envelope envelope, CancellationToken cancel)
|
||||||
{
|
{
|
||||||
@@ -531,15 +527,15 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
if (!hasDocument)
|
if (!hasDocument)
|
||||||
throw new BadRequestException("Cannot send envelope without a document.");
|
throw new BadRequestException("Cannot send envelope without a document.");
|
||||||
|
|
||||||
var links = await EnvelopeReceiverRepository.Query
|
var envRcvs = await EnvelopeReceiverRepository.Query
|
||||||
.Include(er => er.Receiver)
|
.Include(er => er.Receiver)
|
||||||
.Where(er => er.EnvelopeId == envelope.Id)
|
.Where(er => er.EnvelopeId == envelope.Id)
|
||||||
.ToListAsync(cancel);
|
.ToListAsync(cancel);
|
||||||
|
|
||||||
if (links.Count == 0)
|
if (envRcvs.Count == 0)
|
||||||
throw new BadRequestException("Cannot send envelope without receivers.");
|
throw new BadRequestException("Cannot send envelope without receivers.");
|
||||||
|
|
||||||
var receiverIds = links.Select(l => l.ReceiverId).Distinct().ToList();
|
var receiverIds = envRcvs.Select(l => l.ReceiverId).Distinct().ToList();
|
||||||
var documentIds = await DocumentRepository.Query
|
var documentIds = await DocumentRepository.Query
|
||||||
.Where(d => d.EnvelopeId == envelope.Id)
|
.Where(d => d.EnvelopeId == envelope.Id)
|
||||||
.Select(d => d.Id)
|
.Select(d => d.Id)
|
||||||
@@ -552,7 +548,7 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
.Select(g => new { ReceiverId = g.Key, Count = g.Count() })
|
.Select(g => new { ReceiverId = g.Key, Count = g.Count() })
|
||||||
.ToDictionaryAsync(x => x.ReceiverId, x => x.Count, cancel);
|
.ToDictionaryAsync(x => x.ReceiverId, x => x.Count, cancel);
|
||||||
|
|
||||||
var receiversWithoutFields = links
|
var receiversWithoutFields = envRcvs
|
||||||
.Where(link => !receiverFieldCounts.TryGetValue(link.ReceiverId, out var count) || count <= 0)
|
.Where(link => !receiverFieldCounts.TryGetValue(link.ReceiverId, out var count) || count <= 0)
|
||||||
.Select(link => link.Name)
|
.Select(link => link.Name)
|
||||||
.ToList();
|
.ToList();
|
||||||
@@ -576,70 +572,39 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
|
|||||||
Status = EnvelopeStatus.EnvelopeQueued
|
Status = EnvelopeStatus.EnvelopeQueued
|
||||||
}, cancel);
|
}, cancel);
|
||||||
|
|
||||||
await QueueInvitationEmailsAsync(envelope, links, userReference, cancel);
|
await SendInvitationEmailsAsync(envelope, envRcvs, cancel);
|
||||||
|
|
||||||
envelope.Status = EnvelopeStatus.EnvelopeQueued;
|
envelope.Status = EnvelopeStatus.EnvelopeQueued;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task QueueInvitationEmailsAsync(
|
private async Task SendInvitationEmailsAsync(
|
||||||
Envelope envelope,
|
Envelope envelope,
|
||||||
IReadOnlyCollection<EnvelopeReceiver> links,
|
IReadOnlyCollection<EnvelopeReceiver> envRcvs,
|
||||||
string senderReference,
|
|
||||||
CancellationToken cancel)
|
CancellationToken cancel)
|
||||||
{
|
{
|
||||||
var template = await EmailTemplateRepository.Query
|
foreach (var er in envRcvs)
|
||||||
.SingleOrDefaultAsync(x => x.Name == EmailTemplateType.DocumentReceived.ToString(), cancel)
|
|
||||||
?? throw new InvalidOperationException($"Email template not found: {EmailTemplateType.DocumentReceived}");
|
|
||||||
|
|
||||||
var signatureHost = await ConfigService.ReadDefaultSignatureHost();
|
|
||||||
var senderName = senderReference;
|
|
||||||
|
|
||||||
foreach (var link in links)
|
|
||||||
{
|
{
|
||||||
var receiver = link.Receiver;
|
var advancedSignature = envelope.CertificationType == CertificationType.AdvancedElectronicSignature;
|
||||||
if (receiver is null || string.IsNullOrWhiteSpace(receiver.EmailAddress) || string.IsNullOrWhiteSpace(receiver.Signature))
|
var origin = new Uri(ReqCntxt.Origin ?? throw new InvalidOperationException($"The request origin is missing in {nameof(CreateEnvelopeCommandHandler)}."));
|
||||||
continue;
|
try
|
||||||
|
|
||||||
var envelopeKey = (envelope.Uuid, receiver.Signature).ToEnvelopeKey();
|
|
||||||
var documentLink = $"{signatureHost.TrimEnd('/')}/envelope/login/{Uri.EscapeDataString(envelopeKey)}";
|
|
||||||
|
|
||||||
var placeholders = new Dictionary<string, string>(MailParams.Placeholders)
|
|
||||||
{
|
{
|
||||||
["[NAME_RECEIVER]"] = link.Name ?? string.Empty,
|
await EnvNtfService.Notify(er.Receiver.EmailAddress, new DocumentReceivedNotification
|
||||||
["[NAME_SENDER]"] = senderName ?? string.Empty,
|
|
||||||
["[DOCUMENT_TITLE]"] = envelope.Title ?? string.Empty,
|
|
||||||
["[MESSAGE]"] = envelope.Message ?? string.Empty,
|
|
||||||
["[LINK_TO_DOCUMENT]"] = documentLink,
|
|
||||||
["[LINK_TO_DOCUMENT_TEXT]"] = documentLink[..Math.Min(40, documentLink.Length)] + ".."
|
|
||||||
};
|
|
||||||
|
|
||||||
var subject = ReplacePlaceHolders(template.Subject, placeholders);
|
|
||||||
var body = ReplacePlaceHolders(template.Body, placeholders);
|
|
||||||
|
|
||||||
var emailOut = new EmailOut
|
|
||||||
{
|
{
|
||||||
EmailAddress = receiver.EmailAddress,
|
AdvancedSignature = advancedSignature,
|
||||||
EmailSubj = subject,
|
DocumentTitle = envelope.Title ?? string.Empty,
|
||||||
EmailBody = body,
|
NameReceiver = er.Name ?? string.Empty,
|
||||||
AddedWhen = DateTime.Now,
|
EnvelopeUuid = envelope.Uuid,
|
||||||
AddedWho = DispatcherParams.AddedWho,
|
IsReadAndConfirm = envelope.IsReadAndConfirm(),
|
||||||
SendingProfile = DispatcherParams.SendingProfile,
|
Message = envelope.Message ?? string.Empty,
|
||||||
ReminderTypeId = DispatcherParams.ReminderTypeId,
|
NameSender = $"{envelope.User.Prename} {envelope.User.Name}",
|
||||||
EmailAttmt1 = DispatcherParams.EmailAttmt1,
|
Origin = origin,
|
||||||
WfId = (int)EnvelopeStatus.MessageInvitationSent,
|
ReceiverSignature = er.Receiver.Signature,
|
||||||
ReferenceString = receiver.EmailAddress,
|
}, cancel);
|
||||||
ReferenceId = link.ReceiverId
|
}
|
||||||
};
|
catch(Exception ex)
|
||||||
|
{
|
||||||
await EmailOutRepository.CreateAsync(emailOut, cancel);
|
Logger.LogError(ex, "Failed to send invitation email for receiver {emailAddress} in envelope {envelopeId}.", er.Receiver.EmailAddress, envelope.Id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string ReplacePlaceHolders(string text, Dictionary<string, string> placeHolders)
|
|
||||||
{
|
|
||||||
foreach (var placeHolder in placeHolders)
|
|
||||||
text = text.Replace(placeHolder.Key, placeHolder.Value);
|
|
||||||
|
|
||||||
return text;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,7 +98,8 @@ public class FinalizeEnvelopeCommandHandler(IRepository<Envelope> Repo, ISender
|
|||||||
{
|
{
|
||||||
DocumentTitle = envelope.Title,
|
DocumentTitle = envelope.Title,
|
||||||
NameReceiver = er.Name,
|
NameReceiver = er.Name,
|
||||||
Attachment = doc
|
Attachments = [($"unterzeichnetes-dokument.pdf", doc)],
|
||||||
|
IsReadAndConfirm = envelope.IsReadAndConfirm(),
|
||||||
}, cancel);
|
}, cancel);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
public string Comment { get; set; }
|
public string Comment { get; set; }
|
||||||
|
|
||||||
[Column("CONTRACT_TYPE")]
|
[Column("CONTRACT_TYPE")]
|
||||||
public int? ContractType { get; set; }
|
public ContractType? ContractType { get; set; }
|
||||||
|
|
||||||
#if NETFRAMEWORK
|
#if NETFRAMEWORK
|
||||||
[NotMapped]
|
[NotMapped]
|
||||||
@@ -129,7 +129,11 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
public int? ExpiresWarningWhenDays { get; set; }
|
public int? ExpiresWarningWhenDays { get; set; }
|
||||||
|
|
||||||
[ForeignKey("UserId")]
|
[ForeignKey("UserId")]
|
||||||
public User User { get; set; }
|
public User
|
||||||
|
#if nullable
|
||||||
|
?
|
||||||
|
#endif
|
||||||
|
User { get; set; }
|
||||||
|
|
||||||
[Column("TFA_ENABLED")]
|
[Column("TFA_ENABLED")]
|
||||||
public bool? TfaEnabled { get; set; }
|
public bool? TfaEnabled { get; set; }
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
using System.ComponentModel.DataAnnotations.Schema;
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
|
||||||
#if NETFRAMEWORK
|
#if NETFRAMEWORK
|
||||||
using System;
|
using System;
|
||||||
#endif
|
#endif
|
||||||
@@ -56,7 +58,7 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
public int? ReminderIntervalDays { get; set; }
|
public int? ReminderIntervalDays { get; set; }
|
||||||
|
|
||||||
[Column("CONTRACT_TYPE")]
|
[Column("CONTRACT_TYPE")]
|
||||||
public int? ContractType { get; set; }
|
public ContractType? ContractType { get; set; }
|
||||||
|
|
||||||
[NotMapped]
|
[NotMapped]
|
||||||
public bool TFA_Enabled { get; set; } = false;
|
public bool TFA_Enabled { get; set; } = false;
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
namespace EnvelopeGenerator.Infrastructure.Notification.Configuration;
|
||||||
|
|
||||||
|
public enum ConsumerType
|
||||||
|
{
|
||||||
|
API,
|
||||||
|
RabbitMQ
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
using DigitalData.MessagingService.RabbitMQ;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Infrastructure.Notification.Configuration;
|
||||||
|
|
||||||
|
public class NotificationOptions
|
||||||
|
{
|
||||||
|
public const string SectionName = "Notification";
|
||||||
|
|
||||||
|
public ConsumerType ConsumerType { get; set; }
|
||||||
|
|
||||||
|
public string? ApiUrl { get; set; }
|
||||||
|
|
||||||
|
public string SenderEmail { get; set; } = null!;
|
||||||
|
|
||||||
|
public RabbitMqConnectionConfiguration? RabbitMQ { get; set; }
|
||||||
|
}
|
||||||
@@ -1,41 +1,47 @@
|
|||||||
using DigitalData.MessagingService.Client;
|
using DigitalData.MessagingService.Client;
|
||||||
using DigitalData.MessagingService.Domain.Entities;
|
|
||||||
using DigitalData.MessagingService.RabbitMQ;
|
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
using EnvelopeGenerator.Infrastructure.Notification.Configuration;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Notification;
|
namespace EnvelopeGenerator.Infrastructure.Notification;
|
||||||
|
|
||||||
public static class DependencyInjection
|
public static class DependencyInjection
|
||||||
{
|
{
|
||||||
public static IServiceCollection AddNotificationInfrastructure(this IServiceCollection services, IConfiguration configuration)
|
public static IServiceCollection AddNotificationInfrastructure(this IServiceCollection services, IConfiguration configuration, string sectionName = NotificationOptions.SectionName)
|
||||||
{
|
{
|
||||||
var rMqConfig = configuration.GetSection("RabbitMQ").Get<RabbitMqConfiguration>()
|
var ntfConfiguration = configuration.GetSection(sectionName);
|
||||||
?? throw new ArgumentNullException(nameof(RabbitMqConfiguration), "RabbitMQ configuration is missing");
|
services.Configure<NotificationOptions>(ntfConfiguration);
|
||||||
|
|
||||||
EmailSender.ConnectRabbitMq(config =>
|
var options = ntfConfiguration.Get<NotificationOptions>()
|
||||||
|
?? throw new InvalidOperationException(
|
||||||
|
$"Failed to bind configuration section '{sectionName}' to {nameof(NotificationOptions)}. Ensure the section exists and is correctly configured.");
|
||||||
|
|
||||||
|
switch (options.ConsumerType)
|
||||||
{
|
{
|
||||||
config.HostName = rMqConfig.HostName;
|
case ConsumerType.API:
|
||||||
config.Port = rMqConfig.Port;
|
if (options.ApiUrl is string apiUrl)
|
||||||
config.UserName = rMqConfig.UserName;
|
services.AddMessagingServiceHttpClient(opt =>
|
||||||
config.Password = rMqConfig.Password;
|
{
|
||||||
|
opt.BaseAddress = new Uri(apiUrl);
|
||||||
config.VirtualHost = "/";
|
// Additional configuration for the MessagingServiceHttpClient can be added here if needed
|
||||||
config.QueueName = "emailprofiler.email.outbox";
|
|
||||||
config.ExchangeName = "emailprofiler.emails";
|
|
||||||
config.RoutingKey = "email.outbox";
|
|
||||||
config.DlqQueueName = "emailprofiler.email.outbox.dlq";
|
|
||||||
config.DlqExchangeName = "emailprofiler.emails.dlq";
|
|
||||||
config.DlqRoutingKey = "email.outbox.dlq";
|
|
||||||
});
|
});
|
||||||
|
else
|
||||||
services.Configure<EmailAccount>(configuration.GetSection("NotificationEmailAccount"));
|
throw new InvalidOperationException(
|
||||||
|
$"MessagingServiceApiUrl must be provided when ClientType is set to Api in the '{sectionName}' configuration section.");
|
||||||
|
break;
|
||||||
|
case ConsumerType.RabbitMQ:
|
||||||
|
if(options.RabbitMQ is not null)
|
||||||
|
services.AddMessagingServiceClient(ntfConfiguration, nameof(options.RabbitMQ));
|
||||||
|
else
|
||||||
|
throw new InvalidOperationException(
|
||||||
|
$"Missing RabbitMQ connection configuration." +
|
||||||
|
$"When ClientType is set to RabbitMQ, a valid RabbitMQ configuration must be provided in the '{sectionName}' configuration section.");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new InvalidOperationException(
|
||||||
|
$"Unsupported ConsumerType '{options.ConsumerType}' in the '{sectionName}' configuration section.");
|
||||||
|
}
|
||||||
|
|
||||||
services.AddScoped<IEnvelopeNotificationService, EnvelopeNotificationService>();
|
services.AddScoped<IEnvelopeNotificationService, EnvelopeNotificationService>();
|
||||||
return services;
|
return services;
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="DigitalData.MessagingService.Client" Version="1.0.5" />
|
<PackageReference Include="DigitalData.MessagingService.Client" Version="3.0.1" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.10" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.10" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
using DigitalData.MessagingService.Application.Common.Dto;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Infrastructure.Notification;
|
||||||
|
|
||||||
|
public static class EnvelopeNotificationExtensions
|
||||||
|
{
|
||||||
|
public static EmailAttachmentDto ToEmailAttachmentDto(this (string FileName, byte[] Content) attachment) => new()
|
||||||
|
{
|
||||||
|
FileName = attachment.FileName,
|
||||||
|
Content = attachment.Content
|
||||||
|
};
|
||||||
|
|
||||||
|
public static IEnumerable<EmailAttachmentDto> ToEmailAttachmentDto(this IEnumerable<(string FileName, byte[] Content)> attachments)
|
||||||
|
=> attachments.Select(ToEmailAttachmentDto);
|
||||||
|
}
|
||||||
@@ -1,44 +1,45 @@
|
|||||||
using DigitalData.Core.Abstraction.Application.Repository;
|
using DigitalData.Core.Abstraction.Application.Repository;
|
||||||
using DigitalData.Core.Exceptions;
|
using DigitalData.MessagingService.Application.Common.Interfaces;
|
||||||
using DigitalData.MessagingService.Application.Common.Dto;
|
using DigitalData.MessagingService.Application.EmailSending.Commands;
|
||||||
using DigitalData.MessagingService.Client;
|
|
||||||
using DigitalData.MessagingService.Domain.Entities;
|
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
using EnvelopeGenerator.Domain.Entities;
|
using EnvelopeGenerator.Domain.Entities;
|
||||||
using MediatR;
|
using EnvelopeGenerator.Domain.Exceptions;
|
||||||
|
using EnvelopeGenerator.Infrastructure.Notification.Configuration;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Infrastructure.Notification;
|
namespace EnvelopeGenerator.Infrastructure.Notification;
|
||||||
|
|
||||||
public class EnvelopeNotificationService(IOptions<EmailAccount> EmailAccountOptions, IRepository<EmailTemplate> TempRepo) : IEnvelopeNotificationService
|
public class EnvelopeNotificationService(IRepository<EmailTemplate> TempRepo, IMessagingServiceClient MsgClient, IOptions<NotificationOptions> ntfOpt) : IEnvelopeNotificationService
|
||||||
{
|
{
|
||||||
public async Task Notify(string email, DocumentSignedNotification documentSigned, CancellationToken cancel = default)
|
private readonly NotificationOptions NtfOpt = ntfOpt.Value;
|
||||||
{
|
|
||||||
var template = await TempRepo.Where(t => t.Name == "DocumentCompleted").FirstOrDefaultAsync(cancel)
|
|
||||||
?? throw new NotFoundException("DocumentCompleted email template not found");
|
|
||||||
var subjectTemplate = Replace(template.Subject, documentSigned);
|
|
||||||
var bodyTemplate = Replace(template.Body, documentSigned);
|
|
||||||
|
|
||||||
await EmailSender.Send(new EmailContext()
|
private async Task<EmailTemplate> GetTemplateAsync(EmailTemplateType templateType, CancellationToken cancel = default)
|
||||||
{
|
{
|
||||||
Body = bodyTemplate,
|
return await TempRepo.Where(t => t.Name == templateType.ToString()).FirstOrDefaultAsync(cancel)
|
||||||
Subject = subjectTemplate,
|
?? throw new DataIntegrityException($"{templateType} email template not found");
|
||||||
Recipients = [email],
|
|
||||||
Sender = EmailAccountOptions.Value,
|
|
||||||
Attachments = [new EmailAttachmentDto()
|
|
||||||
{
|
|
||||||
FileName = "unterzeichnetes-dokument.pdf",
|
|
||||||
Content = documentSigned.Attachment
|
|
||||||
}]
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string Replace(string template, DocumentSignedNotification documentSigned)
|
public async Task Notify<TEnvelopeNotificationBase>(string receiverEmail, TEnvelopeNotificationBase notification, CancellationToken cancel = default)
|
||||||
|
where TEnvelopeNotificationBase : EnvelopeNotificationBase
|
||||||
{
|
{
|
||||||
return template
|
var template = await GetTemplateAsync(notification.GetTemplateType(), cancel);
|
||||||
.Replace("[DOCUMENT_TITLE]", documentSigned.DocumentTitle)
|
|
||||||
.Replace("[NAME_PORTAL]", documentSigned.NamePortal)
|
// create email command
|
||||||
.Replace("[NAME_RECEIVER]", documentSigned.NameReceiver);
|
var mail = new PublishEmailViaSmtpCommand()
|
||||||
|
{
|
||||||
|
Body = template.Body.ReplacePlaceholders(notification),
|
||||||
|
Subject = template.Subject.ReplacePlaceholders(notification),
|
||||||
|
Recipients = [receiverEmail],
|
||||||
|
Sender = NtfOpt.SenderEmail.ToSender(),
|
||||||
|
IsHtml = true
|
||||||
|
};
|
||||||
|
|
||||||
|
// add attachments if any
|
||||||
|
if(notification.Attachments?.Any() ?? false)
|
||||||
|
mail = mail.WithAttachments(notification.Attachments.ToEmailAttachmentDto());
|
||||||
|
|
||||||
|
await MsgClient.SendAsync(mail, cancel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
using System.Collections.Concurrent;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Infrastructure.Notification;
|
||||||
|
|
||||||
|
public static class ReplacePlaceholderExtensions
|
||||||
|
{
|
||||||
|
private sealed record PlaceholderProperty(string Placeholder, PropertyInfo Property);
|
||||||
|
|
||||||
|
private static readonly ConcurrentDictionary<Type, PlaceholderProperty[]> PropertyCache = new();
|
||||||
|
|
||||||
|
public static string ReplacePlaceholders(this string template, object data)
|
||||||
|
{
|
||||||
|
var properties = PropertyCache.GetOrAdd(data.GetType(), CreatePlaceholderProperties);
|
||||||
|
|
||||||
|
foreach (var item in properties)
|
||||||
|
{
|
||||||
|
var value = item.Property.GetValue(data)?.ToString() ?? string.Empty;
|
||||||
|
template = template.Replace(
|
||||||
|
item.Placeholder,
|
||||||
|
value,
|
||||||
|
StringComparison.Ordinal);
|
||||||
|
}
|
||||||
|
|
||||||
|
return template;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PlaceholderProperty[] CreatePlaceholderProperties(
|
||||||
|
Type type)
|
||||||
|
{
|
||||||
|
return [.. type
|
||||||
|
.GetProperties(BindingFlags.Public | BindingFlags.Instance)
|
||||||
|
.Where(p => p.CanRead && p.GetIndexParameters().Length == 0)
|
||||||
|
.Select(p => new PlaceholderProperty(
|
||||||
|
$"[{ToCapitalSnakeCase(p.Name)}]",
|
||||||
|
p))];
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string ToCapitalSnakeCase(string name)
|
||||||
|
{
|
||||||
|
return Regex.Replace(
|
||||||
|
Regex.Replace(name, @"([A-Z]+)([A-Z][a-z])", "$1_$2"),
|
||||||
|
@"([a-z0-9])([A-Z])",
|
||||||
|
"$1_$2").ToUpperInvariant();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
-- Original email template: DocumentAccessCodeReceived (GUID 5)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:32:15
|
||||||
|
-- Subject: Zugriffscode für Dokument erhalten: ''[DOCUMENT_TITLE]''
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_RECEIVER],<br />
|
||||||
|
<br /><B><I>
|
||||||
|
[NAME_SENDER]</I></B> hat Ihnen ein Dokument zum [SIGNATURE_TYPE] gesendet. <br />
|
||||||
|
<br />
|
||||||
|
Verwenden Sie den folgenden Zugriffscode, um das Dokument einzusehen:<br />
|
||||||
|
<br />
|
||||||
|
[DOCUMENT_ACCESS_CODE]<br />
|
||||||
|
<br />
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
|
WHERE GUID = 5;
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
-- Original email template: DocumentCompleted (GUID 4)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:29:55
|
||||||
|
-- Subject: Umschlag abgeschlossen: ''[DOCUMENT_TITLE]''
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_RECEIVER],<br />
|
||||||
|
<br />
|
||||||
|
Der Vorgang <B><I>''[DOCUMENT_TITLE]''</I></B> wurde erfolgreich abgeschlossen.<br />
|
||||||
|
<br />
|
||||||
|
Sie erhalten das Dokument mit einem detaillierten Ergebnisbericht als Anhang zu dieser Email.<br />
|
||||||
|
<br />
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
|
WHERE GUID = 4;
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
-- Original email template: DocumentDeleted (GUID 2)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:23:45
|
||||||
|
-- Subject: Umschlag zurückgezogen: ''[DOCUMENT_TITLE]''
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_RECEIVER],<br />
|
||||||
|
<br /><B><I>
|
||||||
|
[NAME_SENDER]</I></B> hat den Umschlag <B><I>''[DOCUMENT_TITLE]''</I></B> gelöscht/zurückgezogen.<br /><p>
|
||||||
|
Begründung: <br /> <I>[REASON]</I> <p>
|
||||||
|
<br />
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
-- Original email template: DocumentReceived (GUID 1, de-DE)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:06:07
|
||||||
|
-- Subject: Dokument erhalten: ''[DOCUMENT_TITLE]''
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_RECEIVER],<br />
|
||||||
|
<br /><B><I>
|
||||||
|
[NAME_SENDER]</I></B> hat Ihnen ein Dokument zum [SIGNATURE_TYPE] gesendet.<br />
|
||||||
|
<br />
|
||||||
|
Über den folgenden Link können Sie das Dokument einsehen[DOCUMENT_PROCESS]: <a href="[LINK_TO_DOCUMENT]">[LINK_TO_DOCUMENT_TEXT]</a><br />
|
||||||
|
<br />
|
||||||
|
[MESSAGE]<br />
|
||||||
|
<br />
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
|
WHERE GUID = 1;
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
-- Original email template: DocumentRejected_ADM (GUID 6)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:33:34
|
||||||
|
-- Subject: ''[DOCUMENT_TITLE]'' - Vorgang zurückgezogen
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_SENDER],<p><B><I>[NAME_RECEIVER]</I></B> hat den Umschlag <B><I>''[DOCUMENT_TITLE]''</I></B> mit folgendem Grund abgelehnt: <p>
|
||||||
|
[REASON]
|
||||||
|
<p>Der Umschlag wurde auf den Status Rejected gesetzt. <p>
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
|
WHERE GUID = 6;
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
-- Original email template: DocumentRejected_REC_2 (GUID 10)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:37:12
|
||||||
|
-- Subject: ''[DOCUMENT_TITLE]'' - Vorgang abgelehnt.
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_RECEIVER],
|
||||||
|
<p>Der Vorgang <B><I>''[DOCUMENT_TITLE]''</I></B> wurde durch einen anderen Vertragspartner abgelehnt.<p> Der Absender <B><I>[NAME_SENDER]</I></B> wird sich bei Bedarf mit Ihnen in Verbindung setzen. <p>
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
|
WHERE GUID = 10;
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
-- Original email template: DocumentRejected_REC (GUID 9)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:34:21
|
||||||
|
-- Subject: ''[DOCUMENT_TITLE]'' - Bestätigung der Ablehnung
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_RECEIVER],
|
||||||
|
<p>Hiermit bestätigen wir Ihnen die Ablehnung des Vorgangs <B><I>''[DOCUMENT_TITLE]''</I></B>!<p>Der Absender <B><I>[NAME_SENDER]</I></B> wurde über die Ablehnung informiert. <p>
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
|
WHERE GUID = 9;
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
-- Original email template: DocumentShared (GUID 11)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:42:51
|
||||||
|
-- Subject: Dokument geteilt: ''[DOCUMENT_TITLE]''
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag,<br /> <br /><B><I> [NAME_RECEIVER]</I></B> hat Ihnen ein Dokument zum Ansehen gesendet.<br /> <br /> Über den folgenden Link können Sie das Dokument einsehen: <a href="[LINK_TO_DOCUMENT]">[LINK_TO_DOCUMENT_TEXT]</a><br /> <br /> <br /> Mit freundlichen Grüßen<br /> <br /> [NAME_PORTAL]'
|
||||||
|
WHERE GUID = 11;
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
-- Original email template: DocumentSigned (GUID 3)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:25:45
|
||||||
|
-- Subject: Dokument [RECEIVER_ACTION]: ''[DOCUMENT_TITLE]''
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag [NAME_RECEIVER],<br />
|
||||||
|
<br />
|
||||||
|
hiermit bestätigen wir Ihnen die erfolgreiche [FINAL_STATUS] für den Vorgang <B><I>''[DOCUMENT_TITLE]''</I></B>.<br />
|
||||||
|
Wenn alle [FINAL_ACTION] haben, erhalten Sie ebenfalls per E-Mail ein abgeschlossenes Exemplar mit entsprechendem Zertifikat!
|
||||||
|
<br />
|
||||||
|
Mit freundlichen Grüßen<br />
|
||||||
|
<br />
|
||||||
|
[NAME_PORTAL]'
|
||||||
|
WHERE GUID = 3;
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
-- Original email template: TotpSecret (GUID 12)
|
||||||
|
-- Backed up before redesign: 2026-10-29 16:44:44
|
||||||
|
-- Subject: 2-Faktor-Authentifizierung QR-Code
|
||||||
|
-- Restore by running this script against DD_ECM:
|
||||||
|
UPDATE dbo.TBSIG_EMAIL_TEMPLATE
|
||||||
|
SET BODY = N'Guten Tag,<br /> <br />Sie können auf Ihren Zwei-Faktor-Authentifizierungscode zugreifen, indem Sie den unten stehenden QR-Code mit einer beliebigen Authentifizierungs-App auf Ihrem Telefon scannen (Google Authenticator, Microsoft Authenticator usw.). Dieser Code ist bis zum [TFA_EXPIRATION] gültig.<br /> <br /> <img src="data:image/png;base64,[TFA_QR_CODE]" style="width: 13rem; height: 13rem;"><br /> <br />
|
||||||
|
<br /> Mit freundlichen Grüßen<br /> <br /> [NAME_PORTAL]'
|
||||||
|
WHERE GUID = 12;
|
||||||
@@ -5,6 +5,7 @@
|
|||||||
@using EnvelopeGenerator.Domain.Resources
|
@using EnvelopeGenerator.Domain.Resources
|
||||||
@using EnvelopeGenerator.Server.Client.Components.Sender.ReceiverSuggestionFilter
|
@using EnvelopeGenerator.Server.Client.Components.Sender.ReceiverSuggestionFilter
|
||||||
@using EnvelopeGenerator.Server.Client.Services
|
@using EnvelopeGenerator.Server.Client.Services
|
||||||
|
@using MudBlazor
|
||||||
@using Microsoft.AspNetCore.Components.Forms
|
@using Microsoft.AspNetCore.Components.Forms
|
||||||
@using Microsoft.Extensions.Localization
|
@using Microsoft.Extensions.Localization
|
||||||
@inject IStringLocalizer<Model> ModelLocalizer
|
@inject IStringLocalizer<Model> ModelLocalizer
|
||||||
@@ -27,28 +28,23 @@
|
|||||||
<div class="sender-create-wizard"
|
<div class="sender-create-wizard"
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
@onkeydown="OnWizardKeyDownAsync">
|
@onkeydown="OnWizardKeyDownAsync">
|
||||||
<div class="sender-create-wizard__progress">
|
<MudPaper Class="sender-create-wizard__stepper-shell" Elevation="0">
|
||||||
<div class="sender-create-wizard__progress-track"></div>
|
<MudStepper Vertical="true"
|
||||||
|
NonLinear="false"
|
||||||
|
ShowResetButton="false"
|
||||||
|
ActiveIndex="@_currentStep"
|
||||||
|
Class="sender-create-wizard__stepper">
|
||||||
|
<ChildContent>
|
||||||
@for (var step = 0; step < TotalSteps; step++)
|
@for (var step = 0; step < TotalSteps; step++)
|
||||||
{
|
{
|
||||||
var isActive = step == _currentStep;
|
var stepIndex = step;
|
||||||
var isDone = step < _currentStep;
|
|
||||||
<div class="sender-create-wizard__step @(isActive ? "sender-create-wizard__step--active" : string.Empty) @(isDone ? "sender-create-wizard__step--done" : string.Empty)">
|
|
||||||
<span class="sender-create-wizard__step-index">@(step + 1)</span>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="sender-create-wizard__meta">
|
<MudStep Title="@GetStepTitle(stepIndex)">
|
||||||
<div class="sender-create-wizard__title">@CurrentStepTitle</div>
|
<div class="sender-create-wizard__stepper-description">@GetStepDescription(stepIndex)</div>
|
||||||
<div class="sender-create-wizard__description">@CurrentStepDescription</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@if (!string.IsNullOrWhiteSpace(_validationMessage))
|
@if (stepIndex == _currentStep)
|
||||||
{
|
{
|
||||||
<div class="sender-create-wizard__validation">@_validationMessage</div>
|
<div class="sender-create-wizard__step-content">
|
||||||
}
|
|
||||||
|
|
||||||
@if (_currentStep == 0)
|
@if (_currentStep == 0)
|
||||||
{
|
{
|
||||||
<div class="sender-create-wizard__form-grid">
|
<div class="sender-create-wizard__form-grid">
|
||||||
@@ -78,7 +74,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
else if (_currentStep == 1)
|
else if (_currentStep == 3)
|
||||||
{
|
{
|
||||||
<div class="sender-create-wizard__form-grid">
|
<div class="sender-create-wizard__form-grid">
|
||||||
<div class="sender-create-wizard__field sender-create-wizard__field--full">
|
<div class="sender-create-wizard__field sender-create-wizard__field--full">
|
||||||
@@ -192,7 +188,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
else if (_currentStep == 3)
|
else if (_currentStep == 1)
|
||||||
{
|
{
|
||||||
<div class="sender-create-wizard__suggestions">
|
<div class="sender-create-wizard__suggestions">
|
||||||
<div class="sender-create-wizard__suggestions-title">@L("SenderWizard_RecentReceivers", "Zuletzt verwendete Empfänger")</div>
|
<div class="sender-create-wizard__suggestions-title">@L("SenderWizard_RecentReceivers", "Zuletzt verwendete Empfänger")</div>
|
||||||
@@ -355,6 +351,19 @@
|
|||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
}
|
||||||
|
</MudStep>
|
||||||
|
}
|
||||||
|
</ChildContent>
|
||||||
|
</MudStepper>
|
||||||
|
</MudPaper>
|
||||||
|
|
||||||
|
@if (!string.IsNullOrWhiteSpace(_validationMessage))
|
||||||
|
{
|
||||||
|
<div class="sender-create-wizard__validation">@_validationMessage</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
</div>
|
||||||
</BodyContentTemplate>
|
</BodyContentTemplate>
|
||||||
<FooterContentTemplate>
|
<FooterContentTemplate>
|
||||||
<div class="sender-create-wizard__footer">
|
<div class="sender-create-wizard__footer">
|
||||||
@@ -456,7 +465,7 @@
|
|||||||
|
|
||||||
private bool IsFirstStep => _currentStep <= 0;
|
private bool IsFirstStep => _currentStep <= 0;
|
||||||
private bool IsLastStep => _currentStep >= TotalSteps - 1;
|
private bool IsLastStep => _currentStep >= TotalSteps - 1;
|
||||||
private bool CanSkipCurrentStep => _currentStep == 1;
|
private bool CanSkipCurrentStep => _currentStep == 3;
|
||||||
|
|
||||||
private IReadOnlyList<RecentReceiverSuggestionDto> FilteredRecentSuggestions =>
|
private IReadOnlyList<RecentReceiverSuggestionDto> FilteredRecentSuggestions =>
|
||||||
BuildFilteredRecentSuggestions();
|
BuildFilteredRecentSuggestions();
|
||||||
@@ -465,22 +474,26 @@
|
|||||||
? $"data:application/pdf;base64,{Convert.ToBase64String(_documentBytes)}"
|
? $"data:application/pdf;base64,{Convert.ToBase64String(_documentBytes)}"
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
private string CurrentStepTitle => _currentStep switch
|
private string CurrentStepTitle => GetStepTitle(_currentStep);
|
||||||
|
|
||||||
|
private string CurrentStepDescription => GetStepDescription(_currentStep);
|
||||||
|
|
||||||
|
private string GetStepTitle(int step) => step switch
|
||||||
{
|
{
|
||||||
0 => L("SenderWizard_Step_Basics", "Grunddaten"),
|
0 => L("SenderWizard_Step_Basics", "Grunddaten"),
|
||||||
1 => L("SenderWizard_Step_Message", "Nachricht und Optionen"),
|
1 => L("SenderWizard_Step_Receivers", "Empfänger"),
|
||||||
2 => L("SenderEditor_EnvelopeSettings", "Envelope-Einstellungen"),
|
2 => L("SenderEditor_EnvelopeSettings", "Envelope-Einstellungen"),
|
||||||
3 => L("SenderWizard_Step_Receivers", "Empfänger"),
|
3 => L("SenderWizard_Step_Message", "Nachricht und Optionen"),
|
||||||
4 => L("SenderWizard_Step_Document", "Dokument"),
|
4 => L("SenderWizard_Step_Document", "Dokument"),
|
||||||
_ => L("SenderWizard_Step_Basics", "Grunddaten")
|
_ => L("SenderWizard_Step_Basics", "Grunddaten")
|
||||||
};
|
};
|
||||||
|
|
||||||
private string CurrentStepDescription => _currentStep switch
|
private string GetStepDescription(int step) => step switch
|
||||||
{
|
{
|
||||||
0 => L("SenderWizard_Step_Basics_Desc", "Starten Sie mit den Pflichtangaben für den Umschlag."),
|
0 => L("SenderWizard_Step_Basics_Desc", "Starten Sie mit den Pflichtangaben für den Umschlag."),
|
||||||
1 => L("SenderWizard_Step_Message_Desc", "Fügen Sie optionale Nachricht und Einstellungen hinzu."),
|
1 => L("SenderWizard_Step_Receivers_Desc", "Definieren Sie die Empfänger für den Signaturprozess."),
|
||||||
2 => L("SenderWizard_Step_Settings_Desc", "Konfigurieren Sie Sicherheits-, Erinnerungs- und Ablaufoptionen."),
|
2 => L("SenderWizard_Step_Settings_Desc", "Konfigurieren Sie Sicherheits-, Erinnerungs- und Ablaufoptionen."),
|
||||||
3 => L("SenderWizard_Step_Receivers_Desc", "Definieren Sie die Empfänger für den Signaturprozess."),
|
3 => L("SenderWizard_Step_Message_Desc", "Fügen Sie optionale Nachricht und Einstellungen hinzu."),
|
||||||
4 => L("SenderWizard_Step_Document_Desc", "Laden Sie das Dokument hoch und platzieren Sie Signaturfelder."),
|
4 => L("SenderWizard_Step_Document_Desc", "Laden Sie das Dokument hoch und platzieren Sie Signaturfelder."),
|
||||||
_ => L("SenderWizard_Step_Basics_Desc", "Starten Sie mit den Pflichtangaben für den Umschlag.")
|
_ => L("SenderWizard_Step_Basics_Desc", "Starten Sie mit den Pflichtangaben für den Umschlag.")
|
||||||
};
|
};
|
||||||
@@ -703,7 +716,7 @@
|
|||||||
{
|
{
|
||||||
_currentStep++;
|
_currentStep++;
|
||||||
|
|
||||||
if (_currentStep == 3)
|
if (_currentStep == 1)
|
||||||
await EnsureRecentSuggestionsLoadedAsync();
|
await EnsureRecentSuggestionsLoadedAsync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -797,10 +810,10 @@
|
|||||||
if (!string.Equals(args.Key, "Enter", StringComparison.OrdinalIgnoreCase))
|
if (!string.Equals(args.Key, "Enter", StringComparison.OrdinalIgnoreCase))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (_currentStep == 1)
|
if (_currentStep == 3)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (_currentStep == 3 && (!string.IsNullOrWhiteSpace(_receiverName) || !string.IsNullOrWhiteSpace(_receiverEmail)))
|
if (_currentStep == 1 && (!string.IsNullOrWhiteSpace(_receiverName) || !string.IsNullOrWhiteSpace(_receiverEmail)))
|
||||||
{
|
{
|
||||||
await AddReceiver();
|
await AddReceiver();
|
||||||
return;
|
return;
|
||||||
@@ -894,7 +907,7 @@
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_currentStep == 3)
|
if (_currentStep == 1)
|
||||||
{
|
{
|
||||||
if (_receivers.Count == 0)
|
if (_receivers.Count == 0)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="MudBlazor" Version="8.0.0" />
|
||||||
<PackageReference Include="DevExpress.Blazor.PdfViewer" Version="25.2.3" />
|
<PackageReference Include="DevExpress.Blazor.PdfViewer" Version="25.2.3" />
|
||||||
<PackageReference Include="DevExpress.Blazor.Reporting.JSBasedControls" Version="25.2.3" />
|
<PackageReference Include="DevExpress.Blazor.Reporting.JSBasedControls" Version="25.2.3" />
|
||||||
<PackageReference Include="DevExpress.Blazor.Reporting.Viewer" Version="25.2.3" />
|
<PackageReference Include="DevExpress.Blazor.Reporting.Viewer" Version="25.2.3" />
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
|
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
|
||||||
using EnvelopeGenerator.Server.Client.Services;
|
using EnvelopeGenerator.Server.Client.Services;
|
||||||
using EnvelopeGenerator.Server.Client.Options;
|
using EnvelopeGenerator.Server.Client.Options;
|
||||||
|
using MudBlazor.Services;
|
||||||
using DevExpress.Blazor.Reporting;
|
using DevExpress.Blazor.Reporting;
|
||||||
using DevExpress.XtraReports.Web.Extensions;
|
using DevExpress.XtraReports.Web.Extensions;
|
||||||
using DevExpress.DataAccess.Web;
|
using DevExpress.DataAccess.Web;
|
||||||
@@ -16,6 +17,7 @@ CultureInfo.DefaultThreadCurrentCulture = cultureInfo;
|
|||||||
CultureInfo.DefaultThreadCurrentUICulture = cultureInfo;
|
CultureInfo.DefaultThreadCurrentUICulture = cultureInfo;
|
||||||
|
|
||||||
builder.Services.AddLocalization();
|
builder.Services.AddLocalization();
|
||||||
|
builder.Services.AddMudServices();
|
||||||
|
|
||||||
// Named HttpClient for API calls (both for services and DevExpress components)
|
// Named HttpClient for API calls (both for services and DevExpress components)
|
||||||
builder.Services.AddHttpClient("EnvelopeGenerator.Server", client =>
|
builder.Services.AddHttpClient("EnvelopeGenerator.Server", client =>
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flag-icons@7.2.3/css/flag-icons.min.css" />
|
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flag-icons@7.2.3/css/flag-icons.min.css" />
|
||||||
<link rel="stylesheet" href="css/app.css" />
|
<link rel="stylesheet" href="css/app.css" />
|
||||||
<link rel="stylesheet" href="css/envelope-viewer.css" />
|
<link rel="stylesheet" href="css/envelope-viewer.css" />
|
||||||
|
<link rel="stylesheet" href="_content/MudBlazor/MudBlazor.min.css" />
|
||||||
<link rel="stylesheet" href="EnvelopeGenerator.Server.styles.css" />
|
<link rel="stylesheet" href="EnvelopeGenerator.Server.styles.css" />
|
||||||
<HeadOutlet />
|
<HeadOutlet />
|
||||||
<!-- Apply saved theme immediately on page load — before WASM boots.
|
<!-- Apply saved theme immediately on page load — before WASM boots.
|
||||||
@@ -37,6 +38,7 @@
|
|||||||
<script src="js/receiver-signature.js?v=9"></script>
|
<script src="js/receiver-signature.js?v=9"></script>
|
||||||
<script src="js/signflow-theme.js"></script>
|
<script src="js/signflow-theme.js"></script>
|
||||||
<script src="js/envelope-editor.js"></script>
|
<script src="js/envelope-editor.js"></script>
|
||||||
|
<script src="_content/MudBlazor/MudBlazor.min.js"></script>
|
||||||
<script src="_framework/blazor.web.js"></script>
|
<script src="_framework/blazor.web.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,88 @@
|
|||||||
|
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Server.Controllers;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends envelope notifications, optionally with randomly generated payloads.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Initializes a new instance of the <see cref="NotificationController"/> class.
|
||||||
|
/// </remarks>
|
||||||
|
[ApiController]
|
||||||
|
[Route("api/[controller]")]
|
||||||
|
public class NotificationController(IEnvelopeNotificationService notificationService) : ControllerBase
|
||||||
|
{
|
||||||
|
private const string FallbackEmail = "htek0100@gmail.com";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends the supplied document signed notification.
|
||||||
|
/// </summary>
|
||||||
|
[HttpPost("signed")]
|
||||||
|
public async Task<IActionResult> SendSigned(
|
||||||
|
[FromBody] DocumentSignedNotification notification,
|
||||||
|
[FromQuery] string? email,
|
||||||
|
CancellationToken cancel)
|
||||||
|
{
|
||||||
|
await notificationService.Notify(NormalizeEmail(email), notification, cancel);
|
||||||
|
return Ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends a randomly generated document signed notification.
|
||||||
|
/// </summary>
|
||||||
|
[HttpPost("signed/random")]
|
||||||
|
public async Task<IActionResult> SendSignedRandom(
|
||||||
|
[FromQuery] string? email,
|
||||||
|
CancellationToken cancel)
|
||||||
|
{
|
||||||
|
await notificationService.Notify(NormalizeEmail(email), new DocumentSignedNotification
|
||||||
|
{
|
||||||
|
DocumentTitle = $"Dokument {Random.Shared.Next(1000, 9999)}",
|
||||||
|
NameReceiver = $"Empfänger {Random.Shared.Next(1, 100)}",
|
||||||
|
IsReadAndConfirm = Random.Shared.Next(2) == 0,
|
||||||
|
}, cancel);
|
||||||
|
return Ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends the supplied document received notification.
|
||||||
|
/// </summary>
|
||||||
|
[HttpPost("received")]
|
||||||
|
public async Task<IActionResult> SendReceived(
|
||||||
|
[FromBody] DocumentReceivedNotification notification,
|
||||||
|
[FromQuery] string? email,
|
||||||
|
CancellationToken cancel)
|
||||||
|
{
|
||||||
|
await notificationService.Notify(NormalizeEmail(email), notification, cancel);
|
||||||
|
return Ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends a randomly generated document received notification.
|
||||||
|
/// </summary>
|
||||||
|
[HttpPost("received/random")]
|
||||||
|
public async Task<IActionResult> SendReceivedRandom(
|
||||||
|
[FromQuery] string? email,
|
||||||
|
CancellationToken cancel)
|
||||||
|
{
|
||||||
|
await notificationService.Notify(NormalizeEmail(email), new DocumentReceivedNotification
|
||||||
|
{
|
||||||
|
DocumentTitle = $"Dokument {Random.Shared.Next(1000, 9999)}",
|
||||||
|
NameReceiver = $"Empfänger {Random.Shared.Next(1, 100)}",
|
||||||
|
NameSender = $"Absender {Random.Shared.Next(1, 100)}",
|
||||||
|
IsReadAndConfirm = Random.Shared.Next(2) == 0,
|
||||||
|
AdvancedSignature = Random.Shared.Next(2) == 0,
|
||||||
|
Origin = new Uri($"{Request.Scheme}://{Request.Host}"),
|
||||||
|
EnvelopeUuid = Guid.NewGuid().ToString(),
|
||||||
|
ReceiverSignature = Guid.NewGuid().ToString(),
|
||||||
|
Message = $"Testnachricht {Random.Shared.Next(1000, 9999)}"
|
||||||
|
}, cancel);
|
||||||
|
return Ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string NormalizeEmail(string? email)
|
||||||
|
=> string.IsNullOrWhiteSpace(email) ? FallbackEmail : email;
|
||||||
|
}
|
||||||
@@ -10,9 +10,9 @@
|
|||||||
<Authors>Digital Data GmbH</Authors>
|
<Authors>Digital Data GmbH</Authors>
|
||||||
<Company>Digital Data GmbH</Company>
|
<Company>Digital Data GmbH</Company>
|
||||||
<Product>EnvelopeGenerator.Server</Product>
|
<Product>EnvelopeGenerator.Server</Product>
|
||||||
<Version>1.7.0-beta</Version>
|
<Version>1.8.0-beta</Version>
|
||||||
<FileVersion>1.7.0.0</FileVersion>
|
<FileVersion>1.8.0.0</FileVersion>
|
||||||
<AssemblyVersion>1.7.0.0</AssemblyVersion>
|
<AssemblyVersion>1.8.0.0</AssemblyVersion>
|
||||||
<Copyright>Copyright © 2026 Digital Data GmbH. All rights reserved.</Copyright>
|
<Copyright>Copyright © 2026 Digital Data GmbH. All rights reserved.</Copyright>
|
||||||
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
|
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
@@ -30,6 +30,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.22" />
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.22" />
|
||||||
|
<PackageReference Include="MudBlazor" Version="8.0.0" />
|
||||||
<PackageReference Include="DevExpress.Blazor" Version="25.2.3" />
|
<PackageReference Include="DevExpress.Blazor" Version="25.2.3" />
|
||||||
<PackageReference Include="DevExpress.Blazor.PdfViewer" Version="25.2.3" />
|
<PackageReference Include="DevExpress.Blazor.PdfViewer" Version="25.2.3" />
|
||||||
<PackageReference Include="DevExpress.Blazor.Reporting.Viewer" Version="25.2.3" />
|
<PackageReference Include="DevExpress.Blazor.Reporting.Viewer" Version="25.2.3" />
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ using DigitalData.Core.Application;
|
|||||||
using DigitalData.EmailProfilerDispatcher;
|
using DigitalData.EmailProfilerDispatcher;
|
||||||
using DigitalData.UserManager.DependencyInjection;
|
using DigitalData.UserManager.DependencyInjection;
|
||||||
using EnvelopeGenerator.Application;
|
using EnvelopeGenerator.Application;
|
||||||
|
using EnvelopeGenerator.Application.Common.Interfaces;
|
||||||
using EnvelopeGenerator.Application.Common.Interfaces.Doc;
|
using EnvelopeGenerator.Application.Common.Interfaces.Doc;
|
||||||
using EnvelopeGenerator.Domain.Constants;
|
using EnvelopeGenerator.Domain.Constants;
|
||||||
using EnvelopeGenerator.Infrastructure;
|
using EnvelopeGenerator.Infrastructure;
|
||||||
@@ -19,6 +20,7 @@ using EnvelopeGenerator.Server.Client.Services;
|
|||||||
using EnvelopeGenerator.Server.Components;
|
using EnvelopeGenerator.Server.Components;
|
||||||
using EnvelopeGenerator.Server.Models;
|
using EnvelopeGenerator.Server.Models;
|
||||||
using EnvelopeGenerator.Server.Options;
|
using EnvelopeGenerator.Server.Options;
|
||||||
|
using EnvelopeGenerator.Server.Services;
|
||||||
using Microsoft.AspNetCore.Authentication.Cookies;
|
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
||||||
using Microsoft.AspNetCore.Localization;
|
using Microsoft.AspNetCore.Localization;
|
||||||
@@ -30,6 +32,7 @@ using NLog;
|
|||||||
using NLog.Web;
|
using NLog.Web;
|
||||||
using Scalar.AspNetCore;
|
using Scalar.AspNetCore;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
using MudBlazor.Services;
|
||||||
|
|
||||||
var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
|
var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
|
||||||
logger.Info("EnvelopeGenerator.Server logging initialized!");
|
logger.Info("EnvelopeGenerator.Server logging initialized!");
|
||||||
@@ -58,6 +61,7 @@ try
|
|||||||
builder.Services.AddRazorComponents()
|
builder.Services.AddRazorComponents()
|
||||||
.AddInteractiveServerComponents()
|
.AddInteractiveServerComponents()
|
||||||
.AddInteractiveWebAssemblyComponents();
|
.AddInteractiveWebAssemblyComponents();
|
||||||
|
builder.Services.AddMudServices();
|
||||||
|
|
||||||
// Add API Controllers
|
// Add API Controllers
|
||||||
builder.Services.AddControllers()
|
builder.Services.AddControllers()
|
||||||
@@ -392,6 +396,8 @@ try
|
|||||||
builder.Services.Configure<EnvelopeGenerator.Server.Client.Options.PdfViewerOptions>(
|
builder.Services.Configure<EnvelopeGenerator.Server.Client.Options.PdfViewerOptions>(
|
||||||
builder.Configuration.GetSection("PdfViewerOptions"));
|
builder.Configuration.GetSection("PdfViewerOptions"));
|
||||||
|
|
||||||
|
builder.Services.AddScoped<IRequestContext, RequestContext>();
|
||||||
|
|
||||||
var app = builder.Build();
|
var app = builder.Build();
|
||||||
|
|
||||||
deferredProvider.Factory = () => app.Services;
|
deferredProvider.Factory = () => app.Services;
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
using EnvelopeGenerator.Application.Common.Interfaces;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Server.Services;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="HttpContextAccessor"></param>
|
||||||
|
public sealed class RequestContext(
|
||||||
|
IHttpContextAccessor HttpContextAccessor) : IRequestContext
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string? Origin =>
|
||||||
|
HttpContextAccessor.HttpContext?
|
||||||
|
.Request.Headers.Origin.ToString();
|
||||||
|
}
|
||||||
@@ -1116,57 +1116,71 @@
|
|||||||
z-index: 2;
|
z-index: 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sender-create-wizard__progress {
|
.sender-create-wizard__stepper-shell {
|
||||||
position: relative;
|
border: 1px solid rgba(126, 34, 206, 0.12);
|
||||||
display: grid;
|
border-radius: 10px;
|
||||||
grid-template-columns: repeat(5, minmax(0, 1fr));
|
background: rgba(126, 34, 206, 0.04);
|
||||||
align-items: center;
|
padding: 0.75rem;
|
||||||
gap: 0.5rem;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.sender-create-wizard__progress-track {
|
.sender-create-wizard__stepper {
|
||||||
position: absolute;
|
margin: 0;
|
||||||
left: 12px;
|
|
||||||
right: 12px;
|
|
||||||
top: 50%;
|
|
||||||
height: 2px;
|
|
||||||
transform: translateY(-50%);
|
|
||||||
background: rgba(126, 34, 206, 0.18);
|
|
||||||
z-index: 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.sender-create-wizard__step {
|
.sender-create-wizard__stepper .mud-step {
|
||||||
position: relative;
|
pointer-events: none;
|
||||||
z-index: 1;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.sender-create-wizard__step-index {
|
.sender-create-wizard__stepper .mud-stepper-actions,
|
||||||
width: 24px;
|
.sender-create-wizard__stepper .mud-stepper-action {
|
||||||
height: 24px;
|
display: none !important;
|
||||||
border-radius: 999px;
|
}
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
.sender-create-wizard__stepper .mud-step-label {
|
||||||
justify-content: center;
|
color: #1f2937;
|
||||||
font-size: 0.78rem;
|
font-size: 0.86rem;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sender-create-wizard__stepper .mud-step-content {
|
||||||
|
color: #64748b;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sender-create-wizard__stepper .mud-stepper-vertical .mud-stepper-step {
|
||||||
|
margin-bottom: 0.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sender-create-wizard__stepper .mud-step-icon {
|
||||||
color: #64748b;
|
color: #64748b;
|
||||||
background: #f8fafc;
|
background: #f8fafc;
|
||||||
border: 1px solid rgba(126, 34, 206, 0.25);
|
border: 1px solid rgba(126, 34, 206, 0.25);
|
||||||
}
|
}
|
||||||
|
|
||||||
.sender-create-wizard__step--active .sender-create-wizard__step-index {
|
.sender-create-wizard__stepper .mud-step-completed .mud-step-icon,
|
||||||
|
.sender-create-wizard__stepper .mud-step-current .mud-step-icon {
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
background: linear-gradient(135deg, #7e22ce 0%, #2a5298 100%);
|
|
||||||
border-color: transparent;
|
border-color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sender-create-wizard__stepper .mud-step-current .mud-step-icon {
|
||||||
|
background: linear-gradient(135deg, #7e22ce 0%, #2a5298 100%);
|
||||||
box-shadow: 0 0 0 3px rgba(126, 34, 206, 0.15);
|
box-shadow: 0 0 0 3px rgba(126, 34, 206, 0.15);
|
||||||
}
|
}
|
||||||
|
|
||||||
.sender-create-wizard__step--done .sender-create-wizard__step-index {
|
.sender-create-wizard__stepper .mud-step-completed .mud-step-icon {
|
||||||
color: #ffffff;
|
|
||||||
background: #2a5298;
|
background: #2a5298;
|
||||||
border-color: transparent;
|
}
|
||||||
|
|
||||||
|
.sender-create-wizard__stepper-description {
|
||||||
|
font-size: 0.8rem;
|
||||||
|
line-height: 1.35;
|
||||||
|
color: #64748b;
|
||||||
|
margin-top: 0.2rem;
|
||||||
|
padding-right: 0.35rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sender-create-wizard__step-content {
|
||||||
|
margin-top: 0.7rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sender-create-wizard__meta {
|
.sender-create-wizard__meta {
|
||||||
|
|||||||
@@ -215,7 +215,7 @@ public static class Extensions
|
|||||||
Message = faker.Lorem.Paragraph(faker.Random.Number(2, 5)),
|
Message = faker.Lorem.Paragraph(faker.Random.Number(2, 5)),
|
||||||
TfaEnabled = tfaEnabled,
|
TfaEnabled = tfaEnabled,
|
||||||
AddedWhen = DateTime.Now,
|
AddedWhen = DateTime.Now,
|
||||||
CertificationType = (int)CertificationType.AdvancedElectronicSignature,
|
CertificationType = CertificationType.AdvancedElectronicSignature,
|
||||||
UseAccessCode = false,
|
UseAccessCode = false,
|
||||||
ContractType = (int)ContractType.Contract,
|
ContractType = (int)ContractType.Contract,
|
||||||
Language = "de",
|
Language = "de",
|
||||||
|
|||||||
@@ -71,10 +71,12 @@
|
|||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
|
||||||
<ProjectReference Include="..\EnvelopeGenerator.Infrastructure.Crypt\EnvelopeGenerator.Infrastructure.Crypt.csproj" />
|
<ProjectReference Include="..\EnvelopeGenerator.Infrastructure.Crypt\EnvelopeGenerator.Infrastructure.Crypt.csproj" />
|
||||||
|
<ProjectReference Include="..\EnvelopeGenerator.Infrastructure.Notification\EnvelopeGenerator.Infrastructure.Notification.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
|
||||||
<Compile Remove="Application\Crypt\**\*.cs" />
|
<Compile Remove="Application\Crypt\**\*.cs" />
|
||||||
|
<Compile Remove="Infrastructure\**\*.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
|
||||||
|
|||||||
@@ -0,0 +1,145 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using EnvelopeGenerator.Infrastructure.Notification;
|
||||||
|
using Microsoft.Data.SqlClient;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Tests.Infrastructure;
|
||||||
|
|
||||||
|
[TestFixture]
|
||||||
|
public class MailTemplatePlaceholderDbTests
|
||||||
|
{
|
||||||
|
private static readonly Regex PlaceholderPattern = new(@"\[[A-Z0-9_]+\]", RegexOptions.Compiled);
|
||||||
|
|
||||||
|
private static IEnumerable<TestCaseData> DbTemplateCases()
|
||||||
|
{
|
||||||
|
foreach (var template in ReadTemplates())
|
||||||
|
{
|
||||||
|
yield return new TestCaseData(template)
|
||||||
|
{
|
||||||
|
TestName = $"Template_{template.Name}_{template.LangCode}_{template.Guid}"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Database_contains_templates()
|
||||||
|
{
|
||||||
|
Assert.That(ReadTemplates(), Is.Not.Empty);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCaseSource(nameof(DbTemplateCases))]
|
||||||
|
public void Every_placeholder_in_every_db_template_is_replaced(TemplateRow template)
|
||||||
|
{
|
||||||
|
var data = new TemplatePlaceholders();
|
||||||
|
|
||||||
|
var subject = template.Subject.ReplacePlaceholders(data);
|
||||||
|
var body = template.Body.ReplacePlaceholders(data);
|
||||||
|
|
||||||
|
var originalTokens = PlaceholderPattern
|
||||||
|
.Matches(template.Subject + template.Body)
|
||||||
|
.Select(m => m.Value)
|
||||||
|
.Distinct()
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
Assert.Multiple(() =>
|
||||||
|
{
|
||||||
|
Assert.That(Unresolved(subject), Is.Empty,
|
||||||
|
$"'{template.Name}' subject has unresolved placeholders.");
|
||||||
|
Assert.That(Unresolved(body), Is.Empty,
|
||||||
|
$"'{template.Name}' body has unresolved placeholders.");
|
||||||
|
|
||||||
|
foreach (var token in originalTokens)
|
||||||
|
{
|
||||||
|
Assert.That(subject + body, Does.Contain(Expected(token)),
|
||||||
|
$"'{template.Name}' placeholder {token} was not replaced with its value.");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string[] Unresolved(string text)
|
||||||
|
=> PlaceholderPattern.Matches(text)
|
||||||
|
.Select(m => m.Value)
|
||||||
|
.Distinct()
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
private static string Expected(string token) => $"__{token.Trim('[', ']')}__";
|
||||||
|
|
||||||
|
private static List<TemplateRow> ReadTemplates()
|
||||||
|
{
|
||||||
|
const string sql = "SELECT GUID, NAME, SUBJECT, BODY, LANG_CODE FROM TBSIG_EMAIL_TEMPLATE";
|
||||||
|
|
||||||
|
using var connection = new SqlConnection(ReadConnectionString());
|
||||||
|
connection.Open();
|
||||||
|
|
||||||
|
using var command = new SqlCommand(sql, connection);
|
||||||
|
using var reader = command.ExecuteReader();
|
||||||
|
|
||||||
|
var templates = new List<TemplateRow>();
|
||||||
|
while (reader.Read())
|
||||||
|
{
|
||||||
|
templates.Add(new TemplateRow(
|
||||||
|
reader.GetInt32(0),
|
||||||
|
reader.GetString(1),
|
||||||
|
reader.IsDBNull(2) ? string.Empty : reader.GetString(2),
|
||||||
|
reader.IsDBNull(3) ? string.Empty : reader.GetString(3),
|
||||||
|
reader.IsDBNull(4) ? string.Empty : reader.GetString(4)));
|
||||||
|
}
|
||||||
|
|
||||||
|
return templates;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string ReadConnectionString()
|
||||||
|
{
|
||||||
|
var directory = new DirectoryInfo(AppContext.BaseDirectory);
|
||||||
|
while (directory is not null && !File.Exists(Path.Combine(directory.FullName, "EnvelopeGenerator.sln")))
|
||||||
|
directory = directory.Parent;
|
||||||
|
|
||||||
|
if (directory is null)
|
||||||
|
throw new InvalidOperationException("Solution root (EnvelopeGenerator.sln) was not found.");
|
||||||
|
|
||||||
|
var settingsPath = Path.Combine(
|
||||||
|
directory.FullName,
|
||||||
|
"EnvelopeGenerator.Server",
|
||||||
|
"EnvelopeGenerator.Server",
|
||||||
|
"appsettings.json");
|
||||||
|
|
||||||
|
using var stream = File.OpenRead(settingsPath);
|
||||||
|
using var document = JsonDocument.Parse(stream, new JsonDocumentOptions
|
||||||
|
{
|
||||||
|
CommentHandling = JsonCommentHandling.Skip,
|
||||||
|
AllowTrailingCommas = true
|
||||||
|
});
|
||||||
|
|
||||||
|
return document.RootElement
|
||||||
|
.GetProperty("ConnectionStrings")
|
||||||
|
.GetProperty("Default")
|
||||||
|
.GetString()
|
||||||
|
?? throw new InvalidOperationException($"ConnectionStrings:Default is missing in '{settingsPath}'.");
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed record TemplateRow(int Guid, string Name, string Subject, string Body, string LangCode);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// One property per placeholder used by any row in TBSIG_EMAIL_TEMPLATE.
|
||||||
|
/// The sentinel value equals the placeholder name, so a wrong mapping is detected.
|
||||||
|
/// </summary>
|
||||||
|
private sealed class TemplatePlaceholders
|
||||||
|
{
|
||||||
|
public string DocumentProcess { get; set; } = "__DOCUMENT_PROCESS__";
|
||||||
|
public string DocumentTitle { get; set; } = "__DOCUMENT_TITLE__";
|
||||||
|
public string LinkToDocumentText { get; set; } = "__LINK_TO_DOCUMENT_TEXT__";
|
||||||
|
public string LinkToDocument { get; set; } = "__LINK_TO_DOCUMENT__";
|
||||||
|
public string Message { get; set; } = "__MESSAGE__";
|
||||||
|
public string NamePortal { get; set; } = "__NAME_PORTAL__";
|
||||||
|
public string NameReceiver { get; set; } = "__NAME_RECEIVER__";
|
||||||
|
public string NameSender { get; set; } = "__NAME_SENDER__";
|
||||||
|
public string SignatureType { get; set; } = "__SIGNATURE_TYPE__";
|
||||||
|
public string Reason { get; set; } = "__REASON__";
|
||||||
|
public string ReceiverAction { get; set; } = "__RECEIVER_ACTION__";
|
||||||
|
public string FinalAction { get; set; } = "__FINAL_ACTION__";
|
||||||
|
public string FinalStatus { get; set; } = "__FINAL_STATUS__";
|
||||||
|
public string DocumentAccessCode { get; set; } = "__DOCUMENT_ACCESS_CODE__";
|
||||||
|
public string TfaExpiration { get; set; } = "__TFA_EXPIRATION__";
|
||||||
|
public string TfaQrCode { get; set; } = "__TFA_QR_CODE__";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,478 @@
|
|||||||
|
using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
|
||||||
|
using EnvelopeGenerator.Infrastructure.Notification;
|
||||||
|
|
||||||
|
namespace EnvelopeGenerator.Tests.Infrastructure;
|
||||||
|
|
||||||
|
[TestFixture]
|
||||||
|
public class ReplacePlaceholderExtensionsTests
|
||||||
|
{
|
||||||
|
#region Naming
|
||||||
|
|
||||||
|
private static IEnumerable<TestCaseData> NamingCases()
|
||||||
|
{
|
||||||
|
yield return Naming<PersonModel>("[FIRST_NAME]");
|
||||||
|
yield return Naming<PersonModel>("[LAST_NAME]");
|
||||||
|
yield return Naming<IdModel>("[ID]");
|
||||||
|
yield return Naming<UpperIdModel>("[ID]");
|
||||||
|
yield return Naming<AcronymModel>("[URL_VALUE]");
|
||||||
|
yield return Naming<AcronymModel>("[HTTP_STATUS_CODE]");
|
||||||
|
yield return Naming<AcronymModel>("[XML_HTTP_REQUEST]");
|
||||||
|
yield return Naming<AcronymModel>("[OTP]");
|
||||||
|
yield return Naming<DigitModel>("[FIELD1]");
|
||||||
|
yield return Naming<DigitModel>("[VALUE2_TEXT]");
|
||||||
|
yield return Naming<DigitModel>("[A1_B2]");
|
||||||
|
yield return Naming<DigitModel>("[NAME2]");
|
||||||
|
yield return Naming<MyUrl2ValueModel>("[MY_URL2_VALUE]");
|
||||||
|
yield return Naming<SingleLetterModel>("[X]");
|
||||||
|
yield return Naming<LowerCaseModel>("[FIRST_NAME]");
|
||||||
|
yield return Naming<SnakeCaseModel>("[FIRST_NAME]");
|
||||||
|
yield return Naming<TfaModel>("[TFA_EXPIRATION]");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static TestCaseData Naming<T>(string placeholder) where T : new()
|
||||||
|
=> new(new T(), placeholder)
|
||||||
|
{
|
||||||
|
TestName = $"Placeholder_{typeof(T).Name}_{placeholder.Trim('[', ']')}"
|
||||||
|
};
|
||||||
|
|
||||||
|
[TestCaseSource(nameof(NamingCases))]
|
||||||
|
public void Property_names_are_converted_to_upper_snake_case(object data, string placeholder)
|
||||||
|
{
|
||||||
|
var result = placeholder.ReplacePlaceholders(data);
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("v"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
[SetCulture("tr-TR")]
|
||||||
|
public void Placeholder_names_are_culture_invariant()
|
||||||
|
{
|
||||||
|
var result = "[INFO]".ReplacePlaceholders(new LowerCaseInfoModel());
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("v"), "Turkish casing would produce [\u0130NFO]");
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Basic replacement
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Replaces_single_placeholder()
|
||||||
|
{
|
||||||
|
var result = "[FIRST_NAME]".ReplacePlaceholders(new PersonModel { FirstName = "Ada" });
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("Ada"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Replaces_multiple_placeholders()
|
||||||
|
{
|
||||||
|
var data = new PersonModel { FirstName = "Ada", LastName = "Lovelace" };
|
||||||
|
|
||||||
|
var result = "[FIRST_NAME] [LAST_NAME]".ReplacePlaceholders(data);
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("Ada Lovelace"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Replaces_all_repeated_occurrences()
|
||||||
|
{
|
||||||
|
var data = new PersonModel { FirstName = "Ada" };
|
||||||
|
|
||||||
|
var result = "[FIRST_NAME]-[FIRST_NAME]-[FIRST_NAME]".ReplacePlaceholders(data);
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("Ada-Ada-Ada"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Leaves_unknown_placeholder_untouched()
|
||||||
|
{
|
||||||
|
var result = "[UNKNOWN_TOKEN]".ReplacePlaceholders(new PersonModel());
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("[UNKNOWN_TOKEN]"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Returns_template_unchanged_when_it_has_no_placeholders()
|
||||||
|
{
|
||||||
|
var result = "Hello world".ReplacePlaceholders(new PersonModel());
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("Hello world"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Returns_empty_string_for_empty_template()
|
||||||
|
{
|
||||||
|
var result = string.Empty.ReplacePlaceholders(new PersonModel());
|
||||||
|
|
||||||
|
Assert.That(result, Is.Empty);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Returns_template_unchanged_when_data_has_no_readable_properties()
|
||||||
|
{
|
||||||
|
var result = "[ANYTHING]".ReplacePlaceholders(new object());
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("[ANYTHING]"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Matching_is_case_sensitive()
|
||||||
|
{
|
||||||
|
var result = "[name]|[Name]".ReplacePlaceholders(new PersonNameModel { Name = "v" });
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("[name]|[Name]"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Placeholder_without_brackets_is_untouched()
|
||||||
|
{
|
||||||
|
var result = "NAME Receiver".ReplacePlaceholders(new PersonNameModel { Name = "v" });
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("NAME Receiver"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Double_brackets_leave_the_outer_brackets()
|
||||||
|
{
|
||||||
|
var result = "[[NAME]]".ReplacePlaceholders(new PersonNameModel { Name = "v" });
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("[v]"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Values
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Null_value_is_replaced_with_empty_string()
|
||||||
|
{
|
||||||
|
var result = "[NAME]".ReplacePlaceholders(new { Name = (string?)null });
|
||||||
|
|
||||||
|
Assert.That(result, Is.Empty);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Custom_ToString_is_used()
|
||||||
|
{
|
||||||
|
var result = "[VALUE]".ReplacePlaceholders(new { Value = new CustomValue() });
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("custom"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Primitive_values_use_ToString()
|
||||||
|
{
|
||||||
|
var result = "[COUNT]|[ENABLED]".ReplacePlaceholders(new { Count = 3, Enabled = true });
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("3|True"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Regex_like_characters_are_inserted_literally()
|
||||||
|
{
|
||||||
|
var result = "[PATTERN]".ReplacePlaceholders(new { Pattern = @"$1 {0} \ $&" });
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo(@"$1 {0} \ $&"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Value_containing_its_own_placeholder_is_not_expanded_recursively()
|
||||||
|
{
|
||||||
|
var result = "[NAME]".ReplacePlaceholders(new EchoNameModel());
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("[NAME]"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Unicode_value_is_preserved()
|
||||||
|
{
|
||||||
|
var result = "[NAME]".ReplacePlaceholders(new PersonNameModel { Name = "Z\u00fcrich \ud83d\ude00" });
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("Z\u00fcrich \ud83d\ude00"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Property discovery
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Public_readable_property_is_replaced()
|
||||||
|
{
|
||||||
|
var result = "[SHOWN]".ReplacePlaceholders(new DiscoveryModel());
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("shown"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Get_only_property_is_replaced()
|
||||||
|
{
|
||||||
|
var result = "[READ_ONLY]".ReplacePlaceholders(new DiscoveryModel());
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("computed"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Static_private_write_only_and_indexer_properties_are_ignored()
|
||||||
|
{
|
||||||
|
const string template = "[HIDDEN]|[STATIC]|[WRITE_ONLY]|[ITEM]";
|
||||||
|
|
||||||
|
var result = template.ReplacePlaceholders(new DiscoveryModel());
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo(template));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Inherited_public_property_is_replaced()
|
||||||
|
{
|
||||||
|
var result = "[ID]|[NAME]".ReplacePlaceholders(new DerivedModel());
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("base|derived"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Record_properties_are_replaced()
|
||||||
|
{
|
||||||
|
var result = "[FIRST_NAME]/[AGE]".ReplacePlaceholders(new PersonRecord("Ada", 36));
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("Ada/36"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Struct_data_is_supported()
|
||||||
|
{
|
||||||
|
var result = "[NAME]".ReplacePlaceholders(new StructModel { Name = "struct" });
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("struct"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Anonymous_type_is_supported()
|
||||||
|
{
|
||||||
|
var data = new { Name = "anon", Age = 42 };
|
||||||
|
|
||||||
|
var result = "[NAME]|[AGE]".ReplacePlaceholders(data);
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("anon|42"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Generic_type_is_supported_for_reference_type()
|
||||||
|
{
|
||||||
|
var result = "[VALUE]".ReplacePlaceholders(new Box<string> { Value = "boxed" });
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("boxed"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Generic_type_is_supported_for_value_type()
|
||||||
|
{
|
||||||
|
var result = "[VALUE]".ReplacePlaceholders(new Box<int> { Value = 5 });
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("5"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Cache and thread safety
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Cached_metadata_uses_values_of_current_instance()
|
||||||
|
{
|
||||||
|
var first = "[FIRST_NAME]".ReplacePlaceholders(new PersonModel { FirstName = "first" });
|
||||||
|
var second = "[FIRST_NAME]".ReplacePlaceholders(new PersonModel { FirstName = "second" });
|
||||||
|
|
||||||
|
Assert.That(new[] { first, second }, Is.EqualTo(new[] { "first", "second" }));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Two_types_with_same_property_name_are_resolved_independently()
|
||||||
|
{
|
||||||
|
var a = "[NAME]".ReplacePlaceholders(new TypeA());
|
||||||
|
var b = "[NAME]".ReplacePlaceholders(new TypeB());
|
||||||
|
|
||||||
|
Assert.That(new[] { a, b }, Is.EqualTo(new[] { "a", "b" }));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Concurrent_first_calls_are_thread_safe()
|
||||||
|
{
|
||||||
|
var failures = 0;
|
||||||
|
|
||||||
|
Parallel.For(0, 500, i =>
|
||||||
|
{
|
||||||
|
var expected = $"n{i}";
|
||||||
|
var actual = "[NAME]".ReplacePlaceholders(new ConcurrentModel { Name = expected });
|
||||||
|
|
||||||
|
if (actual != expected)
|
||||||
|
Interlocked.Increment(ref failures);
|
||||||
|
});
|
||||||
|
|
||||||
|
Assert.That(failures, Is.Zero);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Real DTO
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Document_received_notification_is_fully_replaced()
|
||||||
|
{
|
||||||
|
var data = new DocumentReceivedNotification
|
||||||
|
{
|
||||||
|
DocumentTitle = "Vertrag",
|
||||||
|
NameReceiver = "Max",
|
||||||
|
NameSender = "Erika",
|
||||||
|
IsReadAndConfirm = true,
|
||||||
|
AdvancedSignature = false,
|
||||||
|
LinkToDocument = "https://x.io/a",
|
||||||
|
Message = "Bitte",
|
||||||
|
NamePortal = "Portal"
|
||||||
|
};
|
||||||
|
|
||||||
|
const string template =
|
||||||
|
"[NAME_RECEIVER]|[NAME_SENDER]|[SIGNATURE_TYPE]|[DOCUMENT_TITLE]|[MESSAGE]|[NAME_PORTAL]|[LINK_TO_DOCUMENT]|[LINK_TO_DOCUMENT_TEXT]";
|
||||||
|
|
||||||
|
var result = template.ReplacePlaceholders(data);
|
||||||
|
|
||||||
|
Assert.That(result, Is.EqualTo("Max|Erika|Signieren|Vertrag|Bitte|Portal|https://x.io/a|https://x.io/a"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Models
|
||||||
|
|
||||||
|
private sealed class PersonModel
|
||||||
|
{
|
||||||
|
public string FirstName { get; set; } = "v";
|
||||||
|
public string LastName { get; set; } = "v";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class PersonNameModel
|
||||||
|
{
|
||||||
|
public string Name { get; set; } = "v";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class IdModel
|
||||||
|
{
|
||||||
|
public string Id { get; set; } = "v";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class UpperIdModel
|
||||||
|
{
|
||||||
|
public string ID { get; set; } = "v";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class AcronymModel
|
||||||
|
{
|
||||||
|
public string URLValue { get; set; } = "v";
|
||||||
|
public string HTTPStatusCode { get; set; } = "v";
|
||||||
|
public string XMLHttpRequest { get; set; } = "v";
|
||||||
|
public string OTP { get; set; } = "v";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class DigitModel
|
||||||
|
{
|
||||||
|
public string Field1 { get; set; } = "v";
|
||||||
|
public string Value2Text { get; set; } = "v";
|
||||||
|
public string A1B2 { get; set; } = "v";
|
||||||
|
public string Name2 { get; set; } = "v";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class MyUrl2ValueModel
|
||||||
|
{
|
||||||
|
public string MyURL2Value { get; set; } = "v";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class SingleLetterModel
|
||||||
|
{
|
||||||
|
public string X { get; set; } = "v";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class LowerCaseModel
|
||||||
|
{
|
||||||
|
public string firstName { get; set; } = "v";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class LowerCaseInfoModel
|
||||||
|
{
|
||||||
|
public string info { get; set; } = "v";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class SnakeCaseModel
|
||||||
|
{
|
||||||
|
public string First_Name { get; set; } = "v";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class TfaModel
|
||||||
|
{
|
||||||
|
public string TFAExpiration { get; set; } = "v";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class CustomValue
|
||||||
|
{
|
||||||
|
public override string ToString() => "custom";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class EchoNameModel
|
||||||
|
{
|
||||||
|
public string Name { get; set; } = "[NAME]";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class DiscoveryModel
|
||||||
|
{
|
||||||
|
public static string Static { get; set; } = "static";
|
||||||
|
|
||||||
|
public string ReadOnly => "computed";
|
||||||
|
|
||||||
|
public string WriteOnly
|
||||||
|
{
|
||||||
|
set { }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string this[int index] => "indexer";
|
||||||
|
|
||||||
|
public string Shown { get; set; } = "shown";
|
||||||
|
|
||||||
|
private string Hidden { get; set; } = "hidden";
|
||||||
|
}
|
||||||
|
|
||||||
|
private class BaseModel
|
||||||
|
{
|
||||||
|
public string Id { get; set; } = "base";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class DerivedModel : BaseModel
|
||||||
|
{
|
||||||
|
public string Name { get; set; } = "derived";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed record PersonRecord(string FirstName, int Age);
|
||||||
|
|
||||||
|
private struct StructModel
|
||||||
|
{
|
||||||
|
public string Name { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class Box<T>
|
||||||
|
{
|
||||||
|
public T Value { get; set; } = default!;
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class TypeA
|
||||||
|
{
|
||||||
|
public string Name { get; set; } = "a";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class TypeB
|
||||||
|
{
|
||||||
|
public string Name { get; set; } = "b";
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class ConcurrentModel
|
||||||
|
{
|
||||||
|
public string Name { get; set; } = string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user