From 6e4357c6df01ad9a829cf08b4106f593532b8bff Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Fri, 11 Mar 2016 09:42:33 -0500 Subject: [PATCH 1/2] =?UTF-8?q?Adds=20support=20for=20apps=20key=20in=20co?= =?UTF-8?q?nfig=20file,=20throws=20if=20length=20is=20>=C2=A01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/cli/parse-server.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/cli/parse-server.js b/src/cli/parse-server.js index b4cbbb1263..0ad92a33a5 100755 --- a/src/cli/parse-server.js +++ b/src/cli/parse-server.js @@ -38,7 +38,15 @@ let options = {}; if (program.args.length > 0 ) { let jsonPath = program.args[0]; jsonPath = path.resolve(jsonPath); - options = require(jsonPath); + let jsonConfig = require(jsonPath); + if (jsonConfig.apps) { + if (jsonConfig.apps.length > 1) { + throw 'Multiple apps are not supported'; + } + options = jsonConfig.apps[0]; + } else { + options = jsonConfig; + } console.log(`Configuation loaded from ${jsonPath}`) } From 86f93e39a7c344584a165122bee40f66864bbf93 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 15 Mar 2016 20:22:32 -0400 Subject: [PATCH 2/2] supports keys marked as false --- src/cli/parse-server.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cli/parse-server.js b/src/cli/parse-server.js index 0ad92a33a5..6c52175b87 100755 --- a/src/cli/parse-server.js +++ b/src/cli/parse-server.js @@ -9,7 +9,7 @@ program.loadDefinitions(definitions); program .usage('[options] '); - + program.on('--help', function(){ console.log(' Get Started guide:'); console.log(''); @@ -31,7 +31,7 @@ program.on('--help', function(){ console.log(' $ parse-server -- --appId APP_ID --masterKey MASTER_KEY --serverURL serverURL'); console.log(''); }); - + program.parse(process.argv, process.env); let options = {}; @@ -48,10 +48,10 @@ if (program.args.length > 0 ) { options = jsonConfig; } console.log(`Configuation loaded from ${jsonPath}`) -} +} options = Object.keys(definitions).reduce(function (options, key) { - if (program[key]) { + if (typeof program[key] !== 'undefined') { options[key] = program[key]; } return options; @@ -74,7 +74,7 @@ const api = new ParseServer(options); app.use(options.mountPath, api); var server = app.listen(options.port, function() { - + for (let key in options) { let value = options[key]; if (key == "masterKey") {