Skip to content

Commit fb42495

Browse files
eozden-wqLordfirespeed
authored andcommitted
Fixed dev bug with url hostname in destination query param on client-side middleware
1 parent f5719fe commit fb42495

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

client/src/middleware.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ async function getUserProfile(request: NextRequest): Promise<User | null> {
2626

2727
function redirectUnauthenticated(request: NextRequest) {
2828
const loginUrl = new URL("/auth/keycloak/login", siteConfig.apiUrl)
29-
loginUrl.searchParams.set("destination", request.url)
29+
loginUrl.searchParams.set("destination", request.nextUrl.href)
3030
return NextResponse.redirect(loginUrl)
3131
}
3232

@@ -38,6 +38,9 @@ function redirectForbidden(request: NextRequest) {
3838
}
3939

4040
export async function middleware(request: NextRequest) {
41+
request.nextUrl.host = request.headers.get("Host") ?? request.nextUrl.host
42+
if (request.headers.get("Host")?.indexOf(":") === -1) request.nextUrl.port = ""
43+
4144
if (request.nextUrl.pathname.startsWith("/dashboard")) {
4245
const userProfile = await getUserProfile(request)
4346
// if the user is not logged in, go back to root

0 commit comments

Comments
 (0)