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

#446 Check for session first before logging out in fastLogout method of DrupalAuthenticationManager #447

Merged
merged 3 commits into from
Dec 15, 2017
Merged

#446 Check for session first before logging out in fastLogout method of DrupalAuthenticationManager #447

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
606dd7f
#446 Check for session first before logging out in fastLogout method …
m4olivei Dec 13, 2017
d49a3da
#446 Fix coding standards warnings.
m4olivei Dec 13, 2017
e125236
#446 Unset the user outside the conditional.
m4olivei Dec 14, 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
7 changes: 5 additions & 2 deletions src/Drupal/DrupalExtension/Manager/DrupalAuthenticationManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,10 @@ public function loggedIn()
*/
public function fastLogout()
{
$this->getSession()->reset();
$this->userManager->setCurrentUser(false);
$session = $this->getSession();
if ($session->isStarted()) {
$session->reset();
$this->userManager->setCurrentUser(false);
Copy link
Owner

Choose a reason for hiding this comment

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

I wonder if we should unset the user outside the conditional?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That makes sense, will update.

}
}
}