Merge pull request #2630 from mattermost/plt-2512

PLT-2512, PLT-2516 Fixing signup pages not autologging in. Fixing enter key on signup complete.

webapp/components/signup_team_complete/components/team_signup_password_page.jsx

@@ -62,7 +62,11 @@ class TeamSignupPasswordPage extends React.Component {
 
                 var props = this.props;
 
-                Client.loginByEmail(teamSignup.team.name, teamSignup.team.email, teamSignup.user.password,
+                Client.loginByEmail(
+                    teamSignup.team.name,
+                    teamSignup.team.email,
+                    teamSignup.user.password,
+                    '', // No MFA Token
                     () => {
                         UserStore.setLastEmail(teamSignup.team.email);
                         if (this.props.hash > 0) {

webapp/components/signup_user_complete.jsx

@@ -176,7 +176,11 @@ class SignupUserComplete extends React.Component {
             () => {
                 Client.track('signup', 'signup_user_02_complete');
 
-                Client.loginByEmail(this.state.teamName, user.email, user.password,
+                Client.loginByEmail(
+                    this.state.teamName,
+                    user.email,
+                    user.password,
+                    '', // No MFA Token
                     () => {
                         UserStore.setLastEmail(user.email);
                         if (this.state.hash > 0) {
@@ -482,6 +486,7 @@ class SignupUserComplete extends React.Component {
                 <div className='col-sm-12'>
                     <div className='signup-team__container padding--less'>
                         <div>
+                            <form>
                                 <img
                                     className='signup-team-logo'
                                     src={logoImage}
@@ -512,6 +517,7 @@ class SignupUserComplete extends React.Component {
                                 {ldapSignup}
                                 {emailSignup}
                                 {serverError}
+                            </form>
                         </div>
                     </div>
                 </div>