Merge pull request #3705 from nextcloud/backport/3703/stable25

juliusknorr · web-flow · commit d8ba2eaf872a · 2023-01-27T18:19:02.000+01:00
diff --git a/lib/Controller/SessionController.php b/lib/Controller/SessionController.php
@@ -113,9 +113,11 @@ public function mention(int $documentId, int $sessionId, string $sessionToken, s
 
 	private function loginSessionUser(int $documentId, int $sessionId, string $sessionToken) {
 		$currentSession = $this->sessionService->getSession($documentId, $sessionId, $sessionToken);
-		$user = $this->userManager->get($currentSession->getUserId());
-		if ($user !== null) {
-			$this->userSession->setUser($user);
+		if ($currentSession !== false) {
+			$user = $this->userManager->get($currentSession->getUserId());
+			if ($user !== null) {
+				$this->userSession->setUser($user);
+			}
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -113,9 +113,11 @@ public function mention(int $documentId, int $sessionId, string $sessionToken, s`
`113`	`113`
`114`	`114`	`private function loginSessionUser(int $documentId, int $sessionId, string $sessionToken) {`
`115`	`115`	`$currentSession = $this->sessionService->getSession($documentId, $sessionId, $sessionToken);`
`116`		`- $user = $this->userManager->get($currentSession->getUserId());`
`117`		`- if ($user !== null) {`
`118`		`- $this->userSession->setUser($user);`
	`116`	`+ if ($currentSession !== false) {`
	`117`	`+ $user = $this->userManager->get($currentSession->getUserId());`
	`118`	`+ if ($user !== null) {`
	`119`	`+ $this->userSession->setUser($user);`
	`120`	`+ }`
`119`	`121`	`}`
`120`	`122`	`}`
`121`	`123`	`}`