Merge pull request #1143 from matrix-org/luke/fix-login-multiple-fields

Only submit phone number when phone loginType is selected
This commit is contained in:
David Baker 2017-06-23 14:48:52 +01:00 committed by GitHub
commit 0207f3cc02

View file

@ -69,10 +69,19 @@ class PasswordLogin extends React.Component {
onSubmitForm(ev) {
ev.preventDefault();
if (this.state.loginType === PasswordLogin.LOGIN_FIELD_PHONE) {
this.props.onSubmit(
'', // XXX: Synapse breaks if you send null here:
this.state.phoneCountry,
this.state.phoneNumber,
this.state.password,
);
return;
}
this.props.onSubmit(
this.state.username,
this.state.phoneCountry,
this.state.phoneNumber,
null,
null,
this.state.password,
);
}