User::logout() steps reorder

nette · Jan 18, 2021 · 817ee98 · 817ee98
1 parent 6ce3aab
commit 817ee98
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/Security/User.php b/src/Security/User.php
@@ -129,12 +129,7 @@ public function login($user, string $password = null): void
  */
  final public function logout(bool $clearIdentity = false): void
  {
- if ($this->isLoggedIn()) {
- Arrays::invoke($this->onLoggedOut, $this);
- }
-
- $this->authenticated = false;
- $this->identity = $clearIdentity ? null : $this->identity;
+ $logged = $this->isLoggedIn();
 
  if ($this->storage instanceof UserStorage) {
  $this->storage->clearAuthentication($clearIdentity);
@@ -143,8 +138,14 @@ final public function logout(bool $clearIdentity = false): void
  if ($clearIdentity) {
  $this->storage->setIdentity(null);
  }
- $this->logoutReason = self::MANUAL;
  }
+
+ $this->authenticated = false;
+ $this->logoutReason = self::MANUAL;
+ if ($logged) {
+ Arrays::invoke($this->onLoggedOut, $this);
+ }
+ $this->identity = $clearIdentity ? null : $this->identity;
  }