diff --git a/src/http-common/index.js b/src/http-common/index.js index 66835fc5f..e6c116cd6 100644 --- a/src/http-common/index.js +++ b/src/http-common/index.js @@ -1,7 +1,18 @@ import axios from 'axios' +import {getToken} from '@/helpers/auth' -export const HTTPFactory = () => { +export function HTTPFactory() { return axios.create({ baseURL: window.API_URL, }) } + +export function AuthenticatedHTTPFactory(token = getToken()) { + return axios.create({ + baseURL: window.API_URL, + headers: { + Authorization: `Bearer ${token}`, + 'Content-Type': 'application/json', + }, + }) +} diff --git a/src/store/modules/auth.js b/src/store/modules/auth.js index 9e2f9cbb8..99291a2a9 100644 --- a/src/store/modules/auth.js +++ b/src/store/modules/auth.js @@ -1,4 +1,4 @@ -import {HTTPFactory} from '@/http-common' +import {HTTPFactory, AuthenticatedHTTPFactory} from '@/http-common' import {i18n, getCurrentLanguage, saveLanguage} from '@/i18n' import {objectToSnakeCase} from '@/helpers/case' import {LOADING} from '../mutation-types' @@ -215,13 +215,9 @@ export default { return } - const HTTP = HTTPFactory() + const HTTP = AuthenticatedHTTPFactory(jwt) try { - const response = await HTTP.get('user', { - headers: { - Authorization: `Bearer ${jwt}`, - }, - }) + const response = await HTTP.get('user') const info = new UserModel(response.data) info.type = state.info.type info.email = state.info.email