✨ add logs to API controllers

swagindustries · Oct 12, 2024 · 1c2e1fc · 1c2e1fc
1 parent fe327a5
commit 1c2e1fc
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/lib/amphp/http-server-router/src/Router.php b/lib/amphp/http-server-router/src/Router.php
@@ -76,6 +76,8 @@ public function handleRequest(Request $request): Response
         $method = $request->getMethod();
         $path = $request->getUri()->getPath();
 
+        $this->logger->debug('[Router] Matching path: "' . $path . '" with method '.$method);
+
         $toMatch = "{$method}\0{$path}";
 
         if (null === $match = $this->cache->get($toMatch)) {

diff --git a/src/Controller/Subscription/GetSubscriptionController.php b/src/Controller/Subscription/GetSubscriptionController.php
@@ -16,6 +16,8 @@
 use Amp\Http\Server\RequestHandler;
 use Amp\Http\Server\Response;
 use Amp\Http\Server\Router;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use SwagIndustries\MercureRouter\Controller\NotFoundController;
 use SwagIndustries\MercureRouter\Mercure\Hub;
 use SwagIndustries\MercureRouter\Security\Security;
@@ -24,10 +26,15 @@ class GetSubscriptionController implements RequestHandler
 {
     use SubscriptionNormalizerTrait;
     use SubscriptionApiResponseTrait;
-    public function __construct(private Hub $mercure, private NotFoundController $notFound) {}
+    public function __construct(
+        private Hub $mercure,
+        private NotFoundController $notFound,
+        private LoggerInterface $logger = new NullLogger()
+    ) {}
     public function handleRequest(Request $request): Response
     {
         ['topic' => $topicQuery, 'subscriber' => $subscriberId] = $request->getAttribute(Router::class);
+        $this->logger->debug('[API] Get subscriptions for topic "' . $topicQuery . '" and subscriber "' . $subscriberId . '"');
 
         /** @var array{subscribe: array|string|null, payload?: array} $jwtContent */
         $jwtContent = $request->getAttribute(Security::ATTRIBUTE_JWT_PAYLOAD)['mercure'] ?? [];
@@ -36,9 +43,7 @@ public function handleRequest(Request $request): Response
         $validPaths = [
             Hub::MERCURE_PATH . '/subscriptions{/topic}{/subscriber}',
         ];
-        dump($allowedTopics);
-        dump($validPaths);
-        dump(array_intersect($validPaths, $allowedTopics));
+
         if (empty(array_intersect($validPaths, $allowedTopics))) {
             return $this->forbiddenApiResponse();
         }

diff --git a/src/Controller/Subscription/GetSubscriptionsController.php b/src/Controller/Subscription/GetSubscriptionsController.php
@@ -15,6 +15,8 @@
 use Amp\Http\Server\Request;
 use Amp\Http\Server\RequestHandler;
 use Amp\Http\Server\Response;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use SwagIndustries\MercureRouter\Controller\NotFoundController;
 use SwagIndustries\MercureRouter\Mercure\Hub;
 use SwagIndustries\MercureRouter\Security\Security;
@@ -23,9 +25,14 @@ class GetSubscriptionsController implements RequestHandler
 {
     use SubscriptionNormalizerTrait;
     use SubscriptionApiResponseTrait;
-    public function __construct(private Hub $mercure, private NotFoundController $notFound) {}
+    public function __construct(
+        private Hub $mercure,
+        private NotFoundController $notFound,
+        private LoggerInterface $logger = new NullLogger()
+    ) {}
     public function handleRequest(Request $request): Response
     {
+        $this->logger->debug('[API] Get all subscriptions');
         /** @var array{subscribe: array|string|null, payload?: array} $jwtContent */
         $jwtContent = $request->getAttribute(Security::ATTRIBUTE_JWT_PAYLOAD)['mercure'] ?? [];
         $allowedTopics = (array) ($jwtContent['subscribe'] ?? []);

diff --git a/src/Controller/Subscription/GetTopicSubscriptionsController.php b/src/Controller/Subscription/GetTopicSubscriptionsController.php
@@ -16,6 +16,8 @@
 use Amp\Http\Server\RequestHandler;
 use Amp\Http\Server\Response;
 use Amp\Http\Server\Router;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use SwagIndustries\MercureRouter\Controller\NotFoundController;
 use SwagIndustries\MercureRouter\Mercure\Hub;
 use SwagIndustries\MercureRouter\Security\Security;
@@ -24,10 +26,15 @@ class GetTopicSubscriptionsController implements RequestHandler
 {
     use SubscriptionNormalizerTrait;
     use SubscriptionApiResponseTrait;
-    public function __construct(private Hub $mercure, private NotFoundController $notFound) {}
+    public function __construct(
+        private Hub $mercure,
+        private NotFoundController $notFound,
+        private LoggerInterface $logger = new NullLogger()
+    ) {}
     public function handleRequest(Request $request): Response
     {
         ['topic' => $topicQuery] = $request->getAttribute(Router::class);
+        $this->logger->debug('[API] Get topic subscriptions for topic "' . $topicQuery . '"');
 
         /** @var array{subscribe: array|string|null, payload?: array} $jwtContent */
         $jwtContent = $request->getAttribute(Security::ATTRIBUTE_JWT_PAYLOAD)['mercure'] ?? [];