From 8ebba0a93d1c7c02e3255bb06968eba0d5eccfb5 Mon Sep 17 00:00:00 2001 From: Leonard Gram Date: Thu, 29 Jul 2021 11:47:32 +0200 Subject: [PATCH] Auth: refactor to not use the global bus (#37345) --- pkg/services/login/authinfoservice/database.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/services/login/authinfoservice/database.go b/pkg/services/login/authinfoservice/database.go index 5d97ad74426..e29a50af536 100644 --- a/pkg/services/login/authinfoservice/database.go +++ b/pkg/services/login/authinfoservice/database.go @@ -7,7 +7,6 @@ import ( "github.com/grafana/grafana/pkg/services/sqlstore" - "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/util" @@ -17,13 +16,13 @@ var getTime = time.Now func (s *Implementation) GetExternalUserInfoByLogin(query *models.GetExternalUserInfoByLoginQuery) error { userQuery := models.GetUserByLoginQuery{LoginOrEmail: query.LoginOrEmail} - err := bus.Dispatch(&userQuery) + err := s.Bus.Dispatch(&userQuery) if err != nil { return err } authInfoQuery := &models.GetAuthInfoQuery{UserId: userQuery.Result.Id} - if err := bus.Dispatch(authInfoQuery); err != nil { + if err := s.Bus.Dispatch(authInfoQuery); err != nil { return err }