Merge pull request #45652 from nextcloud/feat/migrate-files-sharing-public-to-vue

feat(files_sharing): Migrate public shares to Vue

Author: susnux

__tests__/mock-window.js

@@ -2,12 +2,8 @@
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { beforeEach } from 'vitest'
-
 window.OC = { ...window.OC }
 window.OCA = { ...window.OCA }
 window.OCP = { ...window.OCP }
 
-beforeEach(() => {
-	window.location = new URL('http://nextcloud.local')
-})
+window._oc_webroot = ''

apps/files/src/FilesApp.vue

@@ -4,12 +4,13 @@
  -->
 <template>
 	<NcContent app-name="files">
-		<Navigation />
-		<FilesList />
+		<Navigation v-if="!isPublic" />
+		<FilesList :is-public="isPublic" />
 	</NcContent>
 </template>
 
 <script lang="ts">
+import { isPublicShare } from '@nextcloud/sharing/public'
 import { defineComponent } from 'vue'
 
 import NcContent from '@nextcloud/vue/dist/Components/NcContent.js'
@@ -25,5 +26,13 @@ export default defineComponent({
 		FilesList,
 		Navigation,
 	},
+
+	setup() {
+		const isPublic = isPublicShare()
+
+		return {
+			isPublic,
+		}
+	},
 })
 </script>

apps/files/src/actions/downloadAction.ts

@@ -2,11 +2,12 @@
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import type { ShareAttribute } from '../../../files_sharing/src/sharing'
-
-import { FileAction, Permission, Node, FileType, View, DefaultType } from '@nextcloud/files'
+import { FileAction, Node, FileType, View, DefaultType } from '@nextcloud/files'
 import { t } from '@nextcloud/l10n'
 import { generateUrl } from '@nextcloud/router'
+import { getSharingToken, isPublicShare } from '@nextcloud/sharing/public'
+import { basename } from 'path'
+import { isDownloadable } from '../utils/permissions'
 
 import ArrowDownSvg from '@mdi/svg/svg/arrow-down.svg?raw'
 
@@ -19,29 +20,23 @@ const triggerDownload = function(url: string) {
 
 const downloadNodes = function(dir: string, nodes: Node[]) {
 	const secret = Math.random().toString(36).substring(2)
-	const url = generateUrl('/apps/files/ajax/download.php?dir={dir}&files={files}&downloadStartSecret={secret}', {
-		dir,
-		secret,
-		files: JSON.stringify(nodes.map(node => node.basename)),
-	})
-	triggerDownload(url)
-}
-
-const isDownloadable = function(node: Node) {
-	if ((node.permissions & Permission.READ) === 0) {
-		return false
-	}
-
-	// 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
-		}
+	let url: string
+	if (isPublicShare()) {
+		url = generateUrl('/s/{token}/download/{filename}?path={dir}&files={files}&downloadStartSecret={secret}', {
+			dir,
+			secret,
+			files: JSON.stringify(nodes.map(node => node.basename)),
+			token: getSharingToken(),
+			filename: `${basename(dir)}.zip}`,
+		})
+	} else {
+		url = generateUrl('/apps/files/ajax/download.php?dir={dir}&files={files}&downloadStartSecret={secret}', {
+			dir,
+			secret,
+			files: JSON.stringify(nodes.map(node => node.basename)),
+		})
 	}
-
-	return true
+	triggerDownload(url)
 }
 
 export const action = new FileAction({

apps/files/src/actions/editLocallyAction.spec.ts

@@ -120,6 +120,7 @@ describe('Edit locally action execute tests', () => {
 			data: { ocs: { data: { token: 'foobar' } } },
 		}))
 		const showError = vi.spyOn(nextcloudDialogs, 'showError')
+		const windowOpenSpy = vi.spyOn(window, 'open').mockImplementation(() => null)
 
 		const file = new File({
 			id: 1,
@@ -138,7 +139,7 @@ describe('Edit locally action execute tests', () => {
 		expect(axios.post).toBeCalledTimes(1)
 		expect(axios.post).toBeCalledWith('http://nextcloud.local/ocs/v2.php/apps/files/api/v1/openlocaleditor?format=json', { path: '/foobar.txt' })
 		expect(showError).toBeCalledTimes(0)
-		expect(window.location.href).toBe('nc://open/test@nextcloud.local/foobar.txt?token=foobar')
+		expect(windowOpenSpy).toBeCalledWith('nc://open/test@nextcloud.local/foobar.txt?token=foobar', '_self')
 	})
 
 	test('Edit locally fails and shows error', async () => {

apps/files/src/actions/editLocallyAction.ts

@@ -12,6 +12,7 @@ import axios from '@nextcloud/axios'
 import LaptopSvg from '@mdi/svg/svg/laptop.svg?raw'
 import IconCancel from '@mdi/svg/svg/cancel.svg?raw'
 import IconCheck from '@mdi/svg/svg/check.svg?raw'
+import { isPublicShare } from '@nextcloud/sharing/public'
 
 const confirmLocalEditDialog = (
 	localEditCallback: (openingLocally: boolean) => void = () => {},
@@ -72,7 +73,7 @@ const openLocalClient = async function(path: string) {
 		let url = `nc://open/${uid}@` + window.location.host + encodePath(path)
 		url += '?token=' + result.data.ocs.data.token
 
-		window.location.href = url
+		window.open(url, '_self')
 	} catch (error) {
 		showError(t('files', 'Failed to redirect to client'))
 	}
@@ -90,6 +91,11 @@ export const action = new FileAction({
 			return false
 		}
 
+		// does not work with shares
+		if (isPublicShare()) {
+			return false
+		}
+
 		return (nodes[0].permissions & Permission.UPDATE) !== 0
 	},
 

apps/files/src/actions/favoriteAction.ts

@@ -2,18 +2,21 @@
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+import type { Node, View } from '@nextcloud/files'
+
 import { emit } from '@nextcloud/event-bus'
-import { generateUrl } from '@nextcloud/router'
-import { Permission, type Node, View, FileAction } from '@nextcloud/files'
+import { Permission, FileAction } from '@nextcloud/files'
 import { translate as t } from '@nextcloud/l10n'
+import { encodePath } from '@nextcloud/paths'
+import { generateUrl } from '@nextcloud/router'
+import { isPublicShare } from '@nextcloud/sharing/public'
 import axios from '@nextcloud/axios'
 import Vue from 'vue'
 
 import StarOutlineSvg from '@mdi/svg/svg/star-outline.svg?raw'
 import StarSvg from '@mdi/svg/svg/star.svg?raw'
 
 import logger from '../logger.ts'
-import { encodePath } from '@nextcloud/paths'
 
 // If any of the nodes is not favorited, we display the favorite action.
 const shouldFavorite = (nodes: Node[]): boolean => {
@@ -69,8 +72,14 @@ export const action = new FileAction({
 	},
 
 	enabled(nodes: Node[]) {
-		// We can only favorite nodes within files and with permissions
-		return !nodes.some(node => !node.root?.startsWith?.('/files'))
+		// Not enabled for public shares
+		if (isPublicShare()) {
+			return false
+		}
+
+		// We can only favorite nodes if they are located in files
+		return nodes.every(node => node.root?.startsWith?.('/files'))
+			// and we have permissions
 			&& nodes.every(node => node.permissions !== Permission.NONE)
 	},
 

apps/files/src/actions/moveOrCopyAction.ts

@@ -265,7 +265,11 @@ export const action = new FileAction({
 		}
 	},
 	iconSvgInline: () => FolderMoveSvg,
-	enabled(nodes: Node[]) {
+	enabled(nodes: Node[], view: View) {
+		// We can not copy or move in single file shares
+		if (view.id === 'public-file-share') {
+			return false
+		}
 		// We only support moving/copying files within the user folder
 		if (!nodes.every(node => node.root?.startsWith('/files/'))) {
 			return false

apps/files/src/actions/moveOrCopyActionUtils.ts

@@ -7,7 +7,11 @@ import type { Folder, Node } from '@nextcloud/files'
 import type { ShareAttribute } from '../../../files_sharing/src/sharing'
 
 import { Permission } from '@nextcloud/files'
+import { isPublicShare } from '@nextcloud/sharing/public'
 import PQueue from 'p-queue'
+import { loadState } from '@nextcloud/initial-state'
+
+const sharePermissions = loadState<number>('files_sharing', 'sharePermissions', Permission.NONE)
 
 // This is the processing queue. We only want to allow 3 concurrent requests
 let queue: PQueue
@@ -51,7 +55,17 @@ export const canDownload = (nodes: Node[]) => {
 
 export const canCopy = (nodes: Node[]) => {
 	// a shared file cannot be copied if the download is disabled
-	// it can be copied if the user has at least read permissions
-	return canDownload(nodes)
-		&& !nodes.some(node => node.permissions === Permission.NONE)
+	if (!canDownload(nodes)) {
+		return false
+	}
+	// it cannot be copied if the user has only view permissions
+	if (nodes.some((node) => node.permissions === Permission.NONE)) {
+		return false
+	}
+	// on public shares all files have the same permission so copy is only possible if write permission is granted
+	if (isPublicShare()) {
+		return Boolean(sharePermissions & Permission.CREATE)
+	}
+	// otherwise permission is granted
+	return true
 }

apps/files/src/actions/renameAction.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 import { emit } from '@nextcloud/event-bus'
-import { Permission, type Node, FileAction } from '@nextcloud/files'
+import { Permission, type Node, FileAction, View } from '@nextcloud/files'
 import { translate as t } from '@nextcloud/l10n'
 import PencilSvg from '@mdi/svg/svg/pencil.svg?raw'
 
@@ -14,10 +14,16 @@ export const action = new FileAction({
 	displayName: () => t('files', 'Rename'),
 	iconSvgInline: () => PencilSvg,
 
-	enabled: (nodes: Node[]) => {
-		return nodes.length > 0 && nodes
-			.map(node => node.permissions)
-			.every(permission => Boolean(permission & Permission.DELETE))
+	enabled: (nodes: Node[], view: View) => {
+		if (nodes.length === 0) {
+			return false
+		}
+		// Disable for single file shares
+		if (view.id === 'public-file-share') {
+			return false
+		}
+		// Only enable if all nodes have the delete permission
+		return nodes.every((node) => Boolean(node.permissions & Permission.DELETE))
 	},
 
 	async exec(node: Node) {

apps/files/src/actions/sidebarAction.ts

@@ -2,8 +2,12 @@
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { Permission, type Node, View, FileAction } from '@nextcloud/files'
+import type { Node, View } from '@nextcloud/files'
+
+import { Permission, FileAction } from '@nextcloud/files'
 import { translate as t } from '@nextcloud/l10n'
+import { isPublicShare } from '@nextcloud/sharing/public'
+
 import InformationSvg from '@mdi/svg/svg/information-variant.svg?raw'
 
 import logger from '../logger.ts'
@@ -17,6 +21,10 @@ export const action = new FileAction({
 
 	// Sidebar currently supports user folder only, /files/USER
 	enabled: (nodes: Node[]) => {
+		if (isPublicShare()) {
+			return false
+		}
+
 		// Only works on single node
 		if (nodes.length !== 1) {
 			return false