Skip to content

Make use of session middleware in remaining controllers #4290

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 6 commits into from
Jun 24, 2023
Merged

Make use of session middleware in remaining controllers #4290

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f5963e1
chore: Annotate controller methods in routes.php
juliusknorr Jun 13, 2023
c9f252d
chore: Cleanup workspace controller
juliusknorr Jun 13, 2023
7471edc
chore: Refactor remaining controllers to make use of the session midd…
juliusknorr Jun 13, 2023
e549536
chore: Cleanup in direct editing backend
juliusknorr Jun 13, 2023
3b7877b
chore: Cleanup psalm baseline
juliusknorr Jun 13, 2023
84dd2d3
test(api): Try different approach of chaining api calls
juliusknorr Jun 13, 2023
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
chore: Cleanup psalm baseline 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Jun 23, 2023
commit 3b7877b14e4dc0b4decb2a5d212d15dd22b5d031
5 changes: 3 additions & 2 deletions lib/Listeners/BeforeNodeDeletedListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ public function handle(Event $event): void {
if (!$event instanceof BeforeNodeDeletedEvent) {
return;
}
if ($event->getNode() instanceof File && $event->getNode()->getMimeType() === 'text/markdown') {
$this->attachmentService->deleteAttachments($event->getNode());
$node = $event->getNode();
if ($node instanceof File && $node->getMimeType() === 'text/markdown') {
$this->attachmentService->deleteAttachments($node);
}
}
}
10 changes: 6 additions & 4 deletions lib/Listeners/BeforeNodeRenamedListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,13 @@ public function handle(Event $event): void {
if (!$event instanceof BeforeNodeRenamedEvent) {
return;
}
if ($event->getSource() instanceof File
&& $event->getSource()->getMimeType() === 'text/markdown'
&& $event->getTarget() instanceof File
$source = $event->getSource();
$target = $event->getTarget();
if ($source instanceof File
&& $source->getMimeType() === 'text/markdown'
&& $target instanceof File
) {
$this->attachmentService->moveAttachments($event->getSource(), $event->getTarget());
$this->attachmentService->moveAttachments($source, $target);
}
}
}
12 changes: 7 additions & 5 deletions lib/Listeners/NodeCopiedListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@ public function handle(Event $event): void {
if (!$event instanceof NodeCopiedEvent) {
return;
}
if ($event->getSource() instanceof File
&& $event->getSource()->getMimeType() === 'text/markdown'
&& $event->getTarget() instanceof File
&& $event->getTarget()->getMimeType() === 'text/markdown'
$source = $event->getSource();
$target = $event->getTarget();
if ($source instanceof File
&& $source->getMimeType() === 'text/markdown'
&& $target instanceof File
&& $target->getMimeType() === 'text/markdown'
) {
$this->attachmentService->copyAttachments($event->getSource(), $event->getTarget());
$this->attachmentService->copyAttachments($source, $target);
}
}
}
4 changes: 2 additions & 2 deletions lib/Service/DocumentService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public function createDocument(File $file): Document {
} catch (Exception $e) {
if ($e->getReason() === Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
// Document might have been created in the meantime
return $this->documentMapper->find($file->getFileInfo()->getId());
return $this->documentMapper->find($file->getId());
}

throw $e;
Expand Down Expand Up @@ -509,7 +509,7 @@ public function getFileByShareToken(string $shareToken, ?string $path = null): F
}

$node = $share->getNode();
if ($node instanceof Folder) {
if ($path !== null && $node instanceof Folder) {
$node = $node->get($path);
}
if ($node instanceof File) {
Expand Down
100 changes: 5 additions & 95 deletions tests/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,112 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="4.x-dev@">
<file src="lib/AppInfo/Application.php">
<InvalidArgument occurrences="1">
<code>RegisterDirectEditorEventListener::class</code>
</InvalidArgument>
<UndefinedClass occurrences="3">
<code>BeforeTemplateRenderedEvent</code>
<code>LoadAdditionalScriptsEvent</code>
<code>LoadViewer</code>
</UndefinedClass>
</file>
<file src="lib/Controller/DirectSessionController.php">
<UndefinedClass occurrences="1">
<code>InvalidTokenException</code>
</UndefinedClass>
</file>
<files psalm-version="5.12.0@f90118cdeacd0088e7215e64c0c99ceca819e176">
<file src="lib/Controller/WorkspaceController.php">
<InvalidReturnType occurrences="3">
<code>DataResponse</code>
<code>DataResponse</code>
<code>DataResponse</code>
</InvalidReturnType>
<MissingDependency occurrences="4">
<code>$this-&gt;rootFolder</code>
<code>$this-&gt;rootFolder</code>
<code>IRootFolder</code>
<code>IRootFolder</code>
</MissingDependency>
<UndefinedInterfaceMethod occurrences="1">
<UndefinedInterfaceMethod>
<code>open</code>
</UndefinedInterfaceMethod>
</file>
<file src="lib/DAV/WorkspacePlugin.php">
<UndefinedClass occurrences="1">
<UndefinedClass>
<code>ServerPlugin</code>
</UndefinedClass>
</file>
<file src="lib/DirectEditing/TextDirectEditor.php">
<LessSpecificImplementedReturnType occurrences="3">
<code>array</code>
<code>array</code>
<code>array</code>
</LessSpecificImplementedReturnType>
<UndefinedInterfaceMethod occurrences="1">
<UndefinedInterfaceMethod>
<code>getToken</code>
</UndefinedInterfaceMethod>
</file>
<file src="lib/Listeners/FilesLoadAdditionalScriptsListener.php">
<UndefinedClass occurrences="1">
<code>LoadAdditionalScriptsEvent</code>
</UndefinedClass>
</file>
<file src="lib/Listeners/LoadViewerListener.php">
<UndefinedClass occurrences="1">
<code>LoadViewer</code>
</UndefinedClass>
</file>
<file src="lib/Service/ApiService.php">
<UndefinedDocblockClass occurrences="1"/>
</file>
<file src="lib/Service/DocumentService.php">
<MismatchingDocblockReturnType occurrences="1">
<code>Entity</code>
</MismatchingDocblockReturnType>
<MissingDependency occurrences="3">
<code>$this-&gt;rootFolder</code>
<code>IRootFolder</code>
<code>IRootFolder</code>
</MissingDependency>
<UndefinedClass occurrences="1">
<code>\OC\User\NoUserException</code>
</UndefinedClass>
</file>
<file src="lib/Service/AttachmentService.php">
<MissingDependency occurrences="6">
<code>$this-&gt;rootFolder</code>
<code>$this-&gt;rootFolder</code>
<code>$this-&gt;rootFolder</code>
<code>$this-&gt;rootFolder</code>
<code>IRootFolder</code>
<code>IRootFolder</code>
</MissingDependency>
<UndefinedClass occurrences="3">
<code>ClientException</code>
<code>ConnectException</code>
<code>ServerException</code>
</UndefinedClass>
<UndefinedDocblockClass occurrences="16">
<code>\OC\User\NoUserException</code>
<code>\OC\User\NoUserException</code>
<code>\OC\User\NoUserException</code>
<code>\OC\User\NoUserException</code>
<code>\OC\User\NoUserException</code>
<code>\OC\User\NoUserException</code>
<code>\OC\User\NoUserException</code>
<code>\OC\User\NoUserException</code>
<code>\OC\User\NoUserException</code>
<code>\OC\User\NoUserException</code>
<code>\OC\User\NoUserException</code>
<code>\OC\User\NoUserException</code>
<code>\OC\User\NoUserException</code>
<code>\OC\User\NoUserException</code>
<code>\OC\User\NoUserException</code>
<code>\OC\User\NoUserException</code>
</UndefinedDocblockClass>
</file>
<file src="vendor/nextcloud/ocp/OCP/BackgroundJob/TimedJob.php">
<ImplementedParamTypeMismatch occurrences="1">
<ImplementedParamTypeMismatch>
<code>$jobList</code>
</ImplementedParamTypeMismatch>
</file>
Expand Down
4 changes: 4 additions & 0 deletions tests/stub.phpstub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ namespace OC\AppFramework\OCS {
class BaseResponse {}
}

namespace OCA\Files\Event {
class LoadAdditionalScriptsEvent extends \OCP\EventDispatcher\Event {}
}

namespace OCA\Viewer\Event {
class LoadViewer extends \OCP\EventDispatcher\Event {}
}
Expand Down