From 4b909b13fbb6d8d72ab38700b91cf18920d72fc4 Mon Sep 17 00:00:00 2001
From: kytwb <kytwb@pm.me>
Date: Sun, 19 Dec 2021 15:43:09 +0100
Subject: Hotfix for requireAuthenticatedUser error

---
 .../settings/navigation/SettingsNavigation.js      | 46 +++++++++-------------
 .../settings/recipes/RecipesDashboard.js           |  5 ---
 2 files changed, 18 insertions(+), 33 deletions(-)

(limited to 'src/components/settings')

diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 953760fec..e8370d2ef 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -57,40 +57,34 @@ class SettingsNavigation extends Component {
     workspaceCount: PropTypes.number.isRequired,
   };
 
-  handleLoginLogout() {
-    const isLoggedIn = Boolean(localStorage.getItem('authToken'));
+  handleLogout() {
     const isUsingWithoutAccount =
       this.props.stores.settings.app.server === LOCAL_SERVER;
 
-    if (isLoggedIn) {
-      // Remove current auth token
-      localStorage.removeItem('authToken');
+    // Remove current auth token
+    localStorage.removeItem('authToken');
 
-      if (isUsingWithoutAccount) {
-        // Reset server back to Ferdi API
-        this.props.actions.settings.update({
-          type: 'app',
-          data: {
-            server: LIVE_FERDI_API,
-          },
-        });
-      }
-      this.props.stores.user.isLoggingOut = true;
+    if (isUsingWithoutAccount) {
+      // Reset server back to Ferdi API
+      this.props.actions.settings.update({
+        type: 'app',
+        data: {
+          server: LIVE_FERDI_API,
+        },
+      });
     }
+    this.props.stores.user.isLoggingOut = true;
 
     this.props.stores.router.push('/auth/welcome');
 
-    if (isLoggedIn) {
-      // Reload Ferdi, otherwise many settings won't sync correctly with the server
-      // after logging into another account
-      window.location.reload();
-    }
+    // Reload Ferdi, otherwise many settings won't sync correctly with the server
+    // after logging into another account
+    window.location.reload();
   }
 
   render() {
     const { serviceCount, workspaceCount, stores } = this.props;
     const { intl } = this.props;
-    const isLoggedIn = Boolean(localStorage.getItem('authToken'));
     const isUsingWithoutAccount = stores.settings.app.server === LOCAL_SERVER;
     const isUsingFranzServer = stores.settings.app.server === LIVE_FRANZ_API;
 
@@ -107,7 +101,6 @@ class SettingsNavigation extends Component {
           to="/settings/services"
           className="settings-navigation__link"
           activeClassName="is-active"
-          disabled={!isLoggedIn}
         >
           {intl.formatMessage(messages.yourServices)}{' '}
           <span className="badge">{serviceCount}</span>
@@ -116,7 +109,6 @@ class SettingsNavigation extends Component {
           to="/settings/workspaces"
           className="settings-navigation__link"
           activeClassName="is-active"
-          disabled={!isLoggedIn}
         >
           {intl.formatMessage(messages.yourWorkspaces)}{' '}
           <span className="badge">{workspaceCount}</span>
@@ -126,7 +118,6 @@ class SettingsNavigation extends Component {
             to="/settings/user"
             className="settings-navigation__link"
             activeClassName="is-active"
-            disabled={!isLoggedIn}
           >
             {intl.formatMessage(messages.account)}
           </Link>
@@ -136,7 +127,6 @@ class SettingsNavigation extends Component {
             to="/settings/team"
             className="settings-navigation__link"
             activeClassName="is-active"
-            disabled={!isLoggedIn}
           >
             {intl.formatMessage(messages.team)}
           </Link>
@@ -158,11 +148,11 @@ class SettingsNavigation extends Component {
         <span className="settings-navigation__expander" />
         <button
           type="button"
-          to={isLoggedIn ? '/auth/logout' : '/auth/welcome'}
+          to='/auth/logout'
           className="settings-navigation__link"
-          onClick={this.handleLoginLogout.bind(this)}
+          onClick={this.handleLogout.bind(this)}
         >
-          {isLoggedIn && !isUsingWithoutAccount
+          {!isUsingWithoutAccount
             ? intl.formatMessage(messages.logout)
             : 'Exit session'}
         </button>
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index 0ba295369..4f19a6116 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -148,8 +148,6 @@ class RecipesDashboard extends Component {
     const communityRecipes = recipes.filter(r => !r.isDevRecipe);
     const devRecipes = recipes.filter(r => r.isDevRecipe);
 
-    const isLoggedIn = Boolean(localStorage.getItem('authToken'));
-
     return (
       <div className="settings__main">
         <div className="settings__header">
@@ -240,7 +238,6 @@ class RecipesDashboard extends Component {
                     key={recipe.id}
                     recipe={recipe}
                     onClick={() =>
-                      isLoggedIn &&
                       showAddServiceInterface({ recipeId: recipe.id })
                     }
                   />
@@ -253,7 +250,6 @@ class RecipesDashboard extends Component {
                       key={customWebsiteRecipe.id}
                       recipe={customWebsiteRecipe}
                       onClick={() =>
-                        isLoggedIn &&
                         showAddServiceInterface({
                           recipeId: customWebsiteRecipe.id,
                         })
@@ -274,7 +270,6 @@ class RecipesDashboard extends Component {
                         key={recipe.id}
                         recipe={recipe}
                         onClick={() =>
-                          isLoggedIn &&
                           showAddServiceInterface({ recipeId: recipe.id })
                         }
                       />
-- 
cgit v1.2.3-70-g09d2