Merge pull request #11138 from nanaya/login-log

Log login and forced password reset separately

Author: notbakaneko

Diff for: app/Http/Controllers/SessionsController.php

@@ -77,6 +77,7 @@ public function store()
             $forceReactivation = new ForceReactivation($user, $request);
 
             if ($forceReactivation->isRequired()) {
+                DatadogLoginAttempt::log('password_reset');
                 $forceReactivation->run();
 
                 \Session::flash('password_reset_start', [
@@ -87,6 +88,7 @@ public function store()
                 return ujs_redirect(route('password-reset'));
             }
 
+            DatadogLoginAttempt::log(null);
             $this->login($user, $remember);
 
             return [

Diff for: app/Models/User.php

@@ -2078,9 +2078,9 @@ public static function attemptLogin($user, $password, $ip = null)
             }
         }
 
-        DatadogLoginAttempt::log($authError);
 
         if ($authError !== null) {
+            DatadogLoginAttempt::log($authError);
             LoginAttempt::logAttempt($ip, $user, 'fail', $password);
 
             return osu_trans('users.login.failed');