prevent deactivation of sso users (#7759)

2 files changed, 23 insertions, 3 deletions

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
 	}
diff --git a/app/user_test.go b/app/user_test.go
index 51db207ef..d9f40a604 100644
--- a/app/user_test.go
+++ b/app/user_test.go
@@ -13,6 +13,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/mattermost/mattermost-server/einterfaces"
 	"github.com/mattermost/mattermost-server/model"
 	"github.com/mattermost/mattermost-server/model/gitlab"
@@ -98,6 +100,24 @@ func TestCreateOAuthUser(t *testing.T) {
 	}
 }
 
+func TestDeactivateSSOUser(t *testing.T) {
+	th := Setup().InitBasic()
+	defer th.TearDown()
+
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+	glUser := oauthgitlab.GitLabUser{Id: int64(r.Intn(1000)) + 1, Username: "o" + model.NewId(), Email: model.NewId() + "@simulator.amazonses.com", Name: "Joram Wilander"}
+
+	json := glUser.ToJson()
+	user, err := th.App.CreateOAuthUser(model.USER_AUTH_SERVICE_GITLAB, strings.NewReader(json), th.BasicTeam.Id)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer th.App.PermanentDeleteUser(user)
+
+	_, err = th.App.UpdateNonSSOUserActive(user.Id, false)
+	assert.Equal(t, "api.user.update_active.no_deactivate_sso.app_error", err.Id)
+}
+
 func TestCreateProfileImage(t *testing.T) {
 	b, err := CreateProfileImage("Corey Hulen", "eo1zkdr96pdj98pjmq8zy35wba", "luximbi.ttf")
 	if err != nil {