X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a3ead5062acc169ae3486d90ac2befe3db86bfe6..refs/pull/3138/head:/app/Actions/DispatchWebhookJob.php diff --git a/app/Actions/DispatchWebhookJob.php b/app/Actions/DispatchWebhookJob.php index 69d04d36c..c7e75552d 100644 --- a/app/Actions/DispatchWebhookJob.php +++ b/app/Actions/DispatchWebhookJob.php @@ -4,8 +4,10 @@ namespace BookStack\Actions; use BookStack\Auth\User; use BookStack\Entities\Models\Entity; +use BookStack\Facades\Theme; use BookStack\Interfaces\Loggable; use BookStack\Model; +use BookStack\Theming\ThemeEvents; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; @@ -17,7 +19,10 @@ use Illuminate\Support\Facades\Log; class DispatchWebhookJob implements ShouldQueue { - use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; + use Dispatchable; + use InteractsWithQueue; + use Queueable; + use SerializesModels; /** * @var Webhook @@ -65,10 +70,13 @@ class DispatchWebhookJob implements ShouldQueue */ public function handle() { + $themeResponse = Theme::dispatch(ThemeEvents::WEBHOOK_CALL_BEFORE, $this->event, $this->webhook, $this->detail); + $webhookData = $themeResponse ?? $this->buildWebhookData(); + $response = Http::asJson() ->withOptions(['allow_redirects' => ['strict' => true]]) ->timeout(3) - ->post($this->webhook->endpoint, $this->buildWebhookData()); + ->post($this->webhook->endpoint, $webhookData); if ($response->failed()) { Log::error("Webhook call to endpoint {$this->webhook->endpoint} failed with status {$response->status()}"); @@ -86,14 +94,14 @@ class DispatchWebhookJob implements ShouldQueue $textParts[] = '"' . $this->detail->name . '"'; } - $data = [ - 'event' => $this->event, - 'text' => implode(' ', $textParts), - 'triggered_at' => Carbon::createFromTimestampUTC($this->initiatedTime)->toISOString(), - 'triggered_by' => $this->initiator->attributesToArray(), + $data = [ + 'event' => $this->event, + 'text' => implode(' ', $textParts), + 'triggered_at' => Carbon::createFromTimestampUTC($this->initiatedTime)->toISOString(), + 'triggered_by' => $this->initiator->attributesToArray(), 'triggered_by_profile_url' => $this->initiator->getProfileUrl(), - 'webhook_id' => $this->webhook->id, - 'webhook_name' => $this->webhook->name, + 'webhook_id' => $this->webhook->id, + 'webhook_name' => $this->webhook->name, ]; if (method_exists($this->detail, 'getUrl')) {