fix test issues
Build & Deploy / Build & Push Docker Image (push) Successful in 3m1s
Test / Type Check (all packages) (push) Successful in 55s
Build & Deploy / Deploy to VPS (push) Successful in 5s
Test / API Unit Tests (push) Successful in 47s
Test / Homepage Unit Tests (push) Successful in 42s
Test / Carplace Unit Tests (push) Successful in 42s
Test / Admin Unit Tests (push) Successful in 40s
Test / Dashboard Unit Tests (push) Successful in 41s
Test / API Integration Tests (push) Successful in 1m0s

This commit is contained in:
root
2026-07-02 18:50:03 -04:00
parent e3f40410e9
commit f330efb1ad
8 changed files with 102 additions and 21 deletions
+12 -9
View File
@@ -1,15 +1,18 @@
function normalizeApiBase(value: string): string {
export function normalizeApiBase(value: string): string {
const base = value.replace(/\/+$/, '')
if (/\/api$/.test(base)) return `${base}/v1`
return /\/api\/v1$/.test(base) ? base : `${base}/api/v1`
}
export const API_BASE = normalizeApiBase(
typeof window === 'undefined'
export function resolveApiBase(): string {
const value = typeof window === 'undefined'
? (process.env.API_INTERNAL_URL || 'http://localhost:4000/api/v1')
: (process.env.NEXT_PUBLIC_DASHBOARD_DIRECT_API === 'true' && process.env.NEXT_PUBLIC_API_URL
? process.env.NEXT_PUBLIC_API_URL
: '/dashboard/api/v1'),
)
: (process.env.NEXT_PUBLIC_API_URL || '/dashboard/api/v1')
return normalizeApiBase(value)
}
export const API_BASE = resolveApiBase()
export const EMPLOYEE_PROFILE_KEY = 'employee_profile'
@@ -24,7 +27,7 @@ export async function apiFetch<T>(path: string, options?: RequestInit): Promise<
headers['Content-Type'] = 'application/json'
}
const res = await fetch(`${API_BASE}${path}`, {
const res = await fetch(`${resolveApiBase()}${path}`, {
...options,
headers,
credentials: 'include',
@@ -49,7 +52,7 @@ export async function apiFetch<T>(path: string, options?: RequestInit): Promise<
export async function apiFetchServer<T>(path: string, token: string, options?: RequestInit): Promise<T> {
const isFormData = typeof FormData !== 'undefined' && options?.body instanceof FormData
const res = await fetch(`${API_BASE}${path}`, {
const res = await fetch(`${resolveApiBase()}${path}`, {
...options,
headers: {
...(isFormData ? {} : { 'Content-Type': 'application/json' }),