diff --git a/front/src/App.js b/front/src/App.js index 5a986feea6e08cbdc3f5ff4d56d9c42f0a04b755..996cc9f9ce58a1d988b74094a809cb9fbcf9f920 100644 --- a/front/src/App.js +++ b/front/src/App.js @@ -1,14 +1,15 @@ import React from 'react'; -import { BrowserRouter as Router, Route, Redirect} from 'react-router-dom'; +import { BrowserRouter as Router, Route } from 'react-router-dom'; import './App.css'; import MainPage from './view/mainPage'; import Login from './view/Login'; import env from './.env' +import isLogged from './utils/Oauth'; function App() { return ( <Router > - <Route exact path='/' render={()=>false ? <MainPage/> : window.location=`${env.backURL}/oauth/login`}/> + <Route exact path='/' render={()=>isLogged() ? <MainPage/> : window.location=`${env.backURL}/oauth/login`}/> <Route exact path='/login/:token' component={Login} /> </Router> ); diff --git a/front/src/utils/Oauth.js b/front/src/utils/Oauth.js new file mode 100644 index 0000000000000000000000000000000000000000..8e36654dc4dde0e549afcb2f7cca06c51f0f88c8 --- /dev/null +++ b/front/src/utils/Oauth.js @@ -0,0 +1,9 @@ +function isLogged() { + let token = localStorage.getItem("token"); + if (token) { + return ((/^ey.*/).test(token)) + } + return false; +} + +export default isLogged; diff --git a/front/src/view/Login.js b/front/src/view/Login.js index e8bd6a0771c23e52b7ddcc46ccd03d55067ffd36..e1e3f456aa1a2420bc5f39617263568a5e5a8d06 100644 --- a/front/src/view/Login.js +++ b/front/src/view/Login.js @@ -5,12 +5,13 @@ class Login extends Component { componentDidMount(){ localStorage.setItem("token",this.props.match.params.token); console.log(localStorage.getItem("token")); + window.location = '/'; } render(){ return ( - <div>tesst</div> + <div>Vous allez ĂȘtre redirigĂ©</div> ) } }