Merge pull request #393 from getferdi/refactor/lock

Fix race condition in Ferdi Lock at startup

3 files changed, 39 insertions, 67 deletions

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 48a83c5a1..bd10ccb4a 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -118,21 +118,12 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                 type="button"
                 className="sidebar__button"
                 onClick={() => {
-                  // Disable lock first - otherwise the application might not update correctly
                   actions.settings.update({
                     type: 'app',
                     data: {
-                      locked: false,
+                      locked: true,
                     },
                   });
-                  setTimeout(() => {
-                    actions.settings.update({
-                      type: 'app',
-                      data: {
-                        locked: true,
-                      },
-                    });
-                  }, 0);
                 }}
                 data-tip={`${intl.formatMessage(messages.lockFerdi)} (${ctrlKey}+Shift+L)`}
               >
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index f2669a106..f66dab111 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,15 +1,15 @@
-import { remote, shell, clipboard } from 'electron';
-import { observable, autorun } from 'mobx';
+import { clipboard, remote, shell } from 'electron';
+import { autorun, observable } from 'mobx';
 import { defineMessages } from 'react-intl';
-
-import { isMac, ctrlKey, cmdKey } from '../environment';
-import { workspaceStore } from '../features/workspaces/index';
-import { workspaceActions } from '../features/workspaces/actions';
-import { announcementActions } from '../features/announcements/actions';
+import { cmdKey, ctrlKey, isMac } from '../environment';
 import { announcementsStore } from '../features/announcements';
+import { announcementActions } from '../features/announcements/actions';
 import { todosStore } from '../features/todos';
 import { todoActions } from '../features/todos/actions';
 import { CUSTOM_WEBSITE_ID } from '../features/webControls/constants';
+import { workspaceActions } from '../features/workspaces/actions';
+import { workspaceStore } from '../features/workspaces/index';
+
 
 const { app, Menu, dialog } = remote;
 
@@ -806,21 +806,12 @@ export default class FranzMenu {
       accelerator: 'CmdOrCtrl+Shift+L',
       enabled: this.stores.user.isLoggedIn && this.stores.settings.app.lockingFeatureEnabled,
       click() {
-        // Disable lock first - otherwise the application might not update correctly
         actions.settings.update({
           type: 'app',
           data: {
-            locked: false,
+            locked: true,
           },
         });
-        setTimeout(() => {
-          actions.settings.update({
-            type: 'app',
-            data: {
-              locked: true,
-            },
-          });
-        }, 0);
       },
     });
 
@@ -967,7 +958,7 @@ export default class FranzMenu {
 
     this.currentTemplate = tpl;
     const menu = Menu.buildFromTemplate(tpl);
-    const lockedMenu = Menu.buildFromTemplate([]);
+    const lockedMenu = new Menu();
     Menu.setApplicationMenu(this.stores.user.isLoggedIn && this.stores.settings.app.locked ? lockedMenu : menu);
   }
 
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 43f00b723..26e83b725 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,21 +1,18 @@
 import { ipcRenderer, remote } from 'electron';
-import {
-  action, computed, observable, reaction,
-} from 'mobx';
+import { 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, LOCAL_SERVER } from '../config';
+import { API } from '../environment';
+import { getLocale } from '../helpers/i18n-helpers';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
+import Request from './lib/Request';
+import Store from './lib/Store';
 
 const debug = require('debug')('Ferdi:SettingsStore');
 
 export default class SettingsStore extends Store {
   @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
+  startup = true;
 
   fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES;
 
@@ -30,16 +27,6 @@ export default class SettingsStore extends Store {
     // Register action handlers
     this.actions.settings.update.listen(this._update.bind(this));
     this.actions.settings.remove.listen(this._remove.bind(this));
-
-    ipcRenderer.on('appSettings', (event, resp) => {
-      debug('Get appSettings resolves', resp.type, resp.data);
-
-      Object.assign(this._fileSystemSettingsCache[resp.type], resp.data);
-    });
-
-    this.fileSystemSettingsTypes.forEach((type) => {
-      ipcRenderer.send('getAppSettings', type);
-    });
   }
 
   async setup() {
@@ -101,27 +88,30 @@ export default class SettingsStore extends Store {
       }
     });
 
-    // Make sure to lock app on launch if locking feature is enabled
-    setTimeout(() => {
-      const isLoggedIn = Boolean(localStorage.getItem('authToken'));
-      if (isLoggedIn && this.all.app.lockingFeatureEnabled) {
-        // Disable lock first - otherwise the lock might not get activated corrently
-        this.actions.settings.update({
-          type: 'app',
-          data: {
-            locked: false,
-          },
-        });
-        setTimeout(() => {
-          this.actions.settings.update({
-            type: 'app',
-            data: {
-              locked: true,
-            },
-          });
-        }, 0);
+    ipcRenderer.on('appSettings', (event, resp) => {
+      // Lock on startup if enabled in settings
+      if (this.startup && resp.type === 'app' && resp.data.lockingFeatureEnabled) {
+        this.startup = false;
+        process.nextTick(() => {
+          // If the app was previously closed unlocked
+          // we can update the `locked` setting and rely on the reaction to lock at startup
+          if (!this.all.app.locked) {
+            this.all.app.locked = true;
+          } else {
+            // Otherwise the app previously closed in a locked state
+            // We can't rely on updating the locked setting for the reaction to be triggered
+            // So we lock manually
+            window.ferdi.stores.router.push('/auth/locked');
+          }
+        })
       }
-    }, 1000);
+      debug('Get appSettings resolves', resp.type, resp.data);
+      Object.assign(this._fileSystemSettingsCache[resp.type], resp.data);
+    });
+
+    this.fileSystemSettingsTypes.forEach((type) => {
+      ipcRenderer.send('getAppSettings', type);
+    });
   }
 
   @computed get app() {