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

No longer need to inject auth server into grant

Browse Source
This commit is contained in:
Alex Bilbie 2013-12-05 20:25:50 +00:00
parent b55b73c1e8
commit 262ce23fb9
8 changed files with 34 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/League/OAuth2/Server/Authorization.php
View File

@ -244,6 +244,10 @@ class Authorization
if (is_null($identifier)) {
$identifier = $grantType->getIdentifier();
}
// Inject server into grant
$grantType->setAuthorizationServer($this);
$this->grantTypes[$identifier] = $grantType;
if ( ! is_null($grantType->getResponseType())) {

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

@ -56,16 +56,6 @@ class AuthCode implements GrantTypeInterface {
*/
protected $authTokenTTL = 600;
/**
* Constructor
* @param Authorization $authServer Authorization server instance
* @return void
*/
public function __construct(Authorization $authServer)
{
$this->authServer = $authServer;
}
/**
* Override the default access token expire time
* @param int $authTokenTTL

10
src/League/OAuth2/Server/Grant/ClientCredentials.php
View File

@ -50,16 +50,6 @@ class ClientCredentials implements GrantTypeInterface {
*/
protected $accessTokenTTL = null;
/**
* Constructor
* @param Authorization $authServer Authorization server instance
* @return void
*/
public function __construct(Authorization $authServer)
{
$this->authServer = $authServer;
}
/**
* Return the identifier
* @return string

29
src/League/OAuth2/Server/Grant/GrantTrait.php
View File

@ -11,8 +11,26 @@
namespace League\OAuth2\Server\Grant;
use League\OAuth2\Server\Authorization;
trait GrantTrait {
/**
* Constructor
* @param Authorization $authServer Authorization server instance
* @return void
*/
public function __construct(Authorization $authServer = null)
{
// @codeCoverageIgnoreStart
if ($authServer instanceof Authorization) {
trigger_error(
'Server is now automatically injected into grant as of v3.1 of this library',
E_USER_DEPRECATED
);
} // @codeCoverageIgnoreEnd
}
/**
* Return the identifier
* @return string
@ -42,4 +60,15 @@ trait GrantTrait {
return $this;
}
/**
* Inject the authorization server into the grant
* @param Authorization $authServer The authorization server instance
* @return self
*/
public function setAuthorizationServer(Authorization $authServer)
{
$this->authServer = $authServer;
return $this;
}
}

3
src/League/OAuth2/Server/Grant/GrantTypeInterface.php
View File

@ -23,10 +23,9 @@ interface GrantTypeInterface
{
/**
* Constructor
* @param Authorization $authServer Authorization server instance
* @return void
*/
public function __construct(Authorization $authServer);
public function __construct(Authorization $authServer = null);
/**
* Complete the grant flow

10
src/League/OAuth2/Server/Grant/Implicit.php
View File

@ -50,16 +50,6 @@ class Implicit implements GrantTypeInterface {
*/
protected $accessTokenTTL = null;
/**
* Constructor
* @param Authorization $authServer Authorization server instance
* @return void
*/
public function __construct(Authorization $authServer)
{
$this->authServer = $authServer;
}
/**
* Complete the client credentials grant
* @param null|array $inputParams

10
src/League/OAuth2/Server/Grant/Password.php
View File

@ -56,16 +56,6 @@ class Password implements GrantTypeInterface {
*/
protected $accessTokenTTL = null;
/**
* Constructor
* @param Authorization $authServer Authorization server instance
* @return void
*/
public function __construct(Authorization $authServer)
{
$this->authServer = $authServer;
}
/**
* Set the callback to verify a user's username and password
* @param callable $callback The callback function

10
src/League/OAuth2/Server/Grant/RefreshToken.php
View File

@ -62,16 +62,6 @@ class RefreshToken implements GrantTypeInterface {
*/
protected $rotateRefreshTokens = false;
/**
* Constructor
* @param Authorization $authServer Authorization server instance
* @return void
*/
public function __construct(Authorization $authServer)
{
$this->authServer = $authServer;
}
/**
* Set the TTL of the refresh token
* @param int $refreshTokenTTL