Skip to content

Add support for multiple access tokens per user (#977) #982

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

Add support for multiple access tokens per user (#977) #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6712229
Removing instances of token cleanup.
tnightingale Mar 10, 2017
d9c1b06
Re-enabling expired token cleanup when creating a new access token. R…
tnightingale Mar 10, 2017
081494e
Removed TODO
tnightingale Mar 10, 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
13 changes: 0 additions & 13 deletions modules/restful_token_auth/src/Entity/RestfulTokenAuthController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,6 @@ public function generateAccessToken($uid) {
* The token entity.
*/
private function generateRefreshToken($uid) {
// Check if there are other refresh tokens for the user.
$query = new \EntityFieldQuery();
$results = $query
->entityCondition('entity_type', 'restful_token_auth')
->entityCondition('bundle', 'refresh_token')
->propertyCondition('uid', $uid)
->execute();

if (!empty($results['restful_token_auth'])) {
// Delete the tokens.
entity_delete_multiple('restful_token_auth', array_keys($results['restful_token_auth']));
}

// Create a new refresh token.
$values = array(
'uid' => $uid,
Expand Down
36 changes: 15 additions & 21 deletions modules/restful_token_auth/src/Plugin/resource/AccessToken__1_0.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function controllersInfo() {
return array(
'' => array(
// Get or create a new token.
RequestInterface::METHOD_GET => 'getOrCreateToken',
RequestInterface::METHOD_GET => 'createToken',
RequestInterface::METHOD_OPTIONS => 'discover',
),
);
Expand All @@ -55,9 +55,10 @@ public function controllersInfo() {
/**
* Create a token for a user, and return its value.
*/
public function getOrCreateToken() {
public function createToken() {
$entity_type = $this->getEntityType();
$account = $this->getAccount();

// Check if there is a token that did not expire yet.
/* @var DataProviderEntityInterface $data_provider */
$data_provider = $this->getDataProvider();
Expand All @@ -66,32 +67,25 @@ public function getOrCreateToken() {
->entityCondition('entity_type', $entity_type)
->entityCondition('bundle', 'access_token')
->propertyCondition('uid', $account->uid)
->range(0, 1)
->execute();

$token_exists = FALSE;

if (!empty($result[$entity_type])) {
$id = key($result[$entity_type]);
$access_token = entity_load_single($entity_type, $id);

$token_exists = TRUE;
if (!empty($access_token->expire) && $access_token->expire < REQUEST_TIME) {
if (variable_get('restful_token_auth_delete_expired_tokens', TRUE)) {
// Token has expired, so we can delete this token.
$access_token->delete();
foreach ($result[$entity_type] as $id => $value) {
$access_token = entity_load_single($entity_type, $id);
if (!empty($access_token->expire) && $access_token->expire < REQUEST_TIME) {
if (variable_get('restful_token_auth_delete_expired_tokens', TRUE)) {
// Token has expired, so we can delete this token.
$access_token->delete();
}
}

$token_exists = FALSE;
}
}

if (!$token_exists) {
/* @var \Drupal\restful_token_auth\Entity\RestfulTokenAuthController $controller */
$controller = entity_get_controller($this->getEntityType());
$access_token = $controller->generateAccessToken($account->uid);
$id = $access_token->id;
}
/* @var \Drupal\restful_token_auth\Entity\RestfulTokenAuthController $controller */
$controller = entity_get_controller($this->getEntityType());
$access_token = $controller->generateAccessToken($account->uid);
$id = $access_token->id;

$output = $this->view($id);

return $output;
Expand Down