Expand webhook API, edit and create screen.

This commit is contained in:
James Cole
2025-08-20 06:22:55 +02:00
parent 293be04d40
commit 01cce49070
18 changed files with 421 additions and 232 deletions

View File

@@ -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();
return Webhook::create($fullData);
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;
}
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;
}
}