Skip to content

Commit 4f64911

Browse files
committed
#AC-8887::CNS WebAPI Broken and Failed Integration tests 2.4.7-beta1-develop S3-mimetype changes for media API
1 parent 7c7461a commit 4f64911

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace Magento\Catalog\Model\Product\Gallery;
88

9+
use Magento\AwsS3\Driver\AwsS3;
910
use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
1011
use Magento\Catalog\Api\Data\ProductInterfaceFactory;
1112
use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -287,10 +288,18 @@ private function getImageContent($product, $entry): ImageContentInterface
287288
$mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
288289
$path = $mediaDirectory->getAbsolutePath($product->getMediaConfig()->getMediaPath($entry->getFile()));
289290
$fileName = $this->file->getPathInfo($path)['basename'];
290-
$imageFileContent = $mediaDirectory->getDriver()->fileGetContents($path);
291+
$fileDriver = $mediaDirectory->getDriver();
292+
$imageFileContent = $fileDriver->fileGetContents($path);
293+
294+
if ($fileDriver instanceof AwsS3) {
295+
$remoteMediaMimeType = $fileDriver->getMetadata($path);
296+
$mediaMimeType = $remoteMediaMimeType['mimetype'];
297+
} else {
298+
$mediaMimeType = $this->mime->getMimeType($path);
299+
}
291300
return $this->imageContentInterface->create()
292301
->setName($fileName)
293302
->setBase64EncodedData(base64_encode($imageFileContent))
294-
->setType($this->mime->getMimeType($path));
303+
->setType($mediaMimeType);
295304
}
296305
}

app/code/Magento/Catalog/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
"magento/module-ui": "*",
3232
"magento/module-url-rewrite": "*",
3333
"magento/module-widget": "*",
34-
"magento/module-wishlist": "*"
34+
"magento/module-wishlist": "*",
35+
"magento/module-aws-s3": "*"
3536
},
3637
"suggest": {
3738
"magento/module-cookie": "*",

0 commit comments

Comments
 (0)