Only use auth headers or cookies

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Aug 17, 2021 · bdaa565 · bdaa565
1 parent 77aee15
commit bdaa565
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/build/integration/features/bootstrap/Auth.php b/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;