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

[BUGFIX] #15564 Generated admin API token expires immediately #15598

Merged
merged 2 commits into from
Jun 1, 2018
Merged

[BUGFIX] #15564 Generated admin API token expires immediately #15598

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eab3674
[BUGFIX] #15564 Generated admin API token expires immediately
krukas May 30, 2018
3ca1c6f
[TASK] Remove tab
krukas May 30, 2018
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
5 changes: 5 additions & 0 deletions app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ private function isTokenExpired(Token $token): bool
// other user-type tokens are considered always valid
return false;
}

if (empty($tokenTtl)) {
return false;
}

if ($this->dateTime->strToTime($token->getCreatedAt()) < ($this->date->gmtTimestamp() - $tokenTtl * 3600)) {
return true;
}
Expand Down