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,36 +486,38 @@ class SignupUserComplete extends React.Component {
                 <div className='col-sm-12'>
                     <div className='signup-team__container padding--less'>
                         <div>
-                            <img
+                            <form>
-                                className='signup-team-logo'
+                                <img
-                                src={logoImage}
+                                    className='signup-team-logo'
-                            />
+                                    src={logoImage}
-                            <h5 className='margin--less'>
-                                <FormattedMessage
-                                    id='signup_user_completed.welcome'
-                                    defaultMessage='Welcome to:'
                                 />
-                            </h5>
+                                <h5 className='margin--less'>
-                            <h2 className='signup-team__name'>{this.state.teamName}</h2>
+                                    <FormattedMessage
-                            <h2 className='signup-team__subdomain'>
+                                        id='signup_user_completed.welcome'
-                                <FormattedMessage
+                                        defaultMessage='Welcome to:'
-                                    id='signup_user_completed.onSite'
+                                    />
-                                    defaultMessage='on {siteName}'
+                                </h5>
-                                    values={{
+                                <h2 className='signup-team__name'>{this.state.teamName}</h2>
-                                        siteName: global.window.mm_config.SiteName
+                                <h2 className='signup-team__subdomain'>
-                                    }}
+                                    <FormattedMessage
-                                />
+                                        id='signup_user_completed.onSite'
-                            </h2>
+                                        defaultMessage='on {siteName}'
-                            <h4 className='color--light'>
+                                        values={{
-                                <FormattedMessage
+                                            siteName: global.window.mm_config.SiteName
-                                    id='signup_user_completed.lets'
+                                        }}
-                                    defaultMessage="Let's create your account"
+                                    />
-                                />
+                                </h2>
-                            </h4>
+                                <h4 className='color--light'>
-                            {signupMessage}
+                                    <FormattedMessage
-                            {ldapSignup}
+                                        id='signup_user_completed.lets'
-                            {emailSignup}
+                                        defaultMessage="Let's create your account"
-                            {serverError}
+                                    />
+                                </h4>
+                                {signupMessage}
+                                {ldapSignup}
+                                {emailSignup}
+                                {serverError}
+                            </form>
                         </div>
                     </div>
                 </div>