ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2024-11-01 16:33:07 +05:30
Code Issues Packages Projects Releases Wiki Activity

Use self::getParam

Browse Source
This commit is contained in:
Alex Bilbie 2013-02-19 00:40:30 +00:00
parent dbc80a4360
commit e3f13bf545
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/OAuth2/AuthServer.php
View File

@ -248,22 +248,13 @@ class AuthServer
*/ */
public function checkAuthoriseParams($inputParams = array()) public function checkAuthoriseParams($inputParams = array())
{ {
$authParams = array(); // Auth params
$authParams = self::getParam(array('client_id', 'redirect_uri', 'response_type', 'scope'), 'get', $inputParams);
// Client ID
$authParams['client_id'] = (isset($inputParams['client_id'])) ?
$inputParams['client_id'] :
self::getRequest()->get('client_id');
if (is_null($authParams['client_id'])) { if (is_null($authParams['client_id'])) {
throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'client_id'), 0); throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'client_id'), 0);
} }
// Redirect URI
$authParams['redirect_uri'] = (isset($inputParams['redirect_uri'])) ?
$inputParams['redirect_uri'] :
self::getRequest()->get('redirect_uri');
if (is_null($authParams['redirect_uri'])) { if (is_null($authParams['redirect_uri'])) {
throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'redirect_uri'), 0); throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'redirect_uri'), 0);
} }
@ -277,11 +268,6 @@ class AuthServer
$authParams['client_details'] = $clientDetails; $authParams['client_details'] = $clientDetails;
// Response type
$authParams['response_type'] = (isset($inputParams['response_type'])) ?
$inputParams['response_type'] :
self::getRequest()->get('response_type');
if (is_null($authParams['response_type'])) { if (is_null($authParams['response_type'])) {
throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'response_type'), 0); throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'response_type'), 0);
} }
@ -291,12 +277,8 @@ class AuthServer
throw new Exception\ClientException(self::$exceptionMessages['unsupported_response_type'], 3); throw new Exception\ClientException(self::$exceptionMessages['unsupported_response_type'], 3);
} }
// Get and validate scopes // Validate scopes
$scopes = (isset($inputParams['scope'])) ? $scopes = explode($this->scopeDelimeter, $authParams['scope']);
$inputParams['scope'] :
self::getRequest()->get('scope', '');
$scopes = explode($this->scopeDelimeter, $scopes);
for ($i = 0; $i < count($scopes); $i++) { for ($i = 0; $i < count($scopes); $i++) {
$scopes[$i] = trim($scopes[$i]); $scopes[$i] = trim($scopes[$i]);
@ -358,9 +340,7 @@ class AuthServer
*/ */
public function issueAccessToken($inputParams = array()) public function issueAccessToken($inputParams = array())
{ {
$grantType = (isset($inputParams['grant_type'])) ? $grantType = self::getParam('grant_type', 'post', $inputParams);
$inputParams['grant_type'] :
self::getRequest()->post('grant_type');
if (is_null($grantType)) { if (is_null($grantType)) {
throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'grant_type'), 0); throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'grant_type'), 0);
@ -395,7 +375,7 @@ class AuthServer
public static function getParam($param = '', $method = 'get', $inputParams = array()) public static function getParam($param = '', $method = 'get', $inputParams = array())
{ {
if (is_string($param)) { if (is_string($param)) {
return (isset($inputParams[$param])) ? $inputParams['client_id'] : self::getRequest()->{$method}($param); return (isset($inputParams[$param])) ? $inputParams[$param] : self::getRequest()->{$method}($param);
} else { } else {
$response = array(); $response = array();
foreach ($param as $p) { foreach ($param as $p) {