Bump @nextcloud/router from 1.2.0 to 2.0.0

Bumps [@nextcloud/router](https://github.com/nextcloud/nextcloud-router) from 1.2.0 to 2.0.0.
- [Release notes](https://github.com/nextcloud/nextcloud-router/releases)
- [Changelog](https://github.com/nextcloud/nextcloud-router/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/nextcloud-router/compare/v1.2.0...v2.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>

apps/accessibility/src/Accessibility.vue

@@ -125,7 +125,7 @@ export default {
 			try {
 				const isDelete = id === ''
 				await axios({
-					url: generateOcsUrl('apps/accessibility/api/v1/config', 2) + type,
+					url: generateOcsUrl('apps/accessibility/api/v1/config/{type}', { type }),
 					method: isDelete ? 'DELETE' : 'PUT',
 					data: {
 						value: id,

apps/comments/src/views/Comments.vue

@@ -221,7 +221,7 @@ export default {
 		 * @param {Function} callback the callback to process the results with
 		 */
 		async autoComplete(search, callback) {
-			const results = await axios.get(generateOcsUrl('core', 2) + 'autocomplete/get', {
+			const results = await axios.get(generateOcsUrl('core/autocomplete/get'), {
 				params: {
 					search,
 					itemType: 'files',

apps/files/src/components/TransferOwnershipDialogue.vue

@@ -162,7 +162,7 @@ export default {
 
 			this.loadingUsers = true
 			try {
-				const response = await axios.get(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'sharees', {
+				const response = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees'), {
 					params: {
 						format: 'json',
 						itemType: 'file',
@@ -197,7 +197,7 @@ export default {
 			}
 			logger.debug('submit transfer ownership form', data)
 
-			const url = generateOcsUrl('apps/files/api/v1/', 2) + 'transferownership'
+			const url = generateOcsUrl('apps/files/api/v1//transferownership')
 
 			axios.post(url, data)
 				.then(resp => resp.data)

apps/files/src/services/Templates.js

@@ -24,6 +24,6 @@ import { generateOcsUrl } from '@nextcloud/router'
 import axios from '@nextcloud/axios'
 
 export const getTemplates = async function() {
-	const response = await axios.get(generateOcsUrl('apps/files/api/v1', 2) + 'templates')
+	const response = await axios.get(generateOcsUrl('apps/files/api/v1/templates'))
 	return response.data.ocs.data
 }

apps/files/src/templates.js

@@ -127,7 +127,7 @@ const initTemplatesFolder = async function(name) {
 	const templatePath = (getCurrentDirectory() + `/${name}`).replace('//', '/')
 	try {
 		logger.debug('Initializing the templates directory', { templatePath })
-		const response = await axios.post(generateOcsUrl('apps/files/api/v1/templates', 2) + 'path', {
+		const response = await axios.post(generateOcsUrl('apps/files/api/v1/templates/path'), {
 			templatePath,
 			copySystemTemplates: true,
 		})

apps/files/src/views/TemplatePicker.vue

@@ -199,7 +199,7 @@ export default {
 			const fileList = OCA?.Files?.App?.currentFileList
 
 			try {
-				const response = await axios.post(generateOcsUrl('apps/files/api/v1/templates', 2) + 'create', {
+				const response = await axios.post(generateOcsUrl('apps/files/api/v1/templates/create'), {
 					filePath: `${currentDirectory}/${this.name}`,
 					templatePath: this.selectedTemplate?.filename,
 					templateType: this.selectedTemplate?.templateType,

apps/files_external/js/mountsfilelist.js

@@ -92,7 +92,7 @@
 			this._setCurrentDir('/', false);
 
 			this._reloadCall = $.ajax({
-				url: OC.linkToOCS('apps/files_external/api/v1') + 'mounts',
+				url: OC.linkToOCS('apps/files_external/api/v1/mounts'),
 				data: {
 					format: 'json'
 				},

apps/files_external/js/statusmanager.js

@@ -141,7 +141,7 @@ OCA.Files_External.StatusManager = {
 			self.isGetMountPointListRunning = true;
 			$.ajax({
 				type: 'GET',
-				url: OC.linkToOCS('apps/files_external/api/v1') + 'mounts?format=json',
+				url: OC.linkToOCS('apps/files_external/api/v1/mounts?format=json'),
 				success: function (response) {
 					self.mountPointList = [];
 					_.each(response.ocs.data, function (mount) {

apps/files_external/tests/js/mountsfilelistSpec.js

@@ -117,8 +117,7 @@ describe('OCA.Files_External.FileList tests', function() {
 			expect(fakeServer.requests.length).toEqual(1);
 			request = fakeServer.requests[0];
 			expect(request.url).toEqual(
-				OC.linkToOCS('apps/files_external/api/v1') +
-				'mounts?format=json'
+				OC.linkToOCS('apps/files_external/api/v1/mounts?format=json')
 			);
 
 			fakeServer.requests[0].respond(

apps/files_sharing/js/app.js

@@ -274,7 +274,7 @@ OCA.Sharing.App = {
 			type: OCA.Files.FileActions.TYPE_INLINE,
 			actionHandler(fileName, context) {
 				const shareId = context.$file.data('shareId')
-				$.post(OC.linkToOCS('apps/files_sharing/api/v1/deletedshares', 2) + shareId)
+				$.post(OC.linkToOCS('apps/files_sharing/api/v1/deletedshares/{shareId}', { shareId }))
 					.success(function(result) {
 						context.fileList.remove(context.fileInfoModel.attributes.name)
 					}).fail(function() {
@@ -296,7 +296,7 @@ OCA.Sharing.App = {
 			type: OCA.Files.FileActions.TYPE_INLINE,
 			actionHandler(fileName, context) {
 				const shareId = context.$file.data('shareId')
-				$.post(OC.linkToOCS('apps/files_sharing/api/v1/shares/pending', 2) + shareId)
+				$.post(OC.linkToOCS('apps/files_sharing/api/v1/shares/pending/{shareId}', { shareId }))
 					.success(function(result) {
 						context.fileList.remove(context.fileInfoModel.attributes.name)
 					}).fail(function() {
@@ -314,7 +314,7 @@ OCA.Sharing.App = {
 			actionHandler(fileName, context) {
 				const shareId = context.$file.data('shareId')
 				$.ajax({
-					url: OC.linkToOCS('apps/files_sharing/api/v1/shares', 2) + shareId,
+					url: OC.linkToOCS('apps/files_sharing/api/v1/shares/{shareId}', { shareId }),
 					type: 'DELETE',
 				}).success(function(result) {
 					context.fileList.remove(context.fileInfoModel.attributes.name)

apps/files_sharing/js/dist/collaboration.js

@@ -1,4 +1,4 @@
-!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/js/",t(t.s=154)}({154:function(e,n,r){
+!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/js/",t(t.s=152)}({152:function(e,n,r){
 /**
  * @copyright Copyright (c) 2016 John Molakvoæ <skjnldsv@protonmail.com>
  *

apps/files_sharing/js/dist/main.js

@@ -1,4 +1,4 @@
-!function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="/js/",r(r.s=470)}({470:function(e,t){
+!function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="/js/",r(r.s=471)}({471:function(e,t){
 /**
  * @copyright Copyright (c) 2019 John Molakvoæ <skjnldsv@protonmail.com>
  *

apps/files_sharing/js/sharedfilelist.js

@@ -188,7 +188,7 @@
 				var promises = []
 
 				var deletedShares = {
-					url: OC.linkToOCS('apps/files_sharing/api/v1', 2) + 'deletedshares',
+					url: OC.linkToOCS('apps/files_sharing/api/v1/deletedshares'),
 					/* jshint camelcase: false */
 					data: {
 						format: 'json',
@@ -201,7 +201,7 @@
 				}
 
 				var pendingShares = {
-					url: OC.linkToOCS('apps/files_sharing/api/v1/shares', 2) + 'pending',
+					url: OC.linkToOCS('apps/files_sharing/api/v1/shares/pending'),
 					/* jshint camelcase: false */
 					data: {
 						format: 'json'
@@ -213,7 +213,7 @@
 				}
 
 				var shares = {
-					url: OC.linkToOCS('apps/files_sharing/api/v1') + 'shares',
+					url: OC.linkToOCS('apps/files_sharing/api/v1/shares'),
 					/* jshint camelcase: false */
 					data: {
 						format: 'json',
@@ -227,7 +227,7 @@
 				}
 
 				var remoteShares = {
-					url: OC.linkToOCS('apps/files_sharing/api/v1') + 'remote_shares',
+					url: OC.linkToOCS('apps/files_sharing/api/v1/remote_shares'),
 					/* jshint camelcase: false */
 					data: {
 						format: 'json',

apps/files_sharing/src/components/SharingInput.vue

@@ -199,7 +199,7 @@ export default {
 
 			let request = null
 			try {
-				request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'sharees', {
+				request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees'), {
 					params: {
 						format: 'json',
 						itemType: this.fileInfo.type === 'dir' ? 'folder' : 'file',
@@ -290,7 +290,7 @@ export default {
 
 			let request = null
 			try {
-				request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'sharees_recommended', {
+				request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees_recommended'), {
 					params: {
 						format: 'json',
 						itemType: this.fileInfo.type,

apps/files_sharing/src/mixins/ShareRequests.js

@@ -30,7 +30,7 @@ import { generateOcsUrl } from '@nextcloud/router'
 import axios from '@nextcloud/axios'
 import Share from '../models/Share'
 
-const shareUrl = generateOcsUrl('apps/files_sharing/api/v1', 2) + 'shares'
+const shareUrl = generateOcsUrl('apps/files_sharing/api/v1/shares')
 const headers = {
 	'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
 }

apps/files_sharing/src/views/SharingInherited.vue

@@ -128,8 +128,8 @@ export default {
 		async fetchInheritedShares() {
 			this.loading = true
 			try {
-				const url = generateOcsUrl(`apps/files_sharing/api/v1/shares/inherited?format=json&path=${encodeURIComponent(this.fullPath)}`, 2)
-				const shares = await axios.get(url.replace(/\/$/, ''))
+				const url = generateOcsUrl('apps/files_sharing/api/v1/shares/inherited?format=json&path={path}', { path: this.fullPath })
+				const shares = await axios.get(url)
 				this.shares = shares.data.ocs.data
 					.map(share => new Share(share))
 					.sort((a, b) => b.createdTime - a.createdTime)

apps/files_sharing/src/views/SharingTab.vue

@@ -175,7 +175,7 @@ export default {
 				this.loading = true
 
 				// init params
-				const shareUrl = generateOcsUrl('apps/files_sharing/api/v1', 2) + 'shares'
+				const shareUrl = generateOcsUrl('apps/files_sharing/api/v1/shares')
 				const format = 'json'
 				// TODO: replace with proper getFUllpath implementation of our own FileInfo model
 				const path = (this.fileInfo.path + '/' + this.fileInfo.name).replace('//', '/')

apps/settings/js/apps.js

@@ -2,7 +2,7 @@
 OC.Settings = OC.Settings || {};
 OC.Settings.Apps = OC.Settings.Apps || {
 	rebuildNavigation: function() {
-		$.getJSON(OC.linkToOCS('core/navigation', 2) + 'apps?format=json').done(function(response){
+		$.getJSON(OC.linkToOCS('core/navigation/apps?format=json')).done(function(response){
 			if(response.ocs.meta.status === 'ok') {
 				var addedApps = {};
 				var navEntries = response.ocs.data;

apps/settings/js/settings.js

@@ -35,7 +35,7 @@ OC.Settings = _.extend(OC.Settings, {
 		if ($elements.length > 0) {
 			// Let's load the data and THEN init our select
 			$.ajax({
-				url: OC.linkToOCS('cloud/groups', 2) + 'details',
+				url: OC.linkToOCS('cloud/groups/details'),
 				dataType: 'json',
 				success: function(data) {
 					var results = [];

apps/settings/js/settings/personalInfo.js

@@ -222,7 +222,7 @@ window.addEventListener('DOMContentLoaded', function () {
 			user = OC.getCurrentUser();
 
 		$.ajax({
-			url: OC.linkToOCS('cloud/users', 2) + user['uid'],
+			url: OC.linkToOCS('cloud/users/{uid}', { uid: user.uid }),
 			method: 'PUT',
 			data: {
 				key: 'language',
@@ -248,7 +248,7 @@ window.addEventListener('DOMContentLoaded', function () {
 			user = OC.getCurrentUser();
 
 		$.ajax({
-			url: OC.linkToOCS('cloud/users', 2) + user['uid'],
+			url: OC.linkToOCS('cloud/users/{uid}', { uid: user.uid }),
 			method: 'PUT',
 			data: {
 				key: 'locale',

apps/settings/src/components/AdminTwoFactor.vue

@@ -125,7 +125,7 @@ export default {
 	methods: {
 		searchGroup: _.debounce(function(query) {
 			this.loadingGroups = true
-			axios.get(generateOcsUrl(`cloud/groups?offset=0&search=${encodeURIComponent(query)}&limit=20`, 2))
+			axios.get(generateOcsUrl('cloud/groups?offset=0&search={query}&limit=20', { query }))
 				.then(res => res.data.ocs)
 				.then(ocs => ocs.data.groups)
 				.then(groups => { this.groups = _.sortedUniq(_.uniq(this.groups.concat(groups))) })

apps/settings/src/service/PersonalInfoService.js

@@ -35,8 +35,7 @@ import { ACCOUNT_PROPERTY_ENUM, SCOPE_SUFFIX } from '../constants/AccountPropert
  */
 export const savePrimaryEmail = async(email) => {
 	const userId = getCurrentUser().uid
-	// TODO upgrade @nextcloud/router to v2.0 so we can remove the .slice() trailing slash hacks (same below)
-	const url = generateOcsUrl(`cloud/users/${userId}`, 2).slice(0, -1)
+	const url = generateOcsUrl('cloud/users/{userId}', { userId })
 
 	await confirmPassword()
 
@@ -58,7 +57,7 @@ export const savePrimaryEmail = async(email) => {
  */
 export const saveAdditionalEmail = async(email) => {
 	const userId = getCurrentUser().uid
-	const url = generateOcsUrl(`cloud/users/${userId}`, 2).slice(0, -1)
+	const url = generateOcsUrl('cloud/users/{userId}', { userId })
 
 	await confirmPassword()
 
@@ -78,7 +77,7 @@ export const saveAdditionalEmail = async(email) => {
  */
 export const removeAdditionalEmail = async(email) => {
 	const userId = getCurrentUser().uid
-	const url = generateOcsUrl(`cloud/users/${userId}/${ACCOUNT_PROPERTY_ENUM.EMAIL_COLLECTION}`, 2).slice(0, -1)
+	const url = generateOcsUrl('cloud/users/{userId}/{collection}', { userId, collection: ACCOUNT_PROPERTY_ENUM.EMAIL_COLLECTION })
 
 	await confirmPassword()
 
@@ -99,7 +98,7 @@ export const removeAdditionalEmail = async(email) => {
  */
 export const updateAdditionalEmail = async(prevEmail, newEmail) => {
 	const userId = getCurrentUser().uid
-	const url = generateOcsUrl(`cloud/users/${userId}/${ACCOUNT_PROPERTY_ENUM.EMAIL_COLLECTION}`, 2).slice(0, -1)
+	const url = generateOcsUrl('cloud/users/{userId}/{collection}', { userId, collection: ACCOUNT_PROPERTY_ENUM.EMAIL_COLLECTION })
 
 	await confirmPassword()
 
@@ -119,7 +118,7 @@ export const updateAdditionalEmail = async(prevEmail, newEmail) => {
  */
 export const savePrimaryEmailScope = async(scope) => {
 	const userId = getCurrentUser().uid
-	const url = generateOcsUrl(`cloud/users/${userId}`, 2).slice(0, -1)
+	const url = generateOcsUrl('cloud/users/{userId}', { userId })
 
 	await confirmPassword()
 
@@ -140,7 +139,7 @@ export const savePrimaryEmailScope = async(scope) => {
  */
 export const saveAdditionalEmailScope = async(email, scope) => {
 	const userId = getCurrentUser().uid
-	const url = generateOcsUrl(`cloud/users/${userId}/${ACCOUNT_PROPERTY_ENUM.EMAIL_COLLECTION}${SCOPE_SUFFIX}`, 2).slice(0, -1)
+	const url = generateOcsUrl('cloud/users/{userId}/{collectionScope}', { userId, collectionScope: `${ACCOUNT_PROPERTY_ENUM.EMAIL_COLLECTION}${SCOPE_SUFFIX}` })
 
 	await confirmPassword()
 

apps/settings/src/store/oc.js

@@ -40,7 +40,7 @@ const actions = {
 	 */
 	setAppConfig(context, { app, key, value }) {
 		return api.requireAdmin().then((response) => {
-			return api.post(generateOcsUrl(`apps/provisioning_api/api/v1/config/apps/${app}/${key}`, 2), { value })
+			return api.post(generateOcsUrl('apps/provisioning_api/api/v1/config/apps/{app}/{key}', { app, key }), { value })
 				.catch((error) => { throw error })
 		}).catch((error) => context.commit('API_FAILURE', { app, key, value, error }))
 	},

apps/settings/src/store/users.js

@@ -220,7 +220,7 @@ const actions = {
 		search = typeof search === 'string' ? search : ''
 		group = typeof group === 'string' ? group : ''
 		if (group !== '') {
-			return api.get(generateOcsUrl(`cloud/groups/${encodeURIComponent(encodeURIComponent(group))}/users/details?offset=${offset}&limit=${limit}&search=${search}`, 2), {
+			return api.get(generateOcsUrl('cloud/groups/{group}/users/details?offset={offset}&limit={limit}&search={search}', { group: encodeURIComponent(group), offset, limit, search }), {
 				cancelToken: searchRequestCancelSource.token,
 			})
 				.then((response) => {
@@ -237,7 +237,7 @@ const actions = {
 				})
 		}
 
-		return api.get(generateOcsUrl(`cloud/users/details?offset=${offset}&limit=${limit}&search=${search}`, 2), {
+		return api.get(generateOcsUrl('cloud/users/details?offset={offset}&limit={limit}&search={search}', { offset, limit, search }), {
 			cancelToken: searchRequestCancelSource.token,
 		})
 			.then((response) => {
@@ -257,7 +257,7 @@ const actions = {
 	getGroups(context, { offset, limit, search }) {
 		search = typeof search === 'string' ? search : ''
 		const limitParam = limit === -1 ? '' : `&limit=${limit}`
-		return api.get(generateOcsUrl(`cloud/groups?offset=${offset}&search=${search}${limitParam}`, 2))
+		return api.get(generateOcsUrl('cloud/groups?offset={offset}&search={search}', { offset, search }) + limitParam)
 			.then((response) => {
 				if (Object.keys(response.data.ocs.data.groups).length > 0) {
 					response.data.ocs.data.groups.forEach(function(group) {
@@ -281,7 +281,7 @@ const actions = {
 	 */
 	getUsersFromList(context, { offset, limit, search }) {
 		search = typeof search === 'string' ? search : ''
-		return api.get(generateOcsUrl(`cloud/users/details?offset=${offset}&limit=${limit}&search=${search}`, 2))
+		return api.get(generateOcsUrl('cloud/users/details?offset={offset}&limit={limit}&search={search}', { offset, limit, search }))
 			.then((response) => {
 				if (Object.keys(response.data.ocs.data.users).length > 0) {
 					context.commit('appendUsers', response.data.ocs.data.users)
@@ -302,7 +302,7 @@ const actions = {
 	 * @returns {Promise}
 	 */
 	getUsersFromGroup(context, { groupid, offset, limit }) {
-		return api.get(generateOcsUrl(`cloud/users/${encodeURIComponent(encodeURIComponent(groupid))}/details?offset=${offset}&limit=${limit}`, 2))
+		return api.get(generateOcsUrl('cloud/users/{groupId}/details?offset={offset}&limit={limit}', { groupId: encodeURIComponent(groupid), offset, limit }))
 			.then((response) => context.commit('getUsersFromList', response.data.ocs.data.users))
 			.catch((error) => context.commit('API_FAILURE', error))
 	},
@@ -324,7 +324,7 @@ const actions = {
 	 */
 	addGroup(context, gid) {
 		return api.requireAdmin().then((response) => {
-			return api.post(generateOcsUrl('cloud/groups', 2), { groupid: gid })
+			return api.post(generateOcsUrl('cloud/groups'), { groupid: gid })
 				.then((response) => {
 					context.commit('addGroup', { gid, displayName: gid })
 					return { gid, displayName: gid }
@@ -347,7 +347,7 @@ const actions = {
 	 */
 	removeGroup(context, gid) {
 		return api.requireAdmin().then((response) => {
-			return api.delete(generateOcsUrl(`cloud/groups/${encodeURIComponent(encodeURIComponent(gid))}`, 2))
+			return api.delete(generateOcsUrl('cloud/groups/{groupId}', { groupId: encodeURIComponent(gid) }))
 				.then((response) => context.commit('removeGroup', gid))
 				.catch((error) => { throw error })
 		}).catch((error) => context.commit('API_FAILURE', { gid, error }))
@@ -364,7 +364,7 @@ const actions = {
 	 */
 	addUserGroup(context, { userid, gid }) {
 		return api.requireAdmin().then((response) => {
-			return api.post(generateOcsUrl(`cloud/users/${userid}/groups`, 2), { groupid: gid })
+			return api.post(generateOcsUrl('cloud/users/{userid}/groups', { userid }), { groupid: gid })
 				.then((response) => context.commit('addUserGroup', { userid, gid }))
 				.catch((error) => { throw error })
 		}).catch((error) => context.commit('API_FAILURE', { userid, error }))
@@ -381,7 +381,7 @@ const actions = {
 	 */
 	removeUserGroup(context, { userid, gid }) {
 		return api.requireAdmin().then((response) => {
-			return api.delete(generateOcsUrl(`cloud/users/${userid}/groups`, 2), { groupid: gid })
+			return api.delete(generateOcsUrl('cloud/users/{userid}/groups', { userid }), { groupid: gid })
 				.then((response) => context.commit('removeUserGroup', { userid, gid }))
 				.catch((error) => { throw error })
 		}).catch((error) => {
@@ -403,7 +403,7 @@ const actions = {
 	 */
 	addUserSubAdmin(context, { userid, gid }) {
 		return api.requireAdmin().then((response) => {
-			return api.post(generateOcsUrl(`cloud/users/${userid}/subadmins`, 2), { groupid: gid })
+			return api.post(generateOcsUrl('cloud/users/{userid}/subadmins', { userid }), { groupid: gid })
 				.then((response) => context.commit('addUserSubAdmin', { userid, gid }))
 				.catch((error) => { throw error })
 		}).catch((error) => context.commit('API_FAILURE', { userid, error }))
@@ -420,7 +420,7 @@ const actions = {
 	 */
 	removeUserSubAdmin(context, { userid, gid }) {
 		return api.requireAdmin().then((response) => {
-			return api.delete(generateOcsUrl(`cloud/users/${userid}/subadmins`, 2), { groupid: gid })
+			return api.delete(generateOcsUrl('cloud/users/{userid}/subadmins', { userid }), { groupid: gid })
 				.then((response) => context.commit('removeUserSubAdmin', { userid, gid }))
 				.catch((error) => { throw error })
 		}).catch((error) => context.commit('API_FAILURE', { userid, error }))
@@ -435,7 +435,7 @@ const actions = {
 	 */
 	wipeUserDevices(context, userid) {
 		return api.requireAdmin().then((response) => {
-			return api.post(generateOcsUrl(`cloud/users/${userid}/wipe`, 2))
+			return api.post(generateOcsUrl('cloud/users/{userid}/wipe', { userid }))
 				.catch((error) => { throw error })
 		}).catch((error) => context.commit('API_FAILURE', { userid, error }))
 	},
@@ -449,7 +449,7 @@ const actions = {
 	 */
 	deleteUser(context, userid) {
 		return api.requireAdmin().then((response) => {
-			return api.delete(generateOcsUrl(`cloud/users/${userid}`, 2))
+			return api.delete(generateOcsUrl('cloud/users/{userid}', { userid }))
 				.then((response) => context.commit('deleteUser', userid))
 				.catch((error) => { throw error })
 		}).catch((error) => context.commit('API_FAILURE', { userid, error }))
@@ -471,7 +471,7 @@ const actions = {
 	 */
 	addUser({ commit, dispatch }, { userid, password, displayName, email, groups, subadmin, quota, language }) {
 		return api.requireAdmin().then((response) => {
-			return api.post(generateOcsUrl('cloud/users', 2), { userid, password, displayName, email, groups, subadmin, quota, language })
+			return api.post(generateOcsUrl('cloud/users'), { userid, password, displayName, email, groups, subadmin, quota, language })
 				.then((response) => dispatch('addUserData', userid || response.data.ocs.data.id))
 				.catch((error) => { throw error })
 		}).catch((error) => {
@@ -489,7 +489,7 @@ const actions = {
 	 */
 	addUserData(context, userid) {
 		return api.requireAdmin().then((response) => {
-			return api.get(generateOcsUrl(`cloud/users/${userid}`, 2))
+			return api.get(generateOcsUrl('cloud/users/{userid}', { userid }))
 				.then((response) => context.commit('addUserData', response))
 				.catch((error) => { throw error })
 		}).catch((error) => context.commit('API_FAILURE', { userid, error }))
@@ -506,7 +506,7 @@ const actions = {
 	enableDisableUser(context, { userid, enabled = true }) {
 		const userStatus = enabled ? 'enable' : 'disable'
 		return api.requireAdmin().then((response) => {
-			return api.put(generateOcsUrl(`cloud/users/${userid}/${userStatus}`, 2))
+			return api.put(generateOcsUrl('cloud/users/{userid}/{userStatus}', { userid, userStatus }))
 				.then((response) => context.commit('enableDisableUser', { userid, enabled }))
 				.catch((error) => { throw error })
 		}).catch((error) => context.commit('API_FAILURE', { userid, error }))
@@ -533,7 +533,7 @@ const actions = {
 				)
 			) {
 				return api.requireAdmin().then((response) => {
-					return api.put(generateOcsUrl(`cloud/users/${userid}`, 2), { key, value })
+					return api.put(generateOcsUrl('cloud/users/{userid}', { userid }), { key, value })
 						.then((response) => context.commit('setUserData', { userid, key, value }))
 						.catch((error) => { throw error })
 				}).catch((error) => context.commit('API_FAILURE', { userid, error }))
@@ -551,7 +551,7 @@ const actions = {
 	 */
 	sendWelcomeMail(context, userid) {
 		return api.requireAdmin().then((response) => {
-			return api.post(generateOcsUrl(`cloud/users/${userid}/welcome`, 2))
+			return api.post(generateOcsUrl('cloud/users/{userid}/welcome', { userid }))
 				.then(response => true)
 				.catch((error) => { throw error })
 		}).catch((error) => context.commit('API_FAILURE', { userid, error }))

apps/updatenotification/src/components/UpdateNotification.vue

@@ -298,7 +298,7 @@ export default {
 			}
 
 			$.ajax({
-				url: generateOcsUrl('apps/updatenotification/api/v1/applist', 2) + this.newVersion,
+				url: generateOcsUrl('apps/updatenotification/api/v1/applist/{newVersion}', { newVersion: this.newVersion }),
 				type: 'GET',
 				beforeSend(request) {
 					request.setRequestHeader('Accept', 'application/json')
@@ -356,7 +356,7 @@ export default {
 		}.bind(this))
 
 		$.ajax({
-			url: generateOcsUrl('cloud', 2) + '/groups',
+			url: generateOcsUrl('cloud/groups'),
 			dataType: 'json',
 			success: function(data) {
 				const results = []

apps/user_status/src/services/predefinedStatusService.js

@@ -29,7 +29,7 @@ import { generateOcsUrl } from '@nextcloud/router'
  * @returns {Promise<void>}
  */
 const fetchAllPredefinedStatuses = async() => {
-	const url = generateOcsUrl('apps/user_status/api/v1', 2) + '/predefined_statuses?format=json'
+	const url = generateOcsUrl('apps/user_status/api/v1/predefined_statuses?format=json')
 	const response = await HttpClient.get(url)
 
 	return response.data.ocs.data

apps/user_status/src/services/statusService.js

@@ -29,7 +29,7 @@ import { generateOcsUrl } from '@nextcloud/router'
  * @returns {Promise<Object>}
  */
 const fetchCurrentStatus = async() => {
-	const url = generateOcsUrl('apps/user_status/api/v1', 2) + 'user_status'
+	const url = generateOcsUrl('apps/user_status/api/v1/user_status')
 	const response = await HttpClient.get(url)
 
 	return response.data.ocs.data
@@ -42,7 +42,7 @@ const fetchCurrentStatus = async() => {
  * @returns {Promise<void>}
  */
 const setStatus = async(statusType) => {
-	const url = generateOcsUrl('apps/user_status/api/v1', 2) + 'user_status/status'
+	const url = generateOcsUrl('apps/user_status/api/v1/user_status/status')
 	await HttpClient.put(url, {
 		statusType,
 	})
@@ -56,7 +56,7 @@ const setStatus = async(statusType) => {
  * @returns {Promise<void>}
  */
 const setPredefinedMessage = async(messageId, clearAt = null) => {
-	const url = generateOcsUrl('apps/user_status/api/v1', 2) + 'user_status/message/predefined?format=json'
+	const url = generateOcsUrl('apps/user_status/api/v1/user_status/message/predefined?format=json')
 	await HttpClient.put(url, {
 		messageId,
 		clearAt,
@@ -72,7 +72,7 @@ const setPredefinedMessage = async(messageId, clearAt = null) => {
  * @returns {Promise<void>}
  */
 const setCustomMessage = async(message, statusIcon = null, clearAt = null) => {
-	const url = generateOcsUrl('apps/user_status/api/v1', 2) + 'user_status/message/custom?format=json'
+	const url = generateOcsUrl('apps/user_status/api/v1/user_status/message/custom?format=json')
 	await HttpClient.put(url, {
 		message,
 		statusIcon,
@@ -86,7 +86,7 @@ const setCustomMessage = async(message, statusIcon = null, clearAt = null) => {
  * @returns {Promise<void>}
  */
 const clearMessage = async() => {
-	const url = generateOcsUrl('apps/user_status/api/v1', 2) + 'user_status/message?format=json'
+	const url = generateOcsUrl('apps/user_status/api/v1/user_status/message?format=json')
 	await HttpClient.delete(url)
 }
 

apps/weather_status/src/services/weatherStatusService.js

@@ -31,7 +31,7 @@ import { generateOcsUrl } from '@nextcloud/router'
  * @returns {Promise<Object>}
  */
 const setLocation = async(lat, lon) => {
-	const url = generateOcsUrl('apps/weather_status/api/v1', 2) + 'location'
+	const url = generateOcsUrl('apps/weather_status/api/v1/location')
 	const response = await HttpClient.put(url, {
 		address: '',
 		lat,
@@ -47,7 +47,7 @@ const setLocation = async(lat, lon) => {
  * @returns {Promise<Object>}
  */
 const setAddress = async(address) => {
-	const url = generateOcsUrl('apps/weather_status/api/v1', 2) + 'location'
+	const url = generateOcsUrl('apps/weather_status/api/v1/location')
 	const response = await HttpClient.put(url, {
 		address,
 		lat: null,
@@ -63,7 +63,7 @@ const setAddress = async(address) => {
  * @returns {Promise<Object>}
  */
 const setMode = async(mode) => {
-	const url = generateOcsUrl('apps/weather_status/api/v1', 2) + 'mode'
+	const url = generateOcsUrl('apps/weather_status/api/v1/mode')
 	const response = await HttpClient.put(url, {
 		mode,
 	})
@@ -76,7 +76,7 @@ const setMode = async(mode) => {
  * @returns {Promise<Object>}
  */
 const usePersonalAddress = async() => {
-	const url = generateOcsUrl('apps/weather_status/api/v1', 2) + 'use-personal'
+	const url = generateOcsUrl('apps/weather_status/api/v1/use-personal')
 	const response = await HttpClient.put(url)
 
 	return response.data.ocs.data
@@ -88,7 +88,7 @@ const usePersonalAddress = async() => {
  * @returns {Promise<Object>}
  */
 const getLocation = async() => {
-	const url = generateOcsUrl('apps/weather_status/api/v1', 2) + 'location'
+	const url = generateOcsUrl('apps/weather_status/api/v1/location')
 	const response = await HttpClient.get(url)
 
 	return response.data.ocs.data
@@ -101,7 +101,7 @@ const getLocation = async() => {
  * @returns {Promise<Object>}
  */
 const fetchForecast = async() => {
-	const url = generateOcsUrl('apps/weather_status/api/v1', 2) + 'forecast'
+	const url = generateOcsUrl('apps/weather_status/api/v1/forecast')
 	const response = await HttpClient.get(url)
 
 	return response.data.ocs.data
@@ -114,7 +114,7 @@ const fetchForecast = async() => {
  * @returns {Promise<Object>}
  */
 const getFavorites = async() => {
-	const url = generateOcsUrl('apps/weather_status/api/v1', 2) + 'favorites'
+	const url = generateOcsUrl('apps/weather_status/api/v1/favorites')
 	const response = await HttpClient.get(url)
 
 	return response.data.ocs.data
@@ -126,7 +126,7 @@ const getFavorites = async() => {
  * @returns {Promise<Object>}
  */
 const saveFavorites = async(favorites) => {
-	const url = generateOcsUrl('apps/weather_status/api/v1', 2) + 'favorites'
+	const url = generateOcsUrl('apps/weather_status/api/v1/favorites')
 	const response = await HttpClient.put(url, {
 		favorites,
 	})

apps/workflowengine/src/components/Checks/RequestUserGroup.vue

@@ -84,7 +84,7 @@ export default {
 			}
 
 			this.status.isLoading = true
-			return axios.get(generateOcsUrl('cloud', 2) + 'groups/details?limit=20&search=' + encodeURI(searchQuery)).then((response) => {
+			return axios.get(generateOcsUrl('cloud/groups/details?limit=20&search={searchQuery}', { searchQuery })).then((response) => {
 				response.data.ocs.data.groups.forEach((group) => {
 					this.addGroup({
 						id: group.id,

apps/workflowengine/src/helpers/api.js

@@ -28,7 +28,7 @@ import { generateOcsUrl } from '@nextcloud/router'
 const scopeValue = loadState('workflowengine', 'scope') === 0 ? 'global' : 'user'
 
 const getApiUrl = (url) => {
-	return generateOcsUrl('apps/workflowengine/api/v1/workflows', 2) + scopeValue + url + '?format=json'
+	return generateOcsUrl('apps/workflowengine/api/v1/workflows/{scopeValue}', { scopeValue }) + url + '?format=json'
 }
 
 export {

core/src/OCP/appconfig.js

@@ -22,6 +22,7 @@
  */
 
 import $ from 'jquery'
+import { generateOcsUrl } from '@nextcloud/router'
 
 import OC from '../OC/index'
 
@@ -43,7 +44,7 @@ function call(method, endpoint, options) {
 	options = options || {}
 	$.ajax({
 		type: method.toUpperCase(),
-		url: OC.linkToOCS('apps/provisioning_api/api/v1', 2) + 'config/apps' + endpoint,
+		url: generateOcsUrl('apps/provisioning_api/api/v1/config/apps') + endpoint,
 		data: options.data || {},
 		success: options.success,
 		error: options.error,

core/src/OCP/whatsnew.js

@@ -23,15 +23,14 @@
 
 import _ from 'underscore'
 import $ from 'jquery'
-
-import OC from '../OC/index'
+import { generateOcsUrl } from '@nextcloud/router'
 
 export function query(options) {
 	options = options || {}
 	const dismissOptions = options.dismiss || {}
 	$.ajax({
 		type: 'GET',
-		url: options.url || OC.linkToOCS('core', 2) + 'whatsnew?format=json',
+		url: options.url || generateOcsUrl('core/whatsnew?format=json'),
 		success: options.success || function(data, statusText, xhr) {
 			onQuerySuccess(data, statusText, xhr, dismissOptions)
 		},
@@ -43,7 +42,7 @@ export function dismiss(version, options) {
 	options = options || {}
 	$.ajax({
 		type: 'POST',
-		url: options.url || OC.linkToOCS('core', 2) + 'whatsnew',
+		url: options.url || generateOcsUrl('core/whatsnew'),
 		data: { version: encodeURIComponent(version) },
 		success: options.success || onDismissSuccess,
 		error: options.error || onDismissError,

core/src/services/UnifiedSearchService.js

@@ -45,7 +45,7 @@ const createCancelToken = () => axios.CancelToken.source()
  */
 export async function getTypes() {
 	try {
-		const { data } = await axios.get(generateOcsUrl('search', 2) + 'providers', {
+		const { data } = await axios.get(generateOcsUrl('search/providers'), {
 			params: {
 				// Sending which location we're currently at
 				from: window.location.pathname.replace('/index.php', '') + window.location.search,
@@ -76,7 +76,7 @@ export function search({ type, query, cursor }) {
 	 */
 	const cancelToken = createCancelToken()
 
-	const request = async() => axios.get(generateOcsUrl('search', 2) + `providers/${type}/search`, {
+	const request = async() => axios.get(generateOcsUrl('search/providers/{type}/search', { type }), {
 		cancelToken: cancelToken.token,
 		params: {
 			term: query,

package-lock.json

@@ -28986,9 +28986,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"
       }
@@ -29051,6 +29051,35 @@
             "core-js": "^3.11.2",
             "semver": "^7.3.5"
           }
+        },
+        "@nextcloud/router": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-1.2.0.tgz",
+          "integrity": "sha512-kn9QsL9LuhkIMaSSgdiqRL3SZ6PatuAjXUiyq343BbSnI99Oc5eJH8kU6cT2AHije7wKy/tK8Xe3VQuVO32SZQ==",
+          "requires": {
+            "core-js": "^3.6.4"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
@@ -37654,6 +37683,14 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/@nextcloud/browserslist-config/-/browserslist-config-1.0.0.tgz",
           "integrity": "sha512-f+sKpdLZXkODV+OY39K1M+Spmd4RgxmtEXmNn4Bviv4R7uBFHXuw+JX9ZdfDeOryfHjJ/TRQxQEp0GMpBwZFUw=="
+        },
+        "@nextcloud/router": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-1.2.0.tgz",
+          "integrity": "sha512-kn9QsL9LuhkIMaSSgdiqRL3SZ6PatuAjXUiyq343BbSnI99Oc5eJH8kU6cT2AHije7wKy/tK8Xe3VQuVO32SZQ==",
+          "requires": {
+            "core-js": "^3.6.4"
+          }
         }
       }
     },

package.json

@@ -38,7 +38,7 @@
     "@nextcloud/moment": "^1.1.1",
     "@nextcloud/password-confirmation": "^1.0.1",
     "@nextcloud/paths": "^2.0.0",
-    "@nextcloud/router": "^1.1.0",
+    "@nextcloud/router": "^2.0.0",
     "@nextcloud/vue": "^3.10.1",
     "@nextcloud/vue-dashboard": "^2.0.1",
     "autosize": "^5.0.1",