ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2025-05-31 14:12:07 +05:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'V5-WIP' into minor_merge

Browse Source
This commit is contained in:
Julián Gutiérrez
2016-02-12 00:12:56 +01:00
parent 8fb64041df a40ac5d77b
commit 8b185e0580
14 changed files with 108 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Exception/OAuthServerException.php
View File

@@ -2,10 +2,10 @@
namespace League\OAuth2\Server\Exception;
use League\OAuth2\Server\Utils\RedirectUri;
use Psr\Http\Message\ResponseInterface;
use Zend\Diactoros\Response;
use Zend\Diactoros\ServerRequest;
use Zend\Diactoros\Uri;
class OAuthServerException extends \Exception
{
@@ -186,6 +186,7 @@ class OAuthServerException extends \Exception
/**
* Invalid refresh token
*
* @param string|null $hint
* @return static
*/
public static function invalidRefreshToken($hint = null)
@@ -238,16 +239,21 @@ class OAuthServerException extends \Exception
}
if ($this->redirectUri !== null) {
$headers['Location'] = RedirectUri::make($this->redirectUri, $payload);
$redirectUri = new Uri($this->redirectUri);
parse_str($redirectUri->getQuery(), $redirectPayload);
$headers['Location'] = (string) $redirectUri->withQuery(http_build_query(
array_merge($redirectPayload, $payload)
));
}
foreach ($headers as $header => $content) {
$response = $response->withHeader($header, $content);
}
$response = $response->withStatus($this->getHttpStatusCode());
$response->getBody()->write(json_encode($payload));
return $response;
return $response->withStatus($this->getHttpStatusCode());
}
/**