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:
1
apps/scandic-redirect/.nvmrc
Normal file
1
apps/scandic-redirect/.nvmrc
Normal file
@@ -0,0 +1 @@
|
|||||||
|
22
|
||||||
8
apps/scandic-redirect/README.md
Normal file
8
apps/scandic-redirect/README.md
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
# scandic-redirect
|
||||||
|
|
||||||
|
Netlify Function to handle redirect URLs for Current web -> New web during go live.
|
||||||
|
|
||||||
|
This function will be called by the `web` app's middleware to check if the incoming request contains a legacy URL that should be redirected.
|
||||||
|
The "source of truth" for which URLs should be redirected where will be provided by the SEO team and put in a JSON file within this app.
|
||||||
|
|
||||||
|
If no match for the incoming request is found, the request is passed on through the middleware.
|
||||||
6
apps/scandic-redirect/netlify.toml
Normal file
6
apps/scandic-redirect/netlify.toml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
[functions]
|
||||||
|
included_files = ["netlify/functions/data/**.json"]
|
||||||
|
[[redirects]]
|
||||||
|
from = "/*"
|
||||||
|
to = "/.netlify/functions/redirect"
|
||||||
|
status = 200
|
||||||
1
apps/scandic-redirect/netlify/functions/data/da.json
Normal file
1
apps/scandic-redirect/netlify/functions/data/da.json
Normal file
@@ -0,0 +1 @@
|
|||||||
|
{"/sv/hotell/sverige/stockholm/scandic-wallin/fritt-wifi":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/familj":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/speciella-behov":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/restaurang-bar/bar":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/parkering":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/gym-halsa":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-no-53":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/galleri":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/restaurang-bar":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/rum":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/restaurang-bar/frukost":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/restaurang-bar/bar":"/sv/hotell/scandic-no-53/restaurang-bar/bar","/sv/hotell/sverige/stockholm/scandic-no-53/halsa":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/parkering":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/frukost-och-minibutik":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/erbjudanden":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/omdomen":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/speciella-behov":"/sv/hotell/scandic-no-53/speciella-behov","/sv/hotell/sverige/stockholm/scandic-no-53/familj":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/fritt-wifi":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/checka-ut-online":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-kista/galleri":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/rum":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar/frukost":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/parkering":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar/restaurang":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/halsa":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/tvattomat":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar/bar":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/erbjudanden":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/gastkok":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/frukost-och-minibutik":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/omdomen":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/speciella-behov":"/sv/hotell/scandic-kista/speciella-behov","/sv/hotell/sverige/stockholm/scandic-kista/familj":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/fritt-wifi":"/sv/hotell/scandic-kista"}
|
||||||
1
apps/scandic-redirect/netlify/functions/data/de.json
Normal file
1
apps/scandic-redirect/netlify/functions/data/de.json
Normal file
@@ -0,0 +1 @@
|
|||||||
|
{"/sv/hotell/sverige/stockholm/scandic-wallin/fritt-wifi":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/familj":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/speciella-behov":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/restaurang-bar/bar":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/parkering":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/gym-halsa":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-no-53":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/galleri":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/restaurang-bar":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/rum":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/restaurang-bar/frukost":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/restaurang-bar/bar":"/sv/hotell/scandic-no-53/restaurang-bar/bar","/sv/hotell/sverige/stockholm/scandic-no-53/halsa":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/parkering":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/frukost-och-minibutik":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/erbjudanden":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/omdomen":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/speciella-behov":"/sv/hotell/scandic-no-53/speciella-behov","/sv/hotell/sverige/stockholm/scandic-no-53/familj":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/fritt-wifi":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/checka-ut-online":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-kista/galleri":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/rum":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar/frukost":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/parkering":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar/restaurang":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/halsa":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/tvattomat":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar/bar":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/erbjudanden":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/gastkok":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/frukost-och-minibutik":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/omdomen":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/speciella-behov":"/sv/hotell/scandic-kista/speciella-behov","/sv/hotell/sverige/stockholm/scandic-kista/familj":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/fritt-wifi":"/sv/hotell/scandic-kista"}
|
||||||
1
apps/scandic-redirect/netlify/functions/data/en.json
Normal file
1
apps/scandic-redirect/netlify/functions/data/en.json
Normal file
@@ -0,0 +1 @@
|
|||||||
|
{"/sv/hotell/sverige/stockholm/scandic-wallin/fritt-wifi":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/familj":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/speciella-behov":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/restaurang-bar/bar":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/parkering":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/gym-halsa":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-no-53":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/galleri":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/restaurang-bar":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/rum":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/restaurang-bar/frukost":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/restaurang-bar/bar":"/sv/hotell/scandic-no-53/restaurang-bar/bar","/sv/hotell/sverige/stockholm/scandic-no-53/halsa":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/parkering":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/frukost-och-minibutik":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/erbjudanden":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/omdomen":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/speciella-behov":"/sv/hotell/scandic-no-53/speciella-behov","/sv/hotell/sverige/stockholm/scandic-no-53/familj":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/fritt-wifi":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/checka-ut-online":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-kista/galleri":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/rum":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar/frukost":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/parkering":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar/restaurang":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/halsa":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/tvattomat":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar/bar":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/erbjudanden":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/gastkok":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/frukost-och-minibutik":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/omdomen":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/speciella-behov":"/sv/hotell/scandic-kista/speciella-behov","/sv/hotell/sverige/stockholm/scandic-kista/familj":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/fritt-wifi":"/sv/hotell/scandic-kista"}
|
||||||
1
apps/scandic-redirect/netlify/functions/data/fi.json
Normal file
1
apps/scandic-redirect/netlify/functions/data/fi.json
Normal file
@@ -0,0 +1 @@
|
|||||||
|
{"/sv/hotell/sverige/stockholm/scandic-wallin/fritt-wifi":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/familj":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/speciella-behov":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/restaurang-bar/bar":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/parkering":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/gym-halsa":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-no-53":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/galleri":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/restaurang-bar":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/rum":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/restaurang-bar/frukost":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/restaurang-bar/bar":"/sv/hotell/scandic-no-53/restaurang-bar/bar","/sv/hotell/sverige/stockholm/scandic-no-53/halsa":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/parkering":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/frukost-och-minibutik":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/erbjudanden":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/omdomen":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/speciella-behov":"/sv/hotell/scandic-no-53/speciella-behov","/sv/hotell/sverige/stockholm/scandic-no-53/familj":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/fritt-wifi":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/checka-ut-online":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-kista/galleri":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/rum":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar/frukost":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/parkering":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar/restaurang":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/halsa":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/tvattomat":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar/bar":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/erbjudanden":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/gastkok":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/frukost-och-minibutik":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/omdomen":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/speciella-behov":"/sv/hotell/scandic-kista/speciella-behov","/sv/hotell/sverige/stockholm/scandic-kista/familj":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/fritt-wifi":"/sv/hotell/scandic-kista"}
|
||||||
1
apps/scandic-redirect/netlify/functions/data/no.json
Normal file
1
apps/scandic-redirect/netlify/functions/data/no.json
Normal file
@@ -0,0 +1 @@
|
|||||||
|
{"/sv/hotell/sverige/stockholm/scandic-wallin/fritt-wifi":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/familj":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/speciella-behov":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/restaurang-bar/bar":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/parkering":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-wallin/gym-halsa":"/sv/hotell/scandic-wallin","/sv/hotell/sverige/stockholm/scandic-no-53":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/galleri":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/restaurang-bar":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/rum":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/restaurang-bar/frukost":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/restaurang-bar/bar":"/sv/hotell/scandic-no-53/restaurang-bar/bar","/sv/hotell/sverige/stockholm/scandic-no-53/halsa":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/parkering":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/frukost-och-minibutik":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/erbjudanden":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/omdomen":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/speciella-behov":"/sv/hotell/scandic-no-53/speciella-behov","/sv/hotell/sverige/stockholm/scandic-no-53/familj":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/fritt-wifi":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-no-53/checka-ut-online":"/sv/hotell/scandic-no-53","/sv/hotell/sverige/stockholm/scandic-kista/galleri":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/rum":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar/frukost":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/parkering":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar/restaurang":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/halsa":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/tvattomat":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/restaurang-bar/bar":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/erbjudanden":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/gastkok":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/frukost-och-minibutik":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/omdomen":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/speciella-behov":"/sv/hotell/scandic-kista/speciella-behov","/sv/hotell/sverige/stockholm/scandic-kista/familj":"/sv/hotell/scandic-kista","/sv/hotell/sverige/stockholm/scandic-kista/fritt-wifi":"/sv/hotell/scandic-kista"}
|
||||||
1
apps/scandic-redirect/netlify/functions/data/sv.json
Normal file
1
apps/scandic-redirect/netlify/functions/data/sv.json
Normal file
File diff suppressed because one or more lines are too long
59
apps/scandic-redirect/netlify/functions/redirect.mts
Normal file
59
apps/scandic-redirect/netlify/functions/redirect.mts
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
import { createReadStream } from "fs";
|
||||||
|
import { join } from "path";
|
||||||
|
|
||||||
|
export default async (req: Request) => {
|
||||||
|
try {
|
||||||
|
const body = await req.json();
|
||||||
|
|
||||||
|
if (body.lang && body.pathname) {
|
||||||
|
const filePath = join(import.meta.dirname, `./data/${body.lang}.json`);
|
||||||
|
|
||||||
|
const redirectUrl = await new Promise<string | null>(
|
||||||
|
(resolve, reject) => {
|
||||||
|
const stream = createReadStream(filePath, {
|
||||||
|
emitClose: false,
|
||||||
|
encoding: "utf-8",
|
||||||
|
highWaterMark: 1024,
|
||||||
|
});
|
||||||
|
const data: string[] = [];
|
||||||
|
|
||||||
|
stream.on("data", (chunk) => {
|
||||||
|
if (data.length === 3) {
|
||||||
|
data.shift();
|
||||||
|
}
|
||||||
|
data.push(chunk.toString());
|
||||||
|
|
||||||
|
const re = new RegExp(`"${body.pathname}":"([^"]+)"`);
|
||||||
|
|
||||||
|
const match = data.join("").match(re);
|
||||||
|
if (match?.[1]) {
|
||||||
|
stream.destroy();
|
||||||
|
resolve(match[1]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
stream.on("error", (err) => {
|
||||||
|
console.error("Stream error:", err);
|
||||||
|
stream.destroy();
|
||||||
|
reject(err);
|
||||||
|
});
|
||||||
|
|
||||||
|
stream.on("end", () => {
|
||||||
|
stream.destroy();
|
||||||
|
resolve(null); // No match found
|
||||||
|
});
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
if (redirectUrl) {
|
||||||
|
if (redirectUrl === body.pathname) {
|
||||||
|
return new Response("Not Found", { status: 404 });
|
||||||
|
}
|
||||||
|
return new Response(redirectUrl);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return new Response("Not Found", { status: 404 });
|
||||||
|
} catch (error) {
|
||||||
|
return new Response("Bad request", { status: 400 });
|
||||||
|
}
|
||||||
|
};
|
||||||
9
apps/scandic-redirect/package.json
Normal file
9
apps/scandic-redirect/package.json
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"name": "@scandic-hotels/scandic-redirect",
|
||||||
|
"version": "0.1.0",
|
||||||
|
"private": true,
|
||||||
|
"packageManager": "yarn@4.6.0",
|
||||||
|
"dependencies": {
|
||||||
|
"@netlify/functions": "^3.0.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -30,10 +30,18 @@ function getBreadcrumbsVariantsByContentType(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We need to return null for both ignored content types and non-existent content types
|
||||||
|
// In order to no having to maintain an explicit array of all content types besides the PageContentTypeEnum we convert it here.
|
||||||
|
const allowedContentTypes = Object.keys(PageContentTypeEnum)
|
||||||
|
.map((key) => {
|
||||||
|
return PageContentTypeEnum[key as keyof typeof PageContentTypeEnum]
|
||||||
|
})
|
||||||
|
.filter((c) => !IGNORED_CONTENT_TYPES.includes(c))
|
||||||
|
|
||||||
export default function PageBreadcrumbs({
|
export default function PageBreadcrumbs({
|
||||||
params,
|
params,
|
||||||
}: PageArgs<LangParams & ContentTypeParams>) {
|
}: PageArgs<LangParams & ContentTypeParams>) {
|
||||||
if (IGNORED_CONTENT_TYPES.includes(params.contentType)) {
|
if (!allowedContentTypes.includes(params.contentType)) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import { notFound } from "next/navigation"
|
||||||
|
|
||||||
import styles from "./layout.module.css"
|
import styles from "./layout.module.css"
|
||||||
|
|
||||||
import type {
|
import type {
|
||||||
@@ -6,17 +8,24 @@ import type {
|
|||||||
LayoutArgs,
|
LayoutArgs,
|
||||||
UIDParams,
|
UIDParams,
|
||||||
} from "@/types/params"
|
} from "@/types/params"
|
||||||
|
import { PageContentTypeEnum } from "@/types/requests/contentType"
|
||||||
|
|
||||||
export default function ContentTypeLayout({
|
export default function ContentTypeLayout({
|
||||||
breadcrumbs,
|
breadcrumbs,
|
||||||
preview,
|
preview,
|
||||||
children,
|
children,
|
||||||
|
params,
|
||||||
}: React.PropsWithChildren<
|
}: React.PropsWithChildren<
|
||||||
LayoutArgs<LangParams & ContentTypeParams & UIDParams> & {
|
LayoutArgs<LangParams & ContentTypeParams & UIDParams> & {
|
||||||
breadcrumbs: React.ReactNode
|
breadcrumbs: React.ReactNode
|
||||||
preview: React.ReactNode
|
preview: React.ReactNode
|
||||||
}
|
}
|
||||||
>) {
|
>) {
|
||||||
|
// Would like a better way to check if the contentType is valid.
|
||||||
|
// Perhaps a case for using an `{} as const` object for PageContentTypes instead?
|
||||||
|
if (!Object.values(PageContentTypeEnum).includes(params.contentType)) {
|
||||||
|
notFound()
|
||||||
|
}
|
||||||
return (
|
return (
|
||||||
<div className={styles.container}>
|
<div className={styles.container}>
|
||||||
<section className={styles.layout}>
|
<section className={styles.layout}>
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import * as currentWebLogout from "@/middlewares/currentWebLogout"
|
|||||||
import * as dateFormat from "@/middlewares/dateFormat"
|
import * as dateFormat from "@/middlewares/dateFormat"
|
||||||
import * as handleAuth from "@/middlewares/handleAuth"
|
import * as handleAuth from "@/middlewares/handleAuth"
|
||||||
import * as myPages from "@/middlewares/myPages"
|
import * as myPages from "@/middlewares/myPages"
|
||||||
|
import * as redirect from "@/middlewares/redirect"
|
||||||
import * as sasXScandic from "@/middlewares/sasXScandic"
|
import * as sasXScandic from "@/middlewares/sasXScandic"
|
||||||
import { getDefaultRequestHeaders } from "@/middlewares/utils"
|
import { getDefaultRequestHeaders } from "@/middlewares/utils"
|
||||||
import * as webView from "@/middlewares/webView"
|
import * as webView from "@/middlewares/webView"
|
||||||
@@ -58,6 +59,7 @@ export const middleware: NextMiddleware = async (request, event) => {
|
|||||||
bookingFlow,
|
bookingFlow,
|
||||||
sasXScandic,
|
sasXScandic,
|
||||||
cmsContent,
|
cmsContent,
|
||||||
|
redirect,
|
||||||
]
|
]
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -63,9 +63,10 @@ export const middleware: NextMiddleware = async (request) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!contentType || !uid) {
|
if (!contentType || !uid) {
|
||||||
throw notFound(
|
const headers = getDefaultRequestHeaders(request)
|
||||||
`Unable to resolve CMS entry for page "${pathWithoutTrailingSlash}"`
|
headers.set("x-continue", "1")
|
||||||
)
|
|
||||||
|
return NextResponse.next({ headers })
|
||||||
}
|
}
|
||||||
const headers = getDefaultRequestHeaders(request)
|
const headers = getDefaultRequestHeaders(request)
|
||||||
headers.set("x-uid", uid)
|
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
|
||||||
|
}
|
||||||
@@ -6346,6 +6346,14 @@ __metadata:
|
|||||||
languageName: unknown
|
languageName: unknown
|
||||||
linkType: soft
|
linkType: soft
|
||||||
|
|
||||||
|
"@scandic-hotels/scandic-redirect@workspace:apps/scandic-redirect":
|
||||||
|
version: 0.0.0-use.local
|
||||||
|
resolution: "@scandic-hotels/scandic-redirect@workspace:apps/scandic-redirect"
|
||||||
|
dependencies:
|
||||||
|
"@netlify/functions": "npm:^3.0.0"
|
||||||
|
languageName: unknown
|
||||||
|
linkType: soft
|
||||||
|
|
||||||
"@scandic-hotels/scandic-web@workspace:apps/scandic-web":
|
"@scandic-hotels/scandic-web@workspace:apps/scandic-web":
|
||||||
version: 0.0.0-use.local
|
version: 0.0.0-use.local
|
||||||
resolution: "@scandic-hotels/scandic-web@workspace:apps/scandic-web"
|
resolution: "@scandic-hotels/scandic-web@workspace:apps/scandic-web"
|
||||||
|
|||||||
Reference in New Issue
Block a user