litecharms/midrandbooks-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 32 Wiki Activity

Merge pull request 'Refactored endpoint to handle incoming form using IFormCollection' (#24) from payments into master

Browse Source 
Reviewed-on: #24
This commit was merged in pull request #24.
This commit is contained in:
Khwezi Mngoma
2026-06-13 16:10:33 +02:00
parent 01d3aa90ea 41e1c9da4c
commit 8cdfba58fd
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MidrandBooksApi/MidrandBooksApi.csproj
+2 -2
View File
@@ -54,13 +54,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LiteCharms.Features" Version="1.115.0" /> <PackageReference Include="LiteCharms.Features" Version="1.118.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.115.0" /> <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.118.0" />
<!-- Global Usings --> <!-- Global Usings -->
<Using Include="Blazored.Toast.Services" /> <Using Include="Blazored.Toast.Services" />
MidrandBooksApi/Payments/Payfast/PayfastConfirmationEndpoint.cs
+9 -14
View File
@@ -24,8 +24,6 @@ public sealed class PayfastConfirmationEndpoint : IEndpoint
activity?.SetTag("messaging.system", "payfast"); activity?.SetTag("messaging.system", "payfast");
activity?.SetTag("messaging.destination.name", "payments/payfast/confirm"); activity?.SetTag("messaging.destination.name", "payments/payfast/confirm");
string? remoteIp = request.HttpContext.Connection.RemoteIpAddress?.ToString();
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()))
@@ -34,29 +32,27 @@ public sealed class PayfastConfirmationEndpoint : IEndpoint
string incomingSignature = signatureValues.ToString().Trim(); string incomingSignature = signatureValues.ToString().Trim();
var payload = ParseForm(formCollection, incomingSignature); var payload = ParseForm(formCollection, incomingSignature);
var paramDictionary = payload.ToParamDictionary(); string? passphrase = configuration["PayfastSettings:Passphrase"];
string? passphrase = configuration["HasherSettings:PayfastPassphrase"];
var signatureCheck = PayfastService.GenerateSignature(paramDictionary, passphrase); if (!PayfastService.VerifyIncomingSignatureFromForm(formCollection, passphrase!))
if (signatureCheck.IsFailed || !string.Equals(signatureCheck.Value, incomingSignature, StringComparison.OrdinalIgnoreCase))
{ {
logger.LogCritical($"Incoming sugnature failed validation: {incomingSignature}, {signatureCheck.Errors.Select(e => e.Message).ToList()}"); logger.LogCritical($"Incoming signature failed validation: {incomingSignature}");
return Results.Unauthorized(); return Results.Unauthorized();
} }
var formPairs = formCollection.Select(kvp => $"{kvp.Key}={HttpUtility.UrlEncode(kvp.Value.ToString())}"); var sortedPairs = formCollection
.Where(kvp => !kvp.Key.Equals("signature", StringComparison.OrdinalIgnoreCase))
.OrderBy(kvp => kvp.Key, StringComparer.Ordinal)
.Select(kvp => $"{kvp.Key}={HttpUtility.UrlEncode(kvp.Value.ToString().Trim())}");
string rawQueryParamString = string.Join("&", formPairs); string rawQueryParamString = string.Join("&", sortedPairs);
bool isSandbox = !hostEnvironment.IsProduction(); bool isSandbox = !hostEnvironment.IsProduction();
var serverConfirmation = await payfastService.ValidateServerConfirmationAsync(rawQueryParamString, isSandbox, cancellationToken); var serverConfirmation = await payfastService.ValidateServerConfirmationAsync(rawQueryParamString, isSandbox, cancellationToken);
if (serverConfirmation.IsFailed || !serverConfirmation.Value) if (serverConfirmation.IsFailed || !serverConfirmation.Value)
{ {
logger.LogCritical($"Server confirmation failed: {rawQueryParamString}, {serverConfirmation.Errors.Select(e => e.Message).ToList()}"); logger.LogCritical($"Payfast server validation ping rejected the request data: {rawQueryParamString}");
return Results.Unauthorized(); return Results.Unauthorized();
} }
@@ -67,7 +63,6 @@ public sealed class PayfastConfirmationEndpoint : IEndpoint
await jobOrchestrator.SendAsync(notification, cancellationToken); await jobOrchestrator.SendAsync(notification, cancellationToken);
activity?.SetStatus(ActivityStatusCode.Ok); activity?.SetStatus(ActivityStatusCode.Ok);
return Results.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.")