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

Update webhooks

Browse Source
This commit is contained in:
James Cole
2022-09-17 07:07:25 +02:00
parent f0416f5322
commit 10f2cf2481
13 changed files with 99 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Api/V1/Requests/Models/Webhook/CreateRequest.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\Models\Webhook;
use FireflyIII\Models\Webhook;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
@@ -40,9 +41,10 @@ class CreateRequest extends FormRequest
*/
public function getData(): array
{
$triggers = array_flip(config('firefly.webhooks.triggers'));
$responses = array_flip(config('firefly.webhooks.responses'));
$deliveries = array_flip(config('firefly.webhooks.deliveries'));
$triggers = array_flip(Webhook::getTriggers());
$responses = array_flip(Webhook::getResponses());
$deliveries = array_flip(Webhook::getDeliveries());
$fields = [
'title' => ['title', 'convertString'],
@@ -69,9 +71,9 @@ class CreateRequest extends FormRequest
*/
public function rules(): array
{
$triggers = implode(',', array_values(config('firefly.webhooks.triggers')));
$responses = implode(',', array_values(config('firefly.webhooks.responses')));
$deliveries = implode(',', array_values(config('firefly.webhooks.deliveries')));
$triggers = implode(',', Webhook::getTriggers());
$responses = implode(',', Webhook::getResponses());
$deliveries = implode(',', Webhook::getDeliveries());
return [
'title' => 'required|between:1,512|uniqueObjectForUser:webhooks,title',
@@ -79,7 +81,9 @@ class CreateRequest extends FormRequest
'trigger' => sprintf('required|in:%s', $triggers),
'response' => sprintf('required|in:%s', $responses),
'delivery' => sprintf('required|in:%s', $deliveries),
'url' => ['required', 'url', 'starts_with:https://', 'uniqueWebhook'],
'url' => ['required', 'url', 'uniqueWebhook'],
];
}
}

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

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\Models\Webhook;
use FireflyIII\Models\Webhook;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
@@ -40,9 +41,9 @@ class UpdateRequest extends FormRequest
*/
public function getData(): array
{
$triggers = array_flip(config('firefly.webhooks.triggers'));
$responses = array_flip(config('firefly.webhooks.responses'));
$deliveries = array_flip(config('firefly.webhooks.deliveries'));
$triggers = array_flip(Webhook::getTriggers());
$responses = array_flip(Webhook::getResponses());
$deliveries = array_flip(Webhook::getDeliveries());
$fields = [
'title' => ['title', 'convertString'],
@@ -79,9 +80,10 @@ class UpdateRequest extends FormRequest
*/
public function rules(): array
{
$triggers = implode(',', array_values(config('firefly.webhooks.triggers')));
$responses = implode(',', array_values(config('firefly.webhooks.responses')));
$deliveries = implode(',', array_values(config('firefly.webhooks.deliveries')));
$triggers = implode(',', array_values(Webhook::getTriggers()));
$responses = implode(',', array_values(Webhook::getResponses()));
$deliveries = implode(',', array_values(Webhook::getDeliveries()));
$webhook = $this->route()->parameter('webhook');
return [