diff --git a/pkg/api/admin_users.go b/pkg/api/admin_users.go index 50c018910cd..11cf6564b40 100644 --- a/pkg/api/admin_users.go +++ b/pkg/api/admin_users.go @@ -189,9 +189,9 @@ func (hs *HTTPServer) AdminDeleteUser(c *models.ReqContext) response.Response { return response.Error(http.StatusBadRequest, "id is invalid", err) } - cmd := models.DeleteUserCommand{UserId: userID} + cmd := user.DeleteUserCommand{UserID: userID} - if err := hs.SQLStore.DeleteUser(c.Req.Context(), &cmd); err != nil { + if err := hs.userService.Delete(c.Req.Context(), &cmd); err != nil { if errors.Is(err, user.ErrUserNotFound) { return response.Error(404, user.ErrUserNotFound.Error(), nil) } diff --git a/pkg/services/serviceaccounts/database/database.go b/pkg/services/serviceaccounts/database/database.go index e8228fa0ea7..30950e4d922 100644 --- a/pkg/services/serviceaccounts/database/database.go +++ b/pkg/services/serviceaccounts/database/database.go @@ -24,6 +24,7 @@ type ServiceAccountsStoreImpl struct { apiKeyService apikey.Service kvStore kvstore.KVStore log log.Logger + userService user.Service } func ProvideServiceAccountsStore(store *sqlstore.SQLStore, apiKeyService apikey.Service, kvStore kvstore.KVStore) *ServiceAccountsStoreImpl { @@ -456,7 +457,7 @@ func (s *ServiceAccountsStoreImpl) CreateServiceAccountFromApikey(ctx context.Co } if err := s.assignApiKeyToServiceAccount(sess, key.Id, newSA.ID); err != nil { - if err := s.sqlStore.DeleteUser(ctx, &models.DeleteUserCommand{UserId: newSA.ID}); err != nil { + if err := s.userService.Delete(ctx, &user.DeleteUserCommand{UserID: newSA.ID}); err != nil { s.log.Error("Error deleting service account", "error", err) } return fmt.Errorf("failed to migrate API key to service account token: %w", err) diff --git a/pkg/services/sqlstore/mockstore/mockstore.go b/pkg/services/sqlstore/mockstore/mockstore.go index aec5f4d3def..6430919130c 100644 --- a/pkg/services/sqlstore/mockstore/mockstore.go +++ b/pkg/services/sqlstore/mockstore/mockstore.go @@ -170,11 +170,6 @@ func (m *SQLStoreMock) BatchDisableUsers(ctx context.Context, cmd *models.BatchD return m.ExpectedError } -func (m *SQLStoreMock) DeleteUser(ctx context.Context, cmd *models.DeleteUserCommand) error { - m.LatestUserId = cmd.UserId - return m.ExpectedError -} - func (m *SQLStoreMock) UpdateUserPermissions(userID int64, isAdmin bool) error { return m.ExpectedError } diff --git a/pkg/services/sqlstore/store.go b/pkg/services/sqlstore/store.go index 9e2a7356ea7..2c52b634310 100644 --- a/pkg/services/sqlstore/store.go +++ b/pkg/services/sqlstore/store.go @@ -38,7 +38,6 @@ type Store interface { SearchUsers(ctx context.Context, query *models.SearchUsersQuery) error DisableUser(ctx context.Context, cmd *models.DisableUserCommand) error BatchDisableUsers(ctx context.Context, cmd *models.BatchDisableUsersCommand) error - DeleteUser(ctx context.Context, cmd *models.DeleteUserCommand) error UpdateUserPermissions(userID int64, isAdmin bool) error SetUserHelpFlag(ctx context.Context, cmd *models.SetUserHelpFlagCommand) error CreateTeam(name, email string, orgID int64) (models.Team, error)