Skip to content

Allow multiple client id sources #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mcfedr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow multiple client id sources #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/Symfony/Component/Security/Http/Firewall/TokenListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,12 @@ public function handle(GetResponseEvent $event)
{
$request = $event->getRequest();

// At least one (and only one) of client credentials method required.
// At least one of client credentials method required.
// If more than one is set then basic auth will be used. Some clients (incorrectly) use more than one.
if (!$request->headers->get('PHP_AUTH_USER', false) && !$request->request->get('client_id', false)) {
throw new InvalidRequestException([
'error_description' => 'The request is missing a required parameter',
]);
} elseif ($request->headers->get('PHP_AUTH_USER', false) && $request->request->get('client_id', false)) {
throw new InvalidRequestException([
'error_description' => 'The request utilizes more than one mechanism for authenticating the client',
]);
}

// Check with HTTP basic auth if exists.
Expand Down