From 43300af962f699fd85e09f852205fa2b6c94aae5 Mon Sep 17 00:00:00 2001 From: Oliver THEBAULT Date: Mon, 18 Feb 2019 19:57:47 +0100 Subject: [PATCH 1/2] fix missing $config variable --- DependencyInjection/LexikJWTAuthenticationExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DependencyInjection/LexikJWTAuthenticationExtension.php b/DependencyInjection/LexikJWTAuthenticationExtension.php index ba8dde6e..4cbd4b8e 100644 --- a/DependencyInjection/LexikJWTAuthenticationExtension.php +++ b/DependencyInjection/LexikJWTAuthenticationExtension.php @@ -52,7 +52,7 @@ public function load(array $configs, ContainerBuilder $container) $container->setParameter('lexik_jwt_authentication.public_key_path', $config['public_key']); } - if (empty($config['public_key']) && empty(['secret_key'])) { + if (empty($config['public_key']) && empty($config['secret_key'])) { throw new InvalidConfigurationException('You must either configure a "public_key" or a "secret_key".', 'lexik_jwt_authentication'); } From d05b54d7ef4e80255084b76c235ab963b616666a Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Mon, 18 Feb 2019 20:45:44 +0100 Subject: [PATCH 2/2] fix test --- DependencyInjection/LexikJWTAuthenticationExtension.php | 6 +++++- .../LexikJWTAuthenticationExtensionTest.php | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/DependencyInjection/LexikJWTAuthenticationExtension.php b/DependencyInjection/LexikJWTAuthenticationExtension.php index 4cbd4b8e..01f27bb3 100644 --- a/DependencyInjection/LexikJWTAuthenticationExtension.php +++ b/DependencyInjection/LexikJWTAuthenticationExtension.php @@ -53,7 +53,11 @@ public function load(array $configs, ContainerBuilder $container) } if (empty($config['public_key']) && empty($config['secret_key'])) { - throw new InvalidConfigurationException('You must either configure a "public_key" or a "secret_key".', 'lexik_jwt_authentication'); + $e = new InvalidConfigurationException('You must either configure a "public_key" or a "secret_key".'); + $e->setPath('lexik_jwt_authentication'); + + throw $e; + } $container->setParameter('lexik_jwt_authentication.pass_phrase', $config['pass_phrase']); diff --git a/Tests/DependencyInjection/LexikJWTAuthenticationExtensionTest.php b/Tests/DependencyInjection/LexikJWTAuthenticationExtensionTest.php index 26168a64..69b39da3 100644 --- a/Tests/DependencyInjection/LexikJWTAuthenticationExtensionTest.php +++ b/Tests/DependencyInjection/LexikJWTAuthenticationExtensionTest.php @@ -74,7 +74,7 @@ public function testDeprecatedDefaultEncoderService() public function testTokenExtractorsConfiguration() { // Default configuration - $chainTokenExtractor = $this->getContainer()->getDefinition('lexik_jwt_authentication.extractor.chain_extractor'); + $chainTokenExtractor = $this->getContainer(['secret_key' => 'private.pem', 'public_key' => 'public.pem'])->getDefinition('lexik_jwt_authentication.extractor.chain_extractor'); $extractorIds = array_map('strval', $chainTokenExtractor->getArgument(0)); @@ -83,7 +83,7 @@ public function testTokenExtractorsConfiguration() $this->assertNotContains('lexik_jwt_authentication.extractor.query_parameter_extractor', $extractorIds); // Custom configuration - $chainTokenExtractor = $this->getContainer(['token_extractors' => ['authorization_header' => true, 'cookie' => true]]) + $chainTokenExtractor = $this->getContainer(['secret_key' => 'private.pem', 'public_key' => 'public.pem', 'token_extractors' => ['authorization_header' => true, 'cookie' => true]]) ->getDefinition('lexik_jwt_authentication.extractor.chain_extractor'); $extractorIds = array_map('strval', $chainTokenExtractor->getArgument(0));