From 3cae5d717ed40fdf8da67d6ec445eeea1cbead9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gangloff?= <contact@maelgangloff.fr>
Date: Thu, 27 Feb 2025 09:01:05 +0100
Subject: [PATCH] chore: make verifyAuthData private

---
 src/Controller/ConnectorController.php                     | 6 +++---
 src/Controller/WatchListController.php                     | 2 ++
 src/MessageHandler/ValidateConnectorCredentialsHandler.php | 2 ++
 src/Service/Connector/AbstractProvider.php                 | 6 ++++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Controller/ConnectorController.php b/src/Controller/ConnectorController.php
index da98b09..85cac72 100644
--- a/src/Controller/ConnectorController.php
+++ b/src/Controller/ConnectorController.php
@@ -14,6 +14,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Serializer\Exception\ExceptionInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
@@ -47,6 +48,7 @@ class ConnectorController extends AbstractController
 
     /**
      * @throws \Exception
+     * @throws ExceptionInterface
      */
     #[Route(
         path: '/api/connectors',
@@ -77,9 +79,7 @@ class ConnectorController extends AbstractController
 
         /** @var AbstractProvider $providerClient */
         $providerClient = $this->locator->get($provider->getConnectorProvider());
-        $authData = $providerClient->verifyAuthData($connector->getAuthData());
-        $connector->setAuthData($authData);
-        $providerClient->authenticate($authData);
+        $connector->setAuthData($providerClient->authenticate($connector->getAuthData()));
 
         $this->logger->info('User {username} authentication data with the {provider} provider has been validated.', [
             'username' => $user->getUserIdentifier(),
diff --git a/src/Controller/WatchListController.php b/src/Controller/WatchListController.php
index fa1d997..46d383c 100644
--- a/src/Controller/WatchListController.php
+++ b/src/Controller/WatchListController.php
@@ -41,6 +41,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Serializer\Exception\ExceptionInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 
 class WatchListController extends AbstractController
@@ -154,6 +155,7 @@ class WatchListController extends AbstractController
 
     /**
      * @throws \Exception
+     * @throws ExceptionInterface
      */
     private function verifyConnector(WatchList $watchList, ?Connector $connector): void
     {
diff --git a/src/MessageHandler/ValidateConnectorCredentialsHandler.php b/src/MessageHandler/ValidateConnectorCredentialsHandler.php
index 2f9174c..3cf8074 100644
--- a/src/MessageHandler/ValidateConnectorCredentialsHandler.php
+++ b/src/MessageHandler/ValidateConnectorCredentialsHandler.php
@@ -13,6 +13,7 @@ use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Notifier\Recipient\Recipient;
+use Symfony\Component\Serializer\Exception\ExceptionInterface;
 
 #[AsMessageHandler]
 final readonly class ValidateConnectorCredentialsHandler
@@ -27,6 +28,7 @@ final readonly class ValidateConnectorCredentialsHandler
 
     /**
      * @throws TransportExceptionInterface
+     * @throws ExceptionInterface
      */
     public function __invoke(ValidateConnectorCredentials $message): void
     {
diff --git a/src/Service/Connector/AbstractProvider.php b/src/Service/Connector/AbstractProvider.php
index f550ae7..0ed43e1 100644
--- a/src/Service/Connector/AbstractProvider.php
+++ b/src/Service/Connector/AbstractProvider.php
@@ -52,7 +52,7 @@ abstract class AbstractProvider
      * @throws HttpException      when the user does not accept the necessary conditions
      * @throws ExceptionInterface
      */
-    public function verifyAuthData(array $authData): array
+    private function verifyAuthData(array $authData): array
     {
         /** @var DefaultProviderDto $data */
         $data = $this->serializer->denormalize($this->verifyLegalAuthData($authData), $this->dtoClass);
@@ -136,10 +136,12 @@ abstract class AbstractProvider
      * @throws ExceptionInterface
      * @throws \Exception
      */
-    public function authenticate(array $authData): void
+    public function authenticate(array $authData): array
     {
         $this->authData = $this->verifyAuthData($authData);
         $this->assertAuthentication();
+
+        return $this->authData;
     }
 
     abstract protected function getCachedTldList(): CacheItemInterface;