@@ -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 | { |
@@ -13,8 +13,6 @@ discard block |
||
| 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\AccessToken; |
| 19 | 17 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenHandlerManager; |
| 20 | 18 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenId; |
@@ -23,6 +21,8 @@ discard block |
||
| 23 | 21 | use OAuth2Framework\Component\TokenType\TokenTypeManager; |
| 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 | class OAuth2SecurityMiddleware implements MiddlewareInterface |
| 28 | 28 | { |
@@ -13,11 +13,11 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace OAuth2Framework\Component\OpenIdConnect\UserInfo; |
| 15 | 15 | |
| 16 | +use OAuth2Framework\Component\Core\Client\Client; |
|
| 17 | +use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
|
| 16 | 18 | use OAuth2Framework\Component\OpenIdConnect\UserInfo\ClaimSource\ClaimSourceManager; |
| 17 | 19 | use OAuth2Framework\Component\OpenIdConnect\UserInfo\Pairwise\PairwiseSubjectIdentifierAlgorithm; |
| 18 | 20 | use OAuth2Framework\Component\OpenIdConnect\UserInfo\ScopeSupport\UserInfoScopeSupportManager; |
| 19 | -use OAuth2Framework\Component\Core\Client\Client; |
|
| 20 | -use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
|
| 21 | 21 | |
| 22 | 22 | class UserInfo |
| 23 | 23 | { |
@@ -14,21 +14,21 @@ |
||
| 14 | 14 | namespace OAuth2Framework\Component\OpenIdConnect\UserInfoEndpoint; |
| 15 | 15 | |
| 16 | 16 | use Http\Message\ResponseFactory; |
| 17 | -use Psr\Http\Server\RequestHandlerInterface; |
|
| 18 | -use Psr\Http\Server\MiddlewareInterface; |
|
| 19 | 17 | use Jose\Component\Core\JWKSet; |
| 20 | 18 | use Jose\Component\Encryption\JWEBuilder; |
| 21 | 19 | use Jose\Component\Signature\JWSBuilder; |
| 22 | 20 | use OAuth2Framework\Component\Core\AccessToken\AccessToken; |
| 23 | 21 | use OAuth2Framework\Component\Core\Client\Client; |
| 24 | 22 | use OAuth2Framework\Component\Core\Client\ClientRepository; |
| 25 | -use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
|
| 23 | +use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
| 26 | 24 | use OAuth2Framework\Component\Core\UserAccount\UserAccount; |
| 25 | +use OAuth2Framework\Component\Core\UserAccount\UserAccountId; |
|
| 27 | 26 | use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
| 28 | -use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
| 29 | 27 | use OAuth2Framework\Component\OpenIdConnect\IdTokenBuilderFactory; |
| 30 | 28 | use Psr\Http\Message\ResponseInterface; |
| 31 | 29 | use Psr\Http\Message\ServerRequestInterface; |
| 30 | +use Psr\Http\Server\MiddlewareInterface; |
|
| 31 | +use Psr\Http\Server\RequestHandlerInterface; |
|
| 32 | 32 | |
| 33 | 33 | class UserInfoEndpoint implements MiddlewareInterface |
| 34 | 34 | { |
@@ -13,11 +13,11 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace OAuth2Framework\Component\RefreshTokenGrant\Command; |
| 15 | 15 | |
| 16 | -use OAuth2Framework\Component\RefreshTokenGrant\RefreshTokenId; |
|
| 17 | 16 | use OAuth2Framework\Component\Core\Client\ClientId; |
| 18 | 17 | use OAuth2Framework\Component\Core\DataBag\DataBag; |
| 19 | -use OAuth2Framework\Component\Core\ResourceServer\ResourceServerId; |
|
| 20 | 18 | use OAuth2Framework\Component\Core\ResourceOwner\ResourceOwnerId; |
| 19 | +use OAuth2Framework\Component\Core\ResourceServer\ResourceServerId; |
|
| 20 | +use OAuth2Framework\Component\RefreshTokenGrant\RefreshTokenId; |
|
| 21 | 21 | |
| 22 | 22 | class CreateRefreshTokenCommand |
| 23 | 23 | { |
@@ -13,9 +13,9 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace OAuth2Framework\Component\ResourceServerAuthentication; |
| 15 | 15 | |
| 16 | +use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
| 16 | 17 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServer; |
| 17 | 18 | use OAuth2Framework\Component\Core\ResourceServer\ResourceServerId; |
| 18 | -use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
|
| 19 | 19 | use Psr\Http\Message\ServerRequestInterface; |
| 20 | 20 | |
| 21 | 21 | class AuthenticationMethodManager |
@@ -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 | /** |