aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 22:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Give better error for greenfield API

Browse Source
This commit is contained in:
nicolas.dorier
2021-04-08 15:57:01 +09:00
parent 315284d5f5
commit a7cbb3941a
2 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
BTCPayServer/Controllers/GreenField/InvoiceController.cs
View File

@@ -52,7 +52,7 @@ namespace BTCPayServer.Controllers.GreenField
var store = HttpContext.GetStoreData();
if (store == null)
{
return NotFound();
return StoreNotFound();
}
var invoices =
@@ -74,13 +74,13 @@ namespace BTCPayServer.Controllers.GreenField
var store = HttpContext.GetStoreData();
if (store == null)
{
return NotFound();
return InvoiceNotFound();
}
var invoice = await _invoiceRepository.GetInvoice(invoiceId, true);
if (invoice?.StoreId != store.Id)
{
return NotFound();
return InvoiceNotFound();
}
return Ok(ToModel(invoice));
@@ -94,9 +94,13 @@ namespace BTCPayServer.Controllers.GreenField
var store = HttpContext.GetStoreData();
if (store == null)
{
return NotFound();
return InvoiceNotFound();
}
var invoice = await _invoiceRepository.GetInvoice(invoiceId, true);
if (invoice?.StoreId != store.Id)
{
return InvoiceNotFound();
}
await _invoiceRepository.ToggleInvoiceArchival(invoiceId, true, storeId);
return Ok();
}
@@ -109,7 +113,7 @@ namespace BTCPayServer.Controllers.GreenField
var store = HttpContext.GetStoreData();
if (store == null)
{
return NotFound();
return InvoiceNotFound();
}
var result = await _invoiceRepository.UpdateInvoiceMetadata(invoiceId, storeId, request.Metadata);
@@ -118,7 +122,7 @@ namespace BTCPayServer.Controllers.GreenField
return Ok(ToModel(result));
}
return NotFound();
return InvoiceNotFound();
}
[Authorize(Policy = Policies.CanCreateInvoice,
@@ -129,7 +133,7 @@ namespace BTCPayServer.Controllers.GreenField
var store = HttpContext.GetStoreData();
if (store == null)
{
return NotFound();
return StoreNotFound();
}
if (request.Amount < 0.0m)
@@ -206,13 +210,13 @@ namespace BTCPayServer.Controllers.GreenField
var store = HttpContext.GetStoreData();
if (store == null)
{
return NotFound();
return InvoiceNotFound();
}
var invoice = await _invoiceRepository.GetInvoice(invoiceId, true);
if (invoice.StoreId != store.Id)
{
return NotFound();
return InvoiceNotFound();
}
if (!await _invoiceRepository.MarkInvoiceStatus(invoice.Id, request.Status))
@@ -235,13 +239,13 @@ namespace BTCPayServer.Controllers.GreenField
var store = HttpContext.GetStoreData();
if (store == null)
{
return NotFound();
return InvoiceNotFound();
}
var invoice = await _invoiceRepository.GetInvoice(invoiceId, true);
if (invoice.StoreId != store.Id)
{
return NotFound();
return InvoiceNotFound();
}
if (!invoice.Archived)
@@ -265,13 +269,13 @@ namespace BTCPayServer.Controllers.GreenField
var store = HttpContext.GetStoreData();
if (store == null)
{
return NotFound();
return InvoiceNotFound();
}
var invoice = await _invoiceRepository.GetInvoice(invoiceId, true);
if (invoice?.StoreId != store.Id)
{
return NotFound();
return InvoiceNotFound();
}
return Ok(ToPaymentMethodModels(invoice));
@@ -285,13 +289,13 @@ namespace BTCPayServer.Controllers.GreenField
var store = HttpContext.GetStoreData();
if (store == null)
{
return NotFound();
return InvoiceNotFound();
}
var invoice = await _invoiceRepository.GetInvoice(invoiceId, true);
if (invoice?.StoreId != store.Id)
{
return NotFound();
return InvoiceNotFound();
}
if (PaymentMethodId.TryParse(paymentMethod, out var paymentMethodId))
@@ -300,9 +304,19 @@ namespace BTCPayServer.Controllers.GreenField
_paymentMethodHandlerDictionary, store, invoice, paymentMethodId);
return Ok();
}
return BadRequest();
ModelState.AddModelError(nameof(paymentMethod), "Invalid payment method");
return this.CreateValidationError(ModelState);
}
private IActionResult InvoiceNotFound()
{
return this.CreateAPIError(404, "invoice-not-found", "The invoice was not found");
}
private IActionResult StoreNotFound()
{
return this.CreateAPIError(404, "store-not-found", "The store was not found");
}
private InvoicePaymentMethodDataModel[] ToPaymentMethodModels(InvoiceEntity entity)
{
return entity.GetPaymentMethods().Select(