diff --git a/app/[lang]/(live)/(protected)/logout/route.ts b/app/[lang]/(live)/(protected)/logout/route.ts index 73781abf4..5383be38d 100644 --- a/app/[lang]/(live)/(protected)/logout/route.ts +++ b/app/[lang]/(live)/(protected)/logout/route.ts @@ -17,7 +17,7 @@ export async function GET( let redirectTo: string const returnUrl = request.headers.get("x-returnurl") - console.log("TESTING", returnUrl) + if (returnUrl) { redirectTo = returnUrl } else { @@ -67,6 +67,7 @@ export async function GET( const redirectUrl = new URL(redirectUrlValue) redirectUrl.searchParams.set("returnurl", redirectTo) redirectTo = redirectUrl.toString() + console.log("TOTO", redirectTo) } catch (e) { console.error( "Unable to create URL for seamless logout, proceeding without it." diff --git a/app/[lang]/(live)/(public)/login/route.ts b/app/[lang]/(live)/(public)/login/route.ts index 16447022c..fa9db75aa 100644 --- a/app/[lang]/(live)/(public)/login/route.ts +++ b/app/[lang]/(live)/(public)/login/route.ts @@ -15,7 +15,7 @@ export async function GET( let redirectTo: string const returnUrl = request.headers.get("x-returnurl") - console.log("TESTTEST", returnUrl, request) + if (returnUrl) { // Seamless login request from Current web redirectTo = returnUrl @@ -33,6 +33,7 @@ export async function GET( } redirectTo = new URL(redirectTo, env.PUBLIC_URL).href } + // Clean up cookie from authRequired middleware redirectHeaders = new Headers() redirectHeaders.append( diff --git a/middlewares/authRequired.ts b/middlewares/authRequired.ts index d0a65c215..268316d41 100644 --- a/middlewares/authRequired.ts +++ b/middlewares/authRequired.ts @@ -40,7 +40,7 @@ import type { MiddlewareMatcher } from "@/types/middleware" export const middleware = auth(async (request) => { const { nextUrl } = request const lang = findLang(nextUrl.pathname)! - console.log("TestTest ", nextUrl) + const isLoggedIn = !!request.auth const hasError = request.auth?.error diff --git a/middlewares/currentWebLogout.ts b/middlewares/currentWebLogout.ts index d37bd5709..8dacd770a 100644 --- a/middlewares/currentWebLogout.ts +++ b/middlewares/currentWebLogout.ts @@ -8,24 +8,15 @@ import type { NextMiddleware } from "next/server" import type { MiddlewareMatcher } from "@/types/middleware" export const middleware: NextMiddleware = (request) => { - console.log("HEJ", request) const currentwebUrl = request.nextUrl.searchParams.get("currentweb") - if (currentwebUrl == null) { + if (currentwebUrl == null || undefined) { return badRequest() } - const lang = findLang(request.nextUrl.pathname)! - //const headers = new Headers(request.headers) - //headers.set("x-returnurl", returnUrl) - - return NextResponse.rewrite(new URL(`/${lang}/logout`, request.nextUrl), { - /*request: { - headers, - },*/ - }) + return NextResponse.rewrite(new URL(`/${lang}/logout`, request.nextUrl)) } export const matcher: MiddlewareMatcher = (request) => { - return request.nextUrl.pathname.endsWith("/updatelogout") //?currentweb") + return request.nextUrl.pathname.endsWith("/updatelogout") }