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

fix: move logic to middleware

Browse Source
This commit is contained in:
Matilda Landström
2024-05-30 17:04:41 +02:00
parent 6211eda353
commit 0ab35679f8
2 changed files with 53 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,42 +15,43 @@ export async function GET(
) {
let redirectTo: string = ""
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)
if (request.nextUrl.searchParams.get("currentweb") == null) {
// Request coming from NEW web, redirect to current web logout
const returnUrl = request.headers.get("x-returnurl")
if (returnUrl) {
// Seamless logout request from Current web
redirectTo = returnUrl
} else {
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)
redirectTo = redirectUrl.toString()
} else {
// Request coming from CURRENT web, redirect to current web start page
redirectTo = redirectUrl.origin
} catch (e) {
console.error(
"Unable to create URL for seamless logout, proceeding without it."
)
console.error(e)
}
} catch (e) {
console.error(
"Unable to create URL for seamless logout, proceeding without it."
)
console.error(e)
}
try {

24
middlewares/currentWebLogout.ts
View File

@@ -1,7 +1,8 @@
import { NextResponse } from "next/server"
import { findLang } from "@/constants/languages"
import { badRequest } from "@/server/errors/next"
import { findLang, Lang } from "@/constants/languages"
import { env } from "@/env/server"
import { badRequest, internalServerError } from "@/server/errors/next"
import type { NextMiddleware } from "next/server"
@@ -14,9 +15,20 @@ export const middleware: NextMiddleware = (request) => {
}
const lang = findLang(request.nextUrl.pathname)!
return NextResponse.rewrite(new URL(`/${lang}/logout`, request.nextUrl))
}
if (!env.PUBLIC_URL) {
throw internalServerError("No value for env.PUBLIC_URL")
}
const redirectTo = env.PUBLIC_URL
export const matcher: MiddlewareMatcher = (request) => {
return request.nextUrl.pathname.includes("/updatelogout")
const headers = new Headers(request.headers)
headers.set("x-returnurl", redirectTo)
return NextResponse.rewrite(new URL(`/${lang}/logout`, request.nextUrl), {
request: {
headers,
},
})
}
export const matcher: MiddlewareMatcher = (request) => {
return request.nextUrl.pathname.endsWith("/updatelogout")
}