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

Associate scopes to auth codes in separate method. Creating an auth code now returns an ID

Browse Source
This commit is contained in:
Alex Bilbie
2013-05-10 16:53:21 -07:00
parent 9372cc85d0
commit aa8d38108f
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/League/OAuth2/Server/Grant/AuthCode.php
View File

@ -193,13 +193,6 @@ class AuthCode implements GrantTypeInterface {
// Remove any old sessions the user might have // Remove any old sessions the user might have
$this->authServer->getStorage('session')->deleteSession($authParams['client_id'], $type, $typeId); $this->authServer->getStorage('session')->deleteSession($authParams['client_id'], $type, $typeId);
// List of scopes IDs
$scopeIds = array();
foreach ($authParams['scopes'] as $scope)
{
$scopeIds[] = $scope['id'];
}
// Create a new session // Create a new session
$sessionId = $this->authServer->getStorage('session')->createSession($authParams['client_id'], $type, $typeId); $sessionId = $this->authServer->getStorage('session')->createSession($authParams['client_id'], $type, $typeId);
@ -207,7 +200,12 @@ class AuthCode implements GrantTypeInterface {
$this->authServer->getStorage('session')->associateRedirectUri($sessionId, $authParams['redirect_uri']); $this->authServer->getStorage('session')->associateRedirectUri($sessionId, $authParams['redirect_uri']);
// Associate the auth code // Associate the auth code
$this->authServer->getStorage('session')->associateAuthCode($sessionId, $authCode, time() + $this->authTokenTTL, implode(',', $scopeIds)); $authCodeId = $this->authServer->getStorage('session')->associateAuthCode($sessionId, $authCode, time() + $this->authTokenTTL, implode(',', $scopeIds));
// Associate the scopes to the auth code
foreach ($authParams['scopes'] as $scope) {
$this->authServer->getStorage('session')->associateAuthCodeScope($authCodeId, $scope['id']);
}
return $authCode; return $authCode;
} }

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

@ -102,17 +102,16 @@ interface SessionInterface
* Example SQL query: * Example SQL query:
* *
* <code> * <code>
* INSERT INTO oauth_session_authcodes (session_id, auth_code, auth_code_expires, scope_ids) * INSERT INTO oauth_session_authcodes (session_id, auth_code, auth_code_expires)
* VALUE (:sessionId, :authCode, :authCodeExpires, :scopeIds) * VALUE (:sessionId, :authCode, :authCodeExpires)
* </code> * </code>
* *
* @param int $sessionId The session ID * @param int $sessionId The session ID
* @param string $authCode The authorization code * @param string $authCode The authorization code
* @param int $expireTime Unix timestamp of the access token expiry time * @param int $expireTime Unix timestamp of the access token expiry time
* @param string $scopeIds Comma seperated list of scope IDs to be later associated (default = null) * @return int The auth code ID
* @return void
*/ */
public function associateAuthCode($sessionId, $authCode, $expireTime, $scopeIds = null); public function associateAuthCode($sessionId, $authCode, $expireTime);
/** /**
* Remove an associated authorization token from a session * Remove an associated authorization token from a session