Merge pull request #1328 from dasgarner/develop

Prepare for 3.1.0-beta release. Update swagger.
xibosignage · Feb 8, 2022 · 6f53890 · 6f53890
2 parents 13ac3d5 + db41100
commit 6f53890
Show file tree

Hide file tree

Showing 4 changed files with 453 additions and 7 deletions.
diff --git a/lib/Connector/ConnectorTrait.php b/lib/Connector/ConnectorTrait.php
@@ -120,6 +120,10 @@ public function useHttpOptions($options): ConnectorInterface
         return $this;
     }
 
+    /**
+     * Get an HTTP client with the default proxy settings, etc
+     * @return \GuzzleHttp\Client
+     */
     public function getClient(): Client
     {
         return new Client($this->httpOptions);

diff --git a/lib/Connector/PixabayConnector.php b/lib/Connector/PixabayConnector.php
@@ -23,7 +23,6 @@
 namespace Xibo\Connector;
 
 use Carbon\Carbon;
-use GuzzleHttp\Client;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Xibo\Entity\SearchResult;
 use Xibo\Event\LibraryProviderEvent;
@@ -84,6 +83,12 @@ public function onLibraryProvider(LibraryProviderEvent $event)
     {
         $this->getLogger()->debug('onLibraryProvider');
 
+        // Do we have an alternative URL (we may proxy requests for cache)
+        $baseUrl = $this->getSetting('baseUrl');
+        if (empty($baseUrl)) {
+            $baseUrl = 'https://pixabay.com/api/';
+        }
+
         // Do we have an API key?
         $apiKey = $this->getSetting('apiKey');
         if (empty($apiKey)) {
@@ -138,9 +143,7 @@ public function onLibraryProvider(LibraryProviderEvent $event)
             $this->getLogger()->debug('onLibraryProvider: cache miss, generating.');
 
             // Make the request
-            $client = new Client();
-            $uri = $type === 'video' ? 'https://pixabay.com/api/videos' : 'https://pixabay.com/api/';
-            $request = $client->request('GET', $uri, [
+            $request = $this->getClient()->request('GET', $baseUrl . ($type === 'video' ? 'videos' : ''), [
                 'query' => $query
             ]);
 

diff --git a/lib/Connector/XiboExchangeConnector.php b/lib/Connector/XiboExchangeConnector.php
@@ -101,8 +101,7 @@ public function onTemplateProvider(TemplateProviderEvent $event)
             $this->getLogger()->debug('onTemplateProvider: cache miss, generating.');
 
             // Make the request
-            $client = new Client();
-            $request = $client->request('GET', $uri);
+            $request = $this->getClient()->request('GET', $uri);
 
             $body = $request->getBody()->getContents();
             if (empty($body)) {