From d74ee1a3da495069ea07e1069d730b6a3f5ee273 Mon Sep 17 00:00:00 2001
From: Scott Bishel <scott.bishel@mattermost.com>
Date: Fri, 30 Jun 2023 08:10:10 -0600
Subject: [PATCH] don't allow deletedAt to be set when creating user (#23914)

---
 server/channels/api4/user_test.go | 2 ++
 server/public/model/user.go       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/server/channels/api4/user_test.go b/server/channels/api4/user_test.go
index f17f90e303..e133eaa821 100644
--- a/server/channels/api4/user_test.go
+++ b/server/channels/api4/user_test.go
@@ -41,6 +41,7 @@ func TestCreateUser(t *testing.T) {
 		Username:      GenerateTestUsername(),
 		Roles:         model.SystemAdminRoleId + " " + model.SystemUserRoleId,
 		EmailVerified: true,
+		DeleteAt:      1,
 	}
 
 	ruser, resp, err := th.Client.CreateUser(context.Background(), &user)
@@ -53,6 +54,7 @@ func TestCreateUser(t *testing.T) {
 
 	require.Equal(t, user.Nickname, ruser.Nickname, "nickname didn't match")
 	require.Equal(t, model.SystemUserRoleId, ruser.Roles, "did not clear roles")
+	require.Equal(t, int64(0), ruser.DeleteAt, "did not reset deleteAt")
 
 	CheckUserSanitization(t, ruser)
 
diff --git a/server/public/model/user.go b/server/public/model/user.go
index 8ce86ef2e2..39f19b9cc9 100644
--- a/server/public/model/user.go
+++ b/server/public/model/user.go
@@ -669,6 +669,7 @@ func (u *User) SanitizeInput(isAdmin bool) {
 		u.AuthService = ""
 		u.EmailVerified = false
 	}
+	u.DeleteAt = 0
 	u.LastPasswordUpdate = 0
 	u.LastPictureUpdate = 0
 	u.FailedAttempts = 0