Merge pull request #154 from nextcloud/backport/151/stable28

[stable28] ignore null user on logout
nextcloud · May 27, 2024 · 64aaac2 · 64aaac2
2 parents 944dd82 + b73faf6
commit 64aaac2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0', '8.1', '8.2']
-        server-versions: ['master']
+        server-versions: ['stable28']
 
     services:
       mysql:

diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0']
-        server-versions: ['master']
+        server-versions: ['stable28']
 
     services:
       oracle:

diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0']
-        server-versions: ['master']
+        server-versions: ['stable28']
 
     services:
       postgres:

diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0']
-        server-versions: ['master']
+        server-versions: ['stable28']
 
     steps:
       - name: Set app env

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         php-versions: ['8.0']
         databases: ['sqlite']
-        server-versions: ['master']
+        server-versions: ['stable28']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 

diff --git a/lib/Listeners/UserLoggedOut.php b/lib/Listeners/UserLoggedOut.php
@@ -54,11 +54,13 @@ public function handle(Event $event): void {
 			return;
 		}
 
+		$user = $event->getUser();
+
 		/** only used in slave mode */
-		if ($this->globalSiteSelector->getMode() !== GlobalSiteSelector::SLAVE) {
+		if ($user === null || $this->globalSiteSelector->getMode() !== GlobalSiteSelector::SLAVE) {
 			return;
 		}
 
-		$this->slave->handleLogoutRequest($event->getUser());
+		$this->slave->handleLogoutRequest($user);
 	}
 }