mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2024-11-19 01:43:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

NFC: Handle HTTP-related exceptions (#4965)

Browse Source
This commit is contained in:
d11n 2023-05-08 12:11:42 +02:00 committed by GitHub
parent 6fad5ebedb
commit 3763480280
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
BTCPayServer/Plugins/NFC/NFCController.cs
View File

@ -58,7 +58,7 @@ namespace BTCPayServer.Plugins.NFC
if (!methods.TryGetValue(new PaymentMethodId("BTC", PaymentTypes.LNURLPay), out var lnurlPaymentMethod) &&
!methods.TryGetValue(new PaymentMethodId("BTC", PaymentTypes.LightningLike), out lnPaymentMethod))
{
return BadRequest("Destination for lnurlw was not specified");
return BadRequest("Destination for LNURL-Withdraw was not specified");
}
Uri uri;
@ -81,10 +81,8 @@ namespace BTCPayServer.Plugins.NFC
return BadRequest("LNURL was not LNURL-Withdraw");
}
var httpClient = _httpClientFactory.CreateClient(uri.IsOnion()
? LightningLikePayoutHandler.LightningLikePayoutHandlerOnionNamedClient
: LightningLikePayoutHandler.LightningLikePayoutHandlerClearnetNamedClient);
LNURLWithdrawRequest info;
var httpClient = CreateHttpClient(uri);
try
{
info = await LNURL.LNURL.FetchInformation(uri, tag, httpClient) as LNURLWithdrawRequest;
@ -100,10 +98,6 @@ namespace BTCPayServer.Plugins.NFC
return BadRequest("Could not fetch info from LNURL-Withdraw");
}
httpClient = _httpClientFactory.CreateClient(info.Callback.IsOnion()
? LightningLikePayoutHandler.LightningLikePayoutHandlerOnionNamedClient
: LightningLikePayoutHandler.LightningLikePayoutHandlerClearnetNamedClient);
string bolt11 = null;
if (lnPaymentMethod is not null)
{
@ -155,23 +149,31 @@ namespace BTCPayServer.Plugins.NFC
due = lnurlPaymentMethod.Calculate().Due;
}
var amount = LightMoney.Satoshis(due.Satoshi);
var actionPath = Url.Action(nameof(UILNURLController.GetLNURLForInvoice), "UILNURL",
new { invoiceId = request.InvoiceId, cryptoCode = "BTC", amount = amount.MilliSatoshi });
var url = Request.GetAbsoluteUri(actionPath);
var resp = await httpClient.GetAsync(url);
var response = await resp.Content.ReadAsStringAsync();
try
{
httpClient = CreateHttpClient(info.Callback);
var amount = LightMoney.Satoshis(due.Satoshi);
var actionPath = Url.Action(nameof(UILNURLController.GetLNURLForInvoice), "UILNURL",
new { invoiceId = request.InvoiceId, cryptoCode = "BTC", amount = amount.MilliSatoshi });
var url = Request.GetAbsoluteUri(actionPath);
var resp = await httpClient.GetAsync(url);
var response = await resp.Content.ReadAsStringAsync();
if (resp.IsSuccessStatusCode)
{
var res = JObject.Parse(response).ToObject<LNURLPayRequest.LNURLPayRequestCallbackResponse>();
bolt11 = res.Pr;
if (resp.IsSuccessStatusCode)
{
var res = JObject.Parse(response).ToObject<LNURLPayRequest.LNURLPayRequestCallbackResponse>();
bolt11 = res.Pr;
}
else
{
var res = JObject.Parse(response).ToObject<LNUrlStatusResponse>();
return BadRequest($"Could not fetch BOLT11 invoice to pay to: {res.Reason}");
}
}
else
catch (Exception ex)
{
var res = JObject.Parse(response).ToObject<LNUrlStatusResponse>();
return BadRequest(
$"Could not fetch BOLT11 invoice to pay to: {res.Reason}");
return BadRequest($"Could not fetch BOLT11 invoice to pay to: {ex.Message}");
}
}
@ -180,13 +182,27 @@ namespace BTCPayServer.Plugins.NFC
return BadRequest("Could not fetch BOLT11 invoice to pay to.");
}
var result = await info.SendRequest(bolt11, httpClient);
if (!string.IsNullOrEmpty(result.Status) && result.Status.Equals("ok", StringComparison.InvariantCultureIgnoreCase))
try
{
return Ok(result.Reason);
}
var result = await info.SendRequest(bolt11, httpClient);
if (!string.IsNullOrEmpty(result.Status) && result.Status.Equals("ok", StringComparison.InvariantCultureIgnoreCase))
{
return Ok(result.Reason);
}
return BadRequest(result.Reason ?? "Unknown error");
return BadRequest(result.Reason ?? "Unknown error");
}
catch (Exception ex)
{
return BadRequest(ex.Message);
}
}
private HttpClient CreateHttpClient(Uri uri)
{
return _httpClientFactory.CreateClient(uri.IsOnion()
? LightningLikePayoutHandler.LightningLikePayoutHandlerOnionNamedClient
: LightningLikePayoutHandler.LightningLikePayoutHandlerClearnetNamedClient);
}
}
}