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

Updated exceptions to use exception codes and sprintf to state which parameters or scopes are wrong

Browse Source
This commit is contained in:
Alex Bilbie 2012-07-20 15:41:04 +01:00
parent e3b2c4a95c
commit 386b5794e7
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/oauth2server/Server.php
View File

@ -19,23 +19,33 @@ class Server
'scope_delimeter' => ',' 'scope_delimeter' => ','
); );
public $exceptionCodes = array(
0 => 'invalid_request',
1 => 'unauthorized_client',
2 => 'access_denied',
3 => 'unsupported_response_type',
4 => 'invalid_scope',
5 => 'server_error',
6 => 'temporarily_unavailable'
);
protected $errors = array( protected $errors = array(
'invalid_request' => 'The request is missing a required parameter, 'invalid_request' => 'The request is missing a required parameter,
includes an invalid parameter value, includes a parameter more than includes an invalid parameter value, includes a parameter more than
once, or is otherwise malformed.', once, or is otherwise malformed. Check the "%s" parameter.',
'unauthorized_client' => 'The client is not authorized to request an 'unauthorized_client' => 'The client is not authorized to request an
access token using this method.', access token using this method.',
'access_denied' => 'The resource owner or authorization server denied 'access_denied' => 'The resource owner or authorization server denied
the request.', the request.',
'unsupported_response_type' => 'The authorization server does not 'unsupported_response_type' => 'The authorization server does not
support obtaining an access token using this method.', support obtaining an access token using this method.',
'invalid_scope' => 'The requested scope is invalid, unknown, or 'invalid_scope' => 'The requested scope is invalid, unknown, or
malformed.', malformed. Check the "%s" scope.',
'server_error' => 'The authorization server encountered an unexpected 'server_error' => 'The authorization server encountered an unexpected
condition which prevented it from fulfilling the request.', condition which prevented it from fulfilling the request.',
'temporarily_unavailable' => 'The authorization server is currently 'temporarily_unavailable' => 'The authorization server is currently
unable to handle the request due to a temporary overloading or unable to handle the request due to a temporary overloading or
maintenance of the server.' maintenance of the server.'
); );
/** /**
@ -78,8 +88,7 @@ class Server
// Client ID // Client ID
if ( ! isset($authParams['client_id']) && ! isset($_GET['client_id'])) { if ( ! isset($authParams['client_id']) && ! isset($_GET['client_id'])) {
throw new OAuthServerClientException('invalid_request: ' . throw new OAuthServerClientException(sprintf($this->errors['invalid_request'], 'client_id'), 0);
$this->errors['invalid_request']);
} else { } else {
@ -92,8 +101,7 @@ class Server
if ( ! isset($authParams['redirect_uri']) && if ( ! isset($authParams['redirect_uri']) &&
! isset($_GET['redirect_uri'])) { ! isset($_GET['redirect_uri'])) {
throw new OAuthServerClientException('invalid_request: ' . throw new OAuthServerClientException(sprintf($this->errors['invalid_request'], 'redirect_uri'), 0);
$this->errors['invalid_request']);
} else { } else {
@ -108,16 +116,14 @@ class Server
if ($clientDetails === false) { if ($clientDetails === false) {
throw new OAuthServerClientException('unauthorized_client: ' . throw new OAuthServerClientException($this->errors['unauthorized_client'], 1);
$this->errors['unauthorized_client']);
} }
// Response type // Response type
if ( ! isset($authParams['response_type']) && if ( ! isset($authParams['response_type']) &&
! isset($_GET['response_type'])) { ! isset($_GET['response_type'])) {
throw new OAuthServerClientException('invalid_request: ' . throw new OAuthServerClientException(sprintf($this->errors['invalid_request'], 'response_type'), 0);
$this->errors['invalid_request']);
} else { } else {
@ -128,8 +134,7 @@ class Server
if ( ! in_array($params['response_type'], if ( ! in_array($params['response_type'],
$this->config['response_types'])) { $this->config['response_types'])) {
throw new OAuthServerClientException('unsupported_response_type: throw new OAuthServerClientException($this->errors['unsupported_response_type'], 3);
' . $this->errors['unsupported_response_type']);
} }
} }
@ -154,8 +159,7 @@ class Server
if (count($scopes) === 0) { if (count($scopes) === 0) {
throw new OAuthServerClientException('invalid_request: ' . throw new OAuthServerClientException(sprintf($this->errors['invalid_request'], 'scope'), 0);
$this->errors['invalid_request']);
} }
$params['scopes'] = array(); $params['scopes'] = array();
@ -166,8 +170,7 @@ class Server
if ($scopeDetails === false) { if ($scopeDetails === false) {
throw new OAuthServerClientException('invalid_scope: ' . throw new OAuthServerClientException(sprintf($this->errors['invalid_scope'], $scope), 4);
$this->errors['invalid_scope']);
} }
@ -203,8 +206,7 @@ class Server
if ( ! in_array($scope, $originalScopes)) { if ( ! in_array($scope, $originalScopes)) {
throw new OAuthServerClientException('invalid_scope: ' . throw new OAuthServerClientException($this->errors['invalid_scope'], 4);
$this->errors['invalid_scope']);
} }