mirror of
https://github.com/elyby/oauth2-server.git
synced 2024-12-16 18:19:47 +05:30
Authorization header fixes
This commit is contained in:
parent
55d68bd105
commit
89f3c35466
@ -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);
|
||||||
|
@ -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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user