ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2024-11-15 09:47:46 +05:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #475 from thephpleague/analysis-zYjdLv

Browse Source 
Applied fixes from StyleCI
This commit is contained in:
Alex Bilbie 2016-03-17 15:38:10 +01:00
commit c2e83ff359
9 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/AuthorizationValidators/BearerTokenValidator.php
View File

@ -2,12 +2,12 @@
namespace League\OAuth2\Server\AuthorizationValidators;
use League\OAuth2\Server\CryptTrait;
use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
use Psr\Http\Message\ServerRequestInterface;
use Lcobucci\JWT\Parser;
use Lcobucci\JWT\Signer\Rsa\Sha256;
use League\OAuth2\Server\CryptTrait;
use League\OAuth2\Server\Exception\OAuthServerException;
use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
use Psr\Http\Message\ServerRequestInterface;
class BearerTokenValidator implements AuthorizationValidatorInterface
{

1
src/Grant/AbstractAuthorizeGrant.php
View File

@ -50,6 +50,7 @@ abstract class AbstractAuthorizeGrant extends AbstractGrant
public function makeRedirectUri($uri, $params = [], $queryDelimiter = '?')
{
$uri .= (strstr($uri, $queryDelimiter) === false) ? $queryDelimiter : '&';
return $uri . http_build_query($params);
}
}

1
src/Grant/AuthCodeGrant.php
View File

@ -146,6 +146,7 @@ class AuthCodeGrant extends AbstractAuthorizeGrant
$htmlResponse = new HtmlResponse($this->accessTokenRepository);
$htmlResponse->setStatusCode(403);
$htmlResponse->setHtml($html);
return $htmlResponse;
}

3
src/Grant/ImplicitGrant.php
View File

@ -144,6 +144,7 @@ class ImplicitGrant extends AbstractAuthorizeGrant
$htmlResponse = new HtmlResponse($this->accessTokenRepository);
$htmlResponse->setStatusCode(403);
$htmlResponse->setHtml($html);
return $htmlResponse;
}
@ -155,7 +156,7 @@ class ImplicitGrant extends AbstractAuthorizeGrant
'postback_uri' => $this->makeRedirectUri(
$postbackUri,
$request->getQueryParams()
)
),
]);
$htmlResponse = new HtmlResponse($this->accessTokenRepository);

12
src/Server.php
View File

@ -69,12 +69,12 @@ class Server implements EmitterAwareInterface
/**
* New server instance.
*
* @param \League\OAuth2\Server\Repositories\ClientRepositoryInterface $clientRepository
* @param \League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface $accessTokenRepository
* @param \League\OAuth2\Server\Repositories\ScopeRepositoryInterface $scopeRepository
* @param string $privateKeyPath
* @param string $publicKeyPath
* @param null|\League\OAuth2\Server\ResponseTypes\ResponseTypeInterface $responseType
* @param \League\OAuth2\Server\Repositories\ClientRepositoryInterface $clientRepository
* @param \League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface $accessTokenRepository
* @param \League\OAuth2\Server\Repositories\ScopeRepositoryInterface $scopeRepository
* @param string $privateKeyPath
* @param string $publicKeyPath
* @param null|\League\OAuth2\Server\ResponseTypes\ResponseTypeInterface $responseType
* @param null|\League\OAuth2\Server\AuthorizationValidators\AuthorizationValidatorInterface $authorizationValidator
*/
public function __construct(