Fix random logout issues

3 files changed, 7 insertions, 4 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 0311a11a3..2bfcdf640 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -53,6 +53,8 @@ export default class AppStore extends Store {
 
   @observable isOnline = navigator.onLine;
 
+  @observable authRequestFailed = false;
+
   @observable timeOfflineStart;
 
   @observable updateStatus = null;
diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.js
index 7a85c2daa..8bdafb68c 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.js
@@ -24,9 +24,12 @@ export default class GlobalErrorStore extends Store {
           this.response = {};
         }
         if (this.error.status === 401) {
-          this.actions.user.logout({ serverLogout: true });
+          window.ferdi.stores.app.authRequestFailed = true;
+          // this.actions.user.logout({ serverLogout: true });
         }
       }
+    } else {
+      window.ferdi.stores.app.authRequestFailed = false;
     }
   });
 }
diff --git a/src/stores/NewsStore.js b/src/stores/NewsStore.js
index 43edeba8e..86e092592 100644
--- a/src/stores/NewsStore.js
+++ b/src/stores/NewsStore.js
@@ -29,9 +29,7 @@ export default class NewsStore extends Store {
   }
 
   @computed get latest() {
-    // TODO: fix random logout issues and reactivate news
-    // return this.latestNewsRequest.execute().result || [];
-    return [];
+    return this.latestNewsRequest.execute().result || [];
   }
 
   // Actions