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

Updated with new entity names

Browse Source
This commit is contained in:
Alex Bilbie
2014-05-02 17:21:53 +01:00
parent 8fbbc7bd07
commit 97fd115530
18 changed files with 244 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/ResourceServer.php
View File

@@ -17,7 +17,7 @@ use League\OAuth2\Server\Storage\AccessTokenInterface;
use League\OAuth2\Server\Storage\AuthCodeInterface;
use League\OAuth2\Server\Storage\SessionInterface;
use League\OAuth2\Server\Storage\ScopeInterface;
use League\OAuth2\Server\Entity\AccessToken;
use League\OAuth2\Server\Entity\AccessTokenEntity;
use Symfony\Component\HttpFoundation\Request;
/**
@@ -135,24 +135,6 @@ class ResourceServer extends AbstractServer
return $this->accessToken->getSession()->getClient()->getId();
}
/**
* Checks if the access token is valid or not
* @param $headersOnly Limit Access Token to Authorization header only
* @return bool
*/
public function isValidRequest($headersOnly = true, $accessToken = null)
{
try {
$accessTokenString = ($accessToken !== null) ? $accessToken : $this->determineAccessToken($headersOnly, $accessToken);
} catch (\Exception $e) {
return false;
}
// Set the access token
$this->accessToken = $this->storages['access_token']->get($accessTokenString);
return ($this->accessToken instanceof AccessToken);
}
/**
* Get the session scopes
* @return array
@@ -183,6 +165,20 @@ class ResourceServer extends AbstractServer
return true;
}
/**
* Checks if the access token is valid or not
* @param $headersOnly Limit Access Token to Authorization header only
* @return bool
*/
public function isValidRequest($headersOnly = true, $accessToken = null)
{
$accessTokenString = ($accessToken !== null) ? $accessToken : $this->determineAccessToken($headersOnly, $accessToken);
// Set the access token
$this->accessToken = $this->storages['access_token']->get($accessTokenString);
return ($this->accessToken instanceof AccessTokenEntity);
}
/**
* Reads in the access token from the headers
* @param $headersOnly Limit Access Token to Authorization header only
@@ -195,7 +191,9 @@ class ResourceServer extends AbstractServer
$accessToken = trim(preg_replace('/^(?:\s+)?Bearer\s/', '', $header));
$accessToken = ($accessToken === 'Bearer') ? '' : $accessToken;
} elseif ($headersOnly === false) {
$accessToken = $this->getRequest()->request->get($this->tokenKey);
$accessToken = ($this->getRequest()->server->get('REQUEST_METHOD') === 'GET') ?
$this->getRequest()->query->get($this->tokenKey) :
$this->getRequest()->request->get($this->tokenKey);
}
if (empty($accessToken)) {