Skip to content

perf(session): fetch document only once in SessionMiddleware #9294

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mejo- merged 1 commit into from
Sep 29, 2026
Merged

perf(session): fetch document only once in SessionMiddleware #9294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions lib/Middleware/SessionMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

use OC\User\NoUserException;
use OCA\Text\Controller\ISessionAwareController;
use OCA\Text\Db\Document;
use OCA\Text\Exception\AccountDisabledException;
use OCA\Text\Exception\InvalidDocumentBaseVersionEtagException;
use OCA\Text\Exception\InvalidSessionException;
Expand All @@ -31,6 +32,7 @@
use ReflectionException;

class SessionMiddleware extends Middleware {
private ?Document $document = null;

public function __construct(
private readonly IRequest $request,
Expand Down Expand Up @@ -80,7 +82,7 @@ private function assertDocumentBaseVersionEtag(): void {
$documentId = (int)$this->request->getParam('documentId');
$baseVersionEtag = $this->request->getParam('baseVersionEtag');

$document = $this->documentService->getDocument($documentId);
$document = $this->getDocument($documentId);
if ($baseVersionEtag && $document?->getBaseVersionEtag() !== $baseVersionEtag) {
throw new InvalidDocumentBaseVersionEtagException();
}
Expand Down Expand Up @@ -108,7 +110,7 @@ private function assertDocumentSession(ISessionAwareController $controller): voi
}
}

$document = $this->documentService->getDocument($documentId);
$document = $this->getDocument($documentId);
if (!$document) {
throw new InvalidSessionException();
}
Expand Down Expand Up @@ -147,6 +149,13 @@ private function assertUserOrShareToken(ISessionAwareController $controller): vo
throw new InvalidSessionException();
}

private function getDocument(int $documentId): ?Document {
if ($this->document?->getId() !== $documentId) {
$this->document = $this->documentService->getDocument($documentId);
}
return $this->document;
}

public function afterException($controller, $methodName, \Exception $exception): JSONResponse|Response {
if ($exception instanceof InvalidDocumentBaseVersionEtagException) {
return new JSONResponse(['error' => $this->l10n->t('Editing session has expired. Please reload the page.')], Http::STATUS_PRECONDITION_FAILED);
Expand Down
Loading