Compare commits

..

2 Commits
4.1.6 ... 4.1.x

Author SHA1 Message Date
Andrew Millington
138524984a Merge pull request #918 from Sephster/fix-914
Fix empty issue in PHP 5.4
2018-06-23 17:27:31 +01:00
sephster
8335935854 Fix empty issue in PHP 5.4 2018-06-22 13:47:22 +01:00

View File

@@ -138,7 +138,9 @@ class ResourceServer extends AbstractServer
*/ */
public function determineAccessToken($headerOnly = false) public function determineAccessToken($headerOnly = false)
{ {
if (!empty($this->getRequest()->headers->get('Authorization'))) { $authHeader = $this->getRequest()->headers->get('Authorization');
if (!empty($authHeader)) {
$accessToken = $this->getTokenType()->determineAccessTokenInHeader($this->getRequest()); $accessToken = $this->getTokenType()->determineAccessTokenInHeader($this->getRequest());
} elseif ($headerOnly === false && (! $this->getTokenType() instanceof MAC)) { } elseif ($headerOnly === false && (! $this->getTokenType() instanceof MAC)) {
$accessToken = ($this->getRequest()->server->get('REQUEST_METHOD') === 'GET') $accessToken = ($this->getRequest()->server->get('REQUEST_METHOD') === 'GET')