From 222e52cbdf87cbd3cdc5e01f22e6994ac593f6f9 Mon Sep 17 00:00:00 2001
From: Keerthi Niranjan <keerthiniranjan16@gmail.com>
Date: Fri, 24 Nov 2017 15:58:01 +0530
Subject: [PATCH] SEARCH-444

- Implemented a function to delete the index folder
---
 js/main.js                | 4 ++--
 js/preload/preloadMain.js | 2 +-
 js/search/search.js       | 6 +++---
 js/windowMgr.js           | 6 ++++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/js/main.js b/js/main.js
index e5973bb5..92937eef 100644
--- a/js/main.js
+++ b/js/main.js
@@ -18,7 +18,7 @@ const protocolHandler = require('./protocolHandler');
 const getCmdLineArg = require('./utils/getCmdLineArg.js');
 const log = require('./log.js');
 const logLevels = require('./enums/logLevels.js');
-const { clearIndexFolder } = require('./search/search');
+const { deleteIndexFolder } = require('./search/search.js');
 
 require('electron-dl')();
 
@@ -131,7 +131,7 @@ app.on('activate', function() {
 
 app.on('will-quit', function (e) {
     e.preventDefault();
-    clearIndexFolder();
+    deleteIndexFolder();
     app.exit();
 });
 
diff --git a/js/preload/preloadMain.js b/js/preload/preloadMain.js
index 4254147b..ff9b937f 100644
--- a/js/preload/preloadMain.js
+++ b/js/preload/preloadMain.js
@@ -139,7 +139,7 @@ function createAPI() {
         /**
          * Function to clear the user index data
          */
-        clearIndexFolder: remote.require('./search/search.js').clearIndexFolder,
+        deleteIndexFolder: remote.require('./search/search.js').deleteIndexFolder,
 
         /**
          * Brings window forward and gives focus.
diff --git a/js/search/search.js b/js/search/search.js
index ed92f433..929d7a43 100644
--- a/js/search/search.js
+++ b/js/search/search.js
@@ -538,9 +538,9 @@ class Search {
 
 /**
  * Deleting the data index folder
- * when the app is closed
+ * when the app is closed/signed-out/navigates
  */
-function clearIndexFolder() {
+function deleteIndexFolder() {
     Search.deleteFolderRecursive(INDEX_DATA_FOLDER);
 }
 
@@ -550,5 +550,5 @@ function clearIndexFolder() {
  */
 module.exports = {
     Search: Search,
-    clearIndexFolder: clearIndexFolder
+    deleteIndexFolder: deleteIndexFolder
 };
diff --git a/js/windowMgr.js b/js/windowMgr.js
index 600ef2b1..e76559be 100644
--- a/js/windowMgr.js
+++ b/js/windowMgr.js
@@ -20,6 +20,7 @@ const eventEmitter = require('./eventEmitter');
 const throttle = require('./utils/throttle.js');
 const { getConfigField, updateConfigField } = require('./config.js');
 const { isMac, isNodeEnv } = require('./utils/misc');
+const { deleteIndexFolder } = require('./search/search.js');
 
 // show dialog when certificate errors occur
 require('./dialogs/showCertError.js');
@@ -256,6 +257,11 @@ function doCreateMainWindow(initialUrl, initialBounds) {
         });
     });
 
+    // To delete the user index data folder on navigation
+    mainWindow.webContents.on('will-navigate', () => {
+        deleteIndexFolder();
+    });
+
     getConfigField('url')
     .then(initializeCrashReporter)
     .catch(app.quit);