From 90c5da56cd0114e6711a88ac11382595b5f06cec Mon Sep 17 00:00:00 2001
From: Elizabeth Danzberger <lizzy7128@tutanota.de>
Date: Thu, 12 Sep 2024 14:48:06 -0400
Subject: [PATCH] feat(sharing): Use `@nextcloud/sharing` for sharing token

Signed-off-by: Elizabeth Danzberger <lizzy7128@tutanota.de>
---
 package-lock.json   | 1 +
 package.json        | 1 +
 src/helpers/url.js  | 3 ++-
 src/services/api.js | 3 ++-
 src/view/Office.vue | 3 ++-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ccc2f03f15..5bce65ea7d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,7 @@
         "@nextcloud/paths": "^2.2.1",
         "@nextcloud/router": "^3.0.1",
         "@nextcloud/vue": "^8.18.0",
+        "@nextcloud/sharing": "^0.2.3",
         "vue": "^2.7.16",
         "vue-material-design-icons": "^5.3.0"
       },
diff --git a/package.json b/package.json
index d8fe238bc1..3b89b52fb0 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
     "@nextcloud/paths": "^2.2.1",
     "@nextcloud/router": "^3.0.1",
     "@nextcloud/vue": "^8.18.0",
+    "@nextcloud/sharing": "^0.2.3",
     "vue": "^2.7.16",
     "vue-material-design-icons": "^5.3.0"
   },
diff --git a/src/helpers/url.js b/src/helpers/url.js
index 31e0991c9d..98529ec28a 100644
--- a/src/helpers/url.js
+++ b/src/helpers/url.js
@@ -4,6 +4,7 @@
  */
 
 import { getRootUrl, generateUrl } from '@nextcloud/router'
+import { getSharingToken } from '@nextcloud/sharing/public'
 import { languageToBCP47 } from './index.js'
 import Config from './../services/config.tsx'
 
@@ -62,7 +63,7 @@ const getDocumentUrlForPublicFile = (fileName, fileId) => {
 	return generateUrl(
 		'apps/richdocuments/public?shareToken={shareToken}&fileName={fileName}&requesttoken={requesttoken}&fileId={fileId}',
 		{
-			shareToken: document.getElementById('sharingToken').value,
+			shareToken: getSharingToken(),
 			fileName,
 			fileId,
 			requesttoken: OC.requestToken,
diff --git a/src/services/api.js b/src/services/api.js
index 0eb7e7d734..d6dae0c753 100644
--- a/src/services/api.js
+++ b/src/services/api.js
@@ -5,10 +5,11 @@
 
 import axios from '@nextcloud/axios'
 import { generateOcsUrl, generateFilePath } from '@nextcloud/router'
+import { getSharingToken } from '@nextcloud/sharing/public'
 import { getCurrentDirectory } from '../helpers/filesApp.js'
 
 export const createEmptyFile = async (mimeType, fileName, templateId = null) => {
-	const shareToken = document.getElementById('sharingToken')?.value
+	const shareToken = getSharingToken()
 	const directoryPath = getCurrentDirectory()
 
 	const response = await axios.post(generateOcsUrl('apps/richdocuments/api/v1/file', 2), {
diff --git a/src/view/Office.vue b/src/view/Office.vue
index bd05b22625..cb1e01ad51 100644
--- a/src/view/Office.vue
+++ b/src/view/Office.vue
@@ -117,6 +117,7 @@ import saveAs from '../mixins/saveAs.js'
 import uiMention from '../mixins/uiMention.js'
 import version from '../mixins/version.js'
 import { getCurrentUser, getGuestNickname } from '@nextcloud/auth'
+import { getSharingToken } from '@nextcloud/sharing/public'
 import { shouldAskForGuestName } from '../helpers/guestName.js'
 
 const FRAME_DOCUMENT = 'FRAME_DOCUMENT'
@@ -233,7 +234,7 @@ export default {
 			return document.getElementById('isPublic')?.value === '1'
 		},
 		shareToken() {
-			return document.getElementById('sharingToken')?.value
+			return getSharingToken()
 		},
 		showAdminStorageFailure() {
 			return getCurrentUser()?.isAdmin && this.errorType === 'websocketloadfailed'