Applied fixes from StyleCI

This commit is contained in:
Alex Bilbie 2016-03-17 10:37:48 -04:00 committed by StyleCI Bot
parent 251190d828
commit 51a1a75d37
9 changed files with 18 additions and 15 deletions

View File

@ -15,4 +15,4 @@ interface AuthorizationValidatorInterface
* @return ServerRequestInterface
*/
public function validateAuthorization(ServerRequestInterface $request);
}
}

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
{
@ -63,4 +63,4 @@ class BearerTokenValidator implements AuthorizationValidatorInterface
throw OAuthServerException::accessDenied($exception->getMessage());
}
}
}
}

View File

@ -119,4 +119,4 @@ trait CryptTrait
return $output;
}
}
}

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);
}
}

View File

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

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);

View File

@ -63,4 +63,4 @@ class HtmlResponse extends AbstractResponseType
{
$this->headers[$key] = $value;
}
}
}

View File

@ -28,4 +28,4 @@ class RedirectResponse extends AbstractResponseType
{
return $response->withStatus(302)->withHeader('location', $this->redirectUri);
}
}
}

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(