From cb85cc0794f3ae5343e9db9da92a9d0a67606955 Mon Sep 17 00:00:00 2001
From: Jonas <jonas@freesources.org>
Date: Wed, 23 Jul 2025 18:45:42 +0200
Subject: [PATCH 1/6] fix(share): Dispatch `ShareLinkAccessedEvent`
 (richdocuments in viewer)

Richdocuments listens on this event to inject its viewer registration.

Required to be able to open documents in richdocuments in a public
share.

Signed-off-by: Jonas <jonas@freesources.org>
---
 lib/Controller/PublicStartController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/PublicStartController.php b/lib/Controller/PublicStartController.php
index f710e569e..f99d7101d 100644
--- a/lib/Controller/PublicStartController.php
+++ b/lib/Controller/PublicStartController.php
@@ -11,6 +11,7 @@
 
 use OCA\Collectives\Db\CollectiveShareMapper;
 use OCA\DAV\Connector\Sabre\PublicAuth;
+use OCA\Files_Sharing\Event\ShareLinkAccessedEvent;
 use OCA\Viewer\Event\LoadViewer;
 use OCP\App\IAppManager;
 use OCP\AppFramework\AuthPublicShareController;
@@ -110,7 +111,8 @@ public function showShare(): PublicTemplateResponse {
 		if ($appsMissing = $this->checkDependencies()) {
 			return new PublicTemplateResponse('collectives', 'error', ['appsMissing' => $appsMissing]);  // templates/error.php
 		}
-		$this->eventDispatcher->dispatch(LoadViewer::class, new LoadViewer());
+		$this->eventDispatcher->dispatchTyped(new LoadViewer());
+		$this->eventDispatcher->dispatchTyped(new ShareLinkAccessedEvent($this->getShare(), 'show'));
 		$response = new PublicTemplateResponse('collectives', 'main', [ // templates/main.php
 			'id-app-content' => '#app-content-vue',
 			'id-app-navigation' => '#app-navigation-vue',

From 8becc7527960b5365982113bdaed542acb916361 Mon Sep 17 00:00:00 2001
From: Jonas <jonas@freesources.org>
Date: Wed, 23 Jul 2025 18:47:48 +0200
Subject: [PATCH 2/6] fix(attachments): Allow to open attachments in viewer in
 public share

Try to give correct path depending on whether we're in a public share
or not.

Signed-off-by: Jonas <jonas@freesources.org>
---
 src/components/PageSidebar/SidebarTabAttachments.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/PageSidebar/SidebarTabAttachments.vue b/src/components/PageSidebar/SidebarTabAttachments.vue
index 2ffd2b03d..4172205e7 100644
--- a/src/components/PageSidebar/SidebarTabAttachments.vue
+++ b/src/components/PageSidebar/SidebarTabAttachments.vue
@@ -321,9 +321,12 @@ export default {
 
 		clickAttachment(attachment, ev) {
 			// Show in viewer if the mimetype is supported
-			if (!this.isPublic && window.OCA.Viewer.availableHandlers.map(handler => handler.mimes).flat().includes(attachment.mimetype)) {
+			if (window.OCA.Viewer?.availableHandlers.map(handler => handler.mimes).flat().includes(attachment.mimetype)) {
+				const path = this.isPublic
+					? `/${attachment.internalPath}`
+					: attachment.path
 				ev.preventDefault()
-				window.OCA.Viewer.open({ path: attachment.path })
+				window.OCA.Viewer.open({ path })
 			}
 		},
 

From c6b1d8757ccda6df8bdfa7358263be209986aa70 Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Thu, 24 Jul 2025 11:48:28 +0200
Subject: [PATCH 3/6] fix(attachments): isPublic and sharingToken inputs in
 template

The viewers webdav client is initialized before the vue app is mounted.
So we need to provide the inputs before the app is mounted already.

Signed-off-by: Max <max@nextcloud.com>
---
 lib/Controller/PublicStartController.php | 1 +
 templates/main.php                       | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/lib/Controller/PublicStartController.php b/lib/Controller/PublicStartController.php
index f99d7101d..b7edb1c7b 100644
--- a/lib/Controller/PublicStartController.php
+++ b/lib/Controller/PublicStartController.php
@@ -116,6 +116,7 @@ public function showShare(): PublicTemplateResponse {
 		$response = new PublicTemplateResponse('collectives', 'main', [ // templates/main.php
 			'id-app-content' => '#app-content-vue',
 			'id-app-navigation' => '#app-navigation-vue',
+			'token' => $this->getToken(),
 		]);
 		$response->setFooterVisible(false);
 		return $response;
diff --git a/templates/main.php b/templates/main.php
index 31f901a96..4f6ace728 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -12,3 +12,7 @@
 
 <div id="q-app"></div>
 
+<?php if (isset($_['token'])) {
+	print_unescaped('<input id="isPublic" type="hidden" name="isPublic" value="1">');
+	print_unescaped('<input id="sharingToken" type="hidden" value="' . $_['token'] . '">');
+} ?>

From 6304ba99bc74a47bf86fbe7dcf3ed8aabd1c0f39 Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Thu, 24 Jul 2025 20:46:08 +0200
Subject: [PATCH 4/6] fix(attachments): richdocuments guest name entry above
 viewer

When opening an attachment with rich documents
from a public collective share
a name entry will be shown above the viewer.

Keep the viewer z-index to make sure the name entry is visible.

Signed-off-by: Max <max@nextcloud.com>
---
 src/components/Nav/TemplatesDialog.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/Nav/TemplatesDialog.vue b/src/components/Nav/TemplatesDialog.vue
index e76f9eccf..dea215bba 100644
--- a/src/components/Nav/TemplatesDialog.vue
+++ b/src/components/Nav/TemplatesDialog.vue
@@ -6,6 +6,7 @@
 <template>
 	<NcDialog :name="t('collectives', 'Templates')"
 		data-cy-collectives="templates-dialog"
+		class="templates-dialog"
 		size="normal"
 		@closing="onClose">
 		<SkeletonLoading v-if="loading(`template-list-${templatesCollectiveId}`)" type="items" />
@@ -132,11 +133,8 @@ export default {
 	align-items: center;
 	padding-inline: 12px;
 }
-</style>
-
-<style lang="scss">
-#viewer {
+.templates-dialog {
 	// Make viewer modal overlay the templates dialog modal
-	z-index: 9999;
+	z-index: 9997;
 }
 </style>

From 8c7151a777a21af267726ff0d7c4664cf51ccd56 Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Thu, 24 Jul 2025 20:56:16 +0200
Subject: [PATCH 5/6] test(psalm): add stub for ShareLinkAccessedEvent

Signed-off-by: Max <max@nextcloud.com>
---
 tests/stub.phpstub | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/stub.phpstub b/tests/stub.phpstub
index 8ac4ad5cb..17b00670c 100644
--- a/tests/stub.phpstub
+++ b/tests/stub.phpstub
@@ -607,6 +607,12 @@ namespace OC\Files\Storage\Wrapper{
 	}
 }
 
+namespace OCA\Files_Sharing\Event {
+	class ShareLinkAccessedEvent extends \OCP\EventDispatcher\Event {
+		public function __construct(\OCP\Share\IShare $share, string $step = '', int $errorCode = 200, string $errorMessage = '') {}
+	}
+}
+
 namespace OCA\Viewer\Event {
 	class LoadViewer extends \OCP\EventDispatcher\Event {}
 }

From 669673778f04742113efb50f5ff580e4a81e7689 Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Sat, 26 Jul 2025 15:48:06 +0200
Subject: [PATCH 6/6] fix(share): use relative path for attachments.

This way they can be opened within the share.

Signed-off-by: Max <max@nextcloud.com>
Signed-off-by: Jonas <jonas@freesources.org>
---
 lib/Controller/PageController.php             |  6 +++-
 lib/Controller/PublicPageController.php       |  4 ++-
 lib/Service/AttachmentService.php             | 13 ++++----
 .../PageSidebar/SidebarTabAttachments.vue     |  5 +--
 tests/Unit/Service/AttachmentServiceTest.php  | 32 ++++++++-----------
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index c0e238bbe..e326d82bb 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -21,6 +21,7 @@
 use OCP\AppFramework\OCS\OCSForbiddenException;
 use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\AppFramework\OCSController;
+use OCP\Files\IRootFolder;
 use OCP\IRequest;
 use Psr\Log\LoggerInterface;
 
@@ -37,6 +38,7 @@ public function __construct(
 		string $appName,
 		IRequest $request,
 		private PageService $service,
+		private IRootFolder $rootFolder,
 		private AttachmentService $attachmentService,
 		private SearchService $indexedSearchService,
 		private CollectiveService $collectiveService,
@@ -266,7 +268,9 @@ public function trash(int $collectiveId, int $id): DataResponse {
 	 */
 	#[NoAdminRequired]
 	public function getAttachments(int $collectiveId, int $id): DataResponse {
-		$attachments = $this->handleErrorResponse(fn (): array => $this->attachmentService->getAttachments($collectiveId, $id, $this->userId), $this->logger);
+		$pageFile = $this->service->getPageFile($collectiveId, $id, $this->userId);
+		$userFolder = $this->rootFolder->getUserFolder($this->userId);
+		$attachments = $this->handleErrorResponse(fn (): array => $this->attachmentService->getAttachments($pageFile, $userFolder), $this->logger);
 		return new DataResponse(['attachments' => $attachments]);
 	}
 
diff --git a/lib/Controller/PublicPageController.php b/lib/Controller/PublicPageController.php
index 15371eadb..789cf1529 100644
--- a/lib/Controller/PublicPageController.php
+++ b/lib/Controller/PublicPageController.php
@@ -441,7 +441,9 @@ public function getAttachments(int $id): DataResponse {
 			if (0 !== $sharePageId = $this->getCollectiveShare()->getPageId()) {
 				$this->checkPageShareAccess($collectiveId, $sharePageId, $id, $owner);
 			}
-			return $this->attachmentService->getAttachments($collectiveId, $id, $owner);
+			$pageFile = $this->service->getPageFile($collectiveId, $id, $owner);
+			$shareFolder = $this->getShare()->getNode();
+			return $this->attachmentService->getAttachments($pageFile, $shareFolder);
 		}, $this->logger);
 		return new DataResponse(['attachments' => $attachments]);
 	}
diff --git a/lib/Service/AttachmentService.php b/lib/Service/AttachmentService.php
index 0cb989ec9..0e04b66a0 100644
--- a/lib/Service/AttachmentService.php
+++ b/lib/Service/AttachmentService.php
@@ -17,7 +17,6 @@
 
 class AttachmentService {
 	public function __construct(
-		private PageService $pageService,
 		private IPreview $preview,
 	) {
 	}
@@ -25,7 +24,7 @@ public function __construct(
 	/**
 	 * @throws NotFoundException
 	 */
-	private function fileToInfo(File $file, string $userId): array {
+	private function fileToInfo(File $file, folder $folder): array {
 		try {
 			return [
 				'id' => $file->getId(),
@@ -33,7 +32,7 @@ private function fileToInfo(File $file, string $userId): array {
 				'filesize' => $file->getSize(),
 				'mimetype' => $file->getMimeType(),
 				'timestamp' => $file->getMTime(),
-				'path' => substr($file->getPath(), strlen('/' . $userId . '/files')),
+				'path' => $folder->getRelativePath($file->getPath()),
 				'internalPath' => $file->getInternalPath(),
 				'hasPreview' => $this->preview->isAvailable($file),
 			];
@@ -62,12 +61,14 @@ private function getAttachmentDirectory(File $pageFile): Folder {
 	}
 
 	/**
+	 * @param File $pageFile file of the page with the attachments.
+	 * @param Folder $folder user or share folder for relative paths.
+	 *
 	 * @throws MissingDependencyException
 	 * @throws NotFoundException
 	 * @throws NotPermittedException
 	 */
-	public function getAttachments(int $collectiveId, int $pageId, string $userId): array {
-		$pageFile = $this->pageService->getPageFile($collectiveId, $pageId, $userId);
+	public function getAttachments(File $pageFile, Folder $folder): array {
 		try {
 			$attachmentDir = $this->getAttachmentDirectory($pageFile);
 		} catch (NotFoundException) {
@@ -76,6 +77,6 @@ public function getAttachments(int $collectiveId, int $pageId, string $userId):
 		}
 
 		// Only return files, ignore folders
-		return array_map(fn ($file) => $this->fileToInfo($file, $userId), array_filter($attachmentDir->getDirectoryListing(), static fn ($node) => $node instanceof File));
+		return array_map(fn ($file) => $this->fileToInfo($file, $folder), array_filter($attachmentDir->getDirectoryListing(), static fn ($node) => $node instanceof File));
 	}
 }
diff --git a/src/components/PageSidebar/SidebarTabAttachments.vue b/src/components/PageSidebar/SidebarTabAttachments.vue
index 4172205e7..a89b4e99f 100644
--- a/src/components/PageSidebar/SidebarTabAttachments.vue
+++ b/src/components/PageSidebar/SidebarTabAttachments.vue
@@ -322,11 +322,8 @@ export default {
 		clickAttachment(attachment, ev) {
 			// Show in viewer if the mimetype is supported
 			if (window.OCA.Viewer?.availableHandlers.map(handler => handler.mimes).flat().includes(attachment.mimetype)) {
-				const path = this.isPublic
-					? `/${attachment.internalPath}`
-					: attachment.path
 				ev.preventDefault()
-				window.OCA.Viewer.open({ path })
+				window.OCA.Viewer.open({ path: attachment.path })
 			}
 		},
 
diff --git a/tests/Unit/Service/AttachmentServiceTest.php b/tests/Unit/Service/AttachmentServiceTest.php
index ca6899257..219bbfe2f 100644
--- a/tests/Unit/Service/AttachmentServiceTest.php
+++ b/tests/Unit/Service/AttachmentServiceTest.php
@@ -12,34 +12,32 @@
 use OC\Files\Node\File;
 use OC\Files\Node\Folder;
 use OCA\Collectives\Service\AttachmentService;
-use OCA\Collectives\Service\PageService;
 use OCP\IPreview;
 use PHPUnit\Framework\TestCase;
 
 class AttachmentServiceTest extends TestCase {
 	private AttachmentService $service;
 	private string $userId = 'jane';
-	private int $collectiveId = 1;
+	private File $pageFile;
+	private Folder $parentFolder;
 	private string $attachmentFolderName = '.attachments.' . 1;
 
 	protected function setUp(): void {
-		$pageService = $this->getMockBuilder(PageService::class)
-			->disableOriginalConstructor()
-			->getMock();
-
 		$preview = $this->getMockBuilder(IPreview::class)
 			->disableOriginalConstructor()
 			->getMock();
 
-		$file = $this->getMockBuilder(File::class)
+		$this->pageFile = $this->getMockBuilder(File::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$parentFolder = $this->getMockBuilder(Folder::class)
+		$this->parentFolder = $this->getMockBuilder(Folder::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$parentFolder->method('nodeExists')
+		$this->parentFolder->method('nodeExists')
 			->with($this->attachmentFolderName)
 			->willReturn(true);
+		$this->parentFolder->method('getRelativePath')
+			->willReturn('/Collectives/x/path/to/' . $this->attachmentFolderName . '/attachmentFile1');
 		$attachmentFolder = $this->getMockBuilder(Folder::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -54,24 +52,22 @@ protected function setUp(): void {
 			->willReturn('/path/to/' . $this->attachmentFolderName . '/attachmentFile1');
 		$attachmentFolder->method('getDirectoryListing')
 			->willReturn([$attachmentFile]);
-		$parentFolder->method('get')
+		$this->parentFolder->method('get')
 			->with($this->attachmentFolderName)
 			->willReturn($attachmentFolder);
-		$file->method('getParent')
-			->willReturn($parentFolder);
-		$file->method('getId')
+		$this->pageFile->method('getParent')
+			->willReturn($this->parentFolder);
+		$this->pageFile->method('getId')
 			->willReturn(1);
-		$pageService->method('getPageFile')
-			->willReturn($file);
 
-		$this->service = new AttachmentService($pageService, $preview);
+		$this->service = new AttachmentService($preview);
 	}
 
 	public function testGetAttachments(): void {
 		$attachmentInfo = [
 			'id' => 2,
 			'name' => null,
-			'filesize' => null,
+			'filesize' => 0.0,
 			'mimetype' => null,
 			'timestamp' => null,
 			'path' => '/Collectives/x/path/to/' . $this->attachmentFolderName . '/attachmentFile1',
@@ -79,6 +75,6 @@ public function testGetAttachments(): void {
 			'hasPreview' => null,
 		];
 
-		self::assertEquals([$attachmentInfo], $this->service->getAttachments($this->collectiveId, 1, $this->userId));
+		self::assertEquals([$attachmentInfo], $this->service->getAttachments($this->pageFile, $this->parentFolder));
 	}
 }