Migrate Session.RemoveAllSessions to Sync by default (#11037)
Этот коммит содержится в:
коммит произвёл
Miguel de la Cruz
родитель
330a21a994
Коммит
978ee13262
@@ -153,13 +153,12 @@ func (me SqlSessionStore) Remove(sessionIdOrToken string) store.StoreChannel {
|
||||
})
|
||||
}
|
||||
|
||||
func (me SqlSessionStore) RemoveAllSessions() store.StoreChannel {
|
||||
return store.Do(func(result *store.StoreResult) {
|
||||
func (me SqlSessionStore) RemoveAllSessions() *model.AppError {
|
||||
_, err := me.GetMaster().Exec("DELETE FROM Sessions")
|
||||
if err != nil {
|
||||
result.Err = model.NewAppError("SqlSessionStore.RemoveAllSessions", "store.sql_session.remove_all_sessions_for_team.app_error", nil, err.Error(), http.StatusInternalServerError)
|
||||
return model.NewAppError("SqlSessionStore.RemoveAllSessions", "store.sql_session.remove_all_sessions_for_team.app_error", nil, err.Error(), http.StatusInternalServerError)
|
||||
}
|
||||
})
|
||||
return nil
|
||||
}
|
||||
|
||||
func (me SqlSessionStore) PermanentDeleteSessionsByUser(userId string) *model.AppError {
|
||||
|
||||
@@ -317,7 +317,7 @@ type SessionStore interface {
|
||||
GetSessions(userId string) ([]*model.Session, *model.AppError)
|
||||
GetSessionsWithActiveDeviceIds(userId string) ([]*model.Session, *model.AppError)
|
||||
Remove(sessionIdOrToken string) StoreChannel
|
||||
RemoveAllSessions() StoreChannel
|
||||
RemoveAllSessions() *model.AppError
|
||||
PermanentDeleteSessionsByUser(teamId string) *model.AppError
|
||||
UpdateLastActivityAt(sessionId string, time int64) StoreChannel
|
||||
UpdateRoles(userId string, roles string) StoreChannel
|
||||
|
||||
@@ -149,15 +149,15 @@ func (_m *SessionStore) Remove(sessionIdOrToken string) store.StoreChannel {
|
||||
}
|
||||
|
||||
// RemoveAllSessions provides a mock function with given fields:
|
||||
func (_m *SessionStore) RemoveAllSessions() store.StoreChannel {
|
||||
func (_m *SessionStore) RemoveAllSessions() *model.AppError {
|
||||
ret := _m.Called()
|
||||
|
||||
var r0 store.StoreChannel
|
||||
if rf, ok := ret.Get(0).(func() store.StoreChannel); ok {
|
||||
var r0 *model.AppError
|
||||
if rf, ok := ret.Get(0).(func() *model.AppError); ok {
|
||||
r0 = rf()
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(store.StoreChannel)
|
||||
r0 = ret.Get(0).(*model.AppError)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -146,7 +146,8 @@ func testSessionRemoveAll(t *testing.T, ss store.Store) {
|
||||
}
|
||||
}
|
||||
|
||||
store.Must(ss.Session().RemoveAllSessions())
|
||||
removeErr := ss.Session().RemoveAllSessions()
|
||||
require.Nil(t, removeErr)
|
||||
|
||||
if _, err := ss.Session().Get(s1.Id); err == nil {
|
||||
t.Fatal("should have been removed")
|
||||
|
||||
Ссылка в новой задаче
Block a user