diff --git a/src/League/OAuth2/Server/Resource.php b/src/League/OAuth2/Server/Resource.php index 49f149ee..bc02b961 100644 --- a/src/League/OAuth2/Server/Resource.php +++ b/src/League/OAuth2/Server/Resource.php @@ -242,7 +242,7 @@ class Resource * @throws Exception\MissingAccessTokenException Thrown if there is no access token presented * @return string */ - protected function determineAccessToken($headersOnly = false) + public function determineAccessToken($headersOnly = false) { if ($header = $this->getRequest()->header('Authorization')) { // Check for special case, because cURL sometimes does an diff --git a/src/League/OAuth2/Server/Storage/SessionInterface.php b/src/League/OAuth2/Server/Storage/SessionInterface.php index 08cd4c53..051c4dbb 100644 --- a/src/League/OAuth2/Server/Storage/SessionInterface.php +++ b/src/League/OAuth2/Server/Storage/SessionInterface.php @@ -74,7 +74,7 @@ interface SessionInterface * @param int $sessionId The session ID * @param string $accessToken The access token * @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); @@ -315,7 +315,8 @@ interface SessionInterface * * array ( * array( - * 'key' => (string), + * 'id' => (int), + * 'scope' => (string), * 'name' => (string), * 'description' => (string) * ),