IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Migrate 'UserAccessToken.DeleteAllForUser' to Sync by default (#11320)

Browse Source
This commit is contained in:
Shota Gvinepadze
2019-06-26 14:15:29 +04:00
committed by Daniel Schalla
parent 879883e9a3
commit eea898c6e0
5 changed files with 28 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/user.go
View File

@@ -1438,8 +1438,8 @@ func (a *App) PermanentDeleteUser(user *model.User) *model.AppError {
return err
}
if result := <-a.Srv.Store.UserAccessToken().DeleteAllForUser(user.Id); result.Err != nil {
return result.Err
if err := a.Srv.Store.UserAccessToken().DeleteAllForUser(user.Id); err != nil {
return err
}
if err := a.Srv.Store.OAuth().PermanentDeleteAuthDataByUser(user.Id); err != nil {

47
store/sqlstore/user_access_token_store.go
View File

@@ -92,30 +92,24 @@ func (s SqlUserAccessTokenStore) deleteTokensById(transaction *gorp.Transaction,
return nil
}
func (s SqlUserAccessTokenStore) DeleteAllForUser(userId string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
transaction, err := s.GetMaster().Begin()
if err != nil {
result.Err = model.NewAppError("SqlUserAccessTokenStore.DeleteAllForUser", "store.sql_user_access_token.delete.app_error", nil, err.Error(), http.StatusInternalServerError)
} else {
defer finalizeTransaction(transaction)
if extrasResult := s.deleteSessionsandTokensByUser(transaction, userId); extrasResult.Err != nil {
*result = extrasResult
}
func (s SqlUserAccessTokenStore) DeleteAllForUser(userId string) *model.AppError {
transaction, err := s.GetMaster().Begin()
if err != nil {
return model.NewAppError("SqlUserAccessTokenStore.DeleteAllForUser", "store.sql_user_access_token.delete.app_error", nil, err.Error(), http.StatusInternalServerError)
}
defer finalizeTransaction(transaction)
if err := s.deleteSessionsandTokensByUser(transaction, userId); err != nil {
return err
}
if result.Err == nil {
if err := transaction.Commit(); err != nil {
// don't need to rollback here since the transaction is already closed
result.Err = model.NewAppError("SqlUserAccessTokenStore.DeleteAllForUser", "store.sql_user_access_token.delete.app_error", nil, err.Error(), http.StatusInternalServerError)
}
}
}
})
if err := transaction.Commit(); err != nil {
// don't need to rollback here since the transaction is already closed
return model.NewAppError("SqlUserAccessTokenStore.DeleteAllForUser", "store.sql_user_access_token.delete.app_error", nil, err.Error(), http.StatusInternalServerError)
}
return nil
}
func (s SqlUserAccessTokenStore) deleteSessionsandTokensByUser(transaction *gorp.Transaction, userId string) store.StoreResult {
result := store.StoreResult{}
func (s SqlUserAccessTokenStore) deleteSessionsandTokensByUser(transaction *gorp.Transaction, userId string) *model.AppError {
query := ""
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
query = "DELETE FROM Sessions s USING UserAccessTokens o WHERE o.Token = s.Token AND o.UserId = :UserId"
@@ -124,21 +118,18 @@ func (s SqlUserAccessTokenStore) deleteSessionsandTokensByUser(transaction *gorp
}
if _, err := transaction.Exec(query, map[string]interface{}{"UserId": userId}); err != nil {
result.Err = model.NewAppError("SqlUserAccessTokenStore.deleteSessionsByUser", "store.sql_user_access_token.delete.app_error", nil, "user_id="+userId+", err="+err.Error(), http.StatusInternalServerError)
return result
return model.NewAppError("SqlUserAccessTokenStore.deleteSessionsByUser", "store.sql_user_access_token.delete.app_error", nil, "user_id="+userId+", err="+err.Error(), http.StatusInternalServerError)
}
return s.deleteTokensByUser(transaction, userId)
}
func (s SqlUserAccessTokenStore) deleteTokensByUser(transaction *gorp.Transaction, userId string) store.StoreResult {
result := store.StoreResult{}
func (s SqlUserAccessTokenStore) deleteTokensByUser(transaction *gorp.Transaction, userId string) *model.AppError {
if _, err := transaction.Exec("DELETE FROM UserAccessTokens WHERE UserId = :UserId", map[string]interface{}{"UserId": userId}); err != nil {
result.Err = model.NewAppError("SqlUserAccessTokenStore.deleteTokensByUser", "store.sql_user_access_token.delete.app_error", nil, "", http.StatusInternalServerError)
return model.NewAppError("SqlUserAccessTokenStore.deleteTokensByUser", "store.sql_user_access_token.delete.app_error", nil, "", http.StatusInternalServerError)
}
return result
return nil
}
func (s SqlUserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, *model.AppError) {

2
store/store.go
View File

@@ -519,8 +519,8 @@ type JobStore interface {
type UserAccessTokenStore interface {
Save(token *model.UserAccessToken) (*model.UserAccessToken, *model.AppError)
DeleteAllForUser(userId string) *model.AppError
Delete(tokenId string) *model.AppError
DeleteAllForUser(userId string) StoreChannel
Get(tokenId string) (*model.UserAccessToken, *model.AppError)
GetAll(offset int, limit int) ([]*model.UserAccessToken, *model.AppError)
GetByToken(tokenString string) (*model.UserAccessToken, *model.AppError)

8
store/storetest/mocks/UserAccessTokenStore.go
View File

@@ -30,15 +30,15 @@ func (_m *UserAccessTokenStore) Delete(tokenId string) *model.AppError {
}
// DeleteAllForUser provides a mock function with given fields: userId
func (_m *UserAccessTokenStore) DeleteAllForUser(userId string) store.StoreChannel {
func (_m *UserAccessTokenStore) DeleteAllForUser(userId string) *model.AppError {
ret := _m.Called(userId)
var r0 store.StoreChannel
if rf, ok := ret.Get(0).(func(string) store.StoreChannel); ok {
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string) *model.AppError); ok {
r0 = rf(userId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(store.StoreChannel)
r0 = ret.Get(0).(*model.AppError)
}
}

4
store/storetest/user_access_token_store.go
View File

@@ -86,8 +86,8 @@ func testUserAccessTokenSaveGetDelete(t *testing.T, ss store.Store) {
t.Fatal(err)
}
if result := <-ss.UserAccessToken().DeleteAllForUser(uat.UserId); result.Err != nil {
t.Fatal(result.Err)
if err := ss.UserAccessToken().DeleteAllForUser(uat.UserId); err != nil {
t.Fatal(err)
}
if _, err := ss.Session().Get(s2.Token); err == nil {