ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2024-11-01 16:33:07 +05:30
Code Issues Packages Projects Releases Wiki Activity

Authorization header fixes

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/OAuth2/ResourceServer.php
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);

16
src/OAuth2/Util/Request.php
View File

@ -65,11 +65,15 @@ class Request implements RequestInterface
protected function readHeaders() protected function readHeaders()
{ {
$headers = array(); if (function_exists('getallheaders')) {
foreach ($this->server() as $name => $value) { $headers = getallheaders();
if (substr($name, 0, 5) == 'HTTP_') { } else {
$name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5))))); $headers = array();
$headers[$name] = $value; foreach ($this->server() as $name => $value) {
if (substr($name, 0, 5) == 'HTTP_') {
$name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
$headers[$name] = $value;
}
} }
} }
@ -91,4 +95,4 @@ class Request implements RequestInterface
return $this->{$property}[$index]; return $this->{$property}[$index];
} }
} }