From 46d5d524b5099852a715642ef95946d468085128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Gangloff?= Date: Mon, 3 Mar 2025 14:27:05 +0100 Subject: [PATCH] refactor: use kernel project_dir --- src/Controller/ConnectorController.php | 6 ++++-- src/Service/Connector/EppClientProvider.php | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Controller/ConnectorController.php b/src/Controller/ConnectorController.php index fa486c3..faf2e9a 100644 --- a/src/Controller/ConnectorController.php +++ b/src/Controller/ConnectorController.php @@ -15,6 +15,7 @@ use Symfony\Component\DependencyInjection\Attribute\Autowire; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; +use Symfony\Component\HttpKernel\KernelInterface; use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Serializer\Exception\ExceptionInterface; @@ -25,6 +26,7 @@ class ConnectorController extends AbstractController private readonly LoggerInterface $logger, #[Autowire(service: 'service_container')] private readonly ContainerInterface $locator, + private readonly KernelInterface $kernel, ) { } @@ -78,7 +80,7 @@ class ConnectorController extends AbstractController if (ConnectorProvider::EPP === $provider) { $filesystem = new Filesystem(); - $directory = sprintf('%s/%s/', EppClientProvider::EPP_CERTIFICATES_PATH, $connector->getId()); + $directory = EppClientProvider::buildEppCertificateFolder($this->kernel->getProjectDir(), $connector->getId()); unset($authData['file_certificate_pem'], $authData['file_certificate_key']); // Prevent alteration from user if (isset($authData['certificate_pem'], $authData['certificate_key'])) { @@ -143,7 +145,7 @@ class ConnectorController extends AbstractController } if (ConnectorProvider::EPP === $provider) { - (new Filesystem())->remove(sprintf('%s/%s/', EppClientProvider::EPP_CERTIFICATES_PATH, $connector->getId())); + (new Filesystem())->remove(EppClientProvider::buildEppCertificateFolder($this->kernel->getProjectDir(), $connector->getId())); } $this->em->remove($connector); diff --git a/src/Service/Connector/EppClientProvider.php b/src/Service/Connector/EppClientProvider.php index 45aba12..10e1cbc 100644 --- a/src/Service/Connector/EppClientProvider.php +++ b/src/Service/Connector/EppClientProvider.php @@ -24,8 +24,6 @@ use Symfony\Component\Validator\Validator\ValidatorInterface; class EppClientProvider extends AbstractProvider implements CheckDomainProviderInterface { - public const EPP_CERTIFICATES_PATH = '../var/epp-certificates/'; - protected string $dtoClass = EppClientProviderDto::class; private ?eppConnection $eppClient = null; @@ -187,4 +185,9 @@ class EppClientProvider extends AbstractProvider implements CheckDomainProviderI { $this->disconnect(); } + + public static function buildEppCertificateFolder(string $projectDir, string $connectorId): string + { + return sprintf('%s/%s/%s/', $projectDir, 'var/epp-certificates', $connectorId); + } }