IGNITE-9941 Fixed parsing of boolean parameters returned from nconf.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1502494b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1502494b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1502494b Branch: refs/heads/ignite-10044 Commit: 1502494bca6e6d3059878949f23cae03b947eb24 Parents: 395811d Author: Alexey Kuznetsov <[email protected]> Authored: Mon Dec 3 16:21:46 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Dec 3 16:21:46 2018 +0700 ---------------------------------------------------------------------- modules/web-console/backend/app/settings.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1502494b/modules/web-console/backend/app/settings.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/settings.js b/modules/web-console/backend/app/settings.js index 1c75041..233566b 100644 --- a/modules/web-console/backend/app/settings.js +++ b/modules/web-console/backend/app/settings.js @@ -53,6 +53,14 @@ module.exports = { const dfltHost = packaged ? '0.0.0.0' : '127.0.0.1'; const dfltPort = packaged ? 80 : 3000; + // We need this function because nconf() can return String or Boolean. + // And in JS we cannot compare String with Boolean. + const _isTrue = (confParam) => { + const v = nconf.get(confParam); + + return v === 'true' || v === true; + }; + return { agent: { dists: nconf.get('agent:dists') || dfltAgentDists @@ -62,7 +70,7 @@ module.exports = { host: nconf.get('server:host') || dfltHost, port: _normalizePort(nconf.get('server:port') || dfltPort), // eslint-disable-next-line eqeqeq - SSLOptions: nconf.get('server:ssl') == 'true' && { + SSLOptions: _isTrue('server:ssl') && { enable301Redirects: true, trustXFPHeader: true, key: fs.readFileSync(nconf.get('server:key')), @@ -70,7 +78,7 @@ module.exports = { passphrase: nconf.get('server:keyPassphrase') }, // eslint-disable-next-line eqeqeq - disableSignup: nconf.get('server:disable:signup') == 'true' + disableSignup: _isTrue('server:disable:signup') }, mail, mongoUrl: nconf.get('mongodb:url') || 'mongodb://127.0.0.1/console',
