fix: improve auth handling and logging

middlewares/utils.ts

@@ -1,3 +1,6 @@
+import { env } from "@/env/server"
+import { internalServerError } from "@/server/errors/next"
+
 import { findLang } from "@/utils/languages"
 import { removeTrailingSlash } from "@/utils/url"
 
@@ -6,6 +9,17 @@ import type { NextRequest } from "next/server"
 export function getDefaultRequestHeaders(request: NextRequest) {
   const lang = findLang(request.nextUrl.pathname)!
 
+  let nextUrl
+  if (env.PUBLIC_URL) {
+    const publicUrl = new URL(env.PUBLIC_URL)
+    const nextUrlPublic = request.nextUrl.clone()
+    nextUrlPublic.host = publicUrl.host
+    nextUrlPublic.hostname = publicUrl.hostname
+    nextUrl = nextUrlPublic
+  } else {
+    nextUrl = request.nextUrl
+  }
+
   const headers = new Headers(request.headers)
   headers.set("x-lang", lang)
   headers.set(
@@ -14,7 +28,7 @@ export function getDefaultRequestHeaders(request: NextRequest) {
       request.nextUrl.pathname.replace(`/${lang}`, "").replace(`/webview`, "")
     )
   )
-  headers.set("x-url", removeTrailingSlash(request.nextUrl.href))
+  headers.set("x-url", removeTrailingSlash(nextUrl.href))
 
   return headers
 }