Updates endpoint

zaengle · Oct 8, 2024 · ed6d365 · ed6d365
1 parent 5c1b688
commit ed6d365
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 8 deletions.
diff --git a/src/Services/IPAddressDriver.php b/src/Services/IPAddressDriver.php
@@ -21,9 +21,13 @@ public function __construct(
 
     public function handle(): void
     {
+        $endpoint = config('security-notifications.ip_api_key')
+            ? 'https://pro.ip-api.com/json/'
+            : 'https://ip-api.com/json/';
+
         $ipLocationData = Http::retry(3)
-            ->withQueryParameters(['api_key' => config('security-notifications.ip_api_key')])
-            ->get('http://ip-api.com/json/'.$this->ipAddress)
+            ->withQueryParameters(['key' => config('security-notifications.ip_api_key')])
+            ->get($endpoint.$this->ipAddress)
             ?->json();
 
         throw_if(is_null($ipLocationData), new Exception('Failed to get IP location data for: '.$this->ipAddress));

diff --git a/tests/Unit/IPAddressHandlerTest.php b/tests/Unit/IPAddressHandlerTest.php
@@ -26,7 +26,7 @@
     Http::shouldReceive('withQueryParameters')
         ->andReturnSelf();
     Http::shouldReceive('get')
-        ->with('http://ip-api.com/json/127.0.0.1')
+        ->with('https://ip-api.com/json/127.0.0.1')
         ->once()
         ->andReturnSelf();
     Http::shouldReceive('json')
@@ -67,7 +67,7 @@
     Http::shouldReceive('withQueryParameters')
         ->andReturnSelf();
     Http::shouldReceive('get')
-        ->with('http://ip-api.com/json/'.$login->ip_address)
+        ->with('https://ip-api.com/json/'.$login->ip_address)
         ->once()
         ->andReturnSelf();
     Http::shouldReceive('json')
@@ -108,7 +108,7 @@
     Http::shouldReceive('withQueryParameters')
         ->andReturnSelf();
     Http::shouldReceive('get')
-        ->with('http://ip-api.com/json/127.0.0.1')
+        ->with('https://ip-api.com/json/127.0.0.1')
         ->once()
         ->andReturnSelf();
     Http::shouldReceive('json')
@@ -149,7 +149,7 @@
     Http::shouldReceive('withQueryParameters')
         ->andReturnSelf();
     Http::shouldReceive('get')
-        ->with('http://ip-api.com/json/127.0.0.1')
+        ->with('https://ip-api.com/json/127.0.0.1')
         ->once()
         ->andReturnSelf();
     Http::shouldReceive('json')
@@ -209,7 +209,7 @@
     Http::shouldReceive('withQueryParameters')
         ->andReturnSelf();
     Http::shouldReceive('get')
-        ->with('http://ip-api.com/json/128.0.0.1')
+        ->with('https://ip-api.com/json/128.0.0.1')
         ->once()
         ->andReturnSelf();
     Http::shouldReceive('json')
@@ -269,4 +269,36 @@
         'userId' => $login->user_id,
         'userType' => $login->user_type,
     ]);
-})->expectException(Exception::class, 'Failed to get IP location data for: 1234567890');
+})->expectException(Exception::class, 'Failed to get IP location data for: 1234567890');
+
+it('uses pro endpoint if api key is set', function () {
+    Bus::fake();
+
+    Config::set('security-notifications.ip_api_key', 'test-key');
+
+    $user = User::factory()->create();
+
+    Http::shouldReceive('retry')
+        ->andReturnSelf();
+    Http::shouldReceive('withQueryParameters')
+        ->with(['key' => 'test-key'])
+        ->andReturnSelf();
+    Http::shouldReceive('get')
+        ->with('https://pro.ip-api.com/json/127.0.0.1')
+        ->once()
+        ->andReturnSelf();
+    Http::shouldReceive('json')
+        ->once()
+        ->andReturn([
+            'query' => '127.0.0.1',
+            'city' => 'Minneapolis',
+            'region' => 'MN',
+            'countryCode' => 'US',
+        ]);
+
+    IPAddress::process([
+        'ipAddress' => '127.0.0.1',
+        'userId' => $user->getKey(),
+        'userType' => $user->getMorphClass(),
+    ]);
+});