@@ -13,14 +13,14 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\Server\AuthorizationEndpoint; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
17 | -use Psr\Http\Server\MiddlewareInterface; |
|
18 | 16 | use OAuth2Framework\Component\Server\AuthorizationEndpoint\ConsentScreen\ExtensionManager; |
19 | 17 | use OAuth2Framework\Component\Server\AuthorizationEndpoint\Exception\OAuth2AuthorizationException; |
20 | 18 | use OAuth2Framework\Component\Server\AuthorizationEndpoint\UserAccountDiscovery\UserAccountDiscoveryManager; |
21 | 19 | use OAuth2Framework\Component\Server\Core\Exception\OAuth2Exception; |
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 | abstract class AuthorizationEndpoint implements MiddlewareInterface |
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\Server\BearerTokenType\BearerToken; |
20 | 19 | use OAuth2Framework\Component\Server\ClientConfigurationEndpoint\ClientConfigurationEndpoint; |
21 | 20 | use OAuth2Framework\Component\Server\ClientRegistrationEndpoint\Rule\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 | /** |
@@ -13,14 +13,14 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\Server\Middleware; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
17 | -use Psr\Http\Server\MiddlewareInterface; |
|
18 | 16 | use OAuth2Framework\Component\Server\Core\AccessToken\AccessTokenId; |
19 | 17 | use OAuth2Framework\Component\Server\Core\AccessToken\AccessTokenRepository; |
20 | 18 | use OAuth2Framework\Component\Server\Core\Exception\OAuth2Exception; |
21 | 19 | use OAuth2Framework\Component\Server\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 | final class AccessTokenMiddleware implements MiddlewareInterface |
26 | 26 | { |
@@ -13,12 +13,12 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\Server\Middleware; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
17 | -use Psr\Http\Server\MiddlewareInterface; |
|
18 | 16 | use OAuth2Framework\Component\Server\Core\Exception\OAuth2Exception; |
19 | 17 | use OAuth2Framework\Component\Server\Core\Response\OAuth2ResponseFactoryManager; |
20 | 18 | use Psr\Http\Message\ResponseInterface; |
21 | 19 | use Psr\Http\Message\ServerRequestInterface; |
20 | +use Psr\Http\Server\MiddlewareInterface; |
|
21 | +use Psr\Http\Server\RequestHandlerInterface; |
|
22 | 22 | |
23 | 23 | final class OAuth2ResponseMiddleware implements MiddlewareInterface |
24 | 24 | { |
@@ -13,8 +13,6 @@ discard block |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\Server\Middleware; |
15 | 15 | |
16 | -use Psr\Http\Server\RequestHandlerInterface; |
|
17 | -use Psr\Http\Server\MiddlewareInterface; |
|
18 | 16 | use OAuth2Framework\Component\Server\Core\AccessToken\AccessToken; |
19 | 17 | use OAuth2Framework\Component\Server\Core\AccessToken\AccessTokenHandlerManager; |
20 | 18 | use OAuth2Framework\Component\Server\Core\AccessToken\AccessTokenId; |
@@ -23,6 +21,8 @@ discard block |
||
23 | 21 | use OAuth2Framework\Component\Server\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 | final class OAuth2SecurityMiddleware implements MiddlewareInterface |
28 | 28 | { |
@@ -14,21 +14,21 @@ |
||
14 | 14 | namespace OAuth2Framework\Component\Server\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\Server\Core\AccessToken\AccessToken; |
23 | 21 | use OAuth2Framework\Component\Server\Core\Client\Client; |
24 | 22 | use OAuth2Framework\Component\Server\Core\Client\ClientRepository; |
25 | -use OAuth2Framework\Component\Server\Core\UserAccount\UserAccountId; |
|
23 | +use OAuth2Framework\Component\Server\Core\Exception\OAuth2Exception; |
|
26 | 24 | use OAuth2Framework\Component\Server\Core\UserAccount\UserAccount; |
25 | +use OAuth2Framework\Component\Server\Core\UserAccount\UserAccountId; |
|
27 | 26 | use OAuth2Framework\Component\Server\Core\UserAccount\UserAccountRepository; |
28 | -use OAuth2Framework\Component\Server\Core\Exception\OAuth2Exception; |
|
29 | 27 | use OAuth2Framework\Component\Server\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 | final class UserInfoEndpoint implements MiddlewareInterface |
34 | 34 | { |
@@ -13,10 +13,10 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\Component\Server\RefreshTokenGrant; |
15 | 15 | |
16 | -use OAuth2Framework\Component\Server\TokenEndpoint\GrantTypeData; |
|
17 | 16 | use OAuth2Framework\Component\Server\Core\Client\Client; |
18 | 17 | use OAuth2Framework\Component\Server\Core\Exception\OAuth2Exception; |
19 | 18 | use OAuth2Framework\Component\Server\TokenEndpoint\GrantType; |
19 | +use OAuth2Framework\Component\Server\TokenEndpoint\GrantTypeData; |
|
20 | 20 | use Psr\Http\Message\ServerRequestInterface; |
21 | 21 | |
22 | 22 | final class RefreshTokenGrantType implements GrantType |
@@ -15,8 +15,8 @@ |
||
15 | 15 | |
16 | 16 | use OAuth2Framework\Component\Server\AuthorizationEndpoint\Authorization; |
17 | 17 | use OAuth2Framework\Component\Server\AuthorizationEndpoint\ParameterChecker\ParameterChecker; |
18 | -use OAuth2Framework\Component\Server\Scope\Policy\ScopePolicyManager; |
|
19 | 18 | use OAuth2Framework\Component\Server\Core\Exception\OAuth2Exception; |
19 | +use OAuth2Framework\Component\Server\Scope\Policy\ScopePolicyManager; |
|
20 | 20 | |
21 | 21 | final class ScopeParameterChecker implements ParameterChecker |
22 | 22 | { |
@@ -18,8 +18,8 @@ |
||
18 | 18 | use OAuth2Framework\Component\Server\Core\Client\Client; |
19 | 19 | use OAuth2Framework\Component\Server\Core\Client\ClientId; |
20 | 20 | use OAuth2Framework\Component\Server\Core\DataBag\DataBag; |
21 | -use OAuth2Framework\Component\Server\Core\ResourceOwner\ResourceOwner; |
|
22 | 21 | use OAuth2Framework\Component\Server\Core\Exception\OAuth2Exception; |
22 | +use OAuth2Framework\Component\Server\Core\ResourceOwner\ResourceOwner; |
|
23 | 23 | use OAuth2Framework\Component\Server\Core\UserAccount\UserAccountId; |
24 | 24 | use OAuth2Framework\Component\Server\Scope\Policy\NoScopePolicy; |
25 | 25 | use OAuth2Framework\Component\Server\Scope\Policy\ScopePolicyManager; |