suimeng
/
honojs-middleware
mirror of https://github.com/honojs/middleware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(auth-js): Fix immutable headers error in x-forwarded request (#614) 

* fix: immutable headers error in x-forwarded req

* added changeset
pull/616/head
divyam234 2024-07-04 10:37:21 +05:30 committed by GitHub
parent 52c0e418cd
commit 19f3beae1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/chatty-dragons-juggle.md 100644
View File

@ -0,0 +1,5 @@
---
'@hono/auth-js': patch
---
fix immutable headers error in x-forwarded req

29
packages/auth-js/src/index.ts
View File

@ -8,7 +8,6 @@ import { env ,getRuntimeKey} from 'hono/adapter'
import { HTTPException } from 'hono/http-exception'
import { setEnvDefaults as coreSetEnvDefaults } from '@auth/core'
declare module 'hono' {
interface ContextVariableMap {
authUser: AuthUser
@ -39,18 +38,15 @@ export function setEnvDefaults(env: AuthEnv, config: AuthConfig) {
coreSetEnvDefaults(env, config)
}
async function cloneRequest(input: URL | string, request: Request){
if ( getRuntimeKey() === "bun") {
async function cloneRequest(input: URL | string, request: Request, headers?: Headers) {
if (getRuntimeKey() === 'bun') {
return new Request(input, {
method: request.method,
headers:new Headers(request.headers),
headers: headers ?? new Headers(request.headers),
body:
request.method === "GET" || request.method === "HEAD"
? undefined
: await request.blob(),
request.method === 'GET' || request.method === 'HEAD' ? undefined : await request.blob(),
// @ts-ignore: TS2353
referrer: "referrer" in request ? (request.referrer as string) : undefined,
referrer: 'referrer' in request ? (request.referrer as string) : undefined,
// deno-lint-ignore no-explicit-any
referrerPolicy: request.referrerPolicy as any,
mode: request.mode,
@ -60,7 +56,7 @@ async function cloneRequest(input: URL | string, request: Request){
redirect: request.redirect,
integrity: request.integrity,
keepalive: request.keepalive,
signal: request.signal
signal: request.signal,
})
}
return new Request(input, request)
@ -75,19 +71,20 @@ export async function reqWithEnvUrl(req: Request, authUrl?: string){
return cloneRequest(reqUrlObj.href, req)
} else {
const url = new URL(req.url)
const proto = req.headers.get('x-forwarded-proto')
const host = req.headers.get('x-forwarded-host') ?? req.headers.get('host')
const headers = new Headers(req.headers)
const proto = headers.get('x-forwarded-proto')
const host = headers.get('x-forwarded-host') ?? headers.get('host')
if (proto != null) url.protocol = proto.endsWith(':') ? proto : proto + ':'
if (host != null) {
url.host = host
const portMatch = host.match(/:(\d+)$/)
if (portMatch) url.port = portMatch[1]
else url.port = ''
req.headers.delete("x-forwarded-host")
req.headers.delete("Host")
req.headers.set("Host", host)
headers.delete('x-forwarded-host')
headers.delete('Host')
headers.set('Host', host)
}
return cloneRequest(url.href, req)
return cloneRequest(url.href, req, headers)
}
}