Fix email invitations (#3964)

webapp/components/signup/signup_controller.jsx

@@ -31,16 +31,15 @@ export default class SignupController extends React.Component {
         let usedBefore = false;
 
         if (props.location.query) {
-            loading = true;
             const hash = props.location.query.h;
             const inviteId = props.location.query.id;
 
-            if (hash && hash.length > 0 && !UserStore.getCurrentUser()) {
+            if (inviteId) {
+                loading = true;
+            } else if (hash && !UserStore.getCurrentUser()) {
                 usedBefore = BrowserStore.getGlobalItem(hash);
-                loading = false;
             } else if (!inviteId && global.window.mm_config.EnableOpenServer !== 'true' && !UserStore.getNoAccounts()) {
                 noOpenServerError = true;
-                loading = false;
                 serverError = (
                     <FormattedMessage
                         id='signup_user_completed.no_open_server'
@@ -66,8 +65,9 @@ export default class SignupController extends React.Component {
             const data = this.props.location.query.d;
             const inviteId = this.props.location.query.id;
 
-            if ((inviteId && inviteId.length > 0) || (hash && hash.length > 0)) {
+            const userLoggedIn = UserStore.getCurrentUser() != null;
-                if (UserStore.getCurrentUser()) {
+
+            if ((inviteId || hash) && userLoggedIn) {
                 Client.addUserToTeamFromInvite(
                     data,
                     hash,
@@ -85,7 +85,11 @@ export default class SignupController extends React.Component {
                         });
                     }
                 );
-                } else if (!this.state.usedBefore) {
+
+                return;
+            }
+
+            if (inviteId) {
                 Client.getInviteInfo(
                     inviteId,
                     (inviteData) => {
@@ -111,13 +115,12 @@ export default class SignupController extends React.Component {
                         });
                     }
                 );
+
+                return;
             }
-            } else if (UserStore.getCurrentUser()) {
+
+            if (userLoggedIn) {
                 browserHistory.push('/select_team');
-            } else {
-                this.setState({ // eslint-disable-line react/no-did-mount-set-state
-                    loading: false
-                });
             }
         }
     }