diff --git a/middleware.ts b/middleware.ts index 506323739..8aaff393e 100644 --- a/middleware.ts +++ b/middleware.ts @@ -54,18 +54,8 @@ export const middleware: NextMiddleware = async (request, event) => { for (let i = 0; i < middlewares.length; ++i) { const middleware = middlewares[i] - console.log(`[mw:${i}] request.nextUrl.origin`, request.nextUrl.origin) - console.log(`[mw:${i}] request.nextUrl`, request.nextUrl) - console.log(`[mw:${i}] request.headers`, request.headers) - console.log(`[mw:${i}] request`, request) - if (middleware.matcher(request)) { - console.log(`[mw:${i}] match`) const result = await middleware.middleware(request, event) - console.log(`[mwr:${i}] request.nextUrl.origin`, request.nextUrl.origin) - console.log(`[mwr:${i}] request.nextUrl`, request.nextUrl) - console.log(`[mwr:${i}] request.headers`, request.headers) - console.log(`[mwr:${i}] request`, request) const _continue = result?.headers.get("x-continue") if (_continue) { continue diff --git a/middlewares/authRequired.ts b/middlewares/authRequired.ts index 091172ff1..09781ac56 100644 --- a/middlewares/authRequired.ts +++ b/middlewares/authRequired.ts @@ -37,21 +37,13 @@ import type { MiddlewareMatcher } from "@/types/middleware" * https://authjs.dev/reference/nextjs */ export const middleware = auth(async (request) => { - console.log("[mwauth] start") - console.log("[mwauth] request.nextUrl.origin", request.nextUrl.origin) - console.log("[mwauth] request.nextUrl", request.nextUrl) - console.log("[mwauth] request", request) - console.log("[mwauth] request.headers", request.headers) - for (let [key, value] of request.headers.entries()) { - console.log(`[mwauth] header '${key}'`, value) - } - const lang = findLang(request.nextUrl.pathname)! + const { nextUrl } = request + const lang = findLang(nextUrl.pathname)! const isLoggedIn = !!request.auth const hasError = request.auth?.error const nextUrlPublic = getPublicNextURL(request) - console.log("[mfa] nextUrlPublic", nextUrlPublic) /** * Function to validate MFA from token data @@ -63,21 +55,13 @@ export const middleware = auth(async (request) => { : false return !(request.auth?.token.mfa_scope && isMFATokenValid) } - const isMFAPath = mfaRequired.includes(request.nextUrl.pathname) + const isMFAPath = mfaRequired.includes(nextUrl.pathname) if (isLoggedIn && isMFAPath && isMFAInvalid()) { - console.log("[mfa] required") const headers = new Headers(request.headers) headers.set("x-returnurl", nextUrlPublic.href) headers.set("x-login-source", "mfa") - console.log("[mfa] headers", headers) - - console.log("[mfa] request.nextUrl", request.nextUrl) - console.log("[mfa] request", request) - - const u = new URL(`/${lang}/login`, request.nextUrl) - console.log("[mfa] rewrite url", u) - return NextResponse.rewrite(u, { + return NextResponse.rewrite(new URL(`/${lang}/login`, request.nextUrl), { request: { headers, }, diff --git a/middlewares/currentWebLogin.ts b/middlewares/currentWebLogin.ts index 9a3dfcf66..14fb89e67 100644 --- a/middlewares/currentWebLogin.ts +++ b/middlewares/currentWebLogin.ts @@ -9,10 +9,6 @@ import type { NextMiddleware } from "next/server" import type { MiddlewareMatcher } from "@/types/middleware" export const middleware: NextMiddleware = (request) => { - console.log("[updatelogin] start") - console.log("[updatelogin] request.nextUrl.origin", request.nextUrl.origin) - console.log("[updatelogin] request.nextUrl", request.nextUrl) - console.log("[updatelogin] request", request) const returnUrl = request.nextUrl.searchParams.get("returnurl") if (!returnUrl) { @@ -24,14 +20,8 @@ export const middleware: NextMiddleware = (request) => { const headers = new Headers(request.headers) headers.set("x-returnurl", returnUrl) headers.set("x-login-source", "seamless") - console.log("[updatelogin] headers", headers) - console.log("[updatelogin] request.nextUrl", request.nextUrl) - console.log("[updatelogin] request", request) - - const u = new URL(`/${lang}/login`, request.nextUrl) - console.log("[updatelogin] rewrite url", u) - return NextResponse.rewrite(u, { + return NextResponse.rewrite(new URL(`/${lang}/login`, request.nextUrl), { request: { headers, },