@@ -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; |
@@ -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; |
@@ -40,6 +40,7 @@ |
||
40 | 40 | |
41 | 41 | /** |
42 | 42 | * {@inheritdoc} |
43 | + * @param string $username |
|
43 | 44 | */ |
44 | 45 | public function loadUserByUsername($username) |
45 | 46 | { |
@@ -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 | 39 | * @param NodeDefinition $node |
40 | + * @return void |
|
39 | 41 | */ |
40 | 42 | public function getNodeDefinition(ArrayNodeDefinition $node, ArrayNodeDefinition $rootNode); |
41 | 43 |
@@ -13,8 +13,8 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\ServerBundle\Tests\TestBundle\Controller; |
15 | 15 | |
16 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
|
17 | 16 | use OAuth2Framework\ServerBundle\Annotation\OAuth2; |
17 | +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
|
18 | 18 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
19 | 19 | use Symfony\Component\HttpFoundation\JsonResponse; |
20 | 20 | use Symfony\Component\HttpFoundation\Response; |
@@ -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 | { |
@@ -37,15 +37,15 @@ |
||
37 | 37 | use Jose\Component\Signature\JWSTokenSupport; |
38 | 38 | use Jose\Component\Signature\JWSVerifier; |
39 | 39 | use Jose\Component\Signature\Serializer\CompactSerializer; |
40 | +use OAuth2Framework\Component\ClientAuthentication\AuthenticationMethodManager; |
|
41 | +use OAuth2Framework\Component\ClientAuthentication\ClientAssertionJwt; |
|
40 | 42 | use OAuth2Framework\Component\Core\Client\Client; |
41 | 43 | use OAuth2Framework\Component\Core\Client\ClientId; |
42 | 44 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
43 | 45 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
44 | -use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
|
45 | -use OAuth2Framework\Component\ClientAuthentication\AuthenticationMethodManager; |
|
46 | -use OAuth2Framework\Component\ClientAuthentication\ClientAssertionJwt; |
|
47 | 46 | use OAuth2Framework\Component\Core\TrustedIssuer\TrustedIssuer; |
48 | 47 | use OAuth2Framework\Component\Core\TrustedIssuer\TrustedIssuerRepository; |
48 | +use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
|
49 | 49 | use PHPUnit\Framework\TestCase; |
50 | 50 | use Psr\Http\Message\ServerRequestInterface; |
51 | 51 | use Zend\Diactoros\Response; |
@@ -41,12 +41,12 @@ |
||
41 | 41 | use OAuth2Framework\Component\Core\Client\ClientRepository; |
42 | 42 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
43 | 43 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
44 | +use OAuth2Framework\Component\Core\TrustedIssuer\TrustedIssuer; |
|
45 | +use OAuth2Framework\Component\Core\TrustedIssuer\TrustedIssuerRepository; |
|
44 | 46 | use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
45 | 47 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
46 | 48 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
47 | 49 | use OAuth2Framework\Component\JwtBearerGrant\JwtBearerGrantType; |
48 | -use OAuth2Framework\Component\Core\TrustedIssuer\TrustedIssuer; |
|
49 | -use OAuth2Framework\Component\Core\TrustedIssuer\TrustedIssuerRepository; |
|
50 | 50 | use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
51 | 51 | use PHPUnit\Framework\TestCase; |
52 | 52 | use Prophecy\Argument; |
@@ -25,6 +25,7 @@ |
||
25 | 25 | * @throws Exception\ProcessAuthorizationException |
26 | 26 | * @throws Exception\RedirectToLoginPageException |
27 | 27 | * @throws Exception\ShowConsentScreenException |
28 | + * @return void |
|
28 | 29 | */ |
29 | 30 | public function check(Authorization $authorization); |
30 | 31 | } |