Fix assignment of renamed options.

RubenVerborgh · RubenVerborgh · commit a6e9fee65542 · 2017-09-05T10:54:13.000-04:00
diff --git a/lib/create-app.js b/lib/create-app.js
@@ -57,7 +57,7 @@ function createApp (argv = {}) {
   // Add CORS proxy
   if (argv.proxy) {
     console.warn('The proxy configuration option has been renamed to corsProxy.')
-    argv.corsProxy = argv.proxy
+    argv.corsProxy = argv.corsProxy || argv.proxy
     delete argv.proxy
   }
   if (argv.corsProxy) {
diff --git a/lib/create-server.js b/lib/create-server.js
@@ -24,7 +24,7 @@ function createServer (argv, app) {
 
   if (argv.idp) {
     console.warn('The idp configuration option has been renamed to multiuser.')
-    argv.idp = argv.multiuser
+    argv.multiuser = argv.idp
     delete argv.idp
   }
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ function createApp (argv = {}) {`
`57`	`57`	`// Add CORS proxy`
`58`	`58`	`if (argv.proxy) {`
`59`	`59`	`console.warn('The proxy configuration option has been renamed to corsProxy.')`
`60`		`- argv.corsProxy = argv.proxy`
	`60`	`+ argv.corsProxy = argv.corsProxy \|\| argv.proxy`
`61`	`61`	`delete argv.proxy`
`62`	`62`	`}`
`63`	`63`	`if (argv.corsProxy) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ function createServer (argv, app) {`
`24`	`24`
`25`	`25`	`if (argv.idp) {`
`26`	`26`	`console.warn('The idp configuration option has been renamed to multiuser.')`
`27`		`- argv.idp = argv.multiuser`
	`27`	`+ argv.multiuser = argv.idp`
`28`	`28`	`delete argv.idp`
`29`	`29`	`}`
`30`	`30`