kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 11:48:05 +00:00
Code Issues Projects Releases Wiki Activity

Make sure rules are consistent and catch more errors.

Browse Source
This commit is contained in:
James Cole
2023-01-06 06:12:39 +01:00
parent 1fee2092d6
commit 6d4e45b89f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Requests/Models/Webhook/UpdateRequest.php
View File

@@ -94,7 +94,7 @@ class UpdateRequest extends FormRequest
'trigger' => sprintf('in:%s', $triggers), 'trigger' => sprintf('in:%s', $triggers),
'response' => sprintf('in:%s', $responses), 'response' => sprintf('in:%s', $responses),
'delivery' => sprintf('in:%s', $deliveries), 'delivery' => sprintf('in:%s', $deliveries),
'url' => ['url', 'starts_with:https://', sprintf('uniqueExistingWebhook:%d', $webhook->id)], 'url' => ['url', sprintf('uniqueExistingWebhook:%d', $webhook->id)],
]; ];
} }
} }

3
app/Services/Webhook/StandardWebhookSender.php
View File

@@ -28,6 +28,7 @@ use FireflyIII\Helpers\Webhook\SignatureGeneratorInterface;
use FireflyIII\Models\WebhookAttempt; use FireflyIII\Models\WebhookAttempt;
use FireflyIII\Models\WebhookMessage; use FireflyIII\Models\WebhookMessage;
use GuzzleHttp\Client; use GuzzleHttp\Client;
use GuzzleHttp\Exception\ConnectException;
use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Exception\RequestException;
use JsonException; use JsonException;
use Log; use Log;
@@ -109,7 +110,7 @@ class StandardWebhookSender implements WebhookSenderInterface
$client = new Client(); $client = new Client();
try { try {
$res = $client->request('POST', $this->message->webhook->url, $options); $res = $client->request('POST', $this->message->webhook->url, $options);
} catch (RequestException $e) { } catch (RequestException|ConnectException $e) {
Log::error($e->getMessage()); Log::error($e->getMessage());
Log::error($e->getTraceAsString()); Log::error($e->getTraceAsString());