Skip to content

Commit 857c384

Browse files
committed
switch redirect strategies, dont send POST due to jupyter xrsf cookie constraints
1 parent 872463f commit 857c384

File tree

4 files changed

+31
-35
lines changed

4 files changed

+31
-35
lines changed

src/app/Routes.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import { LogInSessions } from '../features/account/LogInSessions';
3939
import { UseAgreements } from '../features/account/UseAgreements';
4040
import { skipToken } from '@reduxjs/toolkit/dist/query';
4141
import { getMe } from '../common/api/authService';
42+
import { CDMRedirect } from '../features/cdm/CDMRedirect';
4243

4344
export const LOGIN_ROUTE = '/login';
4445
export const SIGNUP_ROUTE = '/signup';
@@ -133,6 +134,11 @@ const Routes: FC = () => {
133134
<Route index element={<Authed element={<ORCIDLinkCreateLink />} />} />
134135
</Route>
135136

137+
{/* CDM */}
138+
<Route path="/cdm">
139+
<Route path="redirect" element={<Authed element={<CDMRedirect />} />} />
140+
</Route>
141+
136142
{/* IFrame Fallback Routes */}
137143
<Route path="/fallback">
138144
<Route

src/features/cdm/CDMRedirect.tsx

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { Container, Stack } from '@mui/system';
2+
import { useEffect } from 'react';
3+
import { Loader } from '../../common/components';
4+
5+
export const CDMRedirect = () => {
6+
useEffect(() => {
7+
window.location.href = `https://cdmhub.${process.env.REACT_APP_KBASE_DOMAIN}/hub`;
8+
});
9+
return (
10+
<Container maxWidth="lg">
11+
<Stack
12+
direction={'row'}
13+
spacing={2}
14+
alignItems={'center'}
15+
paddingTop={'33%'}
16+
justifyContent={'center'}
17+
>
18+
<Loader />
19+
<div>Redirecting to CDM</div>
20+
</Stack>
21+
</Container>
22+
);
23+
};

src/features/cdm/CDMRedirectForm.tsx

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/features/layout/LeftNavBar.tsx

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
faDatabase,
1818
} from '@fortawesome/free-solid-svg-icons';
1919
import { FontAwesomeIcon as FAIcon } from '@fortawesome/react-fontawesome';
20-
import { FC, useRef, useState } from 'react';
20+
import { FC, useState } from 'react';
2121
import { Link, useLocation } from 'react-router-dom';
2222
import { getFeedsUnseenCount } from '../../common/api/feedsService';
2323
import { useAppSelector } from '../../common/hooks';
@@ -26,7 +26,6 @@ import classes from './LeftNavBar.module.scss';
2626
import { Button, Menu, MenuItem } from '@mui/material';
2727
import { getMe } from '../../common/api/authService';
2828
import { skipToken } from '@reduxjs/toolkit/dist/query';
29-
import { CDMRedirectForm } from '../cdm/CDMRedirectForm';
3029

3130
const LeftNavBar: FC = () => {
3231
const token = useAppSelector(authToken);
@@ -44,7 +43,6 @@ const LeftNavBar: FC = () => {
4443
const handleCloseMoreMenu = () => {
4544
setAnchorEl(null);
4645
};
47-
const CDMRedirectFormSubmit = useRef<() => void>();
4846

4947
return (
5048
<nav>
@@ -69,10 +67,7 @@ const LeftNavBar: FC = () => {
6967
badgeColor={'primary'}
7068
/>
7169
<NavItem
72-
path=""
73-
onClick={() => {
74-
if (CDMRedirectFormSubmit.current) CDMRedirectFormSubmit.current();
75-
}}
70+
path={'/cdm/redirect'}
7671
desc="CDM"
7772
icon={faDatabase}
7873
badge={'alpha'}
@@ -154,11 +149,6 @@ const LeftNavBar: FC = () => {
154149
</MenuItem>
155150
</Menu>
156151
</ul>
157-
<CDMRedirectForm
158-
ready={(submit) => {
159-
CDMRedirectFormSubmit.current = submit;
160-
}}
161-
/>
162152
</nav>
163153
);
164154
};

0 commit comments

Comments
 (0)