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

Updated AuthCodeGrant

Browse Source
This commit is contained in:
Alex Bilbie 2016-02-18 10:49:39 +00:00
parent 73cd377c4b
commit 704e114568
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Grant/AuthCodeGrant.php
View File

@ -89,26 +89,7 @@ class AuthCodeGrant extends AbstractGrant
protected function respondToAuthorizationRequest( protected function respondToAuthorizationRequest(
ServerRequestInterface $request ServerRequestInterface $request
) { ) {
$clientId = $this->getQueryStringParameter( $client = $this->validateClient($request);
'client_id',
$request,
$this->getServerParameter('PHP_AUTH_USER', $request)
);
if (is_null($clientId)) {
throw OAuthServerException::invalidRequest('client_id', null, '`%s` parameter is missing');
}
$redirectUri = $this->getQueryStringParameter('redirect_uri', $request, null);
if (is_null($redirectUri)) {
throw OAuthServerException::invalidRequest('redirect_uri', null, '`%s` parameter is missing');
}
$client = $this->clientRepository->getClientEntity(
$clientId,
null,
$redirectUri,
$this->getIdentifier()
);
if ($client instanceof ClientEntityInterface === false) { if ($client instanceof ClientEntityInterface === false) {
$this->emitter->emit(new Event('client.authentication.failed', $request)); $this->emitter->emit(new Event('client.authentication.failed', $request));
@ -116,7 +97,7 @@ class AuthCodeGrant extends AbstractGrant
throw OAuthServerException::invalidClient(); throw OAuthServerException::invalidClient();
} }
$scopes = $this->validateScopes($request, $client, $redirectUri); $scopes = $this->validateScopes($request, $client, $client->getRedirectUri());
$queryString = http_build_query($request->getQueryParams()); $queryString = http_build_query($request->getQueryParams());
$postbackUri = new Uri( $postbackUri = new Uri(
sprintf( sprintf(
@ -168,8 +149,9 @@ class AuthCodeGrant extends AbstractGrant
// The user hasn't logged in yet so show a login form // The user hasn't logged in yet so show a login form
if ($userId === null) { if ($userId === null) {
$engine = new Engine(dirname($this->pathToLoginTemplate)); $engine = new Engine(dirname($this->pathToLoginTemplate));
$pathParts = explode(DIRECTORY_SEPARATOR, $this->pathToLoginTemplate);
$html = $engine->render( $html = $engine->render(
'login_user', end($pathParts),
[ [
'error' => $loginError, 'error' => $loginError,
'postback_uri' => (string) $postbackUri->withQuery($queryString), 'postback_uri' => (string) $postbackUri->withQuery($queryString),
@ -183,8 +165,9 @@ class AuthCodeGrant extends AbstractGrant
// The user hasn't approved the client yet so show an authorize form // The user hasn't approved the client yet so show an authorize form
if ($userId !== null && $userHasApprovedClient === null) { if ($userId !== null && $userHasApprovedClient === null) {
$engine = new Engine(dirname($this->pathToAuthorizeTemplate)); $engine = new Engine(dirname($this->pathToAuthorizeTemplate));
$pathParts = explode(DIRECTORY_SEPARATOR, $this->pathToAuthorizeTemplate);
$html = $engine->render( $html = $engine->render(
'authorize_client', end($pathParts),
[ [
'client' => $client, 'client' => $client,
'scopes' => $scopes, 'scopes' => $scopes,
@ -212,7 +195,7 @@ class AuthCodeGrant extends AbstractGrant
$stateParameter = $this->getQueryStringParameter('state', $request); $stateParameter = $this->getQueryStringParameter('state', $request);
$redirectUri = new Uri($redirectUri); $redirectUri = new Uri($client->getRedirectUri());
parse_str($redirectUri->getQuery(), $redirectPayload); parse_str($redirectUri->getQuery(), $redirectPayload);
if ($stateParameter !== null) { if ($stateParameter !== null) {
$redirectPayload['state'] = $stateParameter; $redirectPayload['state'] = $stateParameter;
@ -263,6 +246,12 @@ class AuthCodeGrant extends AbstractGrant
ResponseTypeInterface $responseType, ResponseTypeInterface $responseType,
DateInterval $accessTokenTTL DateInterval $accessTokenTTL
) { ) {
// The redirect URI is required in this request
$redirectUri = $this->getQueryStringParameter('redirect_uri', $request, null);
if (is_null($redirectUri)) {
throw OAuthServerException::invalidRequest('redirect_uri', null, '`%s` parameter is missing');
}
// Validate request // Validate request
$client = $this->validateClient($request); $client = $this->validateClient($request);
$encryptedAuthCode = $this->getRequestParameter('code', $request, null); $encryptedAuthCode = $this->getRequestParameter('code', $request, null);