Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-04-10 01:16:39 +02:00
Code Issues Projects Releases Wiki Activity

fix: update PR based on feedback

Browse Source
This commit is contained in:
Youssef 2022-02-21 16:24:07 +01:00
parent a47d53d0f4
commit 1796aeb3ea
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/component/App.tsx
View File

@ -87,6 +87,7 @@ export const App = () => {
path="/" path="/"
unauthorized={isUnauthorized()} unauthorized={isUnauthorized()}
component={Redirect} component={Redirect}
renderProps={{ to: '/features' }}
/> />
{renderMainLayoutRoutes()} {renderMainLayoutRoutes()}
{renderStandaloneRoutes()} {renderStandaloneRoutes()}

5
frontend/src/component/common/ProtectedRoute/ProtectedRoute.jsx
View File

@ -1,4 +1,4 @@
import { Route, useLocation, useHistory } from 'react-router-dom'; import { Route, useLocation, Redirect } from 'react-router-dom';
const ProtectedRoute = ({ const ProtectedRoute = ({
component: Component, component: Component,
@ -7,7 +7,6 @@ const ProtectedRoute = ({
...rest ...rest
}) => { }) => {
const { pathname } = useLocation(); const { pathname } = useLocation();
const history = useHistory();
const loginLink = const loginLink =
pathname.length > 1 ? `/login?redirect=${pathname}` : '/login'; pathname.length > 1 ? `/login?redirect=${pathname}` : '/login';
return ( return (
@ -15,7 +14,7 @@ const ProtectedRoute = ({
{...rest} {...rest}
render={props => { render={props => {
if (unauthorized) { if (unauthorized) {
history.push(loginLink); return <Redirect to={loginLink} />;
} else { } else {
return <Component {...props} {...renderProps} />; return <Component {...props} {...renderProps} />;
} }

1
frontend/src/component/user/DemoAuth/DemoAuth.jsx
View File

@ -90,6 +90,7 @@ const DemoAuth = ({ authDetails, redirect }) => {
DemoAuth.propTypes = { DemoAuth.propTypes = {
authDetails: PropTypes.object.isRequired, authDetails: PropTypes.object.isRequired,
redirect: PropTypes.string.isRequired,
}; };
export default DemoAuth; export default DemoAuth;

7
frontend/src/component/user/Login/Login.tsx
View File

@ -7,7 +7,7 @@ import { DEMO_TYPE } from '../../../constants/authTypes';
import Authentication from '../Authentication/Authentication'; import Authentication from '../Authentication/Authentication';
import { useAuthDetails } from '../../../hooks/api/getters/useAuth/useAuthDetails'; import { useAuthDetails } from '../../../hooks/api/getters/useAuth/useAuthDetails';
import { useAuthUser } from '../../../hooks/api/getters/useAuth/useAuthUser'; import { useAuthUser } from '../../../hooks/api/getters/useAuth/useAuthUser';
import { useHistory } from 'react-router-dom'; import { Redirect, useHistory } from 'react-router-dom';
const Login = () => { const Login = () => {
const styles = useStyles(); const styles = useStyles();
@ -15,11 +15,10 @@ const Login = () => {
const { user } = useAuthUser(); const { user } = useAuthUser();
const query = useQueryParams(); const query = useQueryParams();
const resetPassword = query.get('reset') === 'true'; const resetPassword = query.get('reset') === 'true';
const redirect = query.get('redirect') || '/features'; const redirect = query.get('redirect') || '/';
const history = useHistory();
if (user) { if (user) {
history.replace(redirect); return <Redirect to={redirect} />;
} }
return ( return (