김장현
8 months ago
14 changed files with 167 additions and 96 deletions
@ -1,37 +0,0 @@ |
|||||||
import { useEffect } from 'react'; |
|
||||||
import { useDispatch } from 'react-redux'; |
|
||||||
import { Redirect, RouteComponentProps } from 'react-router-dom'; |
|
||||||
import { useSelector } from '@store/storeConfig/store'; |
|
||||||
import { IRoute } from '../routes/type'; |
|
||||||
import * as Actions from '../../modules/account/auth/actions'; |
|
||||||
|
|
||||||
interface IFinalRoute extends RouteComponentProps { |
|
||||||
route: IRoute; |
|
||||||
} |
|
||||||
|
|
||||||
export default function AuthRoutes(props: IFinalRoute) { |
|
||||||
const { isLogin } = useSelector(state => state.authState); |
|
||||||
const dispatch = useDispatch(); |
|
||||||
|
|
||||||
useEffect(() => { |
|
||||||
if (!isLogin) { |
|
||||||
dispatch(Actions.check.request()); |
|
||||||
} |
|
||||||
}, [isLogin]); |
|
||||||
|
|
||||||
if (isLogin === false && !props.route.meta?.authRoute) { |
|
||||||
return <Redirect to='/account/login' />; |
|
||||||
} else { |
|
||||||
const Component: (props: IFinalRoute) => JSX.Element = props.route |
|
||||||
.component as (props: IFinalRoute) => JSX.Element; |
|
||||||
// switch (props.route.path) {
|
|
||||||
// case '/account/register':
|
|
||||||
// case '/account/find':
|
|
||||||
// return <Redirect to='/main/dashboard' />;
|
|
||||||
// default:
|
|
||||||
// return <route.component {...props} />;
|
|
||||||
// }
|
|
||||||
|
|
||||||
return <Component {...props} />; |
|
||||||
} |
|
||||||
} |
|
@ -0,0 +1,43 @@ |
|||||||
|
import { ReactNode, useEffect } from 'react'; |
||||||
|
import { useDispatch } from 'react-redux'; |
||||||
|
import { Redirect, RouteComponentProps } from 'react-router-dom'; |
||||||
|
import { useSelector } from '@store/storeConfig/store'; |
||||||
|
import { IRoute } from '../routes/type'; |
||||||
|
import * as Actions from '../../modules/account/auth/actions'; |
||||||
|
import clientInstance from '../../modules/utils/customAxiosUtil'; |
||||||
|
|
||||||
|
interface IOption { |
||||||
|
authRoute?: boolean; |
||||||
|
} |
||||||
|
|
||||||
|
export default function (SpecificComponent: ReactNode, option: IOption) { |
||||||
|
function AuthenticationCheck(props: RouteComponentProps) { |
||||||
|
const user = useSelector(state => state.authState.user); |
||||||
|
const dispatch = useDispatch(); |
||||||
|
useEffect(() => { |
||||||
|
const tokenVerification = async () => { |
||||||
|
try { |
||||||
|
const { authRoute } = option; |
||||||
|
if (authRoute) { |
||||||
|
const { |
||||||
|
data: { result } |
||||||
|
} = await clientInstance.get('/api/acnt/jwt/valid/token'); |
||||||
|
if (!result) { |
||||||
|
props.history.push('/account/login'); |
||||||
|
} |
||||||
|
dispatch(Actions.check.request()); |
||||||
|
} |
||||||
|
} catch (error) { |
||||||
|
props.history.push('/account/login'); |
||||||
|
} |
||||||
|
}; |
||||||
|
|
||||||
|
tokenVerification(); |
||||||
|
}, []); |
||||||
|
const Component: (props: RouteComponentProps) => JSX.Element = |
||||||
|
SpecificComponent as (props: RouteComponentProps) => JSX.Element; |
||||||
|
|
||||||
|
return <Component {...props} />; |
||||||
|
} |
||||||
|
return AuthenticationCheck; |
||||||
|
} |
@ -1,18 +1,14 @@ |
|||||||
import { lazy } from 'react'; |
import { lazy } from 'react'; |
||||||
|
|
||||||
const RouteWeather = [ |
const RouteWeather = [ |
||||||
|
|
||||||
{ |
{ |
||||||
path: '/weather/info/index', |
path: '/weather/info/index', |
||||||
component: lazy(() => |
component: lazy(() => import('../../views/weather/WeatherView')), |
||||||
import('../../views/weather/WeatherView') |
layout: 'BlankLayout', |
||||||
), |
meta: { |
||||||
layout: 'BlankLayout' |
authRoute: true |
||||||
// meta: {
|
} |
||||||
// open: '/analysis/history/list'
|
|
||||||
// // naveLink: '/analysis/history/detail'
|
|
||||||
// }
|
|
||||||
} |
} |
||||||
]; |
]; |
||||||
|
|
||||||
export default RouteWeather; |
export default RouteWeather; |
||||||
|
Loading…
Reference in new issue