DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

adds a null check for webhook_endpoint

Browse source
This commit is contained in:
Godfrey M 2025-03-05 09:56:04 -08:00
parent c9f55bfd94
commit 3f31283ca3
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Models/Loggable.php
View file

@ -224,6 +224,10 @@ trait Loggable
{ {
$log = new Actionlog; $log = new Actionlog;
$location = Location::find($location_id); $location = Location::find($location_id);
$settings = Setting::getSettings();
if (!$settings) {
throw new \RuntimeException('Settings not found.');
}
if (static::class == LicenseSeat::class) { if (static::class == LicenseSeat::class) {
$log->item_type = License::class; $log->item_type = License::class;
$log->item_id = $this->license_id; $log->item_id = $this->license_id;
@ -244,13 +248,13 @@ trait Loggable
'location' => ($location) ? $location->name : '', 'location' => ($location) ? $location->name : '',
'note' => $note, 'note' => $note,
]; ];
if(Setting::getSettings()->webhook_selected === 'microsoft' && Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')){ if($settings->webhook_selected === 'microsoft' && Str::contains($settings->webhook_endpoint, 'workflows')){
$message = AuditNotification::toMicrosoftTeams($params); $message = AuditNotification::toMicrosoftTeams($params);
$notification = new TeamsNotification(Setting::getSettings()->webhook_endpoint); $notification = new TeamsNotification($settings->webhook_endpoint);
$notification->success()->sendMessage($message[0], $message[1]); $notification->success()->sendMessage($message[0], $message[1]);
} }
else { else if($settings->webhook_endpoint !== null) {
Setting::getSettings()->notify(new AuditNotification($params)); $settings->notify(new AuditNotification($params));
} }
return $log; return $log;