@@ -22,7 +22,6 @@ |
||
| 22 | 22 | * @param ClientId $clientId |
| 23 | 23 | * @param DataBag $commandParameters |
| 24 | 24 | * @param DataBag $validatedParameters |
| 25 | - * @param UserAccountId|null $userAccountId |
|
| 26 | 25 | * @param callable $next |
| 27 | 26 | * |
| 28 | 27 | * @return DataBag |
@@ -17,6 +17,7 @@ |
||
| 17 | 17 | { |
| 18 | 18 | /** |
| 19 | 19 | * @param AccessToken $token |
| 20 | + * @return void |
|
| 20 | 21 | */ |
| 21 | 22 | public function save(AccessToken $token); |
| 22 | 23 | |
@@ -14,23 +14,23 @@ |
||
| 14 | 14 | namespace OAuth2Framework\Component\TokenEndpoint; |
| 15 | 15 | |
| 16 | 16 | use Http\Message\ResponseFactory; |
| 17 | -use OAuth2Framework\Component\Core\AccessToken\AccessTokenIdGenerator; |
|
| 18 | -use Psr\Http\Server\RequestHandlerInterface; |
|
| 19 | -use Psr\Http\Server\MiddlewareInterface; |
|
| 20 | 17 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
| 18 | +use OAuth2Framework\Component\Core\AccessToken\AccessTokenIdGenerator; |
|
| 21 | 19 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenRepository; |
| 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; |
|
| 27 | 26 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
| 28 | 27 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
| 29 | -use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
| 30 | 28 | use OAuth2Framework\Component\TokenEndpoint\Extension\TokenEndpointExtensionManager; |
| 31 | 29 | use OAuth2Framework\Component\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 | { |
@@ -15,11 +15,11 @@ |
||
| 15 | 15 | |
| 16 | 16 | use OAuth2Framework\Component\Core\Client\Event as ClientEvent; |
| 17 | 17 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
| 18 | +use OAuth2Framework\Component\Core\Domain\DomainObject; |
|
| 18 | 19 | use OAuth2Framework\Component\Core\Event\Event; |
| 19 | -use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
| 20 | 20 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwner; |
| 21 | +use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
|
| 21 | 22 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
| 22 | -use OAuth2Framework\Component\Core\Domain\DomainObject; |
|
| 23 | 23 | use SimpleBus\Message\Recorder\ContainsRecordedMessages; |
| 24 | 24 | use SimpleBus\Message\Recorder\PrivateMessageRecorderCapabilities; |
| 25 | 25 | |
@@ -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 | |
@@ -14,15 +14,15 @@ |
||
| 14 | 14 | namespace OAuth2Framework\ServerBundle\Controller; |
| 15 | 15 | |
| 16 | 16 | use Http\Message\MessageFactory; |
| 17 | -use OAuth2Framework\ServerBundle\Form\FormFactory; |
|
| 18 | -use OAuth2Framework\ServerBundle\Form\Handler\AuthorizationFormHandler; |
|
| 19 | -use OAuth2Framework\ServerBundle\Form\Model\AuthorizationModel; |
|
| 20 | 17 | use OAuth2Framework\Component\AuthorizationEndpoint\Authorization; |
| 21 | 18 | use OAuth2Framework\Component\AuthorizationEndpoint\AuthorizationEndpoint; |
| 22 | 19 | use OAuth2Framework\Component\AuthorizationEndpoint\AuthorizationFactory; |
| 23 | 20 | use OAuth2Framework\Component\AuthorizationEndpoint\ConsentScreen\ExtensionManager; |
| 24 | 21 | use OAuth2Framework\Component\AuthorizationEndpoint\Exception\ProcessAuthorizationException; |
| 25 | 22 | use OAuth2Framework\Component\AuthorizationEndpoint\UserAccountDiscovery\UserAccountDiscoveryManager; |
| 23 | +use OAuth2Framework\ServerBundle\Form\FormFactory; |
|
| 24 | +use OAuth2Framework\ServerBundle\Form\Handler\AuthorizationFormHandler; |
|
| 25 | +use OAuth2Framework\ServerBundle\Form\Model\AuthorizationModel; |
|
| 26 | 26 | use Psr\Http\Message\ResponseInterface; |
| 27 | 27 | use Psr\Http\Message\ServerRequestInterface; |
| 28 | 28 | use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface; |
@@ -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; |