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

[MM-16490] Migrate UpdateTokenDisable to Sync by default (#11333)

Browse Source 
* [MM-16490] Migrate UpdateTokenDisable to Sync by default

* fix: missed conversion of app/session.go
This commit is contained in:
krjn
2019-06-21 14:55:23 +00:00
committed by Saturnino Abril
parent 2d00aed038
commit e3c8c1251f
5 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/session.go
View File

@@ -327,8 +327,8 @@ func (a *App) DisableUserAccessToken(token *model.UserAccessToken) *model.AppErr
var session *model.Session
session, _ = a.Srv.Store.Session().Get(token.Token)
if result := <-a.Srv.Store.UserAccessToken().UpdateTokenDisable(token.Id); result.Err != nil {
return result.Err
if err := a.Srv.Store.UserAccessToken().UpdateTokenDisable(token.Id); err != nil {
return err
}
if session == nil {

47
store/sqlstore/user_access_token_store.go
View File

@@ -222,30 +222,24 @@ func (s SqlUserAccessTokenStore) UpdateTokenEnable(tokenId string) store.StoreCh
})
}
func (s SqlUserAccessTokenStore) UpdateTokenDisable(tokenId string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
transaction, err := s.GetMaster().Begin()
if err != nil {
result.Err = model.NewAppError("SqlUserAccessTokenStore.UpdateTokenDisable", "store.sql_user_access_token.update_token_disable.app_error", nil, err.Error(), http.StatusInternalServerError)
} else {
defer finalizeTransaction(transaction)
if extrasResult := s.deleteSessionsAndDisableToken(transaction, tokenId); extrasResult.Err != nil {
*result = extrasResult
}
func (s SqlUserAccessTokenStore) UpdateTokenDisable(tokenId string) *model.AppError {
transaction, err := s.GetMaster().Begin()
if err != nil {
return model.NewAppError("SqlUserAccessTokenStore.UpdateTokenDisable", "store.sql_user_access_token.update_token_disable.app_error", nil, err.Error(), http.StatusInternalServerError)
}
defer finalizeTransaction(transaction)
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.UpdateTokenDisable", "store.sql_user_access_token.update_token_disable.app_error", nil, err.Error(), http.StatusInternalServerError)
}
}
}
})
if err := s.deleteSessionsAndDisableToken(transaction, tokenId); err != nil {
return err
}
if err := transaction.Commit(); err != nil {
// don't need to rollback here since the transaction is already closed
return model.NewAppError("SqlUserAccessTokenStore.UpdateTokenDisable", "store.sql_user_access_token.update_token_disable.app_error", nil, err.Error(), http.StatusInternalServerError)
}
return nil
}
func (s SqlUserAccessTokenStore) deleteSessionsAndDisableToken(transaction *gorp.Transaction, tokenId string) store.StoreResult {
result := store.StoreResult{}
func (s SqlUserAccessTokenStore) deleteSessionsAndDisableToken(transaction *gorp.Transaction, tokenId 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.Id = :Id"
@@ -254,19 +248,16 @@ func (s SqlUserAccessTokenStore) deleteSessionsAndDisableToken(transaction *gorp
}
if _, err := transaction.Exec(query, map[string]interface{}{"Id": tokenId}); err != nil {
result.Err = model.NewAppError("SqlUserAccessTokenStore.deleteSessionsAndDisableToken", "store.sql_user_access_token.update_token_disable.app_error", nil, "id="+tokenId+", err="+err.Error(), http.StatusInternalServerError)
return result
return model.NewAppError("SqlUserAccessTokenStore.deleteSessionsAndDisableToken", "store.sql_user_access_token.update_token_disable.app_error", nil, "id="+tokenId+", err="+err.Error(), http.StatusInternalServerError)
}
return s.updateTokenDisable(transaction, tokenId)
}
func (s SqlUserAccessTokenStore) updateTokenDisable(transaction *gorp.Transaction, tokenId string) store.StoreResult {
result := store.StoreResult{}
func (s SqlUserAccessTokenStore) updateTokenDisable(transaction *gorp.Transaction, tokenId string) *model.AppError {
if _, err := transaction.Exec("UPDATE UserAccessTokens SET IsActive = FALSE WHERE Id = :Id", map[string]interface{}{"Id": tokenId}); err != nil {
result.Err = model.NewAppError("SqlUserAccessTokenStore.updateTokenDisable", "store.sql_user_access_token.update_token_disable.app_error", nil, "", http.StatusInternalServerError)
return model.NewAppError("SqlUserAccessTokenStore.updateTokenDisable", "store.sql_user_access_token.update_token_disable.app_error", nil, "", http.StatusInternalServerError)
}
return result
return nil
}

2
store/store.go
View File

@@ -524,7 +524,7 @@ type UserAccessTokenStore interface {
GetByUser(userId string, page, perPage int) ([]*model.UserAccessToken, *model.AppError)
Search(term string) StoreChannel
UpdateTokenEnable(tokenId string) StoreChannel
UpdateTokenDisable(tokenId string) StoreChannel
UpdateTokenDisable(tokenId string) *model.AppError
}
type PluginStore interface {

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

@@ -187,15 +187,15 @@ func (_m *UserAccessTokenStore) Search(term string) store.StoreChannel {
}
// UpdateTokenDisable provides a mock function with given fields: tokenId
func (_m *UserAccessTokenStore) UpdateTokenDisable(tokenId string) store.StoreChannel {
func (_m *UserAccessTokenStore) UpdateTokenDisable(tokenId string) *model.AppError {
ret := _m.Called(tokenId)
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(tokenId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(store.StoreChannel)
r0 = ret.Get(0).(*model.AppError)
}
}

2
store/storetest/user_access_token_store.go
View File

@@ -117,7 +117,7 @@ func testUserAccessTokenDisableEnable(t *testing.T, ss store.Store) {
t.Fatal(err)
}
if err = (<-ss.UserAccessToken().UpdateTokenDisable(uat.Id)).Err; err != nil {
if err = ss.UserAccessToken().UpdateTokenDisable(uat.Id); err != nil {
t.Fatal(err)
}