@sabstravtech/obtservices 0.2.2601230900 → 0.2.2602271010

package/fesm2022/sabstravtech-obtservices-base.mjs

@@ -602,6 +602,7 @@ var BasketItemStatus;
     BasketItemStatus["Cancelled"] = "CANCELLED";
     BasketItemStatus["Open"] = "OPEN";
     BasketItemStatus["PartiallyCancelled"] = "PARTIALLY_CANCELLED";
+    BasketItemStatus["ProvisionallyCancelled"] = "PROVISIONALLY_CANCELLED";
     BasketItemStatus["Requested"] = "REQUESTED";
 })(BasketItemStatus || (BasketItemStatus = {}));
 /** BasketStatus */
@@ -17117,6 +17118,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
     static STORAGE_SESSION_RESULTS = 'results_hotel';
     type = ServiceType.Hotel;
     travellers;
+    searchId;
     location_types = new BehaviorSubject([]);
     offices = new BehaviorSubject([]);
     lastActivePage = new BehaviorSubject(null);
@@ -17421,6 +17423,9 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         this.getRailStationFetcher = getRailStationFetcher;
         this.applyHotelRulesFetcher = applyHotelRulesFetcher;
         this.results_details.chains = new Set();
+        this.hotelFetcher.searchId$.subscribe(searchId => {
+            this.searchId = searchId;
+        });
         const data = storageService.getSessionItem(HotelEnterpriseSearch.STORAGE_SESSION_PARAMS) || {
             tempParams: {}
         };
@@ -17578,7 +17583,8 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         this.applyHotelRulesFetcher
             .fetchKeyedObject('id', {
             data,
-            originalSearchQuery: this.query
+            originalSearchQuery: this.query,
+            searchId: this.searchId
         })
             .pipe(take(1))
             .subscribe((data1) => {
@@ -17819,7 +17825,7 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
         });
         this.buildQuery();
         return this.applyHotelRulesFetcher
-            .fetchKeyedObject('id', { data, originalSearchQuery: this.query })
+            .fetchKeyedObject('id', { data, originalSearchQuery: this.query, searchId: this.searchId })
             .pipe(take(1), map$1((data1) => {
             availabilityObservables.forEach((item) => {
                 if (data1[item.id]) {
@@ -19107,7 +19113,8 @@ class HotelEnterpriseSearch extends BaseEnterpriseSearch {
                     co2PerPassenger: hotel.co2PerPassenger,
                     reasonKeys: hotelRoom.requiresReasonKeys,
                     approvalKeys: hotelRoom.requiresApprovalKeys,
-                    agentOverrodeUnavailable: hotelRoom.unavailable
+                    agentOverrodeUnavailable: hotelRoom.unavailable,
+                    policyToken: hotelRoom.policyToken
                 }, intBasket, this.searchService, 
                 // this is an array of 1 or 2 travellers which go in 1 room
                 // chunk
@@ -24919,7 +24926,8 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
                 approvalKeys: [
                     ...(outboundFare.requiresApprovalKeys || []),
                     ...(inboundFare.requiresApprovalKeys || [])
-                ]
+                ],
+                policyToken: outboundFare.policyToken || inboundFare.policyToken || ''
             };
             // if inTicketExtras or outTicketExtras exists add the object to basketItem
             // dont show ticketExtras for GMT. We will have a new ticket for ticketExtras
@@ -25383,10 +25391,16 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
             returnDepartureDateTime: this.helpers.formatGraphQLDateTime(tempParams.inBoundDateTime),
             viaLocationId: tempParams.viaLocation?.railstation?.id,
             railCardQualifiers: tempParams.railCards
-                ?.filter(x => x)
-                ?.map((railCard) => {
-                return { code: railCard.code, number: railCard.code, userId: railCard.userId };
-            }),
+                ?.map((railCard, index) => {
+                if (!railCard?.code)
+                    return null;
+                return {
+                    code: railCard.code,
+                    number: railCard.number || '',
+                    userId: this.trainlineTravellers[index]?.originalUserGuestId
+                };
+            })
+                ?.filter(x => x),
             exchangeDirection: tempParams.exchangeDirection,
             exchangeFromOrderID: tempParams.exchangeFromOrderID,
             transactionIdentifier: tempParams.transactionIdentifier
@@ -25758,7 +25772,8 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
                     : null,
                 agentOverrodeUnavailable: railFare.unavailable,
                 reasonKeys: railFare.requiresReasonKeys,
-                approvalKeys: railFare.requiresApprovalKeys
+                approvalKeys: railFare.requiresApprovalKeys,
+                policyToken: railFare.policyToken || ''
             };
             // if ticketExtras exists add the object to basketItem
             // dont show ticketExtras for DTD. We will have a new ticket for ticketExtras
@@ -25919,7 +25934,8 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
                     ...(outboundFare.requiresApprovalKeys || []),
                     ...(inboundFare.requiresApprovalKeys || [])
                 ],
-                agentOverrodeUnavailable: outboundFare.unavailable || inboundFare.unavailable
+                agentOverrodeUnavailable: outboundFare.unavailable || inboundFare.unavailable,
+                policyToken: outboundFare.policyToken || inboundFare.policyToken || ''
             };
             // if ticketExtras exists add the object to basketItem
             // dont show ticketExtras for DTD. We will have a new ticket for ticketExtras
@@ -27115,7 +27131,8 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
                     : null,
                 agentOverrodeUnavailable: railFare.unavailable,
                 reasonKeys: railFare.requiresReasonKeys,
-                approvalKeys: railFare.requiresApprovalKeys
+                approvalKeys: railFare.requiresApprovalKeys,
+                policyToken: railFare.policyToken || ''
             };
             // if ticketExtras exists add the object to basketItem
             if (outTicketExtras && !railFare.type.toLowerCase().includes('travelcard')) {
@@ -27272,7 +27289,8 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
                 approvalKeys: [
                     ...(outboundFare.requiresApprovalKeys || []),
                     ...(inboundFare.requiresApprovalKeys || [])
-                ]
+                ],
+                policyToken: outboundFare.policyToken || inboundFare.policyToken || ''
             };
             // if inTicketExtras or outTicketExtras exists add the object to basketItem
             // dont show ticketExtras for GMT. We will have a new ticket for ticketExtras
@@ -27423,7 +27441,8 @@ class RailEnterpriseSearch extends BaseEnterpriseSearch {
                     ...(outboundFare.requiresApprovalKeys || []),
                     ...(inboundFare.requiresApprovalKeys || [])
                 ],
-                agentOverrodeUnavailable: outboundFare.unavailable || inboundFare.unavailable
+                agentOverrodeUnavailable: outboundFare.unavailable || inboundFare.unavailable,
+                policyToken: outboundFare.policyToken || inboundFare.policyToken || ''
             };
             // if ticketExtras exists add the object to basketItem
             // dont show ticketExtras for DTD. We will have a new ticket for ticketExtras
@@ -29157,7 +29176,7 @@ class SupplementaryBookingInfoImpl {
                     userValue.supplementaryInfo.specificSeatSelection = [
                         {
                             seatId: seatsCopy.seat.seats[0].seatId,
-                            passengerPricePointId: seatsCopy.seat.seats[0].availablePassengerPricePoints[0],
+                            passengerPricePointId: seatsCopy.seat.seats[0].availablePassengerPricePoints[0] || '',
                             url: seatsCopy.seat.url,
                             price: seatsCopy.seat.seats[0].price
                         }
@@ -29169,7 +29188,7 @@ class SupplementaryBookingInfoImpl {
                     }
                     userValue.supplementaryInfo.specificSeatSelection.push({
                         seatId: seatsCopy.returnSeat.seats[0].seatId,
-                        passengerPricePointId: seatsCopy.returnSeat.seats[0].availablePassengerPricePoints[0],
+                        passengerPricePointId: seatsCopy.returnSeat.seats[0].availablePassengerPricePoints[0] || '',
                         url: seatsCopy.returnSeat.url,
                         price: seatsCopy.returnSeat.seats[0].price
                     });
@@ -29234,7 +29253,7 @@ class SupplementaryBookingInfoImpl {
                     {
                         seatId: userValue.supplementaryInfo.specificSeatSelection.seats[0].seatId,
                         passengerPricePointId: userValue.supplementaryInfo.specificSeatSelection.seats[0]
-                            .availablePassengerPricePoints[0],
+                            .availablePassengerPricePoints[0] || '',
                         url: userValue.supplementaryInfo.specificSeatSelection.url,
                         price: userValue.supplementaryInfo.specificSeatSelection.seats[0].price
                     }
@@ -29507,10 +29526,15 @@ class BaseCarhireQuoteFetcher extends FetchableList {
     }
 }
 class BaseHotelQuoteFetcher extends FetchableList {
+    searchId$ = new Subject();
     constructor(gql, helpers, modalService) {
         super(gql, helpers, modalService);
     }
     getDataFromResult(results) {
+        const searchId = results?.data?.searchHotels?.searchId;
+        if (searchId) {
+            this.searchId$.next(searchId);
+        }
         return results?.data?.searchHotels?.results;
     }
 }
@@ -39454,8 +39478,7 @@ class BaseEnterpriseSearchService {
     startSearches(url) {
         this.newSearchStarted.next(true);
         this.search_loading = true;
-        let searchObject;
-        searchObject = this._findSearchObtect();
+        const searchObject = this._findSearchObtect();
         if (searchObject) {
             searchObject.chosen = true;
         }
@@ -40952,6 +40975,16 @@ class BaseLogonService {
         this.setEnvironment();
     }
     checkLogin() {
+        // If we've just completed login (e.g. after MFA), the session is already
+        // established — skip the /refreshToken call and start the refresh timer.
+        // This prevents a race condition where the AuthGuard's refreshToken() call
+        // could fail before the cookie/session is fully settled (ENT-14732).
+        if (this.isLoggedIn) {
+            if (!this.timeoutSubscription) {
+                this.setRefresh();
+            }
+            return Promise.resolve(true);
+        }
         return this.refreshToken();
     }
     refreshToken() {
@@ -40997,6 +41030,7 @@ class BaseLogonService {
                 this.logout();
             }
             resolve(false);
+            return;
         }
         if (this.router.url !== '/' &&
             !this.router.url.includes('logon') &&
@@ -41090,10 +41124,12 @@ class BaseLogonService {
         this.clearRefresh();
         this.searchService.resetSearchParams();
         this.userService.setBobo(null);
+        const appType = this.isLightningEnv ? 'lightning' : 'scion';
         return this.http
             .formEncodedPostNoErrorHandling(URLS.AccessToken, {
             username,
-            password
+            password,
+            app: appType
         })
             .pipe(take(1), map$1((value, index) => {
             return this.handleResponse(value);
@@ -41151,7 +41187,7 @@ class BaseLogonService {
     logout() {
         const ssoUser = this.userService.userIsSSO();
         console.log(`+++ User is SSO only: ${ssoUser} +++`);
-        if (this.isLoggedIn) {
+        if (this.isLoggedIn || ssoUser) {
             this.clearRefresh();
             this.isLoggedIn = false;
             this.userService.setBobo(null, !this.isLoggedIn);
@@ -41543,7 +41579,9 @@ class BaseEnterpriseMyBookingsService {
         basketItems = this.helpers.clone(basketItems);
         return basketItems.reduce((total, basketItem) => {
             let seats = [];
+            let price = basketItem.price;
             if (basketItem.detail.isEU) {
+                price = basketItem.detail.fullPrice; // EU seems to have seat price already accounted for in total, not sure if this is consitent across all eu so leaving seat calc in
                 basketItem.guests.forEach((guest) => {
                     if (guest?.savedSupplementaryInfo?.specificSeatSelection) {
                         seats = seats.concat(guest?.savedSupplementaryInfo?.specificSeatSelection);
@@ -41556,9 +41594,9 @@ class BaseEnterpriseMyBookingsService {
                 });
             }
             seats.forEach((seat) => {
-                basketItem.price += seat.price ? seat.price : 0;
+                price += seat.price ? seat.price : 0;
             });
-            return total + basketItem.price;
+            return total + price;
         }, 0);
     }
     getTravellerNamesFromBasketItems(basketItems, isTitleIncluded = false) {