From 6cf01e8990a40c31c05008aca22db95d1f385003 Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Mon, 28 Apr 2025 07:02:15 +0000
Subject: [PATCH] Merged in fix/redirect-content-types (pull request #1855)

Fix/redirect content types

* feat(SW-2429): Removed [contentType]>[uid] and use app router based structure for content types

* feat(SW-2429): Added breadcrumbs to follow contenttype folder structure

* fix(SW-2112): reenabling redirect middleware since working with new content-type routing strategy


Approved-by: Michael Zetterberg
---
 apps/scandic-web/middleware.ts           | 3 ++-
 apps/scandic-web/middlewares/redirect.ts | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/scandic-web/middleware.ts b/apps/scandic-web/middleware.ts
index 1a66b9b53..e83007c18 100644
--- a/apps/scandic-web/middleware.ts
+++ b/apps/scandic-web/middleware.ts
@@ -12,6 +12,7 @@ import * as currentWebLogout from "@/middlewares/currentWebLogout"
 import * as dateFormat from "@/middlewares/dateFormat"
 import * as handleAuth from "@/middlewares/handleAuth"
 import * as myPages from "@/middlewares/myPages"
+import * as redirect from "@/middlewares/redirect"
 import * as sasXScandic from "@/middlewares/sasXScandic"
 import { getDefaultRequestHeaders } from "@/middlewares/utils"
 import * as webView from "@/middlewares/webView"
@@ -58,7 +59,7 @@ export const middleware: NextMiddleware = async (request, event) => {
     bookingFlow,
     sasXScandic,
     cmsContent,
-    //redirect,
+    redirect,
   ]
 
   try {
diff --git a/apps/scandic-web/middlewares/redirect.ts b/apps/scandic-web/middlewares/redirect.ts
index 8c2670575..b979ac856 100644
--- a/apps/scandic-web/middlewares/redirect.ts
+++ b/apps/scandic-web/middlewares/redirect.ts
@@ -58,6 +58,8 @@ export const middleware: NextMiddleware = async (request) => {
         headers,
       })
     }
+
+    return NextResponse.next({ headers })
   } catch (e) {
     console.error("Redirect error: ", e)
     throw notFound()