ishan-marikar · June 18, 2018 10:00 · Aug 3, 2017 · Jan 31, 2017 · Jan 31, 2017 · Jan 31, 2017
diff --git a/AuthRoute.js b/AuthRoute.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { Redirect, Route } from 'react-router-dom';
 
 //Mock of an Auth method, can be replaced with an async call to the backend. Must return true or false
@@ -34,9 +35,9 @@ const AuthRoute = ({component, ...props}) => {
 };
 
 AuthRoute.propTypes = {
-  component: React.PropTypes.oneOfType([
-    React.PropTypes.element,
-    React.PropTypes.func
+  component: PropTypes.oneOfType([
+    PropTypes.element,
+    PropTypes.func
   ])
 };
 

diff --git a/AuthRoute.js b/AuthRoute.js
@@ -10,18 +10,24 @@ const PUBLIC_ROOT = '/login';
 const AuthRoute = ({component, ...props}) => {
   const { isPrivate } = component;
   if (isAuthenticated()) {
+    //User is Authenticated
     if (isPrivate === true) {
+      //If the route is private the user may proceed.
       return <Route { ...props } component={ component } />;
     }
     else {
+      //If the route is public, the user is redirected to the app's private root.
       return <Redirect to={ PRIVATE_ROOT } />;
     }
   }
   else {
+    //User is not Authenticated
     if (isPrivate === true) {
+      //If the route is private the user is redirected to the app's public root.
       return <Redirect to={ PUBLIC_ROOT } />;
     }
     else {
+      //If the route is public, the user may proceed.
       return <Route { ...props } component={ component } />;
     }
   }

diff --git a/AuthRoute.js b/AuthRoute.js
@@ -34,6 +34,4 @@ AuthRoute.propTypes = {
   ])
 };
 
-export default AuthRoute;
-
 export default AuthRoute;
diff --git a/App.js b/App.js
@@ -0,0 +1,15 @@
+//Usage
+import React from 'react';
+import { BrowserRouter as Router } from 'react-router-dom';
+import Route from './AuthRoute';
+
+import Login from './Login';
+import Private from './Private';
+
+export default () => 
+  <Router>
+    <div>
+      <Route component={ Login } path="/login" />
+      <Route component={ Private } path="/private" />
+    </div>
+  </Router>;
diff --git a/AuthRoute.js b/AuthRoute.js
@@ -0,0 +1,39 @@
+import React from 'react';
+import { Redirect, Route } from 'react-router-dom';
+
+//Mock of an Auth method, can be replaced with an async call to the backend. Must return true or false
+const isAuthenticated = () => true;
+
+const PRIVATE_ROOT = '/private';
+const PUBLIC_ROOT = '/login';
+
+const AuthRoute = ({component, ...props}) => {
+  const { isPrivate } = component;
+  if (isAuthenticated()) {
+    if (isPrivate === true) {
+      return <Route { ...props } component={ component } />;
+    }
+    else {
+      return <Redirect to={ PRIVATE_ROOT } />;
+    }
+  }
+  else {
+    if (isPrivate === true) {
+      return <Redirect to={ PUBLIC_ROOT } />;
+    }
+    else {
+      return <Route { ...props } component={ component } />;
+    }
+  }
+};
+
+AuthRoute.propTypes = {
+  component: React.PropTypes.oneOfType([
+    React.PropTypes.element,
+    React.PropTypes.func
+  ])
+};
+
+export default AuthRoute;
+
+export default AuthRoute;
diff --git a/Login.js b/Login.js
@@ -0,0 +1,10 @@
+import React from 'react';
+
+export default class Login extends React.Component {
+
+  static isPrivate = false
+
+  render() {
+    return <h1>{' Login '}</h1>;
+  }
+}
diff --git a/Private.js b/Private.js
@@ -0,0 +1,10 @@
+import React from 'react';
+
+export default class Private extends React.Component {
+
+  static isPrivate = true
+
+  render() {
+    return <h1>{' Private '}</h1>;
+  }
+}
No results found