From 809108d3a8b56c854ef63476153b9b49a924466f 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>
---
 package-lock.json       | 37 +++++++++++++++++++++++++++++++++++++
 package.json            |  1 +
 src/services/logger.ts  |  6 ++++++
 src/views/GuestForm.vue | 23 +++++++++++------------
 4 files changed, 55 insertions(+), 12 deletions(-)
 create mode 100644 src/services/logger.ts

diff --git a/package-lock.json b/package-lock.json
index b7d78e94..68d3cbd9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
         "@nextcloud/dialogs": "^4.0.1",
         "@nextcloud/event-bus": "^3.0.2",
         "@nextcloud/router": "^2.0.1",
+        "@nextcloud/sharing": "^0.2.2",
         "@nextcloud/vue": "^7.11.4",
         "email-validator": "^2.0.4",
         "vue": "^2.7.14",
@@ -2314,6 +2315,27 @@
         "npm": "^7.0.0 || ^8.0.0"
       }
     },
+    "node_modules/@nextcloud/sharing": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@nextcloud/sharing/-/sharing-0.2.2.tgz",
+      "integrity": "sha512-ui0ZoVazroA+cF4+homhFSFAddd/P4uRYMfG3rw3QR8o6igrVFe0f0l21kYtUwXU0oC0K4v3k8j93zCTfz6v3g==",
+      "dependencies": {
+        "@nextcloud/initial-state": "^2.2.0"
+      },
+      "engines": {
+        "node": "^20.0.0",
+        "npm": "^10.0.0"
+      }
+    },
+    "node_modules/@nextcloud/sharing/node_modules/@nextcloud/initial-state": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-2.2.0.tgz",
+      "integrity": "sha512-cDW98L5KGGgpS8pzd+05304/p80cyu8U2xSDQGa+kGPTpUFmCbv2qnO5WrwwGTauyjYijCal2bmw82VddSH+Pg==",
+      "engines": {
+        "node": "^20.0.0",
+        "npm": "^10.0.0"
+      }
+    },
     "node_modules/@nextcloud/stylelint-config": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@nextcloud/stylelint-config/-/stylelint-config-2.2.0.tgz",
@@ -14666,6 +14688,21 @@
         "core-js": "^3.6.4"
       }
     },
+    "@nextcloud/sharing": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@nextcloud/sharing/-/sharing-0.2.2.tgz",
+      "integrity": "sha512-ui0ZoVazroA+cF4+homhFSFAddd/P4uRYMfG3rw3QR8o6igrVFe0f0l21kYtUwXU0oC0K4v3k8j93zCTfz6v3g==",
+      "requires": {
+        "@nextcloud/initial-state": "^2.2.0"
+      },
+      "dependencies": {
+        "@nextcloud/initial-state": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-2.2.0.tgz",
+          "integrity": "sha512-cDW98L5KGGgpS8pzd+05304/p80cyu8U2xSDQGa+kGPTpUFmCbv2qnO5WrwwGTauyjYijCal2bmw82VddSH+Pg=="
+        }
+      }
+    },
     "@nextcloud/stylelint-config": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@nextcloud/stylelint-config/-/stylelint-config-2.2.0.tgz",
diff --git a/package.json b/package.json
index ee26a6dc..b2151157 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "@nextcloud/dialogs": "^4.0.1",
     "@nextcloud/event-bus": "^3.0.2",
     "@nextcloud/router": "^2.0.1",
+    "@nextcloud/sharing": "^0.2.2",
     "@nextcloud/vue": "^7.11.4",
     "email-validator": "^2.0.4",
     "vue": "^2.7.14",
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 3d1807ac..fb2930c0 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 e25122851a8ede65a5736333fdb94ee325ae9d77 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 fb2930c0..c69bab7b 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 })
 			}
 		},