[MM-39630] - Migrate from gorp to sqlx in store/sqlstore/tokens_store.go (#18887)
* migrate from gorp to sqlx Signed-off-by: Penthaa Patel <penthaapatel@gmail.com> * fixes Signed-off-by: Penthaa Patel <penthaapatel@gmail.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
3c3e1cb9e7
Коммит
c88c9b6625
@@ -39,24 +39,31 @@ func (s SqlTokenStore) Save(token *model.Token) error {
|
||||
if err := token.IsValid(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := s.GetMaster().Insert(token); err != nil {
|
||||
query, args, err := s.getQueryBuilder().
|
||||
Insert("Tokens").
|
||||
Columns("Token", "CreateAt", "Type", "Extra").
|
||||
Values(token.Token, token.CreateAt, token.Type, token.Extra).
|
||||
ToSql()
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "token_tosql")
|
||||
}
|
||||
if _, err := s.GetMasterX().Exec(query, args...); err != nil {
|
||||
return errors.Wrap(err, "failed to save Token")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s SqlTokenStore) Delete(token string) error {
|
||||
if _, err := s.GetMaster().Exec("DELETE FROM Tokens WHERE Token = :Token", map[string]interface{}{"Token": token}); err != nil {
|
||||
if _, err := s.GetMasterX().Exec("DELETE FROM Tokens WHERE Token = ?", token); err != nil {
|
||||
return errors.Wrapf(err, "failed to delete Token with value %s", token)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s SqlTokenStore) GetByToken(tokenString string) (*model.Token, error) {
|
||||
token := &model.Token{}
|
||||
var token model.Token
|
||||
|
||||
if err := s.GetReplica().SelectOne(token, "SELECT * FROM Tokens WHERE Token = :Token", map[string]interface{}{"Token": tokenString}); err != nil {
|
||||
if err := s.GetReplicaX().Get(&token, "SELECT * FROM Tokens WHERE Token = ?", tokenString); err != nil {
|
||||
if err == sql.ErrNoRows {
|
||||
return nil, store.NewErrNotFound("Token", fmt.Sprintf("Token=%s", tokenString))
|
||||
}
|
||||
@@ -64,32 +71,36 @@ func (s SqlTokenStore) GetByToken(tokenString string) (*model.Token, error) {
|
||||
return nil, errors.Wrapf(err, "failed to get Token with value %s", tokenString)
|
||||
}
|
||||
|
||||
return token, nil
|
||||
return &token, nil
|
||||
}
|
||||
|
||||
func (s SqlTokenStore) Cleanup() {
|
||||
mlog.Debug("Cleaning up token store.")
|
||||
deltime := model.GetMillis() - model.MaxTokenExipryTime
|
||||
if _, err := s.GetMaster().Exec("DELETE FROM Tokens WHERE CreateAt < :DelTime", map[string]interface{}{"DelTime": deltime}); err != nil {
|
||||
if _, err := s.GetMasterX().Exec("DELETE FROM Tokens WHERE CreateAt < ?", deltime); err != nil {
|
||||
mlog.Error("Unable to cleanup token store.")
|
||||
}
|
||||
}
|
||||
|
||||
func (s SqlTokenStore) GetAllTokensByType(tokenType string) ([]*model.Token, error) {
|
||||
tokens := []*model.Token{}
|
||||
query, args, err := s.getQueryBuilder().Select("*").From("Tokens").Where(sq.Eq{"Type": tokenType}).ToSql()
|
||||
query, args, err := s.getQueryBuilder().
|
||||
Select("*").
|
||||
From("Tokens").
|
||||
Where(sq.Eq{"Type": tokenType}).
|
||||
ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "could not build sql query to get all tokens by type")
|
||||
}
|
||||
|
||||
if _, err := s.GetReplica().Select(&tokens, query, args...); err != nil {
|
||||
if err := s.GetReplicaX().Select(&tokens, query, args...); err != nil {
|
||||
return nil, errors.Wrapf(err, "failed to get all tokens of Type=%s", tokenType)
|
||||
}
|
||||
return tokens, nil
|
||||
}
|
||||
|
||||
func (s SqlTokenStore) RemoveAllTokensByType(tokenType string) error {
|
||||
if _, err := s.GetMaster().Exec("DELETE FROM Tokens WHERE Type = :TokenType", map[string]interface{}{"TokenType": tokenType}); err != nil {
|
||||
if _, err := s.GetMasterX().Exec("DELETE FROM Tokens WHERE Type = ?", tokenType); err != nil {
|
||||
return errors.Wrapf(err, "failed to remove all Tokens with Type=%s", tokenType)
|
||||
}
|
||||
return nil
|
||||
|
||||
Ссылка в новой задаче
Block a user