From 31f6ec87e48a2776b78b51cdd28ae324ab2cf08b Mon Sep 17 00:00:00 2001
From: fenn-cs <fenn25.fn@gmail.com>
Date: Mon, 24 Jun 2024 10:37:54 +0100
Subject: [PATCH 1/2] fix(Sharing): Do not create new share in guest app

Only create the template for share and return the the 'Sharing UI'
in the sidebar.

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
---
 src/services/logger.ts  |  6 ++++++
 src/views/GuestForm.vue | 23 +++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 src/services/logger.ts

diff --git a/src/services/logger.ts b/src/services/logger.ts
new file mode 100644
index 00000000..45e0d9ee
--- /dev/null
+++ b/src/services/logger.ts
@@ -0,0 +1,6 @@
+import { getLoggerBuilder } from '@nextcloud/logger'
+
+export const logger = getLoggerBuilder()
+    .setApp('guests')
+    .detectUser()
+    .build()
diff --git a/src/views/GuestForm.vue b/src/views/GuestForm.vue
index 7ad9355e..b6c34607 100644
--- a/src/views/GuestForm.vue
+++ b/src/views/GuestForm.vue
@@ -69,7 +69,10 @@
 </template>
 
 <script>
+import { logger } from '../services/logger.ts'
 import { generateOcsUrl } from '@nextcloud/router'
+import { Type as ShareTypes } from '@nextcloud/sharing'
+
 import AccountPlus from 'vue-material-design-icons/AccountPlus.vue'
 import axios from '@nextcloud/axios'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
@@ -200,6 +203,7 @@ export default {
 
 			this.loading = true
 			try {
+
 				await axios.put(generateOcsUrl('/apps/guests/api/v1/users'), {
 					displayName: this.guest.fullName,
 					email: this.guest.email,
@@ -216,7 +220,8 @@ export default {
 					this.closeModal()
 					return
 				}
-				await this.addGuestShare()
+
+				await this.setupGuestShare()
 			} catch ({ response }) {
 				const error = response && response.data && response.data.ocs && response.data.ocs.data
 					? response.data.ocs.data.errorMessages
@@ -230,22 +235,16 @@ export default {
 			}
 		},
 
-		async addGuestShare() {
+		async setupGuestShare() {
 			try {
-				const url = generateOcsUrl('/apps/files_sharing/api/v1/shares')
 				const path = (this.fileInfo.path + '/' + this.fileInfo.name).replace('//', '/')
-
-				const result = await axios.post(url + '?format=json', {
-					shareType: OC.Share.SHARE_TYPE_USER,
+				const shareTemplate = {
+					shareType: ShareTypes.SHARE_TYPE_USER,
 					shareWith: this.guest.username,
 					path,
-				})
-
-				if (!result.data.ocs) {
-					this.reject(result)
 				}
-
-				this.resolve(result.data.ocs.data)
+				logger.info('Created share template with newly invited guest', { shareTemplate })
+				this.resolve(shareTemplate)
 				this.closeModal()
 			} catch ({ response }) {
 				this.reject(response)

From afc13de49942dbd958205665925cfba329565d5a Mon Sep 17 00:00:00 2001
From: fenn-cs <fenn25.fn@gmail.com>
Date: Mon, 24 Jun 2024 15:04:50 +0100
Subject: [PATCH 2/2] Use new NC logger in GuestForm

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
---
 src/views/GuestForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/GuestForm.vue b/src/views/GuestForm.vue
index b6c34607..831150b7 100644
--- a/src/views/GuestForm.vue
+++ b/src/views/GuestForm.vue
@@ -257,7 +257,7 @@ export default {
 				this.groups = result.data.ocs.data.groups
 				this.groupRequired = result.data.ocs.data.required
 			} catch (error) {
-				console.error('Failed to retrieve groups', error)
+				logger.error('Failed to retrieve groups', { error })
 			}
 		},