fix: move fonts and refactor headers in middleware

app/[lang]/(live)/(protected)/my-pages/layout.tsx

@@ -1,4 +1,4 @@
-import { firaMono, firaSans } from "@/app/[lang]/fonts"
+import { firaMono, firaSans } from "@/app/fonts"
 
 import styles from "./layout.module.css"
 

app/[lang]/(live)/error.tsx

@@ -7,7 +7,7 @@ import { findLang } from "@/constants/languages"
 import { login } from "@/constants/routes/handleAuth"
 import { SESSION_EXPIRED } from "@/server/errors/trpc"
 
-import { firaMono, firaSans } from "@/app/[lang]/fonts"
+import { firaMono, firaSans } from "@/app/fonts"
 
 import styles from "./error.module.css"
 

app/[lang]/(live)/layout.tsx

@@ -5,7 +5,7 @@ import Script from "next/script"
 
 import TrpcProvider from "@/lib/trpc/Provider"
 
-import { biroScriptPlus, firaMono, firaSans } from "@/app/[lang]/fonts"
+import { biroScriptPlus, firaMono, firaSans } from "@/app/fonts"
 import AdobeScript from "@/components/Current/AdobeScript"
 import VwoScript from "@/components/Current/VwoScript"
 

app/[lang]/(live)/middleware-error/[status]/page.tsx

@@ -1,4 +1,4 @@
-import { firaMono, firaSans } from "@/app/[lang]/fonts"
+import { firaMono, firaSans } from "@/app/fonts"
 
 import styles from "./page.module.css"
 

app/[lang]/webview/layout.tsx

@@ -1,7 +1,7 @@
 import "@/app/globals.css"
 import "@scandic-hotels/design-system/style.css"
 
-import { biroScriptPlus, firaMono, firaSans } from "@/app/[lang]/fonts"
+import { biroScriptPlus, firaMono, firaSans } from "@/app/fonts"
 
 import styles from "./layout.module.css"
 

app/[lang]/webview/test/page.tsx

@@ -1,22 +0,0 @@
-import { cookies, headers } from "next/headers"
-
-import { serverClient } from "@/lib/trpc/server"
-
-import type { Metadata } from "next"
-
-export const metadata: Metadata = {
-  title: "Hello World from Webview",
-}
-
-export default async function WebViewTestPage() {
-  const data = await serverClient().user.get()
-
-  return (
-    <main>
-      <header>
-        <h1>Hello From WebView Test Page!</h1>
-        <p>{data.firstName}</p>
-      </header>
-    </main>
-  )
-}

app/fonts.ts

@@ -16,7 +16,7 @@ export const firaSans = Fira_Sans({
 export const biroScriptPlus = localFont({
   src: [
     {
-      path: "../../public/_static/fonts/biro-script-plus/Biro-Script-Plus.ttf",
+      path: "../public/_static/fonts/biro-script-plus/Biro-Script-Plus.ttf",
       style: "normal",
       weight: "500",
     },

app/global-error.tsx

@@ -1,6 +1,6 @@
 "use client"
 
-import { firaMono, firaSans } from "@/app/[lang]/fonts"
+import { firaMono, firaSans } from "@/app/fonts"
 
 import styles from "./global-error.module.css"
 

middlewares/webView.ts

@@ -97,14 +97,16 @@ export const middleware: NextMiddleware = async (request) => {
       authorization
     )
 
+    headers.set(
+      "Set-Cookie",
+      `webviewToken=${decryptedData}; Secure; HttpOnly; Path=/; SameSite=Strict;`
+    )
+    headers.set("Cookie", `webviewToken=${decryptedData}`)
+
     if (myPagesWebviews.includes(nextUrl.pathname)) {
       return NextResponse.rewrite(
         new URL(`/${lang}/webview/account-page/${uid}`, nextUrl),
         {
-          headers: {
-            "Set-Cookie": `webviewToken=${decryptedData}; Secure; HttpOnly; Path=/; SameSite=Strict;`,
-            Cookie: `webviewToken=${decryptedData}`,
-          },
           request: {
             headers,
           },
@@ -114,10 +116,6 @@ export const middleware: NextMiddleware = async (request) => {
       return NextResponse.rewrite(
         new URL(`/${lang}/webview/loyalty-page/${uid}`, nextUrl),
         {
-          headers: {
-            "Set-Cookie": `webviewToken=${decryptedData}; Secure; HttpOnly; Path=/; SameSite=Strict;`,
-            Cookie: `webviewToken=${decryptedData}`,
-          },
           request: {
             headers,
           },