4 files changed, 7 insertions, 7 deletions
diff --git a/app/client/auth/auth.actions.js b/app/client/auth/auth.actions.js
index 3171996..8d9a819 100644
--- a/app/client/auth/auth.actions.js
+++ b/app/client/auth/auth.actions.js
@@ -45,7 +45,8 @@ export function login(username, password) {
     .then(req => req.json())
     .then(data => {
       console.log(data)
-      dispatch(setToken(data.token))
+      dispatch(setCurrentUser(data))
+      // dispatch(setToken(data.token))
       dispatch(checkin())
     })
     .catch(error => {
@@ -71,7 +72,7 @@ export function signup(data) {
   }
 }
 
-export function checkin(history) {
+export function checkin() {
   return (dispatch) => {
     dispatch(loading())
     fetch(api.checkin, put({}))
@@ -83,7 +84,6 @@ export function checkin(history) {
     })
     .catch(error => {
       console.log(error)
-      // history.go('/login')
       dispatch(initialized(true))
     })
   }
diff --git a/app/client/auth/auth.gate.js b/app/client/auth/auth.gate.js
index 8bedfa9..4890864 100644
--- a/app/client/auth/auth.gate.js
+++ b/app/client/auth/auth.gate.js
@@ -23,8 +23,8 @@ class AuthRouter extends Component {
             <Route exact path='/login' component={Login} />
             <Route exact path='/logout' component={Logout} />
             <Route exact path='/signup' component={Signup} />
-            <Route component={() => {
-              props.actions.setReturnTo(props.location.pathname)
+            <Route component={props => {
+              this.props.actions.setReturnTo(props.location.pathname)
               return (
                 <Redirect to="/login" />
               )
diff --git a/app/client/auth/login.component.js b/app/client/auth/login.component.js
index d2b7145..3cfcb78 100644
--- a/app/client/auth/login.component.js
+++ b/app/client/auth/login.component.js
@@ -31,7 +31,7 @@ class Login extends Component {
   }
   render(){
     if (this.props.auth.isAuthenticated) {
-      return <Redirect to="/" />
+      return <Redirect to={this.props.auth.returnTo || '/'} />
     }
     return (
       <form onSubmit={this.handleSubmit}>
diff --git a/app/client/auth/signup.component.js b/app/client/auth/signup.component.js
index 6f9cdaf..87e6ac6 100644
--- a/app/client/auth/signup.component.js
+++ b/app/client/auth/signup.component.js
@@ -39,7 +39,7 @@ class Signup extends Component {
   }
   render(){
     if (this.props.auth.isAuthenticated) {
-      return <Redirect to="/" />
+      return <Redirect to={this.props.auth.returnTo || '/'} />
     }
     return (
       <form onSubmit={this.handleSubmit}>