Skip to content

Feature: Route guarding #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions application/src/router/appRouter.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
import React from 'react';
import { connect } from 'react-redux';
import { BrowserRouter as Router, Route } from 'react-router-dom';
import { Main, Login, OrderForm, ViewOrders } from '../components';
import PrivateRouter from './privateRouter';

const AppRouter = (props) => {
const AppRouter = ({ token }) => {
return (
<Router>
<Route path="/" exact component={Main} />
<Route path="/login" exact component={Login} />
<Route path="/order" exact component={OrderForm} />
<Route path="/view-orders" exact component={ViewOrders} />
<PrivateRouter token={token} path="/order" exact component={OrderForm} />
<PrivateRouter token={token} path="/view-orders" exact component={ViewOrders} />
</Router>
);
}

export default AppRouter;
const mapStateToProps = ({ auth }) => ({
token: auth.token
})

export default connect(mapStateToProps, null)(AppRouter);
20 changes: 20 additions & 0 deletions application/src/router/privateRouter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React from 'react';
import { connect } from 'react-redux';
import { Redirect, Route } from "react-router-dom";

const PrivateRouter = ({ token, component: Component, ...rest }) => {
return (
<Route {...rest} render={
(props) => token ?
<Component {...props}/> :
<Redirect to={{pathname: '/login', state: {from: props.location}}}/>
}
/>
)
}

const mapStateToProps = ({ auth }) => ({
token: auth.token
})

export default connect(mapStateToProps, null)(PrivateRouter);