IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-08-26 21:27:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #282 from nickago/MM-1642

Browse Source 
MM-1642 Updated the password error message to not contain extraneous information
This commit is contained in:
Christopher Speller
2015-07-30 08:51:00 -04:00
parent 4646c22ef1 aac2567116
commit 51e244ab5a
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/react/components/user_settings.jsx
+12 -7
View File
@@ -465,17 +465,17 @@ var SecurityTab = React.createClass({
var confirmPassword = this.state.confirm_password;
if (currentPassword === '') {
this.setState({ password_error: "Please enter your current password" });
this.setState({password_error: 'Please enter your current password', server_error: ''});
return;
}
if (newPassword.length < 5) {
this.setState({ password_error: "New passwords must be at least 5 characters" });
this.setState({password_error: 'New passwords must be at least 5 characters', server_error: ''});
return;
}
if (newPassword != confirmPassword) {
this.setState({ password_error: "The new passwords you entered do not match" });
if (newPassword !== confirmPassword) {
this.setState({password_error: 'The new passwords you entered do not match', server_error: ''});
return;
}
@@ -488,11 +488,16 @@ var SecurityTab = React.createClass({
function(data) {
this.props.updateSection("");
AsyncClient.getMe();
this.setState({ current_password: '', new_password: '', confirm_password: '' });
this.setState({current_password: '', new_password: '', confirm_password: ''});
}.bind(this),
function(err) {
state = this.getInitialState();
state.server_error = err;
var state = this.getInitialState();
if (err.message) {
state.server_error = err.message;
} else {
state.server_error = err;
}
state.password_error = '';
this.setState(state);
}.bind(this)
);