replace localStorage with mobx-localstorage

6 files changed, 18 insertions, 5 deletions

diff --git a/package.json b/package.json
index d6b11ec96..a14367bf2 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "mobx": "^3.1.0",
+    "mobx-localstorage": "^0.1.7",
     "mobx-react": "^4.1.0",
     "mobx-react-form": "^1.32.2",
     "mobx-react-router": "^3.1.2",
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index e95d750ac..efbb42999 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -1,4 +1,5 @@
 import { remote } from 'electron';
+import localStorage from 'mobx-localstorage';
 import du from 'du';
 
 import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js';
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index d37ff51f8..8f3297d13 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -3,6 +3,7 @@ import path from 'path';
 import tar from 'tar';
 import fs from 'fs-extra';
 import { remote } from 'electron';
+import localStorage from 'mobx-localstorage';
 
 import ServiceModel from '../../models/Service';
 import RecipePreviewModel from '../../models/RecipePreview';
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();
     }
diff --git a/yarn.lock b/yarn.lock
index 834d4eb20..c788006b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4270,6 +4270,10 @@ mksnapshot@^0.3.0:
     fs-extra "0.26.7"
     request "^2.79.0"
 
+mobx-localstorage@^0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/mobx-localstorage/-/mobx-localstorage-0.1.7.tgz#c0c64366769f390ca4a333f41912eae00cd4a9de"
+
 mobx-react-form@^1.32.2:
   version "1.32.2"
   resolved "https://registry.yarnpkg.com/mobx-react-form/-/mobx-react-form-1.32.2.tgz#5610dd0e4fab006acf2daf1becbedecad182a5a0"