Merge pull request #40415 from nextcloud/artonge/backport/stable27/40389

[stable27] Fix invite guest for new sharing flow

apps/files_sharing/src/mixins/ShareDetails.js

@@ -2,12 +2,29 @@ import Share from '../models/Share.js'
 
 export default {
 	methods: {
-		openSharingDetails(share) {
-			const shareRequestObject = {
+		async openSharingDetails(shareRequestObject) {
+			let share = {}
+			// handle externalResults from OCA.Sharing.ShareSearch
+			// TODO : Better name/interface for handler required
+			// For example `externalAppCreateShareHook` with proper documentation
+			if (shareRequestObject.handler) {
+				if (this.suggestions) {
+					shareRequestObject.suggestions = this.suggestions
+					shareRequestObject.fileInfo = this.fileInfo
+					shareRequestObject.query = this.query
+				}
+				share = await shareRequestObject.handler(shareRequestObject)
+				share = new Share(share)
+			} else {
+				share = this.mapShareRequestToShareObject(shareRequestObject)
+			}
+
+			const shareDetails = {
 				fileInfo: this.fileInfo,
-				share: this.mapShareRequestToShareObject(share),
+				share,
 			}
-			this.$emit('open-sharing-details', shareRequestObject)
+
+			this.$emit('open-sharing-details', shareDetails)
 		},
 		openShareDetailsForCustomSettings(share) {
 			share.setCustomPermissions = true

apps/files_sharing/src/views/SharingDetailsTab.vue

@@ -769,6 +769,7 @@ export default {
 					shareWith: this.share.shareWith,
 					attributes: this.share.attributes,
 					note: this.share.note,
+					fileInfo: this.fileInfo,
 				}
 
 				if (this.hasExpirationDate) {
@@ -795,15 +796,6 @@ export default {
 		 * @param {object} fileInfo file data
 		 */
 		async addShare(share, fileInfo) {
-
-			// handle externalResults from OCA.Sharing.ShareSearch
-			if (share.handler) {
-				const shareFromHandler = await share.handler(this)
-				this.$emit('add:share', new Share(shareFromHandler))
-				return true
-			}
-
-			// this.loading = true // Are we adding loaders the new share flow?
 			console.debug('Adding a new share from the input for', share)
 			try {
 				const path = (fileInfo.path + '/' + fileInfo.name).replace('//', '/')