16029: Fixes failed login attempt by redirecting the user to the login page.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --git a/src/store/auth/auth-action.ts b/src/store/auth/auth-action.ts
index 1d8a01c6f61ef1ee6562012cc184d17a0ea732eb..923d3c9ea693427c344fda6f5344758af153c83b 100644 (file)
--- a/src/store/auth/auth-action.ts
+++ b/src/store/auth/auth-action.ts
@@ -78,6 +78,8 @@ export const saveApiToken = (token: string) => (dispatch: Dispatch, getState: ()
     setAuthorizationHeader(svc, token);
     return svc.authService.getUserDetails().then((user: User) => {
         dispatch(authActions.INIT_USER({ user, token }));
+    }).catch(() => {
+        dispatch(authActions.LOGOUT({ deleteLinkData: false }));
     });
 };
 

diff --git a/src/views/main-panel/main-panel-root.tsx b/src/views/main-panel/main-panel-root.tsx
index e7daaf00932f0a0c8080946b22f340e2114870f9..5806f5b8276593a7a101f66f7ef3c39bdf6f2f6e 100644 (file)
--- a/src/views/main-panel/main-panel-root.tsx
+++ b/src/views/main-panel/main-panel-root.tsx
@@ -46,10 +46,16 @@ export const MainPanelRoot = withStyles(styles)(
                     buildInfo={buildInfo}
                     uuidPrefix={uuidPrefix}
                     siteBanner={siteBanner}>
-                    {working ? <LinearProgress color="secondary" /> : null}
+                    {working
+                        ? <LinearProgress color="secondary" />
+                        : null}
                 </MainAppBar>}
                 <Grid container direction="column" className={classes.root}>
-                    {user ? (user.isActive || (!user.isActive && isLinkingPath) ? <WorkbenchPanel isNotLinking={isNotLinking} isUserActive={user.isActive} /> : <InactivePanel />) : <LoginPanel />}
+                    {user
+                        ? (user.isActive || (!user.isActive && isLinkingPath)
+                            ? <WorkbenchPanel isNotLinking={isNotLinking} isUserActive={user.isActive} />
+                            : <InactivePanel />)
+                        : <LoginPanel />}
                 </Grid>
             </>
 );