signup

2 files changed, 9 insertions, 6 deletions

diff --git a/app/client/auth/auth.actions.js b/app/client/auth/auth.actions.js
index 33af206..c4d9b52 100644
--- a/app/client/auth/auth.actions.js
+++ b/app/client/auth/auth.actions.js
@@ -46,10 +46,9 @@ export function login(username, password) {
     .then(data => {
       console.log(data)
       dispatch(setCurrentUser(data.user))
-      // dispatch(setToken(data.token))
     })
     .catch(error => {
-      console.log(error)
+      console.error(error)
       dispatch(setError(true))
     })
   }
@@ -62,10 +61,10 @@ export function signup(data) {
     .then(req => req.json())
     .then(data => {
       console.log(data)
-      dispatch(login(data.username, data.password))
+      dispatch(setCurrentUser(data.user))
     })
     .catch(error => {
-      console.log(error)
+      console.error(error)
       dispatch(initialized())
     })
   }
@@ -80,7 +79,7 @@ export function checkin() {
       dispatch(setCurrentUser(data.user))
     })
     .catch(error => {
-      console.log(error)
+      console.error(error)
       dispatch(initialized())
     })
   }
diff --git a/app/client/auth/signup.component.js b/app/client/auth/signup.component.js
index 87e6ac6..4882681 100644
--- a/app/client/auth/signup.component.js
+++ b/app/client/auth/signup.component.js
@@ -39,7 +39,11 @@ class Signup extends Component {
   }
   render(){
     if (this.props.auth.isAuthenticated) {
-      return <Redirect to={this.props.auth.returnTo || '/'} />
+      let { returnTo } = this.props.auth
+      if (!returnTo || returnTo.match(/(api|login|logout|signup)/i)) {
+        returnTo = '/'
+      }
+      return <Redirect to={returnTo} />
     }
     return (
       <form onSubmit={this.handleSubmit}>