Skip to content

Firefly III: a personal finances manager

Expand webhook API, edit and create screen.

James Cole01cce49070f1
diff --git a/app/Api/V1/Controllers/Webhook/ShowController.php b/app/Api/V1/Controllers/Webhook/ShowController.php
index cfc2b1ab39..69be75a49a 100644
--- a/app/Api/V1/Controllers/Webhook/ShowController.php
+++ b/app/Api/V1/Controllers/Webhook/ShowController.php
@@ -126,6 +126,13 @@ class ShowController extends Controller
Log::channel('audit')->info(sprintf('User views webhook #%d.', $webhook->id));
$manager = $this->getManager();
+ // enrich
+ /** @var User $admin */
+ $admin = auth()->user();
+ $enrichment = new WebhookEnrichment();
+ $enrichment->setUser($admin);
+ $webhook = $enrichment->enrichSingle($webhook);
+
/** @var WebhookTransformer $transformer */
$transformer = app(WebhookTransformer::class);
$transformer->setParameters($this->parameters);
diff --git a/app/Api/V1/Controllers/Webhook/StoreController.php b/app/Api/V1/Controllers/Webhook/StoreController.php
index 77ea1de82a..12c7b1bf75 100644
--- a/app/Api/V1/Controllers/Webhook/StoreController.php
+++ b/app/Api/V1/Controllers/Webhook/StoreController.php
@@ -27,7 +27,9 @@ namespace FireflyIII\Api\V1\Controllers\Webhook;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Models\Webhook\CreateRequest;
use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\WebhookEnrichment;
use FireflyIII\Transformers\WebhookTransformer;
+use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Log;
use League\Fractal\Resource\Item;
@@ -68,6 +70,15 @@ class StoreController extends Controller
}
$webhook = $this->repository->store($data);
+
+ // enrich
+ /** @var User $admin */
+ $admin = auth()->user();
+ $enrichment = new WebhookEnrichment();
+ $enrichment->setUser($admin);
+ $webhook = $enrichment->enrichSingle($webhook);
+
+
$manager = $this->getManager();
Log::channel('audit')->info('User stores new webhook', $data);
diff --git a/app/Api/V1/Controllers/Webhook/UpdateController.php b/app/Api/V1/Controllers/Webhook/UpdateController.php
index 7e2e0e2353..96411d5ca1 100644
--- a/app/Api/V1/Controllers/Webhook/UpdateController.php
+++ b/app/Api/V1/Controllers/Webhook/UpdateController.php
@@ -24,15 +24,17 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Webhook;
-use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V1\Requests\Models\Webhook\UpdateRequest;
-use FireflyIII\Models\Webhook;
-use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
-use FireflyIII\Transformers\WebhookTransformer;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Log;
-use League\Fractal\Resource\Item;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+ use FireflyIII\Api\V1\Controllers\Controller;
+ use FireflyIII\Api\V1\Requests\Models\Webhook\UpdateRequest;
+ use FireflyIII\Models\Webhook;
+ use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
+ use FireflyIII\Support\JsonApi\Enrichments\WebhookEnrichment;
+ use FireflyIII\Transformers\WebhookTransformer;
+ use FireflyIII\User;
+ use Illuminate\Http\JsonResponse;
+ use Illuminate\Support\Facades\Log;
+ use League\Fractal\Resource\Item;
+ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class UpdateController
@@ -70,6 +72,13 @@ class UpdateController extends Controller
$webhook = $this->repository->update($webhook, $data);
$manager = $this->getManager();
+ // enrich
+ /** @var User $admin */
+ $admin = auth()->user();
+ $enrichment = new WebhookEnrichment();
+ $enrichment->setUser($admin);
+ $webhook = $enrichment->enrichSingle($webhook);
+
Log::channel('audit')->info(sprintf('User updates webhook #%d', $webhook->id), $data);
/** @var WebhookTransformer $transformer */
diff --git a/app/Api/V1/Requests/Models/Webhook/CreateRequest.php b/app/Api/V1/Requests/Models/Webhook/CreateRequest.php
index 66064a0e19..51bef14ad3 100644
--- a/app/Api/V1/Requests/Models/Webhook/CreateRequest.php
+++ b/app/Api/V1/Requests/Models/Webhook/CreateRequest.php
@@ -24,8 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests\Models\Webhook;
-use FireflyIII\Enums\WebhookResponse;
-use FireflyIII\Enums\WebhookTrigger;
+use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Webhook;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Support\Request\ChecksLogin;
@@ -44,24 +43,24 @@ class CreateRequest extends FormRequest
public function getData(): array
{
- $triggers = Webhook::getTriggersForValidation();
- $responses = Webhook::getResponsesForValidation();
- $deliveries = Webhook::getDeliveriesForValidation();
-
- $fields = [
- 'title' => ['title', 'convertString'],
- 'active' => ['active', 'boolean'],
- 'trigger' => ['trigger', 'convertString'],
- 'response' => ['response', 'convertString'],
- 'delivery' => ['delivery', 'convertString'],
- 'url' => ['url', 'convertString'],
+ $fields = [
+ 'title' => ['title', 'convertString'],
+ 'active' => ['active', 'boolean'],
+ 'url' => ['url', 'convertString'],
];
+ $triggers = $this->get('triggers', []);
+ $responses = $this->get('responses', []);
+ $deliveries = $this->get('deliveries', []);
+
+ if (0 === count($triggers) || 0 === count($responses) || 0 === count($deliveries)) {
+ throw new FireflyException('Unexpectedly got no responses, triggers or deliveries.');
+ }
+
- // this is the way.
- $return = $this->getAllData($fields);
- $return['trigger'] = $triggers[$return['trigger']] ?? (int)$return['trigger'];
- $return['response'] = $responses[$return['response']] ?? (int)$return['response'];
- $return['delivery'] = $deliveries[$return['delivery']] ?? (int)$return['delivery'];
+ $return = $this->getAllData($fields);
+ $return['triggers'] = $triggers;
+ $return['responses'] = $responses;
+ $return['deliveries'] = $deliveries;
return $return;
}
@@ -71,18 +70,24 @@ class CreateRequest extends FormRequest
*/
public function rules(): array
{
- $triggers = implode(',', array_keys(Webhook::getTriggersForValidation()));
- $responses = implode(',', array_keys(Webhook::getResponsesForValidation()));
- $deliveries = implode(',', array_keys(Webhook::getDeliveriesForValidation()));
+ $triggers = implode(',', array_values(Webhook::getTriggers()));
+ $responses = implode(',', array_values(Webhook::getResponses()));
+ $deliveries = implode(',', array_values(Webhook::getDeliveries()));
$validProtocols = config('firefly.valid_url_protocols');
return [
- 'title' => 'required|min:1|max:255|uniqueObjectForUser:webhooks,title',
- 'active' => [new IsBoolean()],
- 'trigger' => sprintf('required|in:%s', $triggers),
- 'response' => sprintf('required|in:%s', $responses),
- 'delivery' => sprintf('required|in:%s', $deliveries),
- 'url' => ['required', sprintf('url:%s', $validProtocols), 'uniqueWebhook'],
+ 'title' => 'required|min:1|max:255|uniqueObjectForUser:webhooks,title',
+ 'active' => [new IsBoolean()],
+ 'trigger' => 'prohibited',
+ 'triggers' => 'required|array|min:1|max:10',
+ 'triggers.*' => sprintf('required|in:%s', $triggers),
+ 'response' => 'prohibited',
+ 'responses' => 'required|array|min:1|max:1',
+ 'responses.*' => sprintf('required|in:%s', $responses),
+ 'delivery' => 'prohibited',
+ 'deliveries' => 'required|array|min:1|max:1',
+ 'deliveries.*' => sprintf('required|in:%s', $deliveries),
+ 'url' => ['required', sprintf('url:%s', $validProtocols)],
];
}
@@ -91,37 +96,44 @@ class CreateRequest extends FormRequest
$validator->after(
function (Validator $validator): void {
Log::debug('Validating webhook');
+ if ($validator->failed()) {
+ return;
+ }
$data = $validator->getData();
- $trigger = $data['trigger'] ?? null;
- $response = $data['response'] ?? null;
- if (null === $trigger || null === $response) {
+ $triggers = $data['triggers'] ?? [];
+ $responses = $data['responses'] ?? [];
+
+ if (0 === count($triggers) || 0 === count($responses)) {
Log::debug('No trigger or response, return.');
return;
}
- $triggers = array_keys(Webhook::getTriggersForValidation());
- $responses = array_keys(Webhook::getResponsesForValidation());
- if (!in_array($trigger, $triggers, true) || !in_array($response, $responses, true)) {
- return;
- }
- // cannot deliver budget info.
- if (is_int($trigger)) {
- Log::debug(sprintf('Trigger was integer (%d).', $trigger));
- $trigger = WebhookTrigger::from($trigger)->name;
- }
- if (is_int($response)) {
- Log::debug(sprintf('Response was integer (%d).', $response));
- $response = WebhookResponse::from($response)->name;
- }
- Log::debug(sprintf('Trigger is %s, response is %s', $trigger, $response));
- if (str_contains($trigger, 'TRANSACTION') && str_contains($response, 'BUDGET')) {
- $validator->errors()->add('response', trans('validation.webhook_budget_info'));
+ $validTriggers = array_values(Webhook::getTriggers());
+ $validResponses = array_values(Webhook::getResponses());
+ foreach ($triggers as $trigger) {
+ if (!in_array($trigger, $validTriggers, true)) {
+ return;
+ }
}
- if (str_contains($trigger, 'BUDGET') && str_contains($response, 'ACCOUNT')) {
- $validator->errors()->add('response', trans('validation.webhook_account_info'));
+ foreach ($responses as $response) {
+ if (!in_array($response, $validResponses, true)) {
+ return;
+ }
}
- if (str_contains($trigger, 'BUDGET') && str_contains($response, 'TRANSACTION')) {
- $validator->errors()->add('response', trans('validation.webhook_transaction_info'));
+ // some combinations are illegal.
+ foreach ($triggers as $i => $trigger) {
+ $forbidden = config(sprintf('webhooks.forbidden_responses.%s', $trigger));
+ if (null === $forbidden) {
+ $validator->errors()->add(sprintf('triggers.%d', $i), trans('validation.unknown_webhook_trigger', ['trigger' => $trigger,]));
+ continue;
+ }
+ foreach ($responses as $ii => $response) {
+ if (in_array($response, $forbidden, true)) {
+ Log::debug(sprintf('Trigger %s and response %s are forbidden.', $trigger, $response));
+ $validator->errors()->add(sprintf('responses.%d', $ii), trans('validation.bad_webhook_combination', ['trigger' => $trigger, 'response' => $response,]));
+ return;
+ }
+ }
}
}
);
diff --git a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php
index d235ca048c..a3c2eed05a 100644
--- a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php
@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Requests\Models\Webhook;
use FireflyIII\Enums\WebhookResponse;
use FireflyIII\Enums\WebhookTrigger;
+use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Webhook;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Support\Request\ChecksLogin;
@@ -44,35 +45,25 @@ class UpdateRequest extends FormRequest
public function getData(): array
{
- $triggers = Webhook::getTriggersForValidation();
- $responses = Webhook::getResponsesForValidation();
- $deliveries = Webhook::getDeliveriesForValidation();
-
$fields = [
'title' => ['title', 'convertString'],
'active' => ['active', 'boolean'],
- 'trigger' => ['trigger', 'convertString'],
- 'response' => ['response', 'convertString'],
- 'delivery' => ['delivery', 'convertString'],
'url' => ['url', 'convertString'],
];
- // this is the way.
- $return = $this->getAllData($fields);
- if (array_key_exists('trigger', $return)) {
- $return['trigger'] = $triggers[$return['trigger']] ?? 0;
- }
- if (array_key_exists('response', $return)) {
- $return['response'] = $responses[$return['response']] ?? 0;
- }
- if (array_key_exists('delivery', $return)) {
- $return['delivery'] = $deliveries[$return['delivery']] ?? 0;
- }
- $return['secret'] = null !== $this->get('secret');
- if (null !== $this->get('title')) {
- $return['title'] = $this->convertString('title');
+ $triggers = $this->get('triggers', []);
+ $responses = $this->get('responses', []);
+ $deliveries = $this->get('deliveries', []);
+
+ if (0 === count($triggers) || 0 === count($responses) || 0 === count($deliveries)) {
+ throw new FireflyException('Unexpectedly got no responses, triggers or deliveries.');
}
+ $return = $this->getAllData($fields);
+ $return['triggers'] = $triggers;
+ $return['responses'] = $responses;
+ $return['deliveries'] = $deliveries;
+
return $return;
}
@@ -81,9 +72,9 @@ class UpdateRequest extends FormRequest
*/
public function rules(): array
{
- $triggers = implode(',', array_keys(Webhook::getTriggersForValidation()));
- $responses = implode(',', array_keys(Webhook::getResponsesForValidation()));
- $deliveries = implode(',', array_keys(Webhook::getDeliveriesForValidation()));
+ $triggers = implode(',', array_values(Webhook::getTriggers()));
+ $responses = implode(',', array_values(Webhook::getResponses()));
+ $deliveries = implode(',', array_values(Webhook::getDeliveries()));
$validProtocols = config('firefly.valid_url_protocols');
/** @var Webhook $webhook */
@@ -92,9 +83,17 @@ class UpdateRequest extends FormRequest
return [
'title' => sprintf('min:1|max:255|uniqueObjectForUser:webhooks,title,%d', $webhook->id),
'active' => [new IsBoolean()],
- 'trigger' => sprintf('in:%s', $triggers),
- 'response' => sprintf('in:%s', $responses),
- 'delivery' => sprintf('in:%s', $deliveries),
+
+ 'trigger' => 'prohibited',
+ 'triggers' => 'required|array|min:1|max:10',
+ 'triggers.*' => sprintf('required|in:%s', $triggers),
+ 'response' => 'prohibited',
+ 'responses' => 'required|array|min:1|max:1',
+ 'responses.*' => sprintf('required|in:%s', $responses),
+ 'delivery' => 'prohibited',
+ 'deliveries' => 'required|array|min:1|max:1',
+ 'deliveries.*' => sprintf('required|in:%s', $deliveries),
+
'url' => [sprintf('url:%s', $validProtocols), sprintf('uniqueExistingWebhook:%d', $webhook->id)],
];
}
@@ -104,38 +103,47 @@ class UpdateRequest extends FormRequest
$validator->after(
function (Validator $validator): void {
Log::debug('Validating webhook');
- $data = $validator->getData();
- $trigger = $data['trigger'] ?? null;
- $response = $data['response'] ?? null;
- if (null === $trigger || null === $response) {
- Log::debug('No trigger or response, return.');
+ if ($validator->failed()) {
return;
}
- $triggers = array_keys(Webhook::getTriggersForValidation());
- $responses = array_keys(Webhook::getResponsesForValidation());
- if (!in_array($trigger, $triggers, true) || !in_array($response, $responses, true)) {
+ $data = $validator->getData();
+ $triggers = $data['triggers'] ?? [];
+ $responses = $data['responses'] ?? [];
+
+ if (0 === count($triggers) || 0 === count($responses)) {
+ Log::debug('No trigger or response, return.');
+
return;
}
- // cannot deliver budget info.
- if (is_int($trigger)) {
- Log::debug(sprintf('Trigger was integer (%d).', $trigger));
- $trigger = WebhookTrigger::from($trigger)->name;
- }
- if (is_int($response)) {
- Log::debug(sprintf('Response was integer (%d).', $response));
- $response = WebhookResponse::from($response)->name;
+ $validTriggers = array_values(Webhook::getTriggers());
+ $validResponses = array_values(Webhook::getResponses());
+ foreach ($triggers as $trigger) {
+ if (!in_array($trigger, $validTriggers, true)) {
+ return;
+ }
}
- Log::debug(sprintf('Trigger is %s, response is %s', $trigger, $response));
- if (str_contains($trigger, 'TRANSACTION') && str_contains($response, 'BUDGET')) {
- $validator->errors()->add('response', trans('validation.webhook_budget_info'));
+ foreach ($responses as $response) {
+ if (!in_array($response, $validResponses, true)) {
+ return;
+ }
}
- if (str_contains($trigger, 'BUDGET') && str_contains($response, 'ACCOUNT')) {
- $validator->errors()->add('response', trans('validation.webhook_account_info'));
- }
- if (str_contains($trigger, 'BUDGET') && str_contains($response, 'TRANSACTION')) {
- $validator->errors()->add('response', trans('validation.webhook_transaction_info'));
+ // some combinations are illegal.
+ foreach ($triggers as $i => $trigger) {
+ $forbidden = config(sprintf('webhooks.forbidden_responses.%s', $trigger));
+ if (null === $forbidden) {
+ $validator->errors()->add(sprintf('triggers.%d', $i), trans('validation.unknown_webhook_trigger', ['trigger' => $trigger,]));
+ continue;
+ }
+ foreach ($responses as $ii => $response) {
+ if (in_array($response, $forbidden, true)) {
+ Log::debug(sprintf('Trigger %s and response %s are forbidden.', $trigger, $response));
+ $validator->errors()->add(sprintf('responses.%d', $ii), trans('validation.bad_webhook_combination', ['trigger' => $trigger, 'response' => $response,]));
+ return;
+ }
+ }
}
+
}
);
}
diff --git a/app/Enums/WebhookResponse.php b/app/Enums/WebhookResponse.php
index ead11117a0..f1dfa213e6 100644
--- a/app/Enums/WebhookResponse.php
+++ b/app/Enums/WebhookResponse.php
@@ -32,5 +32,6 @@ enum WebhookResponse: int
case TRANSACTIONS = 200;
case ACCOUNTS = 210;
case BUDGET = 230;
+ case RELEVANT = 240;
case NONE = 220;
}
diff --git a/app/Repositories/Webhook/WebhookRepository.php b/app/Repositories/Webhook/WebhookRepository.php
index 64f6230ac3..7a54e0fd7c 100644
--- a/app/Repositories/Webhook/WebhookRepository.php
+++ b/app/Repositories/Webhook/WebhookRepository.php
@@ -24,9 +24,13 @@ declare(strict_types=1);
namespace FireflyIII\Repositories\Webhook;
+use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Webhook;
use FireflyIII\Models\WebhookAttempt;
+use FireflyIII\Models\WebhookDelivery;
use FireflyIII\Models\WebhookMessage;
+use FireflyIII\Models\WebhookResponse;
+use FireflyIII\Models\WebhookTrigger;
use FireflyIII\Support\Repositories\UserGroup\UserGroupInterface;
use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
use Illuminate\Support\Collection;
@@ -105,26 +109,92 @@ class WebhookRepository implements WebhookRepositoryInterface, UserGroupInterfac
'secret' => $secret,
'url' => $data['url'],
];
+ /** @var Webhook $webhook */
+ $webhook = Webhook::create($fullData);
+ $triggers = new Collection();
+ $responses = new Collection();
+ $deliveries = new Collection();
+
+ foreach ($data['triggers'] as $trigger) {
+ // get the relevant ID:
+ $object = WebhookTrigger::where('title', $trigger)->first();
+ if (null === $object) {
+ throw new FireflyException(sprintf('Could not find webhook trigger with title "%s".', $trigger));
+ }
+ $triggers->push($object);
+ }
+ $webhook->webhookTriggers()->saveMany($triggers);
+
+ foreach ($data['responses'] as $response) {
+ // get the relevant ID:
+ $object = WebhookResponse::where('title', $response)->first();
+ if (null === $object) {
+ throw new FireflyException(sprintf('Could not find webhook response with title "%s".', $response));
+ }
+ $responses->push($object);
+ }
+ $webhook->webhookResponses()->saveMany($responses);
+
+ foreach ($data['deliveries'] as $delivery) {
+ // get the relevant ID:
+ $object = WebhookDelivery::where('title', $delivery)->first();
+ if (null === $object) {
+ throw new FireflyException(sprintf('Could not find webhook delivery with title "%s".', $delivery));
+ }
+ $deliveries->push($object);
+ }
+ $webhook->webhookDeliveries()->saveMany($deliveries);
- return Webhook::create($fullData);
+ return $webhook;
}
public function update(Webhook $webhook, array $data): Webhook
{
$webhook->active = $data['active'] ?? $webhook->active;
-// $webhook->trigger = $data['trigger'] ?? $webhook->trigger;
-// $webhook->response = $data['response'] ?? $webhook->response;
-// $webhook->delivery = $data['delivery'] ?? $webhook->delivery;
$webhook->title = $data['title'] ?? $webhook->title;
$webhook->url = $data['url'] ?? $webhook->url;
- if (true === $data['secret']) {
+ if (array_key_exists('secret', $data) && true === $data['secret']) {
$secret = Str::random(24);
$webhook->secret = $secret;
}
$webhook->save();
+ $triggers = new Collection();
+ $responses = new Collection();
+ $deliveries = new Collection();
+
+ foreach ($data['triggers'] as $trigger) {
+ // get the relevant ID:
+ $object = WebhookTrigger::where('title', $trigger)->first();
+ if (null === $object) {
+ throw new FireflyException(sprintf('Could not find webhook trigger with title "%s".', $trigger));
+ }
+ $triggers->push($object);
+ }
+ $webhook->webhookTriggers()->sync($triggers);
+
+ foreach ($data['responses'] as $response) {
+ // get the relevant ID:
+ $object = WebhookResponse::where('title', $response)->first();
+ if (null === $object) {
+ throw new FireflyException(sprintf('Could not find webhook response with title "%s".', $response));
+ }
+ $responses->push($object);
+ }
+ $webhook->webhookResponses()->sync($responses);
+
+ foreach ($data['deliveries'] as $delivery) {
+ // get the relevant ID:
+ $object = WebhookDelivery::where('title', $delivery)->first();
+ if (null === $object) {
+ throw new FireflyException(sprintf('Could not find webhook delivery with title "%s".', $delivery));
+ }
+ $deliveries->push($object);
+ }
+ $webhook->webhookDeliveries()->sync($deliveries);
+
return $webhook;
}
}
diff --git a/config/webhooks.php b/config/webhooks.php
new file mode 100644
index 0000000000..49eaff18cd
--- /dev/null
+++ b/config/webhooks.php
@@ -0,0 +1,79 @@
+<?php
+
+// this is hard coded, which is unfortunate.
+
+use FireflyIII\Enums\WebhookResponse;
+use FireflyIII\Enums\WebhookTrigger;
+
+return [
+ 'force_relevant_response' => [
+ WebhookTrigger::STORE_TRANSACTION->name => [
+ WebhookTrigger::STORE_BUDGET->name,
+ WebhookTrigger::UPDATE_BUDGET->name,
+ WebhookTrigger::DESTROY_BUDGET->name,
+ WebhookTrigger::STORE_UPDATE_BUDGET_LIMIT->name,
+
+ ],
+ WebhookTrigger::UPDATE_TRANSACTION->name => [
+ WebhookTrigger::STORE_BUDGET->name,
+ WebhookTrigger::UPDATE_BUDGET->name,
+ WebhookTrigger::DESTROY_BUDGET->name,
+ WebhookTrigger::STORE_UPDATE_BUDGET_LIMIT->name,
+ ],
+ WebhookTrigger::DESTROY_TRANSACTION->name => [
+ WebhookTrigger::STORE_BUDGET->name,
+ WebhookTrigger::UPDATE_BUDGET->name,
+ WebhookTrigger::DESTROY_BUDGET->name,
+ WebhookTrigger::STORE_UPDATE_BUDGET_LIMIT->name,
+ ],
+ WebhookTrigger::STORE_BUDGET->name => [
+ WebhookTrigger::STORE_TRANSACTION->name,
+ WebhookTrigger::UPDATE_TRANSACTION->name,
+ WebhookTrigger::DESTROY_TRANSACTION->name,
+
+ ],
+ WebhookTrigger::UPDATE_BUDGET->name => [
+ WebhookTrigger::STORE_TRANSACTION->name,
+ WebhookTrigger::UPDATE_TRANSACTION->name,
+ WebhookTrigger::DESTROY_TRANSACTION->name,
+ ],
+ WebhookTrigger::DESTROY_BUDGET->name => [
+ WebhookTrigger::STORE_TRANSACTION->name,
+ WebhookTrigger::UPDATE_TRANSACTION->name,
+ WebhookTrigger::DESTROY_TRANSACTION->name,
+ ],
+ WebhookTrigger::STORE_UPDATE_BUDGET_LIMIT->name => [
+ WebhookTrigger::STORE_TRANSACTION->name,
+ WebhookTrigger::UPDATE_TRANSACTION->name,
+ WebhookTrigger::DESTROY_TRANSACTION->name,
+ ],
+ ],
+ 'forbidden_responses' => [
+ WebhookTrigger::STORE_TRANSACTION->name => [
+ WebhookResponse::BUDGET->name,
+ ],
+ WebhookTrigger::UPDATE_TRANSACTION->name => [
+ WebhookResponse::BUDGET->name,
+ ],
+ WebhookTrigger::DESTROY_TRANSACTION->name => [
+ WebhookResponse::BUDGET->name,
+ ],
+ WebhookTrigger::STORE_BUDGET->name => [
+ WebhookResponse::TRANSACTIONS->name,
+ WebhookResponse::ACCOUNTS->name,
+
+ ],
+ WebhookTrigger::UPDATE_BUDGET->name => [
+ WebhookResponse::TRANSACTIONS->name,
+ WebhookResponse::ACCOUNTS->name,
+ ],
+ WebhookTrigger::DESTROY_BUDGET->name => [
+ WebhookResponse::TRANSACTIONS->name,
+ WebhookResponse::ACCOUNTS->name,
+ ],
+ WebhookTrigger::STORE_UPDATE_BUDGET_LIMIT->name => [
+ WebhookResponse::TRANSACTIONS->name,
+ WebhookResponse::ACCOUNTS->name,
+ ],
+ ]
+];
diff --git a/public/v1/js/.gitkeep b/public/v1/js/.gitkeep
old mode 100644
new mode 100755
diff --git a/resources/assets/v1/src/components/form/WebhookDelivery.vue b/resources/assets/v1/src/components/form/WebhookDelivery.vue
index ef844cdb1d..ff184466ac 100644
--- a/resources/assets/v1/src/components/form/WebhookDelivery.vue
+++ b/resources/assets/v1/src/components/form/WebhookDelivery.vue
@@ -68,7 +68,7 @@ export default {
}
},
value: {
- type: Number,
+ type: String,
required: true,
}
},
@@ -84,7 +84,7 @@ export default {
}
this.deliveries.push(
{
- id: response.data.data.value[key],
+ id: key,
name: this.$t('firefly.webhook_delivery_' + key),
}
);
diff --git a/resources/assets/v1/src/components/form/WebhookResponse.vue b/resources/assets/v1/src/components/form/WebhookResponse.vue
index 754c29e609..1ce8eb32b9 100644
--- a/resources/assets/v1/src/components/form/WebhookResponse.vue
+++ b/resources/assets/v1/src/components/form/WebhookResponse.vue
@@ -66,7 +66,7 @@ export default {
}
},
value: {
- type: Number,
+ type: String,
required: true,
}
},
@@ -88,7 +88,7 @@ export default {
}
this.responses.push(
{
- id: response.data.data.value[key],
+ id: key,
name: this.$t('firefly.webhook_response_' + key),
}
);
diff --git a/resources/assets/v1/src/components/form/WebhookTrigger.vue b/resources/assets/v1/src/components/form/WebhookTrigger.vue
index c62d75a44f..0a13381b03 100644
--- a/resources/assets/v1/src/components/form/WebhookTrigger.vue
+++ b/resources/assets/v1/src/components/form/WebhookTrigger.vue
@@ -29,6 +29,7 @@
</div>
<select v-if="!loading"
ref="trigger"
+ multiple
v-model="trigger"
:title="$t('form.webhook_trigger')"
class="form-control"
@@ -52,7 +53,7 @@ export default {
name: "WebhookTrigger",
data() {
return {
- trigger: 0,
+ trigger: [],
loading: true,
triggers: [],
};
@@ -66,7 +67,7 @@ export default {
}
},
value: {
- type: Number,
+ type: Array,
required: true,
}
},
@@ -80,11 +81,11 @@ export default {
}
this.triggers.push(
{
- id: response.data.data.value[key],
+ id: key,
name: this.$t('firefly.webhook_trigger_' + key),
}
);
- console.log('webhook trigger: id=' + response.data.data.value[key] + ', name=' + key);
+ // console.log('webhook trigger: id=' + response.data.data.value[key] + ', name=' + key);
}
this.loading = false;
}).catch((error) => {
diff --git a/resources/assets/v1/src/components/webhooks/Create.vue b/resources/assets/v1/src/components/webhooks/Create.vue
index cf39a693df..da997a05ad 100644
--- a/resources/assets/v1/src/components/webhooks/Create.vue
+++ b/resources/assets/v1/src/components/webhooks/Create.vue
@@ -54,12 +54,12 @@
<div class="row">
<div class="col-lg-12">
<Title :value=this.title :error="errors.title" v-on:input="title = $event"></Title>
- <WebhookTrigger :value=this.trigger :error="errors.trigger"
- v-on:input="trigger = $event"></WebhookTrigger>
- <WebhookResponse :value=this.response :error="errors.response"
- v-on:input="response = $event"></WebhookResponse>
- <WebhookDelivery :value=this.delivery :error="errors.delivery"
- v-on:input="delivery = $event"></WebhookDelivery>
+ <WebhookTrigger :value=this.triggers :error="errors.trigger"
+ v-on:input="triggers = $event"></WebhookTrigger>
+ <WebhookResponse :value=this.responses :error="errors.response"
+ v-on:input="responses = $event"></WebhookResponse>
+ <WebhookDelivery :value=this.deliveries :error="errors.delivery"
+ v-on:input="deliveries = $event"></WebhookDelivery>
<URL :value=this.url :error="errors.url" v-on:input="url = $event"></URL>
<Checkbox :value=this.active :error="errors.active" help="ACTIVE HELP TODO" :title="$t('form.active')" v-on:input="active = $event"></Checkbox>
</div>
@@ -96,16 +96,16 @@ export default {
error_message: '',
success_message: '',
title: '',
- trigger: 100,
- response: 200,
- delivery: 300,
+ triggers: ["STORE_TRANSACTION"],
+ responses: "RELEVANT",
+ deliveries: "JSON",
active: true,
url: '',
errors: {
title: [],
- trigger: [],
- response: [],
- delivery: [],
+ triggers: [],
+ responses: [],
+ deliveries: [],
url: [],
active: []
}
@@ -118,9 +118,9 @@ export default {
this.success_message = '';
this.errors = {
title: [],
- trigger: [],
- response: [],
- delivery: [],
+ triggers: [],
+ responses: [],
+ deliveries: [],
url: [],
active: [],
};
@@ -131,9 +131,9 @@ export default {
// collect data
let data = {
title: this.title,
- trigger: this.trigger,
- response: this.response,
- delivery: this.delivery,
+ triggers: this.triggers,
+ responses: [this.responses],
+ deliveries: [this.deliveries],
url: this.url,
active: this.active,
};
@@ -148,9 +148,9 @@ export default {
//console.log(error.response.data);
this.error_message = error.response.data.message;
this.errors.title = error.response.data.errors.title;
- this.errors.trigger = error.response.data.errors.trigger;
- this.errors.response = error.response.data.errors.response;
- this.errors.delivery = error.response.data.errors.delivery;
+ this.errors.triggers = error.response.data.errors.triggers;
+ this.errors.responses = error.response.data.errors.responses;
+ this.errors.deliveries = error.response.data.errors.deliveries;
this.errors.url = error.response.data.errors.url;
// enable button again
diff --git a/resources/assets/v1/src/components/webhooks/Edit.vue b/resources/assets/v1/src/components/webhooks/Edit.vue
index 52121d0abd..afb31e417d 100644
--- a/resources/assets/v1/src/components/webhooks/Edit.vue
+++ b/resources/assets/v1/src/components/webhooks/Edit.vue
@@ -54,12 +54,12 @@
<div class="row">
<div class="col-lg-12">
<Title :value=this.title :error="errors.title" v-on:input="title = $event"></Title>
- <WebhookTrigger :value=this.trigger :error="errors.trigger"
- v-on:input="trigger = $event"></WebhookTrigger>
- <WebhookResponse :value=this.response :error="errors.response"
- v-on:input="response = $event"></WebhookResponse>
- <WebhookDelivery :value=this.delivery :error="errors.delivery"
- v-on:input="delivery = $event"></WebhookDelivery>
+ <WebhookTrigger :value=this.triggers :error="errors.triggers"
+ v-on:input="triggers = $event"></WebhookTrigger>
+ <WebhookResponse :value=this.responses :error="errors.responses"
+ v-on:input="responses = $event"></WebhookResponse>
+ <WebhookDelivery :value=this.deliveries :error="errors.deliveries"
+ v-on:input="deliveries = $event"></WebhookDelivery>
<URL :value=this.url :error="errors.url" v-on:input="url = $event"></URL>
<Checkbox :value=this.active :error="errors.active" help="ACTIVE HELP TODO" :title="$t('form.active')"
v-on:input="active = $event"></Checkbox>
@@ -97,17 +97,17 @@ export default {
error_message: '',
success_message: '',
title: '',
- trigger: 100,
- response: 200,
- delivery: 300,
+ triggers: ["STORE_TRANSACTION"],
+ responses: "RELEVANT",
+ deliveries: "JSON",
id: 0,
active: false,
url: '',
errors: {
title: [],
- trigger: [],
- response: [],
- delivery: [],
+ triggers: [],
+ responses: [],
+ deliveries: [],
url: [],
active: []
}
@@ -127,49 +127,9 @@ export default {
// console.log(response.data.data.attributes);
this.title = response.data.data.attributes.title;
this.id = parseInt(response.data.data.id);
-
- // trigger value on content
- console.log('Trigger is ' + response.data.data.attributes.trigger);
- // TODO does not need to be hard coded.
- if ('STORE_TRANSACTION' === response.data.data.attributes.trigger) {
- this.trigger = 100;
- }
- if ('UPDATE_TRANSACTION' === response.data.data.attributes.trigger) {
- this.trigger = 110;
- }
- if ('DESTROY_TRANSACTION' === response.data.data.attributes.trigger) {
- this.trigger = 120;
- }
- if ('STORE_BUDGET' === response.data.data.attributes.trigger) {
- this.trigger = 200;
- }
- if ('UPDATE_BUDGET' === response.data.data.attributes.trigger) {
- this.trigger = 210;
- }
- if ('DESTROY_BUDGET' === response.data.data.attributes.trigger) {
- this.trigger = 220;
- }
- if ('STORE_UPDATE_BUDGET_LIMIT' === response.data.data.attributes.trigger) {
- this.trigger = 230;
- }
-
- // response value
- if ('TRANSACTIONS' === response.data.data.attributes.response) {
- this.response = 200;
- }
- if ('ACCOUNTS' === response.data.data.attributes.response) {
- this.response = 210;
- }
- if ('BUDGET' === response.data.data.attributes.response) {
- this.response = 230;
- }
- if ('NONE' === response.data.data.attributes.response) {
- this.response = 220;
- }
- if ('JSON' === response.data.data.attributes.delivery) {
- this.delivery = 300;
- }
-
+ this.triggers = response.data.data.attributes.triggers;
+ this.responses = response.data.data.attributes.responses[0];
+ this.deliveries = response.data.data.attributes.deliveries[0];
this.active = response.data.data.attributes.active;
this.url = response.data.data.attributes.url;
}).catch(error => {
@@ -182,9 +142,9 @@ export default {
this.success_message = '';
this.errors = {
title: [],
- trigger: [],
- response: [],
- delivery: [],
+ triggers: [],
+ responses: [],
+ deliveries: [],
url: [],
active: [],
};
@@ -195,9 +155,9 @@ export default {
// collect data
let data = {
title: this.title,
- trigger: this.trigger,
- response: this.response,
- delivery: this.delivery,
+ triggers: this.triggers,
+ responses: [this.responses],
+ deliveries: [this.deliveries],
url: this.url,
active: this.active,
};
@@ -210,9 +170,9 @@ export default {
this.error_message = error.response.data.message;
this.errors.title = error.response.data.errors.title;
- this.errors.trigger = error.response.data.errors.trigger;
- this.errors.response = error.response.data.errors.response;
- this.errors.delivery = error.response.data.errors.delivery;
+ this.errors.triggers = error.response.data.errors.trigger;
+ this.errors.responses = error.response.data.errors.response;
+ this.errors.deliveries = error.response.data.errors.deliveries;
this.errors.url = error.response.data.errors.url;
// enable button again
diff --git a/resources/assets/v1/src/components/webhooks/Index.vue b/resources/assets/v1/src/components/webhooks/Index.vue
index 332ebb438b..7771ca9389 100644
--- a/resources/assets/v1/src/components/webhooks/Index.vue
+++ b/resources/assets/v1/src/components/webhooks/Index.vue
@@ -50,12 +50,24 @@
<a :href="'webhooks/show/' + webhook.id">{{ webhook.title }}</a>
</td>
<td>
- <span v-if="webhook.active">{{ triggers[webhook.trigger] }}</span>
- <span v-if="!webhook.active" class="text-muted"><s>{{ triggers[webhook.trigger] }}</s> ({{
- $t('firefly.inactive')
- }})</span>
+ <span v-if="webhook.active">
+ <ul class="list-unstyled">
+ <li v-for="trigger in webhook.triggers" :key="trigger">
+ {{ triggers[trigger] }}
+ </li>
+ </ul>
+ </span>
+ <span v-if="!webhook.active" class="text-muted">
+ <ul class="list-unstyled">
+ <li v-for="trigger in webhook.triggers" :key="trigger">
+ <s>{{ triggers[trigger] }}</s> ({{$t('firefly.inactive') }})
+ </li>
+ </ul>
+ </span>
+ </td>
+ <td>
+ {{ responses[webhook.responses[0]] }} ({{ deliveries[webhook.deliveries[0]] }})
</td>
- <td>{{ responses[webhook.response] }} ({{ deliveries[webhook.delivery] }})</td>
<td>
<em style="cursor:pointer"
v-if="webhook.show_secret" class="fa fa-eye" @click="toggleSecret(webhook)"></em>
@@ -167,9 +179,9 @@ export default {
active: current.attributes.active,
full_url: current.attributes.url,
secret: current.attributes.secret,
- trigger: current.attributes.trigger,
- response: current.attributes.response,
- delivery: current.attributes.delivery,
+ triggers: current.attributes.triggers,
+ responses: current.attributes.responses,
+ deliveries: current.attributes.deliveries,
show_secret: false,
};
if (current.attributes.url.length > 20) {
diff --git a/resources/assets/v1/src/components/webhooks/Show.vue b/resources/assets/v1/src/components/webhooks/Show.vue
index c0ea77431b..348bd3e80d 100644
--- a/resources/assets/v1/src/components/webhooks/Show.vue
+++ b/resources/assets/v1/src/components/webhooks/Show.vue
@@ -40,27 +40,39 @@
<table class="table table-hover" aria-label="A table">
<tbody>
<tr>
- <th scope="row" style="width:40%;">Title</th>
+ <td style="width:40%;"><strong>{{ $t('list.title') }}</strong></td>
<td>{{ title }}</td>
</tr>
<tr>
- <th scope="row">{{ $t('list.active') }}</th>
+ <td style="width:40%;"><strong>{{ $t('list.active') }}</strong></td>
<td>
<em class="fa fa-check text-success" v-if="active"></em>
<em class="fa fa-times text-danger" v-if="!active"></em>
</td>
</tr>
<tr>
- <th scope="row">{{ $t('list.trigger') }}</th>
- <td> {{ trigger }}</td>
+ <td style="width:40%;"><strong>{{ $t('list.trigger') }}</strong></td>
+ <td>
+ <span v-for="trigger in triggers" :key="trigger">
+ {{ $t('firefly.webhook_trigger_' + trigger) }}<br>
+ </span>
+ </td>
</tr>
<tr>
- <th scope="row">{{ $t('list.response') }}</th>
- <td> {{ response }}</td>
+ <td style="width:40%;"><strong>{{ $t('list.response') }}</strong></td>
+ <td>
+ <span v-for="response in responses" :key="response">
+ {{ $t('firefly.webhook_response_' + response) }}
+ </span>
+ </td>
</tr>
<tr>
- <th scope="row">{{ $t('list.delivery') }}</th>
- <td> {{ delivery }}</td>
+ <td style="width:40%;"><strong>{{ $t('list.delivery') }}</strong></td>
+ <td>
+ <span v-for="delivery in deliveries" :key="delivery">
+ {{ $t('firefly.webhook_delivery_' + delivery) }}
+ </span>
+ </td>
</tr>
</tbody>
</table>
@@ -86,12 +98,13 @@
<table class="table table-hover" aria-label="A table">
<tbody>
<tr>
- <th scope="row" style="width:40%;">{{ $t('list.url') }}</th>
+ <td style="width:40%;"><strong>{{ $t('list.url') }}</strong></td>
<td><input type="text" readonly class="form-control" :value=url></td>
</tr>
<tr>
- <td>
+ <td style="width:40%;"><strong>
{{ $t('list.secret') }}
+ </strong>
</td>
<td>
<em style="cursor:pointer"
@@ -260,11 +273,14 @@ export default {
secret: '',
show_secret: false,
trigger: '',
+ triggers: [],
loading: true,
response: '',
+ responses: [],
message_content: '',
message_attempts: [],
delivery: '',
+ deliveries: [],
messages: [],
active: false,
edit_url: '#',
@@ -369,9 +385,9 @@ export default {
this.title = response.data.data.attributes.title;
this.url = response.data.data.attributes.url;
this.secret = response.data.data.attributes.secret;
- this.trigger = this.$t('firefly.webhook_trigger_' + response.data.data.attributes.trigger);
- this.response = this.$t('firefly.webhook_response_' + response.data.data.attributes.response);
- this.delivery = this.$t('firefly.webhook_delivery_' + response.data.data.attributes.delivery);
+ this.triggers = response.data.data.attributes.triggers;
+ this.responses = response.data.data.attributes.responses;
+ this.deliveries = response.data.data.attributes.deliveries;
this.active = response.data.data.attributes.active;
this.url = response.data.data.attributes.url;
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 3c8efe5e07..08a16a6e3b 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -250,8 +250,8 @@ return [
'webhook_trigger_STORE_UPDATE_BUDGET_LIMIT' => 'After budgeted amount change',
'webhook_response_TRANSACTIONS' => 'Transaction details',
'webhook_response_ACCOUNTS' => 'Account details',
- 'webhook_response_none_BUDGET' => 'Budget details',
- 'webhook_response_none_NONE' => 'No details',
+ 'webhook_response_BUDGET' => 'Budget details',
+ 'webhook_response_RELEVANT' => 'Relevant details',
'webhook_response_NONE' => 'No details',
'webhook_delivery_JSON' => 'JSON',
'inspect' => 'Inspect',
diff --git a/resources/lang/en_US/validation.php b/resources/lang/en_US/validation.php
index 91d04df320..33ec3b34e8 100644
--- a/resources/lang/en_US/validation.php
+++ b/resources/lang/en_US/validation.php
@@ -34,6 +34,9 @@ return [
'filter_not_string' => 'Filter ":filter" is expected to be a string of text',
'bad_api_filter' => 'This API endpoint does not support ":filter" as a filter.',
'nog_logged_in' => 'You are not logged in.',
+ 'prohibited' => 'You must not submit anything in field.',
+ 'bad_webhook_combination' => 'Webhook trigger ":trigger" cannot be combined with webhook response ":response".',
+ 'unknown_webhook_trigger' => 'Unknown webhook trigger ":trigger".',
'bad_type_source' => 'Firefly III can\'t determine the transaction type based on this source account.',
'bad_type_destination' => 'Firefly III can\'t determine the transaction type based on this destination account.',
'missing_where' => 'Array is missing "where"-clause',