Merge branch 'master' of https://github.com/vitoc/react-redux-jwt-authentication-example

Author: Vito Chin

package-lock.json

@@ -9,6 +9,7 @@ import { HomePage } from '../HomePage';
 import { LoginPage } from '../LoginPage';
 import { LogoutPage } from '../LogoutPage';
 
+
 class App extends React.Component {
     constructor(props) {
         super(props);
@@ -21,7 +22,8 @@ class App extends React.Component {
     }
 
     render() {
-        const { alert } = this.props;
+        const { alert, token } = this.props;
+
         return (
             <div className="jumbotron">
                 <div className="container">
@@ -31,7 +33,7 @@ class App extends React.Component {
                         }
                         <Router history={history}>
                             <div>
-                                <PrivateRoute exact path="/" component={HomePage} />
+                                <PrivateRoute exact path="/" component={HomePage} token={token}/>
                                 <Route path="/login" component={LoginPage} />
                                 <Route path="/logout" component={LogoutPage} />                                
                                 <Route path='/auth' component={() => { window.location = authUrl; return null;} }/>
@@ -45,9 +47,10 @@ class App extends React.Component {
 }
 
 function mapStateToProps(state) {
-    const { alert } = state;
+    const { alert, token } = state;
     return {
-        alert
+        alert,
+        token
     };
 }
 

src/App/App.jsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { Route, Redirect } from 'react-router-dom';
 
-export const PrivateRoute = ({ component: Component, ...rest }) => (
+export const PrivateRoute = ({ component: Component, token, ...rest }) => (
     <Route {...rest} render={props => (
-        localStorage.getItem('user')
+        (token !== null)
             ? <Component {...props} />
             : <Redirect to={'/auth'} />
     )} />

src/_components/PrivateRoute.jsx

@@ -8,4 +8,6 @@ export const userConstants = {
     GETALL_REQUEST: 'USERS_GETALL_REQUEST',
     GETALL_SUCCESS: 'USERS_GETALL_SUCCESS',
     GETALL_FAILURE: 'USERS_GETALL_FAILURE',
+
+    SET_TOKEN: 'SET_TOKEN'
 };

src/_constants/user.constants.js

@@ -3,11 +3,13 @@ import { combineReducers } from 'redux';
 import { authentication } from './authentication.reducer';
 import { users } from './users.reducer';
 import { alert } from './alert.reducer';
+import { token } from './token.reducer';
 
 const rootReducer = combineReducers({
   authentication,
   users,
-  alert
+  alert,
+  token
 });
 
 export default rootReducer;

src/_reducers/index.js

@@ -0,0 +1,10 @@
+import { userConstants } from '../_constants';
+
+export function token(state = null, action) {
+  switch (action.type) {
+    case userConstants.SET_TOKEN:
+      return action.token;
+    default:
+      return state;
+  }
+}