mirror of
https://github.com/elyby/oauth2-server.git
synced 2024-12-17 02:29:46 +05:30
Change from static calls
This commit is contained in:
parent
56b559894c
commit
4962762c28
@ -296,7 +296,7 @@ class AuthServer
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Validate client ID and redirect URI
|
// Validate client ID and redirect URI
|
||||||
$clientDetails = self::getStorage('client')->getClient($authParams['client_id'], null, $authParams['redirect_uri']);
|
$clientDetails = $this->getStorage('client')->getClient($authParams['client_id'], null, $authParams['redirect_uri']);
|
||||||
|
|
||||||
if ($clientDetails === false) {
|
if ($clientDetails === false) {
|
||||||
throw new Exception\ClientException(self::$exceptionMessages['invalid_client'], 8);
|
throw new Exception\ClientException(self::$exceptionMessages['invalid_client'], 8);
|
||||||
@ -328,7 +328,7 @@ class AuthServer
|
|||||||
$authParams['scopes'] = array();
|
$authParams['scopes'] = array();
|
||||||
|
|
||||||
foreach ($scopes as $scope) {
|
foreach ($scopes as $scope) {
|
||||||
$scopeDetails = self::getStorage('scope')->getScope($scope);
|
$scopeDetails = $this->getStorage('scope')->getScope($scope);
|
||||||
|
|
||||||
if ($scopeDetails === false) {
|
if ($scopeDetails === false) {
|
||||||
throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_scope'], $scope), 4);
|
throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_scope'], $scope), 4);
|
||||||
@ -354,15 +354,15 @@ class AuthServer
|
|||||||
$authCode = SecureKey::make();
|
$authCode = SecureKey::make();
|
||||||
|
|
||||||
// Remove any old sessions the user might have
|
// Remove any old sessions the user might have
|
||||||
self::getStorage('session')->deleteSession($authParams['client_id'], $type, $typeId);
|
$this->getStorage('session')->deleteSession($authParams['client_id'], $type, $typeId);
|
||||||
|
|
||||||
// Create a new session
|
// Create a new session
|
||||||
$sessionId = self::getStorage('session')->createSession($authParams['client_id'], $authParams['redirect_uri'], $type, $typeId, $authCode);
|
$sessionId = $this->getStorage('session')->createSession($authParams['client_id'], $authParams['redirect_uri'], $type, $typeId, $authCode);
|
||||||
|
|
||||||
// Associate scopes with the new session
|
// Associate scopes with the new session
|
||||||
foreach ($authParams['scopes'] as $scope)
|
foreach ($authParams['scopes'] as $scope)
|
||||||
{
|
{
|
||||||
self::getStorage('session')->associateScope($sessionId, $scope['id']);
|
$this->getStorage('session')->associateScope($sessionId, $scope['id']);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $authCode;
|
return $authCode;
|
||||||
|
Loading…
Reference in New Issue
Block a user