fix(sharing): Get shared collective by token

Fixes opening shares if there's more than one for a collective. Signed-off-by: Jonas <[email protected]>
nextcloud · Dec 18, 2023 · 56fcc6e · 56fcc6e
1 parent c39542d
commit 56fcc6e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/lib/Controller/PublicCollectiveController.php b/lib/Controller/PublicCollectiveController.php
@@ -89,7 +89,8 @@ public function get(int $pageId = 0): DataResponse {
 			}
 			$collective = $this->service->getCollectiveWithShare($share->getCollectiveId(),
 				$share->getPageId(),
-				$share->getOwner());
+				$share->getOwner(),
+				$share->getToken());
 			// Explicitly set member level
 			$collective->setLevel(Member::LEVEL_MEMBER);
 			return [

diff --git a/lib/Service/CollectiveService.php b/lib/Service/CollectiveService.php
@@ -83,18 +83,19 @@ private function initPageVersionsBackend(): void {
 	}
 
 	/**
-	 * @param int    $id
-	 * @param int    $pageId
-	 * @param string $userId
+	 * @param int         $id
+	 * @param int         $pageId
+	 * @param string      $userId
+	 * @param string|null $shareToken
 	 *
 	 * @return CollectiveInfo
 	 * @throws MissingDependencyException
 	 * @throws NotFoundException
 	 * @throws NotPermittedException
 	 */
-	public function getCollectiveWithShare(int $id, int $pageId, string $userId): CollectiveInfo {
+	public function getCollectiveWithShare(int $id, int $pageId, string $userId, ?string $shareToken = null): CollectiveInfo {
 		$collectiveInfo = $this->getCollectiveInfo($id, $userId);
-		if (null !== $share = $this->shareService->findShare($userId, $id, $pageId)) {
+		if ($shareToken && null !== $share = $this->shareService->findShareByToken($shareToken)) {
 			$collectiveInfo->setShareToken($share->getToken());
 			$collectiveInfo->setIsPageShare($share->getPageId() !== 0);
 			$collectiveInfo->setShareEditable($share->getEditable());