Merged in fix/SW-3550-member-rates-should-only- (pull request #3005)

fix(SW-3550): Treat unlinked User as non-logged user within booking flow

Approved-by: Joakim Jäderberg

apps/partner-sas/components/BookingFlowProviders.tsx

@@ -14,11 +14,13 @@ const logger = createLogger("BookingFlowProviders")
 
 export function BookingFlowProviders({ children }: { children: ReactNode }) {
   const user = useBookingFlowUser()
+  const isLinkedUser =
+    !!user.data && user.data.type === "partner-sas" && user.data.isLinked
 
   return (
     <BookingFlowContextProvider
       data={{
-        isLoggedIn: user.state === "loaded" && !!user.data,
+        isLoggedIn: user.state === "loaded" && isLinkedUser,
         user,
       }}
     >
@@ -60,6 +62,7 @@ function useBookingFlowUser(): BookingFlowUser {
       firstName: euroBonusProfile.firstName || null,
       lastName: euroBonusProfile.lastName || null,
       email: euroBonusProfile.email,
+      isLinked: euroBonusProfile.linkStatus === "LINKED",
     },
   }
 }

apps/partner-sas/globals.css

@@ -127,7 +127,7 @@ body.partner-sas {
 
   --Scandic-Brand-Warm-White: var(--Background-Primary);
   --Text-Accent-Primary: var(--SAS-20);
-  --Text-Accent-Secondary: var(--SAS-40);
+  --Text-Accent-Secondary: var(--SAS-Gray-40);
   --Text-Heading: var(--SAS-Gray-20);
   --Text-Interactive-Default: var(--SAS-40);
   --Text-Interactive-Hover: var(--SAS-40);

apps/partner-sas/lib/trpc/index.ts

@@ -47,7 +47,9 @@ export async function createAppContext() {
     },
     getScandicUser: async () => {
       const session = await getSession()
-      if (!session) return null
+
+      // The getSession will either return empty object or session object, hence we need to validate if the object is empty or not
+      if (!session?.access_token) return null
 
       return await getVerifiedUser({
         token: {

packages/booking-flow/lib/bookingFlowContext.tsx

@@ -12,6 +12,7 @@ export type BookingFlowUser =
   | (BaseUser & {
       type: "partner-sas"
       partnerLoyaltyNumber: `EB${string}`
+      isLinked: boolean
     })
   | (BaseUser & {
       type: "scandic"

packages/booking-flow/lib/components/BookingConfirmation/Receipt/Room/room.module.css

@@ -41,7 +41,7 @@
   color: var(--Text-Default);
 
   &.discounted {
-    color: var(--Text-Accent-Primary);
+    color: var(--Surface-Brand-Primary-1-OnSurface-Accent);
   }
 }
 

packages/booking-flow/lib/components/BookingConfirmation/Receipt/TotalPrice/totalPrice.module.css

@@ -15,7 +15,7 @@
   color: var(--Text-Default);
 
   &.discounted {
-    color: var(--Text-Accent-Primary);
+    color: var(--Surface-Brand-Primary-1-OnSurface-Accent);
   }
 }
 

packages/booking-flow/lib/components/EnterDetails/Summary/UI/ui.module.css

@@ -64,7 +64,7 @@
   color: var(--Text-Default);
 
   &.discounted {
-    color: var(--Text-Accent-Primary);
+    color: var(--Surface-Brand-Primary-1-OnSurface-Accent);
   }
 }