ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2024-12-23 05:29:52 +05:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:php-loep/oauth2-server into develop

Browse Source
This commit is contained in:
Alex Bilbie 2013-06-18 18:17:02 +01:00
commit a1ca904255
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,7 +242,7 @@ class Resource
* @throws Exception\MissingAccessTokenException Thrown if there is no access token presented * @throws Exception\MissingAccessTokenException Thrown if there is no access token presented
* @return string * @return string
*/ */
protected function determineAccessToken($headersOnly = false) public function determineAccessToken($headersOnly = false)
{ {
if ($header = $this->getRequest()->header('Authorization')) { if ($header = $this->getRequest()->header('Authorization')) {
// Check for special case, because cURL sometimes does an // Check for special case, because cURL sometimes does an

5
src/League/OAuth2/Server/Storage/SessionInterface.php
View File

@ -74,7 +74,7 @@ interface SessionInterface
* @param int $sessionId The session ID * @param int $sessionId The session ID
* @param string $accessToken The access token * @param string $accessToken The access token
* @param int $expireTime Unix timestamp of the access token expiry time * @param int $expireTime Unix timestamp of the access token expiry time
* @return void * @return int The access token ID
*/ */
public function associateAccessToken($sessionId, $accessToken, $expireTime); public function associateAccessToken($sessionId, $accessToken, $expireTime);
@ -315,7 +315,8 @@ interface SessionInterface
* <code> * <code>
* array ( * array (
* array( * array(
* 'key' => (string), * 'id' => (int),
* 'scope' => (string),
* 'name' => (string), * 'name' => (string),
* 'description' => (string) * 'description' => (string)
* ), * ),