Skip to content

fix(share): use relative path in share as davPath for attachments #7477

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
max-nextcloud merged 4 commits into from
Jul 28, 2025
Merged

fix(share): use relative path in share as davPath for attachments #7477

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6bcb0cd
fix(share): allow opening attachments
max-nextcloud Jul 24, 2025
3e0958c
chore(split): shareWithAttachments from attachments spec
max-nextcloud Jul 26, 2025
bdf48f4
chore(refactor): use cy.getFileId
max-nextcloud Jul 26, 2025
8b04564
test(cy): open attachment in public share
max-nextcloud Jul 26, 2025
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
Next Next commit
fix(share): allow opening attachments 
Provide relative path to attachments in public shares.

The path needs to be relative to the shared folder.

Open attachments in public collective shares
as well as in folder descriptions of public shares.

Signed-off-by: Max <[email protected]>
  • Loading branch information
@max-nextcloud
max-nextcloud committed Jul 28, 2025
commit 6bcb0cde4758759bd845a1062dcc7805c2db4594
37 changes: 35 additions & 2 deletions lib/Service/AttachmentService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,11 @@ public function getAttachmentList(int $documentId, ?string $userId = null, ?Sess
: '?documentId=' . $documentId . $shareTokenUrlString;

$attachments = [];
$userFolder = $userId !== null ? $this->rootFolder->getUserFolder($userId) : null;

// Folder davPath need to be relative to.
$davFolder = $userId !== null
? $this->rootFolder->getUserFolder($userId)
: $this->getShareFolder($shareToken);

$fileNodes = [];
$fileIds = [];
Expand All @@ -247,7 +251,7 @@ public function getAttachmentList(int $documentId, ?string $userId = null, ?Sess
'mimetype' => $node->getMimeType(),
'mtime' => $node->getMTime(),
'isImage' => $isImage,
'davPath' => $userFolder?->getRelativePath($node->getPath()),
'davPath' => $davFolder?->getRelativePath($node->getPath()),
'metadata' => $metadata,
'fullUrl' => $isImage
? $this->urlGenerator->linkToRouteAbsolute('text.Attachment.getImageFile') . $urlParamsBase . '&imageFileName=' . rawurlencode($name) . '&preferRawImage=1'
Expand Down Expand Up @@ -574,6 +578,35 @@ private function getTextFilePublic(?int $documentId, string $shareToken): File {
throw new NotFoundException('Text file with id=' . $documentId . ' and shareToken ' . $shareToken . ' was not found.');
}

/**
* Get share folder
*
* @param string $shareToken
*
* @throws NotFoundException
*/
private function getShareFolder(string $shareToken): ?Folder {
// is the file shared with this token?
try {
$share = $this->shareManager->getShareByToken($shareToken);
if (in_array($share->getShareType(), [IShare::TYPE_LINK, IShare::TYPE_EMAIL])) {
// shared file or folder?
if ($share->getNodeType() === 'file') {
return null;
} elseif ($share->getNodeType() === 'folder') {
$folder = $share->getNode();
if ($folder instanceof Folder) {
return $folder;
}
throw new NotFoundException('Share folder for ' . $shareToken . ' was not a folder.');
}
}
} catch (ShareNotFound $e) {
// same as below
}
throw new NotFoundException('Share folder for ' . $shareToken . ' was not found.');
}

/**
* Actually delete attachment files which are not pointed in the markdown content
*
Expand Down