9 files changed, 112 insertions, 88 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 315235ba4..5bae6e8d4 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -1,6 +1,6 @@
 import { remote, ipcRenderer, shell } from 'electron';
 import {
-  action, computed, observable, reaction,
+  action, computed, observable,
 } from 'mobx';
 import moment from 'moment';
 import { getDoNotDisturb } from '@meetfranz/electron-notification-state';
@@ -17,14 +17,13 @@ import Request from './lib/Request';
 import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
 import { isMac } from '../environment';
 import locales from '../i18n/translations';
-import { gaEvent, gaPage, statsEvent } from '../lib/analytics';
 import { onVisibilityChange } from '../helpers/visibility-helper';
 import { getLocale } from '../helpers/i18n-helpers';
 
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
 import { isValidExternalURL } from '../helpers/url-helpers';
 
-const debug = require('debug')('Franz:AppStore');
+const debug = require('debug')('Ferdi:AppStore');
 
 const { app, systemPreferences, screen } = remote;
 
@@ -32,7 +31,7 @@ const mainWindow = remote.getCurrentWindow();
 
 const defaultLocale = DEFAULT_APP_SETTINGS.locale;
 const autoLauncher = new AutoLaunch({
-  name: 'Franz',
+  name: 'Ferdi',
 });
 
 export default class AppStore extends Store {
@@ -54,6 +53,8 @@ export default class AppStore extends Store {
 
   @observable isOnline = navigator.onLine;
 
+  @observable authRequestFailed = false;
+
   @observable timeOfflineStart;
 
   @observable updateStatus = null;
@@ -113,7 +114,7 @@ export default class AppStore extends Store {
 
     this.isOnline = navigator.onLine;
 
-    // Check if Franz should launch on start
+    // Check if Ferdi should launch on start
     // Needs to be delayed a bit
     this._autoStart();
 
@@ -173,13 +174,6 @@ export default class AppStore extends Store {
 
       debug('Window is visible/focused', isVisible);
     });
-
-    // analytics autorun
-    reaction(() => this.stores.router.location.pathname, (pathname) => {
-      gaPage(pathname);
-    });
-
-    statsEvent('app-start');
   }
 
   @computed get cacheSize() {
@@ -267,8 +261,6 @@ export default class AppStore extends Store {
     } catch (err) {
       console.warn(err);
     }
-
-    gaEvent('App', enable ? 'enable autostart' : 'disable autostart');
   }
 
   @action _openExternalUrl({ url }) {
@@ -278,8 +270,6 @@ export default class AppStore extends Store {
     if (isValidExternalURL(url)) {
       shell.openExternal(url);
     }
-
-    gaEvent('External URL', 'open', parsedUrl.host);
   }
 
   @action _checkForUpdates() {
@@ -373,7 +363,7 @@ export default class AppStore extends Store {
   }
 
   _muteAppHandler() {
-    const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
+    const { showMessageBadgesEvenWhenMuted } = this.stores.ui;
 
     if (!showMessageBadgesEvenWhenMuted) {
       this.actions.app.setBadge({ unreadDirectMessageCount: 0, unreadIndirectMessageCount: 0 });
diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.js
index 7a85c2daa..8bdafb68c 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.js
@@ -24,9 +24,12 @@ export default class GlobalErrorStore extends Store {
           this.response = {};
         }
         if (this.error.status === 401) {
-          this.actions.user.logout({ serverLogout: true });
+          window.ferdi.stores.app.authRequestFailed = true;
+          // this.actions.user.logout({ serverLogout: true });
         }
       }
+    } else {
+      window.ferdi.stores.app.authRequestFailed = false;
     }
   });
 }
diff --git a/src/stores/PaymentStore.js b/src/stores/PaymentStore.js
index d4de476c8..8579812ad 100644
--- a/src/stores/PaymentStore.js
+++ b/src/stores/PaymentStore.js
@@ -3,7 +3,6 @@ import { action, observable, computed } from 'mobx';
 import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
-import { gaEvent } from '../lib/analytics';
 
 export default class PaymentStore extends Store {
   @observable plansRequest = new CachedRequest(this.api.payment, 'plans');
@@ -26,8 +25,6 @@ export default class PaymentStore extends Store {
   @action _createHostedPage({ planId }) {
     const request = this.createHostedPageRequest.execute(planId);
 
-    gaEvent('Payment', 'createHostedPage', planId);
-
     return request;
   }
 }
diff --git a/src/stores/RecipePreviewsStore.js b/src/stores/RecipePreviewsStore.js
index 382820d58..989e1124a 100644
--- a/src/stores/RecipePreviewsStore.js
+++ b/src/stores/RecipePreviewsStore.js
@@ -1,11 +1,8 @@
 import { action, computed, observable } from 'mobx';
-import { debounce } from 'lodash';
-import ms from 'ms';
 
 import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
-import { gaEvent } from '../lib/analytics';
 
 export default class RecipePreviewsStore extends Store {
   @observable allRecipePreviewsRequest = new CachedRequest(this.api.recipePreviews, 'all');
@@ -41,13 +38,6 @@ export default class RecipePreviewsStore extends Store {
   @action _search({ needle }) {
     if (needle !== '') {
       this.searchRecipePreviewsRequest.execute(needle);
-
-      this._analyticsSearch(needle);
     }
   }
-
-  // Helper
-  _analyticsSearch = debounce((needle) => {
-    gaEvent('Recipe', 'search', needle);
-  }, ms('3s'));
 }
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index d51192078..7f91049df 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -5,7 +5,7 @@ import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { matchRoute } from '../helpers/routing-helpers';
 
-const debug = require('debug')('Franz:RecipeStore');
+const debug = require('debug')('Ferdi:RecipeStore');
 
 export default class RecipesStore extends Store {
   @observable allRecipesRequest = new CachedRequest(this.api.recipes, 'all');
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js
index 9254e3223..2587d4eef 100644
--- a/src/stores/RequestStore.js
+++ b/src/stores/RequestStore.js
@@ -3,7 +3,7 @@ import ms from 'ms';
 
 import Store from './lib/Store';
 
-const debug = require('debug')('Franz:RequestsStore');
+const debug = require('debug')('Ferdi:RequestsStore');
 
 export default class RequestStore extends Store {
   @observable userInfoRequest;
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index d1fd2be3d..f88b14983 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -4,19 +4,19 @@ import {
   computed,
   observable,
 } from 'mobx';
-import { debounce, remove } from 'lodash';
+import { remove } from 'lodash';
 import ms from 'ms';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
-import { gaEvent, statsEvent } from '../lib/analytics';
 import { workspaceStore } from '../features/workspaces';
 import { serviceLimitStore } from '../features/serviceLimit';
 import { RESTRICTION_TYPES } from '../models/Service';
+import { KEEP_WS_LOADED_USID } from '../config';
 
-const debug = require('debug')('Franz:ServiceStore');
+const debug = require('debug')('Ferdi:ServiceStore');
 
 export default class ServicesStore extends Store {
   @observable allServicesRequest = new CachedRequest(this.api.services, 'all');
@@ -125,7 +125,35 @@ export default class ServicesStore extends Store {
     const { keepAllWorkspacesLoaded } = this.stores.workspaces.settings;
     const services = this.allServicesRequest.execute().result || [];
     const filteredServices = showDisabledServices ? services : services.filter(service => service.isEnabled);
-    return keepAllWorkspacesLoaded ? filteredServices : workspaceStore.filterServicesByActiveWorkspace(filteredServices);
+
+    let displayedServices;
+    if (keepAllWorkspacesLoaded) {
+      // Keep all enabled services loaded
+      displayedServices = filteredServices;
+    } else {
+      // Keep all services in current workspace loaded
+      displayedServices = workspaceStore.filterServicesByActiveWorkspace(filteredServices);
+
+      // Keep all services active in workspaces that should be kept loaded
+      for (const workspace of this.stores.workspaces.workspaces) {
+        // Check if workspace needs to be kept loaded
+        if (workspace.services.includes(KEEP_WS_LOADED_USID)) {
+          // Get services for workspace
+          const serviceIDs = workspace.services.filter(i => i !== KEEP_WS_LOADED_USID);
+          const wsServices = filteredServices.filter(service => serviceIDs.includes(service.id));
+
+          displayedServices = [
+            ...displayedServices,
+            ...wsServices,
+          ];
+        }
+      }
+
+      // Make sure every service is in the list only once
+      displayedServices = displayedServices.filter((v, i, a) => a.indexOf(v) === i);
+    }
+
+    return displayedServices;
   }
 
   @computed get filtered() {
@@ -182,7 +210,6 @@ export default class ServicesStore extends Store {
 
     if (redirect) {
       this.stores.router.push('/settings/recipes');
-      gaEvent('Service', 'create', recipeId);
     }
   }
 
@@ -259,7 +286,6 @@ export default class ServicesStore extends Store {
 
     if (redirect) {
       this.stores.router.push('/settings/services');
-      gaEvent('Service', 'update', service.recipe.id);
     }
   }
 
@@ -274,19 +300,14 @@ export default class ServicesStore extends Store {
       remove(result, c => c.id === serviceId);
     });
 
-    const service = this.one(serviceId);
-
     await request._promise;
     this.actionStatus = request.result.status;
-
-    gaEvent('Service', 'delete', service.recipe.id);
   }
 
   @action async _clearCache({ serviceId }) {
     this.clearCacheRequest.reset();
     const request = this.clearCacheRequest.execute(serviceId);
     await request._promise;
-    gaEvent('Service', 'clear cache');
   }
 
   @action _setActive({ serviceId, keepActiveRoute }) {
@@ -298,8 +319,6 @@ export default class ServicesStore extends Store {
     });
     service.isActive = true;
 
-    statsEvent('activate-service', service.recipe.id);
-
     this._focusActiveService();
   }
 
@@ -402,7 +421,7 @@ export default class ServicesStore extends Store {
         },
       });
     } else if (channel === 'notification') {
-      const options = args[0].options;
+      const { options } = args[0];
       if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.app.isAppMuted) {
         Object.assign(options, {
           silent: true,
@@ -410,8 +429,17 @@ export default class ServicesStore extends Store {
       }
 
       if (service.isNotificationEnabled) {
-        const title = typeof args[0].title === 'string' ? args[0].title : service.name;
-        options.body = typeof options.body === 'string' ? options.body : '';
+        let title = `Notification from ${service.name}`;
+        if (!this.stores.settings.all.app.privateNotifications) {
+          options.body = typeof options.body === 'string' ? options.body : '';
+          title = typeof args[0].title === 'string' ? args[0].title : service.name;
+        } else {
+          // Remove message data from notification in private mode
+          options.body = '';
+          options.icon = '/assets/img/notification-badge.gif';
+        }
+
+        console.log(title, options);
 
         this.actions.app.notify({
           notificationId: args[0].notificationId,
@@ -529,7 +557,7 @@ export default class ServicesStore extends Store {
   }
 
   @action _reorderService({ oldIndex, newIndex }) {
-    const showDisabledServices = this.stores.settings.all.app.showDisabledServices;
+    const { showDisabledServices } = this.stores.settings.all.app;
     const oldEnabledSortIndex = showDisabledServices ? oldIndex : this.all.indexOf(this.enabled[oldIndex]);
     const newEnabledSortIndex = showDisabledServices ? newIndex : this.all.indexOf(this.enabled[newIndex]);
 
@@ -548,8 +576,6 @@ export default class ServicesStore extends Store {
         service.order = services[s.id];
       });
     });
-
-    this._reorderAnalytics();
   }
 
   @action _toggleNotifications({ serviceId }) {
@@ -625,8 +651,8 @@ export default class ServicesStore extends Store {
   }
 
   _getUnreadMessageCountReaction() {
-    const showMessageBadgeWhenMuted = this.stores.settings.all.app.showMessageBadgeWhenMuted;
-    const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
+    const { showMessageBadgeWhenMuted } = this.stores.settings.all.app;
+    const { showMessageBadgesEvenWhenMuted } = this.stores.ui;
 
     const unreadDirectMessageCount = this.allDisplayed
       .filter(s => (showMessageBadgeWhenMuted || s.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled)
@@ -751,10 +777,6 @@ export default class ServicesStore extends Store {
     }
   }
 
-  _reorderAnalytics = debounce(() => {
-    gaEvent('Service', 'order');
-  }, ms('5s'));
-
   _wrapIndex(index, delta, size) {
     return (((index + delta) % size) + size) % size;
   }
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 75bb38fe0..c09f24af7 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,17 +1,18 @@
-import { ipcRenderer } from 'electron';
+import { ipcRenderer, remote } from 'electron';
 import {
-  action, computed, observable,
+  action, computed, observable, reaction,
 } from 'mobx';
 import localStorage from 'mobx-localstorage';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
 import { getLocale } from '../helpers/i18n-helpers';
+import { API } from '../environment';
 
 import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 
-const debug = require('debug')('Franz:SettingsStore');
+const debug = require('debug')('Ferdi:SettingsStore');
 
 export default class SettingsStore extends Store {
   @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
@@ -43,6 +44,41 @@ export default class SettingsStore extends Store {
 
   async setup() {
     await this._migrate();
+
+    reaction(
+      () => this.all.app.autohideMenuBar,
+      () => remote.getCurrentWindow().setAutoHideMenuBar(
+        this.all.app.autohideMenuBar,
+      ),
+    );
+
+    reaction(
+      () => this.all.app.locked,
+      () => {
+        const { router } = window.ferdi.stores;
+
+        if (this.all.app.locked && this.all.app.lockingFeatureEnabled) {
+          // App just got locked, redirect to unlock screen
+          router.push('/auth/locked');
+        } else if (router.location.pathname.includes('/auth/locked')) {
+          // App is unlocked but user is still on locked screen
+          // Redirect to homepage
+          router.push('/');
+        }
+      },
+    );
+
+    // Make sure to lock app on launch if locking feature is enabled
+    setTimeout(() => {
+      if (this.all.app.lockingFeatureEnabled) {
+        this.actions.settings.update({
+          type: 'app',
+          data: {
+            locked: true,
+          },
+        });
+      }
+    }, 1000);
   }
 
   @computed get app() {
@@ -121,6 +157,7 @@ export default class SettingsStore extends Store {
           runInBackground: legacySettings.runInBackground,
           enableSystemTray: legacySettings.enableSystemTray,
           minimizeToSystemTray: legacySettings.minimizeToSystemTray,
+          server: API,
           isAppMuted: legacySettings.isAppMuted,
           enableGPUAcceleration: legacySettings.enableGPUAcceleration,
           showMessageBadgeWhenMuted: legacySettings.showMessageBadgeWhenMuted,
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index b652098f9..61b7d4adf 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -8,12 +8,11 @@ import { isDevMode } from '../environment';
 import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
-import { gaEvent } from '../lib/analytics';
 import { sleep } from '../helpers/async-helpers';
 import { getPlan } from '../helpers/plan-helpers';
 import { PLANS } from '../config';
 
-const debug = require('debug')('Franz:UserStore');
+const debug = require('debug')('Ferdi:UserStore');
 
 // TODO: split stores into UserStore and AuthStore
 export default class UserStore extends Store {
@@ -94,7 +93,7 @@ export default class UserStore extends Store {
 
     // Reactions
     this.registerReactions([
-      this._requireAuthenticatedUser,
+      // this._requireAuthenticatedUser,
       this._getUserData.bind(this),
       this._resetTrialActivationState.bind(this),
     ]);
@@ -157,7 +156,7 @@ export default class UserStore extends Store {
   }
 
   @computed get isPremium() {
-    return !!this.data.isPremium;
+    return true;
   }
 
   @computed get isPremiumOverride() {
@@ -172,12 +171,13 @@ export default class UserStore extends Store {
   }
 
   @computed get isPro() {
-    if (this.isPremiumOverride) return true;
+    return true;
+    // if (this.isPremiumOverride) return true;
 
-    if (!this.team || (!this.team.plan || this.team.state === 'expired')) return false;
-    const plan = getPlan(this.team.plan);
+    // if (!this.team || (!this.team.plan || this.team.state === 'expired')) return false;
+    // const plan = getPlan(this.team.plan);
 
-    return plan === PLANS.PRO || plan === PLANS.LEGACY;
+    // return plan === PLANS.PRO || plan === PLANS.LEGACY;
   }
 
   @computed get legacyServices() {
@@ -190,16 +190,12 @@ export default class UserStore extends Store {
     this._setUserData(authToken);
 
     this.stores.router.push('/');
-
-    gaEvent('User', 'login');
   }
 
   @action _tokenLogin(authToken) {
     this._setUserData(authToken);
 
     this.stores.router.push('/');
-
-    gaEvent('User', 'tokenLogin');
   }
 
   @action async _signup({
@@ -215,13 +211,11 @@ export default class UserStore extends Store {
       locale: this.stores.app.locale,
     });
 
-    this.hasCompletedSignup = false;
+    this.hasCompletedSignup = true;
 
     this._setUserData(authToken);
 
-    this.stores.router.push(this.PRICING_ROUTE);
-
-    gaEvent('User', 'signup');
+    this.stores.router.push('/');
   }
 
   @action async _retrievePassword({ email }) {
@@ -229,8 +223,6 @@ export default class UserStore extends Store {
 
     await request._promise;
     this.actionStatus = request.result.status || [];
-
-    gaEvent('User', 'retrievePassword');
   }
 
   @action async _activateTrial({ planId }) {
@@ -246,9 +238,6 @@ export default class UserStore extends Store {
 
     this.stores.features.featuresRequest.invalidate({ immediately: true });
     this.stores.user.getUserInfoRequest.invalidate({ immediately: true });
-
-
-    gaEvent('User', 'activateTrial');
   }
 
   @action async _invite({ invites }) {
@@ -262,8 +251,6 @@ export default class UserStore extends Store {
     if (this.stores.router.location.pathname.includes(this.INVITE_ROUTE)) {
       this.stores.router.push('/');
     }
-
-    gaEvent('User', 'inviteUsers');
   }
 
   @action async _update({ userData }) {
@@ -273,8 +260,6 @@ export default class UserStore extends Store {
 
     this.getUserInfoRequest.patch(() => response.data);
     this.actionStatus = response.status || [];
-
-    gaEvent('User', 'update');
   }
 
   @action _resetStatus() {
@@ -297,12 +282,12 @@ export default class UserStore extends Store {
     const recipes = services.filter((obj, pos, arr) => arr.map(mapObj => mapObj.recipe.id).indexOf(obj.recipe.id) === pos).map(s => s.recipe.id);
 
     // Install recipes
-    for (const recipe of recipes) {
+    for (const recipe of recipes) { // eslint-disable-line no-unused-vars
       // eslint-disable-next-line
       await this.stores.recipes._install({ recipeId: recipe });
     }
 
-    for (const service of services) {
+    for (const service of services) { // eslint-disable-line no-unused-vars
       this.actions.service.createFromLegacyService({
         data: service,
       });