Delete existing access token if it is invalid

Author: kamermans

src/OAuth2Handler.php

@@ -147,6 +147,15 @@ public function setAccessToken($token)
         return $this;
     }
 
+    /**
+     * Forcefully delete an access token, even if it's valid
+     */
+    public function deleteAccessToken()
+    {
+        $this->rawToken = null;
+        $this->tokenPersistence->deleteToken();
+    }
+
     /**
      * Get a valid access token.
      *

src/OAuth2Middleware.php

@@ -60,6 +60,9 @@ private function onFulfilled(RequestInterface $request, array $options, $handler
                 return $response;
             }
 
+            // Delete the previous access token, if any
+            $this->deleteAccessToken();
+
             // Acquire a new access token, and retry the request.
             $accessToken = $this->getAccessToken();
             if ($accessToken === null) {

src/OAuth2Subscriber.php

@@ -69,6 +69,9 @@ public function onError(ErrorEvent $event)
             return;
         }
 
+        // Delete the previous access token, if any
+        $this->deleteAccessToken();
+
         // Acquire a new access token, and retry the request.
         $accessToken = $this->getAccessToken();
         if ($accessToken != null) {