14841: Pass token when switching to workbench v1

Avoids "not logged in" bugs, making user log in again, or being logged
in as a different users in workbench v1 and v2.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/src/views-components/main-app-bar/account-menu.tsx b/src/views-components/main-app-bar/account-menu.tsx
index 271cf00f28a61df75f0f47b54a62b79f95fbd3cd..c04d0045a226ec68ae4b8206e37b5167390ed3bb 100644 (file)
--- a/src/views-components/main-app-bar/account-menu.tsx
+++ b/src/views-components/main-app-bar/account-menu.tsx
@@ -25,12 +25,14 @@ interface AccountMenuProps {
     user?: User;
     currentRoute: string;
     workbenchURL: string;
+    apiToken?: string;
 }
 
 const mapStateToProps = (state: RootState): AccountMenuProps => ({
     user: state.auth.user,
     currentRoute: state.router.location ? state.router.location.pathname : '',
     workbenchURL: state.config.workbenchUrl,
+    apiToken: state.auth.apiToken
 });
 
 const wb1URL = (route: string) => {
@@ -54,7 +56,7 @@ const styles: StyleRulesCallback<CssRules> = () => ({
 
 export const AccountMenu = withStyles(styles)(
     connect(mapStateToProps)(
-        ({ user, dispatch, currentRoute, workbenchURL, classes }: AccountMenuProps & DispatchProp<any> & WithStyles<CssRules>) =>
+        ({ user, dispatch, currentRoute, workbenchURL, apiToken, classes }: AccountMenuProps & DispatchProp<any> & WithStyles<CssRules>) =>
             user
                 ? <DropdownMenu
                     icon={<UserPanelIcon />}
@@ -71,7 +73,7 @@ export const AccountMenu = withStyles(styles)(
                     <MenuItem onClick={() => dispatch(navigateToSiteManager)}>Site Manager</MenuItem>
                     <MenuItem onClick={() => dispatch(navigateToMyAccount)}>My account</MenuItem>
                     <MenuItem>
-                        <a href={`${workbenchURL.replace(/\/$/, "")}/${wb1URL(currentRoute)}`}
+                        <a href={`${workbenchURL.replace(/\/$/, "")}/${wb1URL(currentRoute)}?api_token=${apiToken}`}
                             className={classes.link}>
                             Switch to Workbench v1</a></MenuItem>
                     <Divider />