Merge pull request #192 from manchenkoff/fix-ofetch-headers-normaliza…

…tion

fix: use normalized ofetch headers

package.json

@@ -49,6 +49,7 @@
     "changelogen": "^0.5.5",
     "eslint": "^9.9.1",
     "nuxt": "^3.13.2",
+    "ofetch": "^1.4.0",
     "typescript": "^5.5.4",
     "vitest": "^2.0.5",
     "vue-tsc": "^2.1.2"

src/runtime/httpFactory.ts

@@ -81,7 +81,7 @@ export function createHttpClient(nuxtApp: NuxtApp, logger: ConsolaInstance): $Fe
 
       logger.trace(
         `Request headers for "${context.request.toString()}"`,
-        context.options.headers,
+        Object.fromEntries(context.options.headers.entries()),
       )
     },
 
@@ -94,7 +94,7 @@ export function createHttpClient(nuxtApp: NuxtApp, logger: ConsolaInstance): $Fe
 
       logger.trace(
         `Response headers for "${context.request.toString()}"`,
-        context.response?.headers,
+        context.response ? Object.fromEntries(context.response.headers.entries()) : {},
       )
     },
 

src/runtime/interceptors/common/request.ts

@@ -1,5 +1,6 @@
 import type { FetchContext } from 'ofetch'
 import type { ConsolaInstance } from 'consola'
+import { appendRequestHeaders } from '../../utils/headers'
 import type { NuxtApp } from '#app'
 
 /**
@@ -16,10 +17,7 @@ export default async function handleRequestHeaders(
   const method = ctx.options.method?.toLowerCase() ?? 'get'
   const headersToAdd = { Accept: 'application/json' }
 
-  ctx.options.headers = Object.assign(
-    ctx.options.headers || {},
-    headersToAdd,
-  )
+  ctx.options.headers = appendRequestHeaders(ctx.options.headers, headersToAdd)
 
   // https://laravel.com/docs/10.x/routing#form-method-spoofing
   if (method === 'put' && ctx.options.body instanceof FormData) {

src/runtime/interceptors/cookie/request.ts

@@ -2,6 +2,7 @@ import type { FetchContext } from 'ofetch'
 import type { ConsolaInstance } from 'consola'
 import { useSanctumConfig } from '../../composables/useSanctumConfig'
 import type { ModuleOptions } from '../../types/options'
+import { appendRequestHeaders } from '../../utils/headers'
 import { type NuxtApp, useCookie, useRequestHeaders, useRequestURL } from '#app'
 
 const SECURE_METHODS = new Set(['post', 'delete', 'put', 'patch'])
@@ -15,10 +16,10 @@ const COOKIE_OPTIONS: { readonly: true } = { readonly: true }
  * @returns Headers collection to pass to the API
  */
 function useServerHeaders(
-  headers: HeadersInit | undefined,
+  headers: Headers,
   config: ModuleOptions,
   logger: ConsolaInstance,
-): HeadersInit {
+): Headers {
   const clientHeaders = useRequestHeaders(['cookie', 'user-agent'])
   const origin = config.origin ?? useRequestURL().origin
 
@@ -34,7 +35,7 @@ function useServerHeaders(
     Object.keys(headersToAdd),
   )
 
-  return Object.assign(headers || {}, headersToAdd)
+  return appendRequestHeaders(headers, headersToAdd)
 }
 
 /**
@@ -67,10 +68,10 @@ async function initCsrfCookie(
  * @returns Headers collection to pass to the API
  */
 async function useCsrfHeader(
-  headers: HeadersInit | undefined,
+  headers: Headers,
   config: ModuleOptions,
   logger: ConsolaInstance,
-): Promise<HeadersInit> {
+): Promise<Headers> {
   if (config.csrf.cookie === undefined) {
     throw new Error('`sanctum.csrf.cookie` is not defined')
   }
@@ -88,14 +89,14 @@ async function useCsrfHeader(
 
   if (!csrfToken.value) {
     logger.warn(`${config.csrf.cookie} cookie is missing, unable to set ${config.csrf.header} header`)
-    return headers || {}
+    return headers
   }
 
   const headersToAdd = { [config.csrf.header]: csrfToken.value }
 
   logger.debug(`[request] added csrf token header`, Object.keys(headersToAdd))
 
-  return Object.assign(headers || {}, headersToAdd)
+  return appendRequestHeaders(headers, headersToAdd)
 }
 
 /**

src/runtime/interceptors/token/request.ts

@@ -1,6 +1,7 @@
 import type { FetchContext } from 'ofetch'
 import type { ConsolaInstance } from 'consola'
 import { useSanctumAppConfig } from '../../composables/useSanctumAppConfig'
+import { appendRequestHeaders } from '../../utils/headers'
 import type { NuxtApp } from '#app'
 
 /**
@@ -34,5 +35,5 @@ export default async function handleRequestTokenHeader(
     Object.keys(headersToAdd),
   )
 
-  ctx.options.headers = Object.assign(ctx.options.headers || {}, headersToAdd)
+  ctx.options.headers = appendRequestHeaders(ctx.options.headers, headersToAdd)
 }

src/runtime/utils/headers.ts

@@ -0,0 +1,7 @@
+export function appendRequestHeaders(headers: Headers, append: Record<string, string>): Headers {
+  for (const [key, value] of Object.entries(append)) {
+    headers.set(key, value)
+  }
+
+  return headers
+}