@@ -15,12 +15,12 @@ |
||
| 15 | 15 | |
| 16 | 16 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
| 17 | 17 | use OAuth2Framework\Component\Core\Client\Client; |
| 18 | +use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
| 18 | 19 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwner; |
| 20 | +use OAuth2Framework\Component\Scope\Policy\ScopePolicyManager; |
|
| 19 | 21 | use OAuth2Framework\Component\TokenEndpoint\Extension\TokenEndpointExtension; |
| 20 | -use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
| 21 | 22 | use OAuth2Framework\Component\TokenEndpoint\GrantType; |
| 22 | -use OAuth2Framework\Component\Scope\Policy\ScopePolicyManager; |
|
| 23 | -use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
| 23 | +use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
| 24 | 24 | use Psr\Http\Message\ServerRequestInterface; |
| 25 | 25 | |
| 26 | 26 | class TokenEndpointScopeExtension implements TokenEndpointExtension |
@@ -15,12 +15,12 @@ |
||
| 15 | 15 | |
| 16 | 16 | use OAuth2Framework\Component\Core\Client\ClientId; |
| 17 | 17 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
| 18 | +use OAuth2Framework\Component\Core\Domain\DomainObject; |
|
| 18 | 19 | use OAuth2Framework\Component\Core\Event\Event; |
| 19 | 20 | use OAuth2Framework\Component\Core\Id\Id; |
| 20 | -use OAuth2Framework\Component\RefreshTokenGrant\RefreshTokenId; |
|
| 21 | 21 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
| 22 | 22 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServerId; |
| 23 | -use OAuth2Framework\Component\Core\Domain\DomainObject; |
|
| 23 | +use OAuth2Framework\Component\RefreshTokenGrant\RefreshTokenId; |
|
| 24 | 24 | |
| 25 | 25 | class RefreshTokenCreatedEvent extends Event |
| 26 | 26 | { |
@@ -15,7 +15,6 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | use Http\Message\MessageFactory\DiactorosMessageFactory; |
| 17 | 17 | use Http\Message\ResponseFactory; |
| 18 | -use Psr\Http\Server\RequestHandlerInterface; |
|
| 19 | 18 | use OAuth2Framework\Component\BearerTokenType\BearerToken; |
| 20 | 19 | use OAuth2Framework\Component\ClientConfigurationEndpoint\ClientConfigurationEndpoint; |
| 21 | 20 | use OAuth2Framework\Component\ClientRule\RuleManager; |
@@ -28,6 +27,7 @@ discard block |
||
| 28 | 27 | use PHPUnit\Framework\TestCase; |
| 29 | 28 | use Prophecy\Argument; |
| 30 | 29 | use Psr\Http\Message\ServerRequestInterface; |
| 30 | +use Psr\Http\Server\RequestHandlerInterface; |
|
| 31 | 31 | use SimpleBus\Message\Bus\MessageBus; |
| 32 | 32 | |
| 33 | 33 | /** |
@@ -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 | |
@@ -45,9 +45,9 @@ |
||
| 45 | 45 | use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
| 46 | 46 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
| 47 | 47 | use OAuth2Framework\Component\JwtBearerGrant\JwtBearerGrantType; |
| 48 | +use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
| 48 | 49 | use OAuth2Framework\Component\TrustedIssuer\TrustedIssuer; |
| 49 | 50 | use OAuth2Framework\Component\TrustedIssuer\TrustedIssuerRepository; |
| 50 | -use OAuth2Framework\Component\TokenEndpoint\GrantTypeData; |
|
| 51 | 51 | use PHPUnit\Framework\TestCase; |
| 52 | 52 | use Prophecy\Argument; |
| 53 | 53 | use Psr\Http\Message\ServerRequestInterface; |
@@ -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; |