Skip to content

[stable28] Refactor attachment loading #5053

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 23 commits into from
Nov 29, 2023
Merged

[stable28] Refactor attachment loading #5053

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e903edf
refactor(AttachmentService): Some code style cleanup
mejo- Oct 25, 2023
8682d60
chore(attachments): Remove support for obsolete `text://` format
mejo- Oct 31, 2023
75ec895
feat(attachments): API endpoint to get list of attachments for a docu…
mejo- Oct 25, 2023
264aa76
chore(attachments): Remove obsolete metadata API endpoint
mejo- Nov 15, 2023
2f78829
feat(attachments): Use getAttachmentList API endpoint in resolver
mejo- Oct 31, 2023
b288c85
fix(attachment): Remove candidate logic from ImageView node
mejo- Nov 15, 2023
13cea83
fix(attachments): Fix some issues with the showimage modal
mejo- Nov 21, 2023
d8842a6
chore(attachments): Remove obsolete code
mejo- Nov 21, 2023
0bc3556
feat(editor): Allow to pass fileId to MarkdownContentEditor
mejo- Nov 21, 2023
0f2b874
feat(attachments): Allow to get attachments without document session
mejo- Nov 22, 2023
9b9e876
chore(attachments): Remove special-handling for preview URLs
mejo- Nov 22, 2023
d95d6b2
fix(attachments): Open non-image attachments in viewer or download
mejo- Nov 22, 2023
337724d
fix(AttachmentController): Set fileName of returned attachments
mejo- Nov 27, 2023
7a32d8e
chore(composer): Update autoloader maps
mejo- Nov 27, 2023
597b8d5
fix(attachments): Fix encoding of attachment URI component
mejo- Nov 27, 2023
98a47c3
test(cy): Test to open image in modal and download attachment
mejo- Nov 28, 2023
adf5fe8
chore(middleware): Rename to RequireDocumentSessionOrUserOrShareToken
mejo- Nov 28, 2023
88c8810
fix(attachments): use `getRelativePath` from userFolder for `davPath`
mejo- Nov 28, 2023
6864890
test(AttachmentResolver): Refactor jest tests after parent class refa…
mejo- Nov 28, 2023
6a46001
fix(attachments): Show all loaded images in ShowImageModal
mejo- Nov 28, 2023
e632d72
fix(SessionMiddleware): Check if user/share have access to document
mejo- Nov 29, 2023
b3be90a
fix(AttachmentResolver): Require either fileId or session
mejo- Nov 29, 2023
e391298
reactor(ImageView): Simplify attachmentType/isMediaAttachment logic
mejo- Nov 29, 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(middleware): Rename to RequireDocumentSessionOrUserOrShareToken 
Signed-off-by: Jonas <[email protected]>
  • Loading branch information
@mejo- @backportbot-nextcloud
mejo- authored and backportbot-nextcloud[bot] committed Nov 29, 2023
commit adf5fe8cf9418189d2141ea5791dfec30b04405c
2 changes: 1 addition & 1 deletion composer/composer/autoload_classmap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
'OCA\\Text\\Listeners\\NodeCopiedListener' => $baseDir . '/../lib/Listeners/NodeCopiedListener.php',
'OCA\\Text\\Listeners\\RegisterDirectEditorEventListener' => $baseDir . '/../lib/Listeners/RegisterDirectEditorEventListener.php',
'OCA\\Text\\Middleware\\Attribute\\RequireDocumentSession' => $baseDir . '/../lib/Middleware/Attribute/RequireDocumentSession.php',
'OCA\\Text\\Middleware\\Attribute\\RequireDocumentSessionUserOrShareToken' => $baseDir . '/../lib/Middleware/Attribute/RequireDocumentSessionUserOrShareToken.php',
'OCA\\Text\\Middleware\\Attribute\\RequireDocumentSessionOrUserOrShareToken' => $baseDir . '/../lib/Middleware/Attribute/RequireDocumentSessionOrUserOrShareToken.php',
'OCA\\Text\\Middleware\\SessionMiddleware' => $baseDir . '/../lib/Middleware/SessionMiddleware.php',
'OCA\\Text\\Migration\\ResetSessionsBeforeYjs' => $baseDir . '/../lib/Migration/ResetSessionsBeforeYjs.php',
'OCA\\Text\\Migration\\Version010000Date20190617184535' => $baseDir . '/../lib/Migration/Version010000Date20190617184535.php',
Expand Down
2 changes: 1 addition & 1 deletion composer/composer/autoload_static.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class ComposerStaticInitText
'OCA\\Text\\Listeners\\NodeCopiedListener' => __DIR__ . '/..' . '/../lib/Listeners/NodeCopiedListener.php',
'OCA\\Text\\Listeners\\RegisterDirectEditorEventListener' => __DIR__ . '/..' . '/../lib/Listeners/RegisterDirectEditorEventListener.php',
'OCA\\Text\\Middleware\\Attribute\\RequireDocumentSession' => __DIR__ . '/..' . '/../lib/Middleware/Attribute/RequireDocumentSession.php',
'OCA\\Text\\Middleware\\Attribute\\RequireDocumentSessionUserOrShareToken' => __DIR__ . '/..' . '/../lib/Middleware/Attribute/RequireDocumentSessionUserOrShareToken.php',
'OCA\\Text\\Middleware\\Attribute\\RequireDocumentSessionOrUserOrShareToken' => __DIR__ . '/..' . '/../lib/Middleware/Attribute/RequireDocumentSessionOrUserOrShareToken.php',
'OCA\\Text\\Middleware\\SessionMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/SessionMiddleware.php',
'OCA\\Text\\Migration\\ResetSessionsBeforeYjs' => __DIR__ . '/..' . '/../lib/Migration/ResetSessionsBeforeYjs.php',
'OCA\\Text\\Migration\\Version010000Date20190617184535' => __DIR__ . '/..' . '/../lib/Migration/Version010000Date20190617184535.php',
Expand Down
10 changes: 5 additions & 5 deletions lib/Controller/AttachmentController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
use OCA\Text\Exception\InvalidSessionException;
use OCA\Text\Exception\UploadException;
use OCA\Text\Middleware\Attribute\RequireDocumentSession;
use OCA\Text\Middleware\Attribute\RequireDocumentSessionUserOrShareToken;
use OCA\Text\Middleware\Attribute\RequireDocumentSessionOrUserOrShareToken;
use OCA\Text\Service\AttachmentService;
use OCP\AppFramework\ApiController;
use OCP\AppFramework\Http;
Expand Down Expand Up @@ -85,7 +85,7 @@ public function __construct(

#[NoAdminRequired]
#[PublicPage]
#[RequireDocumentSessionUserOrShareToken]
#[RequireDocumentSessionOrUserOrShareToken]
public function getAttachmentList(?string $shareToken = null): DataResponse {
$documentId = $this->getDocument()->getId();
try {
Expand Down Expand Up @@ -192,7 +192,7 @@ private function getUploadedFile(string $key): array {
#[NoAdminRequired]
#[PublicPage]
#[NoCSRFRequired]
#[RequireDocumentSessionUserOrShareToken]
#[RequireDocumentSessionOrUserOrShareToken]
public function getImageFile(string $imageFileName, ?string $shareToken = null,
int $preferRawImage = 0): DataResponse|DataDownloadResponse {
$documentId = $this->getDocument()->getId();
Expand Down Expand Up @@ -227,7 +227,7 @@ public function getImageFile(string $imageFileName, ?string $shareToken = null,
#[NoAdminRequired]
#[PublicPage]
#[NoCSRFRequired]
#[RequireDocumentSessionUserOrShareToken]
#[RequireDocumentSessionOrUserOrShareToken]
public function getMediaFile(string $mediaFileName, ?string $shareToken = null): DataResponse|DataDownloadResponse {
$documentId = $this->getDocument()->getId();

Expand Down Expand Up @@ -258,7 +258,7 @@ public function getMediaFile(string $mediaFileName, ?string $shareToken = null):
#[NoAdminRequired]
#[PublicPage]
#[NoCSRFRequired]
#[RequireDocumentSessionUserOrShareToken]
#[RequireDocumentSessionOrUserOrShareToken]
public function getMediaFilePreview(string $mediaFileName, ?string $shareToken = null) {
$documentId = $this->getDocument()->getId();

Expand Down
2 changes: 1 addition & 1 deletion ...equireDocumentSessionUserOrShareToken.php → ...uireDocumentSessionOrUserOrShareToken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
use Attribute;

#[Attribute(Attribute::TARGET_METHOD)]
class RequireDocumentSessionUserOrShareToken {
class RequireDocumentSessionOrUserOrShareToken {
}
4 changes: 2 additions & 2 deletions lib/Middleware/SessionMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use OCA\Text\Controller\ISessionAwareController;
use OCA\Text\Exception\InvalidSessionException;
use OCA\Text\Middleware\Attribute\RequireDocumentSession;
use OCA\Text\Middleware\Attribute\RequireDocumentSessionUserOrShareToken;
use OCA\Text\Middleware\Attribute\RequireDocumentSessionOrUserOrShareToken;
use OCA\Text\Service\DocumentService;
use OCA\Text\Service\SessionService;
use OCP\AppFramework\Controller;
Expand Down Expand Up @@ -36,7 +36,7 @@ public function beforeController(Controller $controller, string $methodName): vo

$reflectionMethod = new \ReflectionMethod($controller, $methodName);

if (!empty($reflectionMethod->getAttributes(RequireDocumentSessionUserOrShareToken::class))) {
if (!empty($reflectionMethod->getAttributes(RequireDocumentSessionOrUserOrShareToken::class))) {
try {
$this->assertDocumentSession($controller);
} catch (InvalidSessionException) {
Expand Down