mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-03-12 10:30:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

Show better error message for invalid destination in PullPayments

Browse source
This commit is contained in:
nicolas.dorier 2024-05-03 21:56:41 +09:00
parent 958a348fed
commit 3fbc717cd4
No known key found for this signature in database
GPG key ID: 6618763EF09186FE
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
BTCPayServer/Controllers/UIPullPaymentController.cs
View file

@ -227,6 +227,7 @@ namespace BTCPayServer.Controllers
var supported = ppBlob.SupportedPaymentMethods; var supported = ppBlob.SupportedPaymentMethods;
PaymentMethodId paymentMethodId = null; PaymentMethodId paymentMethodId = null;
IClaimDestination destination = null; IClaimDestination destination = null;
string error = null;
if (string.IsNullOrEmpty(vm.SelectedPaymentMethod)) if (string.IsNullOrEmpty(vm.SelectedPaymentMethod))
{ {
foreach (var pmId in supported) foreach (var pmId in supported)
@ -235,6 +236,7 @@ namespace BTCPayServer.Controllers
(IClaimDestination dst, string err) = handler == null (IClaimDestination dst, string err) = handler == null
? (null, "No payment handler found for this payment method") ? (null, "No payment handler found for this payment method")
: await handler.ParseAndValidateClaimDestination(pmId, vm.Destination, ppBlob, cancellationToken); : await handler.ParseAndValidateClaimDestination(pmId, vm.Destination, ppBlob, cancellationToken);
error = err;
if (dst is not null && err is null) if (dst is not null && err is null)
{ {
paymentMethodId = pmId; paymentMethodId = pmId;
@ -247,12 +249,15 @@ namespace BTCPayServer.Controllers
{ {
paymentMethodId = supported.FirstOrDefault(id => vm.SelectedPaymentMethod == id.ToString()); paymentMethodId = supported.FirstOrDefault(id => vm.SelectedPaymentMethod == id.ToString());
var payoutHandler = paymentMethodId is null ? null : _payoutHandlers.FindPayoutHandler(paymentMethodId); var payoutHandler = paymentMethodId is null ? null : _payoutHandlers.FindPayoutHandler(paymentMethodId);
destination = payoutHandler is null ? null : (await payoutHandler.ParseAndValidateClaimDestination(paymentMethodId, vm.Destination, ppBlob, cancellationToken)).destination; if (payoutHandler is not null)
{
(destination, error) = await payoutHandler.ParseAndValidateClaimDestination(paymentMethodId, vm.Destination, ppBlob, cancellationToken);
}
} }
if (destination is null) if (destination is null)
{ {
ModelState.AddModelError(nameof(vm.Destination), "Invalid destination or payment method"); ModelState.AddModelError(nameof(vm.Destination), error ?? "Invalid destination or payment method");
return await ViewPullPayment(pullPaymentId); return await ViewPullPayment(pullPaymentId);
} }