mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-04 18:05:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18397 from Godmartinz/rb-20474-fix

Browse Source 
Adds [RB-20474] a try/catch to ms teams audit notification
This commit is contained in:
snipe
2026-01-05 20:39:42 +00:00
committed by GitHub
parent 2f29edc01f 1543634cb0
commit 41c7bf4aaa
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Models/Traits/Loggable.php
View File

@ -10,10 +10,12 @@ use App\Models\Location;
use App\Models\Setting;
use App\Models\User;
use App\Notifications\AuditNotification;
use GuzzleHttp\Exception\ConnectException;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Str;
use Osama\LaravelTeamsNotification\TeamsNotification;
use Throwable;
trait Loggable
{
@ -282,10 +284,29 @@ trait Loggable
'location' => ($location) ? $location->name : '',
'note' => $note,
];
if(Setting::getSettings()->webhook_selected === 'microsoft' && Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
$message = AuditNotification::toMicrosoftTeams($params);
$notification = new TeamsNotification(Setting::getSettings()->webhook_endpoint);
$notification->success()->sendMessage($message[0], $message[1]);
$endpoint = Setting::getSettings()->webhook_endpoint;
try {
$message = AuditNotification::toMicrosoftTeams($params);
$notification = new TeamsNotification($endpoint);
$notification->success()->sendMessage($message[0], $message[1]);
} catch (ConnectException $e) {
Log::warning('Teams webhook connection failed', [
'endpoint' => $endpoint,
'error' => $e->getMessage(),
]);
} catch (Throwable $e) {
Log::error('Teams webhook failed unexpectedly', [
'endpoint' => $endpoint,
'exception' => get_class($e),
'error' => $e->getMessage(),
]);
}
}
else {
Setting::getSettings()->notify(new AuditNotification($params));