Adds error handling

Author: LoganTFox

src/Services/IPAddressDriver.php

@@ -2,6 +2,7 @@
 
 namespace Zaengle\LaravelSecurityNotifications\Services;
 
+use Exception;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Http;
 use Zaengle\LaravelSecurityNotifications\Jobs\ProcessNewIPAddress;
@@ -20,7 +21,9 @@ public function __construct(
 
     public function handle(): void
     {
-        $ipLocationData = Http::get('http://ip-api.com/json/'.$this->ipAddress)->json();
+        $ipLocationData = Http::retry(3)->get('http://ip-api.com/json/'.$this->ipAddress)?->json();
+
+        throw_if(is_null($ipLocationData), new Exception('Failed to get IP location data for: '.$this->ipAddress));
 
         $loginQuery = Login::query()
             ->where([

tests/Unit/IPAddressHandlerTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Http;
@@ -20,6 +21,8 @@
 
     $user = User::factory()->create();
 
+    Http::shouldReceive('retry')
+        ->andReturnSelf();
     Http::shouldReceive('get')
         ->with('http://ip-api.com/json/127.0.0.1')
         ->once()
@@ -57,6 +60,8 @@
         'last_login_at' => now()->subDays(5),
     ]);
 
+    Http::shouldReceive('retry')
+        ->andReturnSelf();
     Http::shouldReceive('get')
         ->with('http://ip-api.com/json/'.$login->ip_address)
         ->once()
@@ -94,6 +99,8 @@
         ],
     ]);
 
+    Http::shouldReceive('retry')
+        ->andReturnSelf();
     Http::shouldReceive('get')
         ->with('http://ip-api.com/json/127.0.0.1')
         ->once()
@@ -131,6 +138,8 @@
         ],
     ]);
 
+    Http::shouldReceive('retry')
+        ->andReturnSelf();
     Http::shouldReceive('get')
         ->with('http://ip-api.com/json/127.0.0.1')
         ->once()
@@ -187,6 +196,8 @@
         ],
     ]);
 
+    Http::shouldReceive('retry')
+        ->andReturnSelf();
     Http::shouldReceive('get')
         ->with('http://ip-api.com/json/128.0.0.1')
         ->once()
@@ -231,4 +242,21 @@
     IPAddress::process([
         'ipAddress' => '127.0.0.1',
     ]);
-})->expectException(IPAddressDriverMissingException::class);
+})->expectException(IPAddressDriverMissingException::class);
+
+it('fails if no ip location data', function () {
+    $login = Login::factory()->create();
+
+    Http::shouldReceive('retry')
+        ->andReturnSelf();
+    Http::shouldReceive('get')
+        ->with('http://ip-api.com/json/1234567890');
+    Http::shouldReceive('json')
+        ->never();
+
+    IPAddress::process([
+        'ipAddress' => '1234567890',
+        'userId' => $login->user_id,
+        'userType' => $login->user_type,
+    ]);
+})->expectException(Exception::class, 'Failed to get IP location data for: 1234567890');