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

---
 src/components/layout/Sidebar.js                   | 141 ++++++++++-----------
 src/components/services/content/Services.js        |  37 +-----
 .../settings/navigation/SettingsNavigation.js      |  46 +++----
 .../settings/recipes/RecipesDashboard.js           |   5 -
 src/containers/layout/AppLayoutContainer.js        |  10 ++
 5 files changed, 94 insertions(+), 145 deletions(-)

(limited to 'src')

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 57ba170e8..e3df9c2ea 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -3,12 +3,10 @@ import PropTypes from 'prop-types';
 import ReactTooltip from 'react-tooltip';
 import { defineMessages, injectIntl } from 'react-intl';
 import { inject, observer } from 'mobx-react';
-import { Link } from 'react-router';
 import {
   mdiCheckAll,
   mdiViewGrid,
   mdiPlusBox,
-  mdiLoginVariant,
   mdiCog,
   mdiBellOff,
   mdiBell,
@@ -137,7 +135,6 @@ class Sidebar extends Component {
     const workspaceToggleMessage = isWorkspaceDrawerOpen
       ? messages.closeWorkspaceDrawer
       : messages.openWorkspaceDrawer;
-    const isLoggedIn = Boolean(localStorage.getItem('authToken'));
 
     return (
       <div className="sidebar">
@@ -147,96 +144,86 @@ class Sidebar extends Component {
           disableToolTip={() => this.disableToolTip()}
           useVerticalStyle={stores.settings.all.app.useVerticalStyle}
         />
-        {isLoggedIn ? (
-          <>
-            <button
-              type="button"
-              onClick={() => openSettings({ path: 'recipes' })}
-              className="sidebar__button sidebar__button--new-service"
-              data-tip={`${intl.formatMessage(
-                messages.addNewService,
-              )} (${addNewServiceShortcutKey(false)})`}
-            >
-              <Icon icon={mdiPlusBox} size={1.5} />
-            </button>
+        <>
+          <button
+            type="button"
+            onClick={() => openSettings({ path: 'recipes' })}
+            className="sidebar__button sidebar__button--new-service"
+            data-tip={`${intl.formatMessage(
+              messages.addNewService,
+            )} (${addNewServiceShortcutKey(false)})`}
+          >
+            <Icon icon={mdiPlusBox} size={1.5} />
+          </button>
+          <button
+            type="button"
+            onClick={() => {
+              toggleWorkspaceDrawer();
+              this.updateToolTip();
+            }}
+            className={`sidebar__button sidebar__button--workspaces ${
+              isWorkspaceDrawerOpen ? 'is-active' : ''
+            }`}
+            data-tip={`${intl.formatMessage(
+              workspaceToggleMessage,
+            )} (${workspaceToggleShortcutKey(false)})`}
+          >
+            <Icon icon={mdiViewGrid} size={1.5} />
+          </button>
+          {todosStore.isFeatureEnabledByUser ? (
             <button
               type="button"
               onClick={() => {
-                toggleWorkspaceDrawer();
+                todoActions.toggleTodosPanel();
                 this.updateToolTip();
               }}
-              className={`sidebar__button sidebar__button--workspaces ${
-                isWorkspaceDrawerOpen ? 'is-active' : ''
+              disabled={isTodosServiceActive}
+              className={`sidebar__button sidebar__button--todos ${
+                todosStore.isTodosPanelVisible ? 'is-active' : ''
               }`}
               data-tip={`${intl.formatMessage(
-                workspaceToggleMessage,
-              )} (${workspaceToggleShortcutKey(false)})`}
+                todosToggleMessage,
+              )} (${todosToggleShortcutKey(false)})`}
             >
-              <Icon icon={mdiViewGrid} size={1.5} />
+              <Icon icon={mdiCheckAll} size={1.5} />
             </button>
-            {todosStore.isFeatureEnabledByUser ? (
-              <button
-                type="button"
-                onClick={() => {
-                  todoActions.toggleTodosPanel();
-                  this.updateToolTip();
-                }}
-                disabled={isTodosServiceActive}
-                className={`sidebar__button sidebar__button--todos ${
-                  todosStore.isTodosPanelVisible ? 'is-active' : ''
-                }`}
-                data-tip={`${intl.formatMessage(
-                  todosToggleMessage,
-                )} (${todosToggleShortcutKey(false)})`}
-              >
-                <Icon icon={mdiCheckAll} size={1.5} />
-              </button>
-            ) : null}
+          ) : null}
+          <button
+            type="button"
+            onClick={() => {
+              toggleMuteApp();
+              this.updateToolTip();
+            }}
+            className={`sidebar__button sidebar__button--audio ${
+              isAppMuted ? 'is-muted' : ''
+            }`}
+            data-tip={`${intl.formatMessage(
+              isAppMuted ? messages.unmute : messages.mute,
+            )} (${muteFerdiShortcutKey(false)})`}
+          >
+            <Icon icon={isAppMuted ? mdiBellOff : mdiBell} size={1.5} />
+          </button>
+
+          {stores.settings.all.app.lockingFeatureEnabled ? (
             <button
               type="button"
+              className="sidebar__button"
               onClick={() => {
-                toggleMuteApp();
-                this.updateToolTip();
+                actions.settings.update({
+                  type: 'app',
+                  data: {
+                    locked: true,
+                  },
+                });
               }}
-              className={`sidebar__button sidebar__button--audio ${
-                isAppMuted ? 'is-muted' : ''
-              }`}
               data-tip={`${intl.formatMessage(
-                isAppMuted ? messages.unmute : messages.mute,
-              )} (${muteFerdiShortcutKey(false)})`}
+                messages.lockFerdi,
+              )} (${lockFerdiShortcutKey(false)})`}
             >
-              <Icon icon={isAppMuted ? mdiBellOff : mdiBell} size={1.5} />
+              <Icon icon={mdiLock} size={1.5} />
             </button>
-
-            {stores.settings.all.app.lockingFeatureEnabled ? (
-              <button
-                type="button"
-                className="sidebar__button"
-                onClick={() => {
-                  actions.settings.update({
-                    type: 'app',
-                    data: {
-                      locked: true,
-                    },
-                  });
-                }}
-                data-tip={`${intl.formatMessage(
-                  messages.lockFerdi,
-                )} (${lockFerdiShortcutKey(false)})`}
-              >
-                <Icon icon={mdiLock} size={1.5} />
-              </button>
-            ) : null}
-          </>
-        ) : (
-          <Link
-            to="/auth/welcome"
-            className="sidebar__button sidebar__button--new-service"
-            data-tip="Login"
-          >
-            <Icon icon={mdiLoginVariant} size={1.5} />
-          </Link>
-        )}
+          ) : null}
+        </>
         <button
           type="button"
           onClick={() => openSettings({ path: 'app' })}
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index cbc70563d..9b43ea177 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -9,7 +9,6 @@ import injectSheet from 'react-jss';
 
 import ServiceView from './ServiceView';
 import Appear from '../../ui/effects/Appear';
-import serverlessLogin from '../../../helpers/serverless-helpers';
 
 const messages = defineMessages({
   getStarted: {
@@ -52,7 +51,6 @@ class Services extends Component {
     update: PropTypes.func.isRequired,
     userHasCompletedSignup: PropTypes.bool.isRequired,
     classes: PropTypes.object.isRequired,
-    actions: PropTypes.object.isRequired,
     isSpellcheckerEnabled: PropTypes.bool.isRequired,
   };
 
@@ -66,12 +64,6 @@ class Services extends Component {
 
   _confettiTimeout = null;
 
-  constructor(props) {
-    super(props);
-
-    this.useLocalServer = this.useLocalServer.bind(this);
-  }
-
   componentDidMount() {
     this._confettiTimeout = window.setTimeout(() => {
       this.setState({
@@ -86,10 +78,6 @@ class Services extends Component {
     }
   }
 
-  useLocalServer() {
-    serverlessLogin(this.props.actions);
-  }
-
   render() {
     const {
       services,
@@ -108,7 +96,6 @@ class Services extends Component {
     const { showConfetti } = this.state;
 
     const { intl } = this.props;
-    const isLoggedIn = Boolean(localStorage.getItem('authToken'));
 
     return (
       <div className="services">
@@ -129,33 +116,13 @@ class Services extends Component {
                 alt="Logo"
                 style={{ maxHeight: '50vh' }}
               />
-              {!isLoggedIn && (
-                <>
-                  <p>{intl.formatMessage(messages.login)}</p>
-                  <p>{intl.formatMessage(messages.serverInfo)}</p>
-                </>
-              )}
               <Appear timeout={300} transitionName="slideUp">
                 <Link
-                  to={isLoggedIn ? '/settings/recipes' : '/auth/welcome'}
+                  to='/settings/recipes'
                   className="button"
                 >
-                  {isLoggedIn
-                    ? intl.formatMessage(messages.getStarted)
-                    : 'Login'}
+                  {intl.formatMessage(messages.getStarted)}
                 </Link>
-                {!isLoggedIn && (
-                  <button
-                    type="button"
-                    className="button"
-                    style={{
-                      marginLeft: 10,
-                    }}
-                    onClick={this.useLocalServer}
-                  >
-                    {intl.formatMessage(messages.serverless)}
-                  </button>
-                )}
               </Appear>
             </div>
           </Appear>
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 })
                         }
                       />
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 536083c4f..c70144c8e 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -40,8 +40,18 @@ class AppLayoutContainer extends Component {
       requests,
       user,
       workspaces,
+      router
     } = this.props.stores;
 
+    /* HOTFIX for:
+      [mobx] Encountered an uncaught exception that was thrown by a reaction or observer component, in: 'Reaction[bound ]' TypeError: Cannot read properties of null (reading 'push')
+      at RouterStore.push (store.js:25)
+      at UserStore._requireAuthenticatedUser
+    */
+    if (!user.isLoggedIn) {
+      router.push('/auth/welcome');
+    }
+
     const {
       setActive,
       handleIPCMessage,
-- 
cgit v1.2.3-70-g09d2