Merge pull request #448 from jhedstrom/443-fast-logout-follow-up

Further use of fast logout.
jhedstrom · Dec 15, 2017 · 9cf2131 · 9cf2131
2 parents 4fd9abc + ce99d97
commit 9cf2131
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Drupal/DrupalExtension/Context/RawDrupalContext.php b/src/Drupal/DrupalExtension/Context/RawDrupalContext.php
@@ -266,8 +266,11 @@ public function cleanUsers()
             }
             $this->getDriver()->processBatch();
             $this->userManager->clearUsers();
-            if ($this->loggedIn()) {
+            // If the authentication manager supports logout, no need to check if the user is logged in.
+            if ($this->getAuthenticationManager() instanceof FastLogoutInterface) {
                 $this->logout(true);
+            } elseif ($this->loggedIn()) {
+                $this->logout();
             }
         }
     }