From d5abe13a7e323a3a20f52c66394ae993065b1e98 Mon Sep 17 00:00:00 2001 From: Michael Zetterberg Date: Wed, 23 Oct 2024 12:18:08 +0200 Subject: [PATCH 1/2] fix: add feature flag for service token scopes --- server/tokenManager.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/tokenManager.ts b/server/tokenManager.ts index cdd6078dc..24180d017 100644 --- a/server/tokenManager.ts +++ b/server/tokenManager.ts @@ -70,7 +70,12 @@ async function fetchServiceToken(scopes: string[]) { } export async function getServiceToken() { - const scopes = ["profile", "hotel", "booking"] + let scopes: string[] = [] + if (env.HIDE_FOR_NEXT_RELEASE) { + scopes = ["profile"] + } else { + scopes = ["profile", "hotel", "booking"] + } const tag = generateServiceTokenTag(scopes) const getCachedJwt = unstable_cache( async (scopes) => { From 52c5f6d29ecfce9f0766432096f0891ce7d1c933 Mon Sep 17 00:00:00 2001 From: Michael Zetterberg Date: Wed, 23 Oct 2024 12:18:55 +0200 Subject: [PATCH 2/2] fix: feature flag booking widget and sitewidealert --- app/[lang]/(live)/@bookingwidget/loading.tsx | 6 ++++++ app/[lang]/(live)/@bookingwidget/page.tsx | 5 +++++ app/[lang]/(live)/@sitewidealert/page.tsx | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/app/[lang]/(live)/@bookingwidget/loading.tsx b/app/[lang]/(live)/@bookingwidget/loading.tsx index 2c203967d..5e05ba68c 100644 --- a/app/[lang]/(live)/@bookingwidget/loading.tsx +++ b/app/[lang]/(live)/@bookingwidget/loading.tsx @@ -1,8 +1,14 @@ +import { env } from "@/env/server" + import LoadingSpinner from "@/components/LoadingSpinner" import styles from "./loading.module.css" export default function LoadingBookingWidget() { + if (env.HIDE_FOR_NEXT_RELEASE) { + return null + } + return (
diff --git a/app/[lang]/(live)/@bookingwidget/page.tsx b/app/[lang]/(live)/@bookingwidget/page.tsx index 13a414cba..7e197d0fa 100644 --- a/app/[lang]/(live)/@bookingwidget/page.tsx +++ b/app/[lang]/(live)/@bookingwidget/page.tsx @@ -1,8 +1,13 @@ +import { env } from "@/env/server" import { serverClient } from "@/lib/trpc/server" import BookingWidget, { preload } from "@/components/BookingWidget" export default async function BookingWidgetPage() { + if (env.HIDE_FOR_NEXT_RELEASE) { + return null + } + preload() // Get the booking widget show/hide status based on page specific settings diff --git a/app/[lang]/(live)/@sitewidealert/page.tsx b/app/[lang]/(live)/@sitewidealert/page.tsx index 618f3b5cb..be7ae2256 100644 --- a/app/[lang]/(live)/@sitewidealert/page.tsx +++ b/app/[lang]/(live)/@sitewidealert/page.tsx @@ -1,11 +1,17 @@ import { Suspense } from "react" +import { env } from "@/env/server" + import SitewideAlert, { preload } from "@/components/SitewideAlert" import { setLang } from "@/i18n/serverContext" import type { LangParams, PageArgs } from "@/types/params" export default function SitewideAlertPage({ params }: PageArgs) { + if (env.HIDE_FOR_NEXT_RELEASE) { + return null + } + setLang(params.lang) preload()