electron-113: fixed issues w.r.t. reinstall cases on windows

js/config.js

@@ -200,9 +200,9 @@ function updateUserConfig(newGlobalConfig, oldUserConfig) {
         const configDataToUpdate = pick(newGlobalConfig, ['url', 'minimizeOnClose', 'launchOnStartup', 'alwaysOnTop']);
         const updatedUserConfigData = Object.assign(oldUserConfig, configDataToUpdate);
         const jsonNewConfig = JSON.stringify(updatedUserConfigData, null, ' ');
-
         // get user config path
         let userConfigFile;
+
         if (isMac) {
             userConfigFile = path.join(dirs.userConfig(), configFileName);
         } else {
@@ -219,6 +219,32 @@ function updateUserConfig(newGlobalConfig, oldUserConfig) {
     });
 }
 
+/**
+ * Method to read user config data
+ * @param {String} userConfigFile - The user config file path
+ * @returns {Promise}
+ */
+function getUserConfigData(userConfigFile) {
+    return new Promise((resolve, reject) => {
+        fs.readFile(userConfigFile, 'utf8', (err, data) => {
+            if (err) {
+                reject('cannot open user config file: ' + userConfigFile + ', error: ' + err);
+                return;
+            }
+
+            let userConfigData;
+            try {
+                // data is the contents of the text file we just read
+                userConfigData = JSON.parse(data);
+            } catch (e) {
+                reject('can not parse config file data: ' + data + ', error: ' + err);
+                return;
+            }
+            resolve(userConfigData);
+        });
+    });
+}
+
 /**
  * Method to overwrite user config on windows installer
  * @param {String} perUserInstall - Is a flag to determine whether we are installing for per user
@@ -227,7 +253,7 @@ function updateUserConfig(newGlobalConfig, oldUserConfig) {
 function updateUserConfigWin(perUserInstall) {
     return new Promise((resolve, reject) => {
         const userConfigFile = path.join(app.getPath('userData'), configFileName);
-
+        // flag to determine whether per user installation
         if (!perUserInstall) {
             reject();
             return;
@@ -235,40 +261,16 @@ function updateUserConfigWin(perUserInstall) {
 
         // if user config file does't exists just copy global config file
         if (!fs.existsSync(userConfigFile)) {
-            const globalConfigFileName = path.join('config', configFileName);
+            resolve(copyConfigWin());
-            const execPath = path.dirname(app.getPath('exe'));
+            return;
-            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) => {
+        Promise.all([readGlobalConfig(), getUserConfigData(userConfigFile)])
-                if (err) {
+            .then((data) => {
+                resolve(updateUserConfig(data[0], data[1]));
+            })
+            .catch((err) => {
                 reject(err);
-                    return;
-                }
-                resolve();
-            });
-        }
-        readGlobalConfig().then((globalConfigData) => {
-            fs.readFile(userConfigFile, 'utf8', (err, userData) => {
-                if (err) {
-                    reject('cannot open user config file: ' + userConfigFile + ', error: ' + err);
-                    return;
-                }
-                let userConfigData;
-                try {
-                    // data is the contents of the text file we just read
-                    userConfigData = JSON.parse(userData);
-                } catch (e) {
-                    reject('can not parse config file data: ' + userData + ', error: ' + err);
-                }
-                updateUserConfig(globalConfigData, userConfigData).then((error) => {
-                    if (error) {
-                        reject(error);
-                        return;
-                    }
-                    resolve();
-                });
-            });
             });
     });
 }
@@ -284,38 +286,59 @@ function updateUserConfigMac(globalConfigPath) {
 
         // if user config file does't exists just copy global config file
         if (!fs.existsSync(userConfigFile)) {
+            resolve(copyConfigMac(globalConfigPath));
+            return;
+        }
+
+        Promise.all([readGlobalConfig(), getUserConfigData(userConfigFile)])
+            .then((data) => {
+                resolve(updateUserConfig(data[0], data[1]));
+            })
+            .catch((err) => {
+                reject(err);
+            })
+    });
+}
+
+/**
+ * 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
+ * @returns {Promise}
+ */
+function copyConfigMac(globalConfigPath) {
+    return new Promise((resolve, reject) => {
         let userConfigPath = dirs.userConfig() + '/';
         let userName = process.env.USER;
 
         childProcess.exec(`rsync -r "${globalConfigPath}" "${userConfigPath}" && chown -R "${userName}" "${userConfigPath}"`, { timeout: 60000 }, (err) => {
             if (err) {
                 reject(err);
-                }
-                resolve();
-            });
-        }
-        return readGlobalConfig().then((globalConfigData) => {
-            fs.readFile(userConfigFile, 'utf8', (err, userData) => {
-                if (err) {
-                    reject('cannot open user config file: ' + userConfigFile + ', error: ' + err);
-                }
-                let userConfigData;
-                try {
-                    // data is the contents of the text file we just read
-                    userConfigData = JSON.parse(userData);
-                } catch (e) {
-                    reject('can not parse config file data: ' + userData + ', error: ' + err);
-                }
-                updateUserConfig(globalConfigData, userConfigData).then((error) => {
-                    if (error) {
-                        reject(error);
                 return;
             }
             resolve();
         });
     });
-        });
-    });
 }
 
 function clearCachedConfigs() {

js/main.js

@@ -108,7 +108,7 @@ function setupThenOpenMainWindow() {
     if (!isMac && hasInstallFlag) {
         getConfigField('launchOnStartup')
             .then(setStartup)
-            .then(updateUserConfigWin(perUserInstall))
+            .then(() => updateUserConfigWin(perUserInstall))
             .then(app.quit)
             .catch(app.quit);
         return;
@@ -121,7 +121,7 @@ function setupThenOpenMainWindow() {
         // access to the config file
         let launchOnStartup = process.argv[3];
         setStartup(launchOnStartup)
-            .then(updateUserConfigMac(process.argv[2]))
+            .then(() => updateUserConfigMac(process.argv[2]))
             .then(app.quit)
             .catch(app.quit);
         return;

package.json

@@ -23,7 +23,9 @@
     },
     "jest": {
         "collectCoverage": true,
-        "transformIgnorePatterns": []
+        "transformIgnorePatterns": [
+
+        ]
     },
     "build": {
         "asarUnpack": [