@@ -14,23 +14,23 @@ |
||
14 | 14 | namespace OAuth2Framework\Component\TokenEndpoint; |
15 | 15 | |
16 | 16 | use Http\Message\ResponseFactory; |
17 | +use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
|
17 | 18 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenIdGenerator; |
18 | 19 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenRepository; |
19 | -use Psr\Http\Server\RequestHandlerInterface; |
|
20 | -use Psr\Http\Server\MiddlewareInterface; |
|
21 | -use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
|
22 | 20 | use OAuth2Framework\Component\Core\Client\Client; |
23 | 21 | use OAuth2Framework\Component\Core\Client\ClientId; |
24 | 22 | use OAuth2Framework\Component\Core\Client\ClientRepository; |
25 | -use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
23 | +use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
26 | 24 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwner; |
25 | +use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
26 | +use OAuth2Framework\Component\Core\TokenType\TokenType; |
|
27 | 27 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
28 | 28 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
29 | -use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
30 | 29 | use OAuth2Framework\Component\TokenEndpoint\Extension\TokenEndpointExtensionManager; |
31 | -use OAuth2Framework\Component\Core\TokenType\TokenType; |
|
32 | 30 | use Psr\Http\Message\ResponseInterface; |
33 | 31 | use Psr\Http\Message\ServerRequestInterface; |
32 | +use Psr\Http\Server\MiddlewareInterface; |
|
33 | +use Psr\Http\Server\RequestHandlerInterface; |
|
34 | 34 | |
35 | 35 | class TokenEndpoint implements MiddlewareInterface |
36 | 36 | { |
@@ -13,9 +13,9 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\ServerBundle\Form\Handler; |
15 | 15 | |
16 | -use OAuth2Framework\ServerBundle\Form\Model\AuthorizationModel; |
|
17 | 16 | use OAuth2Framework\Component\AuthorizationEndpoint\Authorization; |
18 | 17 | use OAuth2Framework\Component\Core\Message\OAuth2Message; |
18 | +use OAuth2Framework\ServerBundle\Form\Model\AuthorizationModel; |
|
19 | 19 | use Psr\Http\Message\ServerRequestInterface; |
20 | 20 | use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory; |
21 | 21 | use Symfony\Component\Form\ClickableInterface; |
@@ -13,13 +13,13 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\ClientAuthentication; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
17 | -use Psr\Http\Server\MiddlewareInterface; |
|
18 | 16 | use OAuth2Framework\Component\Core\Client\Client; |
19 | 17 | use OAuth2Framework\Component\Core\Client\ClientRepository; |
20 | 18 | use OAuth2Framework\Component\Core\Message\OAuth2Message; |
21 | 19 | use Psr\Http\Message\ResponseInterface; |
22 | 20 | use Psr\Http\Message\ServerRequestInterface; |
21 | +use Psr\Http\Server\MiddlewareInterface; |
|
22 | +use Psr\Http\Server\RequestHandlerInterface; |
|
23 | 23 | |
24 | 24 | class ClientAuthenticationMiddleware implements MiddlewareInterface |
25 | 25 | { |
@@ -13,13 +13,13 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\ResourceServerAuthentication; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
17 | -use Psr\Http\Server\MiddlewareInterface; |
|
16 | +use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
18 | 17 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServer; |
19 | 18 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServerRepository; |
20 | -use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
21 | 19 | use Psr\Http\Message\ResponseInterface; |
22 | 20 | use Psr\Http\Message\ServerRequestInterface; |
21 | +use Psr\Http\Server\MiddlewareInterface; |
|
22 | +use Psr\Http\Server\RequestHandlerInterface; |
|
23 | 23 | |
24 | 24 | final class AuthenticationMiddleware implements MiddlewareInterface |
25 | 25 | { |
@@ -26,16 +26,19 @@ |
||
26 | 26 | /** |
27 | 27 | * @param array $configs |
28 | 28 | * @param ContainerBuilder $container |
29 | + * @return void |
|
29 | 30 | */ |
30 | 31 | public function load(array $configs, ContainerBuilder $container); |
31 | 32 | |
32 | 33 | /** |
33 | 34 | * @param ContainerBuilder $container |
35 | + * @return void |
|
34 | 36 | */ |
35 | 37 | public function build(ContainerBuilder $container); |
36 | 38 | |
37 | 39 | /** |
38 | - * @param NodeDefinition $node |
|
40 | + * @param ArrayNodeDefinition $node |
|
41 | + * @return void |
|
39 | 42 | */ |
40 | 43 | public function getNodeDefinition(ArrayNodeDefinition $node, ArrayNodeDefinition $rootNode); |
41 | 44 |
@@ -13,8 +13,8 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\ServerBundle\Tests\TestBundle\Service; |
15 | 15 | |
16 | -use OAuth2Framework\ServerBundle\Tests\TestBundle\Entity\User; |
|
17 | 16 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
17 | +use OAuth2Framework\ServerBundle\Tests\TestBundle\Entity\User; |
|
18 | 18 | use Symfony\Component\Security\Core\Exception\UnsupportedUserException; |
19 | 19 | use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; |
20 | 20 | use Symfony\Component\Security\Core\User\UserInterface; |
@@ -13,11 +13,11 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\ClientCredentialsGrant\Tests; |
15 | 15 | |
16 | +use OAuth2Framework\Component\ClientCredentialsGrant\ClientCredentialsGrantType; |
|
16 | 17 | use OAuth2Framework\Component\Core\Client\Client; |
17 | 18 | use OAuth2Framework\Component\Core\Client\ClientId; |
18 | 19 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
19 | 20 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
20 | -use OAuth2Framework\Component\ClientCredentialsGrant\ClientCredentialsGrantType; |
|
21 | 21 | use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
22 | 22 | use PHPUnit\Framework\TestCase; |
23 | 23 | use Psr\Http\Message\ServerRequestInterface; |
@@ -13,12 +13,12 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\Core\Middleware; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
17 | -use Psr\Http\Server\MiddlewareInterface; |
|
18 | 16 | use OAuth2Framework\Component\Core\Message\OAuth2Message; |
19 | 17 | use OAuth2Framework\Component\Core\Message\OAuth2MessageFactoryManager; |
20 | 18 | use Psr\Http\Message\ResponseInterface; |
21 | 19 | use Psr\Http\Message\ServerRequestInterface; |
20 | +use Psr\Http\Server\MiddlewareInterface; |
|
21 | +use Psr\Http\Server\RequestHandlerInterface; |
|
22 | 22 | |
23 | 23 | final class OAuth2MessageMiddleware implements MiddlewareInterface |
24 | 24 | { |
@@ -303,7 +303,7 @@ |
||
303 | 303 | /** |
304 | 304 | * @param string $subject |
305 | 305 | * |
306 | - * @return ResourceOwnerId|null |
|
306 | + * @return ResourceOwnerId |
|
307 | 307 | */ |
308 | 308 | private function findResourceOwner(string $subject): ? ResourceOwnerId |
309 | 309 | { |
@@ -26,16 +26,16 @@ |
||
26 | 26 | use Jose\Component\Signature\JWSVerifier; |
27 | 27 | use Jose\Component\Signature\Serializer\CompactSerializer as JwsCompactSerializer; |
28 | 28 | use OAuth2Framework\Component\Core\Client\Client; |
29 | -use OAuth2Framework\Component\Core\Util\RequestBodyParser; |
|
30 | -use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
31 | 29 | use OAuth2Framework\Component\Core\Client\ClientId; |
32 | 30 | use OAuth2Framework\Component\Core\Client\ClientRepository; |
31 | +use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
33 | 32 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
33 | +use OAuth2Framework\Component\Core\TrustedIssuer\TrustedIssuerRepository; |
|
34 | 34 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
35 | 35 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
36 | -use OAuth2Framework\Component\Core\Message\OAuth2Message; |
|
36 | +use OAuth2Framework\Component\Core\Util\RequestBodyParser; |
|
37 | 37 | use OAuth2Framework\Component\TokenEndpoint\GrantType; |
38 | -use OAuth2Framework\Component\Core\TrustedIssuer\TrustedIssuerRepository; |
|
38 | +use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
39 | 39 | use Psr\Http\Message\ServerRequestInterface; |
40 | 40 | |
41 | 41 | class JwtBearerGrantType implements GrantType |