Skip to content

Commit 7a3aab6

Browse files
committed
fix: header auth
Signed-off-by: Innei <[email protected]>
1 parent 3786f61 commit 7a3aab6

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

packages/fetch/src/fetch.client.ts

+10-3
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,19 @@ export const $fetch = createFetch({
2626
headers: globalConfigureHeader,
2727
onRequest(context) {
2828
const token = getToken()
29-
const headers: any = context.options.headers ?? {}
29+
// eslint-disable-next-line prefer-destructuring
30+
let headers: any = context.options.headers
31+
if (headers && headers instanceof Headers) {
32+
headers = Object.fromEntries(headers.entries())
33+
} else {
34+
headers = {}
35+
}
36+
3037
if (token) {
31-
headers['Authorization'] = `bearer ${token}`
38+
headers.Authorization = `bearer ${token}`
3239
}
3340

34-
headers['x-session-uuid'] =
41+
headers['X-Session-Uuid'] =
3542
globalThis?.sessionStorage?.getItem(uuidStorageKey) ?? uuid
3643

3744
context.options.params ??= {}

packages/fetch/src/fetch.server.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@ export const $fetch = createFetch({
1818

1919
const token = cookie.get(TokenKey)?.value
2020

21-
const headers: any = context.options.headers ?? {}
21+
// eslint-disable-next-line prefer-destructuring
22+
let headers: any = context.options.headers
23+
if (headers && headers instanceof Headers) {
24+
headers = Object.fromEntries(headers.entries())
25+
} else {
26+
headers = {}
27+
}
2228
if (token) {
2329
headers['Authorization'] = `bearer ${token}`
2430
}

0 commit comments

Comments
 (0)