ACP2E-1627: [Cloud] Magento Product Recommendation/Data Services Causing File Download Warning

Author: bubasuma

lib/internal/Magento/Framework/App/Response/File.php

@@ -54,6 +54,8 @@ class File extends Http implements NotCacheableInterface
         'contentLength' => null,
         // Whether to remove the file after it is sent to the client
         'remove' => false,
+        // Whether to send the file as attachment
+        'attachment' => true
     ];
 
     /**
@@ -116,13 +118,15 @@ public function sendResponse()
         }
 
         $this->response->setHttpResponseCode(200);
-        $this->response->setHeader('Content-Type', $this->options['contentType'], $forceHeaders)
-            ->setHeader('Content-Length', $this->options['contentLength'], $forceHeaders)
-            ->setHeader(
+        if ($this->options['attachment']) {
+            $this->response->setHeader(
                 'Content-Disposition',
                 'attachment; filename="' . $this->options['fileName'] . '"',
                 $forceHeaders
-            )
+            );
+        }
+        $this->response->setHeader('Content-Type', $this->options['contentType'], $forceHeaders)
+            ->setHeader('Content-Length', $this->options['contentLength'], $forceHeaders)
             ->setHeader('Pragma', 'public', $forceHeaders)
             ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0', $forceHeaders)
             ->setHeader('Last-Modified', date('r'), $forceHeaders);
@@ -225,6 +229,7 @@ private function sendFileContent(): void
      */
     private function afterFileIsSent(): void
     {
+        $this->response->clearBody();
         if ($this->options['remove']) {
             $dir = $this->filesystem->getDirectoryWrite($this->options['directoryCode']);
             $dir->delete($this->options['filePath']);

lib/internal/Magento/Framework/App/Test/Unit/Response/FileTest.php

@@ -180,9 +180,9 @@ public function testSendResponseWithFilePath(): void
         $this->responseMock->expects($this->exactly(6))
             ->method('setHeader')
             ->withConsecutive(
+                ['Content-Disposition', 'attachment; filename="' . $fileName . '"', true],
                 ['Content-Type', $fileMimetype, true],
                 ['Content-Length', $fileSize, true],
-                ['Content-Disposition', 'attachment; filename="' . $fileName . '"', true],
                 ['Pragma', 'public', true],
                 ['Cache-Control', 'must-revalidate, post-check=0, pre-check=0', true],
                 [
@@ -255,9 +255,9 @@ public function testSendResponseWithRemoveOption(): void
         $this->responseMock->expects($this->exactly(6))
             ->method('setHeader')
             ->withConsecutive(
+                ['Content-Disposition', 'attachment; filename="' . $fileName . '"', true],
                 ['Content-Type', $fileMimetype, true],
                 ['Content-Length', $fileSize, true],
-                ['Content-Disposition', 'attachment; filename="' . $fileName . '"', true],
                 ['Pragma', 'public', true],
                 ['Cache-Control', 'must-revalidate, post-check=0, pre-check=0', true],
                 [
@@ -283,9 +283,9 @@ public function testSendResponseWithRawContent(): void
         $this->responseMock->expects($this->exactly(6))
             ->method('setHeader')
             ->withConsecutive(
+                ['Content-Disposition', 'attachment; filename="' . $fileName . '"', false],
                 ['Content-Type', $fileMimetype, false],
                 ['Content-Length', $fileSize, false],
-                ['Content-Disposition', 'attachment; filename="' . $fileName . '"', false],
                 ['Pragma', 'public', false],
                 ['Cache-Control', 'must-revalidate, post-check=0, pre-check=0', false],
                 [