Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix login page breaking on wrong password #3062

Merged
merged 1 commit into from
Jun 4, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions src/components/structures/auth/Login.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: "",
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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(':');
Expand All @@ -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});
}
}
},
Expand All @@ -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,
});
}
},
Expand Down Expand Up @@ -343,6 +343,7 @@ module.exports = React.createClass({
self.setState({
errorText: self._errorTextFromError(err),
loginIncorrect: false,
canTryLogin: false,
});
}).finally(function() {
self.setState({
Expand Down