Merge pull request #342 from cultuurnet/III-6521-remove-unneeded-logging

Author: JonasVHG

src/Http/Authentication/Access/CultureFeedConsumerResolver.php

@@ -30,8 +30,7 @@ public function getStatus(string $apiKey): string
             /** @var CultureFeed_Consumer $cultureFeedConsumer */
             $cultureFeedConsumer = $this->cultureFeed->getServiceConsumerByApiKey($apiKey, true);
         } catch (Exception $exception) {
-            $this->logger->error($exception->getMessage());
-            return 'INVALID';
+            throw new InvalidConsumer();
         }
         return $cultureFeedConsumer->status;
     }

src/Http/Authentication/Access/InvalidConsumer.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CultuurNet\UDB3\Search\Http\Authentication\Access;
+
+final class InvalidConsumer extends \Exception
+{
+}

src/Http/Authentication/AuthenticateRequest.php

@@ -7,6 +7,7 @@
 use CultuurNet\UDB3\Search\Http\Authentication\Access\ConsumerResolver;
 use CultuurNet\UDB3\Search\Http\Authentication\Access\ClientIdResolver;
 use CultuurNet\UDB3\Search\Http\Authentication\Access\InvalidClient;
+use CultuurNet\UDB3\Search\Http\Authentication\Access\InvalidConsumer;
 use CultuurNet\UDB3\Search\Http\Authentication\ApiProblems\BlockedApiKey;
 use CultuurNet\UDB3\Search\Http\Authentication\ApiProblems\InvalidApiKey;
 use CultuurNet\UDB3\Search\Http\Authentication\ApiProblems\InvalidClientId;
@@ -151,9 +152,9 @@ private function handleApiKey(
         RequestHandlerInterface $handler,
         string $apiKey
     ): ResponseInterface {
-        $status = $this->consumerResolver->getStatus($apiKey);
-
-        if ($status === 'INVALID') {
+        try {
+            $status = $this->consumerResolver->getStatus($apiKey);
+        } catch (InvalidConsumer $invalidConsumer) {
             return (new InvalidApiKey($apiKey))->toResponse();
         }
 

tests/Http/Authentication/Access/CultureFeedConsumerResolverTest.php

@@ -34,11 +34,9 @@ public function it_handles_invalid_api_keys(): void
             ->method('getServiceConsumerByApiKey')
             ->with('my_invalid_api_key', true)
             ->willThrowException(new Exception('Invalid API key'));
+        $this->expectException(InvalidConsumer::class);
 
-        $this->assertEquals(
-            'INVALID',
-            $this->consumerResolver->getStatus('my_invalid_api_key')
-        );
+        $this->consumerResolver->getStatus('my_invalid_api_key');
     }
 
     /**

tests/Http/Authentication/AuthenticateRequestTest.php

@@ -8,6 +8,7 @@
 use CultuurNet\UDB3\Search\FileReader;
 use CultuurNet\UDB3\Search\Http\Authentication\Access\ConsumerResolver;
 use CultuurNet\UDB3\Search\Http\Authentication\Access\ClientIdResolver;
+use CultuurNet\UDB3\Search\Http\Authentication\Access\InvalidConsumer;
 use CultuurNet\UDB3\Search\Http\Authentication\ApiProblems\BlockedApiKey;
 use CultuurNet\UDB3\Search\Http\Authentication\ApiProblems\InvalidApiKey;
 use CultuurNet\UDB3\Search\Http\Authentication\ApiProblems\InvalidToken;
@@ -140,7 +141,7 @@ public function it_handles_invalid_api_keys(): void
         $this->consumerResolver->expects($this->once())
             ->method('getStatus')
             ->with('my_invalid_api_key')
-            ->willReturn('INVALID');
+            ->willThrowException(new InvalidConsumer());
 
         $response = $this->authenticateRequest->process(
             (new ServerRequestFactory())