Merge pull request #15809 from marcusmoore/fixes/teams

Fixed Microsoft Teams notifications
snipe · Nov 13, 2024 · 5084843 · 5084843
2 parents 73383c6 + e80a456
commit 5084843
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/app/Listeners/CheckoutableListener.php b/app/Listeners/CheckoutableListener.php
@@ -31,6 +31,7 @@
 use Illuminate\Support\Facades\Notification;
 use Exception;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
 use Osama\LaravelTeamsNotification\TeamsNotification;
 
 class CheckoutableListener
@@ -94,7 +95,7 @@ public function onCheckedOut($event)
 //                 Send Webhook notification
         try{
                 if ($this->shouldSendWebhookNotification()) {
-                    if (Setting::getSettings()->webhook_selected === 'microsoft') {
+                    if ($this->newMicrosoftTeamsWebhookEnabled()) {
                         $message = $this->getCheckoutNotification($event)->toMicrosoftTeams();
                         $notification = new TeamsNotification(Setting::getSettings()->webhook_endpoint);
                         $notification->success()->sendMessage($message[0], $message[1]);  // Send the message to Microsoft Teams
@@ -176,7 +177,7 @@ public function onCheckedIn($event)
         // Send Webhook notification
         try {
             if ($this->shouldSendWebhookNotification()) {
-                    if (Setting::getSettings()->webhook_selected === 'microsoft') {
+                if ($this->newMicrosoftTeamsWebhookEnabled()) {
                         $message = $this->getCheckinNotification($event)->toMicrosoftTeams();
                         $notification = new TeamsNotification(Setting::getSettings()->webhook_endpoint);
                         $notification->success()->sendMessage($message[0], $message[1]);  // Send the message to Microsoft Teams
@@ -345,4 +346,9 @@ private function checkoutableShouldSendEmail($event): bool
         }
         return (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email());
     }
+
+    private function newMicrosoftTeamsWebhookEnabled(): bool
+    {
+        return Setting::getSettings()->webhook_selected === 'microsoft' && Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows');
+    }
 }
diff --git a/app/Livewire/SlackSettingsForm.php b/app/Livewire/SlackSettingsForm.php
@@ -114,10 +114,9 @@ public function updatedWebhookSelected() {
             $this->webhook_channel = '#NA';
         }
     }
-    public function updatedwebhookEndpoint() {
-        $this->teams_webhook_deprecated = !Str::contains($this->webhook_endpoint, 'workflows');
-    }
-    public function updatedwebhookEndpoint() {
+
+    public function updatedwebhookEndpoint()
+    {
         $this->teams_webhook_deprecated = !Str::contains($this->webhook_endpoint, 'workflows');
     }
 

diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php
@@ -111,7 +111,8 @@ public function toSlack() :SlackMessage
                     ->content($note);
             });
     }
-    public function toMicrosoftTeams() : array
+
+    public function toMicrosoftTeams()
     {
         $target = $this->target;
         $admin = $this->admin;