Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3062 from matrix-org/dbkr/dont_break_on_wrong_password

Browse Source 
Fix login page breaking on wrong password
This commit is contained in:
David Baker 2019-06-04 18:02:22 +01:00 committed by GitHub
commit b412103f21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/components/structures/auth/Login.js
View File

@ -83,6 +83,7 @@ module.exports = React.createClass({
busy: false,
errorText: null,
loginIncorrect: false,
canTryLogin: true, // can we attempt to log in or are there validation errors?
// used for preserving form values when changing homeserver
username: "",
@ -135,13 +136,9 @@ module.exports = React.createClass({
return this.state.busy || this.props.busy;
},
hasError: function() {
return this.state.errorText;
},
onPasswordLogin: function(username, phoneCountry, phoneNumber, password) {
// Prevent people from submitting their password when something isn't right.
if (this.isBusy() || this.hasError()) return;
if (this.isBusy() || !this.state.canTryLogin) return;
this.setState({
busy: true,
@ -236,6 +233,7 @@ module.exports = React.createClass({
username: username,
busy: doWellknownLookup, // unset later by the result of onServerConfigChange
errorText: null,
canTryLogin: true,
});
if (doWellknownLookup) {
const serverName = username.split(':').slice(1).join(':');
@ -249,7 +247,7 @@ module.exports = React.createClass({
if (e.translatedMessage) {
message = e.translatedMessage;
}
this.setState({errorText: message, busy: false});
this.setState({errorText: message, busy: false, canTryLogin: false});
}
}
},
@ -265,14 +263,16 @@ module.exports = React.createClass({
},
onPhoneNumberBlur: function(phoneNumber) {
this.setState({
errorText: null,
});
// Validate the phone number entered
if (!PHONE_NUMBER_REGEX.test(phoneNumber)) {
this.setState({
errorText: _t('The phone number entered looks invalid'),
canTryLogin: false,
});
} else {
this.setState({
errorText: null,
canTryLogin: true,
});
}
},
@ -343,6 +343,7 @@ module.exports = React.createClass({
self.setState({
errorText: self._errorTextFromError(err),
loginIncorrect: false,
canTryLogin: false,
});
}).finally(function() {
self.setState({