From 722774976abd41e5e82e8b4c4d96cd87dc86f8f1 Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Tue, 16 Apr 2024 15:34:21 +0200
Subject: [PATCH] chore(deprecations): use @nextcloud/router for generateUrl

Signed-off-by: Max <max@nextcloud.com>
---
 src/files.js       |  8 +++++---
 src/helpers/url.js | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/files.js b/src/files.js
index de3dd08f..2f4c862d 100644
--- a/src/files.js
+++ b/src/files.js
@@ -8,15 +8,17 @@ import Vue from 'vue'
 import Office from './view/Office.vue'
 import types from './helpers/types.js'
 import axios from '@nextcloud/axios'
+import { getRequestToken } from '@nextcloud/auth'
 import { getCapabilities } from '@nextcloud/capabilities'
+import { generateUrl, linkTo } from '@nextcloud/router'
 
 import './css/icons.css'
 
 // eslint-disable-next-line
-__webpack_nonce__ = btoa(window.OC.requestToken)
+__webpack_nonce__ = btoa(getRequestToken())
 
 // eslint-disable-next-line
-__webpack_public_path__ = window.OC.linkTo('officeonline', 'js/')
+__webpack_public_path__ = linkTo('officeonline', 'js/')
 
 Vue.prototype.t = window.t
 Vue.prototype.n = window.n
@@ -82,7 +84,7 @@ const NewFilePlugin = {
 			})
 		}
 
-		axios.post(OC.generateUrl('apps/officeonline/ajax/documents/create'), { mimetype, filename, dir }).then(({ data }) => {
+		axios.post(generateUrl('apps/officeonline/ajax/documents/create'), { mimetype, filename, dir }).then(({ data }) => {
 			console.debug(data)
 			if (data && data.status === 'success') {
 				window.FileList.add(data.data, { animate: true, scrollTo: true })
diff --git a/src/helpers/url.js b/src/helpers/url.js
index 39ff79f5..48f4d887 100644
--- a/src/helpers/url.js
+++ b/src/helpers/url.js
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { getRootUrl } from '@nextcloud/router'
-import { getSharingToken } from '@nextcloud/sharing/public'
-import { languageToBCP47 } from './index.js'
-import Config from './../services/config.ts'
+import { getRequestToken } from '@nextcloud/auth'
+import { getRootUrl, generateUrl } from '@nextcloud/router'
+import { languageToBCP47 } from './index'
+import Config from './../services/config'
 
 const getSearchParam = (name) => {
 	const results = new RegExp('[?&]' + name + '=([^&#]*)').exec(window.location.href)
@@ -37,36 +37,36 @@ const getWopiUrl = ({ fileId, title, readOnly, closeButton, revisionHistory }) =
 }
 
 const getDocumentUrlFromTemplate = (templateId, fileName, fileDir, fillWithTemplate) => {
-	return OC.generateUrl(
+	return generateUrl(
 		'apps/officeonline/indexTemplate?templateId={templateId}&fileName={fileName}&dir={dir}&requesttoken={requesttoken}',
 		{
 			templateId,
 			fileName,
 			dir: encodeURIComponent(fileDir),
-			requesttoken: OC.requestToken,
+			requesttoken: getRequestToken(),
 		},
 	)
 }
 
 const getDocumentUrlForPublicFile = (fileName, fileId) => {
-	return OC.generateUrl(
+	return generateUrl(
 		'apps/officeonline/public?shareToken={shareToken}&fileName={fileName}&requesttoken={requesttoken}&fileId={fileId}',
 		{
 			shareToken: getSharingToken(),
 			fileName: encodeURIComponent(fileName),
 			fileId,
-			requesttoken: OC.requestToken,
+			requesttoken: getRequestToken(),
 		},
 	)
 }
 
 const getDocumentUrlForFile = (fileDir, fileId) => {
-	return OC.generateUrl(
+	return generateUrl(
 		'apps/officeonline/index?fileId={fileId}&requesttoken={requesttoken}',
 		{
 			fileId,
 			dir: fileDir,
-			requesttoken: OC.requestToken,
+			requesttoken: getRequestToken(),
 		})
 }