remove unnecessary loggingIn check when rendering authenticated and p…

…ublic routes
cleverbeagle · Jul 9, 2017 · e763aeb · e763aeb
1 parent 90e3a82
commit e763aeb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/.meteor/versions b/.meteor/versions
@@ -38,7 +38,7 @@ [email protected]
 [email protected]
 [email protected]
 fortawesome:[email protected]
-fourseven:[email protected].0
+fourseven:[email protected].4
 [email protected]
 [email protected]
 [email protected]
@@ -93,7 +93,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-themeteorchef:[email protected].2
+themeteorchef:[email protected].3
 tmeasday:[email protected]
 [email protected]
 twbs:[email protected]

diff --git a/imports/ui/components/Authenticated/Authenticated.js b/imports/ui/components/Authenticated/Authenticated.js
@@ -5,12 +5,11 @@ import { Route, Redirect } from 'react-router-dom';
 const Authenticated = ({ loggingIn, authenticated, component, ...rest }) => (
   <Route
     {...rest}
-    render={(props) => {
-      if (loggingIn) return <div />;
-      return authenticated ?
+    render={props => (
+      authenticated ?
       (React.createElement(component, { ...props, loggingIn, authenticated })) :
-      (<Redirect to="/logout" />);
-    }}
+      (<Redirect to="/logout" />)
+    )}
   />
 );
 

diff --git a/imports/ui/components/Public/Public.js b/imports/ui/components/Public/Public.js
@@ -5,12 +5,11 @@ import { Route, Redirect } from 'react-router-dom';
 const Public = ({ loggingIn, authenticated, component, ...rest }) => (
   <Route
     {...rest}
-    render={(props) => {
-      if (loggingIn) return <div />;
-      return !authenticated ?
+    render={props => (
+      !authenticated ?
       (React.createElement(component, { ...props, loggingIn, authenticated })) :
-      (<Redirect to="/documents" />);
-    }}
+      (<Redirect to="/documents" />)
+    )}
   />
 );