Fix unauthorised access to check the version as for aux object, (#29)

* fix unauthorized access to check the version as for aux object, fixes #28 * checker and tests improvements
elan-ev · Sep 20, 2024 · 1ad2ce3 · 1ad2ce3
1 parent 34dee9a
commit 1ad2ce3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/src/OpencastApi/Rest/OcRestClient.php b/src/OpencastApi/Rest/OcRestClient.php
@@ -161,7 +161,11 @@ public function hasVersion($version)
                 // We have to use an aux object, in order to prevent overwriting arguments of current object.
                 $aux = clone $this;
                 $aux->enableNoHeader();
-                $defaultVersion = $aux->performGet('/api/version/default');
+                $options = [];
+                if (!empty($this->username) && !empty($this->password)) {
+                    $options['auth'] = [$this->username, $this->password];
+                }
+                $defaultVersion = $aux->performGet('/api/version/default', $options);
                 if (!empty($defaultVersion['body']) && isset($defaultVersion['body']->default)) {
                     $this->setVersion(str_replace(['application/', 'v', '+json'], ['', '', ''], $defaultVersion['body']->default));
                 } else {

diff --git a/tests/DataProvider/SetupDataProvider.php b/tests/DataProvider/SetupDataProvider.php
@@ -27,15 +27,23 @@ public static function getConfig($version = ''): array
         return $config;
     }
 
-    public static function getMockResponses($fileName): array
+    public static function getMockResponses($data): array
     {
+        $responseNames = [];
+        if (!is_array($data)) {
+            $responseNames[] = $data;
+        } else {
+            $responseNames = $data;
+        }
         $mockResponse = [];
         $mockResponsesDir = __DIR__ . "/mock_responses";
-        $fileFullName = basename($fileName, ".json") . '.json';
-        $filePath = $mockResponsesDir . "/" . $fileFullName;
-        if (file_exists($filePath)) {
-            $responseStr = file_get_contents($filePath);
-            $mockResponse = json_decode($responseStr, true);
+        foreach ($responseNames as $fileName) {
+            $fileFullName = basename($fileName, ".json") . '.json';
+            $filePath = $mockResponsesDir . "/" . $fileFullName;
+            if (file_exists($filePath)) {
+                $responseStr = file_get_contents($filePath);
+                $mockResponse = array_merge($mockResponse, json_decode($responseStr, true));
+            }
         }
         return $mockResponse !== false ? $mockResponse : [];
     }

diff --git a/tests/UnitMock/OcEventsApiTestMock.php b/tests/UnitMock/OcEventsApiTestMock.php
@@ -12,7 +12,7 @@ class OcEventsApiTestMock extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $mockResponse = \Tests\DataProvider\SetupDataProvider::getMockResponses('api_events');
+        $mockResponse = \Tests\DataProvider\SetupDataProvider::getMockResponses(['api_events', 'api_base']);
         if (empty($mockResponse)) {
             $this->markTestIncomplete('No mock responses for events api could be found!');
         }