fix(files_sharing): Handle download permission the same way for publi…

…c and internal shares Signed-off-by: Ferdinand Thiessen <[email protected]>
nextcloud · Sep 3, 2024 · d431af5 · d431af5
1 parent b775d47
commit d431af5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/apps/files/src/actions/downloadAction.ts b/apps/files/src/actions/downloadAction.ts
@@ -46,11 +46,11 @@ const isDownloadable = function(node: Node) {
 	}
 
 	// If the mount type is a share, ensure it got download permissions.
-	if (node.attributes['mount-type'] === 'shared') {
-		const shareAttributes = JSON.parse(node.attributes['share-attributes'] ?? '[]') as Array<ShareAttribute>
-		const downloadAttribute = shareAttributes?.find?.((attribute: { scope: string; key: string }) => attribute.scope === 'permissions' && attribute.key === 'download')
-		if (downloadAttribute !== undefined && downloadAttribute.value === false) {
-			return false
+	if (node.attributes['share-attributes']) {
+		const shareAttributes = JSON.parse(node.attributes['share-attributes'] || '[]') as Array<ShareAttribute>
+		const downloadAttribute = shareAttributes.find(({ scope, key }: ShareAttribute) => scope === 'permissions' && key === 'download')
+		if (downloadAttribute) {
+			return downloadAttribute.value === true
 		}
 	}
 

diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -1221,10 +1221,13 @@ public function updateShare(
 			}
 
 			// Update hide download state
+			$attributes = $share->getAttributes() ?? $share->newAttributes();
 			if ($hideDownload === 'true') {
 				$share->setHideDownload(true);
+				$attributes->setAttribute('permissions', 'download', false);
 			} elseif ($hideDownload === 'false') {
 				$share->setHideDownload(false);
+				$attributes->setAttribute('permissions', 'download', true);
 			}
 
 			$newPermissions = null;

diff --git a/build/integration/dav_features/dav-v2-public.feature b/build/integration/dav_features/dav-v2-public.feature
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
 # SPDX-License-Identifier: AGPL-3.0-or-later
 Feature: dav-v2-public
 	Background: