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

Webhooks have titles now.

Browse Source
This commit is contained in:
James Cole
2020-12-03 06:54:42 +01:00
parent eb80578e30
commit a539cfe4f2
11 changed files with 50 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Controllers/Webhook/CreateController.php
View File

@@ -66,8 +66,6 @@ class CreateController extends Controller
{
$data = $request->getData();
$webhook = $this->repository->store($data);
$manager = $this->getManager();
/** @var WebhookTransformer $transformer */
$transformer = app(WebhookTransformer::class);

2
app/Api/V1/Controllers/Webhook/EditController.php
View File

@@ -68,8 +68,6 @@ class EditController extends Controller
{
$data = $request->getData();
$webhook = $this->repository->update($webhook, $data);
$manager = $this->getManager();
/** @var WebhookTransformer $transformer */
$transformer = app(WebhookTransformer::class);

15
app/Api/V1/Requests/Webhook/CreateRequest.php
View File

@@ -43,6 +43,7 @@ class CreateRequest extends FormRequest
$deliveries = array_flip(config('firefly.webhooks.deliveries'));
$fields = [
'title' => ['title', 'string'],
'active' => ['active', 'boolean'],
'trigger' => ['trigger', 'string'],
'response' => ['response', 'string'],
@@ -51,15 +52,12 @@ class CreateRequest extends FormRequest
];
// this is the way.
$return = $this->getAllData($fields);
$return = $this->getAllData($fields);
$return['trigger'] = $triggers[$return['trigger']] ?? 0;
$return['response'] = $responses[$return['response']] ?? 0;
$return['delivery'] = $deliveries[$return['delivery']] ?? 0;
return [
'active' => $return['active'],
'trigger' => $triggers[$return['trigger']] ?? 0,
'response' => $responses[$return['response']] ?? 0,
'delivery' => $deliveries[$return['delivery']] ?? 0,
'url' => $return['url'],
];
return $return;
}
/**
@@ -74,6 +72,7 @@ class CreateRequest extends FormRequest
$deliveries = implode(',', array_values(config('firefly.webhooks.deliveries')));
return [
'title' => 'between:1,512',
'active' => [new IsBoolean],
'trigger' => sprintf('required|in:%s', $triggers),
'response' => sprintf('required|in:%s', $responses),

17
app/Api/V1/Requests/Webhook/UpdateRequest.php
View File

@@ -43,6 +43,7 @@ class UpdateRequest extends FormRequest
$deliveries = array_flip(config('firefly.webhooks.deliveries'));
$fields = [
'title' => ['title', 'string'],
'active' => ['active', 'boolean'],
'trigger' => ['trigger', 'string'],
'response' => ['response', 'string'],
@@ -51,15 +52,12 @@ class UpdateRequest extends FormRequest
];
// this is the way.
$return = $this->getAllData($fields);
$return = $this->getAllData($fields);
$return['trigger'] = $triggers[$return['trigger']] ?? 0;
$return['response'] = $responses[$return['response']] ?? 0;
$return['delivery'] = $deliveries[$return['delivery']] ?? 0;
return [
'active' => $return['active'],
'trigger' => $triggers[$return['trigger']] ?? 0,
'response' => $responses[$return['response']] ?? 0,
'delivery' => $deliveries[$return['delivery']] ?? 0,
'url' => $return['url'],
];
return $return;
}
/**
@@ -72,9 +70,10 @@ class UpdateRequest extends FormRequest
$triggers = implode(',', array_values(config('firefly.webhooks.triggers')));
$responses = implode(',', array_values(config('firefly.webhooks.responses')));
$deliveries = implode(',', array_values(config('firefly.webhooks.deliveries')));
$webhook = $this->route()->parameter('webhook');
$webhook = $this->route()->parameter('webhook');
return [
'title' => 'between:1,512',
'active' => [new IsBoolean],
'trigger' => sprintf('required|in:%s', $triggers),
'response' => sprintf('required|in:%s', $responses),