Avoid overwrite last ip or user_agent with empty ones

tlaverdure/laravel-echo-server#546 In some cases request doesn'nt has `ipAddress` or `userAgent`, with this change it avoid overwrite the last reported data
PaolaRuby · Nov 23, 2021 · 417d098 · 417d098
1 parent dcda06f
commit 417d098
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Illuminate/Session/DatabaseSessionHandler.php b/src/Illuminate/Session/DatabaseSessionHandler.php
@@ -234,10 +234,12 @@ protected function userId()
     protected function addRequestInformation(&$payload)
     {
         if ($this->container->bound('request')) {
-            $payload = array_merge($payload, [
-                'ip_address' => $this->ipAddress(),
-                'user_agent' => $this->userAgent(),
-            ]);
+            if ($this->ipAddress()) {
+                $payload['ip_address'] = $this->ipAddress();
+            }
+            if ($this->userAgent()) {
+                $payload['user_agent'] = $this->userAgent();
+            }
         }
 
         return $this;