mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Migrate User.Update method to sync by default (#10942)

Просмотр исходного кода
Этот коммит содержится в:
Jesús Espino
2019-05-28 09:40:29 +02:00
коммит произвёл GitHub
родитель 8e6a158449
Коммит fb237cc624
11 изменённых файлов: 127 добавлений и 104 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
app/bot.go
Просмотреть файл

@@ -44,8 +44,8 @@ func (a *App) PatchBot(botUserId string, botPatch *model.BotPatch) (*model.Bot,
user.Username = patchedUser.Username user.Username = patchedUser.Username
user.Email = patchedUser.Email user.Email = patchedUser.Email
user.FirstName = patchedUser.FirstName user.FirstName = patchedUser.FirstName
if result := <-a.Srv.Store.User().Update(user, true); result.Err != nil { if _, err := a.Srv.Store.User().Update(user, true); err != nil {
return nil, result.Err return nil, err
} }
result := <-a.Srv.Store.Bot().Update(bot) result := <-a.Srv.Store.Bot().Update(bot)

46
app/user.go
Просмотреть файл

@@ -989,11 +989,11 @@ func (a *App) UpdateActive(user *model.User, active bool) (*model.User, *model.A
user.DeleteAt = model.GetMillis() user.DeleteAt = model.GetMillis()
} }
result := <-a.Srv.Store.User().Update(user, true) userUpdate, err := a.Srv.Store.User().Update(user, true)
if result.Err != nil { if err != nil {
return nil, result.Err return nil, err
} }
ruser := result.Data.([2]*model.User)[0] ruser := userUpdate.New
if !active { if !active {
if err := a.userDeactivated(ruser); err != nil { if err := a.userDeactivated(ruser); err != nil {
@@ -1110,7 +1110,7 @@ func (a *App) UpdateUser(user *model.User, sendNotifications bool) (*model.User,
if *a.Config().EmailSettings.RequireEmailVerification && prev.Email != user.Email { if *a.Config().EmailSettings.RequireEmailVerification && prev.Email != user.Email {
newEmail = user.Email newEmail = user.Email
_, err := a.GetUserByEmail(newEmail) _, err = a.GetUserByEmail(newEmail)
if err == nil { if err == nil {
return nil, model.NewAppError("UpdateUser", "store.sql_user.update.email_taken.app_error", nil, "user_id="+user.Id, http.StatusBadRequest) return nil, model.NewAppError("UpdateUser", "store.sql_user.update.email_taken.app_error", nil, "user_id="+user.Id, http.StatusBadRequest)
} }
@@ -1118,32 +1118,31 @@ func (a *App) UpdateUser(user *model.User, sendNotifications bool) (*model.User,
user.Email = prev.Email user.Email = prev.Email
} }
result := <-a.Srv.Store.User().Update(user, false) userUpdate, err := a.Srv.Store.User().Update(user, false)
if result.Err != nil { if err != nil {
return nil, result.Err return nil, err
} }
rusers := result.Data.([2]*model.User)
if sendNotifications { if sendNotifications {
if rusers[0].Email != rusers[1].Email || newEmail != "" { if userUpdate.New.Email != userUpdate.Old.Email || newEmail != "" {
if *a.Config().EmailSettings.RequireEmailVerification { if *a.Config().EmailSettings.RequireEmailVerification {
a.Srv.Go(func() { a.Srv.Go(func() {
if err := a.SendEmailVerification(rusers[0], newEmail); err != nil { if err := a.SendEmailVerification(userUpdate.New, newEmail); err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
} }
}) })
} else { } else {
a.Srv.Go(func() { a.Srv.Go(func() {
if err := a.SendEmailChangeEmail(rusers[1].Email, rusers[0].Email, rusers[0].Locale, a.GetSiteURL()); err != nil { if err := a.SendEmailChangeEmail(userUpdate.Old.Email, userUpdate.New.Email, userUpdate.New.Locale, a.GetSiteURL()); err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
} }
}) })
} }
} }
if rusers[0].Username != rusers[1].Username { if userUpdate.New.Username != userUpdate.Old.Username {
a.Srv.Go(func() { a.Srv.Go(func() {
if err := a.SendChangeUsernameEmail(rusers[1].Username, rusers[0].Username, rusers[0].Email, rusers[0].Locale, a.GetSiteURL()); err != nil { if err := a.SendChangeUsernameEmail(userUpdate.Old.Username, userUpdate.New.Username, userUpdate.New.Email, userUpdate.New.Locale, a.GetSiteURL()); err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
} }
}) })
@@ -1161,7 +1160,7 @@ func (a *App) UpdateUser(user *model.User, sendNotifications bool) (*model.User,
}) })
} }
return rusers[0], nil return userUpdate.New, nil
} }
func (a *App) UpdateUserActive(userId string, active bool) *model.AppError { func (a *App) UpdateUserActive(userId string, active bool) *model.AppError {
@@ -1375,14 +1374,19 @@ func (a *App) UpdateUserRoles(userId string, newRoles string, sendWebSocketEvent
} }
user.Roles = newRoles user.Roles = newRoles
uchan := a.Srv.Store.User().Update(user, true) uchan := make(chan store.StoreResult, 1)
go func() {
userUpdate, err := a.Srv.Store.User().Update(user, true)
uchan <- store.StoreResult{Data: userUpdate, Err: err}
close(uchan)
}()
schan := a.Srv.Store.Session().UpdateRoles(user.Id, newRoles) schan := a.Srv.Store.Session().UpdateRoles(user.Id, newRoles)
result := <-uchan result := <-uchan
if result.Err != nil { if result.Err != nil {
return nil, result.Err return nil, result.Err
} }
ruser := result.Data.([2]*model.User)[0] ruser := result.Data.(*model.UserUpdate).New
if result := <-schan; result.Err != nil { if result := <-schan; result.Err != nil {
// soft error since the user roles were still updated // soft error since the user roles were still updated
@@ -1886,12 +1890,12 @@ func (a *App) UpdateOAuthUserAttrs(userData io.Reader, user *model.User, provide
} }
if userAttrsChanged { if userAttrsChanged {
result := <-a.Srv.Store.User().Update(user, true) users, err := a.Srv.Store.User().Update(user, true)
if result.Err != nil { if err != nil {
return result.Err return err
} }
user = result.Data.([2]*model.User)[0] user = users.New
a.InvalidateCacheForUser(user.Id) a.InvalidateCacheForUser(user.Id)
esInterface := a.Elasticsearch esInterface := a.Elasticsearch

5
model/user.go
Просмотреть файл

@@ -87,6 +87,11 @@ type User struct {
TermsOfServiceCreateAt int64 `db:"-" json:"terms_of_service_create_at,omitempty"` TermsOfServiceCreateAt int64 `db:"-" json:"terms_of_service_create_at,omitempty"`
} }
type UserUpdate struct {
Old *User
New *User
}
type UserPatch struct { type UserPatch struct {
Username *string `json:"username"` Username *string `json:"username"`
Password *string `json:"password,omitempty"` Password *string `json:"password,omitempty"`

125
store/sqlstore/user_store.go
Просмотреть файл

@@ -142,71 +142,72 @@ func (us SqlUserStore) Save(user *model.User) store.StoreChannel {
}) })
} }
func (us SqlUserStore) Update(user *model.User, trustedUpdateData bool) store.StoreChannel { func (us SqlUserStore) Update(user *model.User, trustedUpdateData bool) (*model.UserUpdate, *model.AppError) {
return store.Do(func(result *store.StoreResult) { user.PreUpdate()
user.PreUpdate()
if result.Err = user.IsValid(); result.Err != nil { if err := user.IsValid(); err != nil {
return return nil, err
}
oldUserResult, err := us.GetMaster().Get(model.User{}, user.Id)
if err != nil {
return nil, model.NewAppError("SqlUserStore.Update", "store.sql_user.update.finding.app_error", nil, "user_id="+user.Id+", "+err.Error(), http.StatusInternalServerError)
}
if oldUserResult == nil {
return nil, model.NewAppError("SqlUserStore.Update", "store.sql_user.update.find.app_error", nil, "user_id="+user.Id, http.StatusBadRequest)
}
oldUser := oldUserResult.(*model.User)
user.CreateAt = oldUser.CreateAt
user.AuthData = oldUser.AuthData
user.AuthService = oldUser.AuthService
user.Password = oldUser.Password
user.LastPasswordUpdate = oldUser.LastPasswordUpdate
user.LastPictureUpdate = oldUser.LastPictureUpdate
user.EmailVerified = oldUser.EmailVerified
user.FailedAttempts = oldUser.FailedAttempts
user.MfaSecret = oldUser.MfaSecret
user.MfaActive = oldUser.MfaActive
if !trustedUpdateData {
user.Roles = oldUser.Roles
user.DeleteAt = oldUser.DeleteAt
}
if user.IsOAuthUser() {
if !trustedUpdateData {
user.Email = oldUser.Email
} }
} else if user.IsLDAPUser() && !trustedUpdateData {
if oldUserResult, err := us.GetMaster().Get(model.User{}, user.Id); err != nil { if user.Username != oldUser.Username || user.Email != oldUser.Email {
result.Err = model.NewAppError("SqlUserStore.Update", "store.sql_user.update.finding.app_error", nil, "user_id="+user.Id+", "+err.Error(), http.StatusInternalServerError) return nil, model.NewAppError("SqlUserStore.Update", "store.sql_user.update.can_not_change_ldap.app_error", nil, "user_id="+user.Id, http.StatusBadRequest)
} else if oldUserResult == nil {
result.Err = model.NewAppError("SqlUserStore.Update", "store.sql_user.update.find.app_error", nil, "user_id="+user.Id, http.StatusBadRequest)
} else {
oldUser := oldUserResult.(*model.User)
user.CreateAt = oldUser.CreateAt
user.AuthData = oldUser.AuthData
user.AuthService = oldUser.AuthService
user.Password = oldUser.Password
user.LastPasswordUpdate = oldUser.LastPasswordUpdate
user.LastPictureUpdate = oldUser.LastPictureUpdate
user.EmailVerified = oldUser.EmailVerified
user.FailedAttempts = oldUser.FailedAttempts
user.MfaSecret = oldUser.MfaSecret
user.MfaActive = oldUser.MfaActive
if !trustedUpdateData {
user.Roles = oldUser.Roles
user.DeleteAt = oldUser.DeleteAt
}
if user.IsOAuthUser() {
if !trustedUpdateData {
user.Email = oldUser.Email
}
} else if user.IsLDAPUser() && !trustedUpdateData {
if user.Username != oldUser.Username ||
user.Email != oldUser.Email {
result.Err = model.NewAppError("SqlUserStore.Update", "store.sql_user.update.can_not_change_ldap.app_error", nil, "user_id="+user.Id, http.StatusBadRequest)
return
}
} else if user.Email != oldUser.Email {
user.EmailVerified = false
}
if user.Username != oldUser.Username {
user.UpdateMentionKeysFromUsername(oldUser.Username)
}
if count, err := us.GetMaster().Update(user); err != nil {
if IsUniqueConstraintError(err, []string{"Email", "users_email_key", "idx_users_email_unique"}) {
result.Err = model.NewAppError("SqlUserStore.Update", "store.sql_user.update.email_taken.app_error", nil, "user_id="+user.Id+", "+err.Error(), http.StatusBadRequest)
} else if IsUniqueConstraintError(err, []string{"Username", "users_username_key", "idx_users_username_unique"}) {
result.Err = model.NewAppError("SqlUserStore.Update", "store.sql_user.update.username_taken.app_error", nil, "user_id="+user.Id+", "+err.Error(), http.StatusBadRequest)
} else {
result.Err = model.NewAppError("SqlUserStore.Update", "store.sql_user.update.updating.app_error", nil, "user_id="+user.Id+", "+err.Error(), http.StatusInternalServerError)
}
} else if count != 1 {
result.Err = model.NewAppError("SqlUserStore.Update", "store.sql_user.update.app_error", nil, fmt.Sprintf("user_id=%v, count=%v", user.Id, count), http.StatusInternalServerError)
} else {
user.Sanitize(map[string]bool{})
oldUser.Sanitize(map[string]bool{})
result.Data = [2]*model.User{user, oldUser}
}
} }
}) } else if user.Email != oldUser.Email {
user.EmailVerified = false
}
if user.Username != oldUser.Username {
user.UpdateMentionKeysFromUsername(oldUser.Username)
}
count, err := us.GetMaster().Update(user)
if err != nil {
if IsUniqueConstraintError(err, []string{"Email", "users_email_key", "idx_users_email_unique"}) {
return nil, model.NewAppError("SqlUserStore.Update", "store.sql_user.update.email_taken.app_error", nil, "user_id="+user.Id+", "+err.Error(), http.StatusBadRequest)
} else if IsUniqueConstraintError(err, []string{"Username", "users_username_key", "idx_users_username_unique"}) {
return nil, model.NewAppError("SqlUserStore.Update", "store.sql_user.update.username_taken.app_error", nil, "user_id="+user.Id+", "+err.Error(), http.StatusBadRequest)
}
return nil, model.NewAppError("SqlUserStore.Update", "store.sql_user.update.updating.app_error", nil, "user_id="+user.Id+", "+err.Error(), http.StatusInternalServerError)
}
if count != 1 {
return nil, model.NewAppError("SqlUserStore.Update", "store.sql_user.update.app_error", nil, fmt.Sprintf("user_id=%v, count=%v", user.Id, count), http.StatusInternalServerError)
}
user.Sanitize(map[string]bool{})
oldUser.Sanitize(map[string]bool{})
return &model.UserUpdate{New: user, Old: oldUser}, nil
} }
func (us SqlUserStore) UpdateLastPictureUpdate(userId string) store.StoreChannel { func (us SqlUserStore) UpdateLastPictureUpdate(userId string) store.StoreChannel {

2
store/store.go
Просмотреть файл

@@ -245,7 +245,7 @@ type PostStore interface {
type UserStore interface { type UserStore interface {
Save(user *model.User) StoreChannel Save(user *model.User) StoreChannel
Update(user *model.User, allowRoleUpdate bool) StoreChannel Update(user *model.User, allowRoleUpdate bool) (*model.UserUpdate, *model.AppError)
UpdateLastPictureUpdate(userId string) StoreChannel UpdateLastPictureUpdate(userId string) StoreChannel
ResetLastPictureUpdate(userId string) StoreChannel ResetLastPictureUpdate(userId string) StoreChannel
UpdateUpdateAt(userId string) StoreChannel UpdateUpdateAt(userId string) StoreChannel

2
store/storetest/bot_store.go
Просмотреть файл

@@ -175,7 +175,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store) {
t.Fatal("couldn't save user", err) t.Fatal("couldn't save user", err)
} }
deletedUser.DeleteAt = model.GetMillis() deletedUser.DeleteAt = model.GetMillis()
if err := (<-ss.User().Update(&deletedUser, true)).Err; err != nil { if _, err := ss.User().Update(&deletedUser, true); err != nil {
t.Fatal("couldn't delete user", err) t.Fatal("couldn't delete user", err)
} }
defer func() { require.Nil(t, ss.User().PermanentDelete(deletedUser.Id)) }() defer func() { require.Nil(t, ss.User().PermanentDelete(deletedUser.Id)) }()

6
store/storetest/channel_store.go
Просмотреть файл

@@ -3433,8 +3433,10 @@ func testChannelStoreRemoveAllDeactivatedMembers(t *testing.T, ss store.Store) {
// Deactivate users 1 & 2. // Deactivate users 1 & 2.
u1.DeleteAt = model.GetMillis() u1.DeleteAt = model.GetMillis()
u2.DeleteAt = model.GetMillis() u2.DeleteAt = model.GetMillis()
require.Nil(t, (<-ss.User().Update(&u1, true)).Err) _, err = ss.User().Update(&u1, true)
require.Nil(t, (<-ss.User().Update(&u2, true)).Err) require.Nil(t, err)
_, err = ss.User().Update(&u2, true)
require.Nil(t, err)
// Remove all deactivated users from the channel. // Remove all deactivated users from the channel.
assert.Nil(t, (<-ss.Channel().RemoveAllDeactivatedMembers(c1.Id)).Err) assert.Nil(t, (<-ss.Channel().RemoveAllDeactivatedMembers(c1.Id)).Err)

19
store/storetest/mocks/UserStore.go
Просмотреть файл

@@ -747,19 +747,28 @@ func (_m *UserStore) SearchWithoutTeam(term string, options *model.UserSearchOpt
} }
// Update provides a mock function with given fields: user, allowRoleUpdate // Update provides a mock function with given fields: user, allowRoleUpdate
func (_m *UserStore) Update(user *model.User, allowRoleUpdate bool) store.StoreChannel { func (_m *UserStore) Update(user *model.User, allowRoleUpdate bool) (*model.UserUpdate, *model.AppError) {
ret := _m.Called(user, allowRoleUpdate) ret := _m.Called(user, allowRoleUpdate)
var r0 store.StoreChannel var r0 *model.UserUpdate
if rf, ok := ret.Get(0).(func(*model.User, bool) store.StoreChannel); ok { if rf, ok := ret.Get(0).(func(*model.User, bool) *model.UserUpdate); ok {
r0 = rf(user, allowRoleUpdate) r0 = rf(user, allowRoleUpdate)
} else { } else {
if ret.Get(0) != nil { if ret.Get(0) != nil {
r0 = ret.Get(0).(store.StoreChannel) r0 = ret.Get(0).(*model.UserUpdate)
} }
} }
return r0 var r1 *model.AppError
if rf, ok := ret.Get(1).(func(*model.User, bool) *model.AppError); ok {
r1 = rf(user, allowRoleUpdate)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
}
return r0, r1
} }
// UpdateAuthData provides a mock function with given fields: userId, service, authData, email, resetMfa // UpdateAuthData provides a mock function with given fields: userId, service, authData, email, resetMfa

3
store/storetest/post_store.go
Просмотреть файл

@@ -2167,7 +2167,8 @@ func testPostStoreGetRepliesForExport(t *testing.T, ss store.Store) {
// Checking whether replies by deleted user are exported // Checking whether replies by deleted user are exported
u1.DeleteAt = 1002 u1.DeleteAt = 1002
store.Must(ss.User().Update(&u1, false)) _, err = ss.User().Update(&u1, false)
require.Nil(t, err)
r1 = <-ss.Post().GetRepliesForExport(p1.Id) r1 = <-ss.Post().GetRepliesForExport(p1.Id)
assert.Nil(t, r1.Err) assert.Nil(t, r1.Err)

3
store/storetest/team_store.go
Просмотреть файл

@@ -1026,7 +1026,8 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) {
user2, err := ss.User().Get(userIds[1]) user2, err := ss.User().Get(userIds[1])
require.Nil(t, err) require.Nil(t, err)
user2.DeleteAt = 1234 user2.DeleteAt = 1234
store.Must(ss.User().Update(user2, true)) _, err = ss.User().Update(user2, true)
require.Nil(t, err)
newUserId2 := store.Must(ss.User().Save(&model.User{ newUserId2 := store.Must(ss.User().Save(&model.User{
Username: model.NewId(), Username: model.NewId(),

16
store/storetest/user_store.go
Просмотреть файл

@@ -152,24 +152,24 @@ func testUserStoreUpdate(t *testing.T, ss store.Store) {
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
if err := (<-ss.User().Update(u1, false)).Err; err != nil { if _, err := ss.User().Update(u1, false); err != nil {
t.Fatal(err) t.Fatal(err)
} }
missing := &model.User{} missing := &model.User{}
if err := (<-ss.User().Update(missing, false)).Err; err == nil { if _, err := ss.User().Update(missing, false); err == nil {
t.Fatal("Update should have failed because of missing key") t.Fatal("Update should have failed because of missing key")
} }
newId := &model.User{ newId := &model.User{
Id: model.NewId(), Id: model.NewId(),
} }
if err := (<-ss.User().Update(newId, false)).Err; err == nil { if _, err := ss.User().Update(newId, false); err == nil {
t.Fatal("Update should have failed because id change") t.Fatal("Update should have failed because id change")
} }
u2.Email = MakeEmail() u2.Email = MakeEmail()
if err := (<-ss.User().Update(u2, false)).Err; err == nil { if _, err := ss.User().Update(u2, false); err == nil {
t.Fatal("Update should have failed because you can't modify AD/LDAP fields") t.Fatal("Update should have failed because you can't modify AD/LDAP fields")
} }
@@ -183,20 +183,20 @@ func testUserStoreUpdate(t *testing.T, ss store.Store) {
store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u3.Id}, -1)) store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u3.Id}, -1))
u3.Email = MakeEmail() u3.Email = MakeEmail()
if result := <-ss.User().Update(u3, false); result.Err != nil { if userUpdate, err := ss.User().Update(u3, false); err != nil {
t.Fatal("Update should not have failed") t.Fatal("Update should not have failed")
} else { } else {
newUser := result.Data.([2]*model.User)[0] newUser := userUpdate.New
if newUser.Email != oldEmail { if newUser.Email != oldEmail {
t.Fatal("Email should not have been updated as the update is not trusted") t.Fatal("Email should not have been updated as the update is not trusted")
} }
} }
u3.Email = MakeEmail() u3.Email = MakeEmail()
if result := <-ss.User().Update(u3, true); result.Err != nil { if userUpdate, err := ss.User().Update(u3, true); err != nil {
t.Fatal("Update should not have failed") t.Fatal("Update should not have failed")
} else { } else {
newUser := result.Data.([2]*model.User)[0] newUser := userUpdate.New
if newUser.Email == oldEmail { if newUser.Email == oldEmail {
t.Fatal("Email should have been updated as the update is trusted") t.Fatal("Email should have been updated as the update is trusted")
} }