Small fixes and cleanups (#17)

Small fixes and cleanups

Author: Nyholm

src/Api/HttpApi.php

@@ -128,12 +128,12 @@ protected function httpDelete(string $path, array $params = [], array $requestHe
     protected function handleErrors(ResponseInterface $response)
     {
         switch ($response->getStatusCode()) {
+            case 401:
+                throw new DomainExceptions\UnauthorizedException();
             case 404:
                 throw new DomainExceptions\NotFoundException();
-                break;
             default:
                 throw new DomainExceptions\UnknownErrorException();
-                break;
         }
     }
 

src/Exception/Domain/UnauthorizedException.php

@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace FAPI\Sylius\Exception\Domain;
+
+use FAPI\Sylius\Exception\DomainException;
+
+/**
+ * @author Tobias Nyholm <[email protected]>
+ */
+final class UnauthorizedException extends \Exception implements DomainException
+{
+}

src/Http/AuthenticationPlugin.php

@@ -15,6 +15,8 @@
  */
 class AuthenticationPlugin implements Plugin
 {
+    const RETRY_LIMIT = 2;
+
     /**
      * @var array
      */
@@ -25,6 +27,13 @@ class AuthenticationPlugin implements Plugin
      */
     private $authenticator;
 
+    /**
+     * Store the retry counter for each request.
+     *
+     * @var array
+     */
+    private $retryStorage = [];
+
     public function __construct(Authenticator $authenticator, string $accessToken)
     {
         $this->authenticator = $authenticator;
@@ -33,13 +42,24 @@ public function __construct(Authenticator $authenticator, string $accessToken)
 
     public function handleRequest(RequestInterface $request, callable $next, callable $first)
     {
-        $header = \sprintf('Bearer %s', $this->accessToken['access_token']);
+        if (null === $this->accessToken) {
+            return $next($request);
+        }
+
+        $chainIdentifier = \spl_object_hash((object) $first);
+        $header = \sprintf('Bearer %s', $this->accessToken['access_token'] ?? '');
         $request = $request->withHeader('Authorization', $header);
 
         $promise = $next($request);
 
-        return $promise->then(function (ResponseInterface $response) use ($request, $next, $first) {
-            if (401 !== $response->getStatusCode()) {
+        return $promise->then(function (ResponseInterface $response) use ($request, $next, $first, $chainIdentifier) {
+            if (!\array_key_exists($chainIdentifier, $this->retryStorage)) {
+                $this->retryStorage[$chainIdentifier] = 0;
+            }
+
+            if (401 !== $response->getStatusCode() || $this->retryStorage[$chainIdentifier] >= self::RETRY_LIMIT) {
+                unset($this->retryStorage[$chainIdentifier]);
+
                 return $response;
             }
 
@@ -56,6 +76,7 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
             $request = $request->withHeader('Authorization', $header);
 
             // Retry
+            ++$this->retryStorage[$chainIdentifier];
             $promise = $this->handleRequest($request, $next, $first);
 
             return $promise->wait();