Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/


namespace OCA\Whiteboard\AppInfo;

use OCA\Files_Sharing\Event\BeforeTemplateRenderedEvent;
Expand Down
5 changes: 0 additions & 5 deletions lib/Controller/RecordingController.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
namespace OCA\Whiteboard\Controller;

use InvalidArgumentException;

use OCA\Whiteboard\Exception\InvalidUserException;
use OCA\Whiteboard\Exception\UnauthorizedException;
use OCA\Whiteboard\Model\AuthenticatedUser;
Expand Down Expand Up @@ -86,8 +85,6 @@ public function recording(int $fileId, string $userId) {
}
}



/**
* @NoCSRFRequired
* @NoAdminRequired
Expand Down Expand Up @@ -185,8 +182,6 @@ private function validateUploadedFile(): array {
return $uploadedFile;
}



/**
* @throws NotPermittedException
* @throws NotFoundException
Expand Down
2 changes: 0 additions & 2 deletions lib/Controller/WhiteboardController.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,9 @@ public function update(int $fileId, array $data): DataResponse {
$this->contentService->updateContent($file, $data);

return new DataResponse(['status' => 'success']);

} catch (Exception $e) {
$this->logger->error('Error syncing whiteboard data: ' . $e->getMessage());
return $this->exceptionService->handleException($e);

} finally {
if ($this->cache->get($lockKey) === $lockValue) {
$this->cache->remove($lockKey);
Expand Down
1 change: 1 addition & 0 deletions lib/Listener/AddContentSecurityPolicyListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Whiteboard\Listener;

use OCA\Whiteboard\Service\ConfigService;
Expand Down
1 change: 0 additions & 1 deletion lib/Listener/BeforeTemplateRenderedListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/


namespace OCA\Whiteboard\Listener;

use OCA\Files_Sharing\Event\BeforeTemplateRenderedEvent;
Expand Down
1 change: 0 additions & 1 deletion lib/Listener/LoadViewerListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/


namespace OCA\Whiteboard\Listener;

use OCA\Viewer\Event\LoadViewer;
Expand Down
2 changes: 1 addition & 1 deletion lib/Listener/RegisterTemplateCreatorListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Whiteboard\Listener;

use OCA\Whiteboard\AppInfo\Application;
Expand All @@ -31,7 +32,6 @@ public function handle(Event $event): void {
return;
}


$event->getTemplateManager()->registerTemplateFileCreator(function () {
return self::getTemplateFileCreator($this->l10n);
});
Expand Down
3 changes: 0 additions & 3 deletions lib/Service/File/GetFileServiceFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
use OCA\Whiteboard\Exception\InvalidUserException;
use OCA\Whiteboard\Model\AuthenticatedUser;
use OCA\Whiteboard\Model\PublicSharingUser;

use OCA\Whiteboard\Model\User;
use OCP\Files\IRootFolder;
use OCP\Share\IManager as ShareManager;
Expand Down Expand Up @@ -40,8 +39,6 @@ public function create(User $user, int $fileId): GetFileService {
return new GetFileFromPublicSharingTokenService($this->shareManager, $user->getPublicSharingToken(), $fileId);
}



throw new InvalidUserException();
}
}
2 changes: 0 additions & 2 deletions lib/Service/JWTService.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ public function generateJWT(User $user, File $file, bool $isFileReadOnly = true)
'exp' => $expirationTime
];



return $this->generateJWTFromPayload($payload);
}

Expand Down
1 change: 0 additions & 1 deletion lib/Service/WhiteboardContentService.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ public function updateContent(File $file, array $data): void {
try {
$file->putContent($encodedPayload);
return;

} catch (LockedException $e) {
if ($attempt === $maxRetries - 1) {
$this->logger->error('Whiteboard file write failed after retries', [
Expand Down
1 change: 0 additions & 1 deletion tests/Unit/AppInfo/ApplicationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/


namespace OCA\Whiteboard\AppInfo;

class ApplicationTest extends \Test\TestCase {
Expand Down
Loading