diff --git a/pkg/services/login/authinfo.go b/pkg/services/login/authinfo.go index 67729b56af2..04e7a578ad1 100644 --- a/pkg/services/login/authinfo.go +++ b/pkg/services/login/authinfo.go @@ -11,14 +11,12 @@ type AuthInfoService interface { LookupAndUpdate(ctx context.Context, query *GetUserByAuthInfoQuery) (*user.User, error) GetAuthInfo(ctx context.Context, query *GetAuthInfoQuery) (*UserAuth, error) GetUserLabels(ctx context.Context, query GetUserLabelsQuery) (map[int64]string, error) - GetExternalUserInfoByLogin(ctx context.Context, query *GetExternalUserInfoByLoginQuery) (*ExternalUserInfo, error) SetAuthInfo(ctx context.Context, cmd *SetAuthInfoCommand) error UpdateAuthInfo(ctx context.Context, cmd *UpdateAuthInfoCommand) error DeleteUserAuthInfo(ctx context.Context, userID int64) error } type Store interface { - GetExternalUserInfoByLogin(ctx context.Context, query *GetExternalUserInfoByLoginQuery) (*ExternalUserInfo, error) GetAuthInfo(ctx context.Context, query *GetAuthInfoQuery) (*UserAuth, error) GetUserLabels(ctx context.Context, query GetUserLabelsQuery) (map[int64]string, error) SetAuthInfo(ctx context.Context, cmd *SetAuthInfoCommand) error diff --git a/pkg/services/login/authinfoservice/database/database.go b/pkg/services/login/authinfoservice/database/database.go index 995a119fd82..e3c384f889e 100644 --- a/pkg/services/login/authinfoservice/database/database.go +++ b/pkg/services/login/authinfoservice/database/database.go @@ -34,31 +34,6 @@ func ProvideAuthInfoStore(sqlStore db.DB, secretsService secrets.Service, userSe return store } -func (s *AuthInfoStore) GetExternalUserInfoByLogin(ctx context.Context, query *login.GetExternalUserInfoByLoginQuery) (*login.ExternalUserInfo, error) { - userQuery := user.GetUserByLoginQuery{LoginOrEmail: query.LoginOrEmail} - usr, err := s.userService.GetByLogin(ctx, &userQuery) - if err != nil { - return nil, err - } - - authInfoQuery := &login.GetAuthInfoQuery{UserId: usr.ID} - authInfo, err := s.GetAuthInfo(ctx, authInfoQuery) - if err != nil { - return nil, err - } - - result := &login.ExternalUserInfo{ - UserId: usr.ID, - Login: usr.Login, - Email: usr.Email, - Name: usr.Name, - IsDisabled: usr.IsDisabled, - AuthModule: authInfo.AuthModule, - AuthId: authInfo.AuthId, - } - return result, nil -} - // 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) { diff --git a/pkg/services/login/authinfoservice/service.go b/pkg/services/login/authinfoservice/service.go index d6a49cfb28b..d863af14bef 100644 --- a/pkg/services/login/authinfoservice/service.go +++ b/pkg/services/login/authinfoservice/service.go @@ -201,10 +201,6 @@ func (s *Implementation) SetAuthInfo(ctx context.Context, cmd *login.SetAuthInfo return s.authInfoStore.SetAuthInfo(ctx, cmd) } -func (s *Implementation) GetExternalUserInfoByLogin(ctx context.Context, query *login.GetExternalUserInfoByLoginQuery) (*login.ExternalUserInfo, error) { - return s.authInfoStore.GetExternalUserInfoByLogin(ctx, query) -} - func (s *Implementation) DeleteUserAuthInfo(ctx context.Context, userID int64) error { return s.authInfoStore.DeleteUserAuthInfo(ctx, userID) } diff --git a/pkg/services/login/authinfoservice/user_auth_test.go b/pkg/services/login/authinfoservice/user_auth_test.go index eb524adde84..e61a7e1ba75 100644 --- a/pkg/services/login/authinfoservice/user_auth_test.go +++ b/pkg/services/login/authinfoservice/user_auth_test.go @@ -520,9 +520,6 @@ func newFakeAuthInfoStore() *FakeAuthInfoStore { return &FakeAuthInfoStore{} } -func (f *FakeAuthInfoStore) GetExternalUserInfoByLogin(ctx context.Context, query *login.GetExternalUserInfoByLoginQuery) (*login.ExternalUserInfo, error) { - return nil, f.ExpectedError -} func (f *FakeAuthInfoStore) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) { return f.ExpectedOAuth, f.ExpectedError } diff --git a/pkg/services/login/logintest/logintest.go b/pkg/services/login/logintest/logintest.go index f48e32253a0..10c58736368 100644 --- a/pkg/services/login/logintest/logintest.go +++ b/pkg/services/login/logintest/logintest.go @@ -54,10 +54,6 @@ func (a *AuthInfoServiceFake) UpdateAuthInfo(ctx context.Context, cmd *login.Upd return a.ExpectedError } -func (a *AuthInfoServiceFake) GetExternalUserInfoByLogin(ctx context.Context, query *login.GetExternalUserInfoByLoginQuery) (*login.ExternalUserInfo, error) { - return a.ExpectedExternalUser, a.ExpectedError -} - func (a *AuthInfoServiceFake) DeleteUserAuthInfo(ctx context.Context, userID int64) error { return a.ExpectedError } diff --git a/pkg/services/login/model.go b/pkg/services/login/model.go index d8401df4824..2d8061653a4 100644 --- a/pkg/services/login/model.go +++ b/pkg/services/login/model.go @@ -135,10 +135,6 @@ type UserLookupParams struct { Login *string // if set, will try to find the user by login } -type GetExternalUserInfoByLoginQuery struct { - LoginOrEmail string -} - type GetAuthInfoQuery struct { UserId int64 AuthModule string diff --git a/pkg/services/oauthtoken/oauth_token_test.go b/pkg/services/oauthtoken/oauth_token_test.go index 5f41ac0499d..7d6e569736f 100644 --- a/pkg/services/oauthtoken/oauth_token_test.go +++ b/pkg/services/oauthtoken/oauth_token_test.go @@ -250,10 +250,6 @@ type FakeAuthInfoStore struct { ExpectedLoginStats login.LoginStats } -func (f *FakeAuthInfoStore) GetExternalUserInfoByLogin(ctx context.Context, query *login.GetExternalUserInfoByLoginQuery) (*login.ExternalUserInfo, error) { - return nil, f.ExpectedError -} - func (f *FakeAuthInfoStore) GetAuthInfo(ctx context.Context, query *login.GetAuthInfoQuery) (*login.UserAuth, error) { return f.ExpectedOAuth, f.ExpectedError }