MM-62162: Replace SELECT * in user_access_token_store.go (#30421)
* MM-62162: Replace SELECT * in user_access_token_store.go - Replaced all SELECT * queries with explicit column selection - Used query builder instead of raw SQL strings for all queries - Added reusable userAccessTokensSelectQuery in the store constructor - Added comprehensive test for pagination and IsActive flag 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Fix code formatting in user_access_token_store test file 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * MM-62162: Update UserAccessToken Search method to use explicit column names - Fixed "ambiguous column" errors by explicitly naming columns with table qualifiers - Added test for the Search functionality 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * MM-62162: Update UserAccessToken Search method to use explicit column names - Fixed "ambiguous column" errors by explicitly naming columns with table qualifiers - Maintained exact semantics of original query's LIKE filters - Refactored to use query builder instead of raw SQL 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * MM-62162: Update UserAccessToken Search method to use reusable query - Modified userAccessTokensSelectQuery to use fully qualified column names - Updated Search method to use the existing query builder - Fixed "ambiguous column" errors by using full column qualifiers 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * MM-62162: Remove unnecessary comment in user_access_token_store.go Removed redundant comment in Search method explaining the use of qualified column names, as the code is self-documenting. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * MM-62162: Use t.Cleanup() for token cleanup in userAccessTokenPagination test * MM-62162: Handle error in Cleanup function * linting --------- Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
1f0a180386
Коммит
eb851684e9
@@ -17,6 +17,7 @@ func TestUserAccessTokenStore(t *testing.T, rctx request.CTX, ss store.Store) {
|
||||
t.Run("UserAccessTokenSaveGetDelete", func(t *testing.T) { testUserAccessTokenSaveGetDelete(t, rctx, ss) })
|
||||
t.Run("UserAccessTokenDisableEnable", func(t *testing.T) { testUserAccessTokenDisableEnable(t, rctx, ss) })
|
||||
t.Run("UserAccessTokenSearch", func(t *testing.T) { testUserAccessTokenSearch(t, rctx, ss) })
|
||||
t.Run("UserAccessTokenPagination", func(t *testing.T) { testUserAccessTokenPagination(t, rctx, ss) })
|
||||
}
|
||||
|
||||
func testUserAccessTokenSaveGetDelete(t *testing.T, rctx request.CTX, ss store.Store) {
|
||||
@@ -155,3 +156,92 @@ func testUserAccessTokenSearch(t *testing.T, rctx request.CTX, ss store.Store) {
|
||||
require.NoError(t, nErr)
|
||||
require.Equal(t, 1, len(received), "received incorrect number of tokens after search")
|
||||
}
|
||||
|
||||
func testUserAccessTokenPagination(t *testing.T, rctx request.CTX, ss store.Store) {
|
||||
// Create a user
|
||||
u1 := model.User{}
|
||||
u1.Email = MakeEmail()
|
||||
u1.Username = model.NewUsername()
|
||||
|
||||
_, err := ss.User().Save(rctx, &u1)
|
||||
require.NoError(t, err)
|
||||
|
||||
// Create 10 tokens for the user
|
||||
tokens := make([]*model.UserAccessToken, 10)
|
||||
for i := 0; i < 10; i++ {
|
||||
tokens[i] = &model.UserAccessToken{
|
||||
Token: model.NewId(),
|
||||
UserId: u1.Id,
|
||||
Description: "testtoken" + model.NewId(),
|
||||
}
|
||||
|
||||
// Create a session for each token
|
||||
s := &model.Session{}
|
||||
s.UserId = tokens[i].UserId
|
||||
s.Token = tokens[i].Token
|
||||
|
||||
_, err = ss.Session().Save(rctx, s)
|
||||
require.NoError(t, err)
|
||||
|
||||
// Save the token
|
||||
_, nErr := ss.UserAccessToken().Save(tokens[i])
|
||||
require.NoError(t, nErr)
|
||||
}
|
||||
|
||||
// Set up cleanup to run even if the test fails
|
||||
t.Cleanup(func() {
|
||||
for _, token := range tokens {
|
||||
// Cleanup shouldn't fail the test, but we still log errors
|
||||
if err := ss.UserAccessToken().Delete(token.Id); err != nil {
|
||||
t.Logf("Failed to cleanup token %s: %v", token.Id, err)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Test GetAll with pagination
|
||||
// First page (3 tokens)
|
||||
result, nErr := ss.UserAccessToken().GetAll(0, 3)
|
||||
require.NoError(t, nErr)
|
||||
require.Len(t, result, 3, "Should return 3 tokens for the first page")
|
||||
|
||||
// Second page (3 tokens)
|
||||
result, nErr = ss.UserAccessToken().GetAll(3, 3)
|
||||
require.NoError(t, nErr)
|
||||
require.Len(t, result, 3, "Should return 3 tokens for the second page")
|
||||
|
||||
// Beyond the total number of tokens
|
||||
result, nErr = ss.UserAccessToken().GetAll(30, 3)
|
||||
require.NoError(t, nErr)
|
||||
require.Len(t, result, 0, "Should return 0 tokens when offset is beyond total")
|
||||
|
||||
// All tokens
|
||||
result, nErr = ss.UserAccessToken().GetAll(0, 100)
|
||||
require.NoError(t, nErr)
|
||||
require.GreaterOrEqual(t, len(result), 10, "Should return at least 10 tokens")
|
||||
|
||||
// Test GetByUser with pagination
|
||||
// First page (3 tokens)
|
||||
result, nErr = ss.UserAccessToken().GetByUser(u1.Id, 0, 3)
|
||||
require.NoError(t, nErr)
|
||||
require.Len(t, result, 3, "Should return 3 tokens for the first page")
|
||||
|
||||
// Second page (3 tokens)
|
||||
result, nErr = ss.UserAccessToken().GetByUser(u1.Id, 3, 3)
|
||||
require.NoError(t, nErr)
|
||||
require.Len(t, result, 3, "Should return 3 tokens for the second page")
|
||||
|
||||
// Beyond the total number of tokens
|
||||
result, nErr = ss.UserAccessToken().GetByUser(u1.Id, 30, 3)
|
||||
require.NoError(t, nErr)
|
||||
require.Len(t, result, 0, "Should return 0 tokens when offset is beyond total")
|
||||
|
||||
// All tokens for the user
|
||||
result, nErr = ss.UserAccessToken().GetByUser(u1.Id, 0, 100)
|
||||
require.NoError(t, nErr)
|
||||
require.Len(t, result, 10, "Should return 10 tokens for the user")
|
||||
|
||||
// Test for a non-existent user
|
||||
result, nErr = ss.UserAccessToken().GetByUser(model.NewId(), 0, 100)
|
||||
require.NoError(t, nErr)
|
||||
require.Len(t, result, 0, "Should return 0 tokens for non-existent user")
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user