Merge remote-tracking branch 'origin/master'

ui/src/services/api.js

@@ -3,11 +3,14 @@ import axios from 'axios'
 import qs from 'qs'
 import { useAuthStore } from 'stores/authStore'
 
+export const API_BASE_URL = process.env.VITE_API_BASE_URL || '/api'
+
 const api = axios.create({
-  baseURL: 'http://localhost:8080/api',
+  baseURL: API_BASE_URL,
   timeout: 180000,
   paramsSerializer: params =>
-    qs.stringify(params, { arrayFormat: 'repeat' })
+    qs.stringify(params, { arrayFormat: 'repeat' }),
+  withCredentials: true
 })
 
 // REQUEST
@@ -21,7 +24,6 @@ api.interceptors.request.use((config) => {
     url.startsWith('/password/forgot') ||
     url.startsWith('/password/reset')
 
-
   if (!isPublic && auth?.token) {
     config.headers ||= {}
     config.headers.Authorization = `Bearer ${auth.token}`
@@ -32,6 +34,7 @@ api.interceptors.request.use((config) => {
 
 // RESPONSE
 let isLoggingOut = false
+
 api.interceptors.response.use(
   r => r,
   async (error) => {
@@ -47,7 +50,6 @@ api.interceptors.response.use(
   }
 )
 
-// HELPERS
 export const get = (u, p = {}, c = {}) =>
   api.get(u, { params: p, ...c }).then(r => r.data)
 
@@ -61,7 +63,6 @@ export const del = (u, p = {}, c = {}) =>
   api.delete(u, { params: p, ...c }).then(r => r.data)
 
 export const download = (u, p = {}, c = {}) =>
-  api.get(u, { params: p, responseType: 'blob', ...c })
-    .then(r => r.data)
+  api.get(u, { params: p, responseType: 'blob', ...c }).then(r => r.data)
 
 export default api