@@ -12,7 +12,6 @@ |
||
| 12 | 12 | namespace Gesdinet\JWTRefreshTokenBundle\EventListener; |
| 13 | 13 | |
| 14 | 14 | use Gesdinet\JWTRefreshTokenBundle\Model\RefreshTokenManagerInterface; |
| 15 | -use Gesdinet\JWTRefreshTokenBundle\Entity\RefreshToken; |
|
| 16 | 15 | use Gesdinet\JWTRefreshTokenBundle\NameGenerator\NameGeneratorInterface; |
| 17 | 16 | use Gesdinet\JWTRefreshTokenBundle\Request\RequestRefreshToken; |
| 18 | 17 | use Lexik\Bundle\JWTAuthenticationBundle\Event\AuthenticationSuccessEvent; |
@@ -56,6 +56,6 @@ |
||
| 56 | 56 | |
| 57 | 57 | // Method under test |
| 58 | 58 | $this->generateName('refreshToken') |
| 59 | - ->shouldReturn('refresh_token'); |
|
| 59 | + ->shouldReturn('refresh_token'); |
|
| 60 | 60 | } |
| 61 | 61 | } |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | $event->getData()->willReturn(array()); |
| 36 | 36 | $event->getUser()->willReturn($user); |
| 37 | 37 | $nameGenerator->generateName('refresh_token') |
| 38 | - ->willReturn('refresh_token'); |
|
| 38 | + ->willReturn('refresh_token'); |
|
| 39 | 39 | |
| 40 | 40 | $refreshTokenArray = array('refresh_token' => 'thepreviouslyissuedrefreshtoken'); |
| 41 | 41 | $headers = new HeaderBag(array('content_type' => 'not-json')); |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $event->getData()->willReturn(array()); |
| 92 | 92 | $event->getUser()->willReturn($user); |
| 93 | 93 | $nameGenerator->generateName('refresh_token') |
| 94 | - ->willReturn('refreshToken'); |
|
| 94 | + ->willReturn('refreshToken'); |
|
| 95 | 95 | |
| 96 | 96 | $refreshTokenArray = array('refreshToken' => 'thepreviouslyissuedrefreshtoken'); |
| 97 | 97 | $headers = new HeaderBag(array('content_type' => 'not-json')); |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | // Method under test |
| 35 | 35 | $this->generateName('refresh_token') |
| 36 | - ->shouldReturn('refreshToken'); |
|
| 36 | + ->shouldReturn('refreshToken'); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | public function it_should_return_underscored_values_from_camel_case() |
@@ -42,6 +42,6 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | // Method under test |
| 44 | 44 | $this->generateName('refreshToken') |
| 45 | - ->shouldReturn('refreshToken'); |
|
| 45 | + ->shouldReturn('refreshToken'); |
|
| 46 | 46 | } |
| 47 | 47 | } |
@@ -51,6 +51,9 @@ discard block |
||
| 51 | 51 | $this->requestRefreshToken = $requestRefreshToken; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | + /** |
|
| 55 | + * @param string $providerKey |
|
| 56 | + */ |
|
| 54 | 57 | public function createToken(Request $request, $providerKey) |
| 55 | 58 | { |
| 56 | 59 | $refreshTokenString = $this->requestRefreshToken->getRefreshToken($request); |
@@ -62,6 +65,9 @@ discard block |
||
| 62 | 65 | ); |
| 63 | 66 | } |
| 64 | 67 | |
| 68 | + /** |
|
| 69 | + * @param string $providerKey |
|
| 70 | + */ |
|
| 65 | 71 | public function authenticateToken(TokenInterface $token, UserProviderInterface $userProvider, $providerKey) |
| 66 | 72 | { |
| 67 | 73 | if (!$userProvider instanceof RefreshTokenProvider) { |
@@ -12,9 +12,9 @@ discard block |
||
| 12 | 12 | public function let(ContainerBuilder $container) |
| 13 | 13 | { |
| 14 | 14 | $container->fileExists(dirname(dirname(__DIR__)).'/DependencyInjection/../Resources/config/services.yml') |
| 15 | - ->willReturn(true); |
|
| 15 | + ->willReturn(true); |
|
| 16 | 16 | $container->has('gesdinet.jwtrefreshtoken.name_generator.underscore') |
| 17 | - ->willReturn(true); |
|
| 17 | + ->willReturn(true); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | public function it_is_initializable() |
@@ -26,25 +26,25 @@ discard block |
||
| 26 | 26 | { |
| 27 | 27 | // setParameter calls with default values |
| 28 | 28 | $container->setParameter('gesdinet_jwt_refresh_token.ttl', 2592000) |
| 29 | - ->shouldBeCalled(); |
|
| 29 | + ->shouldBeCalled(); |
|
| 30 | 30 | $container->setParameter('gesdinet_jwt_refresh_token.ttl_update', false) |
| 31 | - ->shouldBeCalled(); |
|
| 31 | + ->shouldBeCalled(); |
|
| 32 | 32 | $container->setParameter('gesdinet_jwt_refresh_token.security.firewall', 'api') |
| 33 | - ->shouldBeCalled(); |
|
| 33 | + ->shouldBeCalled(); |
|
| 34 | 34 | $container->setParameter('gesdinet_jwt_refresh_token.user_provider', null) |
| 35 | - ->shouldBeCalled(); |
|
| 35 | + ->shouldBeCalled(); |
|
| 36 | 36 | $container->setParameter('gesdinet.jwtrefreshtoken.refresh_token.class', 'Gesdinet\JWTRefreshTokenBundle\Entity\RefreshToken') |
| 37 | - ->shouldBeCalled(); |
|
| 37 | + ->shouldBeCalled(); |
|
| 38 | 38 | $container->setParameter('gesdinet.jwtrefreshtoken.entity_manager.id', 'doctrine.orm.entity_manager') |
| 39 | - ->shouldBeCalled(); |
|
| 39 | + ->shouldBeCalled(); |
|
| 40 | 40 | |
| 41 | 41 | // Ignore these calls |
| 42 | 42 | $container->has(Argument::cetera()) |
| 43 | - ->willReturn(); |
|
| 43 | + ->willReturn(); |
|
| 44 | 44 | $container->setDefinition(Argument::cetera()) |
| 45 | - ->willReturn(); |
|
| 45 | + ->willReturn(); |
|
| 46 | 46 | $container->setAlias(Argument::cetera()) |
| 47 | - ->willReturn(); |
|
| 47 | + ->willReturn(); |
|
| 48 | 48 | |
| 49 | 49 | $configs = array(); |
| 50 | 50 | $this->load($configs, $container); |
@@ -56,13 +56,13 @@ discard block |
||
| 56 | 56 | 'gesdinet.jwtrefreshtoken.name_generator.default', |
| 57 | 57 | Argument::exact(new Alias('gesdinet.jwtrefreshtoken.name_generator.underscore')) |
| 58 | 58 | ) |
| 59 | - ->shouldBeCalled(); |
|
| 59 | + ->shouldBeCalled(); |
|
| 60 | 60 | |
| 61 | 61 | // Ignore these calls |
| 62 | 62 | $container->setParameter(Argument::cetera()) |
| 63 | - ->willReturn(); |
|
| 63 | + ->willReturn(); |
|
| 64 | 64 | $container->setDefinition(Argument::cetera()) |
| 65 | - ->willReturn(); |
|
| 65 | + ->willReturn(); |
|
| 66 | 66 | |
| 67 | 67 | $configs = array(); |
| 68 | 68 | $this->load($configs, $container); |
@@ -72,38 +72,38 @@ discard block |
||
| 72 | 72 | ContainerBuilder $container |
| 73 | 73 | ) { |
| 74 | 74 | $container->has('some.service.name') |
| 75 | - ->willReturn(false); |
|
| 75 | + ->willReturn(false); |
|
| 76 | 76 | |
| 77 | 77 | // Ignore these calls |
| 78 | 78 | $container->setParameter(Argument::cetera()) |
| 79 | - ->willReturn(); |
|
| 79 | + ->willReturn(); |
|
| 80 | 80 | $container->setDefinition(Argument::cetera()) |
| 81 | - ->willReturn(); |
|
| 81 | + ->willReturn(); |
|
| 82 | 82 | $container->setAlias(Argument::cetera()) |
| 83 | - ->willReturn(); |
|
| 83 | + ->willReturn(); |
|
| 84 | 84 | |
| 85 | 85 | $configs = array(array('parameter_name_generator' => 'some.service.name')); |
| 86 | 86 | $this->shouldThrow('\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException') |
| 87 | - ->during('load', array($configs, $container)); |
|
| 87 | + ->during('load', array($configs, $container)); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | public function it_should_configure_a_custom_name_generator(ContainerBuilder $container) |
| 91 | 91 | { |
| 92 | 92 | // Expectations |
| 93 | 93 | $container->setAlias('gesdinet.jwtrefreshtoken.name_generator.default', 'some.service.name') |
| 94 | - ->shouldBeCalled(); |
|
| 94 | + ->shouldBeCalled(); |
|
| 95 | 95 | |
| 96 | 96 | // Stubs |
| 97 | 97 | $container->has('some.service.name') |
| 98 | - ->willReturn(true); |
|
| 98 | + ->willReturn(true); |
|
| 99 | 99 | |
| 100 | 100 | // Ignore these calls |
| 101 | 101 | $container->setParameter(Argument::cetera()) |
| 102 | - ->willReturn(); |
|
| 102 | + ->willReturn(); |
|
| 103 | 103 | $container->setDefinition(Argument::cetera()) |
| 104 | - ->willReturn(); |
|
| 104 | + ->willReturn(); |
|
| 105 | 105 | $container->setAlias(Argument::cetera()) |
| 106 | - ->willReturn(); |
|
| 106 | + ->willReturn(); |
|
| 107 | 107 | |
| 108 | 108 | $configs = array(array('parameter_name_generator' => 'some.service.name')); |
| 109 | 109 | $this->load($configs, $container); |