Fix invite guest for new sharing flow

Call external handlers such as the one in the guess app https://github.com/nextcloud/guests/blob/master/src/main.js#L30 if present. Signed-off-by: fenn-cs <[email protected]> Signed-off-by: nextcloud-command <[email protected]>
nextcloud · Sep 14, 2023 · 419eb0d · 419eb0d
1 parent 30a7eab
commit 419eb0d
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 21 deletions.
diff --git a/3rdparty b/3rdparty
diff --git a/apps/files_sharing/src/mixins/ShareDetails.js b/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

diff --git a/apps/files_sharing/src/views/SharingDetailsTab.vue b/apps/files_sharing/src/views/SharingDetailsTab.vue
@@ -777,6 +777,7 @@ export default {
 					shareWith: this.share.shareWith,
 					attributes: this.share.attributes,
 					note: this.share.note,
+					fileInfo: this.fileInfo,
 				}
 
 				if (this.hasExpirationDate) {
@@ -803,15 +804,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('//', '/')

diff --git a/dist/1012-1012.js b/dist/1012-1012.js
diff --git a/dist/9193-9193.js.LICENSE.txt → dist/1012-1012.js.LICENSE.txt b/dist/9193-9193.js.LICENSE.txt → dist/1012-1012.js.LICENSE.txt
diff --git a/dist/1012-1012.js.map b/dist/1012-1012.js.map
diff --git a/dist/9193-9193.js b/dist/9193-9193.js
diff --git a/dist/9193-9193.js.map b/dist/9193-9193.js.map
diff --git a/dist/files_sharing-files_sharing_tab.js b/dist/files_sharing-files_sharing_tab.js
diff --git a/dist/files_sharing-files_sharing_tab.js.map b/dist/files_sharing-files_sharing_tab.js.map