imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

let registering guests either upgrade or create a new account by specifying a new username. fixes https://github.com/vector-im/vector-web/issues/1161

Browse source
This commit is contained in:
Matthew Hodgson 2016-03-15 18:35:09 +00:00
parent 672a5cb89c
commit b23cad5613
3 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/structures/login/Registration.js
View file

@ -43,7 +43,6 @@ module.exports = React.createClass({
email: React.PropTypes.string,
username: React.PropTypes.string,
guestAccessToken: React.PropTypes.string,
disableUsernameChanges: React.PropTypes.bool,
// registration shouldn't know or care how login is done.
onLoginClick: React.PropTypes.func.isRequired
},
@ -108,6 +107,12 @@ module.exports = React.createClass({
errorText: "",
busy: true
});
if (formVals.username !== this.props.username) {
// don't try to upgrade if we changed our username
this.registerLogic.setGuestAccessToken(null);
}
this.onProcessingRegistration(this.registerLogic.register(formVals));
},
@ -205,7 +210,6 @@ module.exports = React.createClass({
showEmail={true}
defaultUsername={this.props.username}
defaultEmail={this.props.email}
disableUsernameChanges={this.props.disableUsernameChanges}
minPasswordLength={MIN_PASSWORD_LENGTH}
onError={this.onFormValidationFailed}
onRegisterClick={this.onFormSubmit} />