Merge remote-tracking branch 'origin/develop'

app/Helpers/Helper.php

@@ -16,6 +16,7 @@
 use Illuminate\Contracts\Encryption\DecryptException;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
 use Intervention\Image\ImageManagerStatic as Image;
 use Illuminate\Support\Facades\Session;
 
@@ -708,6 +709,28 @@ public static function generateRandomString($length = 10)
 
         return $randomString;
     }
+    /**
+     * A method to be used to handle deprecations notifications, currently handling MS Teams. more can be added when needed.
+     *
+     *
+     * @author [Godfrey Martinez]
+     * @since [v7.0.14]
+     * @return array
+     */
+    public static function deprecationCheck()  : array {
+        // The check and message that the user is still using the deprecated version
+        $deprecations = [
+            'ms_teams_deprecated' => array(
+            'check' => !Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows'),
+            'message' => 'The Microsoft Teams webhook URL being used will be deprecated Jan 31st, 2025. <a class="btn btn-primary" href="' . route('settings.slack.index') . '">Change webhook endpoint</a>'),
+        ];
+
+        // if item of concern is being used and its being used with the deprecated values return the notification array.
+        if(Setting::getSettings()->webhook_selected === 'microsoft' && $deprecations['ms_teams_deprecated']['check']) {
+            return $deprecations;
+        }
+            return [];
+    }
 
     /**
      * This nasty little method gets the low inventory info for the

app/Http/Requests/StoreNotificationSettings.php

@@ -25,7 +25,7 @@ public function rules(): array
     {
         return [
             'alert_email'                         => 'email_array|nullable',
-            'admin_cc_email'                      => 'email|nullable',
+            'admin_cc_email'                      => 'email_array|nullable',
             'alert_threshold'                     => 'numeric|nullable|gt:0',
             'alert_interval'                      => 'numeric|nullable|gt:0',
             'audit_warning_days'                  => 'numeric|nullable|gt:0',

app/Listeners/CheckoutableListener.php

@@ -30,6 +30,7 @@
 use Illuminate\Support\Facades\Notification;
 use Exception;
 use Illuminate\Support\Facades\Log;
+use Osama\LaravelTeamsNotification\TeamsNotification;
 
 class CheckoutableListener
 {
@@ -73,18 +74,27 @@ public function onCheckedOut($event)
              * 2. The item has a EULA
              * 3. The item should send an email at check-in/check-out
              */
-            if ($notifiable instanceof User && $notifiable->email != '') {
+
                 if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() ||
                     (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email())) {
-                Mail::to($notifiable)->cc($ccEmails)->send($mailable);
+                    if (!empty($notifiable->email)) {
+                        Mail::to($notifiable)->cc($ccEmails)->send($mailable);
+                    } else {
+                        Mail::cc($ccEmails)->send($mailable);
+                    }
                 Log::info('Sending email, Locale: ' . ($event->checkedOutTo->locale ?? 'default'));
             }
-        }
 
 //                 Send Webhook notification
                 if ($this->shouldSendWebhookNotification()) {
-                    Notification::route(Setting::getSettings()->webhook_selected, Setting::getSettings()->webhook_endpoint)
-                        ->notify($this->getCheckoutNotification($event, $acceptance));
+                    if (Setting::getSettings()->webhook_selected === 'microsoft') {
+                        $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
+                    } else {
+                        Notification::route(Setting::getSettings()->webhook_selected, Setting::getSettings()->webhook_endpoint)
+                            ->notify($this->getCheckoutNotification($event, $acceptance));
+                    }
                 }
         } catch (ClientException $e) {
             Log::debug("Exception caught during checkout notification: " . $e->getMessage());
@@ -142,13 +152,16 @@ public function onCheckedIn($event)
              * 3. The item should send an email at check-in/check-out
              */
 
-            if ($notifiable instanceof User && $notifiable->email != '') {
                 if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() ||
                     (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email())) {
-                    Mail::to($notifiable)->cc($ccEmails)->send($mailable);
+                    if (!empty($notifiable->email)) {
+                        Mail::to($notifiable)->cc($ccEmails)->send($mailable);
+                    } else {
+                        Mail::cc($ccEmails)->send($mailable);
+                    }
                     Log::info('Sending email, Locale: ' . $event->checkedOutTo->locale);
                 }
-            }
+
             // Send Webhook notification
             if ($this->shouldSendWebhookNotification()) {
                     Notification::route(Setting::getSettings()->webhook_selected, Setting::getSettings()->webhook_endpoint)

app/Livewire/SlackSettingsForm.php

@@ -4,10 +4,11 @@
 
 use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Str;
 use Livewire\Component;
 use App\Models\Setting;
 use App\Helpers\Helper;
-
+use Osama\LaravelTeamsNotification\TeamsNotification;
 class SlackSettingsForm extends Component
 {
     public $webhook_endpoint;
@@ -19,6 +20,7 @@ class SlackSettingsForm extends Component
     public $webhook_placeholder;
     public $webhook_icon;
     public $webhook_selected;
+    public $teams_webhook_deprecated;
     public array $webhook_text;
 
     public Setting $setting;
@@ -62,7 +64,7 @@ public function mount() {
                 "name" => trans('admin/settings/general.ms_teams'),
                 "icon" => "fa-brands fa-microsoft",
                 "placeholder" => "https://abcd.webhook.office.com/webhookb2/XXXXXXX",
-                "link" => "https://learn.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/add-incoming-webhook?tabs=dotnet#create-incoming-webhooks-1",
+                "link" => "https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498",
                 "test" => "msTeamTestWebhook"
             ),
         ];
@@ -79,15 +81,17 @@ public function mount() {
         $this->webhook_channel = $this->setting->webhook_channel;
         $this->webhook_botname = $this->setting->webhook_botname;
         $this->webhook_options = $this->setting->webhook_selected;
-        if($this->webhook_selected == 'microsoft' || $this->webhook_selected == 'google'){
+        $this->teams_webhook_deprecated = !Str::contains($this->webhook_endpoint, 'workflows');
+        if($this->webhook_selected === 'microsoft' || $this->webhook_selected === 'google'){
             $this->webhook_channel = '#NA';
         }
 
-
         if($this->setting->webhook_endpoint != null && $this->setting->webhook_channel != null){
             $this->isDisabled= '';
         }
-
+        if($this->webhook_selected === 'microsoft' && $this->teams_webhook_deprecated) {
+            session()->flash('warning', 'The selected Microsoft Teams webhook URL will be deprecated Jan 31st, 2025. Please use a workflow URL. Microsofts Documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>');
+        }
     }
     public function updated($field) {
 
@@ -109,7 +113,6 @@ public function updatedWebhookSelected() {
         if($this->webhook_selected == 'microsoft' || $this->webhook_selected == 'google'){
             $this->webhook_channel = '#NA';
         }
-
     }
 
     private function isButtonDisabled() {
@@ -126,7 +129,9 @@ private function isButtonDisabled() {
     public function render()
     {
         $this->isButtonDisabled();
+
         return view('livewire.slack-settings-form');
+
     }
 
     public function testWebhook(){
@@ -236,20 +241,32 @@ public function googleWebhookTest(){
     }
     public function msTeamTestWebhook(){
 
-     $payload =
-        [
-            "@type" => "MessageCard",
-            "@context" => "http://schema.org/extensions",
-            "summary" => trans('mail.snipe_webhook_summary'),
-            "title" => trans('mail.snipe_webhook_test'),
-            "text" => trans('general.webhook_test_msg', ['app' => $this->webhook_name]),
-        ];
+        try {
 
-         try {
-         $response = Http::withHeaders([
-             'content-type' => 'applications/json',
-         ])->post($this->webhook_endpoint,
-            $payload)->throw();
+            if($this->teams_webhook_deprecated){
+                //will use the deprecated webhook format
+                $payload =
+                    [
+                        "@type" => "MessageCard",
+                        "@context" => "http://schema.org/extensions",
+                        "summary" => trans('mail.snipe_webhook_summary'),
+                        "title" => trans('mail.snipe_webhook_test'),
+                        "text" => trans('general.webhook_test_msg', ['app' => $this->webhook_name]),
+                    ];
+                $response = Http::withHeaders([
+                    'content-type' => 'applications/json',
+                ])->post($this->webhook_endpoint,
+                    $payload)->throw();
+            }
+             else {
+                 $notification = new TeamsNotification($this->webhook_endpoint);
+                 $message = trans('general.webhook_test_msg', ['app' => $this->webhook_name]);
+                 $notification->success()->sendMessage($message);
+
+                 $response = Http::withHeaders([
+                     'content-type' => 'applications/json',
+                 ])->post($this->webhook_endpoint);
+             }
 
          if(($response->getStatusCode() == 302)||($response->getStatusCode() == 301)){
              return session()->flash('error' , trans('admin/settings/message.webhook.error_redirect', ['endpoint' => $this->webhook_endpoint]));

app/Models/License.php

@@ -184,7 +184,7 @@ public static function adjustSeatCount($license, $oldSeats, $newSeats)
             $logAction->item_type = self::class;
             $logAction->item_id = $license->id;
             $logAction->created_by = auth()->id() ?: 1; // We don't have an id while running the importer from CLI.
-            $logAction->note = "deleted ${change} seats";
+            $logAction->note = "deleted {$change} seats";
             $logAction->target_id = null;
             $logAction->logaction('delete seats');
 
@@ -216,7 +216,7 @@ public static function adjustSeatCount($license, $oldSeats, $newSeats)
             $logAction->item_type = self::class;
             $logAction->item_id = $license->id;
             $logAction->created_by = auth()->id() ?: 1; // Importer.
-            $logAction->note = "added ${change} seats";
+            $logAction->note = "added {$change} seats";
             $logAction->target_id = null;
             $logAction->logaction('add seats');
         }
@@ -743,4 +743,4 @@ public function scopeOrderByCreatedBy($query, $order)
     {
         return $query->leftJoin('users as admin_sort', 'licenses.created_by', '=', 'admin_sort.id')->select('licenses.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
     }
-}
+}

app/Notifications/CheckinAccessoryNotification.php

@@ -10,6 +10,7 @@
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\GoogleChatChannel;
 use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -91,18 +92,29 @@ public function toMicrosoftTeams()
         $admin = $this->admin;
         $item = $this->item;
         $note = $this->note;
+        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
+            return MicrosoftTeamsMessage::create()
+                ->to($this->settings->webhook_endpoint)
+                ->type('success')
+                ->addStartGroupToSection('activityTitle')
+                ->title(trans('Accessory_Checkin_Notification'))
+                ->addStartGroupToSection('activityText')
+                ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
+                ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
+                ->fact(trans('mail.Accessory_Checkin_Notification')." by ", $admin->present()->fullName())
+                ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
+                ->fact(trans('mail.notes'), $note ?: '');
+        }
 
-        return MicrosoftTeamsMessage::create()
-            ->to($this->settings->webhook_endpoint)
-            ->type('success')
-            ->addStartGroupToSection('activityTitle')
-            ->title(trans('Accessory_Checkin_Notification'))
-            ->addStartGroupToSection('activityText')
-            ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
-            ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
-            ->fact(trans('mail.Accessory_Checkin_Notification')." by ", $admin->present()->fullName())
-            ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
-            ->fact(trans('mail.notes'), $note ?: '');
+        $message = trans('mail.Accessory_Checkin_Notification');
+        $details = [
+            trans('mail.accessory_name') => htmlspecialchars_decode($item->present()->name),
+            trans('mail.checked_into') => $item->location->name ? $item->location->name : '',
+            trans('mail.Accessory_Checkin_Notification'). ' by' => $admin->present()->fullName(),
+            trans('admin/consumables/general.remaining')=> $item->numRemaining(),
+            trans('mail.notes') => $note ?: '',
+        ];
+        return  array($message, $details);
     }
     public function toGoogleChat()
     {

app/Notifications/CheckinAssetNotification.php

@@ -10,6 +10,7 @@
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\GoogleChatChannel;
 use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -97,16 +98,30 @@ public function toMicrosoftTeams()
         $item = $this->item;
         $note = $this->note;
 
-        return MicrosoftTeamsMessage::create()
-            ->to($this->settings->webhook_endpoint)
-            ->type('success')
-            ->title(trans('mail.Asset_Checkin_Notification'))
-            ->addStartGroupToSection('activityText')
-            ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
-            ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
-            ->fact(trans('mail.Asset_Checkin_Notification')." by ", $admin->present()->fullName())
-            ->fact(trans('admin/hardware/form.status'), $item->assetstatus->name)
-            ->fact(trans('mail.notes'), $note ?: '');
+        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
+            return MicrosoftTeamsMessage::create()
+                ->to($this->settings->webhook_endpoint)
+                ->type('success')
+                ->title(trans('mail.Asset_Checkin_Notification'))
+                ->addStartGroupToSection('activityText')
+                ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
+                ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
+                ->fact(trans('mail.Asset_Checkin_Notification') . " by ", $admin->present()->fullName())
+                ->fact(trans('admin/hardware/form.status'), $item->assetstatus->name)
+                ->fact(trans('mail.notes'), $note ?: '');
+        }
+
+
+        $message = trans('mail.Asset_Checkin_Notification');
+        $details = [
+            trans('mail.asset') => htmlspecialchars_decode($item->present()->name),
+            trans('mail.checked_into') => $item->location->name ? $item->location->name : '',
+            trans('mail.Asset_Checkin_Notification')." by " => $admin->present()->fullName(),
+            trans('admin/hardware/form.status') => $item->assetstatus->name,
+            trans('mail.notes') => $note ?: '',
+        ];
+
+        return  array($message, $details);
     }
     public function toGoogleChat()
     {

app/Notifications/CheckinLicenseSeatNotification.php

@@ -10,6 +10,7 @@
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\GoogleChatChannel;
 use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -102,18 +103,30 @@ public function toMicrosoftTeams()
         $admin = $this->admin;
         $item = $this->item;
         $note = $this->note;
+        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
+            return MicrosoftTeamsMessage::create()
+                ->to($this->settings->webhook_endpoint)
+                ->type('success')
+                ->addStartGroupToSection('activityTitle')
+                ->title(trans('mail.License_Checkin_Notification'))
+                ->addStartGroupToSection('activityText')
+                ->fact(htmlspecialchars_decode($item->present()->name), '', 'header')
+                ->fact(trans('mail.License_Checkin_Notification')." by ", $admin->present()->fullName() ?: 'CLI tool')
+                ->fact(trans('mail.checkedin_from'), $target->present()->fullName())
+                ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count())
+                ->fact(trans('mail.notes'), $note ?: '');
+        }
 
-        return MicrosoftTeamsMessage::create()
-            ->to($this->settings->webhook_endpoint)
-            ->type('success')
-            ->addStartGroupToSection('activityTitle')
-            ->title(trans('mail.License_Checkin_Notification'))
-            ->addStartGroupToSection('activityText')
-            ->fact(htmlspecialchars_decode($item->present()->name), '', 'header')
-            ->fact(trans('mail.License_Checkin_Notification')." by ", $admin->present()->fullName() ?: 'CLI tool')
-            ->fact(trans('mail.checkedin_from'), $target->present()->fullName())
-            ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count())
-            ->fact(trans('mail.notes'), $note ?: '');
+        $message = trans('mail.License_Checkin_Notification');
+        $details = [
+            trans('mail.checkedin_from')=> $target->present()->fullName(),
+            trans('mail.license_for') => htmlspecialchars_decode($item->present()->name),
+            trans('mail.License_Checkin_Notification')." by " => $admin->present()->fullName() ?: 'CLI tool',
+            trans('admin/consumables/general.remaining') => $item->availCount()->count(),
+            trans('mail.notes') => $note ?: '',
+        ];
+
+        return  array($message, $details);
     }
     public function toGoogleChat()
     {