summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYukai Huang2017-01-15 11:58:00 +0800
committerYukai Huang2017-01-15 11:58:00 +0800
commita9a38c3d75b1cf467bb3b4484abfc09dcbcea107 (patch)
tree95f7c973e4ece5072cd07fce03cadcac2ff61e16
parent75e28a1d5e0476d73b59b2255aec2b7e6d0a6cdc (diff)
Recover config change in 0f833f0
-rw-r--r--lib/config.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/config.js b/lib/config.js
index 84f6b3d7..3816017e 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -90,11 +90,11 @@ var gitlab = (process.env.HMD_GITLAB_CLIENTID && process.env.HMD_GITLAB_CLIENTSE
var dropbox = (process.env.HMD_DROPBOX_CLIENTID && process.env.HMD_DROPBOX_CLIENTSECRET) ? {
clientID: process.env.HMD_DROPBOX_CLIENTID,
clientSecret: process.env.HMD_DROPBOX_CLIENTSECRET
-} : (config.dropbox && config.dropbox.clientID && config.dropbox.clientSecret) || false;
+} : (config.dropbox && config.dropbox.clientID && config.dropbox.clientSecret && config.dropbox) || false;
var google = (process.env.HMD_GOOGLE_CLIENTID && process.env.HMD_GOOGLE_CLIENTSECRET) ? {
clientID: process.env.HMD_GOOGLE_CLIENTID,
clientSecret: process.env.HMD_GOOGLE_CLIENTSECRET
-} : (config.google && config.google.clientID && config.google.clientSecret) || false;
+} : (config.google && config.google.clientID && config.google.clientSecret && config.google) || false;
var ldap = config.ldap || (
process.env.HMD_LDAP_URL ||
process.env.HMD_LDAP_BINDDN ||