@@ -16,8 +16,8 @@ |
||
16 | 16 | use OAuth2Framework\Bundle\Security\Authentication\Token\OAuth2Token; |
17 | 17 | use OAuth2Framework\Component\Core\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 | class AccessTokenResolver implements ArgumentValueResolverInterface |
@@ -16,11 +16,11 @@ |
||
16 | 16 | use OAuth2Framework\Bundle\Security\Authentication\Provider\OAuth2Provider; |
17 | 17 | use OAuth2Framework\Bundle\Security\EntryPoint\OAuth2EntryPoint; |
18 | 18 | use OAuth2Framework\Bundle\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 | class OAuth2SecurityFactory implements SecurityFactoryInterface |
@@ -14,10 +14,10 @@ |
||
14 | 14 | namespace OAuth2Framework\Component\AuthorizationCodeGrant; |
15 | 15 | |
16 | 16 | use OAuth2Framework\Component\AuthorizationCodeGrant\PKCEMethod\PKCEMethodManager; |
17 | -use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
18 | 17 | use OAuth2Framework\Component\Core\Client\Client; |
19 | 18 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
20 | 19 | use OAuth2Framework\Component\TokenEndpoint\GrantType; |
20 | +use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
21 | 21 | use Psr\Http\Message\ServerRequestInterface; |
22 | 22 | |
23 | 23 | class AuthorizationCodeGrantType implements GrantType |
@@ -128,7 +128,7 @@ |
||
128 | 128 | * @param ServerRequestInterface $request |
129 | 129 | * @param Client $client |
130 | 130 | * @param AuthenticationMethod $authenticationMethod |
131 | - * @param mixed $clientCredentials |
|
131 | + * @param string $clientCredentials |
|
132 | 132 | * |
133 | 133 | * @return bool |
134 | 134 | */ |
@@ -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\Exception\OAuth2Exception; |
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,12 +13,12 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\ClientAuthentication\Tests; |
15 | 15 | |
16 | +use OAuth2Framework\Component\ClientAuthentication\AuthenticationMethodManager; |
|
17 | +use OAuth2Framework\Component\ClientAuthentication\ClientSecretBasic; |
|
16 | 18 | use OAuth2Framework\Component\Core\Client\Client; |
17 | 19 | use OAuth2Framework\Component\Core\Client\ClientId; |
18 | 20 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
19 | 21 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
20 | -use OAuth2Framework\Component\ClientAuthentication\AuthenticationMethodManager; |
|
21 | -use OAuth2Framework\Component\ClientAuthentication\ClientSecretBasic; |
|
22 | 22 | use PHPUnit\Framework\TestCase; |
23 | 23 | use Psr\Http\Message\ServerRequestInterface; |
24 | 24 |
@@ -17,11 +17,11 @@ |
||
17 | 17 | use Jose\Component\Core\JWKSet; |
18 | 18 | use OAuth2Framework\Component\Core\Client\Event as ClientEvent; |
19 | 19 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
20 | +use OAuth2Framework\Component\Core\Domain\DomainObject; |
|
20 | 21 | use OAuth2Framework\Component\Core\Event\Event; |
21 | -use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
22 | 22 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwner; |
23 | +use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
23 | 24 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
24 | -use OAuth2Framework\Component\Core\Domain\DomainObject; |
|
25 | 25 | use SimpleBus\Message\Recorder\ContainsRecordedMessages; |
26 | 26 | use SimpleBus\Message\Recorder\PrivateMessageRecorderCapabilities; |
27 | 27 |
@@ -20,14 +20,14 @@ |
||
20 | 20 | use Jose\Component\Signature\JWS; |
21 | 21 | use Jose\Component\Signature\JWSVerifier; |
22 | 22 | use Jose\Component\Signature\Serializer\CompactSerializer as JwsCompactSerializer; |
23 | -use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
24 | 23 | use OAuth2Framework\Component\Core\Client\ClientId; |
25 | 24 | use OAuth2Framework\Component\Core\Client\ClientRepository; |
25 | +use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
26 | 26 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
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\GrantType; |
30 | +use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
31 | 31 | use Psr\Http\Message\ServerRequestInterface; |
32 | 32 | |
33 | 33 | class JwtBearerGrantType implements GrantType |
@@ -13,14 +13,14 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\Middleware; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
17 | -use Psr\Http\Server\MiddlewareInterface; |
|
18 | 16 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenId; |
19 | 17 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenRepository; |
20 | 18 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
21 | 19 | use OAuth2Framework\Component\TokenType\TokenTypeManager; |
22 | 20 | use Psr\Http\Message\ResponseInterface; |
23 | 21 | use Psr\Http\Message\ServerRequestInterface; |
22 | +use Psr\Http\Server\MiddlewareInterface; |
|
23 | +use Psr\Http\Server\RequestHandlerInterface; |
|
24 | 24 | |
25 | 25 | class AccessTokenMiddleware implements MiddlewareInterface |
26 | 26 | { |