scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove returnurl since not used, remove double redirect when request coming from current web

Browse Source
This commit is contained in:
Matilda Landström
2024-05-24 14:36:10 +02:00
parent 9d98a93e3a
commit b9c642a35b
1 changed files with 35 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
app/[lang]/(live)/(protected)/logout/route.ts
View File

@@ -14,66 +14,46 @@ export async function GET(
context: { params: { lang: Lang } } context: { params: { lang: Lang } }
) { ) {
let redirectHeaders: Headers | undefined = undefined let redirectHeaders: Headers | undefined = undefined
let redirectTo: string let redirectTo: string = ""
const returnUrl = request.headers.get("x-returnurl") try {
// Initiate the seamless logout flow
if (returnUrl) { let redirectUrlValue
redirectTo = returnUrl switch (context.params.lang) {
} else { case Lang.da:
// Normal logout request from New web redirectUrlValue = env.SEAMLESS_LOGOUT_DA
redirectTo = break
request.cookies.get("redirectTo")?.value || // Cookie gets set by authRequired middleware case Lang.de:
request.nextUrl.searchParams.get("redirectTo") || redirectUrlValue = env.SEAMLESS_LOGOUT_DE
"/" break
case Lang.en:
// Make relative URL to absolute URL redirectUrlValue = env.SEAMLESS_LOGOUT_EN
if (redirectTo.startsWith("/")) { break
if (!env.PUBLIC_URL) { case Lang.fi:
throw internalServerError("No value for env.PUBLIC_URL") redirectUrlValue = env.SEAMLESS_LOGOUT_FI
} break
redirectTo = new URL(redirectTo, env.PUBLIC_URL).href case Lang.no:
redirectUrlValue = env.SEAMLESS_LOGOUT_NO
break
case Lang.sv:
redirectUrlValue = env.SEAMLESS_LOGOUT_SV
break
} }
// Clean up cookie from authRequired middleware const redirectUrl = new URL(redirectUrlValue)
redirectHeaders = new Headers() if (request.nextUrl.searchParams.get("currentweb") != null) {
redirectHeaders.append( // Request coming from NEW web, redirect to current web logout
"set-cookie",
"redirectTo=; Expires=Thu, 01 Jan 1970 00:00:00 UTC; Path=/; HttpOnly; SameSite=Lax"
)
try {
// Initiate the seamless logout flow
let redirectUrlValue
switch (context.params.lang) {
case Lang.da:
redirectUrlValue = env.SEAMLESS_LOGOUT_DA
break
case Lang.de:
redirectUrlValue = env.SEAMLESS_LOGOUT_DE
break
case Lang.en:
redirectUrlValue = env.SEAMLESS_LOGOUT_EN
break
case Lang.fi:
redirectUrlValue = env.SEAMLESS_LOGOUT_FI
break
case Lang.no:
redirectUrlValue = env.SEAMLESS_LOGOUT_NO
break
case Lang.sv:
redirectUrlValue = env.SEAMLESS_LOGOUT_SV
break
}
const redirectUrl = new URL(redirectUrlValue)
redirectUrl.searchParams.set("returnurl", redirectTo)
redirectTo = redirectUrl.toString() redirectTo = redirectUrl.toString()
} catch (e) { } else {
console.error( // Request coming from CURRENT web, redirect to current web start page
"Unable to create URL for seamless logout, proceeding without it." redirectTo = redirectUrl.origin
)
console.error(e)
} }
} catch (e) {
console.error(
"Unable to create URL for seamless logout, proceeding without it."
)
console.error(e)
} }
try { try {
/** /**
* Passing `redirect: false` to `signOut` will return a result object * Passing `redirect: false` to `signOut` will return a result object