ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2025-05-31 14:12:07 +05:30
Code Issues Packages Projects Releases Wiki Activity

Updated @ziege's patch to overcome awkward access token definition requirement (i.e. access token can have a space in it) and also optimised code. Fixes #52

Browse Source
This commit is contained in:
Alex Bilbie
2013-05-10 12:57:06 -07:00
parent b88ef82563
commit 8c4019693b
2 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/League/OAuth2/Server/Resource.php
View File

@@ -250,15 +250,12 @@ class Resource
// 1st request: Authorization: Bearer XXX
// 2nd request: Authorization: Bearer XXX, Bearer XXX
if (strpos($header, ',') !== false) {
$accessTokens = array();
foreach (explode(',', $header) as $header_part) {
$accessTokens[] = trim(preg_replace('/^(?:\s+)?Bearer\s+/', '', $header_part));
}
// take always the first one
$accessToken = $accessTokens[0];
$headerPart = explode(',', $header);
$accessToken = preg_replace('/^(?:\s+)?Bearer(\s{1})/', '', $headerPart[0]);
} else {
$accessToken = trim(preg_replace('/^(?:\s+)?Bearer\s+/', '', $header));
$accessToken = preg_replace('/^(?:\s+)?Bearer(\s{1})/', '', $header);
}
$accessToken = ($accessToken === 'Bearer') ? '' : $accessToken;
} else {
$method = $this->getRequest()->server('REQUEST_METHOD');
$accessToken = $this->getRequest()->{$method}($this->tokenKey);