Chore: Split delete user method (#52216)

* Remove user from preferences, stars, orguser, team member * Fix lint * Add Delete user from org and dashboard acl * Delete user from user auth * Add DeleteUser to quota * Add test files and adjust user auth store * Rename package in wire for user auth * Import Quota Service interface in other services * do the same in tests * fix lint tests * Fix tests * Add some tests * Rename InsertUser and DeleteUser to InsertOrgUser and DeleteOrgUser * Rename DeleteUser to DeleteByUser in quota * changing a method name in few additional places * Fix in other places * Fix lint * Fix tests * Chore: Split Delete User method * Add fakes for userauth * Add mock for access control Delete User permossion, use interface * Use interface for ream guardian * Add simple fake for dashboard acl * Add go routines, clean up, use interfaces * fix lint * Update pkg/services/user/userimpl/user_test.go Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com> * Update pkg/services/user/userimpl/user_test.go Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com> * Update pkg/services/user/userimpl/user_test.go Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com> * Add wrapper for not service account error * fix indentation * Use fmt for error wrapper Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
2022-07-19 16:01:05 +02:00
parent 39025bb4cd
commit c061b66d5f
20 changed files with 315 additions and 35 deletions
@@ -3,27 +3,62 @@ package userimpl
 import (
 	"context"
 	"errors"
+	"fmt"
 	"time"

 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/org"
+	pref "github.com/grafana/grafana/pkg/services/preference"
+	"github.com/grafana/grafana/pkg/services/quota"
 	"github.com/grafana/grafana/pkg/services/sqlstore/db"
+	"github.com/grafana/grafana/pkg/services/star"
+	"github.com/grafana/grafana/pkg/services/teamguardian"
 	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/services/userauth"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
+
+	"golang.org/x/sync/errgroup"
 )

 type Service struct {
-	store      store
-	orgService org.Service
+	store              store
+	orgService         org.Service
+	starService        star.Service
+	dashboardService   dashboards.DashboardService
+	preferenceService  pref.Service
+	teamMemberService  teamguardian.TeamGuardian
+	userAuthService    userauth.Service
+	quotaService       quota.Service
+	accessControlStore accesscontrol.AccessControl
 }

-func ProvideService(db db.DB, orgService org.Service) user.Service {
+func ProvideService(
+	db db.DB,
+	orgService org.Service,
+	starService star.Service,
+	dashboardService dashboards.DashboardService,
+	preferenceService pref.Service,
+	teamMemberService teamguardian.TeamGuardian,
+	userAuthService userauth.Service,
+	quotaService quota.Service,
+	accessControlStore accesscontrol.AccessControl,
+) user.Service {
 	return &Service{
 		store: &sqlStore{
-			db: db,
+			db:      db,
+			dialect: db.GetDialect(),
 		},
-		orgService: orgService,
+		orgService:         orgService,
+		starService:        starService,
+		dashboardService:   dashboardService,
+		preferenceService:  preferenceService,
+		teamMemberService:  teamMemberService,
+		userAuthService:    userAuthService,
+		quotaService:       quotaService,
+		accessControlStore: accessControlStore,
 	}
 }

@@ -88,7 +123,7 @@ func (s *Service) Create(ctx context.Context, cmd *user.CreateUserCommand) (*use
 		usr.Password = encodedPassword
 	}

-	_, err = s.store.Insert(ctx, usr)
+	userID, err := s.store.Insert(ctx, usr)
 	if err != nil {
 		return nil, err
 	}
@@ -112,10 +147,82 @@ func (s *Service) Create(ctx context.Context, cmd *user.CreateUserCommand) (*use
 		}
 		_, err = s.orgService.InsertOrgUser(ctx, &orgUser)
 		if err != nil {
-			//  HERE ADD DELETE USER
+			err := s.store.Delete(ctx, userID)
 			return usr, err
 		}
 	}

 	return usr, nil
 }
+
+func (s *Service) Delete(ctx context.Context, cmd *user.DeleteUserCommand) error {
+	_, err := s.store.GetNotServiceAccount(ctx, cmd.UserID)
+	if err != nil {
+		return fmt.Errorf("failed to get user with not service account: %w", err)
+	}
+	// delete from all the stores
+	if err := s.store.Delete(ctx, cmd.UserID); err != nil {
+		return err
+	}
+
+	g, ctx := errgroup.WithContext(ctx)
+	g.Go(func() error {
+		if err := s.starService.DeleteByUser(ctx, cmd.UserID); err != nil {
+			return err
+		}
+		return nil
+	})
+	g.Go(func() error {
+		if err := s.orgService.DeleteUserFromAll(ctx, cmd.UserID); err != nil {
+			return err
+		}
+		return nil
+	})
+	g.Go(func() error {
+		if err := s.dashboardService.DeleteACLByUser(ctx, cmd.UserID); err != nil {
+			return err
+		}
+		return nil
+	})
+	g.Go(func() error {
+		if err := s.preferenceService.DeleteByUser(ctx, cmd.UserID); err != nil {
+			return err
+		}
+		return nil
+	})
+	g.Go(func() error {
+		if err := s.teamMemberService.DeleteByUser(ctx, cmd.UserID); err != nil {
+			return err
+		}
+		return nil
+	})
+	g.Go(func() error {
+		if err := s.userAuthService.Delete(ctx, cmd.UserID); err != nil {
+			return err
+		}
+		return nil
+	})
+	g.Go(func() error {
+		if err := s.userAuthService.DeleteToken(ctx, cmd.UserID); err != nil {
+			return err
+		}
+		return nil
+	})
+	g.Go(func() error {
+		if err := s.quotaService.DeleteByUser(ctx, cmd.UserID); err != nil {
+			return err
+		}
+		return nil
+	})
+	g.Go(func() error {
+		if err := s.accessControlStore.DeleteUserPermissions(ctx, cmd.UserID); err != nil {
+			return err
+		}
+		return nil
+	})
+	if err := g.Wait(); err != nil {
+		return err
+	}
+
+	return nil
+}