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 pull request #431 from juliangut/redirectUri

Browse Source 
V5 - use Psr\Http\Message\UriInterface
This commit is contained in:
Alex Bilbie
2016-02-11 17:35:33 +00:00
parent 7a8c92b3d9 95634fb390
commit 770bda8f10
2 changed files with 7 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Exception/OAuthServerException.php
View File

@@ -6,6 +6,7 @@ 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
{
@@ -236,7 +237,12 @@ 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) {