Merge remote-tracking branch 'upstream/master' into skynet

# Conflicts:
#	js/windowMgr.js
#	package.json

js/main.js

@@ -11,7 +11,7 @@ const AutoLaunch = require('auto-launch');
 const urlParser = require('url');
 
 // Local Dependencies
-const {getConfigField, updateUserConfigWin, updateUserConfigMac} = require('./config.js');
+const {getConfigField, updateUserConfigWin, updateUserConfigMac, readConfigFileSync} = require('./config.js');
 const {setCheckboxValues} = require('./menus/menuTemplate.js');
 const { isMac, isDevEnv } = require('./utils/misc.js');
 const protocolHandler = require('./protocolHandler');
@@ -81,8 +81,10 @@ const shouldQuit = app.makeSingleInstance((argv) => {
     processProtocolAction(argv);
 });
 
-// quit if another instance is already running, ignore for dev env
-if (!isDevEnv && shouldQuit) {
+let allowMultiInstance = getCmdLineArg(process.argv, '--multiInstance', true) || isDevEnv;
+
+// quit if another instance is already running, ignore for dev env or if app was started with multiInstance flag
+if (!allowMultiInstance && shouldQuit) {
     app.quit();
 }
 
@@ -103,6 +105,39 @@ if (isMac) {
     });
 }
 
+/**
+ * Sets chrome authentication flags in electron
+ */
+function setChromeFlags() {
+    
+    log.send(logLevels.INFO, 'checking if we need to set custom chrome flags!');
+    
+    // Read the config parameters synchronously
+    let config = readConfigFileSync();
+    
+    // If we cannot find any config, just skip setting any flags
+    if (config && config !== null && config.customFlags) {
+        
+        log.send(logLevels.INFO, 'Chrome flags config found!');
+        
+        // If we cannot find the authServerWhitelist config, move on
+        if (config.customFlags.authServerWhitelist && config.customFlags.authServerWhitelist !== "") {
+            log.send(logLevels.INFO, 'Setting auth server whitelist flag');
+            app.commandLine.appendSwitch('auth-server-whitelist', config.customFlags.authServerWhitelist);
+        }
+        
+        // If we cannot find the authNegotiateDelegateWhitelist config, move on
+        if (config.customFlags.authNegotiateDelegateWhitelist && config.customFlags.authNegotiateDelegateWhitelist !== "") {
+            log.send(logLevels.INFO, 'Setting auth negotiate delegate whitelist flag');
+            app.commandLine.appendSwitch('auth-negotiate-delegate-whitelist', config.customFlags.authNegotiateDelegateWhitelist);
+        }
+        
+    }
+}
+
+// Set the chrome flags
+setChromeFlags();
+
 /**
  * This method will be called when Electron has finished
  * initialization and is ready to create browser windows.
@@ -176,6 +211,12 @@ function setupThenOpenMainWindow() {
     // allows installer to launch app and set appropriate global / user config params.
     let hasInstallFlag = getCmdLineArg(process.argv, '--install', true);
     let perUserInstall = getCmdLineArg(process.argv, '--peruser', true);
+    let customDataArg = getCmdLineArg(process.argv, '--userDataPath=', false);
+    
+    if (customDataArg && customDataArg.split('=').length > 1) {
+        let customDataFolder = customDataArg.split('=')[1];
+        app.setPath('userData', customDataFolder);
+    }
     if (!isMac && hasInstallFlag) {
         getConfigField('launchOnStartup')
             .then(setStartup)
@@ -193,9 +234,8 @@ function setupThenOpenMainWindow() {
         let launchOnStartup = process.argv[3];
         // We wire this in via the post install script
         // to get the config file path where the app is installed
-        let appGlobalConfigPath = process.argv[2];
         setStartup(launchOnStartup)
-            .then(() => updateUserConfigMac(appGlobalConfigPath))
+            .then(updateUserConfigMac)
             .then(app.quit)
             .catch(app.quit);
         return;
@@ -214,18 +254,15 @@ function setupThenOpenMainWindow() {
  * @returns {Promise}
  */
 function setStartup(lStartup) {
-    return symphonyAutoLauncher.isEnabled()
-        .then(function(isEnabled) {
-            if (!isEnabled && lStartup) {
-                return symphonyAutoLauncher.enable();
-            }
-
-            if (isEnabled && !lStartup) {
-                return symphonyAutoLauncher.disable();
-            }
-
-            return true;
-        });
+    return new Promise((resolve) => {
+        let launchOnStartup = (lStartup === 'true');
+        if (launchOnStartup) {
+            symphonyAutoLauncher.enable();
+            return resolve();
+        }
+        symphonyAutoLauncher.disable();
+        return resolve();
+    });
 }
 
 /**