ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2024-12-25 06:30:13 +05:30
Code Issues Packages Projects Releases Wiki Activity

Code coverage improvements in grant classes

Browse Source
This commit is contained in:
Alex Bilbie 2014-11-23 23:32:50 +00:00
parent 6157bd77ca
commit e1c0ff2685
4 changed files with 20 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Grant/AuthCodeGrant.php
View File

@ -166,20 +166,15 @@ class AuthCodeGrant extends AbstractGrant
public function completeFlow() public function completeFlow()
{ {
// Get the required params // Get the required params
$clientId = $this->server->getRequest()->request->get('client_id', null); $clientId = $this->server->getRequest()->request->get('client_id', $this->server->getRequest()->getUser());
if (is_null($clientId)) { if (is_null($clientId)) {
$clientId = $this->server->getRequest()->getUser(); throw new Exception\InvalidRequestException('client_id');
if (is_null($clientId)) {
throw new Exception\InvalidRequestException('client_id');
}
} }
$clientSecret = $this->server->getRequest()->request->get('client_secret', null); $clientSecret = $this->server->getRequest()->request->get('client_secret',
$this->server->getRequest()->getPassword());
if (is_null($clientSecret)) { if (is_null($clientSecret)) {
$clientSecret = $this->server->getRequest()->getPassword(); throw new Exception\InvalidRequestException('client_secret');
if (is_null($clientSecret)) {
throw new Exception\InvalidRequestException('client_secret');
}
} }
$redirectUri = $this->server->getRequest()->request->get('redirect_uri', null); $redirectUri = $this->server->getRequest()->request->get('redirect_uri', null);

15
src/Grant/ClientCredentialsGrant.php
View File

@ -55,20 +55,15 @@ class ClientCredentialsGrant extends AbstractGrant
public function completeFlow() public function completeFlow()
{ {
// Get the required params // Get the required params
$clientId = $this->server->getRequest()->request->get('client_id', null); $clientId = $this->server->getRequest()->request->get('client_id', $this->server->getRequest()->getUser());
if (is_null($clientId)) { if (is_null($clientId)) {
$clientId = $this->server->getRequest()->getUser(); throw new Exception\InvalidRequestException('client_id');
if (is_null($clientId)) {
throw new Exception\InvalidRequestException('client_id');
}
} }
$clientSecret = $this->server->getRequest()->request->get('client_secret', null); $clientSecret = $this->server->getRequest()->request->get('client_secret',
$this->server->getRequest()->getPassword());
if (is_null($clientSecret)) { if (is_null($clientSecret)) {
$clientSecret = $this->server->getRequest()->getPassword(); throw new Exception\InvalidRequestException('client_secret');
if (is_null($clientSecret)) {
throw new Exception\InvalidRequestException('client_secret');
}
} }
// Validate client ID and client secret // Validate client ID and client secret

15
src/Grant/PasswordGrant.php
View File

@ -80,20 +80,15 @@ class PasswordGrant extends AbstractGrant
public function completeFlow() public function completeFlow()
{ {
// Get the required params // Get the required params
$clientId = $this->server->getRequest()->request->get('client_id', null); $clientId = $this->server->getRequest()->request->get('client_id', $this->server->getRequest()->getUser());
if (is_null($clientId)) { if (is_null($clientId)) {
$clientId = $this->server->getRequest()->getUser(); throw new Exception\InvalidRequestException('client_id');
if (is_null($clientId)) {
throw new Exception\InvalidRequestException('client_id');
}
} }
$clientSecret = $this->server->getRequest()->request->get('client_secret', null); $clientSecret = $this->server->getRequest()->request->get('client_secret',
$this->server->getRequest()->getPassword());
if (is_null($clientSecret)) { if (is_null($clientSecret)) {
$clientSecret = $this->server->getRequest()->getPassword(); throw new Exception\InvalidRequestException('client_secret');
if (is_null($clientSecret)) {
throw new Exception\InvalidRequestException('client_secret');
}
} }
// Validate client ID and client secret // Validate client ID and client secret

15
src/Grant/RefreshTokenGrant.php
View File

@ -58,20 +58,15 @@ class RefreshTokenGrant extends AbstractGrant
*/ */
public function completeFlow() public function completeFlow()
{ {
$clientId = $this->server->getRequest()->request->get('client_id', null); $clientId = $this->server->getRequest()->request->get('client_id', $this->server->getRequest()->getUser());
if (is_null($clientId)) { if (is_null($clientId)) {
$clientId = $this->server->getRequest()->getUser(); throw new Exception\InvalidRequestException('client_id');
if (is_null($clientId)) {
throw new Exception\InvalidRequestException('client_id');
}
} }
$clientSecret = $this->server->getRequest()->request->get('client_secret', null); $clientSecret = $this->server->getRequest()->request->get('client_secret',
$this->server->getRequest()->getPassword());
if (is_null($clientSecret)) { if (is_null($clientSecret)) {
$clientSecret = $this->server->getRequest()->getPassword(); throw new Exception\InvalidRequestException('client_secret');
if (is_null($clientSecret)) {
throw new Exception\InvalidRequestException('client_secret');
}
} }
// Validate client ID and client secret // Validate client ID and client secret