From c516860466fa53d92a75864096fbf4e799518160 Mon Sep 17 00:00:00 2001 From: Hrishikesh Vaipurkar Date: Wed, 30 Jul 2025 08:29:15 +0000 Subject: [PATCH] Merged in fix/SW-2358-find-my-booking-logged-in-user (pull request #2572) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(SW-2358): Enabled anonymous booking view for logged in user * fix(SW-2358): Enabled anonymous booking view for logged in user * fix(SW-2358): Fixed test case for anonymous booking Approved-by: Matilda Landström --- .../MyStay/accessBooking.test.ts | 5 ++-- .../HotelReservation/MyStay/accessBooking.ts | 24 +++++++++---------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/apps/scandic-web/components/HotelReservation/MyStay/accessBooking.test.ts b/apps/scandic-web/components/HotelReservation/MyStay/accessBooking.test.ts index fd9d8dba4..bb516a939 100644 --- a/apps/scandic-web/components/HotelReservation/MyStay/accessBooking.test.ts +++ b/apps/scandic-web/components/HotelReservation/MyStay/accessBooking.test.ts @@ -3,7 +3,6 @@ import { describe, expect, it } from "vitest" import accessBooking, { ACCESS_GRANTED, ERROR_BAD_REQUEST, - ERROR_FORBIDDEN, ERROR_NOT_FOUND, ERROR_UNAUTHORIZED, } from "./accessBooking" @@ -87,7 +86,7 @@ describe("Access booking", () => { accessBooking(loggedOutGuest, "Booking", null, JSON.stringify(cookie)) ).toBe(ACCESS_GRANTED) }) - it("should prompt logout if user is logged in", () => { + it("should enable access if user is logged in and fetching anonymous booking", () => { const cookie: AdditionalInfoCookieValue = { confirmationNumber: "123456789", firstName: "Anonymous", @@ -101,7 +100,7 @@ describe("Access booking", () => { authenticatedUser, JSON.stringify(cookie) ) - ).toBe(ERROR_FORBIDDEN) + ).toBe(ACCESS_GRANTED) }) it("should prompt for more if first name is missing", () => { const cookie: Partial = { diff --git a/apps/scandic-web/components/HotelReservation/MyStay/accessBooking.ts b/apps/scandic-web/components/HotelReservation/MyStay/accessBooking.ts index e832294e2..920e50a5c 100644 --- a/apps/scandic-web/components/HotelReservation/MyStay/accessBooking.ts +++ b/apps/scandic-web/components/HotelReservation/MyStay/accessBooking.ts @@ -42,21 +42,19 @@ function accessBooking( user.email.toLowerCase() === guest.email?.toLowerCase() ) { return ACCESS_GRANTED - } else { - return ERROR_FORBIDDEN } + } + + const values = + cookie && (JSON.parse(cookie) as Partial) + if ( + values && + values.firstName?.toLowerCase() === guest.firstName?.toLowerCase() && + values.email?.toLowerCase() === guest.email?.toLowerCase() + ) { + return ACCESS_GRANTED } else { - const values = - cookie && (JSON.parse(cookie) as Partial) - if ( - values && - values.firstName?.toLowerCase() === guest.firstName?.toLowerCase() && - values.email?.toLowerCase() === guest.email?.toLowerCase() - ) { - return ACCESS_GRANTED - } else { - return ERROR_BAD_REQUEST - } + return ERROR_BAD_REQUEST } }