fix: header auth

Signed-off-by: Innei <[email protected]>
Innei · Oct 24, 2024 · 7a3aab6 · 7a3aab6
1 parent 3786f61
commit 7a3aab6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/packages/fetch/src/fetch.client.ts b/packages/fetch/src/fetch.client.ts
@@ -26,12 +26,19 @@ export const $fetch = createFetch({
     headers: globalConfigureHeader,
     onRequest(context) {
       const token = getToken()
-      const headers: any = context.options.headers ?? {}
+      // eslint-disable-next-line prefer-destructuring
+      let headers: any = context.options.headers
+      if (headers && headers instanceof Headers) {
+        headers = Object.fromEntries(headers.entries())
+      } else {
+        headers = {}
+      }
+
       if (token) {
-        headers['Authorization'] = `bearer ${token}`
+        headers.Authorization = `bearer ${token}`
       }
 
-      headers['x-session-uuid'] =
+      headers['X-Session-Uuid'] =
         globalThis?.sessionStorage?.getItem(uuidStorageKey) ?? uuid
 
       context.options.params ??= {}

diff --git a/packages/fetch/src/fetch.server.ts b/packages/fetch/src/fetch.server.ts
@@ -18,7 +18,13 @@ export const $fetch = createFetch({
 
       const token = cookie.get(TokenKey)?.value
 
-      const headers: any = context.options.headers ?? {}
+      // eslint-disable-next-line prefer-destructuring
+      let headers: any = context.options.headers
+      if (headers && headers instanceof Headers) {
+        headers = Object.fromEntries(headers.entries())
+      } else {
+        headers = {}
+      }
       if (token) {
         headers['Authorization'] = `bearer ${token}`
       }