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

Fixing Resource bugs and moving the Request dep to a setter.

Browse Source
This commit is contained in:
Daniel Horrigan 2013-01-04 17:21:24 -05:00
parent 373ddf9f34
commit 2fecadd2a6
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/OAuth2/MissingAccessTokenException.php
View File

@ -2,7 +2,7 @@
namespace OAuth2;
class MissingAccessTokenException
class MissingAccessTokenException extends \Exception
{
}

44
src/OAuth2/Resource.php
View File

@ -3,8 +3,8 @@
namespace OAuth2;
use OutOfBoundsException;
use Storage\SessionInterface;
use Storage\SessionScopeInterface;
use OAuth2\Storage\SessionInterface;
use OAuth2\Storage\SessionScopeInterface;
class Resource
{
@ -29,19 +29,37 @@ class Resource
*
* @param SessionInterface The Session Storage Object
* @param SessionScopeInterface The Session Scope Storage Object
* @param RequestInterface The Request Object
*/
public function __construct(SessionInterface $session, SessionScopeInterface $session_scope, RequestInterface $request = null)
public function __construct(SessionInterface $session, SessionScopeInterface $session_scope)
{
$this->storages['session'] = $session;
$this->storages['session_scope'] = $session_scope;
}
if (is_null($request)) {
$request = Request::buildFromGlobals();
}
/**
* Sets the Request Object
*
* @param RequestInterface The Request Object
*/
public function setRequest(RequestInterface $request)
{
$this->request = $request;
}
/**
* Gets the Request object. It will create one from the globals if one is not set.
*
* @return RequestInterface
*/
public function getRequest()
{
if ($this->request === null) {
$this->request = Request::buildFromGlobals();
}
return $this->request;
}
/**
* Checks if the Access Token is valid or not.
*
@ -91,13 +109,19 @@ class Resource
return false;
}
/**
* Reads in the Access Token from the headers.
*
* @return string
* @throws MissingAccessTokenException
*/
protected function determineAccessToken()
{
if ($header = $this->request->header('Authorization')) {
if ($header = $this->getRequest()->header('Authorization')) {
$access_token = trim(str_replace('Bearer', '', $header));
} else {
$method = $this->request->server('REQUEST_METHOD');
$access_token = $this->request->{$method}($this->tokenKey);
$method = $this->getRequest()->server('REQUEST_METHOD');
$access_token = $this->getRequest()->{$method}($this->tokenKey);
}
if (empty($access_token)) {