Skip to content
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

Jump to bottom

Add support for Client Credentials Grant Type to OAuth2 authentication #944

Open
wants to merge 1 commit into
base: 7.x-2.x
Choose a base branch
from
Open

Add support for Client Credentials Grant Type to OAuth2 authentication #944

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
27 changes: 24 additions & 3 deletions src/Plugin/authentication/OAuth2ServerAuthentication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,22 @@ public function authenticate(RequestInterface $request) {
if ($result instanceof \OAuth2\Response) {
throw new UnauthorizedException($result->getResponseBody(), $result->getStatusCode());
}
elseif (empty($result['user_id'])) {
return NULL;

if (empty($result['user_id'])) {
// If the user_id is not set, it could mean that this is a client
// credentials grant token, in which case the client_id would be set.
if (empty($result['client_id'])) {
return NULL;
}

// We are dealing with client credentials flow. See if the resource has
// defined an user for this grant type.
if (!empty($oauth2_info['client_credentials_uid'])) {
$result['user_id'] = $oauth2_info['client_credentials_uid'];
}
elseif (!empty($oauth2_info['client_credentials_user'])) {
$result['user_id'] = user_load_by_name($oauth2_info['client_credentials_user'])->uid;
Copy link
Member

@e0ipso e0ipso Sep 18, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are loading the user by name and then by id. We should load the user only once.

}
}
return user_load($result['user_id']);
}
Expand Down Expand Up @@ -84,7 +98,14 @@ protected function getOAuth2Info(RequestInterface $request) {

$server = $plugin_definition['oauth2Server'];
$scope = !empty($plugin_definition['oauth2Scope']) ? $plugin_definition['oauth2Scope'] : '';
return ['server' => $server, 'scope' => $scope];
$cc_user = !empty($plugin_definition['oauth2ClientCredentialsUser']) ? $plugin_definition['oauth2ClientCredentialsUser'] : '';
$cc_uid = !empty($plugin_definition['oauth2ClientCredentialsUid']) ? $plugin_definition['oauth2ClientCredentialsUid'] : '';
return [
'server' => $server,
'scope' => $scope,
'client_credentials_user' => $cc_user,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any impediment to make it camel case? If not, I'd rather camel case since it's consistent with the rest of the annotation keys.

'client_credentials_uid' => $cc_uid,
];
}

/**
Expand Down