@sabstravtech/obtservices 0.2.2601130820 → 0.2.2601230900

package/base/lib/vendor/models/login.model.d.ts

@@ -10,7 +10,8 @@ export declare enum LoginErrorReason {
     PASSWORD_CHANGE = 1,
     LOGED_IN = 2,
     AUTH_ERROR = 3,
-    SSO = 4
+    SSO = 4,
+    MFA_REQUIRED = 5
 }
 export interface PasswordChangeResponse {
     alreadyLoggedIn: boolean;
@@ -34,6 +35,17 @@ export interface LoginResponse {
     loginSuccess: boolean;
     message: string;
     passwordDescription: string;
+    mfa_access_only?: boolean;
+    mfa_expires_after_epoch_ms?: number;
+    user_id?: number;
+}
+export interface MfaLoginRequest {
+    userId: number;
+    mfaCode: string;
+}
+export interface MfaReissueResponse {
+    message?: string;
+    existingTokenTtl?: number;
 }
 export interface LoginErrorData {
     message: string;

package/base/lib/vendor/services/logon.service.d.ts

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import { BaseEventMessenager } from '../classes/event-messenager';
 import { BaseEnvironment } from '../classes/enviroment';
 import { UserData } from '../interfaces/user.data';
-import { AuthInfo, LoginResponse, PasswordChangeResponse } from '../models/login.model';
+import { AuthInfo, LoginResponse, MfaReissueResponse, PasswordChangeResponse } from '../models/login.model';
 import { UserServiceInterface } from '../interfaces/Iuser.service';
 import { AbstractHttpCallService } from './http-call.service';
 import { Router } from '../types/types';
@@ -48,6 +48,14 @@ export declare class BaseLogonService<GLV_F extends GetLatestVersionsFetcherType
     endBecomeUserSession(): Promise<boolean>;
     login(username: string, password: string, again?: boolean): Observable<UserData>;
     handleResponse(data: any): any;
+    /**
+     * Submit MFA code for verification
+     */
+    submitMfaCode(userId: number, mfaCode: string): Observable<UserData>;
+    /**
+     * Request a new MFA code to be sent via email
+     */
+    resendMfaCode(): Observable<MfaReissueResponse>;
     logout(): void;
     clearLoginData(): void;
     resetPassword(passwordResetToken: string, newPassword: string, source: string): Observable<PasswordChangeResponse>;

package/base/lib/vendor/services/url.service.d.ts

@@ -1,5 +1,7 @@
 export declare enum URLS {
     AccessToken = "accessToken",
+    LoginMfa = "loginMfa",
+    ReissueMfaToken = "reissueMfaToken",
     LOGOUT_URL = "logout",
     Refresh = "refreshToken",
     CONFERMA_THUMBNAIL_URL = "https://ssl.conferma.com/Images/PropertyThumbnails/",

package/fesm2022/sabstravtech-obtservices-base.mjs

@@ -1,5 +1,5 @@
 import { BehaviorSubject, of, combineLatest, Subject, forkJoin, Subscription } from 'rxjs';
-import { take, map as map$1, catchError, debounceTime, distinctUntilChanged, switchMap, tap, takeUntil, filter, finalize } from 'rxjs/operators';
+import { take, map as map$1, catchError, debounceTime, distinctUntilChanged, switchMap, tap, takeUntil, filter, finalize, timeout } from 'rxjs/operators';
 import moment from 'moment';
 import { __decorate } from 'tslib';
 import _, { uniq } from 'lodash';
@@ -13750,14 +13750,12 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
             ? this.helpers.makeTimeWindow(dateTime, -timeFlexibility, timeFlexibility)
             : null;
     }
-    makeArrivalTimeWindow(dateTime, window, type) {
+    makeArrivalTimeWindow(dateTime, window) {
         if (window !== TimeWindow.Arrive) {
             return null;
         }
-        const timeFlexibility = type === FlightSearchType.oneWay
-            ? this.tempParams.outTimeFlexibility
-            : this.tempParams.inTimeFlexibility;
-        return this.helpers.makeTimeWindow(dateTime, -timeFlexibility, 0);
+        // Arrive By always uses a fixed 2-hour window before the arrival time
+        return this.helpers.makeTimeWindow(dateTime, -2, 0);
     }
     convertRecentSearchDateTime(date, timeWindow, hours = 2) {
         if (timeWindow) {
@@ -13798,7 +13796,7 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                 outboundDepartureTimeWindow: timeWindow
                     ? timeWindow.outboundTimeWindow.replace(/%3A/g, '')
                     : this.makeDepartureTimeWindow(this.tempParams.outBoundDate, this.tempParams.outTimeCriteria, FlightSearchType.oneWay),
-                outboundArrivalTimeWindow: this.makeArrivalTimeWindow(this.tempParams.outBoundDate, this.tempParams.outTimeCriteria, FlightSearchType.oneWay)
+                outboundArrivalTimeWindow: this.makeArrivalTimeWindow(this.tempParams.outBoundDate, this.tempParams.outTimeCriteria)
             }, {
             passengers: this._passengers,
             returnTrip: this.isReturn,
@@ -13816,7 +13814,7 @@ class FlightEnterpriseSearch extends BaseEnterpriseSearch {
                 returnDepartureTimeWindow: timeWindow
                     ? timeWindow.returnTimeWindow.replace(/%3A/g, '')
                     : this.makeDepartureTimeWindow(this.tempParams.inboundDate, this.tempParams.inTimeCriteria, FlightSearchType.return),
-                returnArrivalTimeWindow: this.makeArrivalTimeWindow(this.tempParams.inboundDate, this.tempParams.inTimeCriteria, FlightSearchType.return),
+                returnArrivalTimeWindow: this.makeArrivalTimeWindow(this.tempParams.inboundDate, this.tempParams.inTimeCriteria),
                 returnCabinClass: this.tempParams.returnCabinClass
                     ? [this.tempParams.returnCabinClass]
                     : null
@@ -29129,6 +29127,12 @@ class SupplementaryBookingInfoImpl {
                     delete userValue.supplementaryInfo.t_loyaltyCode;
                 }
             }
+            if (userValue.supplementaryInfo.meal === '') {
+                userValue.supplementaryInfo.meal = 'None';
+            }
+            if (userValue.supplementaryInfo.specialNeeds === '') {
+                userValue.supplementaryInfo.specialNeeds = 'None';
+            }
             if (userValue.supplementaryInfo.dob) {
                 userValue.supplementaryInfo.dob = this.helpers
                     .ngDateToMoment(userValue.supplementaryInfo.dob)
@@ -29201,6 +29205,12 @@ class SupplementaryBookingInfoImpl {
                     delete userValue.supplementaryInfo.t_loyaltyCode;
                 }
             }
+            if (userValue.supplementaryInfo.meal === '') {
+                userValue.supplementaryInfo.meal = 'None';
+            }
+            if (userValue.supplementaryInfo.specialNeeds === '') {
+                userValue.supplementaryInfo.specialNeeds = 'None';
+            }
             if (userValue.supplementaryInfo.passport) {
                 if (userValue.supplementaryInfo.passport.dateOfExpiry?.year) {
                     userValue.supplementaryInfo.passport.dateOfExpiry = this.helpers.formatIsoDate(this.helpers.ngDateToMoment(userValue.supplementaryInfo.passport.dateOfExpiry));
@@ -30649,6 +30659,7 @@ var LoginErrorReason;
     LoginErrorReason[LoginErrorReason["LOGED_IN"] = 2] = "LOGED_IN";
     LoginErrorReason[LoginErrorReason["AUTH_ERROR"] = 3] = "AUTH_ERROR";
     LoginErrorReason[LoginErrorReason["SSO"] = 4] = "SSO";
+    LoginErrorReason[LoginErrorReason["MFA_REQUIRED"] = 5] = "MFA_REQUIRED";
 })(LoginErrorReason || (LoginErrorReason = {}));
 class AuthInfo {
     username;
@@ -31493,7 +31504,7 @@ class BaseEnterpriseBasketService {
             this.getUserBasketsFetcher
                 .fetchList({
                 basketStatuses: [BasketStatus.Open],
-                user: this.userService.getfullUserDetails(true).userData.value.user_id.toString()
+                user: this.userService.getfullUserDetails(true)?.userData?.value?.user_id?.toString()
             })
                 .pipe(take(1))
                 .subscribe((baskets) => {
@@ -31885,7 +31896,7 @@ class BaseEnterpriseBasketService {
     async findOrCreateBasket(id, getBookedBasket = false, createdByGut = false) {
         let basket = null;
         if (!id) {
-            let allOpenBaskets = await this.getAllOpenBaskets(this.userService.getfullUserDetails(true).userData.value.user_id.toString());
+            let allOpenBaskets = await this.getAllOpenBaskets(this.userService.getfullUserDetails(true)?.userData?.value?.user_id?.toString());
             if (!this.userService.bobo) {
                 // ENT-3276 remove baskest with invoked user if we are not currently invoking a user // ? - should we do the opposite as well?
                 allOpenBaskets = allOpenBaskets.filter(basket => !basket.invokedUser);
@@ -32841,20 +32852,21 @@ class BaseEnterpriseBasketService {
     }
     async updateExchangeBasket(data) {
         const updatedBasket = await this.updateExchangeBasketUpdater.updateOne(data).toPromise();
-        const selectedItem = updatedBasket.basketItems.filter(item => item.id === data.basketItemId);
-        const reasonAction = await this.requiresService.checkBasketReason(updatedBasket, selectedItem);
-        if (!reasonAction) {
-            delete data.reasonKeys;
-            await this.updateExchangeBasketUpdater.updateOne(data).toPromise();
-        }
-        else {
-            const updatedExchange = await this.getBasket({
-                convertCurrencyTo: this.userCurrency,
-                id: data.basket,
-                withSupplemental: true
-            }).toPromise();
-            return updatedExchange;
+        if (data.reasonKeys !== null) {
+            const selectedItem = updatedBasket.basketItems.filter(item => item.id === data.basketItemId);
+            const reasonAction = await this.requiresService.checkBasketReason(updatedBasket, selectedItem);
+            if (!reasonAction) {
+                delete data.reasonKeys;
+                await this.updateExchangeBasketUpdater.updateOne(data).toPromise();
+                return;
+            }
         }
+        const updatedExchange = await this.getBasket({
+            convertCurrencyTo: this.userCurrency,
+            id: data.basket,
+            withSupplemental: true
+        }).toPromise();
+        return updatedExchange;
     }
 }
 
@@ -35169,7 +35181,7 @@ class BaseUserService {
         return this.fullUserDetails || this.storageService.getSessionItem('lightning_user_data');
     }
     getProfileConfig() {
-        return this.fullUserDetails.allDetails.value.profileConfig;
+        return this.fullUserDetails.allDetails.value?.profileConfig;
     }
     getUserDropdownInfo() {
         const dropdown_info = {
@@ -35279,6 +35291,7 @@ class BaseUserService {
         this.fullUserDetails.userConfigs.next(null);
         this.fullUserDetails.userServices.next(null);
         this.fullUserDetails.messages.next(null);
+        this.fullUserDetails.allDetails.next(null);
         this.changeUser.next(this.fullUserDetails);
     }
     createGuestUser(title, forename, surname, email, guestMobileCountryNo, guestMobileNumber, guest_nationality, gender, isChild, isInfant, childDOB) {
@@ -35316,34 +35329,34 @@ class BaseUserService {
         return services && !!services[service];
     }
     isTraveller() {
-        return this.fullUserDetails.userData.value.booker_type === BookerType.Traveller;
+        return this.fullUserDetails.userData.value?.booker_type === BookerType.Traveller;
     }
     userIsAgent() {
         return this.fullUserDetails.userData.value?.agent_booker;
     }
     canOverrideApproval() {
-        return this.fullUserDetails.allDetails.value.canOverrideApproval;
+        return this.fullUserDetails.allDetails.value?.canOverrideApproval;
     }
     userIsAdmin() {
-        return this.fullUserDetails.userData.value.admin;
+        return this.fullUserDetails.userData.value?.admin;
     }
     userIsCompanyAdmin() {
-        return this.fullUserDetails.userData.value.company_admin;
+        return this.fullUserDetails.userData.value?.company_admin;
     }
     userIsTmcAdmin() {
-        return this.fullUserDetails.userData.value.tmc_admin;
+        return this.fullUserDetails.userData.value?.tmc_admin;
     }
     userTmcId() {
-        return this.fullUserDetails.userData.value.tmc_id;
+        return this.fullUserDetails.userData.value?.tmc_id;
     }
     isSelfBook() {
-        return this.fullUserDetails.userData.value.booker_type === BookerType.SelfBook;
+        return this.fullUserDetails.userData.value?.booker_type === BookerType.SelfBook;
     }
     isBooker() {
-        return this.fullUserDetails.userData.value.booker_type === BookerType.Booker;
+        return this.fullUserDetails.userData.value?.booker_type === BookerType.Booker;
     }
     getUserId() {
-        return this.fullUserDetails.userData.value.user_id;
+        return this.fullUserDetails.userData.value?.user_id;
     }
     getUserPrimaryAddress(userId) {
         return this.getUser(userId).pipe(map$1((user) => user.addresses || []), map$1((addresses) => {
@@ -35373,10 +35386,10 @@ class BaseUserService {
         return this.baseConfirmMessagesUpdater.updateOne({ messages: id });
     }
     userIsRoot() {
-        return this.fullUserDetails.userData.value.booker_type === BookerType.Root;
+        return this.fullUserDetails.userData.value?.booker_type === BookerType.Root;
     }
     userIsSupportAgent() {
-        return !!this.fullUserDetails.userData.value.support_agent;
+        return !!this.fullUserDetails.userData.value?.support_agent;
     }
     getUserCompanies(query = null) {
         return query
@@ -35390,31 +35403,23 @@ class BaseUserService {
         return this.getOfficeUserFetcher.fetchList({ id }).pipe(take(1));
     }
     getUserCompany() {
-        return this.getCompanyById(this.fullUserDetails.userData.value.company_id.toString());
+        return this.getCompanyById(this.fullUserDetails.userData.value?.company_id?.toString());
     }
     getUser(userId) {
-        const user = this.getfullUserDetails();
-        return this.getUserFetcher.fetchOne({
-            id: userId ? userId : user.userData.value.user_id.toString()
-        });
+        const resolvedUserId = userId ?? this.fullUserDetails.userData.value?.user_id?.toString();
+        return this.getUserFetcher.fetchOne({ id: resolvedUserId });
     }
     getUserMi(userId) {
-        const user = this.getfullUserDetails();
-        return this.userMiFetcher.fetchOne({
-            id: userId ? userId : user.userData.value.user_id.toString()
-        });
+        const resolvedUserId = userId ?? this.fullUserDetails.userData.value?.user_id?.toString();
+        return this.userMiFetcher.fetchOne({ id: resolvedUserId });
     }
     getUserDocumentLoyalty(userId) {
-        const user = this.getfullUserDetails();
-        return this.UserDocumentLoyalty.fetchOne({
-            id: userId ? userId : user.userData.value.user_id.toString()
-        });
+        const resolvedUserId = userId ?? this.fullUserDetails.userData.value?.user_id?.toString();
+        return this.UserDocumentLoyalty.fetchOne({ id: resolvedUserId });
     }
     getUserEmergencyContact(userId) {
-        const user = this.getfullUserDetails();
-        return this.UserEmergencyContact.fetchOne({
-            id: userId ? userId : user.userData.value.user_id.toString()
-        });
+        const resolvedUserId = userId ?? this.fullUserDetails.userData.value?.user_id?.toString();
+        return this.UserEmergencyContact.fetchOne({ id: resolvedUserId });
     }
     setUserLanguage(id) {
         return this.setUserLanguageUpdater.updateOne({ language: id });
@@ -35436,7 +35441,7 @@ class BaseUserService {
         return this.getUserGuestsFetcher.fetchList({ officeId });
     }
     canInvokeUser() {
-        return this.fullUserDetails.allDetails.value.canInvokeUser;
+        return this.fullUserDetails.allDetails.value?.canInvokeUser;
     }
     getOffice() {
         return this.getOfficeFetcher.fetchList();
@@ -35463,13 +35468,13 @@ class BaseUserService {
         return !!this.fullUserDetails.allDetails.value;
     }
     ermCompanyType() {
-        return this.fullUserDetails.userData.value.company_type;
+        return this.fullUserDetails.userData.value?.company_type;
     }
     getSearchCompanyApprovers(email) {
         return this.searchCompanyApproversFetcher.fetchList({ email });
     }
     isUserAgentBook() {
-        return this.fullUserDetails.userData.value.agent_booker;
+        return this.fullUserDetails.userData.value?.agent_booker;
     }
     getPreferenceValues() {
         return PREFERENCE_VALUES;
@@ -35600,17 +35605,17 @@ class BaseUserService {
     }
     userIsAnApprover() {
         const user = this.getfullUserDetails();
-        return user.allDetails.value.approver;
+        return user?.allDetails?.value?.approver;
     }
     /**
      * @description - returns if a user is enabled for singlesignon ONLY - if user has more than one authentication method returns false
      */
     userIsSSO() {
         const user = this.getfullUserDetails();
-        return ((user?.allDetails.value.authMethods.length === 1 &&
-            user?.allDetails.value.authMethods.includes('singlesignon')) ||
-            (user?.allDetails.value.company.authMethods.length === 1 &&
-                user?.allDetails.value.company.authMethods.includes('singlesignon')));
+        return ((user?.allDetails?.value?.authMethods?.length === 1 &&
+            user?.allDetails?.value?.authMethods?.includes('singlesignon')) ||
+            (user?.allDetails?.value?.company?.authMethods?.length === 1 &&
+                user?.allDetails?.value?.company?.authMethods?.includes('singlesignon')));
     }
     deleteGuest(id) {
         return this.deleteGuestUpdater.updateOne({
@@ -35645,7 +35650,7 @@ class BaseUserService {
         return this.removePreferredTransportHubUpdater.updateOne({ serviceType, hubCode });
     }
     canSeeBookingsOfOthers() {
-        return this.fullUserDetails.allDetails.value.canSeeBookingsOfOthers;
+        return this.fullUserDetails.allDetails.value?.canSeeBookingsOfOthers;
     }
     getUserMiStack(userId, defaultValueConsumingOnly, serviceId) {
         const query = { userId, defaultValueConsumingOnly, serviceId };
@@ -39378,7 +39383,7 @@ class BaseEnterpriseSearchService {
     }
     validateTravellers() {
         this.travellerValidationMessages = [];
-        switch (this.userService.fullUserDetails.userData.value.booker_type) {
+        switch (this.userService.fullUserDetails.userData.value?.booker_type) {
             case BookerType.SelfBook:
                 if (!(this.selectedTravellers.length === 1 && this.travellersContainUser())) {
                     // this should never trigger under normal conditions as the user should be loaded in as a traveller on login
@@ -40885,6 +40890,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
 var URLS;
 (function (URLS) {
     URLS["AccessToken"] = "accessToken";
+    URLS["LoginMfa"] = "loginMfa";
+    URLS["ReissueMfaToken"] = "reissueMfaToken";
     URLS["LOGOUT_URL"] = "logout";
     URLS["Refresh"] = "refreshToken";
     URLS["CONFERMA_THUMBNAIL_URL"] = "https://ssl.conferma.com/Images/PropertyThumbnails/";
@@ -41034,8 +41041,19 @@ class BaseLogonService {
                 this.searchService.reset();
                 this.searchService.resetSearchParams();
                 this.basketService.reset();
-                this.router.navigate(['main']);
-                resolve(true);
+                const newUserId = data.jwtObject.user_id?.toString();
+                this.userService.fullUserDetails.allDetails
+                    .pipe(filter(user => user?.id === newUserId), take(1), timeout(10000))
+                    .subscribe({
+                    next: () => {
+                        this.router.navigate(['main']);
+                        resolve(true);
+                    },
+                    error: () => {
+                        this.router.navigate(['main']);
+                        resolve(true);
+                    }
+                });
             }, error => {
                 this.becomingUser = false;
                 reject(error);
@@ -41086,6 +41104,16 @@ class BaseLogonService {
     **/
     handleResponse(data) {
         if (typeof data === 'object' && data.jwt) {
+            // Check if MFA is required (mfa_access_only flag in JWT)
+            if (data.jwtObject?.mfa_access_only) {
+                const loginResponse = {
+                    ...data,
+                    mfa_access_only: data.jwtObject.mfa_access_only,
+                    mfa_expires_after_epoch_ms: data.jwtObject.mfa_expires_after_epoch_ms,
+                    user_id: data.jwtObject.user_id
+                };
+                throw new LoginError(LoginErrorReason.MFA_REQUIRED, loginResponse, undefined, undefined, 'MFA verification required');
+            }
             this.userService.setUser(data.jwtObject);
             this.isLoggedIn = true;
             delete data.jwt;
@@ -41101,6 +41129,25 @@ class BaseLogonService {
         }
         return data;
     }
+    /**
+     * Submit MFA code for verification
+     */
+    submitMfaCode(userId, mfaCode) {
+        const request = { userId, mfaCode };
+        return this.http
+            .formEncodedPostNoErrorHandling(URLS.LoginMfa, request)
+            .pipe(take(1), map$1((value) => {
+            return this.handleResponse(value);
+        }));
+    }
+    /**
+     * Request a new MFA code to be sent via email
+     */
+    resendMfaCode() {
+        return this.http
+            .formEncodedPostNoErrorHandling(URLS.ReissueMfaToken, {})
+            .pipe(take(1));
+    }
     logout() {
         const ssoUser = this.userService.userIsSSO();
         console.log(`+++ User is SSO only: ${ssoUser} +++`);