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-16484] Migrate UserAccessToken.Get to Sync by default (#11316)

Browse Source 
* [MM-16484] Migrate UserAccessToken.Get to Sync by default

* [MM-16484] Fix shadowing error for err variable

* [MM-16484] Remove redundant else
This commit is contained in:
Rajat Varyani
2019-06-20 23:52:10 +05:30
committed by Jesús Espino
parent 11b7081f26
commit a9b4a7f508
5 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/session.go
View File

@@ -384,16 +384,15 @@ func (a *App) GetUserAccessTokensForUser(userId string, page, perPage int) ([]*m
}
func (a *App) GetUserAccessToken(tokenId string, sanitize bool) (*model.UserAccessToken, *model.AppError) {
result := <-a.Srv.Store.UserAccessToken().Get(tokenId)
if result.Err != nil {
return nil, result.Err
token, err := a.Srv.Store.UserAccessToken().Get(tokenId)
if err != nil {
return nil, err
}
token := result.Data.(*model.UserAccessToken)
if sanitize {
token.Token = ""
}
return token, nil
}
func (a *App) SearchUserAccessTokens(term string) ([]*model.UserAccessToken, *model.AppError) {

19
store/sqlstore/user_access_token_store.go
View File

@@ -149,20 +149,17 @@ func (s SqlUserAccessTokenStore) deleteTokensByUser(transaction *gorp.Transactio
return result
}
func (s SqlUserAccessTokenStore) Get(tokenId string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
token := model.UserAccessToken{}
func (s SqlUserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, *model.AppError) {
token := model.UserAccessToken{}
if err := s.GetReplica().SelectOne(&token, "SELECT * FROM UserAccessTokens WHERE Id = :Id", map[string]interface{}{"Id": tokenId}); err != nil {
if err == sql.ErrNoRows {
result.Err = model.NewAppError("SqlUserAccessTokenStore.Get", "store.sql_user_access_token.get.app_error", nil, err.Error(), http.StatusNotFound)
} else {
result.Err = model.NewAppError("SqlUserAccessTokenStore.Get", "store.sql_user_access_token.get.app_error", nil, err.Error(), http.StatusInternalServerError)
}
if err := s.GetReplica().SelectOne(&token, "SELECT * FROM UserAccessTokens WHERE Id = :Id", map[string]interface{}{"Id": tokenId}); err != nil {
if err == sql.ErrNoRows {
return nil, model.NewAppError("SqlUserAccessTokenStore.Get", "store.sql_user_access_token.get.app_error", nil, err.Error(), http.StatusNotFound)
}
return nil, model.NewAppError("SqlUserAccessTokenStore.Get", "store.sql_user_access_token.get.app_error", nil, err.Error(), http.StatusInternalServerError)
}
result.Data = &token
})
return &token, nil
}
func (s SqlUserAccessTokenStore) GetAll(offset, limit int) ([]*model.UserAccessToken, *model.AppError) {

2
store/store.go
View File

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

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

@@ -46,19 +46,28 @@ func (_m *UserAccessTokenStore) DeleteAllForUser(userId string) store.StoreChann
}
// Get provides a mock function with given fields: tokenId
func (_m *UserAccessTokenStore) Get(tokenId string) store.StoreChannel {
func (_m *UserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, *model.AppError) {
ret := _m.Called(tokenId)
var r0 store.StoreChannel
if rf, ok := ret.Get(0).(func(string) store.StoreChannel); ok {
var r0 *model.UserAccessToken
if rf, ok := ret.Get(0).(func(string) *model.UserAccessToken); ok {
r0 = rf(tokenId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(store.StoreChannel)
r0 = ret.Get(0).(*model.UserAccessToken)
}
}
return r0
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
r1 = rf(tokenId)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
}
return r0, r1
}
// GetAll provides a mock function with given fields: offset, limit

6
store/storetest/user_access_token_store.go
View File

@@ -35,9 +35,9 @@ func testUserAccessTokenSaveGetDelete(t *testing.T, ss store.Store) {
t.Fatal(result.Err)
}
if result := <-ss.UserAccessToken().Get(uat.Id); result.Err != nil {
t.Fatal(result.Err)
} else if received := result.Data.(*model.UserAccessToken); received.Token != uat.Token {
if result, terr := ss.UserAccessToken().Get(uat.Id); terr != nil {
t.Fatal(terr)
} else if result.Token != uat.Token {
t.Fatal("received incorrect token after save")
}