@@ -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 | { |
@@ -36,6 +36,9 @@ discard block |
||
36 | 36 | */ |
37 | 37 | class RefreshTokenAuthenticator extends RefreshTokenAuthenticatorBase implements AuthenticationFailureHandlerInterface |
38 | 38 | { |
39 | + /** |
|
40 | + * @param string $providerKey |
|
41 | + */ |
|
39 | 42 | public function createToken(Request $request, $providerKey) |
40 | 43 | { |
41 | 44 | $refreshTokenString = RequestRefreshToken::getRefreshToken($request); |
@@ -47,6 +50,9 @@ discard block |
||
47 | 50 | ); |
48 | 51 | } |
49 | 52 | |
53 | + /** |
|
54 | + * @param string $providerKey |
|
55 | + */ |
|
50 | 56 | public function authenticateToken(TokenInterface $token, UserProviderInterface $userProvider, $providerKey) |
51 | 57 | { |
52 | 58 | if (!$userProvider instanceof RefreshTokenProvider) { |
@@ -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 | } |
@@ -14,9 +14,9 @@ discard block |
||
14 | 14 | public function let(ContainerBuilder $container) |
15 | 15 | { |
16 | 16 | $container->fileExists(dirname(dirname(__DIR__)).'/DependencyInjection/../Resources/config/services.yml') |
17 | - ->willReturn(true); |
|
17 | + ->willReturn(true); |
|
18 | 18 | $container->has('gesdinet.jwtrefreshtoken.name_generator.underscore') |
19 | - ->willReturn(true); |
|
19 | + ->willReturn(true); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | public function it_is_initializable() |
@@ -28,25 +28,25 @@ discard block |
||
28 | 28 | { |
29 | 29 | // setParameter calls with default values |
30 | 30 | $container->setParameter('gesdinet_jwt_refresh_token.ttl', 2592000) |
31 | - ->shouldBeCalled(); |
|
31 | + ->shouldBeCalled(); |
|
32 | 32 | $container->setParameter('gesdinet_jwt_refresh_token.ttl_update', false) |
33 | - ->shouldBeCalled(); |
|
33 | + ->shouldBeCalled(); |
|
34 | 34 | $container->setParameter('gesdinet_jwt_refresh_token.security.firewall', 'api') |
35 | - ->shouldBeCalled(); |
|
35 | + ->shouldBeCalled(); |
|
36 | 36 | $container->setParameter('gesdinet_jwt_refresh_token.user_provider', null) |
37 | - ->shouldBeCalled(); |
|
37 | + ->shouldBeCalled(); |
|
38 | 38 | $container->setParameter('gesdinet.jwtrefreshtoken.refresh_token.class', RefreshToken::class) |
39 | - ->shouldBeCalled(); |
|
39 | + ->shouldBeCalled(); |
|
40 | 40 | $container->setParameter('gesdinet.jwtrefreshtoken.entity_manager.id', 'doctrine.orm.entity_manager') |
41 | - ->shouldBeCalled(); |
|
41 | + ->shouldBeCalled(); |
|
42 | 42 | |
43 | 43 | // Ignore these calls |
44 | 44 | $container->has(Argument::cetera()) |
45 | - ->willReturn(); |
|
45 | + ->willReturn(); |
|
46 | 46 | $container->setDefinition(Argument::cetera()) |
47 | - ->willReturn(); |
|
47 | + ->willReturn(); |
|
48 | 48 | $container->setAlias(Argument::cetera()) |
49 | - ->willReturn(); |
|
49 | + ->willReturn(); |
|
50 | 50 | |
51 | 51 | $configs = []; |
52 | 52 | $this->load($configs, $container); |
@@ -58,13 +58,13 @@ discard block |
||
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 = []; |
70 | 70 | $this->load($configs, $container); |
@@ -74,38 +74,38 @@ discard block |
||
74 | 74 | ContainerBuilder $container |
75 | 75 | ) { |
76 | 76 | $container->has('some.service.name') |
77 | - ->willReturn(false); |
|
77 | + ->willReturn(false); |
|
78 | 78 | |
79 | 79 | // Ignore these calls |
80 | 80 | $container->setParameter(Argument::cetera()) |
81 | - ->willReturn(); |
|
81 | + ->willReturn(); |
|
82 | 82 | $container->setDefinition(Argument::cetera()) |
83 | - ->willReturn(); |
|
83 | + ->willReturn(); |
|
84 | 84 | $container->setAlias(Argument::cetera()) |
85 | - ->willReturn(); |
|
85 | + ->willReturn(); |
|
86 | 86 | |
87 | 87 | $configs = [['parameter_name_generator' => 'some.service.name']]; |
88 | 88 | $this->shouldThrow(ServiceNotFoundException::class) |
89 | - ->during('load', [$configs, $container]); |
|
89 | + ->during('load', [$configs, $container]); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | public function it_should_configure_a_custom_name_generator(ContainerBuilder $container) |
93 | 93 | { |
94 | 94 | // Expectations |
95 | 95 | $container->setAlias('gesdinet.jwtrefreshtoken.name_generator.default', 'some.service.name') |
96 | - ->shouldBeCalled(); |
|
96 | + ->shouldBeCalled(); |
|
97 | 97 | |
98 | 98 | // Stubs |
99 | 99 | $container->has('some.service.name') |
100 | - ->willReturn(true); |
|
100 | + ->willReturn(true); |
|
101 | 101 | |
102 | 102 | // Ignore these calls |
103 | 103 | $container->setParameter(Argument::cetera()) |
104 | - ->willReturn(); |
|
104 | + ->willReturn(); |
|
105 | 105 | $container->setDefinition(Argument::cetera()) |
106 | - ->willReturn(); |
|
106 | + ->willReturn(); |
|
107 | 107 | $container->setAlias(Argument::cetera()) |
108 | - ->willReturn(); |
|
108 | + ->willReturn(); |
|
109 | 109 | |
110 | 110 | $configs = [['parameter_name_generator' => 'some.service.name']]; |
111 | 111 | $this->load($configs, $container); |