Skip to content

Use arrays to define OAuth2 information in the plugin definition #945

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
wants to merge 2 commits into
base: 7.x-2.x
Choose a base branch
from
Open

Use arrays to define OAuth2 information in the plugin definition #945

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
724a27d
Use arrays to define OAuth2 information in the plugin definition
hussainweb Sep 5, 2016
6a5673c
Add (legacy) support for the previous method of specifying oauth2 server
hussainweb Oct 31, 2016
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
16 changes: 11 additions & 5 deletions src/Plugin/authentication/OAuth2ServerAuthentication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,19 @@ protected function getOAuth2Info(RequestInterface $request) {

$plugin_definition = ResourcePluginManager::create('cache', $request)->getDefinition($plugin_id);

if (empty($plugin_definition['oauth2Server'])) {
return NULL;
// First check if we have an array with OAuth2 info and use if available.
if (!empty($plugin_definition['oauth2Info']) && !empty($plugin_definition['oauth2Info']['server'])) {
return $plugin_definition['oauth2Info'] + ['scope' => ''];
}

// Check for OAuth2 properties at top level for legacy support.
if (!empty($plugin_definition['oauth2Server'])) {
$server = $plugin_definition['oauth2Server'];
$scope = !empty($plugin_definition['oauth2Scope']) ? $plugin_definition['oauth2Scope'] : '';
return ['server' => $server, 'scope' => $scope];
}

$server = $plugin_definition['oauth2Server'];
$scope = !empty($plugin_definition['oauth2Scope']) ? $plugin_definition['oauth2Scope'] : '';
return ['server' => $server, 'scope' => $scope];
return NULL;
}

/**
Expand Down