Merge branch '2.3-develop#710' of github.com:XxXgeoXxX/graphql-ce into 2.3-develop#710

Author: lenaorobei

app/code/Magento/DownloadableGraphQl/Model/Resolver/Product/DownloadableOptions.php

@@ -19,6 +19,8 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\EnumLookup;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\UrlInterface;
 
 /**
  * @inheritdoc
@@ -47,22 +49,30 @@ class DownloadableOptions implements ResolverInterface
      */
     private $linkCollection;
 
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
     /**
      * @param EnumLookup $enumLookup
      * @param DownloadableHelper $downloadableHelper
      * @param SampleCollection $sampleCollection
      * @param LinkCollection $linkCollection
+     * @param UrlInterface|null $urlBuilder
      */
     public function __construct(
         EnumLookup $enumLookup,
         DownloadableHelper $downloadableHelper,
         SampleCollection $sampleCollection,
-        LinkCollection $linkCollection
+        LinkCollection $linkCollection,
+        UrlInterface $urlBuilder = null
     ) {
         $this->enumLookup = $enumLookup;
         $this->downloadableHelper = $downloadableHelper;
         $this->sampleCollection = $sampleCollection;
         $this->linkCollection = $linkCollection;
+        $this->urlBuilder = $urlBuilder ?: ObjectManager::getInstance()->get(UrlInterface::class);
     }
 
     /**
@@ -165,7 +175,7 @@ private function formatSamples(Collection $samples) : array
             $resultData[$sampleKey]['sort_order'] = $sample->getSortOrder();
             $resultData[$sampleKey]['sample_type']
                 = $this->enumLookup->getEnumValueFromField('DownloadableFileTypeEnum', $sample->getSampleType());
-            $resultData[$sampleKey]['sample_file'] = $sample->getSampleFile();
+            $resultData[$sampleKey]['sample_file'] = $this->urlBuilder->getUrl('downloadable/download/sample', ['sample_id' => $sample->getId()]);
             $resultData[$sampleKey]['sample_url'] = $sample->getSampleUrl();
         }
         return $resultData;