Test fixes

This commit is contained in:
Alex Bilbie 2016-03-10 19:01:57 +00:00
parent 4ab9c52767
commit 6e74de50e5
3 changed files with 6 additions and 6 deletions

View File

@ -95,7 +95,7 @@ class BearerResponseTypeTest extends \PHPUnit_Framework_TestCase
$request = new ServerRequest(); $request = new ServerRequest();
$request = $request->withHeader('authorization', sprintf('Bearer %s', $json->access_token)); $request = $request->withHeader('authorization', sprintf('Bearer %s', $json->access_token));
$request = $responseType->determineAccessTokenInHeader($request); $request = $responseType->validateAccessToken($request);
$this->assertEquals('abcdef', $request->getAttribute('oauth_access_token_id')); $this->assertEquals('abcdef', $request->getAttribute('oauth_access_token_id'));
$this->assertEquals('clientName', $request->getAttribute('oauth_client_id')); $this->assertEquals('clientName', $request->getAttribute('oauth_client_id'));
@ -138,7 +138,7 @@ class BearerResponseTypeTest extends \PHPUnit_Framework_TestCase
$request = $request->withHeader('authorization', sprintf('Bearer %s', $json->access_token . 'foo')); $request = $request->withHeader('authorization', sprintf('Bearer %s', $json->access_token . 'foo'));
try { try {
$responseType->determineAccessTokenInHeader($request); $responseType->validateAccessToken($request);
} catch (OAuthServerException $e) { } catch (OAuthServerException $e) {
$this->assertEquals( $this->assertEquals(
'Access token could not be verified', 'Access token could not be verified',
@ -184,7 +184,7 @@ class BearerResponseTypeTest extends \PHPUnit_Framework_TestCase
$request = $request->withHeader('authorization', sprintf('Bearer %s', $json->access_token)); $request = $request->withHeader('authorization', sprintf('Bearer %s', $json->access_token));
try { try {
$responseType->determineAccessTokenInHeader($request); $responseType->validateAccessToken($request);
} catch (OAuthServerException $e) { } catch (OAuthServerException $e) {
$this->assertEquals( $this->assertEquals(
'Access token has been revoked', 'Access token has been revoked',
@ -207,7 +207,7 @@ class BearerResponseTypeTest extends \PHPUnit_Framework_TestCase
$request = $request->withHeader('authorization', 'Bearer blah'); $request = $request->withHeader('authorization', 'Bearer blah');
try { try {
$responseType->determineAccessTokenInHeader($request); $responseType->validateAccessToken($request);
} catch (OAuthServerException $e) { } catch (OAuthServerException $e) {
$this->assertEquals( $this->assertEquals(
'The JWT string must have two dots', 'The JWT string must have two dots',

View File

@ -131,7 +131,7 @@ class ServerTest extends \PHPUnit_Framework_TestCase
); );
try { try {
$server->validateRequest(new ServerRequest()); $server->validateAuthenticatedRequest(new ServerRequest());
} catch (OAuthServerException $e) { } catch (OAuthServerException $e) {
$this->assertEquals('Missing "Authorization" header', $e->getHint()); $this->assertEquals('Missing "Authorization" header', $e->getHint());
} }

View File

@ -49,7 +49,7 @@ class StubResponseType extends AbstractResponseType
* *
* @return \Psr\Http\Message\ServerRequestInterface * @return \Psr\Http\Message\ServerRequestInterface
*/ */
public function determineAccessTokenInHeader(ServerRequestInterface $request) public function validateAccessToken(ServerRequestInterface $request)
{ {
if ($request->getHeader('authorization')[0] === 'Basic test') { if ($request->getHeader('authorization')[0] === 'Basic test') {
return $request->withAttribute('oauth_access_token_id', 'test'); return $request->withAttribute('oauth_access_token_id', 'test');