Make Laravel appsec login success event more accurate

estringana · estringana · commit fc98f1397bf1 · 2024-03-28T10:08:49.000+01:00
diff --git a/src/Integrations/Integrations/Laravel/LaravelIntegration.php b/src/Integrations/Integrations/Laravel/LaravelIntegration.php
@@ -357,27 +357,27 @@ function ($This, $scope, $args, $loginSuccess) use ($integration) {
 
         // Used by Laravel >= 5.0
         \DDTrace\hook_method(
-            'Illuminate\Auth\SessionGuard',
-            'setUser',
+            'Illuminate\Auth\Events\Authenticated',
+            '__construct',
             function ($This, $scope, $args) use ($integration) {
                 $authClass = 'Illuminate\Contracts\Auth\Authenticatable';
                 if (
                     !function_exists('\datadog\appsec\track_user_login_success_event') ||
-                    !isset($args[0]) ||
-                    !$args[0] ||
-                    !($args[0] instanceof $authClass)
+                    !isset($args[1]) ||
+                    !$args[1] ||
+                    !($args[1] instanceof $authClass)
                 ) {
                     return;
                 }
                 $metadata = [];
-                if (isset($args[0]['name'])) {
-                    $metadata['name'] = $args[0]['name'];
+                if (isset($args[1]['name'])) {
+                    $metadata['name'] = $args[1]['name'];
                 }
-                if (isset($args[0]['email'])) {
-                    $metadata['email'] = $args[0]['email'];
+                if (isset($args[1]['email'])) {
+                    $metadata['email'] = $args[1]['email'];
                 }
                 \datadog\appsec\track_user_login_success_event(
-                    \method_exists($args[0], 'getAuthIdentifier') ? $args[0]->getAuthIdentifier() : '',
+                    \method_exists($args[1], 'getAuthIdentifier') ? $args[1]->getAuthIdentifier() : '',
                     $metadata,
                     true
                 );
@@ -387,7 +387,7 @@ function ($This, $scope, $args) use ($integration) {
         // Used by Laravel < 5.0
         \DDTrace\hook_method(
             'Illuminate\Auth\Guard',
-            'setUser',
+            'login',
             function ($This, $scope, $args) use ($integration) {
                 $authClass = 'Illuminate\Auth\UserInterface';
                 if (
