IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2630 from mattermost/plt-2512

Browse Source 
PLT-2512, PLT-2516 Fixing signup pages not autologging in. Fixing enter key on signup complete.
This commit is contained in:
Joram Wilander
2016-04-04 14:22:45 -04:00
parent 15c7ff8aec 431cf7c3ed
commit a309031d9a
2 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webapp/components/signup_team_complete/components/team_signup_password_page.jsx
View File

@@ -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) {

66
webapp/components/signup_user_complete.jsx
View File

@@ -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:'
<form>
<img
className='signup-team-logo'
src={logoImage}
/>
</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}
<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>