Merge pull request #1 from laravelcm/update-middleware

Update session check on middleware

Author: mckenziearts

.github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: Tests
+name: tests
 
 on: push
 

src/DataObject/Connection.php

@@ -7,11 +7,11 @@
 final class Connection
 {
     public function __construct(
-        public string $connectionType,
-        public int $autonomousSystemNumber,
-        public string $autonomousSystemOrganization,
-        public string $ispName,
-        public string $organizationName,
+        public ?string $connectionType,
+        public ?int $autonomousSystemNumber,
+        public ?string $autonomousSystemOrganization,
+        public ?string $ispName,
+        public ?string $organizationName,
     ) {
     }
 }

src/Middleware/AbstractIpGeolocation.php

@@ -24,8 +24,25 @@ public function handle($request, Closure $next): mixed
             (new IpGeolocation($request))->initialize()
         );
 
-        session()->put('abstract-ip-geolocation', $response);
+        $this->manageSession($response);
 
         return $next($request);
     }
+
+    public function manageSession(GeolocationData $geolocation): void
+    {
+        $sessionKey = 'abstract-ip-geolocation';
+
+        if (session()->exists($sessionKey)) {
+            /** @var GeolocationData $currentValue */
+            $currentValue = session()->get($sessionKey);
+
+            if ($currentValue->ipAddress !== $geolocation->ipAddress) {
+                session()->forget($sessionKey);
+                session()->put($sessionKey, $geolocation);
+            }
+        } else {
+            session()->put($sessionKey, $geolocation);
+        }
+    }
 }