Added possibility to alter headers for Asset Service.

DivanteLtd · May 7, 2020 · 13fdf5d · 13fdf5d
1 parent f8dbda2
commit 13fdf5d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/src/PimcoreDevkitBundle/Service/AssetService.php b/src/PimcoreDevkitBundle/Service/AssetService.php
@@ -26,7 +26,7 @@
  */
 class AssetService
 {
-    private const DEFAULT_FILE_TYPE = 'txt';
+    public const DEFAULT_FILE_TYPE = 'txt';
 
     /** @var ClientInterface */
     protected $httpClient;
@@ -78,28 +78,39 @@ protected function getHttpClient(): ClientInterface
         return $this->httpClient;
     }
 
+    /**
+     * @param ClientInterface $httpClient
+     */
+    public function setHttpClient(ClientInterface $httpClient): void
+    {
+        $this->httpClient = $httpClient;
+    }
+
     /**
      * @param string $url
      * @param Folder $targetFolder
      * @param null $filename
      * @param string $defaultFileType
+     * @param array $headers Headers to append
      * @return HttpAssetInterface
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function prepareHttpAsset(
         string $url,
         Folder $targetFolder,
         $filename = null,
-        string $defaultFileType = self::DEFAULT_FILE_TYPE
+        string $defaultFileType = self::DEFAULT_FILE_TYPE,
+        array  $headers = []
     ): HttpAssetInterface {
-        return new HttpAsset($this->getHttpClient(), $url, $targetFolder, $filename, $defaultFileType);
+        return new HttpAsset($this->getHttpClient(), $url, $targetFolder, $filename, $defaultFileType, $headers);
     }
 
     /**
      * @param string $url
      * @param Folder $targetFolder
      * @param null $filename
      * @param string $defaultFileType
+     * @param array $headers Headers to append
      * @return Asset
      * @throws \GuzzleHttp\Exception\GuzzleException
      * @throws \Exception
@@ -108,9 +119,10 @@ public function getHttpAsset(
         string $url,
         Folder $targetFolder,
         $filename = null,
-        string $defaultFileType = self::DEFAULT_FILE_TYPE
+        string $defaultFileType = self::DEFAULT_FILE_TYPE,
+        array  $headers = []
     ): Asset {
-        $httpAsset = $this->prepareHttpAsset($url, $targetFolder, $filename, $defaultFileType);
+        $httpAsset = $this->prepareHttpAsset($url, $targetFolder, $filename, $defaultFileType, $headers);
 
         return $httpAsset->getAsset();
     }

diff --git a/src/PimcoreDevkitBundle/Wrapper/HttpAsset.php b/src/PimcoreDevkitBundle/Wrapper/HttpAsset.php
@@ -64,9 +64,10 @@ public function __construct(
         string $url,
         Folder $targetFolder,
         string $filename = null,
-        string $defaultFileType = 'txt'
+        string $defaultFileType = 'txt',
+        array  $headers = []
     ) {
-        $this->response = $httpClient->request('GET', $url, ['timeout' => 5, 'connect_timeout' => 2]);
+        $this->response = $httpClient->request('GET', $url, ['headers' => $headers, 'connect_timeout' => 1]);
         $statusCode = $this->response->getStatusCode();
 
         if ($statusCode != 200) {