TokenStore migration to return plain errors (#14875)

* TokenStore migration to return plain errors

* Fix translations

* Fix: returned error is ignored and http.StatusBadRequest is always returned

* Fix

* Fix translations

* Suggestions

* Changed from BadRequest to NotFound

* Setting the correct http status

* Changed test to expect 404 status

* Fix error
Этот коммит содержится в:
Rodrigo Villablanca
2020-07-09 03:16:27 -04:00
коммит произвёл GitHub
родитель 4df6019f61
Коммит 8b6a5fc5d7
14 изменённых файлов: 101 добавлений и 86 удалений

Просмотреть файл

@@ -20,23 +20,21 @@ func (_m *TokenStore) Cleanup() {
}
// Delete provides a mock function with given fields: token
func (_m *TokenStore) Delete(token string) *model.AppError {
func (_m *TokenStore) Delete(token string) error {
ret := _m.Called(token)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string) *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(token)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
}
// GetByToken provides a mock function with given fields: token
func (_m *TokenStore) GetByToken(token string) (*model.Token, *model.AppError) {
func (_m *TokenStore) GetByToken(token string) (*model.Token, error) {
ret := _m.Called(token)
var r0 *model.Token
@@ -48,45 +46,39 @@ func (_m *TokenStore) GetByToken(token string) (*model.Token, *model.AppError) {
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(token)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// RemoveAllTokensByType provides a mock function with given fields: tokenType
func (_m *TokenStore) RemoveAllTokensByType(tokenType string) *model.AppError {
func (_m *TokenStore) RemoveAllTokensByType(tokenType string) error {
ret := _m.Called(tokenType)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string) *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(tokenType)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
}
// Save provides a mock function with given fields: recovery
func (_m *TokenStore) Save(recovery *model.Token) *model.AppError {
func (_m *TokenStore) Save(recovery *model.Token) error {
ret := _m.Called(recovery)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(*model.Token) *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func(*model.Token) error); ok {
r0 = rf(recovery)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0