@@ -106,7 +106,7 @@ |
||
| 106 | 106 | * Response constructor. |
| 107 | 107 | * @param string $accessToken |
| 108 | 108 | * @param string $tokenType |
| 109 | - * @param int|null $expiresIn |
|
| 109 | + * @param integer $expiresIn |
|
| 110 | 110 | * @param null|string $refreshToken |
| 111 | 111 | * @param null|string $scope |
| 112 | 112 | */ |
@@ -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; |
@@ -68,7 +68,7 @@ |
||
| 68 | 68 | /** |
| 69 | 69 | * Server constructor. |
| 70 | 70 | * @param ResourceOwnerProviderInterface $resourceOwnerProvider |
| 71 | - * @param null|StorageRepository $storageRepository |
|
| 71 | + * @param StorageRepository $storageRepository |
|
| 72 | 72 | * @param null|ConfigurationRepository $configurationRepository |
| 73 | 73 | * @param ResponseTypeRepository $responseTypeRepository |
| 74 | 74 | * @param null|GrantTypeRepository $grantTypeRepository |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | * method available via the user-agent to accomplish this redirection is |
| 43 | 43 | * allowed and is considered to be an implementation detail |
| 44 | 44 | * |
| 45 | - * @param $uri |
|
| 45 | + * @param string $uri |
|
| 46 | 46 | * @return Response |
| 47 | 47 | */ |
| 48 | 48 | protected function redirectResponse($uri) |
@@ -274,7 +274,7 @@ |
||
| 274 | 274 | * @param RegisteredClient $client |
| 275 | 275 | * @param null|string $redirectUri |
| 276 | 276 | * @param bool $isImplicitGrant |
| 277 | - * @return Uri|null|string |
|
| 277 | + * @return \Psr\Http\Message\UriInterface |
|
| 278 | 278 | * @throws \Exception |
| 279 | 279 | */ |
| 280 | 280 | private function checkClientRedirectUri(RegisteredClient $client, ?string $redirectUri, $isImplicitGrant = false) |
@@ -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 | |
@@ -115,7 +115,7 @@ |
||
| 115 | 115 | * @param UriInterface $redirectUri |
| 116 | 116 | * @param string $accessToken |
| 117 | 117 | * @param string $tokenType |
| 118 | - * @param int|null $expiresIn |
|
| 118 | + * @param integer $expiresIn |
|
| 119 | 119 | * @param null|string $refreshToken |
| 120 | 120 | * @param null|string $scope |
| 121 | 121 | */ |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | |
| 142 | 142 | /** |
| 143 | 143 | * @param string $name |
| 144 | - * @return mixed |
|
| 144 | + * @return boolean |
|
| 145 | 145 | * @throws \Exception |
| 146 | 146 | */ |
| 147 | 147 | public function getConfig(string $name) |
@@ -161,6 +161,9 @@ discard block |
||
| 161 | 161 | return $this->grantTypes[$uri] ?? null; |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | + /** |
|
| 165 | + * @return \OAuth2\Storages\AuthorizationCodeStorageInterface |
|
| 166 | + */ |
|
| 164 | 167 | public function getStorage(string $name) |
| 165 | 168 | { |
| 166 | 169 | return $this->storages[$name]; |
@@ -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 | /** |