From 1049807a14fa16f1abf8c7727a907f0750c0f1b5 Mon Sep 17 00:00:00 2001
From: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>
Date: Wed, 6 Sep 2017 22:06:00 +0530
Subject: [PATCH] electron-126: implemented changes for single user install in
 user config

---
 js/config.js | 55 +++++++++++++++++++---------------------------------
 js/main.js   |  3 +--
 2 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/js/config.js b/js/config.js
index b00eb810..da613753 100644
--- a/js/config.js
+++ b/js/config.js
@@ -15,6 +15,9 @@ const childProcess = require('child_process');
 const AppDirectory = require('appdirectory');
 const dirs = new AppDirectory('Symphony');
 
+const log = require('../log.js');
+const logLevels = require('./enums/logLevels.js');
+
 // cached config when first reading files. initially undefined and will be
 // updated when read from disk.
 let userConfig;
@@ -250,28 +253,31 @@ function updateUserConfig(newGlobalConfig, oldUserConfig) {
  * @returns {Promise}
  */
 function updateUserConfigWin(perUserInstall) {
+    
     return new Promise((resolve, reject) => {
+        
+        // we get the user config path using electron
         const userConfigFile = path.join(app.getPath('userData'), configFileName);
-        // flag to determine whether per user installation
-        if (!perUserInstall) {
+        
+        // if it's not a per user installation or if the
+        // user config file doesn't exist, we simple move on
+        if (!perUserInstall || !fs.existsSync(userConfigFile)) {
+            log.send(logLevels.WARN, 'config: Could not find the user config file!');
             reject();
             return;
         }
 
-        // if user config file does't exists just copy global config file
-        if (!fs.existsSync(userConfigFile)) {
-            resolve(copyConfigWin());
-            return;
-        }
+        fs.unlink(userConfigFile, (err) => {
+            if (err) {
+                log.send(logLevels.ERROR, 'config: Could not delete the user config file!');
+                reject();
+                return;
+            }
+            resolve();
+        });
 
-        Promise.all([readGlobalConfig(), readUserConfig(userConfigFile)])
-            .then((data) => {
-                resolve(updateUserConfig(data[0], data[1]));
-            })
-            .catch((err) => {
-                reject(err);
-            });
     });
+
 }
 
 /**
@@ -299,27 +305,6 @@ function updateUserConfigMac(globalConfigPath) {
     });
 }
 
-/**
- * Method to copy global config file to user config directory for Windows
- * @returns {Promise}
- */
-function copyConfigWin() {
-    return new Promise((resolve, reject) => {
-        const globalConfigFileName = path.join('config', configFileName);
-        const execPath = path.dirname(app.getPath('exe'));
-        const globalConfigPath = path.join(execPath, '', globalConfigFileName);
-        const userConfigPath = app.getPath('userData');
-
-        childProcess.exec(`echo D|xcopy /y /e /s /c "${globalConfigPath}" "${userConfigPath}"`, { timeout: 60000 }, (err) => {
-            if (err) {
-                reject(err);
-                return;
-            }
-            resolve();
-        });
-    });
-}
-
 /**
  * Method which copies global config file to user config directory for mac
  * @param {String} globalConfigPath - The global config path from installer
diff --git a/js/main.js b/js/main.js
index 4da914b0..489d6bfe 100644
--- a/js/main.js
+++ b/js/main.js
@@ -117,8 +117,7 @@ function setupThenOpenMainWindow() {
 
     isAppAlreadyOpen = true;
 
-    // allows installer to launch app and set auto startup mode then
-    // immediately quit.
+    // 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);
     if (!isMac && hasInstallFlag) {