replace localStorage with mobx-localstorage

2 files changed, 11 insertions, 5 deletions

diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index da99a720f..26d895b7e 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -26,15 +26,19 @@ export default class SettingsStore extends Store {
   }
 
   @computed get all() {
+    console.log('get all settings');
     return new SettingsModel(this.allSettingsRequest.result);
   }
 
   @action async _update({ settings }) {
     await this.updateSettingsRequest.execute(settings)._promise;
-    await this.allSettingsRequest.patch((result) => {
-      if (!result) return;
-      extendObservable(result, settings);
-    });
+    // await this.allSettingsRequest.patch((result) => {
+    //   if (!result) return;
+    //   console.log(result.runInBackground, settings.runInBackground);
+    //   extendObservable(result, settings);
+    //   console.log(result.runInBackground);
+    //   // result.update(settings);
+    // });
 
     // We need a little hack to wait until everything is patched
     setTimeout(() => this._shareSettingsWithMainProcess(), 0);
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index abec4df5d..7b8ffb2b2 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -1,6 +1,7 @@
 import { observable, computed, action } from 'mobx';
 import moment from 'moment';
 import jwt from 'jsonwebtoken';
+import localStorage from 'mobx-localstorage';
 
 import { isDevMode } from '../environment';
 import Store from './lib/Store';
@@ -99,7 +100,7 @@ export default class UserStore extends Store {
 
   // Data
   @computed get isLoggedIn() {
-    return this.authToken !== null && this.authToken !== undefined;
+    return Boolean(localStorage.getItem('authToken'));
   }
 
   // @computed get isTokenValid() {
@@ -225,6 +226,7 @@ export default class UserStore extends Store {
 
   // This is a mobx autorun which forces the user to login if not authenticated
   _requireAuthenticatedUser = () => {
+    console.log('requireAuthenticatedUser');
     if (this.isTokenExpired) {
       this._logout();
     }