diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-07-30 08:51:00 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-07-30 08:51:00 -0400 |
commit | 51e244ab5a04077ed1fd1add32df4aaea8be03cd (patch) | |
tree | 3ebaa68fb5650446ac0b804c73f144935e778c7e | |
parent | 4646c22ef185234a12937f7f3a5e036e5779417f (diff) | |
parent | aac256711605fc3801606c14eb8dc8638b30f0d2 (diff) | |
download | chat-51e244ab5a04077ed1fd1add32df4aaea8be03cd.tar.gz chat-51e244ab5a04077ed1fd1add32df4aaea8be03cd.tar.bz2 chat-51e244ab5a04077ed1fd1add32df4aaea8be03cd.zip |
Merge pull request #282 from nickago/MM-1642
MM-1642 Updated the password error message to not contain extraneous information
-rw-r--r-- | web/react/components/user_settings.jsx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx index e7ac08a94..902989b7b 100644 --- a/web/react/components/user_settings.jsx +++ b/web/react/components/user_settings.jsx @@ -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) ); |