ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2024-11-15 09:47:46 +05:30
Code Issues Packages Projects Releases Wiki Activity

Fix #164

Browse Source
This commit is contained in:
Alex Bilbie 2014-05-07 17:30:07 +01:00
parent e32f153acf
commit 6a0596f40b
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Grant/AuthCodeGrant.php
View File

@ -74,22 +74,22 @@ class AuthCodeGrant extends AbstractGrant
public function checkAuthoriseParams() public function checkAuthoriseParams()
{ {
// Get required params // Get required params
$clientId = $this->server->getRequest()->request->get('client_id', null); $clientId = $this->server->getRequest()->query->get('client_id', null);
if (is_null($clientId)) { if (is_null($clientId)) {
throw new Exception\InvalidRequestException('client_id'); throw new Exception\InvalidRequestException('client_id');
} }
$redirectUri = $this->server->getRequest()->request->get('redirect_uri', null); $redirectUri = $this->server->getRequest()->query->get('redirect_uri', null);
if (is_null($redirectUri)) { if (is_null($redirectUri)) {
throw new Exception\InvalidRequestException('redirect_uri'); throw new Exception\InvalidRequestException('redirect_uri');
} }
$state = $this->server->getRequest()->request->get('state', null); $state = $this->server->getRequest()->query->get('state', null);
if ($this->server->stateParamRequired() === true && is_null($state)) { if ($this->server->stateParamRequired() === true && is_null($state)) {
throw new Exception\InvalidRequestException('state'); throw new Exception\InvalidRequestException('state');
} }
$responseType = $this->server->getRequest()->request->get('response_type', null); $responseType = $this->server->getRequest()->query->get('response_type', null);
if (is_null($responseType)) { if (is_null($responseType)) {
throw new Exception\InvalidRequestException('response_type'); throw new Exception\InvalidRequestException('response_type');
} }
@ -112,7 +112,7 @@ class AuthCodeGrant extends AbstractGrant
} }
// Validate any scopes that are in the request // Validate any scopes that are in the request
$scopeParam = $this->server->getRequest()->request->get('scope', ''); $scopeParam = $this->server->getRequest()->query->get('scope', '');
$scopes = $this->validateScopes($scopeParam); $scopes = $this->validateScopes($scopeParam);
return [ return [

18
tests/Grant/AuthCodeGrantTest.php
View File

@ -29,7 +29,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
{ {
$this->setExpectedException('League\OAuth2\Server\Exception\InvalidRequestException'); $this->setExpectedException('League\OAuth2\Server\Exception\InvalidRequestException');
$_POST = []; $_GET = [];
$server = new AuthorizationServer; $server = new AuthorizationServer;
$grant = new AuthCodeGrant; $grant = new AuthCodeGrant;
@ -44,7 +44,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
$this->setExpectedException('League\OAuth2\Server\Exception\InvalidRequestException'); $this->setExpectedException('League\OAuth2\Server\Exception\InvalidRequestException');
$server = new AuthorizationServer; $server = new AuthorizationServer;
$_POST = [ $_GET = [
'client_id' => 'testapp' 'client_id' => 'testapp'
]; ];
@ -58,7 +58,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
{ {
$this->setExpectedException('League\OAuth2\Server\Exception\InvalidRequestException'); $this->setExpectedException('League\OAuth2\Server\Exception\InvalidRequestException');
$_POST = [ $_GET = [
'client_id' => 'testapp', 'client_id' => 'testapp',
'redirect_uri' => 'http://foo/bar' 'redirect_uri' => 'http://foo/bar'
]; ];
@ -75,7 +75,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
{ {
$this->setExpectedException('League\OAuth2\Server\Exception\InvalidRequestException'); $this->setExpectedException('League\OAuth2\Server\Exception\InvalidRequestException');
$_POST = [ $_GET = [
'client_id' => 'testapp', 'client_id' => 'testapp',
'redirect_uri' => 'http://foo/bar' 'redirect_uri' => 'http://foo/bar'
]; ];
@ -91,7 +91,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
{ {
$this->setExpectedException('League\OAuth2\Server\Exception\UnsupportedResponseTypeException'); $this->setExpectedException('League\OAuth2\Server\Exception\UnsupportedResponseTypeException');
$_POST = [ $_GET = [
'client_id' => 'testapp', 'client_id' => 'testapp',
'redirect_uri' => 'http://foo/bar', 'redirect_uri' => 'http://foo/bar',
'response_type' => 'foobar' 'response_type' => 'foobar'
@ -108,7 +108,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
{ {
$this->setExpectedException('League\OAuth2\Server\Exception\InvalidClientException'); $this->setExpectedException('League\OAuth2\Server\Exception\InvalidClientException');
$_POST = [ $_GET = [
'client_id' => 'testapp', 'client_id' => 'testapp',
'redirect_uri' => 'http://foo/bar', 'redirect_uri' => 'http://foo/bar',
'response_type' => 'code' 'response_type' => 'code'
@ -131,7 +131,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
{ {
$this->setExpectedException('League\OAuth2\Server\Exception\InvalidScopeException'); $this->setExpectedException('League\OAuth2\Server\Exception\InvalidScopeException');
$_POST = [ $_GET = [
'response_type' => 'code', 'response_type' => 'code',
'client_id' => 'testapp', 'client_id' => 'testapp',
'redirect_uri' => 'http://foo/bar', 'redirect_uri' => 'http://foo/bar',
@ -172,7 +172,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
public function testCheckAuthoriseParams() public function testCheckAuthoriseParams()
{ {
$_POST = [ $_GET = [
'response_type' => 'code', 'response_type' => 'code',
'client_id' => 'testapp', 'client_id' => 'testapp',
'redirect_uri' => 'http://foo/bar', 'redirect_uri' => 'http://foo/bar',
@ -220,7 +220,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
$result = $grant->checkAuthoriseParams(); $result = $grant->checkAuthoriseParams();
$this->assertTrue($result['client'] instanceof ClientEntity); $this->assertTrue($result['client'] instanceof ClientEntity);
$this->assertTrue($result['redirect_uri'] === $_POST['redirect_uri']); $this->assertTrue($result['redirect_uri'] === $_GET['redirect_uri']);
$this->assertTrue($result['state'] === null); $this->assertTrue($result['state'] === null);
$this->assertTrue($result['response_type'] === 'code'); $this->assertTrue($result['response_type'] === 'code');
$this->assertTrue($result['scopes']['foo'] instanceof ScopeEntity); $this->assertTrue($result['scopes']['foo'] instanceof ScopeEntity);