Fixed return bug
Added quartz job Added otel exports
This commit is contained in:
@@ -53,13 +53,13 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="LiteCharms.Features" Version="1.61.0" />
|
<PackageReference Include="LiteCharms.Features" Version="1.62.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- UI -->
|
<!-- UI -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="ANM.Blazored.Toast" Version="0.1.1" />
|
<PackageReference Include="ANM.Blazored.Toast" Version="0.1.1" />
|
||||||
<PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.61.0" />
|
<PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.62.0" />
|
||||||
|
|
||||||
<!-- Global Usings -->
|
<!-- Global Usings -->
|
||||||
<Using Include="Blazored.Toast.Services" />
|
<Using Include="Blazored.Toast.Services" />
|
||||||
@@ -85,6 +85,7 @@
|
|||||||
|
|
||||||
<!-- Shared Global Usings -->
|
<!-- Shared Global Usings -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Using Include="System.Diagnostics" />
|
||||||
<Using Include="System.Reflection" />
|
<Using Include="System.Reflection" />
|
||||||
<Using Include="Microsoft.Extensions.DependencyInjection.Extensions" />
|
<Using Include="Microsoft.Extensions.DependencyInjection.Extensions" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -1,17 +1,24 @@
|
|||||||
using LiteCharms.Features.Extensions;
|
using LiteCharms.Features.Hasher;
|
||||||
using LiteCharms.Features.Hasher;
|
using LiteCharms.Features.MidrandBooks.Payments.Events;
|
||||||
using LiteCharms.Features.Models;
|
using LiteCharms.Features.Models;
|
||||||
|
using LiteCharms.Features.Quartz.Abstractions;
|
||||||
|
|
||||||
namespace MidrandBooksApi.Payments.Endpoints;
|
namespace MidrandBooksApi.Payments.Endpoints;
|
||||||
|
|
||||||
[ApiVersionTarget(1)]
|
[ApiVersionTarget(1)]
|
||||||
public sealed class ConfirmationEndpoint : IEndpoint
|
public sealed class ConfirmationEndpoint : IEndpoint
|
||||||
{
|
{
|
||||||
|
private static readonly ActivitySource PaymentActivitySource = new("MidrandBooksApi.Payments");
|
||||||
|
|
||||||
public void Map(IEndpointRouteBuilder builder)
|
public void Map(IEndpointRouteBuilder builder)
|
||||||
{
|
{
|
||||||
builder.MapPost("payments/confirm", async (HttpRequest request, HashService hashService,
|
builder.MapPost("payments/confirm", async (HttpRequest request, HashService hashService,
|
||||||
CancellationToken cancellationToken) =>
|
IJobOrchestrator jobOrchestrator, CancellationToken cancellationToken) =>
|
||||||
{
|
{
|
||||||
|
using Activity? activity = PaymentActivitySource.StartActivity("ReceivePayfastWebhook", ActivityKind.Server);
|
||||||
|
activity?.SetTag("messaging.system", "payfast");
|
||||||
|
activity?.SetTag("messaging.destination.name", "payments/confirm");
|
||||||
|
|
||||||
var formCollection = await request.ReadFormAsync(cancellationToken);
|
var formCollection = await request.ReadFormAsync(cancellationToken);
|
||||||
|
|
||||||
if (!formCollection.TryGetValue("signature", out var signatureValues) || string.IsNullOrWhiteSpace(signatureValues.ToString()))
|
if (!formCollection.TryGetValue("signature", out var signatureValues) || string.IsNullOrWhiteSpace(signatureValues.ToString()))
|
||||||
@@ -28,9 +35,13 @@ public sealed class ConfirmationEndpoint : IEndpoint
|
|||||||
|
|
||||||
var validationResult = hashService.VerifyPayfastWebhookSignature(payload, incomingSignature);
|
var validationResult = hashService.VerifyPayfastWebhookSignature(payload, incomingSignature);
|
||||||
|
|
||||||
return validationResult.IsFailed || !validationResult.Value
|
if (validationResult.IsFailed || !validationResult.Value) return Results.Unauthorized();
|
||||||
? Results.Unauthorized()
|
|
||||||
: Results.Ok();
|
await jobOrchestrator.SendAsync(PayfastPaymentConfirmationReceivedEvent.Create(payload, payload.MPaymentId!), cancellationToken);
|
||||||
|
|
||||||
|
activity?.SetStatus(ActivityStatusCode.Ok);
|
||||||
|
|
||||||
|
return Results.Ok();
|
||||||
})
|
})
|
||||||
.WithDescription("Securely confirm and process an incoming Payfast merchant payment callback.")
|
.WithDescription("Securely confirm and process an incoming Payfast merchant payment callback.")
|
||||||
.WithName(typeof(ConfirmationEndpoint).ToEndpointName())
|
.WithName(typeof(ConfirmationEndpoint).ToEndpointName())
|
||||||
|
|||||||
Reference in New Issue
Block a user