SUPPORT-91253: code review fix

paysera · Mar 4, 2024 · 1eaf778 · 1eaf778
1 parent b4c6fd6
commit 1eaf778
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/src/Listener/BearerListener.php b/src/Listener/BearerListener.php
@@ -6,7 +6,7 @@
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\HeaderBag;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\KernelEvent;
 use Symfony\Component\Security\Http\Firewall\ListenerInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Paysera\BearerAuthenticationBundle\Security\Token\BearerToken;
@@ -35,7 +35,7 @@ public function __construct(
         $this->logger = $logger;
     }
 
-    public function handle(GetResponseEvent $event): void
+    public function handle(KernelEvent $event): void
     {
         $request = $event->getRequest();
         $this->fixAuthHeader($request->headers);

diff --git a/src/PayseraBearerAuthenticationBundle.php b/src/PayseraBearerAuthenticationBundle.php
@@ -16,7 +16,13 @@ public function build(ContainerBuilder $container): void
         parent::build($container);
 
         $extension = $container->getExtension('security');
-        $extension->addAuthenticatorFactory(new BearerFactory());
+        if (method_exists($extension, 'addAuthenticatorFactory')) {
+            $extension->addAuthenticatorFactory(new BearerFactory());
+        }
+
+        if (method_exists($extension, 'addSecurityListenerFactory')) {
+            $extension->addSecurityListenerFactory(new BearerFactory());
+        }
 
         $container->addCompilerPass(new AddTaggedCompilerPass(
             'paysera_bearer_authentication.security_user.bearer_user_provider',

diff --git a/src/Security/Token/BearerTokenInterface.php → ...entication/Token/BearerTokenInterface.php b/src/Security/Token/BearerTokenInterface.php → ...entication/Token/BearerTokenInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Paysera\BearerAuthenticationBundle\Security\Token;
+namespace Paysera\BearerAuthenticationBundle\Security\Authentication\Token;
 
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 

diff --git a/src/Security/Provider/BearerProvider.php b/src/Security/Provider/BearerProvider.php
@@ -5,7 +5,7 @@
 namespace Paysera\BearerAuthenticationBundle\Security\Provider;
 
 use Paysera\BearerAuthenticationBundle\Entity\BearerUserInterface;
-use Paysera\BearerAuthenticationBundle\Security\Token\BearerTokenInterface;
+use Paysera\BearerAuthenticationBundle\Security\Authentication\Token\BearerTokenInterface;
 use Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;

diff --git a/src/Security/Token/BearerToken.php b/src/Security/Token/BearerToken.php
@@ -4,6 +4,7 @@
 
 namespace Paysera\BearerAuthenticationBundle\Security\Token;
 
+use Paysera\BearerAuthenticationBundle\Security\Authentication\Token\BearerTokenInterface;
 use Symfony\Component\Security\Core\Authentication\Token\AbstractToken;
 
 class BearerToken extends AbstractToken implements BearerTokenInterface