fix webhook logging with numeric check

fleetbase · Oct 17, 2024 · 18d94c7 · 18d94c7
1 parent 320522a
commit 18d94c7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Listeners/LogFailedWebhook.php b/src/Listeners/LogFailedWebhook.php
@@ -57,8 +57,8 @@ public function handle(WebhookCallFailedEvent $event)
         }
 
         // Check if it was a personal access token which made the request
-        if ($accessTokenId && PersonalAccessToken::where('id', $accessTokenId)->exists()) {
-            $data['access_token_id'] = $accessTokenId;
+        if ($accessTokenId && is_numeric($accessTokenId) && PersonalAccessToken::where('id', $accessTokenId)->exists()) {
+            $data['access_token_id'] = (int) $accessTokenId;
         }
 
         // Log webhook callback event

diff --git a/src/Listeners/LogFinalWebhookAttempt.php b/src/Listeners/LogFinalWebhookAttempt.php
@@ -59,8 +59,8 @@ public function handle(FinalWebhookCallFailedEvent $event)
         }
 
         // Check if it was a personal access token which made the request
-        if ($accessTokenId && PersonalAccessToken::where('id', $accessTokenId)->exists()) {
-            $data['access_token_id'] = $accessTokenId;
+        if ($accessTokenId && is_numeric($accessTokenId) && PersonalAccessToken::where('id', $accessTokenId)->exists()) {
+            $data['access_token_id'] = (int) $accessTokenId;
         }
 
         // log webhook event

diff --git a/src/Listeners/LogSuccessfulWebhook.php b/src/Listeners/LogSuccessfulWebhook.php
@@ -57,8 +57,8 @@ public function handle(WebhookCallSucceededEvent $event)
         }
 
         // Check if it was a personal access token which made the request
-        if ($accessTokenId && PersonalAccessToken::where('id', $accessTokenId)->exists()) {
-            $data['access_token_id'] = $accessTokenId;
+        if ($accessTokenId && is_numeric($accessTokenId) && PersonalAccessToken::where('id', $accessTokenId)->exists()) {
+            $data['access_token_id'] = (int) $accessTokenId;
         }
 
         // Log webhook callback event