Small bug fixes. Fixes #13

This commit is contained in:
Alex Bilbie 2013-03-18 16:46:07 +00:00
parent f102b4fb68
commit b6ba08813d
2 changed files with 3 additions and 3 deletions

View File

@ -291,8 +291,8 @@ class AuthServer
throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'redirect_uri'), 0); throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'redirect_uri'), 0);
} }
if ($this->requireStateParam === true && is_null($authParams['redirect_uri'])) { if ($this->requireStateParam === true && is_null($authParams['state'])) {
throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'redirect_uri'), 0); throw new Exception\ClientException(sprintf(self::$exceptionMessages['invalid_request'], 'state'), 0);
} }
// Validate client ID and redirect URI // Validate client ID and redirect URI

View File

@ -120,7 +120,7 @@ class Password implements GrantTypeInterface {
// Check if user's username and password are correct // Check if user's username and password are correct
$userId = call_user_func($this->getVerifyCredentialsCallback(), $authParams['username'], $authParams['password']); $userId = call_user_func($this->getVerifyCredentialsCallback(), $authParams['username'], $authParams['password']);
if ($userId === false) { if ($userId === false || $userId === null) {
throw new Exception\ClientException(AuthServer::getExceptionMessage('invalid_credentials'), 0); throw new Exception\ClientException(AuthServer::getExceptionMessage('invalid_credentials'), 0);
} }