feat: make auth http client config extends from default client config (#2348)

geoffrey-brier · bshaffer · web-flow · commit 2640250c7bab · 2022-12-19T21:05:34.000Z
Co-authored-by: Brent Shaffer &lt;betterbrent@google.com&gt;
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();
 

Original file line number	Diff line number	Diff line change
`@@ -105,11 +105,6 @@ public function attachKey(ClientInterface $http, $key)`
`105`	`105`
`106`	`106`	`private function createAuthHttp(ClientInterface $http)`
`107`	`107`	`{`
`108`		`- return new Client([`
`109`		`- 'base_uri' => $http->getConfig('base_uri'),`
`110`		`- 'http_errors' => true,`
`111`		`- 'verify' => $http->getConfig('verify'),`
`112`		`- 'proxy' => $http->getConfig('proxy'),`
`113`		`- ]);`
	`108`	`+ return new Client(['http_errors' => true] + $http->getConfig());`
`114`	`109`	`}`
`115`	`110`	`}`