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-16513] Migrate Token.Delete to Sync by default (#11365)

Browse Source 
* Made changes to TokenStore interface, Delete()

* Modified user.go

* Refactored app/user.go
This commit is contained in:
Deepak Sah
2019-06-27 16:44:17 +05:30
committed by Jesús Espino
parent eb8b475497
commit 77ed6015fd
4 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/user.go
View File

@@ -1360,11 +1360,7 @@ func (a *App) GetPasswordRecoveryToken(token string) (*model.Token, *model.AppEr
}
func (a *App) DeleteToken(token *model.Token) *model.AppError {
if result := <-a.Srv.Store.Token().Delete(token.Token); result.Err != nil {
return result.Err
}
return nil
return a.Srv.Store.Token().Delete(token.Token)
}
func (a *App) UpdateUserRoles(userId string, newRoles string, sendWebSocketEvent bool) (*model.User, *model.AppError) {

11
store/sqlstore/tokens_store.go
View File

@@ -43,12 +43,11 @@ func (s SqlTokenStore) Save(token *model.Token) *model.AppError {
return nil
}
func (s SqlTokenStore) Delete(token string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
if _, err := s.GetMaster().Exec("DELETE FROM Tokens WHERE Token = :Token", map[string]interface{}{"Token": token}); err != nil {
result.Err = model.NewAppError("SqlTokenStore.Delete", "store.sql_recover.delete.app_error", nil, "", http.StatusInternalServerError)
}
})
func (s SqlTokenStore) Delete(token string) *model.AppError {
if _, err := s.GetMaster().Exec("DELETE FROM Tokens WHERE Token = :Token", map[string]interface{}{"Token": token}); err != nil {
return model.NewAppError("SqlTokenStore.Delete", "store.sql_recover.delete.app_error", nil, "", http.StatusInternalServerError)
}
return nil
}
func (s SqlTokenStore) GetByToken(tokenString string) (*model.Token, *model.AppError) {

2
store/store.go
View File

@@ -450,7 +450,7 @@ type LicenseStore interface {
type TokenStore interface {
Save(recovery *model.Token) *model.AppError
Delete(token string) StoreChannel
Delete(token string) *model.AppError
GetByToken(token string) (*model.Token, *model.AppError)
Cleanup()
RemoveAllTokensByType(tokenType string) StoreChannel

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

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