Merge pull request #136 from rhwilrForks/master

Fix Kloudend (ipapi.co) integration with empty tokens
stevebauman · Feb 27, 2023 · 49f28e5 · 49f28e5
2 parents e2d38d0 + f7fcae2
commit 49f28e5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/Drivers/Kloudend.php b/src/Drivers/Kloudend.php
@@ -15,7 +15,7 @@ protected function url($ip)
     {
         $token = config('location.kloudend.token', '');
 
-        return "https://ipapi.co/{$ip}/json".empty($token) ? '' : "?key={$token}";
+        return "https://ipapi.co/{$ip}/json".(empty($token) ? '' : "?key={$token}");
     }
 
     /**

diff --git a/tests/IpData.php → tests/IpDataTest.php b/tests/IpData.php → tests/IpDataTest.php
diff --git a/tests/Kloudend.php → tests/KloudendTest.php b/tests/Kloudend.php → tests/KloudendTest.php
@@ -20,7 +20,7 @@
         'postal' => '55555',
         'latitude' => '50',
         'longitude' => '50',
-        'timezone' => ['name' => 'America/Toronto'],
+        'timezone' => 'America/Toronto',
     ];
 
     $driver
@@ -52,3 +52,19 @@
         'driver' => get_class($driver),
     ]);
 });
+
+it('it can make requests with a token', function () {
+    config(['location.kloudend.token' => 'ABC1234']);
+
+    $driver = m::mock(Kloudend::class);
+    $driver->makePartial();
+
+    expect($driver->url('1.1.1.1'))->toEqual('https://ipapi.co/1.1.1.1/json?key=ABC1234');
+});
+
+it('it can make requests without a token', function () {
+    $driver = m::mock(Kloudend::class);
+    $driver->makePartial();
+
+    expect($driver->url('1.1.1.1'))->toEqual('https://ipapi.co/1.1.1.1/json');
+});