From 04c169c56da24ecd694521989d039ec0e7d29b49 Mon Sep 17 00:00:00 2001
From: vantezzen <properly@protonmail.com>
Date: Mon, 26 Aug 2019 22:09:27 +0200
Subject: Fix random logout issues

---
 src/components/layout/AppLayout.js          | 14 ++++++++++++++
 src/containers/layout/AppLayoutContainer.js |  1 +
 src/stores/AppStore.js                      |  2 ++
 src/stores/GlobalErrorStore.js              |  5 ++++-
 src/stores/NewsStore.js                     |  4 +---
 src/styles/auth.scss                        |  2 +-
 src/styles/colors.scss                      |  1 +
 src/theme/default/legacy.js                 |  2 +-
 8 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 0aeee6781..02550c87f 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -60,6 +60,7 @@ class AppLayout extends Component {
     showServicesUpdatedInfoBar: PropTypes.bool.isRequired,
     appUpdateIsDownloaded: PropTypes.bool.isRequired,
     nextAppReleaseVersion: PropTypes.string,
+    authRequestFailed: PropTypes.bool.isRequired,
     removeNewsItem: PropTypes.func.isRequired,
     reloadServicesAfterUpdate: PropTypes.func.isRequired,
     installAppUpdate: PropTypes.func.isRequired,
@@ -91,6 +92,7 @@ class AppLayout extends Component {
       showServicesUpdatedInfoBar,
       appUpdateIsDownloaded,
       nextAppReleaseVersion,
+      authRequestFailed,
       removeNewsItem,
       reloadServicesAfterUpdate,
       installAppUpdate,
@@ -143,6 +145,18 @@ class AppLayout extends Component {
                   {intl.formatMessage(messages.requiredRequestsFailed)}
                 </InfoBar>
               )}
+              {authRequestFailed && (
+                <InfoBar
+                  type="danger"
+                  ctaLabel="Try again"
+                  ctaLoading={areRequiredRequestsLoading}
+                  sticky
+                  onClick={retryRequiredRequests}
+                >
+                  <span className="mdi mdi-flash" />
+                  There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.
+                </InfoBar>
+              )}
               {showServicesUpdatedInfoBar && (
                 <InfoBar
                   type="primary"
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index cf3da71e8..38ed85986 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -136,6 +136,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
           showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar}
           appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED}
           nextAppReleaseVersion={app.nextAppReleaseVersion}
+          authRequestFailed={app.authRequestFailed}
           sidebar={sidebar}
           workspacesDrawer={workspacesDrawer}
           services={servicesContainer}
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
diff --git a/src/styles/auth.scss b/src/styles/auth.scss
index 0a075036a..cbc720559 100644
--- a/src/styles/auth.scss
+++ b/src/styles/auth.scss
@@ -27,7 +27,7 @@
 }
 
 .auth {
-  background: $theme-brand-primary;
+  background: $theme-brand-gradient;
   display: flex;
   justify-content: center;
 
diff --git a/src/styles/colors.scss b/src/styles/colors.scss
index 80c2fb633..d89d42b9e 100644
--- a/src/styles/colors.scss
+++ b/src/styles/colors.scss
@@ -1,6 +1,7 @@
 @import "./type-helper";
 
 $theme-brand-primary:        convert-rgb-string-to-color($raw-theme-brand-primary);
+$theme-brand-gradient:       linear-gradient( 135deg, #CE9FFC 10%, #7367F0 100%);
 $theme-brand-success:        convert-rgb-string-to-color($raw-theme-brand-success);
 $theme-brand-info:           convert-rgb-string-to-color($raw-theme-brand-info);
 $theme-brand-warning:        convert-rgb-string-to-color($raw-theme-brand-warning);
diff --git a/src/theme/default/legacy.js b/src/theme/default/legacy.js
index b676dc1d9..46847c60b 100644
--- a/src/theme/default/legacy.js
+++ b/src/theme/default/legacy.js
@@ -1,5 +1,5 @@
 /* legacy config, injected into sass */
-export const themeBrandPrimary = '#3498db';
+export const themeBrandPrimary = '#7367F0';
 export const themeBrandSuccess = '#5cb85c';
 export const themeBrandInfo = '#5bc0de';
 export const themeBrandWarning = '#FF9F00';
-- 
cgit v1.2.3-54-g00ecf