Merged in fix/feature-flag-scopes (pull request #743)

Fix/feature flag scopes

Approved-by: Christel Westerberg

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 (
     <div className={styles.container}>
       <LoadingSpinner />

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

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<LangParams>) {
+  if (env.HIDE_FOR_NEXT_RELEASE) {
+    return null
+  }
+
   setLang(params.lang)
   preload()
 

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) => {