Merge pull request #280 from scr4bble/patch-5

Retry the request with new auth headers.
helpscout · Jul 15, 2021 · 3a0984d · 3a0984d
2 parents eae536d + 4fea459
commit 3a0984d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/Http/RestClient.php b/src/Http/RestClient.php
@@ -182,6 +182,10 @@ private function send(Request $request)
             $authenticator = $this->getAuthenticator();
             if ($authenticator->shouldAutoRefreshAccessToken()) {
                 $authenticator->fetchAccessAndRefreshToken();
+                // Replace the auth headers in the Request object.
+                foreach ($this->getAuthHeader() as $header => $value) {
+                    $request = $request->withHeader($header, $value);
+                }
                 $response = $this->client->send($request, $options);
             } else {
                 throw $e;

diff --git a/tests/Http/RestClientTest.php b/tests/Http/RestClientTest.php
@@ -88,7 +88,7 @@ public function testSendingRequestDoesntRefreshToken()
             ->andThrow($exception);
 
         $this->authenticator->shouldReceive([
-            'getAuthHeader' => [],
+            'getAuthHeader' => ['the-header' => 'the-value'],
             'shouldAutoRefreshAccessToken' => false,
         ]);
         $this->authenticator->shouldReceive('fetchAccessAndRefreshToken')
@@ -106,7 +106,7 @@ public function testSendingRequestRefreshesToken()
             ->once();
 
         $this->authenticator->shouldReceive([
-            'getAuthHeader' => [],
+            'getAuthHeader' => ['the-header' => 'the-value'],
             'shouldAutoRefreshAccessToken' => true,
         ]);
         $this->authenticator->shouldReceive('fetchAccessAndRefreshToken')
@@ -118,6 +118,11 @@ public function testSendingRequestRefreshesToken()
         ];
         $response = new Response(200, [], json_encode($responseData));
         $this->methodsClient->shouldReceive('send')
+            ->with(\Mockery::on(function (Request $request) {
+                // Ensure retry request includes new auth headers.
+                $this->assertSame(['the-value'], $request->getHeader('the-header'));
+                return true;
+            }), \Mockery::any())
             ->andReturn($response);
 
         $restClient = new RestClient($this->methodsClient, $this->authenticator);