From ce7898fbd6d26f394410b4c4410c84566b7f6ab5 Mon Sep 17 00:00:00 2001
From: jasquat <jasquat@users.noreply.github.com>
Date: Mon, 25 Sep 2023 11:31:02 -0400
Subject: [PATCH] some fixes for the error page when backend is down w/
 burnettk

---
 spiffworkflow-frontend/src/App.tsx            |   6 -
 .../src/ContainerForExtensions.tsx            |   2 +
 .../src/components/NavigationBar.tsx          | 111 +++++++++---------
 spiffworkflow-frontend/src/index.tsx          |   2 -
 4 files changed, 58 insertions(+), 63 deletions(-)

diff --git a/spiffworkflow-frontend/src/App.tsx b/spiffworkflow-frontend/src/App.tsx
index fc2bf60e..998a6605 100644
--- a/spiffworkflow-frontend/src/App.tsx
+++ b/spiffworkflow-frontend/src/App.tsx
@@ -3,16 +3,10 @@ import { defineAbility } from '@casl/ability';
 import React from 'react';
 
 import { AbilityContext } from './contexts/Can';
-import UserService from './services/UserService';
 import APIErrorProvider from './contexts/APIErrorContext';
 import ContainerForExtensions from './ContainerForExtensions';
 
 export default function App() {
-  if (!UserService.isLoggedIn()) {
-    UserService.doLogin();
-    return null;
-  }
-
   const ability = defineAbility(() => {});
   return (
     <div className="cds--white">
diff --git a/spiffworkflow-frontend/src/ContainerForExtensions.tsx b/spiffworkflow-frontend/src/ContainerForExtensions.tsx
index b9382cbc..22eb8775 100644
--- a/spiffworkflow-frontend/src/ContainerForExtensions.tsx
+++ b/spiffworkflow-frontend/src/ContainerForExtensions.tsx
@@ -18,6 +18,7 @@ import HttpService from './services/HttpService';
 import { ErrorBoundaryFallback } from './ErrorBoundaryFallack';
 import BaseRoutes from './routes/BaseRoutes';
 import BackendIsDown from './routes/BackendIsDown';
+import UserService from './services/UserService';
 
 export default function ContainerForExtensions() {
   const [backendIsUp, setBackendIsUp] = useState<boolean | null>(null);
@@ -93,6 +94,7 @@ export default function ContainerForExtensions() {
   ]);
 
   const routeComponents = () => {
+    UserService.loginIfNeeded();
     return (
       <Routes>
         <Route
diff --git a/spiffworkflow-frontend/src/components/NavigationBar.tsx b/spiffworkflow-frontend/src/components/NavigationBar.tsx
index 6b20374f..cc9fc7a7 100644
--- a/spiffworkflow-frontend/src/components/NavigationBar.tsx
+++ b/spiffworkflow-frontend/src/components/NavigationBar.tsx
@@ -27,7 +27,6 @@ import { useUriListForPermissions } from '../hooks/UriListForPermissions';
 import { PermissionsToCheck } from '../interfaces';
 import { UiSchemaUxElement } from '../extension_ui_schema_interfaces';
 import { usePermissionFetcher } from '../hooks/PermissionService';
-import { UnauthenticatedError } from '../services/HttpService';
 import { DOCUMENTATION_URL, SPIFF_ENVIRONMENT } from '../config';
 import appVersionInfo from '../helpers/appVersionInfo';
 import { slugifyString } from '../helpers';
@@ -50,11 +49,6 @@ export default function NavigationBar({ extensionUxElements }: OwnProps) {
   const [activeKey, setActiveKey] = useState<string>('');
 
   const { targetUris } = useUriListForPermissions();
-
-  // App.jsx forces login (which redirects to keycloak) so we should never get here if we're not logged in.
-  if (!UserService.isLoggedIn()) {
-    throw new UnauthenticatedError('You must be authenticated to do this.');
-  }
   const permissionRequestData: PermissionsToCheck = {
     [targetUris.authenticationListPath]: ['GET'],
     [targetUris.messageInstanceListPath]: ['GET'],
@@ -99,12 +93,6 @@ export default function NavigationBar({ extensionUxElements }: OwnProps) {
     return activeKey === menuItemPath;
   };
 
-  let aboutLinkElement = null;
-
-  if (Object.keys(versionInfo).length) {
-    aboutLinkElement = <a href="/about">About</a>;
-  }
-
   const userEmail = UserService.getUserEmail();
   const username = UserService.getPreferredUsername();
 
@@ -113,48 +101,56 @@ export default function NavigationBar({ extensionUxElements }: OwnProps) {
     return <a href={navItemPage}>{uxElement.label}</a>;
   };
 
-  const profileToggletip = (
-    <div style={{ display: 'flex' }} id="user-profile-toggletip">
-      <Toggletip isTabTip align="bottom-right">
-        <ToggletipButton
-          aria-label="User Actions"
-          className="user-profile-toggletip-button"
-          type="button"
-        >
-          <div className="user-circle">{username[0].toUpperCase()}</div>
-        </ToggletipButton>
-        <ToggletipContent className="user-profile-toggletip-content">
-          <p>
-            <strong>{username}</strong>
-          </p>
-          {username !== userEmail && <p>{userEmail}</p>}
-          <hr />
-          {aboutLinkElement}
-          <a target="_blank" href={documentationUrl} rel="noreferrer">
-            Documentation
-          </a>
-          <ExtensionUxElementForDisplay
-            displayLocation="user_profile_item"
-            elementCallback={extensionUserProfileElement}
-            extensionUxElements={extensionUxElements}
-          />
-          {!UserService.authenticationDisabled() ? (
-            <>
-              <hr />
-              <Button
-                data-qa="logout-button"
-                className="button-link"
-                onClick={handleLogout}
-              >
-                <Logout />
-                &nbsp;&nbsp;Sign out
-              </Button>
-            </>
-          ) : null}
-        </ToggletipContent>
-      </Toggletip>
-    </div>
-  );
+  const profileToggletip = () => {
+    let aboutLinkElement = null;
+
+    if (Object.keys(versionInfo).length) {
+      aboutLinkElement = <a href="/about">About</a>;
+    }
+
+    return (
+      <div style={{ display: 'flex' }} id="user-profile-toggletip">
+        <Toggletip isTabTip align="bottom-right">
+          <ToggletipButton
+            aria-label="User Actions"
+            className="user-profile-toggletip-button"
+            type="button"
+          >
+            <div className="user-circle">{username[0].toUpperCase()}</div>
+          </ToggletipButton>
+          <ToggletipContent className="user-profile-toggletip-content">
+            <p>
+              <strong>{username}</strong>
+            </p>
+            {username !== userEmail && <p>{userEmail}</p>}
+            <hr />
+            {aboutLinkElement}
+            <a target="_blank" href={documentationUrl} rel="noreferrer">
+              Documentation
+            </a>
+            <ExtensionUxElementForDisplay
+              displayLocation="user_profile_item"
+              elementCallback={extensionUserProfileElement}
+              extensionUxElements={extensionUxElements}
+            />
+            {!UserService.authenticationDisabled() ? (
+              <>
+                <hr />
+                <Button
+                  data-qa="logout-button"
+                  className="button-link"
+                  onClick={handleLogout}
+                >
+                  <Logout />
+                  &nbsp;&nbsp;Sign out
+                </Button>
+              </>
+            ) : null}
+          </ToggletipContent>
+        </Toggletip>
+      </div>
+    );
+  };
 
   const loginAndLogoutAction = () => {
     if (UserService.isLoggedIn()) {
@@ -168,7 +164,7 @@ export default function NavigationBar({ extensionUxElements }: OwnProps) {
               {SPIFF_ENVIRONMENT}
             </HeaderGlobalAction>
           ) : null}
-          {profileToggletip}
+          {profileToggletip()}
         </>
       );
     }
@@ -292,6 +288,11 @@ export default function NavigationBar({ extensionUxElements }: OwnProps) {
     );
   };
 
+  // App.jsx forces login (which redirects to keycloak) so we should never get here if we're not logged in.
+  if (!UserService.isLoggedIn()) {
+    return null;
+  }
+
   if (activeKey && ability && !UserService.onlyGuestTaskCompletion()) {
     return (
       <HeaderContainer
diff --git a/spiffworkflow-frontend/src/index.tsx b/spiffworkflow-frontend/src/index.tsx
index 0c28d84e..b9c0f6a2 100644
--- a/spiffworkflow-frontend/src/index.tsx
+++ b/spiffworkflow-frontend/src/index.tsx
@@ -6,7 +6,6 @@ import './index.scss';
 import './index.css';
 
 import reportWebVitals from './reportWebVitals';
-import UserService from './services/UserService';
 
 // @ts-expect-error TS(2345) FIXME: Argument of type 'HTMLElement | null' is not assig... Remove this comment to see the full error message
 const root = ReactDOMClient.createRoot(document.getElementById('root'));
@@ -19,7 +18,6 @@ const doRender = () => {
   );
 };
 
-UserService.loginIfNeeded();
 doRender();
 
 // If you want to start measuring performance in your app, pass a function