Set content type appropriately for downloads

Author: Brent Engelbrecht

src/routes/files.js

@@ -3,11 +3,7 @@ const fileService = require('../services/fileService')
 async function upload (ctx) {
   const fileToUpload = ctx.request.files.file
   const currentUser = ctx.request.jwtPayload.sub
-  const { key, url } = await fileService.uploadFile({
-      fileName: fileToUpload.name,
-      filePath: fileToUpload.path,
-      fileType: fileToUpload.type
-  })
+  const { key, url } = await fileService.uploadFile(fileToUpload)
   await fileService.setTags(key, [{ Key: 'username', Value: `${currentUser}` }])
   ctx.body = { key, url }
 }
@@ -21,6 +17,7 @@ async function download (ctx) {
   }
 
   const fileData = await fileService.downloadFile(fileToDownload)
+  ctx.set('Content-Type', fileData.ContentType)
   ctx.body = fileData.Body
 }
 

src/services/fileService.js

@@ -49,19 +49,19 @@ const getTags = async key => {
   })
 }
 
-const uploadFile = async ({ fileName, filePath, fileType }) => {
+const uploadFile = async (fileObject) => {
   return new Promise((resolve, reject) => {
     getS3Ref()
-    const stream = fs.createReadStream(filePath)
+    const stream = fs.createReadStream(fileObject.path)
     stream.on('error', err => {
         reject(err)
     })
 
     s3.upload({
       Bucket: process.env.BUCKET,
       Body: stream,
-      Key: fileName, 
-      ContentType: fileType
+      Key: fileObject.name, 
+      ContentType: fileObject.type
     },
     (err, data) => {
       if (err) {