@@ -26,14 +26,14 @@ |
||
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\TokenEndpoint\GrantTypeData; |
|
30 | 29 | use OAuth2Framework\Component\Core\Client\ClientId; |
31 | 30 | use OAuth2Framework\Component\Core\Client\ClientRepository; |
31 | +use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
32 | 32 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
33 | 33 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
34 | 34 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
35 | -use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
36 | 35 | use OAuth2Framework\Component\TokenEndpoint\GrantType; |
36 | +use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
37 | 37 | use OAuth2Framework\Component\TrustedIssuer\TrustedIssuerRepository; |
38 | 38 | use Psr\Http\Message\ServerRequestInterface; |
39 | 39 |
@@ -14,12 +14,12 @@ |
||
14 | 14 | namespace OAuth2Framework\ServerBundle\Annotation; |
15 | 15 | |
16 | 16 | use Doctrine\Common\Annotations\Reader; |
17 | -use OAuth2Framework\ServerBundle\Annotation\Checker\Checker; |
|
18 | -use OAuth2Framework\ServerBundle\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\TokenType\TokenTypeManager; |
21 | +use OAuth2Framework\ServerBundle\Annotation\Checker\Checker; |
|
22 | +use OAuth2Framework\ServerBundle\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; |
@@ -31,11 +31,13 @@ |
||
31 | 31 | |
32 | 32 | /** |
33 | 33 | * @param ContainerBuilder $container |
34 | + * @return void |
|
34 | 35 | */ |
35 | 36 | public function build(ContainerBuilder $container); |
36 | 37 | |
37 | 38 | /** |
38 | - * @param NodeDefinition $node |
|
39 | + * @param ArrayNodeDefinition $node |
|
40 | + * @return void |
|
39 | 41 | */ |
40 | 42 | public function getNodeDefinition(ArrayNodeDefinition $node, ArrayNodeDefinition $rootNode); |
41 | 43 |
@@ -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\Exception\OAuth2Exception; |
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,11 +13,11 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\ServerBundle\SecurityPlugin\Resolver; |
15 | 15 | |
16 | -use OAuth2Framework\ServerBundle\Security\Authentication\Token\OAuth2Token; |
|
17 | 16 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
17 | +use OAuth2Framework\ServerBundle\Security\Authentication\Token\OAuth2Token; |
|
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,10 +16,10 @@ |
||
16 | 16 | use OAuth2Framework\ServerBundle\Security\Authentication\Provider\OAuth2Provider; |
17 | 17 | use OAuth2Framework\ServerBundle\Security\EntryPoint\OAuth2EntryPoint; |
18 | 18 | use OAuth2Framework\ServerBundle\Security\Firewall\OAuth2Listener; |
19 | +use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface; |
|
19 | 20 | use Symfony\Component\DependencyInjection\ChildDefinition; |
20 | 21 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
21 | 22 | use Symfony\Component\DependencyInjection\Reference; |
22 | -use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface; |
|
23 | 23 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
24 | 24 | |
25 | 25 | class OAuth2SecurityFactory implements SecurityFactoryInterface |
@@ -13,9 +13,9 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\ServerBundle\Tests\TestBundle\Service; |
15 | 15 | |
16 | +use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
|
16 | 17 | use OAuth2Framework\ServerBundle\Tests\TestBundle\Entity\User; |
17 | 18 | use OAuth2Framework\ServerBundle\Tests\TestBundle\Entity\UserRepository; |
18 | -use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
|
19 | 19 | use Symfony\Component\Security\Core\Exception\UnsupportedUserException; |
20 | 20 | use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; |
21 | 21 | use Symfony\Component\Security\Core\User\UserInterface; |
@@ -19,6 +19,7 @@ |
||
19 | 19 | { |
20 | 20 | /** |
21 | 21 | * @param Authorization $authorization |
22 | + * @return void |
|
22 | 23 | */ |
23 | 24 | public function check(Authorization $authorization); |
24 | 25 | } |
@@ -13,16 +13,16 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\AuthorizationEndpoint; |
15 | 15 | |
16 | -use OAuth2Framework\Component\AuthorizationEndpoint\ParameterChecker\ParameterCheckerManager; |
|
17 | -use OAuth2Framework\Component\AuthorizationEndpoint\UserAccount\UserAccountCheckerManager; |
|
18 | -use Psr\Http\Server\RequestHandlerInterface; |
|
19 | -use Psr\Http\Server\MiddlewareInterface; |
|
20 | 16 | use OAuth2Framework\Component\AuthorizationEndpoint\ConsentScreen\ExtensionManager; |
21 | 17 | use OAuth2Framework\Component\AuthorizationEndpoint\Exception\OAuth2AuthorizationException; |
18 | +use OAuth2Framework\Component\AuthorizationEndpoint\ParameterChecker\ParameterCheckerManager; |
|
19 | +use OAuth2Framework\Component\AuthorizationEndpoint\UserAccount\UserAccountCheckerManager; |
|
22 | 20 | use OAuth2Framework\Component\AuthorizationEndpoint\UserAccount\UserAccountDiscovery; |
23 | 21 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
24 | 22 | use Psr\Http\Message\ResponseInterface; |
25 | 23 | use Psr\Http\Message\ServerRequestInterface; |
24 | +use Psr\Http\Server\MiddlewareInterface; |
|
25 | +use Psr\Http\Server\RequestHandlerInterface; |
|
26 | 26 | |
27 | 27 | abstract class AuthorizationEndpoint implements MiddlewareInterface |
28 | 28 | { |