1 files changed, 138 insertions, 61 deletions

diff --git a/src/index.js b/src/index.js
index 91004aac7..9146a23da 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,15 +1,9 @@
 /* eslint-disable import/first */
 
-import {
-  app,
-  BrowserWindow,
-  shell,
-  ipcMain,
-  session,
-} from 'electron';
-
-import fs from 'fs-extra';
-import path from 'path';
+import { app, BrowserWindow, shell, ipcMain, session } from 'electron';
+
+import { emptyDirSync, ensureFileSync } from 'fs-extra';
+import { join } from 'path';
 import windowStateKeeper from 'electron-window-state';
 import { enforceMacOSAppLocation } from 'electron-util';
 import ms from 'ms';
@@ -25,6 +19,8 @@ import {
   isWindows,
   isLinux,
   aboutAppDetails,
+  userDataRecipesPath,
+  userDataPath,
 } from './environment';
 
 import { mainIpcHandler as basicAuthHandler } from './features/basicAuth';
@@ -69,8 +65,8 @@ function onDidLoad(fn) {
 }
 
 // Ensure that the recipe directory exists
-fs.emptyDirSync(path.join(app.getPath('userData'), 'recipes', 'temp'));
-fs.ensureFileSync(path.join(app.getPath('userData'), 'window-state.json'));
+emptyDirSync(userDataRecipesPath('temp'));
+ensureFileSync(userDataPath('window-state.json'));
 
 // Set App ID for Windows
 if (isWindows) {
@@ -90,7 +86,9 @@ if (settings.get('sentry')) {
 const liftSingleInstanceLock = settings.get('liftSingleInstanceLock') || false;
 
 // Force single window
-const gotTheLock = liftSingleInstanceLock ? true : app.requestSingleInstanceLock();
+const gotTheLock = liftSingleInstanceLock
+  ? true
+  : app.requestSingleInstanceLock();
 if (!gotTheLock) {
   app.quit();
 } else {
@@ -106,7 +104,7 @@ if (!gotTheLock) {
       mainWindow.focus();
 
       if (isWindows) {
-        onDidLoad((window) => {
+        onDidLoad(window => {
           // Keep only command line / deep linked arguments
           const url = argv.slice(1);
           if (url) {
@@ -117,8 +115,14 @@ if (!gotTheLock) {
             // Needs to be delayed to not interfere with mainWindow.restore();
             setTimeout(() => {
               debug('Resetting windows via Task');
-              window.setPosition(DEFAULT_WINDOW_OPTIONS.x + 100, DEFAULT_WINDOW_OPTIONS.y + 100);
-              window.setSize(DEFAULT_WINDOW_OPTIONS.width, DEFAULT_WINDOW_OPTIONS.height);
+              window.setPosition(
+                DEFAULT_WINDOW_OPTIONS.x + 100,
+                DEFAULT_WINDOW_OPTIONS.y + 100,
+              );
+              window.setSize(
+                DEFAULT_WINDOW_OPTIONS.width,
+                DEFAULT_WINDOW_OPTIONS.height,
+              );
             }, 1);
           } else if (argv.includes('--quit')) {
             // Needs to be delayed to not interfere with mainWindow.restore();
@@ -135,7 +139,10 @@ if (!gotTheLock) {
 
 // Fix Unity indicator issue
 // https://github.com/electron/electron/issues/9046
-if (isLinux && ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESKTOP) !== -1) {
+if (
+  isLinux &&
+  ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESKTOP) !== -1
+) {
   process.env.XDG_CURRENT_DESKTOP = 'Unity';
 }
 
@@ -169,7 +176,9 @@ const createWindow = () => {
   }
 
   // Create the browser window.
-  const backgroundColor = settings.get('darkMode') ? '#1E1E1E' : settings.get('accentColor');
+  const backgroundColor = settings.get('darkMode')
+    ? '#1E1E1E'
+    : settings.get('accentColor');
 
   mainWindow = new BrowserWindow({
     x: posX,
@@ -181,19 +190,20 @@ const createWindow = () => {
     show: false,
     titleBarStyle: isMac ? 'hidden' : '',
     frame: isLinux,
+    spellcheck: settings.get('enableSpellchecking'),
     backgroundColor,
     webPreferences: {
       nodeIntegration: true,
       contextIsolation: false,
       webviewTag: true,
-      preload: path.join(__dirname, 'sentry.js'),
+      preload: join(__dirname, 'sentry.js'),
       enableRemoteModule: true,
     },
   });
 
   app.on('web-contents-created', (e, contents) => {
     if (contents.getType() === 'webview') {
-      contents.on('new-window', (event) => {
+      contents.on('new-window', event => {
         event.preventDefault();
       });
     }
@@ -242,7 +252,7 @@ const createWindow = () => {
 
   // Windows deep linking handling on app launch
   if (isWindows) {
-    onDidLoad((window) => {
+    onDidLoad(window => {
       const url = process.argv.slice(1);
       if (url) {
         handleDeepLink(window, url.toString());
@@ -251,12 +261,16 @@ const createWindow = () => {
   }
 
   // Emitted when the window is closed.
-  mainWindow.on('close', (e) => {
+  mainWindow.on('close', e => {
     debug('Window: close window');
     // Dereference the window object, usually you would store windows
     // in an array if your app supports multi windows, this is the time
     // when you should delete the corresponding element.
-    if (!willQuitApp && (settings.get('runInBackground') === undefined || settings.get('runInBackground'))) {
+    if (
+      !willQuitApp &&
+      (settings.get('runInBackground') === undefined ||
+        settings.get('runInBackground'))
+    ) {
       e.preventDefault();
       if (isWindows) {
         debug('Window: minimize');
@@ -315,7 +329,7 @@ const createWindow = () => {
 
   if (isMac) {
     // eslint-disable-next-line global-require
-    const { default: askFormacOSPermissions } = require('./electron/macOSPermissions');
+    const { askFormacOSPermissions } = require('./electron/macOSPermissions');
     setTimeout(() => askFormacOSPermissions(mainWindow), ms('30s'));
   }
 
@@ -351,15 +365,24 @@ const createWindow = () => {
 const argv = require('minimist')(process.argv.slice(1));
 
 if (argv['auth-server-whitelist']) {
-  app.commandLine.appendSwitch('auth-server-whitelist', argv['auth-server-whitelist']);
+  app.commandLine.appendSwitch(
+    'auth-server-whitelist',
+    argv['auth-server-whitelist'],
+  );
 }
 if (argv['auth-negotiate-delegate-whitelist']) {
-  app.commandLine.appendSwitch('auth-negotiate-delegate-whitelist', argv['auth-negotiate-delegate-whitelist']);
+  app.commandLine.appendSwitch(
+    'auth-negotiate-delegate-whitelist',
+    argv['auth-negotiate-delegate-whitelist'],
+  );
 }
 
 // Disable Chromium's poor MPRIS implementation
 // and apply workaround for https://github.com/electron/electron/pull/26432
-app.commandLine.appendSwitch('disable-features', 'HardwareMediaKeyHandling,MediaSessionService,CrossOriginOpenerPolicy');
+app.commandLine.appendSwitch(
+  'disable-features',
+  'HardwareMediaKeyHandling,MediaSessionService,CrossOriginOpenerPolicy',
+);
 
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
@@ -369,26 +392,36 @@ app.on('ready', () => {
   enforceMacOSAppLocation();
 
   // Register App URL
-  app.setAsDefaultProtocolClient('ferdi');
-
   if (isDevMode) {
     app.setAsDefaultProtocolClient('ferdi-dev');
+  } else {
+    app.setAsDefaultProtocolClient('ferdi');
   }
 
   if (isWindows) {
-    app.setUserTasks([{
-      program: process.execPath,
-      arguments: `${isDevMode ? `${__dirname} ` : ''}--reset-window`,
-      iconPath: asarPath(path.join(isDevMode ? `${__dirname}../src/` : __dirname, 'assets/images/taskbar/win32/display.ico')),
-      iconIndex: 0,
-      title: 'Move Ferdi to Current Display',
-      description: 'Restore the position and size of Ferdi',
-    }, {
-      program: process.execPath,
-      arguments: `${isDevMode ? `${__dirname} ` : ''}--quit`,
-      iconIndex: 0,
-      title: 'Quit Ferdi',
-    }]);
+    app.setUserTasks([
+      {
+        program: process.execPath,
+        arguments: `${isDevMode ? `${__dirname} ` : ''}--reset-window`,
+        iconPath: asarPath(
+          join(
+            isDevMode ? `${__dirname}../src/` : __dirname,
+            'assets/images/taskbar/win32/display.ico',
+          ),
+        ),
+        iconIndex: 0,
+        title: 'Move Ferdi to Current Display',
+        description: 'Restore the position and size of Ferdi',
+      },
+      {
+        program: process.execPath,
+        arguments: `${isDevMode ? `${__dirname} ` : ''}--quit`,
+        iconIndex: 0,
+        iconPath: null,
+        title: 'Quit Ferdi',
+        description: null,
+      },
+    ]);
   }
 
   createWindow();
@@ -420,27 +453,35 @@ ipcMain.on('feature-basic-auth-credentials', (e, { user, password }) => {
 
 ipcMain.on('open-browser-window', (e, { url, serviceId }) => {
   const serviceSession = session.fromPartition(`persist:service-${serviceId}`);
-  const child = new BrowserWindow({ parent: mainWindow, webPreferences: { session: serviceSession } });
+  const child = new BrowserWindow({
+    parent: mainWindow,
+    webPreferences: { session: serviceSession },
+  });
   child.show();
   child.loadURL(url);
   debug('Received open-browser-window', url);
 });
 
-ipcMain.on('modifyRequestHeaders', (e, { modifiedRequestHeaders, serviceId }) => {
-  debug('Received modifyRequestHeaders', modifiedRequestHeaders, serviceId);
-  modifiedRequestHeaders.forEach((headerFilterSet) => {
-    const { headers, requestFilters } = headerFilterSet;
-    session.fromPartition(`persist:service-${serviceId}`).webRequest.onBeforeSendHeaders(requestFilters, (details, callback) => {
-      for (const key in headers) {
-        if (Object.prototype.hasOwnProperty.call(headers, key)) {
-          const value = headers[key];
-          details.requestHeaders[key] = value;
-        }
-      }
-      callback({ requestHeaders: details.requestHeaders });
+ipcMain.on(
+  'modifyRequestHeaders',
+  (e, { modifiedRequestHeaders, serviceId }) => {
+    debug('Received modifyRequestHeaders', modifiedRequestHeaders, serviceId);
+    modifiedRequestHeaders.forEach(headerFilterSet => {
+      const { headers, requestFilters } = headerFilterSet;
+      session
+        .fromPartition(`persist:service-${serviceId}`)
+        .webRequest.onBeforeSendHeaders(requestFilters, (details, callback) => {
+          for (const key in headers) {
+            if (Object.prototype.hasOwnProperty.call(headers, key)) {
+              const value = headers[key];
+              details.requestHeaders[key] = value;
+            }
+          }
+          callback({ requestHeaders: details.requestHeaders });
+        });
     });
-  });
-});
+  },
+);
 
 ipcMain.on('feature-basic-auth-cancel', () => {
   debug('Cancel basic auth');
@@ -449,16 +490,52 @@ ipcMain.on('feature-basic-auth-cancel', () => {
   authCallback = noop;
 });
 
+// Handle synchronous messages from service webviews.
+
+ipcMain.on('find-in-page', (e, text, options) => {
+  const { sender: webContents } = e;
+  if (webContents !== mainWindow.webContents && typeof text === 'string') {
+    const sanitizedOptions = {};
+    for (const option of ['forward', 'findNext', 'matchCase']) {
+      if (option in options) {
+        sanitizedOptions[option] = !!options[option];
+      }
+    }
+    const requestId = webContents.findInPage(text, sanitizedOptions);
+    debug('Find in page', text, options, requestId);
+    e.returnValue = requestId;
+  } else {
+    e.returnValue = null;
+  }
+});
+
+ipcMain.on('stop-find-in-page', (e, action) => {
+  const { sender: webContents } = e;
+  if (webContents !== mainWindow.webContents) {
+    const validActions = [
+      'clearSelection',
+      'keepSelection',
+      'activateSelection',
+    ];
+    if (validActions.includes(action)) {
+      webContents.stopFindInPage(action);
+    }
+  }
+  e.returnValue = null;
+});
+
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
   // On OS X it is common for applications and their menu bar
   // to stay active until the user quits explicitly with Cmd + Q
-  if (settings.get('runInBackground') === undefined
-    || settings.get('runInBackground')) {
+  if (
+    settings.get('runInBackground') === undefined ||
+    settings.get('runInBackground')
+  ) {
     debug('Window: all windows closed, quit app');
     app.quit();
   } else {
-    debug('Window: don\'t quit app');
+    debug("Window: don't quit app");
   }
 });
 
@@ -487,7 +564,7 @@ app.on('will-finish-launching', () => {
   app.on('open-url', (event, url) => {
     event.preventDefault();
 
-    onDidLoad((window) => {
+    onDidLoad(window => {
       debug('open-url event', url);
       handleDeepLink(window, url);
     });