ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2025-01-01 01:40:21 +05:30
Code Issues Packages Projects Releases Wiki Activity

Fixed line lengths

Browse Source
This commit is contained in:
Alex Bilbie 2012-07-25 14:40:08 +01:00
parent fdf71b758b
commit 7ba0f4ee1a
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Oauth2/Server.php
View File

@ -16,6 +16,9 @@ class Server
'response_types' => array( 'response_types' => array(
'code' 'code'
), ),
'grant_types' => array(
'authorization_code'
),
'scope_delimeter' => ',', 'scope_delimeter' => ',',
'access_token_ttl' => null 'access_token_ttl' => null
); );
@ -318,7 +321,8 @@ maintenance of the server.',
$params = array(); $params = array();
// Client ID // Client ID
if ( ! isset($authParams['client_id']) && ! isset($_POST['client_id'])) { if ( ! isset($authParams['client_id']) &&
! isset($_POST['client_id'])) {
throw new OAuthServerClientException(sprintf( throw new OAuthServerClientException(sprintf(
$this->errors['invalid_request'], 'client_id'), 0); $this->errors['invalid_request'], 'client_id'), 0);
@ -331,7 +335,8 @@ maintenance of the server.',
} }
// Client secret // Client secret
if ( ! isset($authParams['client_secret']) && ! isset($_POST['client_secret'])) { if ( ! isset($authParams['client_secret']) &&
! isset($_POST['client_secret'])) {
throw new OAuthServerClientException(sprintf( throw new OAuthServerClientException(sprintf(
$this->errors['invalid_request'], 'client_secret'), 0); $this->errors['invalid_request'], 'client_secret'), 0);
@ -358,7 +363,8 @@ maintenance of the server.',
} }
// Validate client ID and redirect URI // Validate client ID and redirect URI
$clientDetails = $this->db->validateClient($params['client_id'], $params['client_secret'], $clientDetails = $this->db->validateClient($params['client_id'],
$params['client_secret'],
$params['redirect_uri']); $params['redirect_uri']);
if ($clientDetails === false) { if ($clientDetails === false) {
@ -407,22 +413,23 @@ maintenance of the server.',
$sessionId = $this->db->validateAuthCode($params['client_id'], $sessionId = $this->db->validateAuthCode($params['client_id'],
$params['request_uri'], $params['code']); $params['request_uri'], $params['code']);
if ( ! $sessionId) if ( ! $sessionId) {
{
throw new OAuthServerClientException(sprintf( throw new OAuthServerClientException(sprintf(
$this->errors['invalid_grant'], 'code'), 9); $this->errors['invalid_grant'], 'code'), 9);
}
else } else {
{
// A session ID was returned so update it with an access token, // A session ID was returned so update it with an access token,
// remove the authorisation code, change the stage to 'granted' // remove the authorisation code, change the stage to 'granted'
$accessToken = $this->generateCode(); $accessToken = $this->generateCode();
$accessTokenExpires = ($this->config['access_token_ttl'] === null) ? null : time() + $this->config['access_token_ttl']; $accessTokenExpires = ($this->config['access_token_ttl'] === null)
? null : time() + $this->config['access_token_ttl'];
$this->db->updateSession($sessionId, null, $accessToken, $accessTokenExpires, 'granted'); $this->db->updateSession($sessionId, null, $accessToken,
$accessTokenExpires, 'granted');
// Update the session's scopes to reference the access token // Update the session's scopes to reference the access token
$this->db->updateSessionScopeAccessToken($sessionId, $accessToken); $this->db->updateSessionScopeAccessToken($sessionId, $accessToken);