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>

4 files changed, 26 insertions, 27 deletions

diff --git a/apps/settings/src/components/AdminTwoFactor.vue b/apps/settings/src/components/AdminTwoFactor.vue
index ea9d6f97fde..2f568913124 100644
--- a/apps/settings/src/components/AdminTwoFactor.vue
+++ b/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))) })
diff --git a/apps/settings/src/service/PersonalInfoService.js b/apps/settings/src/service/PersonalInfoService.js
index d033666817f..f5c010f5377 100644
--- a/apps/settings/src/service/PersonalInfoService.js
+++ b/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()
 
diff --git a/apps/settings/src/store/oc.js b/apps/settings/src/store/oc.js
index 153c16570cd..a6d3bffc34e 100644
--- a/apps/settings/src/store/oc.js
+++ b/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 }))
 	},
diff --git a/apps/settings/src/store/users.js b/apps/settings/src/store/users.js
index e07fccd9d5b..475486d6c40 100644
--- a/apps/settings/src/store/users.js
+++ b/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 }))