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

allow middleware use

Browse Source
This commit is contained in:
Julián Gutiérrez
2016-01-15 14:02:47 +01:00
parent 0fbe447862
commit 65d981ad32
7 changed files with 63 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Exception/OAuthServerException.php
View File

@@ -204,8 +204,12 @@ class OAuthServerException extends \Exception
*
* @return ResponseInterface
*/
public function generateHttpResponse()
public function generateHttpResponse(ResponseInterface $response = null)
{
if (!$response instanceof ResponseInterface) {
$response = new Response();
}
$headers = $this->getHttpHeaders();
$payload = [
@@ -221,12 +225,13 @@ class OAuthServerException extends \Exception
$headers['Location'] = RedirectUri::make($this->redirectUri, $payload);
}
$response = new Response(
'php://memory',
$this->getHttpStatusCode(),
$headers
);
$response->getBody()->write(json_encode($payload));
foreach ($headers as $header => $content) {
$response->withHeader($header, $content);
}
$response
->withStatus($this->getHttpStatusCode())
->getBody()->write(json_encode($payload));
return $response;
}
@@ -254,8 +259,7 @@ class OAuthServerException extends \Exception
if ($this->errorType === 'invalid_client') {
$authScheme = null;
$request = new ServerRequest();
if (
isset($request->getServerParams()['PHP_AUTH_USER']) &&
if (isset($request->getServerParams()['PHP_AUTH_USER']) &&
$request->getServerParams()['PHP_AUTH_USER'] !== null
) {
$authScheme = 'Basic';