Merge pull request #1 from cbzink/fix-token-usage

Fix API tokens not working correctly

src/Exceptions/InvalidTokenException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace cbzink\LaunchLibrary\Exceptions;
+
+use Exception;
+
+class InvalidTokenException extends Exception
+{
+    /**
+     * Create a new exception instance.
+     */
+    public function __construct()
+    {
+        parent::__construct('Invalid token.');
+    }
+}

src/LL2.php

@@ -54,14 +54,19 @@ public function __construct($apiToken = null, $apiEndpoint = null, $guzzle = nul
         $this->apiToken      = $apiToken;
         $this->apiEndpoint   = $apiEndpoint ?: 'https://ll.thespacedevs.com/2.2.0/';
 
+        $headers = [
+            'Accept'       => 'application/json',
+            'Content-Type' => 'application/json',
+        ];
+
+        if ($this->apiToken) {
+            $headers['Authorization'] = "Token {$this->apiToken}";
+        }
+
         $this->guzzle = $guzzle ?: new HttpClient([
             'base_uri'    => 'https://ll.thespacedevs.com/2.2.0/',
             'http_errors' => false,
-            'headers'     => [
-                'Token'        => $this->apiToken,
-                'Accept'       => 'application/json',
-                'Content-Type' => 'application/json',
-            ],
+            'headers'     => $headers,
         ]);
     }
 

src/MakesHttpRequests.php

@@ -6,6 +6,7 @@
 use GuzzleHttp\Psr7\Response;
 use cbzink\LaunchLibrary\Exceptions\NotFoundException;
 use cbzink\LaunchLibrary\Exceptions\RateLimitException;
+use cbzink\LaunchLibrary\Exceptions\InvalidTokenException;
 
 trait MakesHttpRequests
 {
@@ -78,6 +79,10 @@ protected function request(string $method, string $uri, array $params = [])
      */
     protected function handleRequestError(Response $response): void
     {
+        if ($response->getStatusCode() === 401) {
+            throw new InvalidTokenException();
+        }
+
         if ($response->getStatusCode() === 429) {
             $body = json_decode((string) $response->getBody(), true);
 

tests/LL2Test.php

@@ -19,6 +19,7 @@
 use cbzink\LaunchLibrary\Api\SpaceStation;
 use cbzink\LaunchLibrary\Api\Launch\Launch;
 use cbzink\LaunchLibrary\Api\Spacecraft\Spacecraft;
+use cbzink\LaunchLibrary\Exceptions\InvalidTokenException;
 use cbzink\LaunchLibrary\Exceptions\NotFoundException;
 use cbzink\LaunchLibrary\Exceptions\RateLimitException;
 use cbzink\LaunchLibrary\Exceptions\UnknownApiException;
@@ -79,6 +80,22 @@ public function testMakesGetRequests()
         ]);
     }
 
+    public function testHandlesInvalidTokenErrors()
+    {
+        $this->expectException(InvalidTokenException::class);
+
+        $guzzle = Mockery::mock(HttpClient::class);
+        $client = new LL2(null, null, $guzzle);
+
+        $guzzle->shouldReceive('request')->once()->with('GET', 'agencies', [
+            'query' => ['limit' => $client->getPaginationLimit()],
+        ])->andReturn(
+            new Response(401, [], '{"detail": "Invalid token."}')
+        );
+
+        $client->get('agencies');
+    }
+
     public function testHandlesRateLimitErrors()
     {
         $this->expectException(RateLimitException::class);