Check for AuthenticationLoggable trait on event

rappasoft · Mar 29, 2024 · 0967d3a · 0967d3a
1 parent c901975
commit 0967d3a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,8 +5,9 @@ All notable changes to `Laravel Authentication Log` will be documented in this f
 ### 4.0.0 - 2024-03-28
 
 - Laravel 11 Support (https://github.com/rappasoft/laravel-authentication-log/pull/100)
-- Add config listeners
+- Add config listeners (https://github.com/rappasoft/laravel-authentication-log/pull/92)
 - Use real user IP behind Cloudflare
+- Check for AuthenticationLoggable trait on event (https://github.com/rappasoft/laravel-authentication-log/pull/94)
 
 ### 3.0.0 - 2023-02-23
 

diff --git a/src/Listeners/FailedLoginListener.php b/src/Listeners/FailedLoginListener.php
@@ -5,6 +5,7 @@
 use Illuminate\Auth\Events\Failed;
 use Illuminate\Http\Request;
 use Rappasoft\LaravelAuthenticationLog\Notifications\FailedLogin;
+use Rappasoft\LaravelAuthenticationLog\Traits\AuthenticationLoggable;
 
 class FailedLoginListener
 {
@@ -18,11 +19,15 @@ public function __construct(Request $request)
     public function handle($event): void
     {
         $listener = config('authentication-log.events.failed', Failed::class);
+
         if (! $event instanceof $listener) {
             return;
         }
 
         if ($event->user) {
+            if(! in_array(AuthenticationLoggable::class, class_uses_recursive(get_class($event->user)))){
+                return;
+            }
 
             if (config('authentication-log.behind_cdn')) {
                 $ip = $this->request->server(config('authentication-log.behind_cdn.http_header_field'));

diff --git a/src/Listeners/LoginListener.php b/src/Listeners/LoginListener.php
@@ -20,12 +20,13 @@ public function __construct(Request $request)
     public function handle($event): void
     {
         $listener = config('authentication-log.events.login', Login::class);
+
         if (! $event instanceof $listener) {
             return;
         }
 
         if ($event->user) {
-            if(!in_array(AuthenticationLoggable::class, class_uses_recursive(get_class($event->user))){
+            if(! in_array(AuthenticationLoggable::class, class_uses_recursive(get_class($event->user)))){
                 return;
             }
 

diff --git a/src/Listeners/LogoutListener.php b/src/Listeners/LogoutListener.php
@@ -5,6 +5,7 @@
 use Illuminate\Auth\Events\Logout;
 use Illuminate\Http\Request;
 use Rappasoft\LaravelAuthenticationLog\Models\AuthenticationLog;
+use Rappasoft\LaravelAuthenticationLog\Traits\AuthenticationLoggable;
 
 class LogoutListener
 {
@@ -18,11 +19,16 @@ public function __construct(Request $request)
     public function handle($event): void
     {
         $listener = config('authentication-log.events.logout', Logout::class);
+
         if (! $event instanceof $listener) {
             return;
         }
 
         if ($event->user) {
+            if(! in_array(AuthenticationLoggable::class, class_uses_recursive(get_class($event->user)))){
+                return;
+            }
+
             $user = $event->user;
 
             if (config('authentication-log.behind_cdn')) {

diff --git a/src/Listeners/OtherDeviceLogoutListener.php b/src/Listeners/OtherDeviceLogoutListener.php
@@ -5,6 +5,7 @@
 use Illuminate\Auth\Events\OtherDeviceLogout;
 use Illuminate\Http\Request;
 use Rappasoft\LaravelAuthenticationLog\Models\AuthenticationLog;
+use Rappasoft\LaravelAuthenticationLog\Traits\AuthenticationLoggable;
 
 class OtherDeviceLogoutListener
 {
@@ -18,11 +19,16 @@ public function __construct(Request $request)
     public function handle($event): void
     {
         $listener = config('authentication-log.events.other-device-logout', OtherDeviceLogout::class);
+
         if (! $event instanceof $listener) {
             return;
         }
 
         if ($event->user) {
+            if(! in_array(AuthenticationLoggable::class, class_uses_recursive(get_class($event->user)))){
+                return;
+            }
+
             $user = $event->user;
 
             if (config('authentication-log.behind_cdn')) {