diff --git a/src/main/client/app/main.js b/src/main/client/app/main.js index c9214763d..a191336c7 100644 --- a/src/main/client/app/main.js +++ b/src/main/client/app/main.js @@ -4,6 +4,7 @@ import VueFormWizard from 'vue-form-wizard'; import fontawesomeConfig from '@/shared/config/fontawesome-config'; import bootstrapVueConfig from '@/shared/config/bootstrap-vue-config'; +import axiosConfig from '@/shared/config/axios-config'; import initFilters from '@/shared/filters'; @@ -29,6 +30,9 @@ Vue.component('app-default-layout', AppDefaultLayout); Vue.component('app-error-layout', AppErrorLayout); Vue.component('app-none-layout', AppNoneLayout); +// axios +axiosConfig.init(); + Vue.config.productionTip = false; new Vue({ diff --git a/src/main/client/app/shared/api/authentication-api.js b/src/main/client/app/shared/api/authentication-api.js index 6e3c0fab7..eee9721fa 100644 --- a/src/main/client/app/shared/api/authentication-api.js +++ b/src/main/client/app/shared/api/authentication-api.js @@ -2,19 +2,10 @@ import axios from 'axios'; export const doLogin = async (formData) => axios.post('/auth/classic', formData); -export const listProviders = async () => { - const resp = await axios.get('/auth/providers'); - return resp.data; -}; +export const listProviders = async () => axios.get('/auth/providers'); -export const getUser = async () => { - const resp = await axios.get('/auth/user'); - return resp.data; -}; +export const getUser = async () => axios.get('/auth/user'); -export const getAuthorities = async () => { - const resp = await axios.get('/auth/authorities'); - return resp.data; -}; +export const getAuthorities = async () => axios.get('/auth/authorities'); export const doLogout = async () => axios.post('/auth/logout'); diff --git a/src/main/client/app/shared/api/build-infos-api.js b/src/main/client/app/shared/api/build-infos-api.js index db2e39102..6c486a604 100644 --- a/src/main/client/app/shared/api/build-infos-api.js +++ b/src/main/client/app/shared/api/build-infos-api.js @@ -1,6 +1,3 @@ import axios from 'axios'; -export const getBuildInfo = async () => { - const resp = await axios.get('/build-info'); - return resp.data; -}; +export const getBuildInfo = async () => axios.get('/build-info'); diff --git a/src/main/client/app/shared/api/dashboard-api.js b/src/main/client/app/shared/api/dashboard-api.js index af545762c..75754d9a8 100644 --- a/src/main/client/app/shared/api/dashboard-api.js +++ b/src/main/client/app/shared/api/dashboard-api.js @@ -1,6 +1,3 @@ import axios from 'axios'; -export const getSummary = async () => { - const resp = await axios.get('/api/dashboard/summary'); - return resp.data; -}; +export const getSummary = async () => axios.get('/api/dashboard/summary'); diff --git a/src/main/client/app/shared/api/modules-api.js b/src/main/client/app/shared/api/modules-api.js index a4cd592cc..95376dd13 100644 --- a/src/main/client/app/shared/api/modules-api.js +++ b/src/main/client/app/shared/api/modules-api.js @@ -1,23 +1,11 @@ import axios from 'axios'; -export const getModules = async () => { - const resp = await axios.get('/api/modules'); - return resp.data; -}; +export const getModules = async () => axios.get('/api/modules'); -export const getModule = async (moduleId) => { - const resp = await axios.get(`/api/modules/${moduleId}`); - return resp.data; -}; +export const getModule = async (moduleId) => axios.get(`/api/modules/${moduleId}`); -export const getModuleReadme = async (moduleId) => { - const resp = await axios.get(`/api/modules/${moduleId}/readme`); - return resp.data; -}; +export const getModuleReadme = async (moduleId) => axios.get(`/api/modules/${moduleId}/readme`); export const updateModule = async (module) => axios.put(`/api/modules/${module.id}`, module); -export const createModule = async (module) => { - const resp = await axios.post('/api/modules', module); - return resp.data; -}; +export const createModule = async (module) => axios.post('/api/modules', module); diff --git a/src/main/client/app/shared/api/registries-api.js b/src/main/client/app/shared/api/registries-api.js index aec2bf7e4..a97808bd9 100644 --- a/src/main/client/app/shared/api/registries-api.js +++ b/src/main/client/app/shared/api/registries-api.js @@ -1,11 +1,7 @@ import axios from 'axios'; -export const getRegistriesRepositories = async (registry) => { - const resp = await axios.get(`/api/registries/${registry}/repositories`); - return resp.data; -}; +export const getRegistriesRepositories = async (registry) => axios.get(`/api/registries/${registry}/repositories`); -export const importRegistryRepository = async (registry, id) => { - const resp = await axios.post(`/api/registries/${registry}/repositories/${id}/import`); - return resp.data; -}; +export const importRegistryRepository = async (registry, id) => axios.post( + `/api/registries/${registry}/repositories/${id}/import`, +); diff --git a/src/main/client/app/shared/api/settings-api.js b/src/main/client/app/shared/api/settings-api.js index 4f8ace38f..59b5cd8dd 100644 --- a/src/main/client/app/shared/api/settings-api.js +++ b/src/main/client/app/shared/api/settings-api.js @@ -1,8 +1,5 @@ import axios from 'axios'; -export const getSettings = async () => { - const resp = await axios.get('/api/settings'); - return resp.data; -}; +export const getSettings = async () => axios.get('/api/settings'); export const saveSettings = async (settings) => axios.put('/api/settings', settings); diff --git a/src/main/client/app/shared/api/stacks-api.js b/src/main/client/app/shared/api/stacks-api.js index 49e6e76d8..b3650d203 100644 --- a/src/main/client/app/shared/api/stacks-api.js +++ b/src/main/client/app/shared/api/stacks-api.js @@ -1,6 +1,3 @@ import axios from 'axios'; -export const createStack = async (stack) => { - const resp = await axios.post('/api/stacks', stack); - return resp.data; -}; +export const createStack = async (stack) => axios.post('/api/stacks', stack); diff --git a/src/main/client/app/shared/api/teams-api.js b/src/main/client/app/shared/api/teams-api.js index 06f6ab802..55bab4c35 100644 --- a/src/main/client/app/shared/api/teams-api.js +++ b/src/main/client/app/shared/api/teams-api.js @@ -1,6 +1,3 @@ import axios from 'axios'; -export const getTeams = async () => { - const resp = await axios.get('/api/teams'); - return resp.data; -}; +export const getTeams = async () => axios.get('/api/teams'); diff --git a/src/main/client/app/shared/api/users-api.js b/src/main/client/app/shared/api/users-api.js index ef6306471..b3376ff9b 100644 --- a/src/main/client/app/shared/api/users-api.js +++ b/src/main/client/app/shared/api/users-api.js @@ -1,8 +1,5 @@ import axios from 'axios'; -export const getUsers = async () => { - const resp = await axios.get('/api/users'); - return resp.data; -}; +export const getUsers = async () => axios.get('/api/users'); export const updateUser = async (user) => axios.put(`/api/users/${user.id}`, user); diff --git a/src/main/client/app/shared/config/axios-config.js b/src/main/client/app/shared/config/axios-config.js new file mode 100644 index 000000000..cafd1f495 --- /dev/null +++ b/src/main/client/app/shared/config/axios-config.js @@ -0,0 +1,10 @@ +import axios from 'axios'; + +export default { + init: () => { + axios.interceptors.response.use( + (response) => response.data, + (error) => Promise.reject(error.response.data), + ); + }, +};