From 9dc76c18231f158ab71dfcfae2f1659a4f2a5396 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Tue, 7 Feb 2017 09:35:58 -0800 Subject: Implement PUT /users/{user_id}/password endpoint for APIv4 (#5243) --- app/user.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'app/user.go') diff --git a/app/user.go b/app/user.go index c302db511..2fc308421 100644 --- a/app/user.go +++ b/app/user.go @@ -764,22 +764,19 @@ func UpdatePasswordAsUser(userId, currentPassword, newPassword, siteURL string) } if user == nil { - err = model.NewLocAppError("updatePassword", "api.user.update_password.valid_account.app_error", nil, "") - err.StatusCode = http.StatusBadRequest + err = model.NewAppError("updatePassword", "api.user.update_password.valid_account.app_error", nil, "", http.StatusBadRequest) return err } if user.AuthData != nil && *user.AuthData != "" { - err = model.NewLocAppError("updatePassword", "api.user.update_password.oauth.app_error", nil, "auth_service="+user.AuthService) - err.StatusCode = http.StatusBadRequest + err = model.NewAppError("updatePassword", "api.user.update_password.oauth.app_error", nil, "auth_service="+user.AuthService, http.StatusBadRequest) return err } if err := doubleCheckPassword(user, currentPassword); err != nil { if err.Id == "api.user.check_user_password.invalid.app_error" { - err = model.NewLocAppError("updatePassword", "api.user.update_password.incorrect.app_error", nil, "") + err = model.NewAppError("updatePassword", "api.user.update_password.incorrect.app_error", nil, "", http.StatusBadRequest) } - err.StatusCode = http.StatusForbidden return err } -- cgit v1.2.3-1-g7c22