public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

User: Fix GetByID (#86282)

Browse Source 
* Auth: Remove unused lookup param

* Remove case sensitive lookup for GetByID
This commit is contained in:
Karl Persson
2024-04-16 15:24:34 +02:00
committed by GitHub
parent b9285e320a
commit 8520892923
10 changed files with 42 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/user/userimpl/user.go
+1 -8
View File
@@ -209,14 +209,7 @@ func (s *Service) Delete(ctx context.Context, cmd *user.DeleteUserCommand) error
}
func (s *Service) GetByID(ctx context.Context, query *user.GetUserByIDQuery) (*user.User, error) {
user, err := s.store.GetByID(ctx, query.ID)
if err != nil {
return nil, err
}
if err := s.store.CaseInsensitiveLoginConflict(ctx, user.Login, user.Email); err != nil {
return nil, err
}
return user, nil
return s.store.GetByID(ctx, query.ID)
}
func (s *Service) GetByLogin(ctx context.Context, query *user.GetUserByLoginQuery) (*user.User, error) {