Remove Baikal 0.9.1, there are open issues in the docker image

ckulka/baikal-docker#52
mstilkerich · Jan 14, 2022 · 4504a61 · 4504a61
1 parent 47ece3e
commit 4504a61
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -293,7 +293,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        baikal-version: ['experimental', 0.8.0', '0.7.2']
+        baikal-version: ['0.8.0', '0.7.2']
     runs-on: ubuntu-20.04
 
     env:

diff --git a/tests/interop/AccountData.php.dist b/tests/interop/AccountData.php.dist
@@ -57,6 +57,8 @@ final class AccountData
             "password" => "ncadmPassw0rd",
             "discoveryUri" => "http://localhost:8080/remote.php/dav/",
             "syncAllowExtraChanges" => false,
+            // Nextcloud 21 (oldest still supported) uses Sabre 4.1.4 which still contains the reported issues, so we
+            // need to exclude some tests until 21 is EOL
             "featureSet" => TestInfrastructureSrv::SRVFEATS_SABRE,
         ],
         "Radicale" => [

diff --git a/tests/interop/TestInfrastructureSrv.php b/tests/interop/TestInfrastructureSrv.php
@@ -195,6 +195,8 @@ public static function makeCredentials(array $cfg): array
             && isset($cfg['clientId'])
             && isset($cfg['clientSecret'])
         ) {
+            // Fetch an access token using the available refresh token
+            $client = new \GuzzleHttp\Client();
             $postData = [
                 'grant_type' => 'refresh_token',
                 'refresh_token' => self::replaceEnvVar($cfg['refreshtoken']),
@@ -206,22 +208,13 @@ public static function makeCredentials(array $cfg): array
                 $postData['scope'] = $cfg['oAuthScopes'];
             }
 
-            $options = array(
-                'http' => array(
-                    'header'  => "Content-type: application/x-www-form-urlencoded\r\n",
-                    'method'  => 'POST',
-                    'content' => http_build_query($postData)
-                )
-            );
-            $context  = stream_context_create($options);
-            $result = file_get_contents($cfg['tokenUri'], false, $context);
-
-            if (is_string($result)) {
-                /** @var array | false */
-                $json = json_decode($result, true);
-                if (isset($json["access_token"]) && is_string($json["access_token"])) {
-                    $cred["bearertoken"] = $json["access_token"];
-                }
+            $response = $client->request('POST', $cfg['tokenUri'], ['form_params' => $postData]);
+            $body = (string) $response->getBody();
+
+            /** @var array | false */
+            $json = json_decode($body, true);
+            if (isset($json["access_token"]) && is_string($json["access_token"])) {
+                $cred["bearertoken"] = $json["access_token"];
             }
         }