[MM-53943] Remove deprecated UserAuth.Password field (#24213)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
8372267739
Коммит
7ecf6c0b5c
@@ -2184,7 +2184,6 @@ func TestUpdateUserAuth(t *testing.T) {
|
|||||||
userAuth := &model.UserAuth{}
|
userAuth := &model.UserAuth{}
|
||||||
userAuth.AuthData = user.AuthData
|
userAuth.AuthData = user.AuthData
|
||||||
userAuth.AuthService = user.AuthService
|
userAuth.AuthService = user.AuthService
|
||||||
userAuth.Password = user.Password
|
|
||||||
|
|
||||||
// Regular user can not use endpoint
|
// Regular user can not use endpoint
|
||||||
_, respErr, _ := th.SystemAdminClient.UpdateUserAuth(context.Background(), user.Id, userAuth)
|
_, 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.AuthData = model.NewString("test@test.com")
|
||||||
userAuth.AuthService = model.UserAuthServiceSaml
|
userAuth.AuthService = model.UserAuthServiceSaml
|
||||||
userAuth.Password = "newpassword"
|
|
||||||
ruser, _, err := th.SystemAdminClient.UpdateUserAuth(context.Background(), user.Id, userAuth)
|
ruser, _, err := th.SystemAdminClient.UpdateUserAuth(context.Background(), user.Id, userAuth)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
// AuthData and AuthService are set, password is set to empty
|
// AuthData and AuthService are set, password is set to empty
|
||||||
require.Equal(t, *userAuth.AuthData, *ruser.AuthData)
|
require.Equal(t, *userAuth.AuthData, *ruser.AuthData)
|
||||||
require.Equal(t, model.UserAuthServiceSaml, ruser.AuthService)
|
require.Equal(t, model.UserAuthServiceSaml, ruser.AuthService)
|
||||||
require.Empty(t, ruser.Password)
|
|
||||||
|
|
||||||
// When AuthData or AuthService are empty, password must be valid
|
// When AuthData or AuthService are empty, password must be valid
|
||||||
userAuth.AuthData = user.AuthData
|
userAuth.AuthData = user.AuthData
|
||||||
userAuth.AuthService = ""
|
userAuth.AuthService = ""
|
||||||
userAuth.Password = "1"
|
|
||||||
_, respErr, _ = th.SystemAdminClient.UpdateUserAuth(context.Background(), user.Id, userAuth)
|
_, respErr, _ = th.SystemAdminClient.UpdateUserAuth(context.Background(), user.Id, userAuth)
|
||||||
require.NotNil(t, respErr)
|
require.NotNil(t, respErr)
|
||||||
|
|
||||||
@@ -2218,7 +2214,6 @@ func TestUpdateUserAuth(t *testing.T) {
|
|||||||
|
|
||||||
userAuth.AuthData = user.AuthData
|
userAuth.AuthData = user.AuthData
|
||||||
userAuth.AuthService = user.AuthService
|
userAuth.AuthService = user.AuthService
|
||||||
userAuth.Password = user.Password
|
|
||||||
_, respErr, _ = th.SystemAdminClient.UpdateUserAuth(context.Background(), user.Id, userAuth)
|
_, respErr, _ = th.SystemAdminClient.UpdateUserAuth(context.Background(), user.Id, userAuth)
|
||||||
require.NotNil(t, respErr, "Should have errored")
|
require.NotNil(t, respErr, "Should have errored")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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) {
|
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 {
|
if _, err := a.Srv().Store().User().UpdateAuthData(userID, userAuth.AuthService, userAuth.AuthData, "", false); err != nil {
|
||||||
var invErr *store.ErrInvalidInput
|
var invErr *store.ErrInvalidInput
|
||||||
switch {
|
switch {
|
||||||
|
|||||||
@@ -183,7 +183,6 @@ func (u *UserPatch) Auditable() map[string]interface{} {
|
|||||||
|
|
||||||
//msgp:ignore UserAuth
|
//msgp:ignore UserAuth
|
||||||
type UserAuth struct {
|
type UserAuth struct {
|
||||||
Password string `json:"password,omitempty"` // DEPRECATED: It is not used.
|
|
||||||
AuthData *string `json:"auth_data,omitempty"`
|
AuthData *string `json:"auth_data,omitempty"`
|
||||||
AuthService string `json:"auth_service,omitempty"`
|
AuthService string `json:"auth_service,omitempty"`
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user