Merge pull request #167 from lucadegasperi/patch-2

updated calls to proper request methods
This commit is contained in:
Alex Bilbie 2014-05-07 17:11:29 +01:00
commit be4799edc9

View File

@ -71,10 +71,10 @@ class OAuthException extends \Exception
if ($this->errorType === 'invalid_client') { if ($this->errorType === 'invalid_client') {
$authScheme = null; $authScheme = null;
$request = new Request(); $request = new Request();
if ($request->server('PHP_AUTH_USER') !== null) { if ($request->getUser() !== null) {
$authScheme = 'Basic'; $authScheme = 'Basic';
} else { } else {
$authHeader = $request->header('Authorization'); $authHeader = $request->headers->get('Authorization');
if ($authHeader !== null) { if ($authHeader !== null) {
if (strpos($authHeader, 'Bearer') === 0) { if (strpos($authHeader, 'Bearer') === 0) {
$authScheme = 'Bearer'; $authScheme = 'Bearer';