From 0c619fee91ac5b7dbacf60244c9f6fec6ed62ba7 Mon Sep 17 00:00:00 2001
From: Raccoon Li <a60814billy@gmail.com>
Date: Mon, 8 May 2017 20:41:38 +0800
Subject: [PATCH] fix(config): ssl environment configs not parse properly

---
 lib/config/environment.js    | 15 +++++++++------
 lib/config/oldEnvironment.js |  4 +++-
 lib/config/utils.js          |  8 ++++++++
 3 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 lib/config/utils.js

diff --git a/lib/config/environment.js b/lib/config/environment.js
index cd0c009..75381ff 100644
--- a/lib/config/environment.js
+++ b/lib/config/environment.js
@@ -1,15 +1,18 @@
 'use strict'
 
+const {toBooleanConfig} = require('./utils')
+
 module.exports = {
   domain: process.env.HMD_DOMAIN,
   urlpath: process.env.HMD_URL_PATH,
   port: process.env.HMD_PORT,
   urladdport: process.env.HMD_URL_ADDPORT,
-  usessl: (process.env.HMD_PROTOCOL_USESSL === 'true'),
+  usessl: toBooleanConfig(process.env.HMD_USESSL),
+  protocolusessl: toBooleanConfig(process.env.HMD_PROTOCOL_USESSL),
   alloworigin: process.env.HMD_ALLOW_ORIGIN ? process.env.HMD_ALLOW_ORIGIN.split(',') : undefined,
-  usecdn: (process.env.HMD_USECDN === 'true'),
-  allowanonymous: (process.env.HMD_ALLOW_ANONYMOUS === 'true'),
-  allowfreeurl: (process.env.HMD_ALLOW_FREEURL === 'true'),
+  usecdn: toBooleanConfig(process.env.HMD_USECDN),
+  allowanonymous: toBooleanConfig(process.env.HMD_ALLOW_ANONYMOUS),
+  allowfreeurl: toBooleanConfig(process.env.HMD_ALLOW_FREEURL),
   defaultpermission: process.env.HMD_DEFAULT_PERMISSION,
   dburl: process.env.HMD_DB_URL,
   imageUploadType: process.env.HMD_IMAGE_UPLOAD_TYPE,
@@ -59,6 +62,6 @@ module.exports = {
     searchAttributes: process.env.HMD_LDAP_SEARCHATTRIBUTES,
     tlsca: process.env.HMD_LDAP_TLS_CA
   },
-  email: (process.env.HMD_EMAIL === 'true'),
-  allowemailregister: (process.env.HMD_ALLOW_EMAIL_REGISTER === 'true')
+  email: toBooleanConfig(process.env.HMD_EMAIL),
+  allowemailregister: toBooleanConfig(process.env.HMD_ALLOW_EMAIL_REGISTER)
 }
diff --git a/lib/config/oldEnvironment.js b/lib/config/oldEnvironment.js
index 67e70ff..a3b13cb 100644
--- a/lib/config/oldEnvironment.js
+++ b/lib/config/oldEnvironment.js
@@ -1,7 +1,9 @@
 'use strict'
 
+const {toBooleanConfig} = require('./utils')
+
 module.exports = {
-  debug: (process.env.DEBUG === 'true'),
+  debug: toBooleanConfig(process.env.DEBUG),
   dburl: process.env.DATABASE_URL,
   urlpath: process.env.URL_PATH,
   port: process.env.PORT
diff --git a/lib/config/utils.js b/lib/config/utils.js
new file mode 100644
index 0000000..11bbd8c
--- /dev/null
+++ b/lib/config/utils.js
@@ -0,0 +1,8 @@
+'use strict'
+
+exports.toBooleanConfig = function toBooleanConfig (configValue) {
+  if (configValue && typeof configValue === 'string') {
+    return (configValue === 'true')
+  }
+  return configValue
+}