Fixing email verification flow (#2806)

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});

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');
         }
     }