ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2024-11-15 17:56:14 +05:30
Code Issues Packages Projects Releases Wiki Activity

Fixed Password grant to match past updates

Browse Source
This commit is contained in:
Alex Bilbie 2013-04-30 14:28:59 +01:00
parent 18eea191ed
commit 85a53d7470
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/OAuth2/Grant/Password.php
View File

@ -178,22 +178,15 @@ class Password implements GrantTypeInterface {
$this->authServer->getStorage('session')->deleteSession($authParams['client_id'], 'user', $userId); $this->authServer->getStorage('session')->deleteSession($authParams['client_id'], 'user', $userId);
// Create a new session // Create a new session
$sessionId = $this->authServer->getStorage('session')->createSession( $sessionId = $this->authServer->getStorage('session')->createSession($authParams['client_id'], 'user', $userId);
$authParams['client_id'],
null,
'user',
$userId,
null,
$accessToken,
$refreshToken,
$accessTokenExpires,
'granted'
);
// Associate scopes with the new session // Associate an access token with the session
$accessTokenId = $this->authServer->getStorage('session')->associateAccessToken($sessionId, $accessToken, $accessTokenExpires);
// Associate scopes with the access token
foreach ($authParams['scopes'] as $scope) foreach ($authParams['scopes'] as $scope)
{ {
$this->authServer->getStorage('session')->associateScope($sessionId, $scope['id']); $this->authServer->getStorage('session')->associateScope($accessTokenId, $scope['id']);
} }
$response = array( $response = array(
@ -203,7 +196,10 @@ class Password implements GrantTypeInterface {
'expires_in' => $accessTokenExpiresIn 'expires_in' => $accessTokenExpiresIn
); );
// Associate a refresh token if set
if ($this->authServer->hasGrantType('refresh_token')) { if ($this->authServer->hasGrantType('refresh_token')) {
$refreshToken = SecureKey::make();
$this->authServer->getStorage('session')->associateRefreshToken($accessTokenId, $refreshToken);
$response['refresh_token'] = $refreshToken; $response['refresh_token'] = $refreshToken;
} }