remove duplicates

Signed-off-by: Miguel Martinez <miguel@chainloop.dev>

Author: migmartri

app/controlplane/internal/service/organization.go

@@ -98,8 +98,7 @@ func (s *OrganizationService) Update(ctx context.Context, req *pb.OrganizationSe
 }
 
 func (s *OrganizationService) Delete(ctx context.Context, req *pb.OrganizationServiceDeleteRequest) (*pb.OrganizationServiceDeleteResponse, error) {
-	currentUser, err := requireCurrentUser(ctx)
-	if err != nil {
+	if _, err := requireCurrentUser(ctx); err != nil {
 		return nil, err
 	}
 
@@ -120,7 +119,7 @@ func (s *OrganizationService) Delete(ctx context.Context, req *pb.OrganizationSe
 		return nil, err
 	}
 
-	if err := s.orgUC.DeleteByUser(ctx, req.Name, currentUser.ID); err != nil {
+	if err := s.orgUC.Delete(ctx, orgUUID.String()); err != nil {
 		return nil, handleUseCaseErr(err, s.log)
 	}
 

app/controlplane/pkg/biz/organization.go

@@ -290,43 +290,6 @@ func (uc *OrganizationUseCase) Delete(ctx context.Context, id string) error {
 	return uc.orgRepo.Delete(ctx, orgUUID)
 }
 
-// DeleteByUser deletes an organization initiated by a user with owner validation
-// Only organization owners can delete an organization
-func (uc *OrganizationUseCase) DeleteByUser(ctx context.Context, orgName, userID string) error {
-	// Find organization by name
-	org, err := uc.orgRepo.FindByName(ctx, orgName)
-	if err != nil {
-		return err
-	} else if org == nil {
-		return NewErrNotFound("organization")
-	}
-
-	orgUUID, err := uuid.Parse(org.ID)
-	if err != nil {
-		return NewErrInvalidUUID(err)
-	}
-
-	userUUID, err := uuid.Parse(userID)
-	if err != nil {
-		return NewErrInvalidUUID(err)
-	}
-
-	// Check if user is an owner of the organization
-	m, err := uc.membershipRepo.FindByOrgAndUser(ctx, orgUUID, userUUID)
-	if err != nil {
-		return fmt.Errorf("failed to find owners: %w", err)
-	}
-
-	if m == nil || m.Role != authz.RoleOwner {
-		return NewErrValidationStr("only organization owners can delete the organization")
-	}
-
-	uc.logger.Infow("msg", "User deleting organization", "user_id", userID, "organization_id", org.ID)
-
-	// Use the existing Delete method to handle the actual deletion
-	return uc.Delete(ctx, org.ID)
-}
-
 // AutoOnboardOrganizations creates the organizations specified in the onboarding config and assigns the user to them
 // with the specified role if they are not already a member.
 func (uc *OrganizationUseCase) AutoOnboardOrganizations(ctx context.Context, userID string) error {