1 files changed, 50 insertions, 9 deletions

diff --git a/src/models/Service.js b/src/models/Service.js
index 12a2d4af9..dc8febe0b 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -2,6 +2,8 @@ import { autorun, computed, observable } from 'mobx';
 import normalizeUrl from 'normalize-url';
 import path from 'path';
 
+import userAgent from '../helpers/userAgent-helpers';
+
 const debug = require('debug')('Ferdi:Service');
 
 export const RESTRICTION_TYPES = {
@@ -56,6 +58,8 @@ export default class Service {
 
   @observable isDarkModeEnabled = false;
 
+  @observable darkReaderSettings = { brightness: 100, contrast: 90, sepia: 10 };
+
   @observable spellcheckerLanguage = null;
 
   @observable isFirstLoad = true;
@@ -72,6 +76,20 @@ export default class Service {
 
   @observable restrictionType = null;
 
+  @observable isHibernationEnabled = false;
+
+  @observable lastUsed = Date.now(); // timestamp
+
+  @observable lastPoll = null;
+
+  @observable lastPollAnswer = null;
+
+  @observable lostRecipeConnection = false;
+
+  @observable lostRecipeReloadAttempt = 0;
+
+  @observable chromelessUserAgent = false;
+
   constructor(data, recipe) {
     if (!data) {
       console.error('Service config not valid');
@@ -109,12 +127,16 @@ export default class Service {
 
     this.isDarkModeEnabled = data.isDarkModeEnabled !== undefined ? data.isDarkModeEnabled : this.isDarkModeEnabled;
 
+    this.darkReaderSettings = data.darkReaderSettings !== undefined ? data.darkReaderSettings : this.darkReaderSettings;
+
     this.hasCustomUploadedIcon = data.hasCustomIcon !== undefined ? data.hasCustomIcon : this.hasCustomUploadedIcon;
 
     this.proxy = data.proxy !== undefined ? data.proxy : this.proxy;
 
     this.spellcheckerLanguage = data.spellcheckerLanguage !== undefined ? data.spellcheckerLanguage : this.spellcheckerLanguage;
 
+    this.isHibernationEnabled = data.isHibernationEnabled !== undefined ? data.isHibernationEnabled : this.isHibernationEnabled;
+
     this.recipe = recipe;
 
     autorun(() => {
@@ -136,6 +158,7 @@ export default class Service {
       id: this.id,
       spellcheckerLanguage: this.spellcheckerLanguage,
       isDarkModeEnabled: this.isDarkModeEnabled,
+      darkReaderSettings: this.darkReaderSettings,
       team: this.team,
       url: this.url,
       hasCustomIcon: this.hasCustomIcon,
@@ -182,21 +205,34 @@ export default class Service {
   }
 
   @computed get userAgent() {
-    let { userAgent } = window.navigator;
+    let ua = userAgent(this.chromelessUserAgent);
     if (typeof this.recipe.overrideUserAgent === 'function') {
-      userAgent = this.recipe.overrideUserAgent();
+      ua = this.recipe.overrideUserAgent();
     }
 
-    // Remove Ferdi as it can cause incompatabilities with services.
-    // This way, Ferdi will look like a normal Chrome instance
-    userAgent = userAgent.replace(/(Ferdi|Electron)([^\s]+\s)/g, '');
-
-    return userAgent;
+    return ua;
   }
 
   initializeWebViewEvents({ handleIPCMessage, openWindow, stores }) {
     const webContents = this.webview.getWebContents();
 
+    const handleUserAgent = (url, forwardingHack = false) => {
+      if (url.startsWith('https://accounts.google.com')) {
+        if (!this.chromelessUserAgent) {
+          debug('Setting user agent to chromeless for url', url);
+          this.webview.setUserAgent(userAgent(true));
+          if (forwardingHack) {
+            this.webview.loadURL(url);
+          }
+          this.chromelessUserAgent = true;
+        }
+      } else if (this.chromelessUserAgent) {
+        debug('Setting user agent to contain chrome');
+        this.webview.setUserAgent(this.userAgent);
+        this.chromelessUserAgent = false;
+      }
+    };
+
     this.webview.addEventListener('ipc-message', e => handleIPCMessage({
       serviceId: this.id,
       channel: e.channel,
@@ -204,7 +240,6 @@ export default class Service {
     }));
 
     this.webview.addEventListener('new-window', (event, url, frameName, options) => {
-      console.log('open window', event, url, frameName, options);
       openWindow({
         event,
         url,
@@ -213,6 +248,9 @@ export default class Service {
       });
     });
 
+
+    this.webview.addEventListener('will-navigate', event => handleUserAgent(event.url, true));
+
     this.webview.addEventListener('did-start-loading', (event) => {
       debug('Did start load', this.name, event);
 
@@ -230,7 +268,10 @@ export default class Service {
     };
 
     this.webview.addEventListener('did-frame-finish-load', didLoad.bind(this));
-    this.webview.addEventListener('did-navigate', didLoad.bind(this));
+    this.webview.addEventListener('did-navigate', (event) => {
+      handleUserAgent(event.url);
+      didLoad();
+    });
 
     this.webview.addEventListener('did-fail-load', (event) => {
       debug('Service failed to load', this.name, event);