Skip to content

[stable24] Implement collaborative locking #2322

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 8 commits into from
Apr 21, 2022
Merged

[stable24] Implement collaborative locking #2322

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
15e613d
Implement collaborative locking
juliusknorr Mar 23, 2022
56357a2
Open files read only if locked
juliusknorr Apr 21, 2022
fccfa2b
Expose lock in the text UI
juliusknorr Apr 21, 2022
c933740
Also take mtime into account for change detection during editing
juliusknorr Apr 21, 2022
645b33f
Unlock during session cleanup
juliusknorr Apr 21, 2022
1029f58
Make psalm happy
juliusknorr Apr 21, 2022
0e1d8f7
Use proper file id source for public shares
juliusknorr Apr 21, 2022
dcd0f7a
Bump bundles
juliusknorr Apr 21, 2022
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
Prev Previous commit
Next Next commit
Open files read only if locked 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr @backportbot
juliusknorr authored and backportbot[bot] committed Apr 21, 2022
commit 56357a26b2682183086b6ca6dbe541b7de87810e
12 changes: 4 additions & 8 deletions lib/Service/ApiService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

use Exception;
use OC\Files\Node\File;
use OCA\Text\AppInfo\Application;
use OCA\Text\DocumentHasUnsavedChangesException;
use OCA\Text\DocumentSaveConflictException;
use OCA\Text\VersionMismatchException;
Expand All @@ -37,6 +38,7 @@
use OCP\AppFramework\Http\FileDisplayResponse;
use OCP\AppFramework\Http\NotFoundResponse;
use OCP\Constants;
use OCP\Files\Lock\ILock;
use OCP\Files\NotFoundException;
use OCP\ILogger;
use OCP\IRequest;
Expand All @@ -63,7 +65,6 @@ public function __construct(IRequest $request,

public function create($fileId = null, $filePath = null, $token = null, $guestName = null, bool $forceRecreate = false): DataResponse {
try {
$readOnly = true;
/** @var File $file */
if ($token) {
$file = $this->documentService->getFileByShareToken($token, $this->request->getParam('filePath'));
Expand All @@ -77,19 +78,14 @@ public function create($fileId = null, $filePath = null, $token = null, $guestNa
} catch (NotFoundException $e) {
return new DataResponse([], Http::STATUS_NOT_FOUND);
}

try {
$this->documentService->checkSharePermissions($token, Constants::PERMISSION_UPDATE);
$readOnly = false;
} catch (NotFoundException $e) {
}
} elseif ($fileId) {
$file = $this->documentService->getFileById($fileId);
$readOnly = !$file->isUpdateable();
} else {
return new DataResponse('No valid file argument provided', 500);
}

$readOnly = $this->documentService->isReadOnly($file, $token);

$this->sessionService->removeInactiveSessions($file->getId());
$activeSessions = $this->sessionService->getActiveSessions($file->getId());
if ($forceRecreate || count($activeSessions) === 0) {
Expand Down