From 28661853493142663f406117e965b7dffac6d49e Mon Sep 17 00:00:00 2001 From: Alex Bilbie Date: Tue, 30 Apr 2013 15:51:55 +0100 Subject: [PATCH] Updated implicit grant --- src/OAuth2/Grant/Implicit.php | 47 ++++++++++++++--------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/src/OAuth2/Grant/Implicit.php b/src/OAuth2/Grant/Implicit.php index 06b7a6f5..9ca9d611 100644 --- a/src/OAuth2/Grant/Implicit.php +++ b/src/OAuth2/Grant/Implicit.php @@ -77,40 +77,31 @@ class Implict implements GrantTypeInterface { */ public function completeFlow($authParams = null) { - // Remove any old sessions the user might have - $this->authServer->getStorage('session')->deleteSession($authParams['client_id'], 'user', $authParams['user_id']); + // Remove any old sessions the user might have + $this->authServer->getStorage('session')->deleteSession($authParams['client_id'], 'user', $authParams['user_id']); - // Generate a new access token - $accessToken = SecureKey::make(); + // Generate a new access token + $accessToken = SecureKey::make(); - // Compute expiry time - $accessTokenExpires = time() + $this->authServer->getExpiresIn(); + // Compute expiry time + $accessTokenExpires = time() + $this->authServer->getExpiresIn(); - // Create a new session - $sessionId = $this->authServer->getStorage('session')->createSession( - $authParams['client_id'], - $authParams['redirect_uri'], - 'user', - $authParams['user_id'], - null, - $accessToken, - null, - $accessTokenExpires, - 'granted' - ); + // Create a new session + $sessionId = $this->authServer->getStorage('session')->createSession($authParams['client_id'], 'user', $authParams['user_id']); - // Associate scopes with the new session - foreach ($authParams['scopes'] as $scope) - { - $this->authServer->getStorage('session')->associateScope($sessionId, $scope['id']); - } + // Create an access token + $accessTokenId = $this->authServer->getStorage('session')->associateAccessToken($sessionId, $accessToken, $accessTokenExpires); - $response = array( - 'access_token' => $accessToken - ); - - return $response; + // Associate scopes with the access token + foreach ($authParams['scopes'] as $scope) { + $this->authServer->getStorage('session')->associateScope($accessTokenId, $scope['id']); } + + $response = array( + 'access_token' => $accessToken + ); + + return $response; } } \ No newline at end of file