Merge pull request #87 from TerriaJS/proxyAuthInMainConfig

Allow specifying proxyAuth in main config file

Author: kring

CHANGES.md

@@ -1,3 +1,7 @@
+### 2.7.3
+
+* Proxy authentication can now optionally be specified with the `proxyAuth` key in the `--config-file`, as an alternative to `--proxy-auth`.
+
 ### 2.7.2
 
 * When using `--proxy-auth` to automatically supply HTTP basic authentication credentials, and the remote server returns 403 (Forbidden), we now retry the request without the credentials. This will usually result in the server responding with a 401 (Unauthorized), causing the user's browser to prompt for credentials. This is useful when some of the resources on the server are not available with the automatic credentials but will work if more powerful credentials are supplied.

lib/options.js

@@ -107,6 +107,11 @@ options.init = function(quiet) {
     this.settings = getConfig(this.configFile, 'config', 'ALL proxy requests will be accepted.', quiet);
     this.proxyAuthFile = getConfigFile(argv.proxyAuth, 'proxyauth.json');
     this.proxyAuth = getConfig(this.proxyAuthFile, 'proxyAuth', 'Proxying to servers that require authentication will fail', quiet);
+    
+    if (!this.proxyAuth || Object.keys(this.proxyAuth).length === 0) {
+        this.proxyAuth = this.settings.proxyAuth || {};
+    }
+                     
     this.port = argv.port || this.settings.port || 3001;
     this.wwwroot = argv._.length > 0 ? argv._[0] : process.cwd() + '/wwwroot';
     this.configDir = argv.configFile ? path.dirname (argv.configFile) : '.';