Skip to content

412/allow access token with cookie #1008

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 7 commits into
base: 7.x-1.x
Choose a base branch
from
Open

412/allow access token with cookie #1008

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4e01d83
Fix dual authentication problem.
bricel Nov 29, 2017
bd8203c
Better comments.
bricel Nov 29, 2017
6fbd7e0
retry tests.
bricel Nov 29, 2017
5c92cd0
Drush 8 for travis.
bricel Nov 29, 2017
504573c
Restore Drush version.
bricel Nov 30, 2017
182ec8a
Fix warning.
bricel Dec 4, 2017
b5baa90
close bracket.
bricel Dec 4, 2017
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
14 changes: 14 additions & 0 deletions plugins/authentication/RestfulAuthenticationCookie.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,20 @@

class RestfulAuthenticationCookie extends RestfulAuthenticationBase implements RestfulAuthenticationInterface {

/**
* {@inheritdoc}
*/
public function applies(array $request = array(), $method = \RestfulInterface::GET) {
// Skip cookies auth if we have an access token.
if (variable_get('restful_prefer_access_token', FALSE) && isset($request['__application']['access_token'])) {
// The variable may be set if you want to be logged in both with a session
// cookie and with an access token, favoriting the access_token request
// see https://github.com/RESTful-Drupal/restful/issues/412.
return;
}
return TRUE;
}

/**
* Implements RestfulAuthenticationInterface::authenticate().
*/
Expand Down