Use psr7-pack to get Flex recipes.

Author: vuongxuongminh

composer.json

@@ -15,9 +15,8 @@
   "minimum-stability": "stable",
   "require": {
     "php": ">=8.0",
-    "nyholm/psr7": "^1.4",
     "php-istio/jwt-payload-extractor": "^1.0",
-    "symfony/psr-http-message-bridge": "^2.1",
+    "symfony/psr7-pack": "^1.0",
     "symfony/security-bundle": "^5.3"
   },
   "autoload": {

src/Authenticator/Authenticator.php

@@ -11,9 +11,7 @@
 namespace Istio\Symfony\JWTAuthentication\Authenticator;
 
 use Istio\Symfony\JWTAuthentication\User\JWTPayloadAwareUserProviderInterface;
-use Nyholm\Psr7\Factory\Psr17Factory;
-use Psr\Http\Message\ServerRequestInterface;
-use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
+use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
@@ -29,13 +27,14 @@ final class Authenticator extends AbstractAuthenticator implements Authenticatio
 {
     public function __construct(
         private iterable $userIdentifierClaimMappings,
-        private UserProviderInterface $userProvider
+        private UserProviderInterface $userProvider,
+        private HttpMessageFactoryInterface $httpMessageFactory
     ) {
     }
 
     public function supports(Request $request): ?bool
     {
-        $psr7Request = $this->normalizeRequest($request);
+        $psr7Request = $this->httpMessageFactory->createRequest($request);
 
         foreach ($this->userIdentifierClaimMappings as $mapping) {
             /** @var UserIdentifierClaimMapping $mapping */
@@ -103,12 +102,4 @@ public function start(Request $request, AuthenticationException $authException =
     {
         return new Response('Istio JWT in request\'s missing or invalid.', Response::HTTP_UNAUTHORIZED);
     }
-
-    private function normalizeRequest(Request $request): ServerRequestInterface
-    {
-        $psr17Factory = new Psr17Factory();
-        $psrHttpFactory = new PsrHttpFactory($psr17Factory, $psr17Factory, $psr17Factory, $psr17Factory);
-
-        return $psrHttpFactory->createRequest($request);
-    }
 }

src/Resources/config/security.php

@@ -12,13 +12,15 @@
 
 use Istio\Symfony\JWTAuthentication\Authenticator\Authenticator;
 use Istio\Symfony\JWTAuthentication\User\StatelessUserProvider;
+use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 
 return static function (ContainerConfigurator $container) {
     $container->services()
         ->set('istio.jwt_authentication.authenticator', Authenticator::class)
         ->abstract()
             ->arg(0, abstract_arg('user identifier claim mappings'))
             ->arg(1, abstract_arg('user provider'))
+            ->arg(2, service(HttpMessageFactoryInterface::class))
 
         ->set('istio.jwt_authentication.stateless_user_provider', StatelessUserProvider::class)
         ->abstract()

tests/TestKernel.php

@@ -13,11 +13,15 @@
 use Istio\Symfony\JWTAuthentication\JWTAuthenticationBundle;
 use Istio\Symfony\JWTAuthentication\Tests\Fixtures\SecureController;
 use Istio\Symfony\JWTAuthentication\Tests\Fixtures\StatelessUser;
+use Nyholm\Psr7\Factory\Psr17Factory;
+use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
+use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter;
 
@@ -130,16 +134,10 @@ private function publicServices(ContainerBuilder $container)
         $container->getDefinition('security.authenticator.manager.test2')->setPublic(true);
     }
 
-    protected function build(ContainerBuilder $container)
-    {
-        parent::build($container);
-
-        $this->registerFixtures($container);
-    }
-
     public function process(ContainerBuilder $container)
     {
         $this->publicServices($container);
+        $this->registerFixtures($container);
     }
 
     private function registerFixtures(ContainerBuilder $container)
@@ -148,5 +146,12 @@ private function registerFixtures(ContainerBuilder $container)
             ->register('secure_controller', SecureController::class)
             ->setPublic(true)
             ->addTag('controller.service_arguments');
+
+        $container->register(Psr17Factory::class, Psr17Factory::class);
+
+        $psr17Factory = new Reference(Psr17Factory::class);
+        $container
+            ->register(HttpMessageFactoryInterface::class, PsrHttpFactory::class)
+            ->setArguments([$psr17Factory, $psr17Factory, $psr17Factory, $psr17Factory]);
     }
 }

tests/Unit/Authenticator/AuthenticatorTest.php

@@ -15,7 +15,9 @@
 use Istio\Symfony\JWTAuthentication\Authenticator\UserIdentifierClaimMapping;
 use Istio\Symfony\JWTAuthentication\Tests\Fixtures\TokenTrait;
 use Istio\Symfony\JWTAuthentication\User\JWTPayloadAwareUserProviderInterface;
+use Nyholm\Psr7\Factory\Psr17Factory;
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\User\InMemoryUser;
 use Symfony\Component\Security\Core\User\InMemoryUserProvider;
@@ -210,7 +212,10 @@ private function createAuthenticatorWithInMemoryUserProvider(array $users): Auth
 
     private function createAuthenticator(UserProviderInterface $userProvider): Authenticator
     {
-        return new Authenticator($this->getUserIdentifierClaimMappings(), $userProvider);
+        $psr17Factory = new Psr17Factory();
+        $psrHttpFactory = new PsrHttpFactory($psr17Factory, $psr17Factory, $psr17Factory, $psr17Factory);
+
+        return new Authenticator($this->getUserIdentifierClaimMappings(), $userProvider, $psrHttpFactory);
     }
 
     private function getUserIdentifierClaimMappings(): array