diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-04-04 14:22:45 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-04-04 14:22:45 -0400 |
| commit | a309031d9af9907e2b7a78116bc84133939ed4f8 (patch) | |
| tree | 43552ca061163f395e7c63fd493d4efca7c27b2b /webapp | |
| parent | 15c7ff8aeca7e7bb838cf18497ca1c322d044f89 (diff) | |
| parent | 431cf7c3ed22540edc1daaad261c66999ae47772 (diff) | |
| download | chat-a309031d9af9907e2b7a78116bc84133939ed4f8.tar.gz chat-a309031d9af9907e2b7a78116bc84133939ed4f8.tar.bz2 chat-a309031d9af9907e2b7a78116bc84133939ed4f8.zip | |
Merge pull request #2630 from mattermost/plt-2512
PLT-2512, PLT-2516 Fixing signup pages not autologging in. Fixing enter key on signup complete.
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/signup_team_complete/components/team_signup_password_page.jsx | 6 | ||||
| -rw-r--r-- | webapp/components/signup_user_complete.jsx | 66 |
2 files changed, 41 insertions, 31 deletions
diff --git a/webapp/components/signup_team_complete/components/team_signup_password_page.jsx b/webapp/components/signup_team_complete/components/team_signup_password_page.jsx index 110690da1..fbe8ab683 100644 --- a/webapp/components/signup_team_complete/components/team_signup_password_page.jsx +++ b/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) { diff --git a/webapp/components/signup_user_complete.jsx b/webapp/components/signup_user_complete.jsx index e9f9d9d88..629ac4a0a 100644 --- a/webapp/components/signup_user_complete.jsx +++ b/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 - className='signup-team-logo' - src={logoImage} - /> - <h5 className='margin--less'> - <FormattedMessage - id='signup_user_completed.welcome' - defaultMessage='Welcome to:' - /> - </h5> - <h2 className='signup-team__name'>{this.state.teamName}</h2> - <h2 className='signup-team__subdomain'> - <FormattedMessage - id='signup_user_completed.onSite' - defaultMessage='on {siteName}' - values={{ - siteName: global.window.mm_config.SiteName - }} - /> - </h2> - <h4 className='color--light'> - <FormattedMessage - id='signup_user_completed.lets' - defaultMessage="Let's create your account" + <form> + <img + className='signup-team-logo' + src={logoImage} /> - </h4> - {signupMessage} - {ldapSignup} - {emailSignup} - {serverError} + <h5 className='margin--less'> + <FormattedMessage + id='signup_user_completed.welcome' + defaultMessage='Welcome to:' + /> + </h5> + <h2 className='signup-team__name'>{this.state.teamName}</h2> + <h2 className='signup-team__subdomain'> + <FormattedMessage + id='signup_user_completed.onSite' + defaultMessage='on {siteName}' + values={{ + siteName: global.window.mm_config.SiteName + }} + /> + </h2> + <h4 className='color--light'> + <FormattedMessage + id='signup_user_completed.lets' + defaultMessage="Let's create your account" + /> + </h4> + {signupMessage} + {ldapSignup} + {emailSignup} + {serverError} + </form> </div> </div> </div> |