Merge pull request #198 from ExpDev07/dev

Bugfix

Author: coalaura

app/Http/Controllers/Auth/SteamController.php

@@ -4,6 +4,7 @@
 
 use App\Helpers\LoggingHelper;
 use App\Helpers\SessionHelper;
+use App\Http\Middleware\StaffMiddleware;
 use App\Player;
 use App\User;
 use Illuminate\Http\Request;
@@ -61,6 +62,8 @@ public function authenticated(Request $request, SteamUser $steam)
             LoggingHelper::log($session->getSessionKey(), 'Putting user in session');
             $session->put('user', $user);
 
+            StaffMiddleware::updateSessionLock();
+
             if ($session->exists('returnTo')) {
                 return redirect($session->get('returnTo'));
             }

app/Http/Middleware/StaffMiddleware.php

@@ -116,18 +116,30 @@ protected function checkSessionLock(): bool
 
             return $valid;
         } else {
-            $session->put('session_lock', $this->getFingerprint());
-            $session->put('session_detail', $detail);
+            self::updateSessionLock();
             return true;
         }
     }
 
-    private function getFingerprint(): string
+    public static function updateSessionLock()
+    {
+        $detail = [
+            'ua' => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '',
+            'ip' => $_SERVER['REMOTE_ADDR'],
+        ];
+
+        $session = SessionHelper::getInstance();
+
+        $session->put('session_lock', self::getFingerprint());
+        $session->put('session_detail', $detail);
+    }
+
+    public static function getFingerprint(): string
     {
         $ua = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '';
         $ip = $_SERVER['REMOTE_ADDR'];
 
-        return sha1($ua . '_' . $ip);
+        return md5($ua . '_' . $ip);
     }
 
     /**