@@ -113,7 +113,7 @@ |
||
| 113 | 113 | /** |
| 114 | 114 | * Get valid. |
| 115 | 115 | * |
| 116 | - * @return \DateTime |
|
| 116 | + * @return string |
|
| 117 | 117 | */ |
| 118 | 118 | public function getValid() |
| 119 | 119 | { |
@@ -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; |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | /** |
| 59 | 59 | * Set username. |
| 60 | 60 | * |
| 61 | - * @param $username |
|
| 61 | + * @param string $username |
|
| 62 | 62 | * |
| 63 | 63 | * @return self |
| 64 | 64 | */ |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | /** |
| 68 | 68 | * Get user. |
| 69 | 69 | * |
| 70 | - * @return $username |
|
| 70 | + * @return string |
|
| 71 | 71 | */ |
| 72 | 72 | public function getUsername(); |
| 73 | 73 | |
@@ -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) { |
@@ -17,31 +17,31 @@ discard block |
||
| 17 | 17 | public function it_should_set_parameters_correctly(ContainerBuilder $container) |
| 18 | 18 | { |
| 19 | 19 | $container->fileExists(dirname(dirname(__DIR__)).'/DependencyInjection/../Resources/config/services.yml') |
| 20 | - ->willReturn(true); |
|
| 20 | + ->willReturn(true); |
|
| 21 | 21 | $container->has('gesdinet.jwtrefreshtoken.name_generator.underscore') |
| 22 | - ->willReturn(true); |
|
| 22 | + ->willReturn(true); |
|
| 23 | 23 | |
| 24 | 24 | // setParameter calls with default values |
| 25 | 25 | $container->setParameter('gesdinet_jwt_refresh_token.ttl', 2592000) |
| 26 | - ->shouldBeCalled(); |
|
| 26 | + ->shouldBeCalled(); |
|
| 27 | 27 | $container->setParameter('gesdinet_jwt_refresh_token.ttl_update', false) |
| 28 | - ->shouldBeCalled(); |
|
| 28 | + ->shouldBeCalled(); |
|
| 29 | 29 | $container->setParameter('gesdinet_jwt_refresh_token.security.firewall', 'api') |
| 30 | - ->shouldBeCalled(); |
|
| 30 | + ->shouldBeCalled(); |
|
| 31 | 31 | $container->setParameter('gesdinet_jwt_refresh_token.user_provider', null) |
| 32 | - ->shouldBeCalled(); |
|
| 32 | + ->shouldBeCalled(); |
|
| 33 | 33 | $container->setParameter('gesdinet.jwtrefreshtoken.refresh_token.class', 'Gesdinet\JWTRefreshTokenBundle\Entity\RefreshToken') |
| 34 | - ->shouldBeCalled(); |
|
| 34 | + ->shouldBeCalled(); |
|
| 35 | 35 | $container->setParameter('gesdinet.jwtrefreshtoken.entity_manager.id', 'doctrine.orm.entity_manager') |
| 36 | - ->shouldBeCalled(); |
|
| 36 | + ->shouldBeCalled(); |
|
| 37 | 37 | |
| 38 | 38 | // Ignore these calls |
| 39 | 39 | $container->has(Argument::cetera()) |
| 40 | - ->willReturn(); |
|
| 40 | + ->willReturn(); |
|
| 41 | 41 | $container->setDefinition(Argument::cetera()) |
| 42 | - ->willReturn(); |
|
| 42 | + ->willReturn(); |
|
| 43 | 43 | $container->setAlias(Argument::cetera()) |
| 44 | - ->willReturn(); |
|
| 44 | + ->willReturn(); |
|
| 45 | 45 | |
| 46 | 46 | $configs = array(); |
| 47 | 47 | $this->load($configs, $container); |
@@ -50,21 +50,21 @@ discard block |
||
| 50 | 50 | public function it_should_configure_the_default_naming_generator(ContainerBuilder $container) |
| 51 | 51 | { |
| 52 | 52 | $container->fileExists(dirname(dirname(__DIR__)).'/DependencyInjection/../Resources/config/services.yml') |
| 53 | - ->willReturn(true); |
|
| 53 | + ->willReturn(true); |
|
| 54 | 54 | $container->has('gesdinet.jwtrefreshtoken.name_generator.underscore') |
| 55 | - ->willReturn(true); |
|
| 55 | + ->willReturn(true); |
|
| 56 | 56 | |
| 57 | 57 | $container->setAlias( |
| 58 | 58 | 'gesdinet.jwtrefreshtoken.name_generator.default', |
| 59 | 59 | Argument::exact(new Alias('gesdinet.jwtrefreshtoken.name_generator.underscore')) |
| 60 | 60 | ) |
| 61 | - ->shouldBeCalled(); |
|
| 61 | + ->shouldBeCalled(); |
|
| 62 | 62 | |
| 63 | 63 | // Ignore these calls |
| 64 | 64 | $container->setParameter(Argument::cetera()) |
| 65 | - ->willReturn(); |
|
| 65 | + ->willReturn(); |
|
| 66 | 66 | $container->setDefinition(Argument::cetera()) |
| 67 | - ->willReturn(); |
|
| 67 | + ->willReturn(); |
|
| 68 | 68 | |
| 69 | 69 | $configs = array(); |
| 70 | 70 | $this->load($configs, $container); |
@@ -74,47 +74,47 @@ discard block |
||
| 74 | 74 | ContainerBuilder $container |
| 75 | 75 | ) { |
| 76 | 76 | $container->fileExists(dirname(dirname(__DIR__)).'/DependencyInjection/../Resources/config/services.yml') |
| 77 | - ->willReturn(true); |
|
| 77 | + ->willReturn(true); |
|
| 78 | 78 | |
| 79 | 79 | $container->has('some.service.name') |
| 80 | - ->willReturn(false); |
|
| 80 | + ->willReturn(false); |
|
| 81 | 81 | |
| 82 | 82 | // Ignore these calls |
| 83 | 83 | $container->setParameter(Argument::cetera()) |
| 84 | - ->willReturn(); |
|
| 84 | + ->willReturn(); |
|
| 85 | 85 | $container->setDefinition(Argument::cetera()) |
| 86 | - ->willReturn(); |
|
| 86 | + ->willReturn(); |
|
| 87 | 87 | $container->setAlias(Argument::cetera()) |
| 88 | - ->willReturn(); |
|
| 88 | + ->willReturn(); |
|
| 89 | 89 | |
| 90 | 90 | $configs = array(array('parameter_name_generator' => 'some.service.name')); |
| 91 | 91 | $this->shouldThrow('\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException') |
| 92 | - ->during('load', array($configs, $container)); |
|
| 92 | + ->during('load', array($configs, $container)); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | public function it_should_configure_a_custom_name_generator(ContainerBuilder $container) |
| 96 | 96 | { |
| 97 | 97 | $container->fileExists(dirname(dirname(__DIR__)).'/DependencyInjection/../Resources/config/services.yml') |
| 98 | - ->willReturn(true); |
|
| 98 | + ->willReturn(true); |
|
| 99 | 99 | |
| 100 | 100 | $container->has('gesdinet.jwtrefreshtoken.name_generator.underscore') |
| 101 | - ->willReturn(true); |
|
| 101 | + ->willReturn(true); |
|
| 102 | 102 | |
| 103 | 103 | // Expectations |
| 104 | 104 | $container->setAlias('gesdinet.jwtrefreshtoken.name_generator.default', 'some.service.name') |
| 105 | - ->shouldBeCalled(); |
|
| 105 | + ->shouldBeCalled(); |
|
| 106 | 106 | |
| 107 | 107 | // Stubs |
| 108 | 108 | $container->has('some.service.name') |
| 109 | - ->willReturn(true); |
|
| 109 | + ->willReturn(true); |
|
| 110 | 110 | |
| 111 | 111 | // Ignore these calls |
| 112 | 112 | $container->setParameter(Argument::cetera()) |
| 113 | - ->willReturn(); |
|
| 113 | + ->willReturn(); |
|
| 114 | 114 | $container->setDefinition(Argument::cetera()) |
| 115 | - ->willReturn(); |
|
| 115 | + ->willReturn(); |
|
| 116 | 116 | $container->setAlias(Argument::cetera()) |
| 117 | - ->willReturn(); |
|
| 117 | + ->willReturn(); |
|
| 118 | 118 | |
| 119 | 119 | $configs = array(array('parameter_name_generator' => 'some.service.name')); |
| 120 | 120 | $this->load($configs, $container); |