Compare commits

...

6 Commits
4.1.4 ... 4.1.6

Author SHA1 Message Date
Alex Bilbie
3bec591393 Changelog update 2016-09-13 14:42:53 +01:00
Alex Bilbie
084b779cc6 Merge pull request #652 from rickshawhobo/4.1.x
less restrictive on Authorization header check
2016-09-13 14:38:47 +01:00
Guy Huynh
491f3f0e95 less restrictive on Authorization header check 2016-09-08 10:20:34 -04:00
Alex Bilbie
c5db707e69 Updated changelog 2016-01-04 19:56:12 +00:00
Alex Bilbie
ed7f78179a Merge pull request #412 from derrabus/symfony-3
Allow Symfony 3.0
2015-12-20 20:38:02 +00:00
Alexander M. Turek
6e92239dd7 Allow Symfony 3.0. 2015-12-11 15:24:13 +01:00
3 changed files with 10 additions and 2 deletions

View File

@@ -1,5 +1,13 @@
# Changelog
## 4.1.6 (released 2016-09-13)
* Less restrictive on Authorization header check (Issue #652)
## 4.1.5 (released 2016-01-04)
* Enable Symfony 3.0 support (#412)
## 4.1.4 (released 2015-11-13)
* Fix for determining access token in header (Issue #328)

View File

@@ -5,7 +5,7 @@
"license": "MIT",
"require": {
"php": ">=5.4.0",
"symfony/http-foundation": "~2.4",
"symfony/http-foundation": "~2.4|~3.0",
"league/event": "~2.1"
},
"require-dev": {

View File

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