Use dependency injection for API Exception converters

Author: jeromegamez

src/Firebase/AppCheck/ApiClient.php

@@ -19,12 +19,10 @@
  */
 final class ApiClient
 {
-    private readonly AppCheckApiExceptionConverter $errorHandler;
-
     public function __construct(
         private readonly ClientInterface $client,
+        private readonly AppCheckApiExceptionConverter $errorHandler,
     ) {
-        $this->errorHandler = new AppCheckApiExceptionConverter();
     }
 
     /**

src/Firebase/Auth/ApiClient.php

@@ -38,8 +38,6 @@ class ApiClient
 
     private readonly AuthResourceUrlBuilder $authResourceUrlBuilder;
 
-    private readonly AuthApiExceptionConverter $errorHandler;
-
     /**
      * @param non-empty-string $projectId
      * @param non-empty-string|null $tenantId
@@ -50,9 +48,8 @@ public function __construct(
         private readonly ClientInterface $client,
         private readonly GuzzleHandler $signInHandler,
         private readonly ClockInterface $clock,
+        private readonly AuthApiExceptionConverter $errorHandler,
     ) {
-        $this->errorHandler = new AuthApiExceptionConverter();
-
         $this->awareAuthResourceUrlBuilder = $tenantId !== null
             ? TenantAwareAuthResourceUrlBuilder::forProjectAndTenant($projectId, $tenantId)
             : ProjectAwareAuthResourceUrlBuilder::forProject($projectId);

src/Firebase/Database/ApiClient.php

@@ -19,13 +19,11 @@
  */
 class ApiClient
 {
-    protected DatabaseApiExceptionConverter $errorHandler;
-
     public function __construct(
         private readonly ClientInterface $client,
         private readonly UrlBuilder $resourceUrlBuilder,
+        private readonly DatabaseApiExceptionConverter $errorHandler,
     ) {
-        $this->errorHandler = new DatabaseApiExceptionConverter();
     }
 
     /**

src/Firebase/Exception/AppCheckApiExceptionConverter.php

@@ -18,11 +18,8 @@
  */
 final class AppCheckApiExceptionConverter
 {
-    private readonly ErrorResponseParser $responseParser;
-
-    public function __construct()
+    public function __construct(private readonly ErrorResponseParser $responseParser)
     {
-        $this->responseParser = new ErrorResponseParser();
     }
 
     public function convertException(Throwable $exception): AppCheckException

src/Firebase/Exception/AuthApiExceptionConverter.php

@@ -32,11 +32,8 @@
  */
 class AuthApiExceptionConverter
 {
-    private readonly ErrorResponseParser $responseParser;
-
-    public function __construct()
+    public function __construct(private readonly ErrorResponseParser $responseParser)
     {
-        $this->responseParser = new ErrorResponseParser();
     }
 
     public function convertException(Throwable $exception): AuthException

src/Firebase/Exception/DatabaseApiExceptionConverter.php

@@ -20,11 +20,8 @@
  */
 class DatabaseApiExceptionConverter
 {
-    private readonly ErrorResponseParser $responseParser;
-
-    public function __construct()
+    public function __construct(private readonly ErrorResponseParser $responseParser)
     {
-        $this->responseParser = new ErrorResponseParser();
     }
 
     public function convertException(Throwable $exception): DatabaseException

src/Firebase/Exception/RemoteConfigApiExceptionConverter.php

@@ -22,11 +22,8 @@
  */
 class RemoteConfigApiExceptionConverter
 {
-    private readonly ErrorResponseParser $responseParser;
-
-    public function __construct()
+    public function __construct(private readonly ErrorResponseParser $responseParser)
     {
-        $this->responseParser = new ErrorResponseParser();
     }
 
     public function convertException(Throwable $exception): RemoteConfigException

src/Firebase/Factory.php

@@ -28,9 +28,14 @@
 use Kreait\Firebase\Auth\CustomTokenViaGoogleCredentials;
 use Kreait\Firebase\Auth\SignIn\GuzzleHandler;
 use Kreait\Firebase\Database\UrlBuilder;
+use Kreait\Firebase\Exception\AppCheckApiExceptionConverter;
+use Kreait\Firebase\Exception\AuthApiExceptionConverter;
+use Kreait\Firebase\Exception\DatabaseApiExceptionConverter;
 use Kreait\Firebase\Exception\InvalidArgumentException;
 use Kreait\Firebase\Exception\MessagingApiExceptionConverter;
+use Kreait\Firebase\Exception\RemoteConfigApiExceptionConverter;
 use Kreait\Firebase\Exception\RuntimeException;
+use Kreait\Firebase\Http\ErrorResponseParser;
 use Kreait\Firebase\Http\HttpClientOptions;
 use Kreait\Firebase\Http\Middleware;
 use Kreait\Firebase\JWT\IdTokenVerifier;
@@ -119,6 +124,8 @@ final class Factory
 
     private HttpClientOptions $httpClientOptions;
 
+    private ErrorResponseParser $errorResponseParser;
+
     /**
      * @var array<non-empty-string, mixed>
      */
@@ -139,6 +146,7 @@ public function __construct()
         $this->defaultCache = new InMemoryCache($this->clock);
         $this->httpFactory = new HttpFactory();
         $this->httpClientOptions = HttpClientOptions::default();
+        $this->errorResponseParser = new ErrorResponseParser();
     }
 
     /**
@@ -375,7 +383,7 @@ public function createAppCheck(): Contract\AppCheck
         );
 
         return new AppCheck(
-            new AppCheck\ApiClient($http),
+            new AppCheck\ApiClient($http, new AppCheckApiExceptionConverter($this->errorResponseParser)),
             new AppCheckTokenGenerator(
                 $serviceAccount->clientEmail,
                 $serviceAccount->privateKey,
@@ -392,7 +400,14 @@ public function createAuth(): Contract\Auth
         $httpClient = $this->createApiClient();
 
         $signInHandler = new GuzzleHandler($projectId, $httpClient);
-        $authApiClient = new ApiClient($projectId, $this->tenantId, $httpClient, $signInHandler, $this->clock);
+        $authApiClient = new ApiClient(
+            $projectId,
+            $this->tenantId,
+            $httpClient,
+            $signInHandler,
+            $this->clock,
+            new AuthApiExceptionConverter($this->errorResponseParser),
+        );
         $customTokenGenerator = $this->createCustomTokenGenerator();
         $idTokenVerifier = $this->createIdTokenVerifier();
         $sessionCookieVerifier = $this->createSessionCookieVerifier();
@@ -413,7 +428,11 @@ public function createDatabase(): Contract\Database
 
         return new Database(
             GuzzleUtils::uriFor($databaseUrl),
-            new Database\ApiClient($http, $resourceUrlBuilder),
+            new Database\ApiClient(
+                $http,
+                $resourceUrlBuilder,
+                new DatabaseApiExceptionConverter($this->errorResponseParser),
+            ),
         );
     }
 
@@ -423,7 +442,13 @@ public function createRemoteConfig(): Contract\RemoteConfig
             'base_uri' => "https://firebaseremoteconfig.googleapis.com/v1/projects/{$this->getProjectId()}/remoteConfig",
         ]);
 
-        return new RemoteConfig(new RemoteConfig\ApiClient($this->getProjectId(), $http));
+        return new RemoteConfig(
+            new RemoteConfig\ApiClient(
+                $this->getProjectId(),
+                $http,
+                new RemoteConfigApiExceptionConverter($this->errorResponseParser),
+            ),
+        );
     }
 
     public function createMessaging(): Contract\Messaging

src/Firebase/RemoteConfig/ApiClient.php

@@ -18,14 +18,14 @@
  */
 class ApiClient
 {
-    private readonly RemoteConfigApiExceptionConverter $errorHandler;
-
     private readonly string $baseUri;
 
-    public function __construct(string $projectId, private readonly ClientInterface $client)
-    {
+    public function __construct(
+        string $projectId,
+        private readonly ClientInterface $client,
+        private readonly RemoteConfigApiExceptionConverter $errorHandler,
+    ) {
         $this->baseUri = "https://firebaseremoteconfig.googleapis.com/v1/projects/{$projectId}/remoteConfig";
-        $this->errorHandler = new RemoteConfigApiExceptionConverter();
     }
 
     /**

tests/Unit/Exception/AppCheckApiExceptionConverterTest.php

@@ -14,6 +14,7 @@
 use Kreait\Firebase\Exception\AppCheck\AppCheckError;
 use Kreait\Firebase\Exception\AppCheck\PermissionDenied;
 use Kreait\Firebase\Exception\AppCheckApiExceptionConverter;
+use Kreait\Firebase\Http\ErrorResponseParser;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
@@ -30,7 +31,7 @@ final class AppCheckApiExceptionConverterTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->converter = new AppCheckApiExceptionConverter();
+        $this->converter = new AppCheckApiExceptionConverter(new ErrorResponseParser());
     }
 
     #[Test]