feat: make auth http client config extends from default client config (…

…#2348) Co-authored-by: Brent Shaffer <[email protected]>
googleapis · Dec 19, 2022 · 2640250 · 2640250
1 parent b2624d2
commit 2640250
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/src/AuthHandler/Guzzle6AuthHandler.php b/src/AuthHandler/Guzzle6AuthHandler.php
@@ -105,11 +105,6 @@ public function attachKey(ClientInterface $http, $key)
 
  private function createAuthHttp(ClientInterface $http)
  {
- return new Client([
- 'base_uri' => $http->getConfig('base_uri'),
- 'http_errors' => true,
- 'verify' => $http->getConfig('verify'),
- 'proxy' => $http->getConfig('proxy'),
- ]);
+ return new Client(['http_errors' => true] + $http->getConfig());
  }
 }
diff --git a/tests/Google/ClientTest.php b/tests/Google/ClientTest.php
@@ -997,14 +997,8 @@ public function testCredentialsOptionWithCredentialsLoader()
 
  $httpClient = $this->prophesize('GuzzleHttp\ClientInterface');
  $httpClient->getConfig()
- ->shouldBeCalledOnce()
+ ->shouldBeCalled()
  ->willReturn(['handler' => $handler->reveal()]);
- $httpClient->getConfig('base_uri')
- ->shouldBeCalledOnce();
- $httpClient->getConfig('verify')
- ->shouldBeCalledOnce();
- $httpClient->getConfig('proxy')
- ->shouldBeCalledOnce();
  $httpClient->send(Argument::any(), Argument::any())
  ->shouldNotBeCalled();