Skip to content

[stable24] Fix bug when session not found #5692

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

Merged
juliusknorr merged 2 commits into from
Apr 23, 2024
Merged

[stable24] Fix bug when session not found #5692

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb577b8
fix potential crash when trying to use the document session's user wh…
julien-nc Jan 27, 2023
1976dd2
chore(assets): Recompile assets
nextcloud-command Apr 23, 2024
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
Next Next commit
fix potential crash when trying to use the document session's user wh… 
…en the session is not found

Signed-off-by: Julien Veyssier <[email protected]>
  • Loading branch information
@julien-nc @backportbot
julien-nc authored and backportbot[bot] committed Apr 16, 2024
commit cb577b8306dd0b8faae31db74d481f8acbd147b8
8 changes: 5 additions & 3 deletions lib/Controller/SessionController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,11 @@ public function sync(int $documentId, int $sessionId, string $sessionToken, int

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);
}
}
}
}