feat: implement config for newClient

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>

Author: SMillerDev

lib/private/Http/Client/ClientService.php

@@ -39,7 +39,7 @@ public function __construct(
 	) {
 	}
 
-	public function newClient(): IClient {
+	public function newClient(array $baseConfig = []): IClient {
 		$handler = new CurlHandler();
 		$stack = HandlerStack::create($handler);
 		if ($this->config->getSystemValueBool('dns_pinning', true)) {
@@ -51,7 +51,8 @@ public function newClient(): IClient {
 			$this->eventLogger->end('http:request');
 		}), 'event logger');
 
-		$client = new GuzzleClient(['handler' => $stack]);
+		$config = array_merge($baseConfig, ['handler' => $stack]);
+		$client = new GuzzleClient($config);
 
 		return new Client(
 			$this->config,

lib/public/Http/Client/IClientService.php

@@ -14,10 +14,11 @@
  * @since 8.1.0
  */
 interface IClientService {
-   /**
-    * @param array $baseConfig default configuration for the client
-	* @return IClient
-	* @since 8.1.0
-	*/
+
+	/**
+	 * @param array $baseConfig default configuration for the client
+	 * @return IClient
+	 * @since 8.1.0
+	 */
 	public function newClient(array $baseConfig = []): IClient;
 }

tests/lib/Http/Client/ClientServiceTest.php

@@ -81,6 +81,58 @@ public function testNewClient(): void {
 		);
 	}
 
+	public function testNewClientWithConfig(): void {
+		/** @var IConfig $config */
+		$config = $this->createMock(IConfig::class);
+		$config->method('getSystemValueBool')
+			->with('dns_pinning', true)
+			->willReturn(true);
+		/** @var ICertificateManager $certificateManager */
+		$certificateManager = $this->createMock(ICertificateManager::class);
+		$dnsPinMiddleware = $this->createMock(DnsPinMiddleware::class);
+		$dnsPinMiddleware
+			->expects($this->atLeastOnce())
+			->method('addDnsPinning')
+			->willReturn(function (): void {
+			});
+		$remoteHostValidator = $this->createMock(IRemoteHostValidator::class);
+		$eventLogger = $this->createMock(IEventLogger::class);
+		$logger = $this->createMock(LoggerInterface::class);
+		$serverVersion = $this->createMock(ServerVersion::class);
+
+		$clientService = new ClientService(
+			$config,
+			$certificateManager,
+			$dnsPinMiddleware,
+			$remoteHostValidator,
+			$eventLogger,
+			$logger,
+			$serverVersion,
+		);
+
+		$handler = new CurlHandler();
+		$stack = HandlerStack::create($handler);
+		$stack->push($dnsPinMiddleware->addDnsPinning());
+		$stack->push(Middleware::tap(function (RequestInterface $request) use ($eventLogger): void {
+			$eventLogger->start('http:request', $request->getMethod() . ' request to ' . $request->getRequestTarget());
+		}, function () use ($eventLogger): void {
+			$eventLogger->end('http:request');
+		}), 'event logger');
+		$guzzleClient = new GuzzleClient(['handler' => $stack, 'timeout' => 2.0]);
+
+		$this->assertEquals(
+			new Client(
+				$config,
+				$certificateManager,
+				$guzzleClient,
+				$remoteHostValidator,
+				$logger,
+				$serverVersion,
+			),
+			$clientService->newClient(['timeout' => 2.0])
+		);
+	}
+
 	public function testDisableDnsPinning(): void {
 		/** @var IConfig $config */
 		$config = $this->createMock(IConfig::class);