ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2025-01-05 19:43:56 +05:30
Code Issues Packages Projects Releases Wiki Activity

rename determineAccessTokenInHeader

Browse Source
This commit is contained in:
Julián Gutiérrez 2016-02-13 14:38:23 +01:00
parent 186853390a
commit dbcaaa1f35
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Middleware/ResourceServerMiddleware.php
View File

@ -35,7 +35,7 @@ class ResourceServerMiddleware
public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next) public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next)
{ {
try { try {
$request = $this->server->validateRequest($request); $request = $this->server->validateAuthenticatedRequest($request);
} catch (OAuthServerException $exception) { } catch (OAuthServerException $exception) {
return $exception->generateHttpResponse($response); return $exception->generateHttpResponse($response);
} catch (\Exception $exception) { } catch (\Exception $exception) {

2
src/ResponseTypes/AbstractResponseType.php
View File

@ -78,7 +78,7 @@ abstract class AbstractResponseType implements ResponseTypeInterface
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function determineAccessTokenInHeader(ServerRequestInterface $request) public function validateAccessToken(ServerRequestInterface $request)
{ {
if ($request->hasHeader('authorization') === false) { if ($request->hasHeader('authorization') === false) {
throw OAuthServerException::accessDenied('Missing "Authorization" header'); throw OAuthServerException::accessDenied('Missing "Authorization" header');

4
src/ResponseTypes/BearerTokenResponse.php
View File

@ -79,9 +79,9 @@ class BearerTokenResponse extends AbstractResponseType
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function determineAccessTokenInHeader(ServerRequestInterface $request) public function validateAccessToken(ServerRequestInterface $request)
{ {
$request = parent::determineAccessTokenInHeader($request); $request = parent::validateAccessToken($request);
$header = $request->getHeader('authorization'); $header = $request->getHeader('authorization');
$jwt = trim(preg_replace('/^(?:\s+)?Bearer\s/', '', $header[0])); $jwt = trim(preg_replace('/^(?:\s+)?Bearer\s/', '', $header[0]));

2
src/ResponseTypes/MAC.php
View File

@ -42,7 +42,7 @@ class MAC extends AbstractTokenType implements TokenTypeInterface
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function determineAccessTokenInHeader(Request $request) public function validateAccessToken(Request $request)
{ {
if ($request->headers->has('Authorization') === false) { if ($request->headers->has('Authorization') === false) {
return; return;

2
src/ResponseTypes/ResponseTypeInterface.php
View File

@ -36,7 +36,7 @@ interface ResponseTypeInterface
* *
* @return ServerRequestInterface * @return ServerRequestInterface
*/ */
public function determineAccessTokenInHeader(ServerRequestInterface $request); public function validateAccessToken(ServerRequestInterface $request);
/** /**
* @param ResponseInterface $response * @param ResponseInterface $response

4
src/Server.php
View File

@ -157,9 +157,9 @@ class Server implements EmitterAwareInterface
* *
* @throws \League\OAuth2\Server\Exception\OAuthServerException * @throws \League\OAuth2\Server\Exception\OAuthServerException
*/ */
public function validateRequest(ServerRequestInterface $request) public function validateAuthenticatedRequest(ServerRequestInterface $request)
{ {
return $this->getResponseType()->determineAccessTokenInHeader($request); return $this->getResponseType()->validateAccessToken($request);
} }
/** /**