2 files changed, 23 insertions, 0 deletions
diff --git a/app.js b/app.js
index 677d3fa5..91e17ad8 100644
--- a/app.js
+++ b/app.js
@@ -548,6 +548,9 @@ app.post('/uploadimage', function (req, res) {
                 Body: buffer
               }
 
+              var mimeType = getImageMimeType(files.image.path)
+              if (mimeType) { params.ContentType = mimeType }
+
               s3.putObject(params, function (err, data) {
                 if (err) {
                   logger.error(err)
diff --git a/lib/utils.js b/lib/utils.js
index 6c36549b..52541667 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -3,3 +3,23 @@
 exports.isSQLite = function isSQLite (sequelize) {
   return sequelize.options.dialect === 'sqlite'
 }
+
+exports.getImageMimeType = function getImageMimeType (imagePath) {
+  var fileExtension = /[^.]+$/.exec(imagePath)
+
+  switch (fileExtension[0]) {
+    case "bmp":
+      return "image/bmp"
+    case "gif":
+      return "image/gif"
+    case "jpg":
+    case "jpeg":
+      return "image/jpeg"
+    case "png":
+      return "image/png"
+    case "tiff":
+      return "image/tiff"
+    default:
+      return undefined
+  }
+}