Merge pull request #281 from nickago/MM-1600

MM-1600 Improve quality of error returned upon a duplicate username request

store/sql_user_store.go

@@ -161,7 +161,13 @@ func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreCha
 			}
 
 			if count, err := us.GetMaster().Update(user); err != nil {
-				result.Err = model.NewAppError("SqlUserStore.Update", "We encounted an error updating the account", "user_id="+user.Id+", "+err.Error())
+				if IsUniqueConstraintError(err.Error(), "Email", "users_email_teamid_key") {
+					result.Err = model.NewAppError("SqlUserStore.Update", "This email is already taken. Please choose another", "user_id="+user.Id+", "+err.Error())
+				} else if IsUniqueConstraintError(err.Error(), "Username", "users_username_teamid_key") {
+					result.Err = model.NewAppError("SqlUserStore.Update", "This username is already taken. Please choose another.", "user_id="+user.Id+", "+err.Error())
+				} else {
+					result.Err = model.NewAppError("SqlUserStore.Update", "We encounted an error updating the account", "user_id="+user.Id+", "+err.Error())
+				}
 			} else if count != 1 {
 				result.Err = model.NewAppError("SqlUserStore.Update", "We couldn't update the account", fmt.Sprintf("user_id=%v, count=%v", user.Id, count))
 			} else {

web/react/components/user_settings.jsx

@@ -709,7 +709,11 @@ var GeneralTab = React.createClass({
             }.bind(this),
             function(err) {
                 state = this.getInitialState();
-                state.server_error = err;
+                if(err.message) {
+                    state.server_error = err.message;
+                } else {
+                    state.server_error = err
+                }
                 this.setState(state);
             }.bind(this)
         );