From 9d32cd42085bbb37460d815c6c1a00ad881c4895 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 2 Nov 2017 16:24:11 -0500 Subject: prevent deactivation of sso users (#7759) --- app/user.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/user.go') diff --git a/app/user.go b/app/user.go index a4513af9a..9f74ef303 100644 --- a/app/user.go +++ b/app/user.go @@ -867,15 +867,15 @@ func (a *App) UpdatePasswordAsUser(userId, currentPassword, newPassword string) return a.UpdatePasswordSendEmail(user, newPassword, T("api.user.update_password.menu")) } -func (a *App) UpdateActiveNoLdap(userId string, active bool) (*model.User, *model.AppError) { +func (a *App) UpdateNonSSOUserActive(userId string, active bool) (*model.User, *model.AppError) { var user *model.User var err *model.AppError if user, err = a.GetUser(userId); err != nil { return nil, err } - if user.IsLDAPUser() { - err := model.NewAppError("UpdateActive", "api.user.update_active.no_deactivate_ldap.app_error", nil, "userId="+user.Id, http.StatusBadRequest) + if user.IsSSOUser() { + err := model.NewAppError("UpdateActive", "api.user.update_active.no_deactivate_sso.app_error", nil, "userId="+user.Id, http.StatusBadRequest) err.StatusCode = http.StatusBadRequest return nil, err } -- cgit v1.2.3-1-g7c22