(refactor): pass apiType param to endpoint constructor instead of defining per endpoint class

Author: Mike van den Hoek

src/Contracts/AbstractClient.php

@@ -6,11 +6,11 @@
 
 use InvalidArgumentException;
 use OWC\Zaaksysteem\Endpoints\Endpoint;
+use function OWC\Zaaksysteem\Foundation\Helpers\resolve;
 use OWC\Zaaksysteem\Http\Errors\ResourceNotFoundError;
 use OWC\Zaaksysteem\Http\Errors\ServerError;
-use OWC\Zaaksysteem\Http\RequestClientInterface;
 
-use function OWC\Zaaksysteem\Foundation\Helpers\resolve;
+use OWC\Zaaksysteem\Http\RequestClientInterface;
 use function Yard\DigiD\Foundation\Helpers\config;
 
 abstract class AbstractClient implements Client
@@ -92,7 +92,7 @@ protected function fetchFromContainer(string $key): Endpoint
 
             $this->setClientSecretByType($type);
 
-            $endpoint = new $class($this, $this->getEndpointUrlByType($type));
+            $endpoint = new $class($this, $this->getEndpointUrlByType($type), $type);
             $this->container[$key] = $endpoint;
         }
 

src/Endpoints/Endpoint.php

@@ -22,16 +22,18 @@ abstract class Endpoint
 
     protected Client $client;
     protected string $endpointURL = '';
+    protected string $apiType = '';
     protected RequestClientInterface $httpClient;
     protected TokenAuthenticator $authenticator;
     protected Stack $responseHandlers;
 
     protected string $entityClass = Entity::class;
 
-    public function __construct(Client $client, string $endpointURL)
+    public function __construct(Client $client, string $endpointURL, string $apiType)
     {
         $this->client = $client;
         $this->endpointURL = $endpointURL;
+        $this->apiType = $apiType;
         $this->httpClient = $client->getRequestClient();
         $this->authenticator = $client->getAuthenticator();
         $this->responseHandlers = Stack::create();
@@ -50,7 +52,7 @@ protected function buildRequestOptions(): RequestOptions
     {
         return new RequestOptions([
             'headers' => [
-                'Authorization' => $this->apiType !== 'taken' ? $this->authenticator->getAuthString() : $this->authenticator->getApiKeyMijnTaken(),
+                'Authorization' => 'taken' === $this->apiType ? $this->authenticator->getApiKeyMijnTaken() : $this->authenticator->getAuthString(),
             ],
         ]);
     }
@@ -72,7 +74,7 @@ protected function buildUriWithExpand(string $uri, ?Filter\AbstractFilter $filte
 
         if ($this->endpointSupportsExpand() && $this->expandIsEnabled()) {
             $uri = add_query_arg([
-                'expand' => implode(',', $this->getExpandableResources())
+                'expand' => implode(',', $this->getExpandableResources()),
             ], $uri);
         }
 

src/Endpoints/TakenEndpoint.php

@@ -9,7 +9,7 @@
 
 class TakenEndpoint extends Endpoint
 {
-    protected string $apiType = 'taken';
+    // protected string $apiType = 'taken';
     protected string $endpoint = 'taken';
     protected string $entityClass = Taak::class;
 

src/Endpoints/ZakenEndpoint.php

@@ -4,17 +4,16 @@
 
 namespace OWC\Zaaksysteem\Endpoints;
 
-use OWC\Zaaksysteem\Http\Response;
-use OWC\Zaaksysteem\Entities\Zaak;
 use OWC\Zaaksysteem\Entities\Entity;
 use OWC\Zaaksysteem\Entities\Status;
+use OWC\Zaaksysteem\Entities\Zaak;
+use OWC\Zaaksysteem\Http\Response;
+use OWC\Zaaksysteem\Resolvers\ContainerResolver;
 use OWC\Zaaksysteem\Support\Collection;
 use OWC\Zaaksysteem\Support\PagedCollection;
-use OWC\Zaaksysteem\Resolvers\ContainerResolver;
 
 class ZakenEndpoint extends Endpoint
 {
-    protected string $apiType = 'zaken';
     protected string $endpoint = 'zaken';
     protected string $entityClass = Zaak::class;