@@ -16,8 +16,8 @@ |
||
16 | 16 | use OAuth2Framework\Bundle\Server\SecurityPlugin\Security\Authentication\Token\OAuth2Token; |
17 | 17 | use OAuth2Framework\Component\Server\Model\AccessToken\AccessToken; |
18 | 18 | use Symfony\Component\HttpFoundation\Request; |
19 | -use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface; |
|
20 | 19 | use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata; |
20 | +use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface; |
|
21 | 21 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
22 | 22 | |
23 | 23 | final class AccessTokenResolver implements ArgumentValueResolverInterface |
@@ -15,8 +15,8 @@ |
||
15 | 15 | |
16 | 16 | use Fluent\PhpConfigFileLoader; |
17 | 17 | use OAuth2Framework\Bundle\Server\DependencyInjection\Source\ActionableSource; |
18 | -use Symfony\Component\Config\FileLocator; |
|
19 | 18 | use Symfony\Component\Config\Definition\Builder\NodeDefinition; |
19 | +use Symfony\Component\Config\FileLocator; |
|
20 | 20 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
21 | 21 | |
22 | 22 | final class ScopePolicyDefaultSource extends ActionableSource |
@@ -16,11 +16,11 @@ |
||
16 | 16 | use OAuth2Framework\Bundle\Server\Security\Authentication\Provider\OAuth2Provider; |
17 | 17 | use OAuth2Framework\Bundle\Server\Security\EntryPoint\OAuth2EntryPoint; |
18 | 18 | use OAuth2Framework\Bundle\Server\Security\Firewall\OAuth2Listener; |
19 | +use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface; |
|
20 | +use Symfony\Component\Config\Definition\Builder\NodeDefinition; |
|
19 | 21 | use Symfony\Component\DependencyInjection\ChildDefinition; |
20 | 22 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
21 | 23 | use Symfony\Component\DependencyInjection\Reference; |
22 | -use Symfony\Component\Config\Definition\Builder\NodeDefinition; |
|
23 | -use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface; |
|
24 | 24 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
25 | 25 | |
26 | 26 | final class OAuth2SecurityFactory implements SecurityFactoryInterface |
@@ -13,7 +13,6 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Bundle\Server\DependencyInjection\Source\Grant; |
15 | 15 | |
16 | -use Jose\Bundle\JoseFramework\Helper\ConfigurationHelper; |
|
17 | 16 | use OAuth2Framework\Bundle\Server\DependencyInjection\Source\ActionableSource; |
18 | 17 | use Symfony\Component\Config\Definition\Builder\NodeDefinition; |
19 | 18 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
@@ -17,9 +17,9 @@ |
||
17 | 17 | use Jose\Component\Core\JWK; |
18 | 18 | use Jose\Component\Core\JWKSet; |
19 | 19 | use Jose\Component\Encryption\JWEBuilder; |
20 | +use Jose\Component\Encryption\Serializer\CompactSerializer as JweCompactSerializer; |
|
20 | 21 | use Jose\Component\Signature\JWSBuilder; |
21 | 22 | use Jose\Component\Signature\Serializer\CompactSerializer as JwsCompactSerializer; |
22 | -use Jose\Component\Encryption\Serializer\CompactSerializer as JweCompactSerializer; |
|
23 | 23 | use OAuth2Framework\Component\Server\AuthorizationCodeGrant\AuthorizationCodeId; |
24 | 24 | use OAuth2Framework\Component\Server\Core\AccessToken\AccessToken; |
25 | 25 | use OAuth2Framework\Component\Server\Core\AccessToken\AccessTokenId; |
@@ -13,11 +13,11 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\Server\OpenIdConnect\UserInfo; |
15 | 15 | |
16 | +use OAuth2Framework\Component\Server\Core\Client\Client; |
|
17 | +use OAuth2Framework\Component\Server\Core\UserAccount\UserAccount; |
|
16 | 18 | use OAuth2Framework\Component\Server\OpenIdConnect\UserInfo\ClaimSource\ClaimSourceManager; |
17 | 19 | use OAuth2Framework\Component\Server\OpenIdConnect\UserInfo\Pairwise\PairwiseSubjectIdentifierAlgorithm; |
18 | 20 | use OAuth2Framework\Component\Server\OpenIdConnect\UserInfo\ScopeSupport\UserInfoScopeSupportManager; |
19 | -use OAuth2Framework\Component\Server\Core\Client\Client; |
|
20 | -use OAuth2Framework\Component\Server\Core\UserAccount\UserAccount; |
|
21 | 21 | |
22 | 22 | final class UserInfo |
23 | 23 | { |
@@ -13,11 +13,11 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\Server\RefreshTokenGrant\Command; |
15 | 15 | |
16 | -use OAuth2Framework\Component\Server\RefreshTokenGrant\RefreshTokenId; |
|
17 | 16 | use OAuth2Framework\Component\Server\Core\Client\ClientId; |
18 | 17 | use OAuth2Framework\Component\Server\Core\DataBag\DataBag; |
19 | -use OAuth2Framework\Component\Server\Core\ResourceServer\ResourceServerId; |
|
20 | 18 | use OAuth2Framework\Component\Server\Core\ResourceOwner\ResourceOwnerId; |
19 | +use OAuth2Framework\Component\Server\Core\ResourceServer\ResourceServerId; |
|
20 | +use OAuth2Framework\Component\Server\RefreshTokenGrant\RefreshTokenId; |
|
21 | 21 | |
22 | 22 | final class CreateRefreshTokenCommand |
23 | 23 | { |
@@ -15,13 +15,13 @@ |
||
15 | 15 | |
16 | 16 | use OAuth2Framework\Component\Server\Core\Client\ClientId; |
17 | 17 | use OAuth2Framework\Component\Server\Core\DataBag\DataBag; |
18 | +use OAuth2Framework\Component\Server\Core\DomainObject; |
|
18 | 19 | use OAuth2Framework\Component\Server\Core\Event\Event; |
19 | 20 | use OAuth2Framework\Component\Server\Core\Event\EventId; |
20 | 21 | use OAuth2Framework\Component\Server\Core\Id\Id; |
21 | -use OAuth2Framework\Component\Server\RefreshTokenGrant\RefreshTokenId; |
|
22 | 22 | use OAuth2Framework\Component\Server\Core\ResourceOwner\ResourceOwnerId; |
23 | 23 | use OAuth2Framework\Component\Server\Core\ResourceServer\ResourceServerId; |
24 | -use OAuth2Framework\Component\Server\Core\DomainObject; |
|
24 | +use OAuth2Framework\Component\Server\RefreshTokenGrant\RefreshTokenId; |
|
25 | 25 | |
26 | 26 | final class RefreshTokenCreatedEvent extends Event |
27 | 27 | { |
@@ -13,14 +13,14 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\Server\RefreshTokenGrant\Tests; |
15 | 15 | |
16 | -use OAuth2Framework\Component\Server\RefreshTokenGrant\RefreshToken; |
|
17 | -use OAuth2Framework\Component\Server\RefreshTokenGrant\RefreshTokenId; |
|
18 | -use OAuth2Framework\Component\Server\RefreshTokenGrant\RefreshTokenRepository; |
|
19 | -use OAuth2Framework\Component\Server\RefreshTokenGrant\RefreshTokenTypeHint; |
|
20 | 16 | use OAuth2Framework\Component\Server\Core\Client\ClientId; |
21 | 17 | use OAuth2Framework\Component\Server\Core\DataBag\DataBag; |
22 | 18 | use OAuth2Framework\Component\Server\Core\ResourceServer\ResourceServerId; |
23 | 19 | use OAuth2Framework\Component\Server\Core\UserAccount\UserAccountId; |
20 | +use OAuth2Framework\Component\Server\RefreshTokenGrant\RefreshToken; |
|
21 | +use OAuth2Framework\Component\Server\RefreshTokenGrant\RefreshTokenId; |
|
22 | +use OAuth2Framework\Component\Server\RefreshTokenGrant\RefreshTokenRepository; |
|
23 | +use OAuth2Framework\Component\Server\RefreshTokenGrant\RefreshTokenTypeHint; |
|
24 | 24 | use PHPUnit\Framework\TestCase; |
25 | 25 | use Prophecy\Argument; |
26 | 26 |