Merge pull request #1762 from blademainer/develop

fixes #1761

Author: jackycute

lib/imageRouter/s3.js

@@ -48,13 +48,16 @@ exports.uploadImage = function (imagePath, callback) {
     const command = new PutObjectCommand(params)
 
     s3.send(command).then(data => {
-      let s3Endpoint = 's3.amazonaws.com'
+      // default scheme settings to https
+      let s3Endpoint = 'https://s3.amazonaws.com'
+      if (config.s3.region && config.s3.region !== 'us-east-1') {
+        s3Endpoint = `s3-${config.s3.region}.amazonaws.com`
+      }
+      // rewrite endpoint from config
       if (config.s3.endpoint) {
         s3Endpoint = config.s3.endpoint
-      } else if (config.s3.region && config.s3.region !== 'us-east-1') {
-        s3Endpoint = `s3-${config.s3.region}.amazonaws.com`
       }
-      callback(null, `https://${s3Endpoint}/${config.s3bucket}/${params.Key}`)
+      callback(null, `${s3Endpoint}/${config.s3bucket}/${params.Key}`)
     }).catch(err => {
       if (err) {
         callback(new Error(err), null)