Merged in feat/SW-2111 (pull request #1761)
feat(SW-2111): add initial scandic-redirect * feat(SW-2111): add initial scandic-redirect * feat(SW-2112): add scandic-redirect call to middleware * chore: add redirect jsons per lang * fix: handle incorrect contentTypes * fix: handle lang * refactor: add json streaming * refactor: wrap redirect call in cacheOrGet * refactor: review Approved-by: Michael Zetterberg
This commit is contained in:
@@ -63,9 +63,10 @@ export const middleware: NextMiddleware = async (request) => {
|
||||
}
|
||||
|
||||
if (!contentType || !uid) {
|
||||
throw notFound(
|
||||
`Unable to resolve CMS entry for page "${pathWithoutTrailingSlash}"`
|
||||
)
|
||||
const headers = getDefaultRequestHeaders(request)
|
||||
headers.set("x-continue", "1")
|
||||
|
||||
return NextResponse.next({ headers })
|
||||
}
|
||||
const headers = getDefaultRequestHeaders(request)
|
||||
headers.set("x-uid", uid)
|
||||
|
||||
69
apps/scandic-web/middlewares/redirect.ts
Normal file
69
apps/scandic-web/middlewares/redirect.ts
Normal file
@@ -0,0 +1,69 @@
|
||||
import { type NextMiddleware, NextResponse } from "next/server"
|
||||
|
||||
import { notFound } from "@/server/errors/next"
|
||||
|
||||
import { getCacheClient } from "@/services/dataCache"
|
||||
import { findLang } from "@/utils/languages"
|
||||
|
||||
import { getDefaultRequestHeaders } from "./utils"
|
||||
|
||||
import type { MiddlewareMatcher } from "@/types/middleware"
|
||||
import type { Lang } from "@/constants/languages"
|
||||
|
||||
async function fetchAndCacheRedirect(lang: Lang, pathname: string) {
|
||||
const cacheKey = `${lang}:redirect:${pathname}`
|
||||
const cache = await getCacheClient()
|
||||
|
||||
return await cache.cacheOrGet(
|
||||
cacheKey,
|
||||
async () => {
|
||||
const matchedRedirect = await fetch(
|
||||
"https://redirect-scandic-hotels.netlify.app",
|
||||
{
|
||||
method: "POST",
|
||||
body: JSON.stringify({ lang, pathname }),
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
if (matchedRedirect.ok) {
|
||||
const result = await matchedRedirect.text()
|
||||
|
||||
if (result) {
|
||||
return result
|
||||
}
|
||||
}
|
||||
return null
|
||||
},
|
||||
// longer once tested
|
||||
"1m"
|
||||
)
|
||||
}
|
||||
|
||||
export const middleware: NextMiddleware = async (request) => {
|
||||
const lang = findLang(request.nextUrl.pathname)!
|
||||
const headers = getDefaultRequestHeaders(request)
|
||||
try {
|
||||
const matchedRedirect = await fetchAndCacheRedirect(
|
||||
lang,
|
||||
request.nextUrl.pathname
|
||||
)
|
||||
|
||||
if (matchedRedirect) {
|
||||
const newUrl = new URL(matchedRedirect, request.nextUrl)
|
||||
headers.set("Cache-control", "public, max-age=60")
|
||||
return NextResponse.redirect(newUrl, {
|
||||
headers,
|
||||
})
|
||||
}
|
||||
} catch (e) {
|
||||
console.error("Redirect error: ", e)
|
||||
throw notFound()
|
||||
}
|
||||
}
|
||||
|
||||
export const matcher: MiddlewareMatcher = (_) => {
|
||||
return true
|
||||
}
|
||||
Reference in New Issue
Block a user