fix(2889): allow to get mime type directly by adding raw flag (#140)

screwdriver-cd · Jun 15, 2023 · b6965be · b6965be
1 parent f44cb72
commit b6965be
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/helpers/mime.js b/helpers/mime.js
@@ -32,11 +32,16 @@ const KNOWN_FILE_EXTS_IN_TEXT_FORMAT = [
 /**
  * Get MIME types from file name and file extension
  * @method getMimeFromFileName
- * @param  {String} fileExtension  File extension (e.g. css, txt, html)
- * @param  {String} fileName       File name      (e.g. dockerfile, main)
- * @return {String} MIME Type      eg. text/html, text/plain
+ * @param  {String}  fileExtension  File extension (e.g. css, txt, html)
+ * @param  {String}  fileName       File name      (e.g. dockerfile, main)
+ * @param  {Boolean} raw            raw data type  (e.g. application/javascript instead of text/javascript)
+ * @return {String}  MIME Type      eg. text/html, text/plain
  */
-function getMimeFromFileName(fileExtension, fileName = '') {
+function getMimeFromFileName(fileExtension, fileName = '', raw = false) {
+    if (raw === true) {
+        return mime.lookup(fileExtension) || '';
+    }
+
     if (fileName.toLowerCase().endsWith('file')) {
         return 'text/plain';
     }

diff --git a/plugins/builds.js b/plugins/builds.js
@@ -101,6 +101,16 @@ exports.plugin = {
 
                         response.headers['content-type'] = mime;
 
+                        if (!displayableMimes.includes(mime)) {
+                            response.headers['content-disposition'] = `inline; filename="${encodeURI(fileName)}"`;
+                        }
+                    } else {
+                        const fileExt = fileName.split('.').pop();
+                        const raw = true;
+                        const mime = getMimeFromFileName(fileExt, fileName, raw);
+
+                        response.headers['content-type'] = mime;
+
                         if (!displayableMimes.includes(mime)) {
                             response.headers['content-disposition'] = `inline; filename="${encodeURI(fileName)}"`;
                         }

diff --git a/test/plugins/builds.test.js b/test/plugins/builds.test.js
@@ -308,7 +308,7 @@ describe('builds plugin test', () => {
 
             assert.equal(getResponse.statusCode, 200);
             assert.equal(getResponse.headers['x-foo'], 'bar');
-            assert.equal(getResponse.headers['content-type'], 'application/x-ndjson');
+            assert.equal(getResponse.headers['content-type'], 'application/octet-stream');
             assert.isNotOk(getResponse.headers.ignore);
             assert.equal(getResponse.result, 'THIS IS A TEST');
 
@@ -330,7 +330,7 @@ describe('builds plugin test', () => {
         it('saves an artifact of Japanese filename', async () => {
             options.url = `/builds/${mockBuildID}/日本語.txt`;
 
-            options.headers['content-type'] = 'application/x-ndjson';
+            options.headers['content-type'] = 'text/plain; charset=utf-8';
             const putResponse = await server.inject(options);
 
             assert.equal(putResponse.statusCode, 202);
@@ -348,7 +348,7 @@ describe('builds plugin test', () => {
 
             assert.equal(getResponse.statusCode, 200);
             assert.equal(getResponse.headers['x-foo'], 'bar');
-            assert.equal(getResponse.headers['content-type'], 'application/x-ndjson');
+            assert.equal(getResponse.headers['content-type'], 'text/plain; charset=utf-8');
             assert.isNotOk(getResponse.headers.ignore);
             assert.equal(getResponse.result, 'THIS IS A TEST');