From 518fb7d9debc871f500b6ac636697e76b35eb687 Mon Sep 17 00:00:00 2001
From: cleverbeagle <business@cleverbeagle.com>
Date: Thu, 7 Sep 2017 10:11:58 -0500
Subject: [PATCH] move logout functionality to logout page

---
 .../components/Authenticated/Authenticated.js |  2 +-
 .../AuthenticatedNavigation.js                |  7 ++--
 imports/ui/layouts/App/App.js                 |  2 +-
 imports/ui/pages/Login/Login.js               |  1 -
 imports/ui/pages/Logout/Logout.js             | 38 +++++++++++--------
 5 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/imports/ui/components/Authenticated/Authenticated.js b/imports/ui/components/Authenticated/Authenticated.js
index 69c2ab5..f34da2f 100644
--- a/imports/ui/components/Authenticated/Authenticated.js
+++ b/imports/ui/components/Authenticated/Authenticated.js
@@ -9,7 +9,7 @@ const Authenticated = ({ loggingIn, authenticated, component, path, exact, ...re
     render={props => (
       authenticated ?
         (React.createElement(component, { ...props, ...rest, loggingIn, authenticated })) :
-        (<Redirect to="/logout" />)
+        (<Redirect to="/login" />)
     )}
   />
 );
diff --git a/imports/ui/components/AuthenticatedNavigation/AuthenticatedNavigation.js b/imports/ui/components/AuthenticatedNavigation/AuthenticatedNavigation.js
index d8518b8..c8f6b18 100644
--- a/imports/ui/components/AuthenticatedNavigation/AuthenticatedNavigation.js
+++ b/imports/ui/components/AuthenticatedNavigation/AuthenticatedNavigation.js
@@ -1,10 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { withRouter } from 'react-router-dom';
 import { LinkContainer } from 'react-router-bootstrap';
 import { Nav, NavItem, NavDropdown, MenuItem } from 'react-bootstrap';
 import { Meteor } from 'meteor/meteor';
 
-const AuthenticatedNavigation = ({ name }) => (
+const AuthenticatedNavigation = ({ name, history }) => (
   <div>
     <Nav>
       <LinkContainer to="/documents">
@@ -17,7 +18,7 @@ const AuthenticatedNavigation = ({ name }) => (
           <NavItem eventKey={2.1} href="/profile">Profile</NavItem>
         </LinkContainer>
         <MenuItem divider />
-        <MenuItem eventKey={2.2} onClick={() => Meteor.logout()}>Logout</MenuItem>
+        <MenuItem eventKey={2.2} onClick={() => history.push('/logout')}>Logout</MenuItem>
       </NavDropdown>
     </Nav>
   </div>
@@ -27,4 +28,4 @@ AuthenticatedNavigation.propTypes = {
   name: PropTypes.string.isRequired,
 };
 
-export default AuthenticatedNavigation;
+export default withRouter(AuthenticatedNavigation);
diff --git a/imports/ui/layouts/App/App.js b/imports/ui/layouts/App/App.js
index 97a49c5..2be6a1f 100644
--- a/imports/ui/layouts/App/App.js
+++ b/imports/ui/layouts/App/App.js
@@ -56,7 +56,7 @@ const App = props => (
           <Authenticated exact path="/profile" component={Profile} {...props} />
           <Public path="/signup" component={Signup} {...props} />
           <Public path="/login" component={Login} {...props} />
-          <Public path="/logout" component={Logout} {...props} />
+          <Route path="/logout" component={Logout} {...props} />
           <Route name="verify-email" path="/verify-email/:token" component={VerifyEmail} />
           <Route name="recover-password" path="/recover-password" component={RecoverPassword} />
           <Route name="reset-password" path="/reset-password/:token" component={ResetPassword} />
diff --git a/imports/ui/pages/Login/Login.js b/imports/ui/pages/Login/Login.js
index 29f4fa2..fb7377f 100644
--- a/imports/ui/pages/Login/Login.js
+++ b/imports/ui/pages/Login/Login.js
@@ -48,7 +48,6 @@ class Login extends React.Component {
         Bert.alert(error.reason, 'danger');
       } else {
         Bert.alert('Welcome back!', 'success');
-        history.push('/documents');
       }
     });
   }
diff --git a/imports/ui/pages/Logout/Logout.js b/imports/ui/pages/Logout/Logout.js
index 59b3cbe..127c35c 100644
--- a/imports/ui/pages/Logout/Logout.js
+++ b/imports/ui/pages/Logout/Logout.js
@@ -3,21 +3,29 @@ import Icon from '../../components/Icon/Icon';
 
 import './Logout.scss';
 
-const Logout = () => (
-  <div className="Logout">
-    <img
-      src="https://s3-us-west-2.amazonaws.com/cleverbeagle-assets/graphics/email-icon.png"
-      alt="Clever Beagle"
-    />
-    <h1>Stay safe out there.</h1>
-    <p>{'Don\'t forget to like and follow Clever Beagle elsewhere on the web:'}</p>
-    <ul className="FollowUsElsewhere">
-      <li><a href="https://facebook.com/cleverbeagle"><Icon icon="facebook-official" /></a></li>
-      <li><a href="https://twitter.com/clvrbgl"><Icon icon="twitter" /></a></li>
-      <li><a href="https://github.com/cleverbeagle"><Icon icon="github" /></a></li>
-    </ul>
-  </div>
-);
+class Logout extends React.Component {
+  componentDidMount() {
+    Meteor.logout();
+  }
+
+  render() {
+    return (
+      <div className="Logout">
+        <img
+          src="https://s3-us-west-2.amazonaws.com/cleverbeagle-assets/graphics/email-icon.png"
+          alt="Clever Beagle"
+        />
+        <h1>Stay safe out there.</h1>
+        <p>{'Don\'t forget to like and follow Clever Beagle elsewhere on the web:'}</p>
+        <ul className="FollowUsElsewhere">
+          <li><a href="https://facebook.com/cleverbeagle"><Icon icon="facebook-official" /></a></li>
+          <li><a href="https://twitter.com/clvrbgl"><Icon icon="twitter" /></a></li>
+          <li><a href="https://github.com/cleverbeagle"><Icon icon="github" /></a></li>
+        </ul>
+      </div>
+    );
+  }
+}
 
 Logout.propTypes = {};