Only use auth headers or cookies

Signed-off-by: Julius Härtl <jus@bitgrid.net>

build/integration/features/bootstrap/Auth.php

@@ -66,7 +66,7 @@ private function sendRequest($url, $method, $authHeader = null, $useCookies = fa
 			} else {
 				$options = [];
 			}
-			if ($authHeader) {
+			if ($authHeader && !$useCookies) {
 				$options['headers'] = [
 					'Authorization' => $authHeader
 				];
@@ -111,6 +111,11 @@ private function createClientToken($loginViaWeb = true) {
 			'cookies' => $this->cookieJar,
 		];
 
+		if ($loginViaWeb) {
+			// Session cookies are used instead
+			unset($options['auth']);
+		}
+
 		try {
 			$this->response = $client->request('POST', $fullUrl, $options);
 		} catch (\GuzzleHttp\Exception\ServerException $e) {
@@ -138,7 +143,6 @@ public function aNewRestrictedClientTokenIsAdded() {
 					'filesystem' => false,
 				],
 			],
-			'cookies' => $this->cookieJar,
 		];
 		$this->response = $client->request('PUT', $fullUrl, $options);
 		$this->restrictedClientToken = $tokenObj->token;