fix(auth): use public url for redirect
This commit is contained in:
@@ -13,7 +13,6 @@ export async function GET(request: NextRequest) {
|
|||||||
returnUrl ||
|
returnUrl ||
|
||||||
request.headers.get("x-redirect-to") ||
|
request.headers.get("x-redirect-to") ||
|
||||||
request.nextUrl.searchParams.get("redirectTo") ||
|
request.nextUrl.searchParams.get("redirectTo") ||
|
||||||
request.headers.get("Referer") ||
|
|
||||||
"/"
|
"/"
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { NextResponse } from "next/server"
|
|||||||
import { findLang } from "@/constants/languages"
|
import { findLang } from "@/constants/languages"
|
||||||
import { authRequired } from "@/constants/routes/authRequired"
|
import { authRequired } from "@/constants/routes/authRequired"
|
||||||
import { login } from "@/constants/routes/handleAuth"
|
import { login } from "@/constants/routes/handleAuth"
|
||||||
|
import { env } from "@/env/server"
|
||||||
|
|
||||||
import { auth } from "@/auth"
|
import { auth } from "@/auth"
|
||||||
|
|
||||||
@@ -45,13 +46,16 @@ export const middleware = auth(async (request) => {
|
|||||||
return NextResponse.next()
|
return NextResponse.next()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const publicUrl = nextUrl.clone()
|
||||||
|
publicUrl.host = env.PUBLIC_URL!
|
||||||
|
|
||||||
const headers = new Headers()
|
const headers = new Headers()
|
||||||
headers.append(
|
headers.append(
|
||||||
"set-cookie",
|
"set-cookie",
|
||||||
`redirectTo=${encodeURIComponent(nextUrl.href)}; Path=/; HttpOnly; SameSite=Lax`
|
`redirectTo=${encodeURIComponent(publicUrl.href)}; Path=/; HttpOnly; SameSite=Lax`
|
||||||
)
|
)
|
||||||
const loginUrl = login[lang]
|
const loginUrl = login[lang]
|
||||||
return NextResponse.redirect(new URL(loginUrl, request.nextUrl), {
|
return NextResponse.redirect(new URL(loginUrl, publicUrl), {
|
||||||
headers,
|
headers,
|
||||||
})
|
})
|
||||||
}) as NextMiddleware // See comment above
|
}) as NextMiddleware // See comment above
|
||||||
|
|||||||
Reference in New Issue
Block a user