ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2024-11-01 16:33:07 +05:30
Code Issues Packages Projects Releases Wiki Activity

Allow grant access token expiresIn override

Browse Source
This commit is contained in:
Alex Bilbie 2013-05-06 15:04:00 -07:00
parent a561a9d98a
commit fdebbac2df
4 changed files with 72 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/OAuth2/Grant/AuthCode.php
View File

@ -42,6 +42,12 @@ class AuthCode implements GrantTypeInterface {
*/
protected $authServer = null;
/**
* Access token expires in override
* @var int
*/
protected $expiresIn = null;
/**
* Constructor
* @param AuthServer $authServer AuthServer instance
@ -70,6 +76,16 @@ class AuthCode implements GrantTypeInterface {
return $this->responseType;
}
/**
* Override the default access token expire time
* @param int $expiresIn
* @return void
*/
public function setExpiresIn($expiresIn)
{
$this->expiresIn = $expiresIn;
}
/**
* Check authorise parameters
*
@ -222,8 +238,8 @@ class AuthCode implements GrantTypeInterface {
// A session ID was returned so update it with an access token and remove the authorisation code
$accessToken = SecureKey::make();
$accessTokenExpires = time() + $this->authServer->getExpiresIn();
$accessTokenExpiresIn = $this->authServer->getExpiresIn();
$accessTokenExpiresIn = ($this->expiresIn !== null) ? $this->expiresIn : $this->authServer->getExpiresIn();
$accessTokenExpires = time() + $accessTokenExpiresIn;
// Remove the auth code
$this->authServer->getStorage('session')->removeAuthCode($session['id']);

21
src/OAuth2/Grant/ClientCredentials.php
View File

@ -42,6 +42,12 @@ class ClientCredentials implements GrantTypeInterface {
*/
protected $authServer = null;
/**
* Access token expires in override
* @var int
*/
protected $expiresIn = null;
/**
* Constructor
* @param AuthServer $authServer AuthServer instance
@ -70,6 +76,16 @@ class ClientCredentials implements GrantTypeInterface {
return $this->responseType;
}
/**
* Override the default access token expire time
* @param int $expiresIn
* @return void
*/
public function setExpiresIn($expiresIn)
{
$this->expiresIn = $expiresIn;
}
/**
* Complete the client credentials grant
* @param null|array $inputParams
@ -126,9 +142,8 @@ class ClientCredentials implements GrantTypeInterface {
// Generate an access token
$accessToken = SecureKey::make();
$accessTokenExpires = time() + $this->authServer->getExpiresIn();
$accessTokenExpiresIn = $this->authServer->getExpiresIn();
$accessTokenExpiresIn = ($this->expiresIn !== null) ? $this->expiresIn : $this->authServer->getExpiresIn();
$accessTokenExpires = time() + $accessTokenExpiresIn;
// Delete any existing sessions just to be sure
$this->authServer->getStorage('session')->deleteSession($authParams['client_id'], 'client', $authParams['client_id']);

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

@ -48,6 +48,12 @@ class Password implements GrantTypeInterface {
*/
protected $authServer = null;
/**
* Access token expires in override
* @var int
*/
protected $expiresIn = null;
/**
* Constructor
* @param AuthServer $authServer AuthServer instance
@ -76,6 +82,16 @@ class Password implements GrantTypeInterface {
return $this->responseType;
}
/**
* Override the default access token expire time
* @param int $expiresIn
* @return void
*/
public function setExpiresIn($expiresIn)
{
$this->expiresIn = $expiresIn;
}
/**
* Set the callback to verify a user's username and password
* @param function $callback The callback function
@ -169,8 +185,8 @@ class Password implements GrantTypeInterface {
// Generate an access token
$accessToken = SecureKey::make();
$accessTokenExpires = time() + $this->authServer->getExpiresIn();
$accessTokenExpiresIn = $this->authServer->getExpiresIn();
$accessTokenExpiresIn = ($this->expiresIn !== null) ? $this->expiresIn : $this->authServer->getExpiresIn();
$accessTokenExpires = time() + $accessTokenExpiresIn;
// Delete any existing sessions just to be sure
$this->authServer->getStorage('session')->deleteSession($authParams['client_id'], 'user', $userId);

20
src/OAuth2/Grant/RefreshToken.php
View File

@ -42,6 +42,12 @@ class RefreshToken implements GrantTypeInterface {
*/
protected $authServer = null;
/**
* Access token expires in override
* @var int
*/
protected $expiresIn = null;
/**
* Constructor
* @param AuthServer $authServer AuthServer instance
@ -70,6 +76,16 @@ class RefreshToken implements GrantTypeInterface {
return $this->responseType;
}
/**
* Override the default access token expire time
* @param int $expiresIn
* @return void
*/
public function setExpiresIn($expiresIn)
{
$this->expiresIn = $expiresIn;
}
/**
* Complete the refresh token grant
* @param null|array $inputParams
@ -116,8 +132,8 @@ class RefreshToken implements GrantTypeInterface {
// Generate new tokens and associate them to the session
$accessToken = SecureKey::make();
$accessTokenExpires = time() + $this->authServer->getExpiresIn();
$accessTokenExpiresIn = $this->authServer->getExpiresIn();
$accessTokenExpiresIn = ($this->expiresIn !== null) ? $this->expiresIn : $this->authServer->getExpiresIn();
$accessTokenExpires = time() + $accessTokenExpiresIn;
$refreshToken = SecureKey::make();
$newAccessTokenId = $this->authServer->getStorage('session')->associateAccessToken($accessTokenDetails['session_id'], $accessToken, $accessTokenExpires);