1 files changed, 42 insertions, 7 deletions

diff --git a/src/index.js b/src/index.js
index 5ba901b89..663f81cc9 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,10 +1,16 @@
-import { app, BrowserWindow, shell } from 'electron';
+import { app, BrowserWindow, shell, ipcMain } from 'electron';
+
 import fs from 'fs-extra';
 import path from 'path';
-
 import windowStateKeeper from 'electron-window-state';
 
 import { isDevMode, isMac, isWindows, isLinux } from './environment';
+
+// DEV MODE: Save user data into FranzDev
+if (isDevMode) {
+  app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
+}
+/* eslint-disable import/first */
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
 import Settings from './electron/Settings';
@@ -12,7 +18,10 @@ import handleDeepLink from './electron/deepLinking';
 import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
 
-const debug = require('debug')('App');
+import { DEFAULT_APP_SETTINGS } from './config';
+/* eslint-enable import/first */
+
+const debug = require('debug')('Franz:App');
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -57,7 +66,8 @@ if (isLinux && ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESK
 }
 
 // Initialize Settings
-const settings = new Settings();
+const settings = new Settings('app', DEFAULT_APP_SETTINGS);
+const proxySettings = new Settings('proxy');
 
 // Disable GPU acceleration
 if (!settings.get('enableGPUAcceleration')) {
@@ -82,14 +92,21 @@ const createWindow = () => {
     minHeight: 500,
     titleBarStyle: isMac ? 'hidden' : '',
     frame: isLinux,
-    backgroundColor: '#3498db',
+    backgroundColor: !settings.get('darkMode') ? '#3498db' : '#1E1E1E',
   });
 
   // Initialize System Tray
   const trayIcon = new Tray();
 
   // Initialize ipcApi
-  ipcApi({ mainWindow, settings, trayIcon });
+  ipcApi({
+    mainWindow,
+    settings: {
+      app: settings,
+      proxy: proxySettings,
+    },
+    trayIcon,
+  });
 
   // Manage Window State
   mainWindowState.manage(mainWindow);
@@ -115,7 +132,7 @@ const createWindow = () => {
         mainWindow.hide();
       }
 
-      if (isWindows && settings.get('minimizeToSystemTray')) {
+      if (isWindows) {
         mainWindow.setSkipTaskbar(true);
       }
     } else {
@@ -172,6 +189,24 @@ const createWindow = () => {
 // Some APIs can only be used after this event occurs.
 app.on('ready', createWindow);
 
+// This is the worst possible implementation as the webview.webContents based callback doesn't work 🖕
+app.on('login', (event, webContents, request, authInfo, callback) => {
+  event.preventDefault();
+  debug('browser login event', authInfo);
+  if (authInfo.isProxy && authInfo.scheme === 'basic') {
+    webContents.send('get-service-id');
+
+    ipcMain.on('service-id', (e, id) => {
+      debug('Received service id', id);
+
+      const ps = proxySettings.get(id);
+      callback(ps.user, ps.password);
+    });
+  } else {
+    // TODO: implement basic auth
+  }
+});
+
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
   // On OS X it is common for applications and their menu bar