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

Added null checks before calling set functions

Browse Source
This commit is contained in:
Andrew Millington 2018-04-21 21:29:21 +01:00
parent 143afc9561
commit 80bc291c51
No known key found for this signature in database
GPG Key ID: 815DE090877B53F3
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Entities/AuthCodeEntityInterface.php
View File

@ -17,7 +17,7 @@ interface AuthCodeEntityInterface extends TokenInterface
public function getRedirectUri(); public function getRedirectUri();
/** /**
* @param string|null $uri * @param string $uri
*/ */
public function setRedirectUri($uri); public function setRedirectUri($uri);
} }

5
src/Grant/AbstractGrant.php
View File

@ -407,7 +407,10 @@ abstract class AbstractGrant implements GrantTypeInterface
$authCode->setExpiryDateTime((new \DateTime())->add($authCodeTTL)); $authCode->setExpiryDateTime((new \DateTime())->add($authCodeTTL));
$authCode->setClient($client); $authCode->setClient($client);
$authCode->setUserIdentifier($userIdentifier); $authCode->setUserIdentifier($userIdentifier);
$authCode->setRedirectUri($redirectUri);
if ($redirectUri !== null) {
$authCode->setRedirectUri($redirectUri);
}
foreach ($scopes as $scope) { foreach ($scopes as $scope) {
$authCode->addScope($scope); $authCode->addScope($scope);

6
src/Grant/AuthCodeGrant.php
View File

@ -270,7 +270,11 @@ class AuthCodeGrant extends AbstractAuthorizeGrant
$authorizationRequest->setGrantTypeId($this->getIdentifier()); $authorizationRequest->setGrantTypeId($this->getIdentifier());
$authorizationRequest->setClient($client); $authorizationRequest->setClient($client);
$authorizationRequest->setRedirectUri($redirectUri); $authorizationRequest->setRedirectUri($redirectUri);
$authorizationRequest->setState($stateParameter);
if ($stateParameter !== null) {
$authorizationRequest->setState($stateParameter);
}
$authorizationRequest->setScopes($scopes); $authorizationRequest->setScopes($scopes);
if ($this->enableCodeExchangeProof === true) { if ($this->enableCodeExchangeProof === true) {

6
src/Grant/ImplicitGrant.php
View File

@ -177,7 +177,11 @@ class ImplicitGrant extends AbstractAuthorizeGrant
$authorizationRequest->setGrantTypeId($this->getIdentifier()); $authorizationRequest->setGrantTypeId($this->getIdentifier());
$authorizationRequest->setClient($client); $authorizationRequest->setClient($client);
$authorizationRequest->setRedirectUri($redirectUri); $authorizationRequest->setRedirectUri($redirectUri);
$authorizationRequest->setState($stateParameter);
if ($stateParameter !== null) {
$authorizationRequest->setState($stateParameter);
}
$authorizationRequest->setScopes($finalizedScopes); $authorizationRequest->setScopes($finalizedScopes);
return $authorizationRequest; return $authorizationRequest;

2
src/RequestTypes/AuthorizationRequest.php
View File

@ -183,7 +183,7 @@ class AuthorizationRequest
} }
/** /**
* @param string|null $state * @param string $state
*/ */
public function setState($state) public function setState($state)
{ {