diff --git a/src/Middleware/ResourceServerMiddleware.php b/src/Middleware/ResourceServerMiddleware.php index 65d6e8e4..eecaabbe 100644 --- a/src/Middleware/ResourceServerMiddleware.php +++ b/src/Middleware/ResourceServerMiddleware.php @@ -35,7 +35,7 @@ class ResourceServerMiddleware public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next) { try { - $request = $this->server->validateRequest($request); + $request = $this->server->validateAuthenticatedRequest($request); } catch (OAuthServerException $exception) { return $exception->generateHttpResponse($response); // @codeCoverageIgnoreStart diff --git a/src/ResponseTypes/AbstractResponseType.php b/src/ResponseTypes/AbstractResponseType.php index bc218266..b0e8dfc0 100644 --- a/src/ResponseTypes/AbstractResponseType.php +++ b/src/ResponseTypes/AbstractResponseType.php @@ -77,7 +77,7 @@ abstract class AbstractResponseType implements ResponseTypeInterface /** * {@inheritdoc} */ - public function determineAccessTokenInHeader(ServerRequestInterface $request) + public function validateAccessToken(ServerRequestInterface $request) { if ($request->hasHeader('authorization') === false) { throw OAuthServerException::accessDenied('Missing "Authorization" header'); diff --git a/src/ResponseTypes/BearerTokenResponse.php b/src/ResponseTypes/BearerTokenResponse.php index 643c1917..c161bd3c 100644 --- a/src/ResponseTypes/BearerTokenResponse.php +++ b/src/ResponseTypes/BearerTokenResponse.php @@ -67,9 +67,9 @@ class BearerTokenResponse extends AbstractResponseType /** * {@inheritdoc} */ - public function determineAccessTokenInHeader(ServerRequestInterface $request) + public function validateAccessToken(ServerRequestInterface $request) { - $request = parent::determineAccessTokenInHeader($request); + $request = parent::validateAccessToken($request); $header = $request->getHeader('authorization'); $jwt = trim(preg_replace('/^(?:\s+)?Bearer\s/', '', $header[0])); diff --git a/src/ResponseTypes/MAC.php b/src/ResponseTypes/MAC.php index 598214d4..106d7330 100644 --- a/src/ResponseTypes/MAC.php +++ b/src/ResponseTypes/MAC.php @@ -41,7 +41,7 @@ class MAC extends AbstractTokenType implements TokenTypeInterface /** * {@inheritdoc} */ - public function determineAccessTokenInHeader(Request $request) + public function validateAccessToken(Request $request) { if ($request->headers->has('Authorization') === false) { return; diff --git a/src/ResponseTypes/ResponseTypeInterface.php b/src/ResponseTypes/ResponseTypeInterface.php index 34198eaf..982ef2b1 100644 --- a/src/ResponseTypes/ResponseTypeInterface.php +++ b/src/ResponseTypes/ResponseTypeInterface.php @@ -35,7 +35,7 @@ interface ResponseTypeInterface * * @return ServerRequestInterface */ - public function determineAccessTokenInHeader(ServerRequestInterface $request); + public function validateAccessToken(ServerRequestInterface $request); /** * @param ResponseInterface $response diff --git a/src/Server.php b/src/Server.php index 248a5b7c..9d328d3c 100644 --- a/src/Server.php +++ b/src/Server.php @@ -158,9 +158,9 @@ class Server implements EmitterAwareInterface * * @return \Psr\Http\Message\ServerRequestInterface */ - public function validateRequest(ServerRequestInterface $request) + public function validateAuthenticatedRequest(ServerRequestInterface $request) { - return $this->getResponseType()->determineAccessTokenInHeader($request); + return $this->getResponseType()->validateAccessToken($request); } /**