From 5ea056ee05d9efd8010b2238ef9183ecf9e7ccc0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Apr 2021 13:13:19 +0000 Subject: [PATCH 1/2] 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] --- package-lock.json | 43 +++++++++++++++++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1e00889d5..dda9071a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4791,17 +4791,17 @@ } }, "@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" }, "dependencies": { "core-js": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz", - "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==" + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.1.tgz", + "integrity": "sha512-pwCxEXnj27XG47mu7SXAwhLP3L5CrlvCB91ANUkIz40P27kUcvNfSdvyZJ9CLHiVoKSp+TTChMQMSKQEH/IQxA==" } } }, @@ -4847,6 +4847,14 @@ "vue2-datepicker": "^3.6.3" }, "dependencies": { + "@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" + } + }, "@types/json-schema": { "version": "7.0.7", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz", @@ -4950,6 +4958,16 @@ "vue-multiselect": "^2.1.6", "vue-visible": "^1.0.2", "vue2-datepicker": "^3.6.2" + }, + "dependencies": { + "@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" + } + } } }, "core-js": { @@ -16743,6 +16761,19 @@ "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" + } + }, + "core-js": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.1.tgz", + "integrity": "sha512-pwCxEXnj27XG47mu7SXAwhLP3L5CrlvCB91ANUkIz40P27kUcvNfSdvyZJ9CLHiVoKSp+TTChMQMSKQEH/IQxA==" } } }, diff --git a/package.json b/package.json index b95f3f044..8c12a05a5 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@nextcloud/initial-state": "^1.2.0", "@nextcloud/l10n": "^1.4.1", "@nextcloud/moment": "^1.1.1", - "@nextcloud/router": "^1.2.0", + "@nextcloud/router": "^2.0.0", "@nextcloud/vue": "^3.9.0", "@nextcloud/vue-dashboard": "^1.1.0", "blueimp-md5": "^2.18.0", From 6fb99df3e481b2de06d304149705edc631406e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 14 Apr 2021 16:18:10 +0200 Subject: [PATCH 2/2] Adjust generateOcsUrl calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- src/components/ActivityList.vue | 2 +- src/components/card/AttachmentList.vue | 2 +- src/components/navigation/AppNavigation.vue | 2 +- src/components/search/GlobalSearchResults.vue | 2 +- src/services/CommentApi.js | 8 ++++---- src/services/OverviewApi.js | 2 +- src/services/SharingApi.js | 2 +- src/store/main.js | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/ActivityList.vue b/src/components/ActivityList.vue index 7e976bd58..597058527 100644 --- a/src/components/ActivityList.vue +++ b/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 diff --git a/src/components/card/AttachmentList.vue b/src/components/card/AttachmentList.vue index 2de92cc23..ce24850b0 100644 --- a/src/components/card/AttachmentList.vue +++ b/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, diff --git a/src/components/navigation/AppNavigation.vue b/src/components/navigation/AppNavigation.vue index 028a20678..d5d97ecc6 100644 --- a/src/components/navigation/AppNavigation.vue +++ b/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, diff --git a/src/components/search/GlobalSearchResults.vue b/src/components/search/GlobalSearchResults.vue index 951e9a0d3..b8de8d5c1 100644 --- a/src/components/search/GlobalSearchResults.vue +++ b/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, diff --git a/src/services/CommentApi.js b/src/services/CommentApi.js index e2c048f1e..dae7b3e77 100644 --- a/src/services/CommentApi.js +++ b/src/services/CommentApi.js @@ -31,7 +31,7 @@ export class CommentApi { } async loadComments({ cardId, limit, offset }) { - const api = await axios.get(generateOcsUrl('apps/deck/api/v1.0/cards', 2) + `${cardId}/comments`, { + const api = await axios.get(generateOcsUrl(`apps/deck/api/v1.0/cards${cardId}/comments`), { params: { limit, offset }, headers: { 'OCS-APIRequest': 'true' }, }) @@ -39,7 +39,7 @@ export class CommentApi { } async createComment({ cardId, comment, replyTo }) { - const api = await axios.post(generateOcsUrl('apps/deck/api/v1.0/cards', 2) + `${cardId}/comments`, { + const api = await axios.post(generateOcsUrl(`apps/deck/api/v1.0/cards/${cardId}/comments`), { message: `${comment}`, parentId: replyTo ? replyTo.id : null, }) @@ -47,14 +47,14 @@ export class CommentApi { } async updateComment({ cardId, id, comment }) { - const api = await axios.put(generateOcsUrl('apps/deck/api/v1.0/cards', 2) + `${cardId}/comments/${id}`, { + const api = await axios.put(generateOcsUrl(`apps/deck/api/v1.0/cards/${cardId}/comments/${id}`), { message: `${comment}`, }) return api.data.ocs.data } async deleteComment({ cardId, id }) { - const api = await axios.delete(generateOcsUrl('apps/deck/api/v1.0/cards', 2) + `${cardId}/comments/${id}`) + const api = await axios.delete(generateOcsUrl(`apps/deck/api/v1.0/cards/${cardId}/comments/${id}`)) return api.data.ocs.data } diff --git a/src/services/OverviewApi.js b/src/services/OverviewApi.js index 3210e2bfd..c9981fb56 100644 --- a/src/services/OverviewApi.js +++ b/src/services/OverviewApi.js @@ -26,7 +26,7 @@ import { generateOcsUrl } from '@nextcloud/router' export class OverviewApi { url(url) { - return generateOcsUrl('apps/deck/api/v1.0') + url + return generateOcsUrl(`apps/deck/api/v1.0/${url}`) } get(filter) { diff --git a/src/services/SharingApi.js b/src/services/SharingApi.js index fd60957ff..cacbe7e3a 100644 --- a/src/services/SharingApi.js +++ b/src/services/SharingApi.js @@ -22,7 +22,7 @@ import axios from '@nextcloud/axios' import { generateOcsUrl } from '@nextcloud/router' -const shareUrl = generateOcsUrl('apps/files_sharing/api/v1', 2) + 'shares' +const shareUrl = generateOcsUrl('apps/files_sharing/api/v1/shares') const createShare = async function({ path, permissions, shareType, shareWith, publicUpload, password, sendPasswordByTalk, expireDate, label }) { try { diff --git a/src/store/main.js b/src/store/main.js index c5562eaf3..45e620d36 100644 --- a/src/store/main.js +++ b/src/store/main.js @@ -317,7 +317,7 @@ export default new Vuex.Store({ async setConfig({ commit }, config) { for (const key in config) { try { - await axios.post(generateOcsUrl('apps/deck/api/v1.0/config') + key, { + await axios.post(generateOcsUrl(`apps/deck/api/v1.0/config/${key}`), { value: config[key], }) commit('SET_CONFIG', { key, value: config[key] }) @@ -421,7 +421,7 @@ export default new Vuex.Store({ params.append('perPage', 20) params.append('itemType', [0, 1, 4, 7]) - const response = await axios.get(generateOcsUrl('apps/files_sharing/api/v1') + 'sharees', { params }) + const response = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees'), { params }) commit('setSharees', response.data.ocs.data) },