fix(api): Unlock the file via the context

Signed-off-by: Max <max@nextcloud.com>

Author: max-nextcloud

lib/Context/FileContext.php

@@ -151,6 +151,12 @@ public function saveWithLock(string $content, callable $doWhileLocked): void {
 		});
 	}
 
+	#[Override]
+	public function cleanup(): void
+	{
+		$this->unlock();
+	}
+
 	private function computeCheckSum(?string $content = null): string {
 		if ($content === null) {
 			$content = $this->file->getContent();
@@ -175,4 +181,12 @@ private function lock(): bool {
 		return true;
 	}
 
+	private function unlock(): void {
+		// Disable file locking for Readme.md files, because in the
+		// current setup, this makes it almost impossible to delete these files.
+		if (strcasecmp($this->file->getName(), 'Readme.md') !== 0) {
+			$this->lockService->unlock($this->file);
+		}
+	}
+
 }

lib/Context/IContext.php

@@ -23,6 +23,10 @@ public function updateDocument(Document $document): ?Document;
 	public function getFile(): ?File;
 	public function loadContent(): ?string;
 	public function saveWithLock(string $content, callable $doWhileLocked): void;
+	/**
+	 * This will be called when the last active editing session ends.
+	 */
+	public function cleanup(): void;
 }
 
 readonly class DocumentData {

lib/Controller/PublicSessionController.php

@@ -85,8 +85,7 @@ public function create(string $token, ?string $filePath = null, ?string $baseVer
 	#[NoAdminRequired]
 	#[PublicPage]
 	public function close(int $documentId, int $sessionId, string $sessionToken, string $token): DataResponse {
-		$file = $this->fileService->getFileByIdFromShare($documentId, $token);
-		return $this->apiService->close($documentId, $sessionId, $sessionToken, $file);
+		return $this->apiService->close($documentId, $sessionId, $sessionToken);
 	}
 
 	#[NoAdminRequired]

lib/Controller/SessionController.php

@@ -74,8 +74,7 @@ public function close(int $documentId, int $sessionId, string $sessionToken): Da
 		if ($userId === null) {
 			throw new InvalidSessionException();
 		}
-		$file = $this->fileService->getFileById($documentId, $userId);
-		return $this->apiService->close($documentId, $sessionId, $sessionToken, $file);
+		return $this->apiService->close($documentId, $sessionId, $sessionToken);
 	}
 
 	#[NoAdminRequired]

lib/Service/ApiService.php

@@ -76,12 +76,16 @@ public function create(IContext $context, ?string $baseVersionEtag, ?string $gue
 		);
 	}
 
-	public function close(int $documentId, int $sessionId, string $sessionToken, File $file): DataResponse {
+	public function close(int $documentId, int $sessionId, string $sessionToken): DataResponse {
 		$this->sessionService->closeSession($documentId, $sessionId, $sessionToken);
 		$this->sessionService->removeInactiveSessionsWithoutSteps($documentId);
 		$activeSessions = $this->sessionService->getActiveSessions($documentId);
 		if (count($activeSessions) === 0) {
-			$this->lockService->unlock($file);
+			$document = $this->documentService->getDocument($documentId);
+			$type = $document->getContextType();
+			$id = $document->getContextId();
+			$context = $this->contextManager->getContext($type, $id, $sessionToken);
+			$context->cleanup();
 		}
 		return new DataResponse([]);
 	}