Revert "Throw an AuthenticationException for 401 status codes"

helpscout · Jan 2, 2020 · 651d606 · 651d606
1 parent 1cbe4e2
commit 651d606
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 121 deletions.
diff --git a/src/Exception/AuthenticationException.php b/src/Exception/AuthenticationException.php
@@ -4,8 +4,6 @@
 
 namespace HelpScout\Api\Exception;
 
-use GuzzleHttp\Exception\RequestException;
-
-class AuthenticationException extends RequestException implements Exception
+class AuthenticationException extends \Exception implements Exception
 {
 }
diff --git a/src/Http/Handlers/AuthenticationHandler.php b/src/Http/Handlers/AuthenticationHandler.php
diff --git a/src/Http/Handlers/ClientErrorHandler.php b/src/Http/Handlers/ClientErrorHandler.php
@@ -15,7 +15,7 @@ public function __invoke(callable $handler)
         return function (RequestInterface $request, array $options = []) use ($handler) {
             return $handler($request, $options)->then(
                 function (ResponseInterface $response) use ($request) {
-                    if ($response->getStatusCode() >= 400 && $response->getStatusCode() !== 401) {
+                    if ($response->getStatusCode() >= 400) {
                         $e = RequestException::create($request, $response);
 
                         throw $e;

diff --git a/src/Http/RestClientBuilder.php b/src/Http/RestClientBuilder.php
@@ -16,7 +16,6 @@
 use HelpScout\Api\Http\Auth\LegacyCredentials;
 use HelpScout\Api\Http\Auth\NullCredentials;
 use HelpScout\Api\Http\Auth\RefreshCredentials;
-use HelpScout\Api\Http\Handlers\AuthenticationHandler;
 use HelpScout\Api\Http\Handlers\ClientErrorHandler;
 use HelpScout\Api\Http\Handlers\RateLimitHandler;
 use HelpScout\Api\Http\Handlers\ValidationHandler;
@@ -96,7 +95,6 @@ protected function getHandlerStack(): HandlerStack
     {
         $handler = HandlerStack::create();
 
-        $handler->push(new AuthenticationHandler());
         $handler->push(new ClientErrorHandler());
         $handler->push(new RateLimitHandler());
         $handler->push(new ValidationHandler());

diff --git a/tests/ApiClientIntegrationTestCase.php b/tests/ApiClientIntegrationTestCase.php
@@ -11,7 +11,6 @@
 use GuzzleHttp\Psr7\Response;
 use HelpScout\Api\ApiClient;
 use HelpScout\Api\Http\Authenticator;
-use HelpScout\Api\Http\Handlers\AuthenticationHandler;
 use HelpScout\Api\Http\Handlers\ClientErrorHandler;
 use HelpScout\Api\Http\Handlers\RateLimitHandler;
 use HelpScout\Api\Http\Handlers\ValidationHandler;
@@ -49,7 +48,6 @@ public function setUp()
         $handler = HandlerStack::create($this->mockHandler);
 
         $handler->push(Middleware::history($this->history));
-        $handler->push(new AuthenticationHandler());
         $handler->push(new ClientErrorHandler());
         $handler->push(new RateLimitHandler());
         $handler->push(new ValidationHandler());

diff --git a/tests/Http/Handlers/AuthenticationHandlerTest.php b/tests/Http/Handlers/AuthenticationHandlerTest.php
diff --git a/tests/Http/Handlers/ClientHandlerTest.php b/tests/Http/Handlers/ClientHandlerTest.php