diff --git a/packages/nc-gui/components/project/graphqlClient.vue b/packages/nc-gui/components/project/graphqlClient.vue index 15669720c9..085f8bcd1a 100644 --- a/packages/nc-gui/components/project/graphqlClient.vue +++ b/packages/nc-gui/components/project/graphqlClient.vue @@ -56,7 +56,7 @@ export default { async created() { if (this.$store.state.graphqlClient.list && this.$store.state.graphqlClient.list[0]) { this.webViewUrl = this.url = this.$store.state.graphqlClient.list[0].url } try { - const { info } = (await this.$axios.get(`${this.$axios.defaults.baseURL}/nc/${this.$route.params.project_id}/projectApiInfo`, { + const { info } = (await this.$axios.get(`/nc/${this.$route.params.project_id}/projectApiInfo`, { headers: { 'xc-auth': this.$store.state.users.token } diff --git a/packages/nc-gui/components/project/spreadsheet/apis/gqlApi.js b/packages/nc-gui/components/project/spreadsheet/apis/gqlApi.js index 59b66ab9d9..197fe85a52 100644 --- a/packages/nc-gui/components/project/spreadsheet/apis/gqlApi.js +++ b/packages/nc-gui/components/project/spreadsheet/apis/gqlApi.js @@ -27,7 +27,7 @@ export default class GqlApi { post(url, params) { return this.$axios({ - url: `${this.$axios.defaults.baseURL}${url}`, + url: `${url}`, method: 'post', data: params }) diff --git a/packages/nc-gui/components/project/swaggerClient.vue b/packages/nc-gui/components/project/swaggerClient.vue index 38a3dbf24e..e0fab6d64b 100644 --- a/packages/nc-gui/components/project/swaggerClient.vue +++ b/packages/nc-gui/components/project/swaggerClient.vue @@ -57,7 +57,7 @@ export default { // if (this.$store.state.graphqlClient.list && this.$store.state.graphqlClient.list[0]) // this.webViewUrl = this.url = this.$store.state.graphqlClient.list[0].url; try { - const { info } = (await this.$axios.get(`${this.$axios.defaults.baseURL}/nc/${this.$route.params.project_id}/projectApiInfo`, { + const { info } = (await this.$axios.get(`/nc/${this.$route.params.project_id}/projectApiInfo`, { headers: { 'xc-auth': this.$store.state.users.token } diff --git a/packages/nc-gui/components/project/xcInfo.vue b/packages/nc-gui/components/project/xcInfo.vue index fff166a0ab..4035c73fe3 100644 --- a/packages/nc-gui/components/project/xcInfo.vue +++ b/packages/nc-gui/components/project/xcInfo.vue @@ -290,7 +290,7 @@ export default { methods: { async loadProjectApiInfo() { try { - const { info, aggregatedInfo } = (await this.$axios.get(`${this.$axios.defaults.baseURL}/nc/${this.$route.params.project_id}/projectApiInfo`, { + const { info, aggregatedInfo } = (await this.$axios.get(`/nc/${this.$route.params.project_id}/projectApiInfo`, { headers: { 'xc-auth': this.$store.state.users.token } diff --git a/packages/nc-gui/layouts/default.vue b/packages/nc-gui/layouts/default.vue index 445fe74d84..997e63b2ac 100644 --- a/packages/nc-gui/layouts/default.vue +++ b/packages/nc-gui/layouts/default.vue @@ -677,7 +677,7 @@ export default { async loadProjectInfo() { if (this.$route.params.project_id) { try { - const { info } = (await this.$axios.get(`${this.$axios.defaults.baseURL}/nc/${this.$route.params.project_id}/projectApiInfo`, { + const { info } = (await this.$axios.get(`/nc/${this.$route.params.project_id}/projectApiInfo`, { headers: { 'xc-auth': this.$store.state.users.token } diff --git a/packages/nc-gui/plugins/axiosInterceptor.js b/packages/nc-gui/plugins/axiosInterceptor.js index 8d22a946dc..0ffc8fd5aa 100644 --- a/packages/nc-gui/plugins/axiosInterceptor.js +++ b/packages/nc-gui/plugins/axiosInterceptor.js @@ -39,7 +39,7 @@ export default ({ store, $axios, redirect, $toast }) => { } // Logout user if token refresh didn't work or user is disabled - if (error.config.url === '/api/v1/auth/refresh-token') { + if (error.config.url === '/auth/refresh-token') { store.dispatch('users/ActSignOut') return new Promise((resolve, reject) => { @@ -48,7 +48,7 @@ export default ({ store, $axios, redirect, $toast }) => { } // Try request again with new token - return $axios.post('/api/v1/auth/refresh-token', null, { + return $axios.post('/auth/refresh-token', null, { withCredentials: true }) .then((token) => { diff --git a/packages/nc-gui/plugins/ncApis/gqlApi.js b/packages/nc-gui/plugins/ncApis/gqlApi.js index 9672616c30..9760c9ac9a 100644 --- a/packages/nc-gui/plugins/ncApis/gqlApi.js +++ b/packages/nc-gui/plugins/ncApis/gqlApi.js @@ -31,7 +31,7 @@ export default class GqlApi { post(url, params) { return this.$axios({ - url: `${this.$axios.defaults.baseURL}${url}`, + url: `${url}`, method: 'post', data: params })