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

src/components/ActivityList.vue

@@ -84,7 +84,7 @@ export default {
 			params.append('object_id', '' + this.objectId)
 			params.append('limit', ACTIVITY_FETCH_LIMIT)
 
-			const response = await axios.get(generateOcsUrl('apps/activity/api/v2/activity') + this.filter + '?' + params)
+			const response = await axios.get(generateOcsUrl(`apps/activity/api/v2/activity/${this.filter}`) + '?' + params)
 			let activities = response.data.ocs.data
 			if (this.filter === 'deck') {
 				// We need to manually filter activities here, since currently we use two different types and there is no way

src/components/card/AttachmentList.vue

@@ -210,7 +210,7 @@ export default {
 						throw new Error(t('files', 'Invalid path selected'))
 					}
 
-					axios.post(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'shares', {
+					axios.post(generateOcsUrl('apps/files_sharing/api/v1/shares'), {
 						path,
 						shareType: 12,
 						shareWith: '' + this.cardId,

src/components/navigation/AppNavigation.vue

@@ -163,7 +163,7 @@ export default {
 		if (this.isAdmin) {
 			this.groupLimit = this.$store.getters.config('groupLimit')
 			this.groupLimitDisabled = false
-			axios.get(generateOcsUrl('cloud', 2) + 'groups').then((response) => {
+			axios.get(generateOcsUrl('cloud/groups')).then((response) => {
 				this.groups = response.data.ocs.data.groups.reduce((obj, item) => {
 					obj.push({
 						id: item,

src/components/search/GlobalSearchResults.vue

@@ -63,7 +63,7 @@ const createCancelToken = () => axios.CancelToken.source()
 function search({ query, cursor }) {
 	const cancelToken = createCancelToken()
 
-	const request = async() => axios.get(generateOcsUrl('apps/deck/api/v1.0', 2) + '/search', {
+	const request = async() => axios.get(generateOcsUrl('apps/deck/api/v1.0/search'), {
 		cancelToken: cancelToken.token,
 		params: {
 			term: query,