Authorization header fixes

This commit is contained in:
Alex Bilbie 2013-02-07 16:16:09 +00:00
parent 55d68bd105
commit 89f3c35466
2 changed files with 11 additions and 7 deletions

View File

@ -161,7 +161,7 @@ class ResourceServer
protected function determineAccessToken() protected function determineAccessToken()
{ {
if ($header = $this->getRequest()->header('Authorization')) { if ($header = $this->getRequest()->header('Authorization')) {
$access_token = trim(str_replace('Bearer', '', $header)); $access_token = base64_decode(trim(str_replace('Bearer', '', $header)));
} else { } else {
$method = $this->getRequest()->server('REQUEST_METHOD'); $method = $this->getRequest()->server('REQUEST_METHOD');
$access_token = $this->getRequest()->{$method}($this->tokenKey); $access_token = $this->getRequest()->{$method}($this->tokenKey);

View File

@ -65,6 +65,9 @@ class Request implements RequestInterface
protected function readHeaders() protected function readHeaders()
{ {
if (function_exists('getallheaders')) {
$headers = getallheaders();
} else {
$headers = array(); $headers = array();
foreach ($this->server() as $name => $value) { foreach ($this->server() as $name => $value) {
if (substr($name, 0, 5) == 'HTTP_') { if (substr($name, 0, 5) == 'HTTP_') {
@ -72,6 +75,7 @@ class Request implements RequestInterface
$headers[$name] = $value; $headers[$name] = $value;
} }
} }
}
return $headers; return $headers;
} }