Merge pull request #1474 from nextcloud/dependabot/npm_and_yarn/nextcloud/router-2.0.0

6 files changed, 12 insertions, 43 deletions

diff --git a/package-lock.json b/package-lock.json
index cf1132b3..97fb54d4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
 				"@nextcloud/initial-state": "^1.2.1",
 				"@nextcloud/l10n": "^1.6.0",
 				"@nextcloud/moment": "^1.2.1",
-				"@nextcloud/router": "^1.2.0",
+				"@nextcloud/router": "^2.0.0",
 				"@nextcloud/vue": "^5.4.0",
 				"vue": "^2.7.8"
 			},
@@ -4360,9 +4360,9 @@
 			}
 		},
 		"node_modules/@nextcloud/router": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-1.2.0.tgz",
-			"integrity": "sha512-kn9QsL9LuhkIMaSSgdiqRL3SZ6PatuAjXUiyq343BbSnI99Oc5eJH8kU6cT2AHije7wKy/tK8Xe3VQuVO32SZQ==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-2.0.0.tgz",
+			"integrity": "sha512-GyHYNYrYAZRBGD5VxRggcbahdJ/zCkXb8+ERVfuaosT+nHMjJSmenTD6Uyct41qGm0p3Az4xRCXGyZGJM0NEUQ==",
 			"dependencies": {
 				"core-js": "^3.6.4"
 			}
@@ -4438,14 +4438,6 @@
 				"uuid": "^8.3.2"
 			}
 		},
-		"node_modules/@nextcloud/vue/node_modules/@nextcloud/router": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-2.0.0.tgz",
-			"integrity": "sha512-GyHYNYrYAZRBGD5VxRggcbahdJ/zCkXb8+ERVfuaosT+nHMjJSmenTD6Uyct41qGm0p3Az4xRCXGyZGJM0NEUQ==",
-			"dependencies": {
-				"core-js": "^3.6.4"
-			}
-		},
 		"node_modules/@nextcloud/vue/node_modules/ansi-regex": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
@@ -4465,16 +4457,6 @@
 				"node": ">=12.20"
 			}
 		},
-		"node_modules/@nextcloud/vue/node_modules/core-js": {
-			"version": "3.15.2",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz",
-			"integrity": "sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==",
-			"hasInstallScript": true,
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/core-js"
-			}
-		},
 		"node_modules/@nextcloud/vue/node_modules/string-length": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.0.tgz",
@@ -27732,9 +27714,9 @@
 			}
 		},
 		"@nextcloud/router": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-1.2.0.tgz",
-			"integrity": "sha512-kn9QsL9LuhkIMaSSgdiqRL3SZ6PatuAjXUiyq343BbSnI99Oc5eJH8kU6cT2AHije7wKy/tK8Xe3VQuVO32SZQ==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-2.0.0.tgz",
+			"integrity": "sha512-GyHYNYrYAZRBGD5VxRggcbahdJ/zCkXb8+ERVfuaosT+nHMjJSmenTD6Uyct41qGm0p3Az4xRCXGyZGJM0NEUQ==",
 			"requires": {
 				"core-js": "^3.6.4"
 			},
@@ -27796,14 +27778,6 @@
 					"integrity": "sha512-Uy/etWwRmbzG1jxcfampOCEXbGMEzY1xVCBlONVrkusUmD9t02u3jWFkRJGAHvFAtLd4iM+MdTo1x3VXemBvcA==",
 					"requires": {}
 				},
-				"@nextcloud/router": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-2.0.0.tgz",
-					"integrity": "sha512-GyHYNYrYAZRBGD5VxRggcbahdJ/zCkXb8+ERVfuaosT+nHMjJSmenTD6Uyct41qGm0p3Az4xRCXGyZGJM0NEUQ==",
-					"requires": {
-						"core-js": "^3.6.4"
-					}
-				},
 				"ansi-regex": {
 					"version": "6.0.1",
 					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
@@ -27814,11 +27788,6 @@
 					"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.0.tgz",
 					"integrity": "sha512-oGu2QekBMXgyQNWPDRQ001bjvDnZe4/zBTz37TMbiKz1NbNiyiH5hRkobe7npRN6GfbGbxMYFck/vQ1r9c1VMA=="
 				},
-				"core-js": {
-					"version": "3.15.2",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz",
-					"integrity": "sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q=="
-				},
 				"string-length": {
 					"version": "5.0.0",
 					"resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.0.tgz",
diff --git a/package.json b/package.json
index ff0e1d97..ab44f48f 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
 		"@nextcloud/initial-state": "^1.2.1",
 		"@nextcloud/l10n": "^1.6.0",
 		"@nextcloud/moment": "^1.2.1",
-		"@nextcloud/router": "^1.2.0",
+		"@nextcloud/router": "^2.0.0",
 		"@nextcloud/vue": "^5.4.0",
 		"vue": "^2.7.8"
 	},
diff --git a/src/files.js b/src/files.js
index fcd95280..ee24b00a 100644
--- a/src/files.js
+++ b/src/files.js
@@ -101,7 +101,7 @@ const odfViewer = {
 		let templateId
 
 		if (!odfViewer.isCollaboraConfigured) {
-			$.get(generateOcsUrl('cloud') + '/capabilities?format=json').then(
+			$.get(generateOcsUrl('cloud/capabilities?format=json')).then(
 				e => {
 					if ((OC.getCapabilities().richdocuments.config.wopi_url.indexOf('proxy.php') !== -1)
 						|| (typeof e.ocs.data.capabilities.richdocuments.collabora === 'object'
diff --git a/src/helpers/guestName.js b/src/helpers/guestName.js
index a7ae7ffb..41be3216 100644
--- a/src/helpers/guestName.js
+++ b/src/helpers/guestName.js
@@ -52,7 +52,7 @@ const setGuestName = function(username) {
 		guestName = username
 	}
 	const accessToken = encodeURIComponent(Config.get('token'))
-	return axios.post(generateOcsUrl('apps/richdocuments/api/v1/wopi', 2) + 'guestname', {
+	return axios.post(generateOcsUrl('apps/richdocuments/api/v1/wopi/guestname', 2), {
 		access_token: accessToken,
 		guestName,
 	})
diff --git a/src/services/api.js b/src/services/api.js
index 8efe54b6..6c1b9dbe 100644
--- a/src/services/api.js
+++ b/src/services/api.js
@@ -28,7 +28,7 @@ export const createEmptyFile = async(mimeType, fileName) => {
 	const shareToken = document.getElementById('sharingToken')?.value
 	const directoryPath = getCurrentDirectory()
 
-	const response = await axios.post(generateOcsUrl('apps/richdocuments/api/v1', 2) + 'file', {
+	const response = await axios.post(generateOcsUrl('apps/richdocuments/api/v1/file', 2), {
 		mimeType,
 		fileName,
 		directoryPath,
diff --git a/src/view/NewFileMenu.js b/src/view/NewFileMenu.js
index 74be0a0e..fc28539d 100644
--- a/src/view/NewFileMenu.js
+++ b/src/view/NewFileMenu.js
@@ -132,7 +132,7 @@ const NewFileMenu = {
 	_openTemplatePicker(type, mimetype, filename) {
 		const self = this
 		$.ajax({
-			url: generateOcsUrl('apps/richdocuments/api/v1/templates', 2) + type,
+			url: generateOcsUrl(`apps/richdocuments/api/v1/templates/${type}`, 2) + type,
 			dataType: 'json',
 		}).then(function(response) {
 			if (response.ocs.data.length === 1) {