aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-08 15:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Greenfield: Human friendly error if webhook or delivery not found

Browse Source
This commit is contained in:
nicolas.dorier
2021-04-27 15:38:42 +09:00
parent 0888cc4f97
commit 5f9ef0ff62
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
BTCPayServer/Controllers/GreenField/StoreWebhooksController.cs
View File

@@ -48,7 +48,7 @@ namespace BTCPayServer.Controllers.GreenField
{
var w = await StoreRepository.GetWebhook(CurrentStoreId, webhookId);
if (w is null)
return NotFound();
return WebhookNotFound();
return Ok(FromModel(w, false));
}
}
@@ -70,7 +70,7 @@ namespace BTCPayServer.Controllers.GreenField
var webhookId = await StoreRepository.CreateWebhook(CurrentStoreId, ToModel(create));
var w = await StoreRepository.GetWebhook(CurrentStoreId, webhookId);
if (w is null)
return NotFound();
return WebhookNotFound();
return Ok(FromModel(w, true));
}
@@ -88,7 +88,7 @@ namespace BTCPayServer.Controllers.GreenField
return this.CreateValidationError(ModelState);
var w = await StoreRepository.GetWebhook(CurrentStoreId, webhookId);
if (w is null)
return NotFound();
return WebhookNotFound();
await StoreRepository.UpdateWebhook(storeId, webhookId, ToModel(update));
return await ListWebhooks(webhookId);
}
@@ -97,10 +97,19 @@ namespace BTCPayServer.Controllers.GreenField
{
var w = await StoreRepository.GetWebhook(CurrentStoreId, webhookId);
if (w is null)
return NotFound();
return WebhookNotFound();
await StoreRepository.DeleteWebhook(CurrentStoreId, webhookId);
return Ok();
}
IActionResult WebhookNotFound()
{
return this.CreateAPIError(404, "webhook-not-found", "The webhook was not found");
}
IActionResult WebhookDeliveryNotFound()
{
return this.CreateAPIError(404, "webhookdelivery-not-found", "The webhook delivery was not found");
}
private WebhookBlob ToModel(StoreWebhookBaseData create)
{
return new WebhookBlob()
@@ -133,7 +142,7 @@ namespace BTCPayServer.Controllers.GreenField
{
var delivery = await StoreRepository.GetWebhookDelivery(CurrentStoreId, webhookId, deliveryId);
if (delivery is null)
return NotFound();
return WebhookDeliveryNotFound();
return Ok(FromModel(delivery));
}
}
@@ -142,7 +151,7 @@ namespace BTCPayServer.Controllers.GreenField
{
var delivery = await StoreRepository.GetWebhookDelivery(CurrentStoreId, webhookId, deliveryId);
if (delivery is null)
return NotFound();
return WebhookDeliveryNotFound();
return this.Ok(new JValue(await WebhookNotificationManager.Redeliver(deliveryId)));
}
@@ -151,7 +160,7 @@ namespace BTCPayServer.Controllers.GreenField
{
var delivery = await StoreRepository.GetWebhookDelivery(CurrentStoreId, webhookId, deliveryId);
if (delivery is null)
return NotFound();
return WebhookDeliveryNotFound();
return File(delivery.GetBlob().Request, "application/json");
}