3 files changed, 17 insertions, 3 deletions
diff --git a/lib/config/environment.js b/lib/config/environment.js
index 2d0b520a..ddc09e10 100644
--- a/lib/config/environment.js
+++ b/lib/config/environment.js
@@ -1,11 +1,11 @@
 'use strict'
 
-const {toBooleanConfig, toArrayConfig} = require('./utils')
+const {toBooleanConfig, toArrayConfig, toIntegerConfig} = require('./utils')
 
 module.exports = {
   domain: process.env.HMD_DOMAIN,
   urlpath: process.env.HMD_URL_PATH,
-  port: process.env.HMD_PORT,
+  port: toIntegerConfig(process.env.HMD_PORT),
   urladdport: toBooleanConfig(process.env.HMD_URL_ADDPORT),
   usessl: toBooleanConfig(process.env.HMD_USESSL),
   hsts: {
@@ -40,7 +40,7 @@ module.exports = {
     secretKey: process.env.HMD_MINIO_SECRET_KEY,
     endPoint: process.env.HMD_MINIO_ENDPOINT,
     secure: toBooleanConfig(process.env.HMD_MINIO_SECURE),
-    port: parseInt(process.env.HMD_MINIO_PORT)
+    port: toIntegerConfig(process.env.HMD_MINIO_PORT)
   },
   s3bucket: process.env.HMD_S3_BUCKET,
   facebook: {
diff --git a/lib/config/index.js b/lib/config/index.js
index 0051e485..abcd2b3e 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -6,6 +6,7 @@ const path = require('path')
 const {merge} = require('lodash')
 const deepFreeze = require('deep-freeze')
 const {Environment, Permission} = require('./enum')
+const logger = require('../logger')
 
 const appRootPath = path.join(__dirname, '../../')
 const env = process.env.NODE_ENV || Environment.development
@@ -103,6 +104,12 @@ if (config.imageUploadType && !config.imageuploadtype) {
   config.imageuploadtype = config.imageUploadType
 }
 
+// Validate upload upload providers
+if (['filesystem', 's3', 'minio', 'imgur'].indexOf(config.imageuploadtype) === -1) {
+  logger.error('"imageuploadtype" is not correctly set. Please use "filesystem", "s3", "minio" or "imgur". Defaulting to "imgur"')
+  config.imageuploadtype = 'imgur'
+}
+
 // figure out mime types for image uploads
 switch (config.imageuploadtype) {
   case 'imgur':
diff --git a/lib/config/utils.js b/lib/config/utils.js
index 9ff2f96d..b2406cf1 100644
--- a/lib/config/utils.js
+++ b/lib/config/utils.js
@@ -13,3 +13,10 @@ exports.toArrayConfig = function toArrayConfig (configValue, separator = ',', fa
   }
   return fallback
 }
+
+exports.toIntegerConfig = function toIntegerConfig (configValue) {
+  if (configValue && typeof configValue === 'string') {
+    return parseInt(configValue)
+  }
+  return configValue
+}