mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

UserAccessTokenStore migration (#15029)

Просмотр исходного кода 
* Migration completed

* Suggestions

* Fix no new var

* Fix another no new var in the left side
Этот коммит содержится в:
Rodrigo Villablanca
2020-07-23 04:58:49 -04:00
коммит произвёл GitHub
родитель 549e5b57cd
Коммит d9529183b2
10 изменённых файлов: 207 добавлений и 207 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
store/storetest/mocks/SqlSupplier.go
Просмотреть файл

@@ -14,6 +14,20 @@ type SqlSupplier struct {
mock.Mock
}
// DriverName provides a mock function with given fields:
func (_m *SqlSupplier) DriverName() string {
ret := _m.Called()
var r0 string
if rf, ok := ret.Get(0).(func() string); ok {
r0 = rf()
} else {
r0 = ret.Get(0).(string)
}
return r0
}
// GetMaster provides a mock function with given fields:
func (_m *SqlSupplier) GetMaster() *gorp.DbMap {
ret := _m.Called()

100
store/storetest/mocks/UserAccessTokenStore.go
Просмотреть файл

@@ -15,39 +15,35 @@ type UserAccessTokenStore struct {
}
// Delete provides a mock function with given fields: tokenId
func (_m *UserAccessTokenStore) Delete(tokenId string) *model.AppError {
func (_m *UserAccessTokenStore) Delete(tokenId string) error {
ret := _m.Called(tokenId)
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(tokenId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
}
// DeleteAllForUser provides a mock function with given fields: userId
func (_m *UserAccessTokenStore) DeleteAllForUser(userId string) *model.AppError {
func (_m *UserAccessTokenStore) DeleteAllForUser(userId string) error {
ret := _m.Called(userId)
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(userId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
}
// Get provides a mock function with given fields: tokenId
func (_m *UserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, *model.AppError) {
func (_m *UserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, error) {
ret := _m.Called(tokenId)
var r0 *model.UserAccessToken
@@ -59,20 +55,18 @@ func (_m *UserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, *mo
}
}
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(tokenId)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetAll provides a mock function with given fields: offset, limit
func (_m *UserAccessTokenStore) GetAll(offset int, limit int) ([]*model.UserAccessToken, *model.AppError) {
func (_m *UserAccessTokenStore) GetAll(offset int, limit int) ([]*model.UserAccessToken, error) {
ret := _m.Called(offset, limit)
var r0 []*model.UserAccessToken
@@ -84,20 +78,18 @@ func (_m *UserAccessTokenStore) GetAll(offset int, limit int) ([]*model.UserAcce
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(int, int) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(int, int) error); ok {
r1 = rf(offset, limit)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetByToken provides a mock function with given fields: tokenString
func (_m *UserAccessTokenStore) GetByToken(tokenString string) (*model.UserAccessToken, *model.AppError) {
func (_m *UserAccessTokenStore) GetByToken(tokenString string) (*model.UserAccessToken, error) {
ret := _m.Called(tokenString)
var r0 *model.UserAccessToken
@@ -109,20 +101,18 @@ func (_m *UserAccessTokenStore) GetByToken(tokenString string) (*model.UserAcces
}
}
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(tokenString)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetByUser provides a mock function with given fields: userId, page, perPage
func (_m *UserAccessTokenStore) GetByUser(userId string, page int, perPage int) ([]*model.UserAccessToken, *model.AppError) {
func (_m *UserAccessTokenStore) GetByUser(userId string, page int, perPage int) ([]*model.UserAccessToken, error) {
ret := _m.Called(userId, page, perPage)
var r0 []*model.UserAccessToken
@@ -134,20 +124,18 @@ func (_m *UserAccessTokenStore) GetByUser(userId string, page int, perPage int)
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, int, int) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string, int, int) error); ok {
r1 = rf(userId, page, perPage)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// Save provides a mock function with given fields: token
func (_m *UserAccessTokenStore) Save(token *model.UserAccessToken) (*model.UserAccessToken, *model.AppError) {
func (_m *UserAccessTokenStore) Save(token *model.UserAccessToken) (*model.UserAccessToken, error) {
ret := _m.Called(token)
var r0 *model.UserAccessToken
@@ -159,20 +147,18 @@ func (_m *UserAccessTokenStore) Save(token *model.UserAccessToken) (*model.UserA
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(*model.UserAccessToken) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(*model.UserAccessToken) error); ok {
r1 = rf(token)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// Search provides a mock function with given fields: term
func (_m *UserAccessTokenStore) Search(term string) ([]*model.UserAccessToken, *model.AppError) {
func (_m *UserAccessTokenStore) Search(term string) ([]*model.UserAccessToken, error) {
ret := _m.Called(term)
var r0 []*model.UserAccessToken
@@ -184,45 +170,39 @@ func (_m *UserAccessTokenStore) Search(term string) ([]*model.UserAccessToken, *
}
}
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(term)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// UpdateTokenDisable provides a mock function with given fields: tokenId
func (_m *UserAccessTokenStore) UpdateTokenDisable(tokenId string) *model.AppError {
func (_m *UserAccessTokenStore) UpdateTokenDisable(tokenId string) error {
ret := _m.Called(tokenId)
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(tokenId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
}
// UpdateTokenEnable provides a mock function with given fields: tokenId
func (_m *UserAccessTokenStore) UpdateTokenEnable(tokenId string) *model.AppError {
func (_m *UserAccessTokenStore) UpdateTokenEnable(tokenId string) error {
ret := _m.Called(tokenId)
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(tokenId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0

56
store/storetest/user_access_token_store.go
Просмотреть файл

@@ -31,8 +31,8 @@ func testUserAccessTokenSaveGetDelete(t *testing.T, ss store.Store) {
s1, err := ss.Session().Save(s1)
require.Nil(t, err)
_, err = ss.UserAccessToken().Save(uat)
require.Nil(t, err)
_, nErr := ss.UserAccessToken().Save(uat)
require.Nil(t, nErr)
result, terr := ss.UserAccessToken().Get(uat.Id)
require.Nil(t, terr)
@@ -42,8 +42,8 @@ func testUserAccessTokenSaveGetDelete(t *testing.T, ss store.Store) {
require.Nil(t, err2)
require.Equal(t, received.Token, uat.Token, "received incorrect token after save")
_, err = ss.UserAccessToken().GetByToken("notarealtoken")
require.NotNil(t, err, "should have failed on bad token")
_, nErr = ss.UserAccessToken().GetByToken("notarealtoken")
require.NotNil(t, nErr, "should have failed on bad token")
received2, err2 := ss.UserAccessToken().GetByUser(uat.UserId, 0, 100)
require.Nil(t, err2)
@@ -53,14 +53,14 @@ func testUserAccessTokenSaveGetDelete(t *testing.T, ss store.Store) {
require.Nil(t, appError)
require.Equal(t, 1, len(result2), "received incorrect number of tokens after save")
err = ss.UserAccessToken().Delete(uat.Id)
require.Nil(t, err)
nErr = ss.UserAccessToken().Delete(uat.Id)
require.Nil(t, nErr)
_, err = ss.Session().Get(s1.Token)
require.NotNil(t, err, "should error - session should be deleted")
_, err = ss.UserAccessToken().GetByToken(s1.Token)
require.NotNil(t, err, "should error - access token should be deleted")
_, nErr = ss.UserAccessToken().GetByToken(s1.Token)
require.NotNil(t, nErr, "should error - access token should be deleted")
s2 := &model.Session{}
s2.UserId = uat.UserId
@@ -69,17 +69,17 @@ func testUserAccessTokenSaveGetDelete(t *testing.T, ss store.Store) {
s2, err = ss.Session().Save(s2)
require.Nil(t, err)
_, err = ss.UserAccessToken().Save(uat)
require.Nil(t, err)
_, nErr = ss.UserAccessToken().Save(uat)
require.Nil(t, nErr)
err = ss.UserAccessToken().DeleteAllForUser(uat.UserId)
require.Nil(t, err)
nErr = ss.UserAccessToken().DeleteAllForUser(uat.UserId)
require.Nil(t, nErr)
_, err = ss.Session().Get(s2.Token)
require.NotNil(t, err, "should error - session should be deleted")
_, err = ss.UserAccessToken().GetByToken(s2.Token)
require.NotNil(t, err, "should error - access token should be deleted")
_, nErr = ss.UserAccessToken().GetByToken(s2.Token)
require.NotNil(t, nErr, "should error - access token should be deleted")
}
func testUserAccessTokenDisableEnable(t *testing.T, ss store.Store) {
@@ -96,11 +96,11 @@ func testUserAccessTokenDisableEnable(t *testing.T, ss store.Store) {
s1, err := ss.Session().Save(s1)
require.Nil(t, err)
_, err = ss.UserAccessToken().Save(uat)
require.Nil(t, err)
_, nErr := ss.UserAccessToken().Save(uat)
require.Nil(t, nErr)
err = ss.UserAccessToken().UpdateTokenDisable(uat.Id)
require.Nil(t, err)
nErr = ss.UserAccessToken().UpdateTokenDisable(uat.Id)
require.Nil(t, nErr)
_, err = ss.Session().Get(s1.Token)
require.NotNil(t, err, "should error - session should be deleted")
@@ -112,8 +112,8 @@ func testUserAccessTokenDisableEnable(t *testing.T, ss store.Store) {
s2, err = ss.Session().Save(s2)
require.Nil(t, err)
err = ss.UserAccessToken().UpdateTokenEnable(uat.Id)
require.Nil(t, err)
nErr = ss.UserAccessToken().UpdateTokenEnable(uat.Id)
require.Nil(t, nErr)
}
func testUserAccessTokenSearch(t *testing.T, ss store.Store) {
@@ -137,19 +137,19 @@ func testUserAccessTokenSearch(t *testing.T, ss store.Store) {
s1, nErr := ss.Session().Save(s1)
require.Nil(t, nErr)
_, err = ss.UserAccessToken().Save(uat)
require.Nil(t, err)
_, nErr = ss.UserAccessToken().Save(uat)
require.Nil(t, nErr)
received, err := ss.UserAccessToken().Search(uat.Id)
require.Nil(t, err)
received, nErr := ss.UserAccessToken().Search(uat.Id)
require.Nil(t, nErr)
require.Equal(t, 1, len(received), "received incorrect number of tokens after search")
received, err = ss.UserAccessToken().Search(uat.UserId)
require.Nil(t, err)
received, nErr = ss.UserAccessToken().Search(uat.UserId)
require.Nil(t, nErr)
require.Equal(t, 1, len(received), "received incorrect number of tokens after search")
received, err = ss.UserAccessToken().Search(u1.Username)
require.Nil(t, err)
received, nErr = ss.UserAccessToken().Search(u1.Username)
require.Nil(t, nErr)
require.Equal(t, 1, len(received), "received incorrect number of tokens after search")
}