From b1d13a2d897147de8290a03e624efe4000dc9aa7 Mon Sep 17 00:00:00 2001 From: Adrian Carolli Date: Thu, 11 Jan 2018 16:30:55 -0500 Subject: [PLT-7793] Add /users/tokens/search endpoint (#8088) * Add /users/tokens/search endpoint + tests * Fix check-style * Unnecessary deletion --- store/sqlstore/user_access_token_store.go | 20 +++++++++++++ store/store.go | 1 + store/storetest/mocks/UserAccessTokenStore.go | 16 ++++++++++ store/storetest/user_access_token_store.go | 43 +++++++++++++++++++++++++++ 4 files changed, 80 insertions(+) (limited to 'store') diff --git a/store/sqlstore/user_access_token_store.go b/store/sqlstore/user_access_token_store.go index deba9f7ea..b90ba773f 100644 --- a/store/sqlstore/user_access_token_store.go +++ b/store/sqlstore/user_access_token_store.go @@ -211,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 de8bd4635..dc140edd4 100644 --- a/store/store.go +++ b/store/store.go @@ -449,6 +449,7 @@ type UserAccessTokenStore interface { 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/mocks/UserAccessTokenStore.go b/store/storetest/mocks/UserAccessTokenStore.go index 60e08076c..b989fa1cc 100644 --- a/store/storetest/mocks/UserAccessTokenStore.go +++ b/store/storetest/mocks/UserAccessTokenStore.go @@ -109,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/user_access_token_store.go b/store/storetest/user_access_token_store.go index c32023d30..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) { @@ -130,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") + } +} -- cgit v1.2.3-1-g7c22