Merge pull request #16 from ndeet/fix-webhook-dos

Fix bug creating new webhook on each order
btcpayserver · Jun 16, 2023 · 2675d25 · 2675d25
2 parents 2356aa3 + 3e09dad
commit 2675d25
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Model/BTCPay/BTCPayService.php b/Model/BTCPay/BTCPayService.php
@@ -422,7 +422,7 @@ public function updateInvoice(string $btcPayStoreId, string $invoiceId, $logPaym
                             if ($autoCancel) {
                                 $btcpayInvoices = $this->getInvoicesByOrderIds($magentoStoreId, [$order->getIncrementId()]);
                                 $isEverythingExpired = true;
-                                foreach ($btcpayInvoices->getInvoices() as $invoice) {
+                                foreach ($btcpayInvoices->all() as $invoice) {
                                     if (!$invoice->isExpired()) {
                                         $isEverythingExpired = false;
                                         break;
@@ -662,7 +662,7 @@ public function getWebhooksForStore(int $magentoStoreId, $btcPayStoreId, string
 
         $url = $this->getWebhookUrl($magentoStoreId);
 
-        foreach ($webhooks as $webhook) {
+        foreach ($webhooks->all() as $webhook) {
             $data = $webhook->getData();
             if ($data['url'] === $url) {
                 return $data;

diff --git a/Observer/CheckOrderStatus.php b/Observer/CheckOrderStatus.php
@@ -54,7 +54,7 @@ public function execute(Observer $observer)
                 //Check Order Status
                 $invoices = $this->btcService->getInvoicesByOrderIds($currentStoreId, $orderIdArr);
 
-                $invoices = $invoices->getInvoices();
+                $invoices = $invoices->all();
                 if (count($invoices) !== 0) {
                     $invoice = $invoices[0];
 
@@ -65,7 +65,7 @@ public function execute(Observer $observer)
                         //Only cancel when no other open invoices for the same orderId
                         $btcpayInvoices = $this->btcService->getInvoicesByOrderIds($currentStoreId, [$order->getIncrementId()]);
                         $isEverythingNew = true;
-                        foreach ($btcpayInvoices->getInvoices() as $invoice) {
+                        foreach ($btcpayInvoices->all() as $invoice) {
                             if (!$invoice->isNew()) {
                                 $isEverythingNew = false;
                                 break;