Login: refactor auth info package (#78459)

* Remove unused stats and metrics

* No longer collect metrics

* Remove unused dependency

* Move database from sub package

pkg/services/authn/authnimpl/sync/user_sync_test.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/grafana/grafana/pkg/services/authn"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/login/authinfoservice"
-	"github.com/grafana/grafana/pkg/services/login/logintest"
+	"github.com/grafana/grafana/pkg/services/login/authinfoimpl"
+	"github.com/grafana/grafana/pkg/services/login/authinfotest"
 	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/quota/quotatest"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -30,9 +30,9 @@ func ptrInt64(i int64) *int64 {
 }
 
 func TestUserSync_SyncUserHook(t *testing.T) {
-	userProtection := &authinfoservice.OSSUserProtectionImpl{}
+	userProtection := &authinfoimpl.OSSUserProtectionImpl{}
 
-	authFakeNil := &logintest.AuthInfoServiceFake{
+	authFakeNil := &authinfotest.FakeService{
 		ExpectedError: user.ErrUserNotFound,
 		SetAuthInfoFn: func(ctx context.Context, cmd *login.SetAuthInfoCommand) error {
 			return nil
@@ -41,7 +41,7 @@ func TestUserSync_SyncUserHook(t *testing.T) {
 			return nil
 		},
 	}
-	authFakeUserID := &logintest.AuthInfoServiceFake{
+	authFakeUserID := &authinfotest.FakeService{
 		ExpectedError: nil,
 		ExpectedUserAuth: &login.UserAuth{
 			AuthModule: "oauth",

pkg/services/authn/clients/ldap_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/ldap/multildap"
 	"github.com/grafana/grafana/pkg/services/ldap/service"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/login/logintest"
+	"github.com/grafana/grafana/pkg/services/login/authinfotest"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/services/user/usertest"
@@ -192,7 +192,7 @@ func setupLDAPTestCase(tt *ldapTestCase) *LDAP {
 			return nil
 		},
 	}
-	authInfoService := &logintest.AuthInfoServiceFake{
+	authInfoService := &authinfotest.FakeService{
 		ExpectedUserAuth: &tt.expectedAuthInfo,
 		ExpectedError:    tt.expectedAuthInfoErr,
 	}

pkg/services/ldap/api/service_test.go

@@ -20,7 +20,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/ldap/multildap"
 	"github.com/grafana/grafana/pkg/services/ldap/service"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/login/logintest"
+	"github.com/grafana/grafana/pkg/services/login/authinfotest"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/org/orgtest"
 	"github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
@@ -67,7 +67,7 @@ func setupAPITest(t *testing.T, opts ...func(a *Service)) (*Service, *webtest.Se
 		router,
 		acimpl.ProvideAccessControl(cfg),
 		usertest.NewUserServiceFake(),
-		&logintest.AuthInfoServiceFake{},
+		&authinfotest.FakeService{},
 		ldap.ProvideGroupsService(),
 		&authntest.FakeService{},
 		&orgtest.FakeOrgService{},
@@ -507,7 +507,7 @@ func TestPostSyncUserWithLDAPAPIEndpoint_WhenUserNotInLDAP(t *testing.T) {
 
 	_, server := setupAPITest(t, func(a *Service) {
 		a.userService = userServiceMock
-		a.authInfoService = &logintest.AuthInfoServiceFake{ExpectedExternalUser: &login.ExternalUserInfo{IsDisabled: true, UserId: 34}}
+		a.authInfoService = &authinfotest.FakeService{ExpectedExternalUser: &login.ExternalUserInfo{IsDisabled: true, UserId: 34}}
 		a.ldapService = &service.LDAPFakeService{
 			ExpectedClient: &LDAPMock{UserSearchError: multildap.ErrDidNotFindUser},
 			ExpectedConfig: &ldap.Config{},

pkg/services/login/authinfo.go

@@ -20,8 +20,6 @@ type Store interface {
 	SetAuthInfo(ctx context.Context, cmd *SetAuthInfoCommand) error
 	UpdateAuthInfo(ctx context.Context, cmd *UpdateAuthInfoCommand) error
 	DeleteUserAuthInfo(ctx context.Context, userID int64) error
-	CollectLoginStats(ctx context.Context) (map[string]any, error)
-	RunMetricsCollection(ctx context.Context) error
 }
 
 const (

pkg/services/login/authinfoimpl/service.go

@@ -0,0 +1,45 @@
+package authinfoimpl
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/login"
+)
+
+type Service struct {
+	authInfoStore login.Store
+	logger        log.Logger
+}
+
+func ProvideService(authInfoStore login.Store) *Service {
+	s := &Service{
+		authInfoStore: authInfoStore,
+		logger:        log.New("login.authinfo"),
+	}
+
+	return s
+}
+
+func (s *Service) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
+	return s.authInfoStore.GetAuthInfo(ctx, query)
+}
+
+func (s *Service) GetUserLabels(ctx context.Context, query login.GetUserLabelsQuery) (map[int64]string, error) {
+	if len(query.UserIDs) == 0 {
+		return map[int64]string{}, nil
+	}
+	return s.authInfoStore.GetUserLabels(ctx, query)
+}
+
+func (s *Service) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error {
+	return s.authInfoStore.UpdateAuthInfo(ctx, cmd)
+}
+
+func (s *Service) SetAuthInfo(ctx context.Context, cmd *login.SetAuthInfoCommand) error {
+	return s.authInfoStore.SetAuthInfo(ctx, cmd)
+}
+
+func (s *Service) DeleteUserAuthInfo(ctx context.Context, userID int64) error {
+	return s.authInfoStore.DeleteUserAuthInfo(ctx, userID)
+}

pkg/services/login/authinfoimpl/store.go

@@ -1,4 +1,4 @@
-package database
+package authinfoimpl
 
 import (
 	"context"
@@ -14,29 +14,25 @@ import (
 
 var GetTime = time.Now
 
-type AuthInfoStore struct {
+type Store struct {
 	sqlStore       db.DB
 	secretsService secrets.Service
 	logger         log.Logger
-	userService    user.Service
 }
 
-func ProvideAuthInfoStore(sqlStore db.DB, secretsService secrets.Service, userService user.Service) login.Store {
-	store := &AuthInfoStore{
+func ProvideStore(sqlStore db.DB, secretsService secrets.Service) login.Store {
+	store := &Store{
 		sqlStore:       sqlStore,
 		secretsService: secretsService,
 		logger:         log.New("login.authinfo.store"),
-		userService:    userService,
 	}
-	// FIXME: disabled the metric collection for duplicate user entries
-	// due to query performance issues that is clogging the users Grafana instance
-	// InitDuplicateUserMetrics()
+
 	return store
 }
 
 // GetAuthInfo returns the auth info for a user
 // It will return the latest auth info for a user
-func (s *AuthInfoStore) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
+func (s *Store) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
 	if query.UserId == 0 && query.AuthId == "" {
 		return nil, user.ErrUserNotFound
 	}
@@ -86,7 +82,7 @@ func (s *AuthInfoStore) GetAuthInfo(ctx context.Context, query *login.GetAuthInf
 	return userAuth, nil
 }
 
-func (s *AuthInfoStore) GetUserLabels(ctx context.Context, query login.GetUserLabelsQuery) (map[int64]string, error) {
+func (s *Store) GetUserLabels(ctx context.Context, query login.GetUserLabelsQuery) (map[int64]string, error) {
 	userAuths := []login.UserAuth{}
 	params := make([]interface{}, 0, len(query.UserIDs))
 	for _, id := range query.UserIDs {
@@ -110,7 +106,7 @@ func (s *AuthInfoStore) GetUserLabels(ctx context.Context, query login.GetUserLa
 	return labelMap, nil
 }
 
-func (s *AuthInfoStore) SetAuthInfo(ctx context.Context, cmd *login.SetAuthInfoCommand) error {
+func (s *Store) SetAuthInfo(ctx context.Context, cmd *login.SetAuthInfoCommand) error {
 	authUser := &login.UserAuth{
 		UserId:     cmd.UserId,
 		AuthModule: cmd.AuthModule,
@@ -153,7 +149,7 @@ func (s *AuthInfoStore) SetAuthInfo(ctx context.Context, cmd *login.SetAuthInfoC
 	})
 }
 
-func (s *AuthInfoStore) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error {
+func (s *Store) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error {
 	authUser := &login.UserAuth{
 		UserId:     cmd.UserId,
 		AuthModule: cmd.AuthModule,
@@ -222,7 +218,7 @@ func (s *AuthInfoStore) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAut
 	})
 }
 
-func (s *AuthInfoStore) DeleteUserAuthInfo(ctx context.Context, userID int64) error {
+func (s *Store) DeleteUserAuthInfo(ctx context.Context, userID int64) error {
 	return s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
 		var rawSQL = "DELETE FROM user_auth WHERE user_id = ?"
 		_, err := sess.Exec(rawSQL, userID)
@@ -231,7 +227,7 @@ func (s *AuthInfoStore) DeleteUserAuthInfo(ctx context.Context, userID int64) er
 }
 
 // decodeAndDecrypt will decode the string with the standard base64 decoder and then decrypt it
-func (s *AuthInfoStore) decodeAndDecrypt(str string) (string, error) {
+func (s *Store) decodeAndDecrypt(str string) (string, error) {
 	// Bail out if empty string since it'll cause a segfault in Decrypt
 	if str == "" {
 		return "", nil
@@ -249,7 +245,7 @@ func (s *AuthInfoStore) decodeAndDecrypt(str string) (string, error) {
 
 // encryptAndEncode will encrypt a string with grafana's secretKey, and
 // then encode it with the standard bas64 encoder
-func (s *AuthInfoStore) encryptAndEncode(str string) (string, error) {
+func (s *Store) encryptAndEncode(str string) (string, error) {
 	encrypted, err := s.secretsService.Encrypt(context.Background(), []byte(str), secrets.WithoutScope())
 	if err != nil {
 		return "", err

pkg/services/login/authinfoimpl/store_test.go

@@ -1,4 +1,4 @@
-package database
+package authinfoimpl
 
 import (
 	"context"
@@ -21,7 +21,7 @@ func TestIntegrationAuthInfoStore(t *testing.T) {
 	}
 
 	sql := db.InitTestDB(t)
-	store := ProvideAuthInfoStore(sql, secretstest.NewFakeSecretsService(), nil)
+	store := ProvideStore(sql, secretstest.NewFakeSecretsService())
 
 	t.Run("should be able to auth lables for users", func(t *testing.T) {
 		ctx := context.Background()

pkg/services/login/authinfoimpl/userprotection.go

@@ -1,4 +1,4 @@
-package authinfoservice
+package authinfoimpl
 
 import "github.com/grafana/grafana/pkg/services/user"
 

pkg/services/login/authinfoservice/database/stats.go

@@ -1,127 +0,0 @@
-package database
-
-import (
-	"context"
-	"time"
-
-	"github.com/prometheus/client_golang/prometheus"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/login"
-)
-
-// Should be in use in ProvideAuthInfoStore
-// due to query performance for big user tables
-// we have disabled these metrics from Grafana for now
-func InitDuplicateUserMetrics() {
-	login.Once.Do(func() {
-		login.MStatDuplicateUserEntries = prometheus.NewGauge(prometheus.GaugeOpts{
-			Name:      "stat_users_total_duplicate_user_entries",
-			Help:      "total number of duplicate user entries by email or login",
-			Namespace: login.ExporterName,
-		})
-
-		login.MStatHasDuplicateEntries = prometheus.NewGauge(prometheus.GaugeOpts{
-			Name:      "stat_users_has_duplicate_user_entries",
-			Help:      "instance has duplicate user entries by email or login",
-			Namespace: login.ExporterName,
-		})
-
-		login.MStatMixedCasedUsers = prometheus.NewGauge(prometheus.GaugeOpts{
-			Name:      "stat_users_total_mixed_cased_users",
-			Help:      "total number of users with upper and lower case logins or emails",
-			Namespace: login.ExporterName,
-		})
-
-		prometheus.MustRegister(
-			login.MStatDuplicateUserEntries,
-			login.MStatHasDuplicateEntries,
-			login.MStatMixedCasedUsers,
-		)
-	})
-}
-
-func (s *AuthInfoStore) RunMetricsCollection(ctx context.Context) error {
-	// 	if _, err := s.getLoginStats(ctx); err != nil {
-	// 		s.logger.Warn("Failed to get authinfo metrics", "error", err.Error())
-	// 	}
-	updateStatsTicker := time.NewTicker(login.MetricsCollectionInterval)
-	defer updateStatsTicker.Stop()
-
-	for {
-		select {
-		case <-updateStatsTicker.C:
-			// if _, err := s.getLoginStats(ctx); err != nil {
-			// s.logger.Warn("Failed to get authinfo metrics", "error", nil)
-			// }
-		case <-ctx.Done():
-			return ctx.Err()
-		}
-	}
-}
-
-func (s *AuthInfoStore) CollectLoginStats(ctx context.Context) (map[string]any, error) {
-	m := map[string]any{}
-
-	loginStats, err := s.getLoginStats(ctx)
-	if err != nil {
-		s.logger.Error("Failed to get login stats", "error", err)
-		return nil, err
-	}
-	m["stats.users.duplicate_user_entries"] = loginStats.DuplicateUserEntries
-	if loginStats.DuplicateUserEntries > 0 {
-		m["stats.users.has_duplicate_user_entries"] = 1
-	} else {
-		m["stats.users.has_duplicate_user_entries"] = 0
-	}
-	m["stats.users.mixed_cased_users"] = loginStats.MixedCasedUsers
-
-	return m, nil
-}
-
-func (s *AuthInfoStore) getLoginStats(ctx context.Context) (login.LoginStats, error) {
-	var stats login.LoginStats
-	outerErr := s.sqlStore.WithDbSession(ctx, func(dbSession *db.Session) error {
-		rawSQL := `SELECT
-		(SELECT COUNT(*) FROM (` + s.duplicateUserEntriesSQL(ctx) + `) AS d WHERE (d.dup_login IS NOT NULL OR d.dup_email IS NOT NULL)) as duplicate_user_entries,
-		(SELECT COUNT(*) FROM (` + s.mixedCasedUsers(ctx) + `) AS mcu) AS mixed_cased_users
-		`
-		_, err := dbSession.SQL(rawSQL).Get(&stats)
-		return err
-	})
-	if outerErr != nil {
-		return stats, outerErr
-	}
-
-	// set prometheus metrics stats
-	login.MStatDuplicateUserEntries.Set(float64(stats.DuplicateUserEntries))
-	if stats.DuplicateUserEntries == 0 {
-		login.MStatHasDuplicateEntries.Set(float64(0))
-	} else {
-		login.MStatHasDuplicateEntries.Set(float64(1))
-	}
-
-	login.MStatMixedCasedUsers.Set(float64(stats.MixedCasedUsers))
-	return stats, nil
-}
-
-func (s *AuthInfoStore) duplicateUserEntriesSQL(ctx context.Context) string {
-	userDialect := s.sqlStore.GetDialect().Quote("user")
-	// this query counts how many users have the same login or email.
-	// which might be confusing, but gives a good indication
-	// we want this query to not require too much cpu
-	sqlQuery := `SELECT
-		(SELECT login from ` + userDialect + ` WHERE (LOWER(login) = LOWER(u.login)) AND (login != u.login)) AS dup_login,
-		(SELECT email from ` + userDialect + ` WHERE (LOWER(email) = LOWER(u.email)) AND (email != u.email)) AS dup_email
-	FROM ` + userDialect + ` AS u`
-	return sqlQuery
-}
-
-func (s *AuthInfoStore) mixedCasedUsers(ctx context.Context) string {
-	userDialect := db.DB.GetDialect(s.sqlStore).Quote("user")
-	// this query counts how many users have upper case and lower case login or emails.
-	// why
-	// users login via IDP or service providers get upper cased domains at times :shrug:
-	sqlQuery := `SELECT login, email FROM ` + userDialect + ` WHERE (LOWER(login) != login OR lower(email) != email)`
-	return sqlQuery
-}

pkg/services/login/authinfoservice/database/stats_test.go

@@ -1,76 +0,0 @@
-package database
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/infra/db"
-	secretstest "github.com/grafana/grafana/pkg/services/secrets/fakes"
-	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/services/user/userimpl"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func TestIntegrationAuthInfoStoreStats(t *testing.T) {
-	sql := db.InitTestDB(t)
-	cfg := setting.NewCfg()
-	InitDuplicateUserMetrics()
-
-	now := time.Now()
-
-	usrStore := userimpl.ProvideStore(sql, cfg)
-	for i := 0; i < 5; i++ {
-		usr := &user.User{
-			Email:      fmt.Sprint("user", i, "@test.com"),
-			Login:      fmt.Sprint("user", i),
-			Name:       fmt.Sprint("user", i),
-			Created:    now,
-			Updated:    now,
-			LastSeenAt: now,
-		}
-		_, err := usrStore.Insert(context.Background(), usr)
-		require.Nil(t, err)
-	}
-
-	var (
-		duplicatedUsers    int
-		mixedCasedUsers    int
-		hasDuplicatedUsers int
-	)
-
-	if sql.GetDialect().DriverName() != "mysql" {
-		duplicatedUsers, mixedCasedUsers, hasDuplicatedUsers = 2, 1, 1
-		_, err := usrStore.Insert(context.Background(), &user.User{
-			Email:      "USERDUPLICATETEST1@TEST.COM",
-			Name:       "user name 1",
-			Login:      "USER_DUPLICATE_TEST_1_LOGIN",
-			Created:    now,
-			Updated:    now,
-			LastSeenAt: now,
-		})
-		require.NoError(t, err)
-
-		// add additional user with duplicate login where DOMAIN is upper case
-		_, err = usrStore.Insert(context.Background(), &user.User{
-			Email:      "userduplicatetest1@test.com",
-			Name:       "user name 1",
-			Login:      "user_duplicate_test_1_login",
-			Created:    now,
-			Updated:    now,
-			LastSeenAt: now,
-		})
-		require.NoError(t, err)
-	}
-
-	store := ProvideAuthInfoStore(sql, secretstest.NewFakeSecretsService(), nil)
-	stats, err := store.CollectLoginStats(context.Background())
-	require.NoError(t, err)
-
-	require.Equal(t, duplicatedUsers, stats["stats.users.duplicate_user_entries"])
-	require.Equal(t, mixedCasedUsers, stats["stats.users.mixed_cased_users"])
-	require.Equal(t, hasDuplicatedUsers, stats["stats.users.has_duplicate_user_entries"])
-}

pkg/services/login/authinfoservice/service.go

@@ -1,52 +0,0 @@
-package authinfoservice
-
-import (
-	"context"
-
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/login"
-)
-
-type Implementation struct {
-	authInfoStore login.Store
-	logger        log.Logger
-}
-
-func ProvideAuthInfoService(authInfoStore login.Store) *Implementation {
-	s := &Implementation{
-		authInfoStore: authInfoStore,
-		logger:        log.New("login.authinfo"),
-	}
-	// FIXME: disabled metrics until further notice
-	// query performance is slow for more than 20000 users
-	// usageStats.RegisterMetricsFunc(authInfoStore.CollectLoginStats)
-	return s
-}
-
-func (s *Implementation) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
-	return s.authInfoStore.GetAuthInfo(ctx, query)
-}
-
-func (s *Implementation) GetUserLabels(ctx context.Context, query login.GetUserLabelsQuery) (map[int64]string, error) {
-	if len(query.UserIDs) == 0 {
-		return map[int64]string{}, nil
-	}
-	return s.authInfoStore.GetUserLabels(ctx, query)
-}
-
-func (s *Implementation) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error {
-	return s.authInfoStore.UpdateAuthInfo(ctx, cmd)
-}
-
-func (s *Implementation) SetAuthInfo(ctx context.Context, cmd *login.SetAuthInfoCommand) error {
-	return s.authInfoStore.SetAuthInfo(ctx, cmd)
-}
-
-func (s *Implementation) DeleteUserAuthInfo(ctx context.Context, userID int64) error {
-	return s.authInfoStore.DeleteUserAuthInfo(ctx, userID)
-}
-
-func (s *Implementation) Run(ctx context.Context) error {
-	s.logger.Debug("Started AuthInfo Metrics collection service")
-	return s.authInfoStore.RunMetricsCollection(ctx)
-}

pkg/services/login/authinfotest/fake.go

@@ -1,4 +1,4 @@
-package logintest
+package authinfotest
 
 import (
 	"context"
@@ -6,7 +6,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/login"
 )
 
-type AuthInfoServiceFake struct {
+type FakeService struct {
 	login.AuthInfoService
 	LatestUserID         int64
 	ExpectedUserAuth     *login.UserAuth
@@ -18,16 +18,16 @@ type AuthInfoServiceFake struct {
 	UpdateAuthInfoFn func(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error
 }
 
-func (a *AuthInfoServiceFake) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
+func (a *FakeService) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
 	a.LatestUserID = query.UserId
 	return a.ExpectedUserAuth, a.ExpectedError
 }
 
-func (a *AuthInfoServiceFake) GetUserLabels(ctx context.Context, query login.GetUserLabelsQuery) (map[int64]string, error) {
+func (a *FakeService) GetUserLabels(ctx context.Context, query login.GetUserLabelsQuery) (map[int64]string, error) {
 	return a.ExpectedLabels, a.ExpectedError
 }
 
-func (a *AuthInfoServiceFake) SetAuthInfo(ctx context.Context, cmd *login.SetAuthInfoCommand) error {
+func (a *FakeService) SetAuthInfo(ctx context.Context, cmd *login.SetAuthInfoCommand) error {
 	if a.SetAuthInfoFn != nil {
 		return a.SetAuthInfoFn(ctx, cmd)
 	}
@@ -35,7 +35,7 @@ func (a *AuthInfoServiceFake) SetAuthInfo(ctx context.Context, cmd *login.SetAut
 	return a.ExpectedError
 }
 
-func (a *AuthInfoServiceFake) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error {
+func (a *FakeService) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error {
 	if a.UpdateAuthInfoFn != nil {
 		return a.UpdateAuthInfoFn(ctx, cmd)
 	}
@@ -43,6 +43,6 @@ func (a *AuthInfoServiceFake) UpdateAuthInfo(ctx context.Context, cmd *login.Upd
 	return a.ExpectedError
 }
 
-func (a *AuthInfoServiceFake) DeleteUserAuthInfo(ctx context.Context, userID int64) error {
+func (a *FakeService) DeleteUserAuthInfo(ctx context.Context, userID int64) error {
 	return a.ExpectedError
 }

pkg/services/login/model.go

@@ -2,10 +2,8 @@ package login
 
 import (
 	"fmt"
-	"sync"
 	"time"
 
-	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/oauth2"
 
 	contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
@@ -14,30 +12,6 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-type LoginStats struct {
-	DuplicateUserEntries int `xorm:"duplicate_user_entries"`
-	MixedCasedUsers      int `xorm:"mixed_cased_users"`
-}
-
-const (
-	ExporterName              = "grafana"
-	MetricsCollectionInterval = time.Hour * 4 // every 4 hours, indication of duplicate users
-)
-
-var (
-	// MStatDuplicateUserEntries is a indication metric gauge for number of users with duplicate emails or logins
-	MStatDuplicateUserEntries prometheus.Gauge
-
-	// MStatHasDuplicateEntries is a metric for if there is duplicate users
-	MStatHasDuplicateEntries prometheus.Gauge
-
-	// MStatMixedCasedUsers is a metric for if there is duplicate users
-	MStatMixedCasedUsers prometheus.Gauge
-
-	Once        sync.Once
-	Initialised bool = false
-)
-
 type UserAuth struct {
 	Id                int64
 	UserId            int64

pkg/services/oauthtoken/oauth_token_test.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/login/socialtest"
 	"github.com/grafana/grafana/pkg/services/login"
-	"github.com/grafana/grafana/pkg/services/login/authinfoservice"
+	"github.com/grafana/grafana/pkg/services/login/authinfoimpl"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -229,7 +229,7 @@ func setupOAuthTokenService(t *testing.T) (*Service, *FakeAuthInfoStore, *social
 	}
 
 	authInfoStore := &FakeAuthInfoStore{}
-	authInfoService := authinfoservice.ProvideAuthInfoService(authInfoStore)
+	authInfoService := authinfoimpl.ProvideService(authInfoStore)
 	return &Service{
 		Cfg:                  setting.NewCfg(),
 		SocialService:        socialService,
@@ -241,12 +241,8 @@ func setupOAuthTokenService(t *testing.T) (*Service, *FakeAuthInfoStore, *social
 
 type FakeAuthInfoStore struct {
 	login.Store
-	ExpectedError                   error
-	ExpectedUser                    *user.User
-	ExpectedOAuth                   *login.UserAuth
-	ExpectedDuplicateUserEntries    int
-	ExpectedHasDuplicateUserEntries int
-	ExpectedLoginStats              login.LoginStats
+	ExpectedError error
+	ExpectedOAuth *login.UserAuth
 }
 
 func (f *FakeAuthInfoStore) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) {
@@ -257,10 +253,6 @@ func (f *FakeAuthInfoStore) SetAuthInfo(ctx context.Context, cmd *login.SetAuthI
 	return f.ExpectedError
 }
 
-func (f *FakeAuthInfoStore) UpdateAuthInfoDate(ctx context.Context, authInfo *login.UserAuth) error {
-	return f.ExpectedError
-}
-
 func (f *FakeAuthInfoStore) UpdateAuthInfo(ctx context.Context, cmd *login.UpdateAuthInfoCommand) error {
 	f.ExpectedOAuth.OAuthAccessToken = cmd.OAuthToken.AccessToken
 	f.ExpectedOAuth.OAuthExpiry = cmd.OAuthToken.Expiry
@@ -272,35 +264,3 @@ func (f *FakeAuthInfoStore) UpdateAuthInfo(ctx context.Context, cmd *login.Updat
 func (f *FakeAuthInfoStore) DeleteAuthInfo(ctx context.Context, cmd *login.DeleteAuthInfoCommand) error {
 	return f.ExpectedError
 }
-
-func (f *FakeAuthInfoStore) GetUserById(ctx context.Context, id int64) (*user.User, error) {
-	return f.ExpectedUser, f.ExpectedError
-}
-
-func (f *FakeAuthInfoStore) GetUserByLogin(ctx context.Context, login string) (*user.User, error) {
-	return f.ExpectedUser, f.ExpectedError
-}
-
-func (f *FakeAuthInfoStore) GetUserByEmail(ctx context.Context, email string) (*user.User, error) {
-	return f.ExpectedUser, f.ExpectedError
-}
-
-func (f *FakeAuthInfoStore) CollectLoginStats(ctx context.Context) (map[string]interface{}, error) {
-	var res = make(map[string]interface{})
-	res["stats.users.duplicate_user_entries"] = f.ExpectedDuplicateUserEntries
-	res["stats.users.has_duplicate_user_entries"] = f.ExpectedHasDuplicateUserEntries
-	res["stats.users.duplicate_user_entries_by_login"] = 0
-	res["stats.users.has_duplicate_user_entries_by_login"] = 0
-	res["stats.users.duplicate_user_entries_by_email"] = 0
-	res["stats.users.has_duplicate_user_entries_by_email"] = 0
-	res["stats.users.mixed_cased_users"] = f.ExpectedLoginStats.MixedCasedUsers
-	return res, f.ExpectedError
-}
-
-func (f *FakeAuthInfoStore) RunMetricsCollection(ctx context.Context) error {
-	return f.ExpectedError
-}
-
-func (f *FakeAuthInfoStore) GetLoginStats(ctx context.Context) (login.LoginStats, error) {
-	return f.ExpectedLoginStats, f.ExpectedError
-}