Update api-client.ts

src/lib/api-client.ts

@@ -17,7 +17,7 @@ async function request<T>(
   endpoint: string,
   options: RequestInit & { params?: Record<string, string> } = {}
 ): Promise<T> {
-  const { params, headers, ...config } = options;
+  const { params, headers: customHeaders, ...config } = options;
 
   // 1. Construct URL with Search Params
   const url = new URL(`${BASE_URL}${endpoint}`);
@@ -28,20 +28,38 @@ async function request<T>(
   // 2. Token Retrieval (Direct localStorage for non-React context utility)
   const token = typeof window !== "undefined" ? localStorage.getItem("token") : null;
 
-  // 3. Header Synthesis
-  const authHeader = token ? { Authorization: `Bearer ${token}` } : {};
-  
-  // Don't set Content-Type if sending FormData (browser handles it)
+  // 3. Header Synthesis - Build headers as Record<string, string>
+  const headers: Record<string, string> = {};
+
+  // Add Content-Type if not FormData
   const isFormData = config.body instanceof FormData;
-  const contentTypeHeader = isFormData ? {} : { "Content-Type": "application/json" };
+  if (!isFormData) {
+    headers["Content-Type"] = "application/json";
+  }
+
+  // Add Authorization if token exists
+  if (token) {
+    headers["Authorization"] = `Bearer ${token}`;
+  }
+
+  // Merge custom headers
+  if (customHeaders) {
+    if (customHeaders instanceof Headers) {
+      customHeaders.forEach((value, key) => {
+        headers[key] = value;
+      });
+    } else if (Array.isArray(customHeaders)) {
+      customHeaders.forEach(([key, value]) => {
+        headers[key] = value;
+      });
+    } else {
+      Object.assign(headers, customHeaders as Record<string, string>);
+    }
+  }
 
   const finalConfig: RequestInit = {
     ...config,
-    headers: {
-      ...contentTypeHeader,
-      ...authHeader,
-      ...headers,
-    },
+    headers,
   };
 
   try {