diff options
-rw-r--r-- | package.json | 1 | ||||
-rw-r--r-- | src/api/server/LocalApi.js | 1 | ||||
-rw-r--r-- | src/api/server/ServerApi.js | 1 | ||||
-rw-r--r-- | src/stores/SettingsStore.js | 12 | ||||
-rw-r--r-- | src/stores/UserStore.js | 4 | ||||
-rw-r--r-- | yarn.lock | 4 |
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 @@ | |||
49 | "minimist": "^1.2.0", | 49 | "minimist": "^1.2.0", |
50 | "mkdirp": "^0.5.1", | 50 | "mkdirp": "^0.5.1", |
51 | "mobx": "^3.1.0", | 51 | "mobx": "^3.1.0", |
52 | "mobx-localstorage": "^0.1.7", | ||
52 | "mobx-react": "^4.1.0", | 53 | "mobx-react": "^4.1.0", |
53 | "mobx-react-form": "^1.32.2", | 54 | "mobx-react-form": "^1.32.2", |
54 | "mobx-react-router": "^3.1.2", | 55 | "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 @@ | |||
1 | import { remote } from 'electron'; | 1 | import { remote } from 'electron'; |
2 | import localStorage from 'mobx-localstorage'; | ||
2 | import du from 'du'; | 3 | import du from 'du'; |
3 | 4 | ||
4 | import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js'; | 5 | 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'; | |||
3 | import tar from 'tar'; | 3 | import tar from 'tar'; |
4 | import fs from 'fs-extra'; | 4 | import fs from 'fs-extra'; |
5 | import { remote } from 'electron'; | 5 | import { remote } from 'electron'; |
6 | import localStorage from 'mobx-localstorage'; | ||
6 | 7 | ||
7 | import ServiceModel from '../../models/Service'; | 8 | import ServiceModel from '../../models/Service'; |
8 | import RecipePreviewModel from '../../models/RecipePreview'; | 9 | 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 { | |||
26 | } | 26 | } |
27 | 27 | ||
28 | @computed get all() { | 28 | @computed get all() { |
29 | console.log('get all settings'); | ||
29 | return new SettingsModel(this.allSettingsRequest.result); | 30 | return new SettingsModel(this.allSettingsRequest.result); |
30 | } | 31 | } |
31 | 32 | ||
32 | @action async _update({ settings }) { | 33 | @action async _update({ settings }) { |
33 | await this.updateSettingsRequest.execute(settings)._promise; | 34 | await this.updateSettingsRequest.execute(settings)._promise; |
34 | await this.allSettingsRequest.patch((result) => { | 35 | // await this.allSettingsRequest.patch((result) => { |
35 | if (!result) return; | 36 | // if (!result) return; |
36 | extendObservable(result, settings); | 37 | // console.log(result.runInBackground, settings.runInBackground); |
37 | }); | 38 | // extendObservable(result, settings); |
39 | // console.log(result.runInBackground); | ||
40 | // // result.update(settings); | ||
41 | // }); | ||
38 | 42 | ||
39 | // We need a little hack to wait until everything is patched | 43 | // We need a little hack to wait until everything is patched |
40 | setTimeout(() => this._shareSettingsWithMainProcess(), 0); | 44 | 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 @@ | |||
1 | import { observable, computed, action } from 'mobx'; | 1 | import { observable, computed, action } from 'mobx'; |
2 | import moment from 'moment'; | 2 | import moment from 'moment'; |
3 | import jwt from 'jsonwebtoken'; | 3 | import jwt from 'jsonwebtoken'; |
4 | import localStorage from 'mobx-localstorage'; | ||
4 | 5 | ||
5 | import { isDevMode } from '../environment'; | 6 | import { isDevMode } from '../environment'; |
6 | import Store from './lib/Store'; | 7 | import Store from './lib/Store'; |
@@ -99,7 +100,7 @@ export default class UserStore extends Store { | |||
99 | 100 | ||
100 | // Data | 101 | // Data |
101 | @computed get isLoggedIn() { | 102 | @computed get isLoggedIn() { |
102 | return this.authToken !== null && this.authToken !== undefined; | 103 | return Boolean(localStorage.getItem('authToken')); |
103 | } | 104 | } |
104 | 105 | ||
105 | // @computed get isTokenValid() { | 106 | // @computed get isTokenValid() { |
@@ -225,6 +226,7 @@ export default class UserStore extends Store { | |||
225 | 226 | ||
226 | // This is a mobx autorun which forces the user to login if not authenticated | 227 | // This is a mobx autorun which forces the user to login if not authenticated |
227 | _requireAuthenticatedUser = () => { | 228 | _requireAuthenticatedUser = () => { |
229 | console.log('requireAuthenticatedUser'); | ||
228 | if (this.isTokenExpired) { | 230 | if (this.isTokenExpired) { |
229 | this._logout(); | 231 | this._logout(); |
230 | } | 232 | } |
@@ -4270,6 +4270,10 @@ mksnapshot@^0.3.0: | |||
4270 | fs-extra "0.26.7" | 4270 | fs-extra "0.26.7" |
4271 | request "^2.79.0" | 4271 | request "^2.79.0" |
4272 | 4272 | ||
4273 | mobx-localstorage@^0.1.7: | ||
4274 | version "0.1.7" | ||
4275 | resolved "https://registry.yarnpkg.com/mobx-localstorage/-/mobx-localstorage-0.1.7.tgz#c0c64366769f390ca4a333f41912eae00cd4a9de" | ||
4276 | |||
4273 | mobx-react-form@^1.32.2: | 4277 | mobx-react-form@^1.32.2: |
4274 | version "1.32.2" | 4278 | version "1.32.2" |
4275 | resolved "https://registry.yarnpkg.com/mobx-react-form/-/mobx-react-form-1.32.2.tgz#5610dd0e4fab006acf2daf1becbedecad182a5a0" | 4279 | resolved "https://registry.yarnpkg.com/mobx-react-form/-/mobx-react-form-1.32.2.tgz#5610dd0e4fab006acf2daf1becbedecad182a5a0" |