@@ -15,8 +15,8 @@ |
||
15 | 15 | |
16 | 16 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
17 | 17 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenId; |
18 | -use OAuth2Framework\Component\Core\AccessToken\AccessTokenRepository; |
|
19 | 18 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenIntrospectionTypeHint; |
19 | +use OAuth2Framework\Component\Core\AccessToken\AccessTokenRepository; |
|
20 | 20 | use OAuth2Framework\Component\Core\Client\ClientId; |
21 | 21 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
22 | 22 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServerId; |
@@ -28,6 +28,7 @@ |
||
28 | 28 | |
29 | 29 | /** |
30 | 30 | * @param AuthorizationCode $authorizationCode |
31 | + * @return void |
|
31 | 32 | */ |
32 | 33 | public function save(AuthorizationCode $authorizationCode): void; |
33 | 34 | } |
@@ -13,19 +13,19 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\AuthorizationCodeGrant\Tests; |
15 | 15 | |
16 | +use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCode; |
|
17 | +use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCodeGrantType; |
|
18 | +use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCodeId; |
|
19 | +use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCodeRepository; |
|
16 | 20 | use OAuth2Framework\Component\AuthorizationCodeGrant\PKCEMethod\PKCEMethodManager; |
17 | 21 | use OAuth2Framework\Component\AuthorizationCodeGrant\PKCEMethod\Plain; |
18 | 22 | use OAuth2Framework\Component\AuthorizationCodeGrant\PKCEMethod\S256; |
19 | 23 | use OAuth2Framework\Component\Core\Client\Client; |
20 | 24 | use OAuth2Framework\Component\Core\Client\ClientId; |
21 | 25 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
22 | -use OAuth2Framework\Component\Core\ResourceServer\ResourceServerId; |
|
23 | 26 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
27 | +use OAuth2Framework\Component\Core\ResourceServer\ResourceServerId; |
|
24 | 28 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
25 | -use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCode; |
|
26 | -use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCodeGrantType; |
|
27 | -use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCodeId; |
|
28 | -use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCodeRepository; |
|
29 | 29 | use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
30 | 30 | use PHPUnit\Framework\TestCase; |
31 | 31 | use Prophecy\Argument; |
@@ -13,8 +13,11 @@ discard block |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\AuthorizationCodeGrant\Tests; |
15 | 15 | |
16 | +use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCode; |
|
16 | 17 | use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCodeId; |
18 | +use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCodeIdGenerator; |
|
17 | 19 | use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCodeRepository; |
20 | +use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCodeResponseType; |
|
18 | 21 | use OAuth2Framework\Component\AuthorizationCodeGrant\PKCEMethod\PKCEMethodManager; |
19 | 22 | use OAuth2Framework\Component\AuthorizationCodeGrant\PKCEMethod\Plain; |
20 | 23 | use OAuth2Framework\Component\AuthorizationCodeGrant\PKCEMethod\S256; |
@@ -22,9 +25,6 @@ discard block |
||
22 | 25 | use OAuth2Framework\Component\Core\Client\Client; |
23 | 26 | use OAuth2Framework\Component\Core\Client\ClientId; |
24 | 27 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
25 | -use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCode; |
|
26 | -use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCodeResponseType; |
|
27 | -use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCodeIdGenerator; |
|
28 | 28 | use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
29 | 29 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
30 | 30 | use PHPUnit\Framework\TestCase; |
@@ -18,10 +18,10 @@ |
||
18 | 18 | use Jose\Component\Core\JWK; |
19 | 19 | use Jose\Component\Core\JWKSet; |
20 | 20 | use Jose\Component\Encryption\JWEBuilder; |
21 | +use Jose\Component\Encryption\Serializer\CompactSerializer as JweCompactSerializer; |
|
21 | 22 | use Jose\Component\KeyManagement\JKUFactory; |
22 | 23 | use Jose\Component\Signature\JWSBuilder; |
23 | 24 | use Jose\Component\Signature\Serializer\CompactSerializer as JwsCompactSerializer; |
24 | -use Jose\Component\Encryption\Serializer\CompactSerializer as JweCompactSerializer; |
|
25 | 25 | use OAuth2Framework\Component\AuthorizationCodeGrant\AuthorizationCodeId; |
26 | 26 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
27 | 27 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenId; |
@@ -14,25 +14,25 @@ |
||
14 | 14 | namespace OAuth2Framework\Component\TokenEndpoint\Tests; |
15 | 15 | |
16 | 16 | use Http\Message\MessageFactory\GuzzleMessageFactory; |
17 | +use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
|
17 | 18 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenId; |
18 | 19 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenIdGenerator; |
19 | 20 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenRepository; |
20 | -use Psr\Http\Server\RequestHandlerInterface; |
|
21 | -use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
|
22 | 21 | use OAuth2Framework\Component\Core\Client\Client; |
23 | 22 | use OAuth2Framework\Component\Core\Client\ClientId; |
24 | 23 | use OAuth2Framework\Component\Core\Client\ClientRepository; |
25 | 24 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
26 | -use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
27 | 25 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
26 | +use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
27 | +use OAuth2Framework\Component\Core\TokenType\TokenType; |
|
28 | 28 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
29 | 29 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
30 | 30 | use OAuth2Framework\Component\TokenEndpoint\Extension\TokenEndpointExtensionManager; |
31 | 31 | use OAuth2Framework\Component\TokenEndpoint\TokenEndpoint; |
32 | -use OAuth2Framework\Component\Core\TokenType\TokenType; |
|
33 | 32 | use PHPUnit\Framework\TestCase; |
34 | 33 | use Prophecy\Argument; |
35 | 34 | use Psr\Http\Message\ServerRequestInterface; |
35 | +use Psr\Http\Server\RequestHandlerInterface; |
|
36 | 36 | |
37 | 37 | /** |
38 | 38 | * @group TokenEndpoint |
@@ -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\Exception\OAuth2Exception; |
|
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\Exception\OAuth2Exception; |
|
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 | { |
@@ -14,12 +14,12 @@ |
||
14 | 14 | namespace OAuth2Framework\SecurityBundle\Annotation; |
15 | 15 | |
16 | 16 | use Doctrine\Common\Annotations\Reader; |
17 | -use OAuth2Framework\SecurityBundle\Annotation\Checker\Checker; |
|
18 | -use OAuth2Framework\SecurityBundle\Security\Authentication\Token\OAuth2Token; |
|
19 | 17 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
20 | 18 | use OAuth2Framework\Component\Core\Response\OAuth2Response; |
21 | 19 | use OAuth2Framework\Component\Core\Response\OAuth2ResponseFactoryManager; |
22 | 20 | use OAuth2Framework\Component\Core\TokenType\TokenTypeManager; |
21 | +use OAuth2Framework\SecurityBundle\Annotation\Checker\Checker; |
|
22 | +use OAuth2Framework\SecurityBundle\Security\Authentication\Token\OAuth2Token; |
|
23 | 23 | use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory; |
24 | 24 | use Symfony\Component\HttpKernel\Event\FilterControllerEvent; |
25 | 25 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
@@ -16,11 +16,11 @@ |
||
16 | 16 | use OAuth2Framework\SecurityBundle\Security\Authentication\Provider\OAuth2Provider; |
17 | 17 | use OAuth2Framework\SecurityBundle\Security\EntryPoint\OAuth2EntryPoint; |
18 | 18 | use OAuth2Framework\SecurityBundle\Security\Firewall\OAuth2Listener; |
19 | +use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface; |
|
19 | 20 | use Symfony\Component\Config\Definition\Builder\NodeDefinition; |
20 | 21 | use Symfony\Component\DependencyInjection\ChildDefinition; |
21 | 22 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
22 | 23 | use Symfony\Component\DependencyInjection\Reference; |
23 | -use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface; |
|
24 | 24 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
25 | 25 | |
26 | 26 | class OAuth2SecurityFactory implements SecurityFactoryInterface |