@@ -9,8 +9,6 @@ |
||
| 9 | 9 | namespace OAuth2\ClientAuthentication\Authenticators; |
| 10 | 10 | |
| 11 | 11 | |
| 12 | -use OAuth2\Role\Client\Type\ClientPassword; |
|
| 13 | -use OAuth2\Role\Client\Type\ConfidentialClient; |
|
| 14 | 12 | use OAuth2\Roles\ClientInterface; |
| 15 | 13 | use OAuth2\Roles\Clients\ConfidentialClientInterface; |
| 16 | 14 | use OAuth2\Storages\ClientStorageInterface; |
@@ -9,8 +9,6 @@ |
||
| 9 | 9 | namespace OAuth2\EndpointMessages\Authorization; |
| 10 | 10 | |
| 11 | 11 | use GuzzleHttp\Psr7\Response; |
| 12 | -use GuzzleHttp\Psr7\Uri; |
|
| 13 | -use OAuth2\Credentials\AuthorizationCode; |
|
| 14 | 12 | use Psr\Http\Message\UriInterface; |
| 15 | 13 | |
| 16 | 14 | |
@@ -10,7 +10,6 @@ |
||
| 10 | 10 | |
| 11 | 11 | |
| 12 | 12 | use GuzzleHttp\Psr7\Response; |
| 13 | -use Psr\Http\Message\UriInterface; |
|
| 14 | 13 | |
| 15 | 14 | /** |
| 16 | 15 | * Class AccessTokenResponse |
@@ -10,8 +10,6 @@ |
||
| 10 | 10 | |
| 11 | 11 | |
| 12 | 12 | use GuzzleHttp\Psr7\Response; |
| 13 | -use GuzzleHttp\Psr7\Uri; |
|
| 14 | -use Psr\Http\Message\UriInterface; |
|
| 15 | 13 | |
| 16 | 14 | class ErrorResponse extends Response |
| 17 | 15 | { |
@@ -12,7 +12,6 @@ |
||
| 12 | 12 | use OAuth2\Config; |
| 13 | 13 | use OAuth2\Exceptions\OAuthException; |
| 14 | 14 | use OAuth2\Repositories\ConfigurationRepository; |
| 15 | -use OAuth2\ResponseTypes\ResponseTypeInterface; |
|
| 16 | 15 | use OAuth2\Roles\Clients\RegisteredClient; |
| 17 | 16 | use OAuth2\Roles\ResourceOwnerInterface; |
| 18 | 17 | use OAuth2\Storages\AuthorizationCodeStorageInterface; |
@@ -10,20 +10,16 @@ |
||
| 10 | 10 | |
| 11 | 11 | use GuzzleHttp\Psr7\Response; |
| 12 | 12 | use GuzzleHttp\Psr7\Uri; |
| 13 | -use OAuth2\Credential\AuthorizationCode; |
|
| 14 | 13 | use OAuth2\Endpoint\Config; |
| 15 | 14 | use OAuth2\Endpoint\Endpoint; |
| 16 | 15 | use OAuth2\Endpoint\Server\Messages\Authorization\AuthorizationRequest as AuthorizationRequest; |
| 17 | -use OAuth2\Endpoint\Server\Messages\Authorization\AuthorizationResponse as AuthorizationResponse; |
|
| 18 | 16 | use OAuth2\Endpoint\Server\Messages\Authorization\ErrorResponse; |
| 19 | 17 | use OAuth2\Exception\MissingResourceOwnerDecision; |
| 20 | 18 | use OAuth2\Exception\ResourceOwnerNotAuthenticatedException; |
| 21 | 19 | use OAuth2\ResponseType\ResponseTypeInterface; |
| 22 | -use OAuth2\Storage\ClientStorage; |
|
| 23 | 20 | use OAuth2\Role\Client\RegisteredClient; |
| 24 | 21 | use OAuth2\Role\Client\Type\ClientPassword; |
| 25 | 22 | use OAuth2\Role\Client\Type\PublicClient; |
| 26 | -use OAuth2\Role\Client\WebApplication; |
|
| 27 | 23 | use OAuth2\Role\ResourceOwner; |
| 28 | 24 | |
| 29 | 25 | |
@@ -238,8 +238,7 @@ |
||
| 238 | 238 | |
| 239 | 239 | if($isImplicitResponseType) { |
| 240 | 240 | $redirectUri = $redirectUri->withFragment(http_build_query($params)); |
| 241 | - } |
|
| 242 | - else { |
|
| 241 | + } else { |
|
| 243 | 242 | foreach ($params as $key => $value) { |
| 244 | 243 | $redirectUri = Uri::withQueryValue($redirectUri, $key, $value); |
| 245 | 244 | } |
@@ -18,7 +18,6 @@ |
||
| 18 | 18 | use OAuth2\Storage\AuthorizationCodeStorage; |
| 19 | 19 | use OAuth2\Storage\ClientStorage; |
| 20 | 20 | use OAuth2\Role\Client\RegisteredClient; |
| 21 | -use OAuth2\Role\Client\Type\ClientPassword; |
|
| 22 | 21 | use Psr\Http\Message\ServerRequestInterface; |
| 23 | 22 | |
| 24 | 23 | class Server |
@@ -11,19 +11,11 @@ |
||
| 11 | 11 | use GuzzleHttp\Psr7\Uri; |
| 12 | 12 | use OAuth2\Credential\AccessToken; |
| 13 | 13 | use OAuth2\Credential\RefreshToken; |
| 14 | -use OAuth2\Credential\TokenType\BearerToken; |
|
| 15 | -use OAuth2\Endpoint\Config; |
|
| 16 | 14 | use OAuth2\Endpoint\Server\Messages\AccessToken\AccessTokenRequest; |
| 17 | 15 | use OAuth2\Endpoint\Server\Messages\AccessToken\AccessTokenResponse; |
| 18 | -use OAuth2\Endpoint\Server\Messages\Authorization\AuthorizationRequest; |
|
| 19 | 16 | use OAuth2\Endpoint\Server\Messages\AccessToken\ErrorResponse; |
| 20 | -use OAuth2\GrantType\AuthorizationCode; |
|
| 21 | 17 | use OAuth2\GrantType\InvalidGrantType; |
| 22 | -use OAuth2\Storage\ClientStorage; |
|
| 23 | 18 | use OAuth2\Role\Client; |
| 24 | -use OAuth2\Role\Client\RegisteredClient; |
|
| 25 | -use OAuth2\Role\Client\Type\ClientPassword; |
|
| 26 | -use Psr\Http\Message\ServerRequestInterface; |
|
| 27 | 19 | |
| 28 | 20 | |
| 29 | 21 | /** |
@@ -166,8 +166,7 @@ |
||
| 166 | 166 | |
| 167 | 167 | try { |
| 168 | 168 | $redirectUri = $grantType->grant($request, $client); |
| 169 | - } |
|
| 170 | - catch(InvalidGrantType $e) { |
|
| 169 | + } catch(InvalidGrantType $e) { |
|
| 171 | 170 | return new ErrorResponse('invalid_grant', $e->getErrorDescription(), $e->getErrorUri()); |
| 172 | 171 | } |
| 173 | 172 | |
@@ -8,15 +8,10 @@ |
||
| 8 | 8 | |
| 9 | 9 | namespace OAuth2\GrantType; |
| 10 | 10 | use OAuth2\Endpoint\Server\Messages\AccessToken\AccessTokenRequest; |
| 11 | -use OAuth2\Endpoint\Server\Messages\AccessToken\ErrorResponse; |
|
| 12 | 11 | use OAuth2\Endpoint\Server\Messages\Authorization\AuthorizationRequest; |
| 13 | 12 | use OAuth2\Endpoint\Server\Messages\Authorization\AuthorizationResponse; |
| 14 | -use OAuth2\Endpoint\Server\Server; |
|
| 15 | -use OAuth2\Role\Client; |
|
| 16 | 13 | use OAuth2\Role\Client\RegisteredClient; |
| 17 | -use OAuth2\Storage\AuthorizationCodeStorage; |
|
| 18 | 14 | use OAuth2\Storages\AuthorizationCodeStorageInterface; |
| 19 | -use Psr\Http\Message\ServerRequestInterface; |
|
| 20 | 15 | |
| 21 | 16 | /** |
| 22 | 17 | * Class AuthorizationCode |