1 files changed, 50 insertions, 24 deletions

diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue
index 67fdceae336..46bacef0c6c 100644
--- a/apps/files_sharing/src/components/SharingInput.vue
+++ b/apps/files_sharing/src/components/SharingInput.vue
@@ -5,13 +5,13 @@
 
 <template>
 	<div class="sharing-search">
-		<label class="hidden-visually" for="sharing-search-input">
+		<label class="hidden-visually" :for="shareInputId">
 			{{ isExternal ? t('files_sharing', 'Enter external recipients')
 				: t('files_sharing', 'Search for internal recipients') }}
 		</label>
 		<NcSelect ref="select"
 			v-model="value"
-			input-id="sharing-search-input"
+			:input-id="shareInputId"
 			class="sharing-search__input"
 			:disabled="!canReshare"
 			:loading="loading"
@@ -36,7 +36,7 @@ import { getCurrentUser } from '@nextcloud/auth'
 import { getCapabilities } from '@nextcloud/capabilities'
 import axios from '@nextcloud/axios'
 import debounce from 'debounce'
-import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
+import NcSelect from '@nextcloud/vue/components/NcSelect'
 
 import Config from '../services/ConfigService.ts'
 import Share from '../models/Share.ts'
@@ -87,6 +87,12 @@ export default {
 		},
 	},
 
+	setup() {
+		return {
+			shareInputId: `share-input-${Math.random().toString(36).slice(2, 7)}`,
+		}
+	},
+
 	data() {
 		return {
 			config: new Config(),
@@ -149,7 +155,10 @@ export default {
 	},
 
 	mounted() {
-		this.getRecommendations()
+		if (!this.isExternal) {
+			// We can only recommend users, groups etc for internal shares
+			this.getRecommendations()
+		}
 	},
 
 	methods: {
@@ -183,14 +192,25 @@ export default {
 				lookup = true
 			}
 
-			let shareType = []
+			const remoteTypes = [ShareType.Remote, ShareType.RemoteGroup]
+			const shareType = []
+
+			const showFederatedAsInternal = this.config.showFederatedSharesAsInternal
+				|| this.config.showFederatedSharesToTrustedServersAsInternal
+
+			// For internal users, add remote types if config says to show them as internal
+			const shouldAddRemoteTypes = (!this.isExternal && showFederatedAsInternal)
+				// For external users, add them if config *doesn't* say to show them as internal
+				|| (this.isExternal && !showFederatedAsInternal)
+				// Edge case: federated-to-trusted is a separate "add" trigger for external users
+				|| (this.isExternal && this.config.showFederatedSharesToTrustedServersAsInternal)
 
 			if (this.isExternal) {
-				shareType.push(ShareType.Remote)
-				shareType.push(ShareType.RemoteGroup)
+				if (getCapabilities().files_sharing.public.enabled === true) {
+					shareType.push(ShareType.Email)
+				}
 			} else {
-				// Merge shareType array
-				shareType = shareType.concat([
+				shareType.push(
 					ShareType.User,
 					ShareType.Group,
 					ShareType.Team,
@@ -198,12 +218,11 @@ export default {
 					ShareType.Guest,
 					ShareType.Deck,
 					ShareType.ScienceMesh,
-				])
-
+				)
 			}
 
-			if (getCapabilities().files_sharing.public.enabled === true && this.isExternal) {
-				shareType.push(ShareType.Email)
+			if (shouldAddRemoteTypes) {
+				shareType.push(...remoteTypes)
 			}
 
 			let request = null
@@ -223,13 +242,10 @@ export default {
 				return
 			}
 
-			const data = request.data.ocs.data
-			const exact = request.data.ocs.data.exact
-			data.exact = [] // removing exact from general results
-
+			const { exact, ...data } = request.data.ocs.data
 			// flatten array of arrays
-			const rawExactSuggestions = Object.values(exact).reduce((arr, elem) => arr.concat(elem), [])
-			const rawSuggestions = Object.values(data).reduce((arr, elem) => arr.concat(elem), [])
+			const rawExactSuggestions = Object.values(exact).flat()
+			const rawSuggestions = Object.values(data).flat()
 
 			// remove invalid data and format to user-select layout
 			const exactSuggestions = this.filterOutExistingShares(rawExactSuggestions)
@@ -354,6 +370,11 @@ export default {
 
 					// filter out existing mail shares
 					if (share.value.shareType === ShareType.Email) {
+						// When sharing internally, we don't want to suggest email addresses
+						// that the user previously created shares to
+						if (!this.isExternal) {
+							return arr
+						}
 						const emails = this.linkShares.map(elem => elem.shareWith)
 						if (emails.indexOf(share.value.shareWith.trim()) !== -1) {
 							return arr
@@ -444,14 +465,19 @@ export default {
 		 */
 		formatForMultiselect(result) {
 			let subname
+			let displayName = result.name || result.label
+
 			if (result.value.shareType === ShareType.User && this.config.shouldAlwaysShowUnique) {
 				subname = result.shareWithDisplayNameUnique ?? ''
-			} else if ((result.value.shareType === ShareType.Remote
-					|| result.value.shareType === ShareType.RemoteGroup
-			) && result.value.server) {
-				subname = t('files_sharing', 'on {server}', { server: result.value.server })
 			} else if (result.value.shareType === ShareType.Email) {
 				subname = result.value.shareWith
+			} else if (result.value.shareType === ShareType.Remote || result.value.shareType === ShareType.RemoteGroup) {
+				if (this.config.showFederatedSharesAsInternal) {
+					subname = result.extra?.email?.value ?? ''
+					displayName = result.extra?.name?.value ?? displayName
+				} else if (result.value.server) {
+					subname = t('files_sharing', 'on {server}', { server: result.value.server })
+				}
 			} else {
 				subname = result.shareWithDescription ?? ''
 			}
@@ -461,7 +487,7 @@ export default {
 				shareType: result.value.shareType,
 				user: result.uuid || result.value.shareWith,
 				isNoUser: result.value.shareType !== ShareType.User,
-				displayName: result.name || result.label,
+				displayName,
 				subname,
 				shareWithDisplayNameUnique: result.shareWithDisplayNameUnique || '',
 				...this.shareTypeToIcon(result.value.shareType),