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

Move grant check for client back to validate method

Browse Source
This commit is contained in:
sephster 2018-09-01 14:38:31 +01:00
parent 060a090479
commit cfa9b8d3b4
No known key found for this signature in database
GPG Key ID: 077754CA23023F4F
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Grant/AbstractGrant.php
View File

@ -181,7 +181,7 @@ abstract class AbstractGrant implements GrantTypeInterface
$clientSecret = $this->getRequestParameter('client_secret', $request, $basicAuthPassword);
if ($this->clientRepository->validateClient($clientId, $clientSecret) === false) {
if ($this->clientRepository->validateClient($clientId, $clientSecret, $this->getIdentifier()) === false) {
$this->getEmitter()->emit(new RequestEvent(RequestEvent::CLIENT_AUTHENTICATION_FAILED, $request));
throw OAuthServerException::invalidClient($request);
@ -191,7 +191,7 @@ abstract class AbstractGrant implements GrantTypeInterface
// If a redirect URI is provided ensure it matches what is pre-registered
$redirectUri = $this->getRequestParameter('redirect_uri', $request, null);
if ($redirectUri !== null) {
$this->validateRedirectUri($redirectUri, $client, $request);
}

10
src/Repositories/ClientRepositoryInterface.php
View File

@ -39,15 +39,9 @@ interface ClientRepositoryInterface extends RepositoryInterface
*
* @param string $clientIdentifier The client's identifier
* @param null|string $clientSecret The client's secret (if sent)
* @param null|string $grantType The type of grant the client is using (if sent)
*
* @return bool
*/
public function validateClient($clientIdentifier, $clientSecret);
/**
* Check if a client can use a grant type.
*
* @return bool
*/
public function canUseGrant($clientIdentifier, $grantType);
public function validateClient($clientIdentifier, $clientSecret, $grantType);
}