From 7ecf6c0b5c706bee82f0cc15904f221b80aeb666 Mon Sep 17 00:00:00 2001 From: Ben Schumacher Date: Wed, 9 Aug 2023 10:35:53 +0200 Subject: [PATCH] [MM-53943] Remove deprecated UserAuth.Password field (#24213) --- server/channels/api4/user_test.go | 5 ----- server/channels/app/user.go | 1 - server/public/model/user.go | 1 - 3 files changed, 7 deletions(-) diff --git a/server/channels/api4/user_test.go b/server/channels/api4/user_test.go index c12312b0a8..f3be8485dc 100644 --- a/server/channels/api4/user_test.go +++ b/server/channels/api4/user_test.go @@ -2184,7 +2184,6 @@ func TestUpdateUserAuth(t *testing.T) { userAuth := &model.UserAuth{} userAuth.AuthData = user.AuthData userAuth.AuthService = user.AuthService - userAuth.Password = user.Password // Regular user can not use endpoint _, respErr, _ := th.SystemAdminClient.UpdateUserAuth(context.Background(), user.Id, userAuth) @@ -2192,19 +2191,16 @@ func TestUpdateUserAuth(t *testing.T) { userAuth.AuthData = model.NewString("test@test.com") userAuth.AuthService = model.UserAuthServiceSaml - userAuth.Password = "newpassword" ruser, _, err := th.SystemAdminClient.UpdateUserAuth(context.Background(), user.Id, userAuth) require.NoError(t, err) // AuthData and AuthService are set, password is set to empty require.Equal(t, *userAuth.AuthData, *ruser.AuthData) require.Equal(t, model.UserAuthServiceSaml, ruser.AuthService) - require.Empty(t, ruser.Password) // When AuthData or AuthService are empty, password must be valid userAuth.AuthData = user.AuthData userAuth.AuthService = "" - userAuth.Password = "1" _, respErr, _ = th.SystemAdminClient.UpdateUserAuth(context.Background(), user.Id, userAuth) require.NotNil(t, respErr) @@ -2218,7 +2214,6 @@ func TestUpdateUserAuth(t *testing.T) { userAuth.AuthData = user.AuthData userAuth.AuthService = user.AuthService - userAuth.Password = user.Password _, respErr, _ = th.SystemAdminClient.UpdateUserAuth(context.Background(), user.Id, userAuth) require.NotNil(t, respErr, "Should have errored") } diff --git a/server/channels/app/user.go b/server/channels/app/user.go index e062b31a37..944443834b 100644 --- a/server/channels/app/user.go +++ b/server/channels/app/user.go @@ -1086,7 +1086,6 @@ func (a *App) PatchUser(c request.CTX, userID string, patch *model.UserPatch, as } func (a *App) UpdateUserAuth(userID string, userAuth *model.UserAuth) (*model.UserAuth, *model.AppError) { - userAuth.Password = "" if _, err := a.Srv().Store().User().UpdateAuthData(userID, userAuth.AuthService, userAuth.AuthData, "", false); err != nil { var invErr *store.ErrInvalidInput switch { diff --git a/server/public/model/user.go b/server/public/model/user.go index 39f19b9cc9..281de1dc30 100644 --- a/server/public/model/user.go +++ b/server/public/model/user.go @@ -183,7 +183,6 @@ func (u *UserPatch) Auditable() map[string]interface{} { //msgp:ignore UserAuth type UserAuth struct { - Password string `json:"password,omitempty"` // DEPRECATED: It is not used. AuthData *string `json:"auth_data,omitempty"` AuthService string `json:"auth_service,omitempty"` }