Move default feature config to config.js

2 files changed, 8 insertions, 6 deletions

diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 59abeb218..9480e27ab 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -7,6 +7,8 @@ import delayApp from '../features/delayApp';
 import spellchecker from '../features/spellchecker';
 import serviceProxy from '../features/serviceProxy';
 
+import { DEFAULT_FEATURES_CONFIG } from '../config';
+
 export default class FeaturesStore extends Store {
   @observable defaultFeaturesRequest = new CachedRequest(this.api.features, 'default');
   @observable featuresRequest = new CachedRequest(this.api.features, 'features');
@@ -22,10 +24,10 @@ export default class FeaturesStore extends Store {
 
   @computed get features() {
     if (this.stores.user.isLoggedIn) {
-      return this.featuresRequest.execute().result || {};
+      return this.featuresRequest.execute().result || DEFAULT_FEATURES_CONFIG;
     }
 
-    return this.defaultFeaturesRequest.execute().result || {};
+    return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG;
   }
 
   _monitorLoginStatus() {
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 9d8ac5657..d1e6d6570 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -122,13 +122,13 @@ export default class UserStore extends Store {
   }
 
   @computed get data() {
-    this.getUserInfoRequest.execute();
-    return this.getUserInfoRequest.result || {};
+    if (!this.isLoggedIn) return {};
+    
+    return this.getUserInfoRequest.execute().result || {};
   }
 
   @computed get legacyServices() {
-    this.getLegacyServicesRequest.execute();
-    return this.getLegacyServicesRequest.result || [];
+    return this.getLegacyServicesRequest.execute() || {};
   }
 
   // Actions