From cd3c5491ec4c0ef9a3090882de546be1d2e0ce68 Mon Sep 17 00:00:00 2001 From: Christel Westerberg Date: Tue, 28 May 2024 12:15:40 +0200 Subject: [PATCH] fix: move fonts and refactor headers in middleware --- .../(live)/(protected)/my-pages/layout.tsx | 2 +- app/[lang]/(live)/error.tsx | 2 +- app/[lang]/(live)/layout.tsx | 2 +- .../(live)/middleware-error/[status]/page.tsx | 2 +- app/[lang]/webview/layout.tsx | 2 +- app/[lang]/webview/test/page.tsx | 22 ------------------- app/{[lang] => }/fonts.ts | 2 +- app/global-error.tsx | 2 +- middlewares/webView.ts | 14 +++++------- 9 files changed, 13 insertions(+), 37 deletions(-) delete mode 100644 app/[lang]/webview/test/page.tsx rename app/{[lang] => }/fonts.ts (86%) diff --git a/app/[lang]/(live)/(protected)/my-pages/layout.tsx b/app/[lang]/(live)/(protected)/my-pages/layout.tsx index f5965b1fd..935f1addd 100644 --- a/app/[lang]/(live)/(protected)/my-pages/layout.tsx +++ b/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" diff --git a/app/[lang]/(live)/error.tsx b/app/[lang]/(live)/error.tsx index 620ae5c4a..b05823085 100644 --- a/app/[lang]/(live)/error.tsx +++ b/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" diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx index 8739a23d3..b3e6c387f 100644 --- a/app/[lang]/(live)/layout.tsx +++ b/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" diff --git a/app/[lang]/(live)/middleware-error/[status]/page.tsx b/app/[lang]/(live)/middleware-error/[status]/page.tsx index 071b85436..24c9b2818 100644 --- a/app/[lang]/(live)/middleware-error/[status]/page.tsx +++ b/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" diff --git a/app/[lang]/webview/layout.tsx b/app/[lang]/webview/layout.tsx index bf9ccb5b0..6947b119d 100644 --- a/app/[lang]/webview/layout.tsx +++ b/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" diff --git a/app/[lang]/webview/test/page.tsx b/app/[lang]/webview/test/page.tsx deleted file mode 100644 index bca6f0dd7..000000000 --- a/app/[lang]/webview/test/page.tsx +++ /dev/null @@ -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 ( -
-
-

Hello From WebView Test Page!

-

{data.firstName}

-
-
- ) -} diff --git a/app/[lang]/fonts.ts b/app/fonts.ts similarity index 86% rename from app/[lang]/fonts.ts rename to app/fonts.ts index b77335afc..ca626579f 100644 --- a/app/[lang]/fonts.ts +++ b/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", }, diff --git a/app/global-error.tsx b/app/global-error.tsx index e25b624bf..196810c66 100644 --- a/app/global-error.tsx +++ b/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" diff --git a/middlewares/webView.ts b/middlewares/webView.ts index 1ad71840c..21b5aba1a 100644 --- a/middlewares/webView.ts +++ b/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, },