summaryrefslogtreecommitdiffstats
path: root/store
diff options
context:
space:
mode:
Diffstat (limited to 'store')
-rw-r--r--store/sqlstore/emoji_store.go48
-rw-r--r--store/sqlstore/session_store.go54
-rw-r--r--store/sqlstore/user_access_token_store.go32
-rw-r--r--store/store.go6
-rw-r--r--store/storetest/emoji_store.go94
-rw-r--r--store/storetest/mocks/EmojiStore.go26
-rw-r--r--store/storetest/mocks/SessionStore.go5
-rw-r--r--store/storetest/mocks/UserAccessTokenStore.go32
-rw-r--r--store/storetest/session_store.go48
-rw-r--r--store/storetest/user_access_token_store.go49
10 files changed, 354 insertions, 40 deletions
diff --git a/store/sqlstore/emoji_store.go b/store/sqlstore/emoji_store.go
index 9ef071f02..afd87b83d 100644
--- a/store/sqlstore/emoji_store.go
+++ b/store/sqlstore/emoji_store.go
@@ -46,6 +46,7 @@ func (es SqlEmojiStore) CreateIndexesIfNotExists() {
es.CreateIndexIfNotExists("idx_emoji_update_at", "Emoji", "UpdateAt")
es.CreateIndexIfNotExists("idx_emoji_create_at", "Emoji", "CreateAt")
es.CreateIndexIfNotExists("idx_emoji_delete_at", "Emoji", "DeleteAt")
+ es.CreateIndexIfNotExists("idx_emoji_name", "Emoji", "Name")
}
func (es SqlEmojiStore) Save(emoji *model.Emoji) store.StoreChannel {
@@ -123,18 +124,19 @@ func (es SqlEmojiStore) GetByName(name string) store.StoreChannel {
})
}
-func (es SqlEmojiStore) GetList(offset, limit int) store.StoreChannel {
+func (es SqlEmojiStore) GetList(offset, limit int, sort string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
var emoji []*model.Emoji
- if _, err := es.GetReplica().Select(&emoji,
- `SELECT
- *
- FROM
- Emoji
- WHERE
- DeleteAt = 0
- LIMIT :Limit OFFSET :Offset`, map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil {
+ query := "SELECT * FROM Emoji WHERE DeleteAt = 0"
+
+ if sort == model.EMOJI_SORT_BY_NAME {
+ query += " ORDER BY Name"
+ }
+
+ query += " LIMIT :Limit OFFSET :Offset"
+
+ if _, err := es.GetReplica().Select(&emoji, query, map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil {
result.Err = model.NewAppError("SqlEmojiStore.GetList", "store.sql_emoji.get_all.app_error", nil, err.Error(), http.StatusInternalServerError)
} else {
result.Data = emoji
@@ -161,3 +163,31 @@ func (es SqlEmojiStore) Delete(id string, time int64) store.StoreChannel {
emojiCache.Remove(id)
})
}
+
+func (es SqlEmojiStore) Search(name string, prefixOnly bool, limit int) store.StoreChannel {
+ return store.Do(func(result *store.StoreResult) {
+ var emojis []*model.Emoji
+
+ term := ""
+ if !prefixOnly {
+ term = "%"
+ }
+
+ term += name + "%"
+
+ if _, err := es.GetReplica().Select(&emojis,
+ `SELECT
+ *
+ FROM
+ Emoji
+ WHERE
+ Name LIKE :Name
+ AND DeleteAt = 0
+ ORDER BY Name
+ LIMIT :Limit`, map[string]interface{}{"Name": term, "Limit": limit}); err != nil {
+ result.Err = model.NewAppError("SqlEmojiStore.Search", "store.sql_emoji.get_by_name.app_error", nil, "name="+name+", "+err.Error(), http.StatusInternalServerError)
+ } else {
+ result.Data = emojis
+ }
+ })
+}
diff --git a/store/sqlstore/session_store.go b/store/sqlstore/session_store.go
index 57b7bbffe..221603865 100644
--- a/store/sqlstore/session_store.go
+++ b/store/sqlstore/session_store.go
@@ -5,12 +5,15 @@ package sqlstore
import (
"net/http"
+ "time"
l4g "github.com/alecthomas/log4go"
-
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/store"
- "github.com/mattermost/mattermost-server/utils"
+)
+
+const (
+ SESSIONS_CLEANUP_DELAY_MILLISECONDS = 100
)
type SqlSessionStore struct {
@@ -50,10 +53,6 @@ func (me SqlSessionStore) Save(session *model.Session) store.StoreChannel {
session.PreSave()
- if cur := <-me.CleanUpExpiredSessions(session.UserId); cur.Err != nil {
- l4g.Error(utils.T("store.sql_session.save.cleanup.error"), cur.Err)
- }
-
tcs := me.Team().GetTeamsForUser(session.UserId)
if err := me.GetMaster().Insert(session); err != nil {
@@ -108,10 +107,6 @@ func (me SqlSessionStore) Get(sessionIdOrToken string) store.StoreChannel {
func (me SqlSessionStore) GetSessions(userId string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
- if cur := <-me.CleanUpExpiredSessions(userId); cur.Err != nil {
- l4g.Error(utils.T("store.sql_session.get_sessions.error"), cur.Err)
- }
-
var sessions []*model.Session
tcs := me.Team().GetTeamsForUser(userId)
@@ -180,16 +175,6 @@ func (me SqlSessionStore) PermanentDeleteSessionsByUser(userId string) store.Sto
})
}
-func (me SqlSessionStore) CleanUpExpiredSessions(userId string) store.StoreChannel {
- return store.Do(func(result *store.StoreResult) {
- if _, err := me.GetMaster().Exec("DELETE FROM Sessions WHERE UserId = :UserId AND ExpiresAt != 0 AND :ExpiresAt > ExpiresAt", map[string]interface{}{"UserId": userId, "ExpiresAt": model.GetMillis()}); err != nil {
- result.Err = model.NewAppError("SqlSessionStore.CleanUpExpiredSessions", "store.sql_session.cleanup_expired_sessions.app_error", nil, err.Error(), http.StatusInternalServerError)
- } else {
- result.Data = userId
- }
- })
-}
-
func (me SqlSessionStore) UpdateLastActivityAt(sessionId string, time int64) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
if _, err := me.GetMaster().Exec("UPDATE Sessions SET LastActivityAt = :LastActivityAt WHERE Id = :Id", map[string]interface{}{"LastActivityAt": time, "Id": sessionId}); err != nil {
@@ -236,3 +221,32 @@ func (me SqlSessionStore) AnalyticsSessionCount() store.StoreChannel {
}
})
}
+
+func (me SqlSessionStore) Cleanup(expiryTime int64, batchSize int64) {
+ l4g.Debug("Cleaning up session store.")
+
+ var query string
+ if me.DriverName() == model.DATABASE_DRIVER_POSTGRES {
+ query = "DELETE FROM Sessions WHERE Id = any (array (SELECT Id FROM Sessions WHERE ExpiresAt != 0 AND :ExpiresAt > ExpiresAt LIMIT :Limit))"
+ } else {
+ query = "DELETE FROM Sessions WHERE ExpiresAt != 0 AND :ExpiresAt > ExpiresAt LIMIT :Limit"
+ }
+
+ var rowsAffected int64 = 1
+
+ for rowsAffected > 0 {
+ if sqlResult, err := me.GetMaster().Exec(query, map[string]interface{}{"ExpiresAt": expiryTime, "Limit": batchSize}); err != nil {
+ l4g.Error("Unable to cleanup session store. err=%v", err.Error())
+ return
+ } else {
+ var rowErr error
+ rowsAffected, rowErr = sqlResult.RowsAffected()
+ if rowErr != nil {
+ l4g.Error("Unable to cleanup session store. err=%v", err.Error())
+ return
+ }
+ }
+
+ time.Sleep(SESSIONS_CLEANUP_DELAY_MILLISECONDS * time.Millisecond)
+ }
+}
diff --git a/store/sqlstore/user_access_token_store.go b/store/sqlstore/user_access_token_store.go
index 530ba8d16..b90ba773f 100644
--- a/store/sqlstore/user_access_token_store.go
+++ b/store/sqlstore/user_access_token_store.go
@@ -171,6 +171,18 @@ func (s SqlUserAccessTokenStore) Get(tokenId string) store.StoreChannel {
})
}
+func (s SqlUserAccessTokenStore) GetAll(offset, limit int) store.StoreChannel {
+ return store.Do(func(result *store.StoreResult) {
+ tokens := []*model.UserAccessToken{}
+
+ if _, err := s.GetReplica().Select(&tokens, "SELECT * FROM UserAccessTokens LIMIT :Limit OFFSET :Offset", map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil {
+ result.Err = model.NewAppError("SqlUserAccessTokenStore.GetAll", "store.sql_user_access_token.get_all.app_error", nil, err.Error(), http.StatusInternalServerError)
+ }
+
+ result.Data = tokens
+ })
+}
+
func (s SqlUserAccessTokenStore) GetByToken(tokenString string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
token := model.UserAccessToken{}
@@ -199,6 +211,26 @@ func (s SqlUserAccessTokenStore) GetByUser(userId string, offset, limit int) sto
})
}
+func (s SqlUserAccessTokenStore) Search(term string) store.StoreChannel {
+ return store.Do(func(result *store.StoreResult) {
+ tokens := []*model.UserAccessToken{}
+ params := map[string]interface{}{"Term": term + "%"}
+ query := `
+ SELECT
+ uat.*
+ FROM UserAccessTokens uat
+ INNER JOIN Users u
+ ON uat.UserId = u.Id
+ WHERE uat.Id LIKE :Term OR uat.UserId LIKE :Term OR u.Username LIKE :Term`
+
+ if _, err := s.GetReplica().Select(&tokens, query, params); err != nil {
+ result.Err = model.NewAppError("SqlUserAccessTokenStore.Search", "store.sql_user_access_token.search.app_error", nil, "term="+term+", "+err.Error(), http.StatusInternalServerError)
+ }
+
+ result.Data = tokens
+ })
+}
+
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 {
diff --git a/store/store.go b/store/store.go
index 6ca07c294..2742c0889 100644
--- a/store/store.go
+++ b/store/store.go
@@ -260,6 +260,7 @@ type SessionStore interface {
UpdateRoles(userId string, roles string) StoreChannel
UpdateDeviceId(id string, deviceId string, expiresAt int64) StoreChannel
AnalyticsSessionCount() StoreChannel
+ Cleanup(expiryTime int64, batchSize int64)
}
type AuditStore interface {
@@ -390,8 +391,9 @@ type EmojiStore interface {
Save(emoji *model.Emoji) StoreChannel
Get(id string, allowFromCache bool) StoreChannel
GetByName(name string) StoreChannel
- GetList(offset, limit int) StoreChannel
+ GetList(offset, limit int, sort string) StoreChannel
Delete(id string, time int64) StoreChannel
+ Search(name string, prefixOnly bool, limit int) StoreChannel
}
type StatusStore interface {
@@ -446,8 +448,10 @@ type UserAccessTokenStore interface {
Delete(tokenId string) StoreChannel
DeleteAllForUser(userId string) StoreChannel
Get(tokenId string) StoreChannel
+ GetAll(offset int, limit int) StoreChannel
GetByToken(tokenString string) StoreChannel
GetByUser(userId string, page, perPage int) StoreChannel
+ Search(term string) StoreChannel
UpdateTokenEnable(tokenId string) StoreChannel
UpdateTokenDisable(tokenId string) StoreChannel
}
diff --git a/store/storetest/emoji_store.go b/store/storetest/emoji_store.go
index fc5a31a43..9e4dbaa6e 100644
--- a/store/storetest/emoji_store.go
+++ b/store/storetest/emoji_store.go
@@ -9,6 +9,8 @@ import (
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/store"
+
+ "github.com/stretchr/testify/assert"
)
func TestEmojiStore(t *testing.T, ss store.Store) {
@@ -16,6 +18,7 @@ func TestEmojiStore(t *testing.T, ss store.Store) {
t.Run("EmojiGet", func(t *testing.T) { testEmojiGet(t, ss) })
t.Run("EmojiGetByName", func(t *testing.T) { testEmojiGetByName(t, ss) })
t.Run("EmojiGetList", func(t *testing.T) { testEmojiGetList(t, ss) })
+ t.Run("EmojiSearch", func(t *testing.T) { testEmojiSearch(t, ss) })
}
func testEmojiSaveDelete(t *testing.T, ss store.Store) {
@@ -133,15 +136,15 @@ func testEmojiGetList(t *testing.T, ss store.Store) {
emojis := []model.Emoji{
{
CreatorId: model.NewId(),
- Name: model.NewId(),
+ Name: "00000000000000000000000000a" + model.NewId(),
},
{
CreatorId: model.NewId(),
- Name: model.NewId(),
+ Name: "00000000000000000000000000b" + model.NewId(),
},
{
CreatorId: model.NewId(),
- Name: model.NewId(),
+ Name: "00000000000000000000000000c" + model.NewId(),
},
}
@@ -154,7 +157,7 @@ func testEmojiGetList(t *testing.T, ss store.Store) {
}
}()
- if result := <-ss.Emoji().GetList(0, 100); result.Err != nil {
+ if result := <-ss.Emoji().GetList(0, 100, ""); result.Err != nil {
t.Fatal(result.Err)
} else {
for _, emoji := range emojis {
@@ -172,4 +175,87 @@ func testEmojiGetList(t *testing.T, ss store.Store) {
}
}
}
+
+ result := <-ss.Emoji().GetList(0, 3, model.EMOJI_SORT_BY_NAME)
+ assert.Nil(t, result.Err)
+ remojis := result.Data.([]*model.Emoji)
+ assert.Equal(t, 3, len(remojis))
+ assert.Equal(t, emojis[0].Name, remojis[0].Name)
+ assert.Equal(t, emojis[1].Name, remojis[1].Name)
+ assert.Equal(t, emojis[2].Name, remojis[2].Name)
+
+ result = <-ss.Emoji().GetList(1, 2, model.EMOJI_SORT_BY_NAME)
+ assert.Nil(t, result.Err)
+ remojis = result.Data.([]*model.Emoji)
+ assert.Equal(t, 2, len(remojis))
+ assert.Equal(t, emojis[1].Name, remojis[0].Name)
+ assert.Equal(t, emojis[2].Name, remojis[1].Name)
+
+}
+
+func testEmojiSearch(t *testing.T, ss store.Store) {
+ emojis := []model.Emoji{
+ {
+ CreatorId: model.NewId(),
+ Name: "blargh_" + model.NewId(),
+ },
+ {
+ CreatorId: model.NewId(),
+ Name: model.NewId() + "_blargh",
+ },
+ {
+ CreatorId: model.NewId(),
+ Name: model.NewId() + "_blargh_" + model.NewId(),
+ },
+ {
+ CreatorId: model.NewId(),
+ Name: model.NewId(),
+ },
+ }
+
+ for i, emoji := range emojis {
+ emojis[i] = *store.Must(ss.Emoji().Save(&emoji)).(*model.Emoji)
+ }
+ defer func() {
+ for _, emoji := range emojis {
+ store.Must(ss.Emoji().Delete(emoji.Id, time.Now().Unix()))
+ }
+ }()
+
+ shouldFind := []bool{true, false, false, false}
+
+ if result := <-ss.Emoji().Search("blargh", true, 100); result.Err != nil {
+ t.Fatal(result.Err)
+ } else {
+ for i, emoji := range emojis {
+ found := false
+
+ for _, savedEmoji := range result.Data.([]*model.Emoji) {
+ if emoji.Id == savedEmoji.Id {
+ found = true
+ break
+ }
+ }
+
+ assert.Equal(t, shouldFind[i], found, emoji.Name)
+ }
+ }
+
+ shouldFind = []bool{true, true, true, false}
+ if result := <-ss.Emoji().Search("blargh", false, 100); result.Err != nil {
+ t.Fatal(result.Err)
+ } else {
+ for i, emoji := range emojis {
+ found := false
+
+ for _, savedEmoji := range result.Data.([]*model.Emoji) {
+ if emoji.Id == savedEmoji.Id {
+ found = true
+ break
+ }
+ }
+
+ assert.Equal(t, shouldFind[i], found, emoji.Name)
+ }
+ }
}
diff --git a/store/storetest/mocks/EmojiStore.go b/store/storetest/mocks/EmojiStore.go
index c01e64578..9871c98aa 100644
--- a/store/storetest/mocks/EmojiStore.go
+++ b/store/storetest/mocks/EmojiStore.go
@@ -61,13 +61,13 @@ func (_m *EmojiStore) GetByName(name string) store.StoreChannel {
return r0
}
-// GetList provides a mock function with given fields: offset, limit
-func (_m *EmojiStore) GetList(offset int, limit int) store.StoreChannel {
- ret := _m.Called(offset, limit)
+// GetList provides a mock function with given fields: offset, limit, sort
+func (_m *EmojiStore) GetList(offset int, limit int, sort string) store.StoreChannel {
+ ret := _m.Called(offset, limit, sort)
var r0 store.StoreChannel
- if rf, ok := ret.Get(0).(func(int, int) store.StoreChannel); ok {
- r0 = rf(offset, limit)
+ if rf, ok := ret.Get(0).(func(int, int, string) store.StoreChannel); ok {
+ r0 = rf(offset, limit, sort)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(store.StoreChannel)
@@ -92,3 +92,19 @@ func (_m *EmojiStore) Save(emoji *model.Emoji) store.StoreChannel {
return r0
}
+
+// Search provides a mock function with given fields: name, prefixOnly, limit
+func (_m *EmojiStore) Search(name string, prefixOnly bool, limit int) store.StoreChannel {
+ ret := _m.Called(name, prefixOnly, limit)
+
+ var r0 store.StoreChannel
+ if rf, ok := ret.Get(0).(func(string, bool, int) store.StoreChannel); ok {
+ r0 = rf(name, prefixOnly, limit)
+ } else {
+ if ret.Get(0) != nil {
+ r0 = ret.Get(0).(store.StoreChannel)
+ }
+ }
+
+ return r0
+}
diff --git a/store/storetest/mocks/SessionStore.go b/store/storetest/mocks/SessionStore.go
index 1bec89e11..70b2bd945 100644
--- a/store/storetest/mocks/SessionStore.go
+++ b/store/storetest/mocks/SessionStore.go
@@ -29,6 +29,11 @@ func (_m *SessionStore) AnalyticsSessionCount() store.StoreChannel {
return r0
}
+// Cleanup provides a mock function with given fields: expiryTime, batchSize
+func (_m *SessionStore) Cleanup(expiryTime int64, batchSize int64) {
+ _m.Called(expiryTime, batchSize)
+}
+
// Get provides a mock function with given fields: sessionIdOrToken
func (_m *SessionStore) Get(sessionIdOrToken string) store.StoreChannel {
ret := _m.Called(sessionIdOrToken)
diff --git a/store/storetest/mocks/UserAccessTokenStore.go b/store/storetest/mocks/UserAccessTokenStore.go
index 87541fd76..b989fa1cc 100644
--- a/store/storetest/mocks/UserAccessTokenStore.go
+++ b/store/storetest/mocks/UserAccessTokenStore.go
@@ -61,6 +61,22 @@ func (_m *UserAccessTokenStore) Get(tokenId string) store.StoreChannel {
return r0
}
+// GetAll provides a mock function with given fields:
+func (_m *UserAccessTokenStore) GetAll(page int, perPage int) store.StoreChannel {
+ ret := _m.Called(page, perPage)
+
+ var r0 store.StoreChannel
+ if rf, ok := ret.Get(0).(func(int, int) store.StoreChannel); ok {
+ r0 = rf(page, perPage)
+ } else {
+ if ret.Get(0) != nil {
+ r0 = ret.Get(0).(store.StoreChannel)
+ }
+ }
+
+ return r0
+}
+
// GetByToken provides a mock function with given fields: tokenString
func (_m *UserAccessTokenStore) GetByToken(tokenString string) store.StoreChannel {
ret := _m.Called(tokenString)
@@ -93,6 +109,22 @@ func (_m *UserAccessTokenStore) GetByUser(userId string, page int, perPage int)
return r0
}
+// Search provides a mock function with given fields:
+func (_m *UserAccessTokenStore) Search(term string) store.StoreChannel {
+ ret := _m.Called(term)
+
+ var r0 store.StoreChannel
+ if rf, ok := ret.Get(0).(func(string) store.StoreChannel); ok {
+ r0 = rf(term)
+ } else {
+ if ret.Get(0) != nil {
+ r0 = ret.Get(0).(store.StoreChannel)
+ }
+ }
+
+ return r0
+}
+
// Save provides a mock function with given fields: token
func (_m *UserAccessTokenStore) Save(token *model.UserAccessToken) store.StoreChannel {
ret := _m.Called(token)
diff --git a/store/storetest/session_store.go b/store/storetest/session_store.go
index 3d35b91ad..cf1db177d 100644
--- a/store/storetest/session_store.go
+++ b/store/storetest/session_store.go
@@ -8,9 +8,14 @@ import (
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/store"
+
+ "github.com/stretchr/testify/assert"
)
func TestSessionStore(t *testing.T, ss store.Store) {
+ // Run serially to prevent interfering with other tests
+ testSessionCleanup(t, ss)
+
t.Run("Save", func(t *testing.T) { testSessionStoreSave(t, ss) })
t.Run("SessionGet", func(t *testing.T) { testSessionGet(t, ss) })
t.Run("SessionGetWithDeviceId", func(t *testing.T) { testSessionGetWithDeviceId(t, ss) })
@@ -58,7 +63,7 @@ func testSessionGet(t *testing.T, ss store.Store) {
if rs2 := (<-ss.Session().GetSessions(s1.UserId)); rs2.Err != nil {
t.Fatal(rs2.Err)
} else {
- if len(rs2.Data.([]*model.Session)) != 2 {
+ if len(rs2.Data.([]*model.Session)) != 3 {
t.Fatal("should match len")
}
}
@@ -248,3 +253,44 @@ func testSessionCount(t *testing.T, ss store.Store) {
}
}
}
+
+func testSessionCleanup(t *testing.T, ss store.Store) {
+ now := model.GetMillis()
+
+ s1 := model.Session{}
+ s1.UserId = model.NewId()
+ s1.ExpiresAt = 0 // never expires
+ store.Must(ss.Session().Save(&s1))
+
+ s2 := model.Session{}
+ s2.UserId = s1.UserId
+ s2.ExpiresAt = now + 1000000 // expires in the future
+ store.Must(ss.Session().Save(&s2))
+
+ s3 := model.Session{}
+ s3.UserId = model.NewId()
+ s3.ExpiresAt = 1 // expired
+ store.Must(ss.Session().Save(&s3))
+
+ s4 := model.Session{}
+ s4.UserId = model.NewId()
+ s4.ExpiresAt = 2 // expired
+ store.Must(ss.Session().Save(&s4))
+
+ ss.Session().Cleanup(now, 1)
+
+ err := (<-ss.Session().Get(s1.Id)).Err
+ assert.Nil(t, err)
+
+ err = (<-ss.Session().Get(s2.Id)).Err
+ assert.Nil(t, err)
+
+ err = (<-ss.Session().Get(s3.Id)).Err
+ assert.NotNil(t, err)
+
+ err = (<-ss.Session().Get(s4.Id)).Err
+ assert.NotNil(t, err)
+
+ store.Must(ss.Session().Remove(s1.Id))
+ store.Must(ss.Session().Remove(s2.Id))
+}
diff --git a/store/storetest/user_access_token_store.go b/store/storetest/user_access_token_store.go
index 661c969da..e8eb8ca60 100644
--- a/store/storetest/user_access_token_store.go
+++ b/store/storetest/user_access_token_store.go
@@ -13,6 +13,7 @@ import (
func TestUserAccessTokenStore(t *testing.T, ss store.Store) {
t.Run("UserAccessTokenSaveGetDelete", func(t *testing.T) { testUserAccessTokenSaveGetDelete(t, ss) })
t.Run("UserAccessTokenDisableEnable", func(t *testing.T) { testUserAccessTokenDisableEnable(t, ss) })
+ t.Run("UserAccessTokenSearch", func(t *testing.T) { testUserAccessTokenSearch(t, ss) })
}
func testUserAccessTokenSaveGetDelete(t *testing.T, ss store.Store) {
@@ -54,6 +55,12 @@ func testUserAccessTokenSaveGetDelete(t *testing.T, ss store.Store) {
t.Fatal("received incorrect number of tokens after save")
}
+ if result := <-ss.UserAccessToken().GetAll(0, 100); result.Err != nil {
+ t.Fatal(result.Err)
+ } else if received := result.Data.([]*model.UserAccessToken); len(received) != 1 {
+ t.Fatal("received incorrect number of tokens after save")
+ }
+
if result := <-ss.UserAccessToken().Delete(uat.Id); result.Err != nil {
t.Fatal(result.Err)
}
@@ -124,3 +131,45 @@ func testUserAccessTokenDisableEnable(t *testing.T, ss store.Store) {
t.Fatal(err)
}
}
+
+func testUserAccessTokenSearch(t *testing.T, ss store.Store) {
+ u1 := model.User{}
+ u1.Email = model.NewId()
+ u1.Username = model.NewId()
+
+ store.Must(ss.User().Save(&u1))
+
+ uat := &model.UserAccessToken{
+ Token: model.NewId(),
+ UserId: u1.Id,
+ Description: "testtoken",
+ }
+
+ s1 := model.Session{}
+ s1.UserId = uat.UserId
+ s1.Token = uat.Token
+
+ store.Must(ss.Session().Save(&s1))
+
+ if result := <-ss.UserAccessToken().Save(uat); result.Err != nil {
+ t.Fatal(result.Err)
+ }
+
+ if result := <-ss.UserAccessToken().Search(uat.Id); result.Err != nil {
+ t.Fatal(result.Err)
+ } else if received := result.Data.([]*model.UserAccessToken); len(received) != 1 {
+ t.Fatal("received incorrect number of tokens after search")
+ }
+
+ if result := <-ss.UserAccessToken().Search(uat.UserId); result.Err != nil {
+ t.Fatal(result.Err)
+ } else if received := result.Data.([]*model.UserAccessToken); len(received) != 1 {
+ t.Fatal("received incorrect number of tokens after search")
+ }
+
+ if result := <-ss.UserAccessToken().Search(u1.Username); result.Err != nil {
+ t.Fatal(result.Err)
+ } else if received := result.Data.([]*model.UserAccessToken); len(received) != 1 {
+ t.Fatal("received incorrect number of tokens after search")
+ }
+}
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-29 00:52:28 +0000