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

GH-11298 Migrate UserAccessToken.UpdateTokenEnable to Sync by default (#11418)

Browse Source
This commit is contained in:
Marc Argent
2019-06-28 11:02:51 +01:00
committed by George Goldberg
parent a86b204105
commit 591c73310c
5 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/session.go
View File

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

13
store/sqlstore/user_access_token_store.go
View File

@@ -196,14 +196,11 @@ func (s SqlUserAccessTokenStore) Search(term string) ([]*model.UserAccessToken,
return tokens, nil
}
func (s SqlUserAccessTokenStore) UpdateTokenEnable(tokenId string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
if _, err := s.GetMaster().Exec("UPDATE UserAccessTokens SET IsActive = TRUE WHERE Id = :Id", map[string]interface{}{"Id": tokenId}); err != nil {
result.Err = model.NewAppError("SqlUserAccessTokenStore.UpdateTokenEnable", "store.sql_user_access_token.update_token_enable.app_error", nil, "id="+tokenId+", "+err.Error(), http.StatusInternalServerError)
} else {
result.Data = tokenId
}
})
func (s SqlUserAccessTokenStore) UpdateTokenEnable(tokenId string) *model.AppError {
if _, err := s.GetMaster().Exec("UPDATE UserAccessTokens SET IsActive = TRUE WHERE Id = :Id", map[string]interface{}{"Id": tokenId}); err != nil {
return model.NewAppError("SqlUserAccessTokenStore.UpdateTokenEnable", "store.sql_user_access_token.update_token_enable.app_error", nil, "id="+tokenId+", "+err.Error(), http.StatusInternalServerError)
}
return nil
}
func (s SqlUserAccessTokenStore) UpdateTokenDisable(tokenId string) *model.AppError {

2
store/store.go
View File

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

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

@@ -6,7 +6,6 @@ package mocks
import mock "github.com/stretchr/testify/mock"
import model "github.com/mattermost/mattermost-server/model"
import store "github.com/mattermost/mattermost-server/store"
// UserAccessTokenStore is an autogenerated mock type for the UserAccessTokenStore type
type UserAccessTokenStore struct {
@@ -212,15 +211,15 @@ func (_m *UserAccessTokenStore) UpdateTokenDisable(tokenId string) *model.AppErr
}
// UpdateTokenEnable provides a mock function with given fields: tokenId
func (_m *UserAccessTokenStore) UpdateTokenEnable(tokenId string) store.StoreChannel {
func (_m *UserAccessTokenStore) UpdateTokenEnable(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

@@ -132,7 +132,7 @@ func testUserAccessTokenDisableEnable(t *testing.T, ss store.Store) {
s2, err = ss.Session().Save(s2)
require.Nil(t, err)
if err := (<-ss.UserAccessToken().UpdateTokenEnable(uat.Id)).Err; err != nil {
if err = ss.UserAccessToken().UpdateTokenEnable(uat.Id); err != nil {
t.Fatal(err)
}
}