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>
Этот коммит содержится в:
Jesse Hallam
коммит произвёл
GitHub
GitHub
родитель
1f0a180386
Коммит
eb851684e9
@@ -7,6 +7,7 @@ import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
|
||||
sq "github.com/mattermost/squirrel"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/mattermost/mattermost/server/public/model"
|
||||
@@ -15,10 +16,26 @@ import (
|
||||
|
||||
type SqlUserAccessTokenStore struct {
|
||||
*SqlStore
|
||||
|
||||
userAccessTokensSelectQuery sq.SelectBuilder
|
||||
}
|
||||
|
||||
func newSqlUserAccessTokenStore(sqlStore *SqlStore) store.UserAccessTokenStore {
|
||||
return &SqlUserAccessTokenStore{sqlStore}
|
||||
s := &SqlUserAccessTokenStore{
|
||||
SqlStore: sqlStore,
|
||||
}
|
||||
|
||||
s.userAccessTokensSelectQuery = s.getQueryBuilder().
|
||||
Select(
|
||||
"UserAccessTokens.Id",
|
||||
"UserAccessTokens.Token",
|
||||
"UserAccessTokens.UserId",
|
||||
"UserAccessTokens.Description",
|
||||
"UserAccessTokens.IsActive",
|
||||
).
|
||||
From("UserAccessTokens")
|
||||
|
||||
return s
|
||||
}
|
||||
|
||||
func (s SqlUserAccessTokenStore) Save(token *model.UserAccessToken) (*model.UserAccessToken, error) {
|
||||
@@ -125,7 +142,9 @@ func (s SqlUserAccessTokenStore) deleteTokensByUser(transaction *sqlxTxWrapper,
|
||||
func (s SqlUserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, error) {
|
||||
var token model.UserAccessToken
|
||||
|
||||
if err := s.GetReplica().Get(&token, "SELECT * FROM UserAccessTokens WHERE Id = ?", tokenId); err != nil {
|
||||
query := s.userAccessTokensSelectQuery.Where(sq.Eq{"Id": tokenId})
|
||||
|
||||
if err := s.GetReplica().GetBuilder(&token, query); err != nil {
|
||||
if err == sql.ErrNoRows {
|
||||
return nil, store.NewErrNotFound("UserAccessToken", tokenId)
|
||||
}
|
||||
@@ -138,7 +157,11 @@ func (s SqlUserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, er
|
||||
func (s SqlUserAccessTokenStore) GetAll(offset, limit int) ([]*model.UserAccessToken, error) {
|
||||
tokens := []*model.UserAccessToken{}
|
||||
|
||||
if err := s.GetReplica().Select(&tokens, "SELECT * FROM UserAccessTokens LIMIT ? OFFSET ?", limit, offset); err != nil {
|
||||
query := s.userAccessTokensSelectQuery.
|
||||
Limit(uint64(limit)).
|
||||
Offset(uint64(offset))
|
||||
|
||||
if err := s.GetReplica().SelectBuilder(&tokens, query); err != nil {
|
||||
return nil, errors.Wrap(err, "failed to find UserAccessTokens")
|
||||
}
|
||||
|
||||
@@ -148,7 +171,9 @@ func (s SqlUserAccessTokenStore) GetAll(offset, limit int) ([]*model.UserAccessT
|
||||
func (s SqlUserAccessTokenStore) GetByToken(tokenString string) (*model.UserAccessToken, error) {
|
||||
var token model.UserAccessToken
|
||||
|
||||
if err := s.GetReplica().Get(&token, "SELECT * FROM UserAccessTokens WHERE Token = ?", tokenString); err != nil {
|
||||
query := s.userAccessTokensSelectQuery.Where(sq.Eq{"Token": tokenString})
|
||||
|
||||
if err := s.GetReplica().GetBuilder(&token, query); err != nil {
|
||||
if err == sql.ErrNoRows {
|
||||
return nil, store.NewErrNotFound("UserAccessToken", fmt.Sprintf("token=%s", tokenString))
|
||||
}
|
||||
@@ -161,7 +186,12 @@ func (s SqlUserAccessTokenStore) GetByToken(tokenString string) (*model.UserAcce
|
||||
func (s SqlUserAccessTokenStore) GetByUser(userId string, offset, limit int) ([]*model.UserAccessToken, error) {
|
||||
tokens := []*model.UserAccessToken{}
|
||||
|
||||
if err := s.GetReplica().Select(&tokens, "SELECT * FROM UserAccessTokens WHERE UserId = ? LIMIT ? OFFSET ?", userId, limit, offset); err != nil {
|
||||
query := s.userAccessTokensSelectQuery.
|
||||
Where(sq.Eq{"UserId": userId}).
|
||||
Limit(uint64(limit)).
|
||||
Offset(uint64(offset))
|
||||
|
||||
if err := s.GetReplica().SelectBuilder(&tokens, query); err != nil {
|
||||
return nil, errors.Wrapf(err, "failed to find UserAccessTokens with userId=%s", userId)
|
||||
}
|
||||
|
||||
@@ -171,16 +201,16 @@ func (s SqlUserAccessTokenStore) GetByUser(userId string, offset, limit int) ([]
|
||||
func (s SqlUserAccessTokenStore) Search(term string) ([]*model.UserAccessToken, error) {
|
||||
term = sanitizeSearchTerm(term, "\\")
|
||||
tokens := []*model.UserAccessToken{}
|
||||
params := []any{term, term, term}
|
||||
query := `
|
||||
SELECT
|
||||
uat.*
|
||||
FROM UserAccessTokens uat
|
||||
INNER JOIN Users u
|
||||
ON uat.UserId = u.Id
|
||||
WHERE uat.Id LIKE ? OR uat.UserId LIKE ? OR u.Username LIKE ?`
|
||||
|
||||
if err := s.GetReplica().Select(&tokens, query, params...); err != nil {
|
||||
query := s.userAccessTokensSelectQuery.
|
||||
InnerJoin("Users ON UserAccessTokens.UserId = Users.Id").
|
||||
Where(sq.Or{
|
||||
sq.Like{"UserAccessTokens.Id": term},
|
||||
sq.Like{"UserAccessTokens.UserId": term},
|
||||
sq.Like{"Users.Username": term},
|
||||
})
|
||||
|
||||
if err := s.GetReplica().SelectBuilder(&tokens, query); err != nil {
|
||||
return nil, errors.Wrapf(err, "failed to find UserAccessTokens by term with value '%s'", term)
|
||||
}
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user