diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-04-27 16:03:31 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-04-27 16:03:31 -0400 |
| commit | ada513a0146cfb570e3614f9b26c0465de3a1d94 (patch) | |
| tree | 31eda01563a199296302a70fa84edff59815e50b | |
| parent | fa807d8e436e87b8c1749ea54c293a15c67f7f29 (diff) | |
| download | chat-ada513a0146cfb570e3614f9b26c0465de3a1d94.tar.gz chat-ada513a0146cfb570e3614f9b26c0465de3a1d94.tar.bz2 chat-ada513a0146cfb570e3614f9b26c0465de3a1d94.zip | |
Fixing email verification flow (#2806)
| -rw-r--r-- | webapp/components/do_verify_email.jsx | 3 | ||||
| -rw-r--r-- | webapp/utils/web_client.jsx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/webapp/components/do_verify_email.jsx b/webapp/components/do_verify_email.jsx index fe4d61a72..193205266 100644 --- a/webapp/components/do_verify_email.jsx +++ b/webapp/components/do_verify_email.jsx @@ -21,14 +21,13 @@ export default class DoVerifyEmail extends React.Component { componentWillMount() { const uid = this.props.location.query.uid; const hid = this.props.location.query.hid; - const teamName = this.props.location.query.teamname; const email = this.props.location.query.email; Client.verifyEmail( uid, hid, () => { - browserHistory.push('/' + teamName + '/login?extra=verified&email=' + email); + browserHistory.push('/login?extra=verified&email=' + email); }, (err) => { this.setState({verifyStatus: 'failure', serverError: err.message}); diff --git a/webapp/utils/web_client.jsx b/webapp/utils/web_client.jsx index 6071b4bb4..a9851442b 100644 --- a/webapp/utils/web_client.jsx +++ b/webapp/utils/web_client.jsx @@ -32,7 +32,7 @@ class WebClientClass extends Client { } handleError = (err, res) => { // eslint-disable-line no-unused-vars - if (err.status === HTTP_UNAUTHORIZED) { + if (err.status === HTTP_UNAUTHORIZED && res.req.url !== '/api/v3/users/login') { GlobalActions.emitUserLoggedOutEvent('/login'); } } |