@xsolla/payment-client-core 0.4.0 → 0.5.1

package/fesm2022/xsolla-payment-client-core.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, Inject, Injectable, isDevMode, Pipe, NgModule } from '@angular/core';
-import { firstValueFrom, lastValueFrom, map, Subject, BehaviorSubject, filter as filter$1, takeUntil, take, of, interval, throwError, share } from 'rxjs';
+import { firstValueFrom, lastValueFrom, map, Subject, BehaviorSubject, filter as filter$1, takeUntil, take, of, interval, throwError, share, merge } from 'rxjs';
 import * as i1 from '@angular/common/http';
 import { HttpParams, HttpHeaders, HttpClientModule, HTTP_INTERCEPTORS, provideHttpClient } from '@angular/common/http';
 import { UntypedFormGroup, Validators, UntypedFormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
@@ -13,7 +13,7 @@ import { CommonModule } from '@angular/common';
 import { provideTranslateHttpLoader } from '@ngx-translate/http-loader';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const PAYMENT_CLIENT_CORE_VERSION = '0.4.0';
+const PAYMENT_CLIENT_CORE_VERSION = '0.5.1';
 
 class TranslateHelper {
     static init(service) {
@@ -6215,22 +6215,28 @@ class CheckStatusService extends XpsApiPart {
         this.invoice = invoice;
     }
     request() {
-        const requestParams = this.requestFactory(this.settingsService.token, this.invoice);
-        this.xpsApiService
-            .directPaymentRequest(requestParams)
-            .then((xpsResponse) => {
-            const response = this.xpsResponseErrorsMappingService.mapErrors(xpsResponse);
-            const checkStatusResponse = this.responseFactory({
-                status: response.status,
-                final: response.final,
-                isPaymentAccountAttached: response.is_payment_account_attached,
-            });
-            this.emitResponse(checkStatusResponse);
-        })
+        this.requestStatus(this.invoice)
+            .then((checkStatusResponse) => this.emitResponse(checkStatusResponse))
             .catch((error) => {
             throw new ResponseError(error.message);
         });
     }
+    /**
+     * Performs a one-shot getstatus poll and returns the mapped response without
+     * emitting it to the shared `response$` stream. Used by StatusService to
+     * consult the authoritative terminal signal without interfering with the
+     * listen-status polling loop. See PAYMENTS-29021.
+     */
+    async requestStatus(invoice) {
+        const requestParams = this.requestFactory(this.settingsService.token, invoice);
+        const xpsResponse = await this.xpsApiService.directPaymentRequest(requestParams);
+        const response = this.xpsResponseErrorsMappingService.mapErrors(xpsResponse);
+        return this.responseFactory({
+            status: response.status,
+            final: response.final,
+            isPaymentAccountAttached: response.is_payment_account_attached,
+        });
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: CheckStatusService, deps: [{ token: XpsApiService }, { token: SettingsService }, { token: XpsResponseErrorsMappingService }, { token: checkStatusRequestFactoryToken }, { token: checkStatusResponseFactoryToken }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: CheckStatusService, providedIn: 'root' }); }
 }
@@ -6703,8 +6709,12 @@ class WebsocketStatusService {
             this.clearReinsuranceCheckTimeout();
         }
         if (message === WebSocketStatus.troubledStatus) {
+            // A troubled status can be the terminal AFS-declined/refunded outcome.
+            // Trigger a getstatus poll so listen-status can read the authoritative
+            // verdict and finalize, instead of silently closing and leaving the UI
+            // stuck on "Processing"
             this.clearReinsuranceCheckTimeout();
-            this.closeWebSocket();
+            this.needCheckStatusSubject.next();
         }
     }
     removeSubscription() {
@@ -6740,6 +6750,7 @@ class ListenStatusService {
         this.destroy$ = new Subject();
         this.listenInvoice = null;
         this.websocketInvoice = null;
+        this.pendingTerminalStatus = null;
     }
     listen(invoice) {
         if (this.isListening) {
@@ -6758,6 +6769,7 @@ class ListenStatusService {
         this.isListening = false;
         this.listenInvoice = null;
         this.websocketInvoice = null;
+        this.pendingTerminalStatus = null;
         this.websocketStatusService.closeWebSocket();
         this.destroy$.next();
         this.destroy$.complete();
@@ -6774,6 +6786,13 @@ class ListenStatusService {
             if (!statusResponse?.status) {
                 return;
             }
+            const terminalStatus = this.pendingTerminalStatus;
+            if (terminalStatus) {
+                statusResponse.status.statusState = terminalStatus;
+                if (terminalStatus === StatusEnum.canceled) {
+                    statusResponse.status.isCanceled = true;
+                }
+            }
             const statusSettings = {
                 statusState: statusResponse.status.statusState,
                 isCancelUser: statusResponse.status.isCancelUser,
@@ -6800,6 +6819,14 @@ class ListenStatusService {
                     instanceId: statusResponse.status.pid,
                 });
             }
+            // A terminal verdict from the getstatus poll (e.g. AFS-declined and
+            // refunded) is authoritative: finalize even when the full status still
+            // reports needToCheck.
+            if (terminalStatus) {
+                this.stopListening();
+                this.statusDoneSubject.next(statusSettings);
+                return;
+            }
             if (statusSettings.needWebSocket) {
                 if (!this.websocketStatusService.isOpened ||
                     this.websocketInvoice !== invoice) {
@@ -6826,6 +6853,19 @@ class ListenStatusService {
                 this.websocketStatusService.closeWebSocket();
                 return;
             }
+            // AFS-declined / refunded transactions report a terminal failure here
+            // (canceled/error + final) while the full status may still say
+            // processing. Re-fetch the rich status, then flag it so the update
+            // handler overrides the state to the terminal verdict and finalizes.
+            const isTerminalFailure = checkStatusResponse.final === true &&
+                (checkStatusResponse.status === StatusEnum.canceled ||
+                    checkStatusResponse.status === StatusEnum.error);
+            if (isTerminalFailure) {
+                this.pendingTerminalStatus = checkStatusResponse.status;
+                this.statusService.request();
+                this.websocketStatusService.closeWebSocket();
+                return;
+            }
             if (checkStatusResponse.final === false) {
                 this.websocketStatusService.startReinsuranceCheckTimeout();
                 return;
@@ -7019,13 +7059,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
         }], ctorParameters: () => [{ type: StatusRequestService }, { type: ListenStatusService }, { type: SavedPaymentAccountChangesService }, { type: NextActionService }, { type: CheckStatusService }, { type: StatusUpdatedActionCreator }] });
 
 class StatusService {
-    constructor(urlService, statusRequestService, financeDetailsService, listenStatusService, nextActionService, savePaymentMethodStatusService, statusUpdatedActionCreator) {
+    constructor(urlService, statusRequestService, financeDetailsService, listenStatusService, nextActionService, savePaymentMethodStatusService, checkStatusService, statusUpdatedActionCreator) {
         this.urlService = urlService;
         this.statusRequestService = statusRequestService;
         this.financeDetailsService = financeDetailsService;
         this.listenStatusService = listenStatusService;
         this.nextActionService = nextActionService;
         this.savePaymentMethodStatusService = savePaymentMethodStatusService;
+        this.checkStatusService = checkStatusService;
         this.statusUpdatedActionCreator = statusUpdatedActionCreator;
         this.listenStatusSubscription = null;
     }
@@ -7038,6 +7079,7 @@ class StatusService {
         this.startWaitingStatusUpdates(params.invoice);
         this.statusRequestService.request();
         const statusResponse = await firstValueFrom(this.statusRequestService.response$);
+        await this.applyPollTerminalStatus(statusResponse.status, params.invoice);
         this.financeDetailsService.emitWithStatus(statusResponse.status);
         return statusResponse.status;
     }
@@ -7056,6 +7098,46 @@ class StatusService {
         this.listenStatusSubscription = null;
         this.listenStatusService.stopListening();
     }
+    /**
+     * The full-status endpoint can report a non-terminal state (e.g.
+     * `processing` with group `delivering`) for a transaction that has actually
+     * been terminated — most notably a card payment declined by AFS and then
+     * auto-refunded. In that scenario the lightweight getstatus poll is the only
+     * authoritative terminal signal (`status: canceled`, `final: true`), so we
+     * consult it and surface the terminal verdict to the partner instead of
+     * leaving `statusState` stuck on `processing`.
+     */
+    async applyPollTerminalStatus(status, invoice) {
+        const nonTerminalStates = [
+            StatusEnum.created,
+            StatusEnum.awaiting,
+            StatusEnum.processing,
+            StatusEnum.held,
+        ];
+        if (!status.needToCheck ||
+            !nonTerminalStates.includes(status.statusState)) {
+            return;
+        }
+        let pollStatus;
+        try {
+            pollStatus = await this.checkStatusService.requestStatus(invoice);
+        }
+        catch {
+            return;
+        }
+        const terminalStatus = pollStatus.final === true &&
+            (pollStatus.status === StatusEnum.canceled ||
+                pollStatus.status === StatusEnum.error)
+            ? pollStatus.status
+            : null;
+        if (!terminalStatus) {
+            return;
+        }
+        status.statusState = terminalStatus;
+        if (terminalStatus === StatusEnum.canceled) {
+            status.isCanceled = true;
+        }
+    }
     getRequestParamsFromUrl(url) {
         const searchParams = this.urlService.getSearchParams(url ?? '');
         const keys = new Set(Object.keys(searchParams));
@@ -7091,7 +7173,7 @@ class StatusService {
                 this.nextActionService.emitFlowUpdates(this.statusUpdatedActionCreator.getActionData({ statusResponse }));
             });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: StatusService, deps: [{ token: UrlService }, { token: StatusRequestService }, { token: FinanceDetailsService }, { token: ListenStatusService }, { token: NextActionService }, { token: SavePaymentMethodStatusService }, { token: StatusUpdatedActionCreator }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: StatusService, deps: [{ token: UrlService }, { token: StatusRequestService }, { token: FinanceDetailsService }, { token: ListenStatusService }, { token: NextActionService }, { token: SavePaymentMethodStatusService }, { token: CheckStatusService }, { token: StatusUpdatedActionCreator }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: StatusService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: StatusService, decorators: [{
@@ -7099,7 +7181,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: () => [{ type: UrlService }, { type: StatusRequestService }, { type: FinanceDetailsService }, { type: ListenStatusService }, { type: NextActionService }, { type: SavePaymentMethodStatusService }, { type: StatusUpdatedActionCreator }] });
+        }], ctorParameters: () => [{ type: UrlService }, { type: StatusRequestService }, { type: FinanceDetailsService }, { type: ListenStatusService }, { type: NextActionService }, { type: SavePaymentMethodStatusService }, { type: CheckStatusService }, { type: StatusUpdatedActionCreator }] });
 
 class CreditCardStateService extends EmitDataService {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: CreditCardStateService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -9394,6 +9476,7 @@ class ApplePaySessionHandlerAbstract {
     constructor() {
         this.payment = new Subject();
         this._errorSubject = new Subject();
+        this._analyticsEventSubject = new Subject();
     }
     get error$() {
         return this._errorSubject.asObservable();
@@ -9401,9 +9484,15 @@ class ApplePaySessionHandlerAbstract {
     get payment$() {
         return this.payment.asObservable();
     }
+    get analyticsEvent$() {
+        return this._analyticsEventSubject.asObservable();
+    }
     emitError(error) {
         this._errorSubject.next(error);
     }
+    emitAnalyticsEvent(event) {
+        this._analyticsEventSubject.next(event);
+    }
     buildPaymentRequest(params) {
         return {
             total: {
@@ -9430,12 +9519,15 @@ class ApplePayCartService {
     get cartRecalculationRequest$() {
         return this.cartRecalculationRequest.asObservable();
     }
-    constructor(userBehaviourAnalyticsService, summaryFinanceDetailsAdapterService) {
-        this.userBehaviourAnalyticsService = userBehaviourAnalyticsService;
+    get analyticsEvent$() {
+        return this.analyticsEvent.asObservable();
+    }
+    constructor(summaryFinanceDetailsAdapterService) {
         this.summaryFinanceDetailsAdapterService = summaryFinanceDetailsAdapterService;
         this.cartSuccessfulRecalculated = new Subject();
         this.cartErrorRecalculated = new Subject();
         this.cartRecalculationRequest = new Subject();
+        this.analyticsEvent = new Subject();
     }
     recalculateCartTaxes(shippingContact) {
         const zip = shippingContact.postalCode;
@@ -9449,7 +9541,9 @@ class ApplePayCartService {
             zip: parsedZip,
             country,
         });
-        this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayRecalculateCartTaxes, 'manual', {
+        this.analyticsEvent.next({
+            eventName: UserBehaviourEventName.applePayRecalculateCartTaxes,
+            eventType: userBehaviourEventTypes.manual,
             dimension1: country,
             dimension2: parsedZip || '',
         });
@@ -9476,7 +9570,10 @@ class ApplePayCartService {
         this.cartSuccessfulRecalculated.next(updatedPrice);
     }
     sendErrorRecalculatedCart(error) {
-        this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayRecalculateCartError, 'manual');
+        this.analyticsEvent.next({
+            eventName: UserBehaviourEventName.applePayRecalculateCartError,
+            eventType: userBehaviourEventTypes.manual,
+        });
         this.cartErrorRecalculated.next(error);
     }
     isZipCountry(country) {
@@ -9511,7 +9608,7 @@ class ApplePayCartService {
     getTotalAmount(finance) {
         return finance?.grand_total?.amount ?? finance?.total?.amount;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ApplePayCartService, deps: [{ token: UserBehaviourAnalyticsService }, { token: SummaryFinanceDetailsAdapterService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ApplePayCartService, deps: [{ token: SummaryFinanceDetailsAdapterService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ApplePayCartService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ApplePayCartService, decorators: [{
@@ -9519,15 +9616,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: () => [{ type: UserBehaviourAnalyticsService }, { type: SummaryFinanceDetailsAdapterService }] });
+        }], ctorParameters: () => [{ type: SummaryFinanceDetailsAdapterService }] });
 
 class BraintreeHandler extends ApplePaySessionHandlerAbstract {
-    constructor(window, loggerService, applePayCartService, userBehaviourAnalyticsService) {
+    constructor(window, loggerService, applePayCartService) {
         super();
         this.window = window;
         this.loggerService = loggerService;
         this.applePayCartService = applePayCartService;
-        this.userBehaviourAnalyticsService = userBehaviourAnalyticsService;
         this.paymentClient = null;
     }
     setClient(client) {
@@ -9557,18 +9653,30 @@ class BraintreeHandler extends ApplePaySessionHandlerAbstract {
         if (!session)
             return;
         const { isApplePayInstantFlowEnabled, topLevelDomain } = additionalParams;
-        this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayBraintreeStartSession, 'manual');
+        this.emitAnalyticsEvent({
+            eventName: UserBehaviourEventName.applePayBraintreeStartSession,
+            eventType: userBehaviourEventTypes.manual,
+        });
         session.onshippingcontactselected = (event) => {
-            this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayBraintreeSelectShipping, 'manual');
+            this.emitAnalyticsEvent({
+                eventName: UserBehaviourEventName.applePayBraintreeSelectShipping,
+                eventType: userBehaviourEventTypes.manual,
+            });
             this.applePayCartService.cartSuccessfulRecalculated$
                 .pipe(take(1))
                 .subscribe((updatedPrice) => {
                 const contactUpdate = this.applePayCartService.buildShippingContactUpdate(params, updatedPrice);
-                this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayBraintreeCartSuccessfulRecalculated, 'manual');
+                this.emitAnalyticsEvent({
+                    eventName: UserBehaviourEventName.applePayBraintreeCartSuccessfulRecalculated,
+                    eventType: userBehaviourEventTypes.manual,
+                });
                 session.completeShippingContactSelection(contactUpdate);
             });
             this.applePayCartService.cartErrorRecalculated$.subscribe((error) => {
-                this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayBraintreeCartErrorRecalculated, 'manual');
+                this.emitAnalyticsEvent({
+                    eventName: UserBehaviourEventName.applePayBraintreeCartErrorRecalculated,
+                    eventType: userBehaviourEventTypes.manual,
+                });
                 session.completeShippingContactSelection({
                     errors: [error],
                     newTotal: {
@@ -9581,7 +9689,9 @@ class BraintreeHandler extends ApplePaySessionHandlerAbstract {
             this.applePayCartService.recalculateCartTaxes(event.shippingContact);
         };
         session.onvalidatemerchant = (event) => {
-            this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayBraintreeValidateMerchant, 'manual', {
+            this.emitAnalyticsEvent({
+                eventName: UserBehaviourEventName.applePayBraintreeValidateMerchant,
+                eventType: userBehaviourEventTypes.manual,
                 value: event.validationURL,
                 extraValue: params.totalLabel,
             });
@@ -9599,14 +9709,20 @@ class BraintreeHandler extends ApplePaySessionHandlerAbstract {
                 session.completeMerchantValidation(merchantSession);
             })
                 .catch((error) => {
-                this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayBraintreeValidateMerchantError, 'manual');
+                this.emitAnalyticsEvent({
+                    eventName: UserBehaviourEventName.applePayBraintreeValidateMerchantError,
+                    eventType: userBehaviourEventTypes.manual,
+                });
                 console.error(ApplePayErrors.merchantValidationError, error);
                 session.abort();
                 applePayFinallyCallback();
             });
         };
         session.onpaymentauthorized = (event) => {
-            this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayBraintreePaymentAuthorized, 'manual');
+            this.emitAnalyticsEvent({
+                eventName: UserBehaviourEventName.applePayBraintreePaymentAuthorized,
+                eventType: userBehaviourEventTypes.manual,
+            });
             this.paymentClient
                 ?.tokenize({ token: event.payment.token })
                 .then((response) => {
@@ -9619,21 +9735,27 @@ class BraintreeHandler extends ApplePaySessionHandlerAbstract {
                 session.completePayment(this.window.ApplePaySession.STATUS_SUCCESS);
             })
                 .catch((error) => {
-                this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayBraintreePaymentTokenizationError, 'manual');
+                this.emitAnalyticsEvent({
+                    eventName: UserBehaviourEventName.applePayBraintreePaymentTokenizationError,
+                    eventType: userBehaviourEventTypes.manual,
+                });
                 console.error('Apple Pay: Tokenization error', error);
                 session.completePayment(this.window.ApplePaySession.STATUS_FAILURE);
                 applePayFinallyCallback();
             });
         };
         session.oncancel = (event) => {
-            this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayBraintreePaymentCancel, 'manual');
+            this.emitAnalyticsEvent({
+                eventName: UserBehaviourEventName.applePayBraintreePaymentCancel,
+                eventType: userBehaviourEventTypes.manual,
+            });
             console.error(ApplePayErrors.cancelled, event);
             this.emitError(ApplePayErrors.cancelled);
             applePayFinallyCallback();
         };
         session.begin();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: BraintreeHandler, deps: [{ token: windowToken }, { token: LoggerService }, { token: ApplePayCartService }, { token: UserBehaviourAnalyticsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: BraintreeHandler, deps: [{ token: windowToken }, { token: LoggerService }, { token: ApplePayCartService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: BraintreeHandler }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: BraintreeHandler, decorators: [{
@@ -9641,16 +9763,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [windowToken]
-                }] }, { type: LoggerService }, { type: ApplePayCartService }, { type: UserBehaviourAnalyticsService }] });
+                }] }, { type: LoggerService }, { type: ApplePayCartService }] });
 
 class CheckoutHandler extends ApplePaySessionHandlerAbstract {
-    constructor(window, http, loggerService, applePayCartService, userBehaviourAnalyticsService) {
+    constructor(window, http, loggerService, applePayCartService) {
         super();
         this.window = window;
         this.http = http;
         this.loggerService = loggerService;
         this.applePayCartService = applePayCartService;
-        this.userBehaviourAnalyticsService = userBehaviourAnalyticsService;
     }
     startSession(params, additionalParams, applePayFinallyCallback) {
         const request = this.buildPaymentRequest(params);
@@ -9668,16 +9789,25 @@ class CheckoutHandler extends ApplePaySessionHandlerAbstract {
         if (!session)
             return;
         session.onshippingcontactselected = (event) => {
-            this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayCheckoutSelectShipping, 'manual');
+            this.emitAnalyticsEvent({
+                eventName: UserBehaviourEventName.applePayCheckoutSelectShipping,
+                eventType: userBehaviourEventTypes.manual,
+            });
             this.applePayCartService.cartSuccessfulRecalculated$
                 .pipe(take(1))
                 .subscribe((updatedPrice) => {
                 const contactUpdate = this.applePayCartService.buildShippingContactUpdate(params, updatedPrice);
-                this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayCheckoutCartSuccessfulRecalculated, 'manual');
+                this.emitAnalyticsEvent({
+                    eventName: UserBehaviourEventName.applePayCheckoutCartSuccessfulRecalculated,
+                    eventType: userBehaviourEventTypes.manual,
+                });
                 session.completeShippingContactSelection(contactUpdate);
             });
             this.applePayCartService.cartErrorRecalculated$.subscribe((error) => {
-                this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayCheckoutCartErrorRecalculated, 'manual');
+                this.emitAnalyticsEvent({
+                    eventName: UserBehaviourEventName.applePayCheckoutCartErrorRecalculated,
+                    eventType: userBehaviourEventTypes.manual,
+                });
                 session.completeShippingContactSelection({
                     errors: [error],
                     newTotal: {
@@ -9690,7 +9820,9 @@ class CheckoutHandler extends ApplePaySessionHandlerAbstract {
             this.applePayCartService.recalculateCartTaxes(event.shippingContact);
         };
         session.onvalidatemerchant = (event) => {
-            this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayCheckoutValidateMerchant, 'manual', {
+            this.emitAnalyticsEvent({
+                eventName: UserBehaviourEventName.applePayCheckoutValidateMerchant,
+                eventType: userBehaviourEventTypes.manual,
                 value: event.validationURL,
                 extraValue: params.totalLabel,
             });
@@ -9713,7 +9845,10 @@ class CheckoutHandler extends ApplePaySessionHandlerAbstract {
                     session.completeMerchantValidation(response.merchantSession);
                 },
                 error: (error) => {
-                    this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayCheckoutValidateMerchantError, 'manual');
+                    this.emitAnalyticsEvent({
+                        eventName: UserBehaviourEventName.applePayCheckoutValidateMerchantError,
+                        eventType: userBehaviourEventTypes.manual,
+                    });
                     console.error(ApplePayErrors.merchantValidationError, error);
                     session.abort();
                     applePayFinallyCallback();
@@ -9721,7 +9856,10 @@ class CheckoutHandler extends ApplePaySessionHandlerAbstract {
             });
         };
         session.onpaymentauthorized = (event) => {
-            this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayCheckoutPaymentAuthorized, 'manual');
+            this.emitAnalyticsEvent({
+                eventName: UserBehaviourEventName.applePayCheckoutPaymentAuthorized,
+                eventType: userBehaviourEventTypes.manual,
+            });
             this.payment.next(JSON.stringify({
                 token: event.payment.token ?? '',
                 email: event.payment.billingContact?.emailAddress ?? null,
@@ -9731,14 +9869,17 @@ class CheckoutHandler extends ApplePaySessionHandlerAbstract {
             session.completePayment(this.window.ApplePaySession.STATUS_SUCCESS);
         };
         session.oncancel = (event) => {
-            this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayCheckoutPaymentCancel, 'manual');
+            this.emitAnalyticsEvent({
+                eventName: UserBehaviourEventName.applePayCheckoutPaymentCancel,
+                eventType: userBehaviourEventTypes.manual,
+            });
             console.error(ApplePayErrors.cancelled, event);
             this.emitError(ApplePayErrors.cancelled);
             applePayFinallyCallback();
         };
         session.begin();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: CheckoutHandler, deps: [{ token: windowToken }, { token: i1.HttpClient }, { token: LoggerService }, { token: ApplePayCartService }, { token: UserBehaviourAnalyticsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: CheckoutHandler, deps: [{ token: windowToken }, { token: i1.HttpClient }, { token: LoggerService }, { token: ApplePayCartService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: CheckoutHandler }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: CheckoutHandler, decorators: [{
@@ -9746,7 +9887,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [windowToken]
-                }] }, { type: i1.HttpClient }, { type: LoggerService }, { type: ApplePayCartService }, { type: UserBehaviourAnalyticsService }] });
+                }] }, { type: i1.HttpClient }, { type: LoggerService }, { type: ApplePayCartService }] });
 
 class PaymentBehaviourModule {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: PaymentBehaviourModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
@@ -9972,11 +10113,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
                 }] }] });
 
 class GooglePayCheckoutPaymentService {
-    constructor(paymentSystemProcessingService, userBehaviourAnalyticsService, loggerService) {
+    constructor(paymentSystemProcessingService, loggerService) {
         this.paymentSystemProcessingService = paymentSystemProcessingService;
-        this.userBehaviourAnalyticsService = userBehaviourAnalyticsService;
         this.loggerService = loggerService;
         this.checkout = null;
+        this.analyticsEvent = new Subject();
+    }
+    get analyticsEvent$() {
+        return this.analyticsEvent.asObservable();
     }
     preparePayment({ initParams, checkDeviceData, }) {
         if (!initParams || !checkDeviceData.base64checkoutData) {
@@ -10021,7 +10165,11 @@ class GooglePayCheckoutPaymentService {
         return paymentDataRequest.allowedPaymentMethods;
     }
     handleSuccessfulPayment(response) {
-        this.userBehaviourAnalyticsService.send(UserBehaviourEventName.googlePayHandleSuccessfulPayment, 'manual', { value: this.checkout?.request?.form?.fields?.returnSuccessUrl ?? '' });
+        this.analyticsEvent.next({
+            eventName: UserBehaviourEventName.googlePayHandleSuccessfulPayment,
+            eventType: userBehaviourEventTypes.manual,
+            value: this.checkout?.request?.form?.fields?.returnSuccessUrl ?? '',
+        });
         if (!this.checkout)
             return;
         let returnUrl = this.checkout.request.form.fields.returnSuccessUrl;
@@ -10030,7 +10178,11 @@ class GooglePayCheckoutPaymentService {
         this.paymentSystemProcessingService.emitStatusUrl(returnUrl);
     }
     handleFailedPayment(error) {
-        this.userBehaviourAnalyticsService.send(UserBehaviourEventName.googlePayHandleFailedPayment, 'manual', { value: this.checkout?.request?.form?.fields?.returnFailUrl ?? '' });
+        this.analyticsEvent.next({
+            eventName: UserBehaviourEventName.googlePayHandleFailedPayment,
+            eventType: userBehaviourEventTypes.manual,
+            value: this.checkout?.request?.form?.fields?.returnFailUrl ?? '',
+        });
         if (!this.checkout)
             return;
         const statusCode = error?.statusCode;
@@ -10043,7 +10195,7 @@ class GooglePayCheckoutPaymentService {
     isCancelledStatus(statusCode) {
         return statusCode.toLowerCase() === 'canceled';
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: GooglePayCheckoutPaymentService, deps: [{ token: PaymentSystemProcessingService }, { token: UserBehaviourAnalyticsService }, { token: LoggerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: GooglePayCheckoutPaymentService, deps: [{ token: PaymentSystemProcessingService }, { token: LoggerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: GooglePayCheckoutPaymentService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: GooglePayCheckoutPaymentService, decorators: [{
@@ -10051,7 +10203,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: () => [{ type: PaymentSystemProcessingService }, { type: UserBehaviourAnalyticsService }, { type: LoggerService }] });
+        }], ctorParameters: () => [{ type: PaymentSystemProcessingService }, { type: LoggerService }] });
 
 class GooglePayInstantPaymentService {
     constructor(summaryFinanceDetailsAdapterService, loggerService) {
@@ -10185,19 +10337,19 @@ class GooglePayService {
     get googlePaymentClientWasInitialized() {
         return !!this.googlePaymentClient;
     }
-    constructor(window, loggerService, paymentSystemProcessingService, googlePayCheckoutPaymentService, googlePayInstantPaymentService, injector, userBehaviourAnalyticsService) {
+    constructor(window, loggerService, paymentSystemProcessingService, googlePayCheckoutPaymentService, googlePayInstantPaymentService, injector) {
         this.window = window;
         this.loggerService = loggerService;
         this.paymentSystemProcessingService = paymentSystemProcessingService;
         this.googlePayCheckoutPaymentService = googlePayCheckoutPaymentService;
         this.googlePayInstantPaymentService = googlePayInstantPaymentService;
         this.injector = injector;
-        this.userBehaviourAnalyticsService = userBehaviourAnalyticsService;
         this.googlePayScriptUrl = 'https://pay.google.com/gp/p/js/pay.js';
         this.readyToPay = new BehaviorSubject(null);
         this.paymentWindowIsReady = new Subject();
         this.paymentWindowIsClose = new Subject();
         this.error = new Subject();
+        this.analyticsEvent = new Subject();
         this.paymentInProgress = false;
         this.googlePaymentClient = null;
         this.paymentService = null;
@@ -10214,6 +10366,9 @@ class GooglePayService {
     get error$() {
         return this.error.asObservable();
     }
+    get analyticsEvent$() {
+        return merge(this.analyticsEvent.asObservable(), this.googlePayCheckoutPaymentService.analyticsEvent$);
+    }
     isReadyToPay() {
         return this.readyToPay.getValue();
     }
@@ -10286,7 +10441,11 @@ class GooglePayService {
             return Promise.resolve(null);
         }
         if (this.initParams.isInstantPayFlow) {
-            this.userBehaviourAnalyticsService.send(UserBehaviourEventName.sysInstantFlowOpen, userBehaviourEventTypes.open, { instanceId: googlePay });
+            this.analyticsEvent.next({
+                eventName: UserBehaviourEventName.sysInstantFlowOpen,
+                eventType: userBehaviourEventTypes.open,
+                instanceId: googlePay,
+            });
         }
         const paymentDataRequest = this.paymentService.getPaymentRequest();
         if (!paymentDataRequest) {
@@ -10434,7 +10593,7 @@ class GooglePayService {
         }
         return allowedLocales.find((locale) => locale === userLocale) ?? 'en';
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: GooglePayService, deps: [{ token: windowToken }, { token: LoggerService }, { token: PaymentSystemProcessingService }, { token: GooglePayCheckoutPaymentService }, { token: GooglePayInstantPaymentService }, { token: i0.Injector }, { token: UserBehaviourAnalyticsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: GooglePayService, deps: [{ token: windowToken }, { token: LoggerService }, { token: PaymentSystemProcessingService }, { token: GooglePayCheckoutPaymentService }, { token: GooglePayInstantPaymentService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: GooglePayService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: GooglePayService, decorators: [{
@@ -10445,7 +10604,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [windowToken]
-                }] }, { type: LoggerService }, { type: PaymentSystemProcessingService }, { type: GooglePayCheckoutPaymentService }, { type: GooglePayInstantPaymentService }, { type: i0.Injector }, { type: UserBehaviourAnalyticsService }] });
+                }] }, { type: LoggerService }, { type: PaymentSystemProcessingService }, { type: GooglePayCheckoutPaymentService }, { type: GooglePayInstantPaymentService }, { type: i0.Injector }] });
 
 var ApplePayIntegrationType;
 (function (ApplePayIntegrationType) {
@@ -10692,11 +10851,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
         }], ctorParameters: () => [{ type: SecureApiClient }] });
 
 class ApplePayExternalWindowCommunicationService {
-    constructor(window, webSocketFactory, socketBridgeService, userBehaviourAnalyticsService) {
+    constructor(window, webSocketFactory, socketBridgeService) {
         this.window = window;
         this.webSocketFactory = webSocketFactory;
         this.socketBridgeService = socketBridgeService;
-        this.userBehaviourAnalyticsService = userBehaviourAnalyticsService;
+        this.analyticsEvent = new Subject();
+    }
+    get analyticsEvent$() {
+        return this.analyticsEvent.asObservable();
     }
     getWindowClose$() {
         const isWindowCloseMessage = (message) => message.command === "apple-pay-window-close" /* CommandsForPages.APPLE_PAY_WINDOW_CLOSE */;
@@ -10721,7 +10883,10 @@ class ApplePayExternalWindowCommunicationService {
         return this.getEventSource(isRecalculateCartMessage);
     }
     async openWebSocketConnection(token) {
-        this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayOpenWebSocketConnection, 'manual');
+        this.analyticsEvent.next({
+            eventName: UserBehaviourEventName.applePayOpenWebSocketConnection,
+            eventType: userBehaviourEventTypes.manual,
+        });
         const bridgeInfo = await this.socketBridgeService.getBridgeConnectionChannel(token);
         if (this.websocketClient) {
             this.websocketClient.close();
@@ -10730,7 +10895,11 @@ class ApplePayExternalWindowCommunicationService {
         await this.websocketClient.open(bridgeInfo.subscribeUrl, bridgeInfo.channelName);
     }
     async sendMessageToAnotherWindow(command, payload) {
-        this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePaySendMessageToAnotherWindow, 'manual', { value: command });
+        this.analyticsEvent.next({
+            eventName: UserBehaviourEventName.applePaySendMessageToAnotherWindow,
+            eventType: userBehaviourEventTypes.manual,
+            value: command,
+        });
         await this.socketBridgeService.publishMessage(command, payload);
     }
     getEventSource(eventHandler) {
@@ -10739,7 +10908,7 @@ class ApplePayExternalWindowCommunicationService {
             return JSON.parse(message);
         }), filter(eventHandler));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ApplePayExternalWindowCommunicationService, deps: [{ token: windowToken }, { token: WebSocketFactory }, { token: SocketBridgeService }, { token: UserBehaviourAnalyticsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ApplePayExternalWindowCommunicationService, deps: [{ token: windowToken }, { token: WebSocketFactory }, { token: SocketBridgeService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ApplePayExternalWindowCommunicationService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ApplePayExternalWindowCommunicationService, decorators: [{
@@ -10750,7 +10919,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [windowToken]
-                }] }, { type: WebSocketFactory }, { type: SocketBridgeService }, { type: UserBehaviourAnalyticsService }] });
+                }] }, { type: WebSocketFactory }, { type: SocketBridgeService }] });
 
 class ApplePayService {
     get paymentParameters() {
@@ -10766,6 +10935,9 @@ class ApplePayService {
     get applePayQrOpened$() {
         return this.applePayQrOpened.asObservable();
     }
+    get analyticsEvent$() {
+        return merge(this.analyticsEvent.asObservable(), this.braintreeHandler.analyticsEvent$, this.checkoutHandler.analyticsEvent$, this.externalWindowCommunicationService.analyticsEvent$);
+    }
     /* istanbul ignore next */
     get windowClosing$() {
         return this.applePaySdkService.windowClosing$;
@@ -10793,7 +10965,7 @@ class ApplePayService {
             .getWindowReturnMessage$()
             .pipe(takeUntil(this.destroy$));
     }
-    constructor(window, summaryFinanceDetailsAdapterService, braintreeHandler, checkoutHandler, appleParamsBuilder, loggerService, applePaySdkService, externalWindowCommunicationService, userBehaviourAnalyticsService, settingsService) {
+    constructor(window, summaryFinanceDetailsAdapterService, braintreeHandler, checkoutHandler, appleParamsBuilder, loggerService, applePaySdkService, externalWindowCommunicationService, settingsService) {
         this.window = window;
         this.summaryFinanceDetailsAdapterService = summaryFinanceDetailsAdapterService;
         this.braintreeHandler = braintreeHandler;
@@ -10802,12 +10974,12 @@ class ApplePayService {
         this.loggerService = loggerService;
         this.applePaySdkService = applePaySdkService;
         this.externalWindowCommunicationService = externalWindowCommunicationService;
-        this.userBehaviourAnalyticsService = userBehaviourAnalyticsService;
         this.settingsService = settingsService;
         this.payment = new Subject();
         this.error = new Subject();
         this.integrationType = new Subject();
         this.applePayQrOpened = new Subject();
+        this.analyticsEvent = new Subject();
         this.destroy$ = new Subject();
         this.paymentClient = null;
         this.applePayParams = null;
@@ -10930,9 +11102,17 @@ class ApplePayService {
         this.applePayParams = this.appleParamsBuilder.updateParams(this.applePayParams, summary);
     }
     proceedCheckout(parameters, additionalParams) {
-        this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayAcquirer, 'manual', { value: parameters.acquirer });
+        this.analyticsEvent.next({
+            eventName: UserBehaviourEventName.applePayAcquirer,
+            eventType: userBehaviourEventTypes.manual,
+            value: parameters.acquirer,
+        });
         if (additionalParams.isApplePayInstantFlowEnabled) {
-            this.userBehaviourAnalyticsService.send(UserBehaviourEventName.sysInstantFlowOpen, userBehaviourEventTypes.open, { instanceId: applePayId });
+            this.analyticsEvent.next({
+                eventName: UserBehaviourEventName.sysInstantFlowOpen,
+                eventType: userBehaviourEventTypes.open,
+                instanceId: applePayId,
+            });
         }
         const sessionHandler = this.getSessionHandler(parameters.acquirer);
         if (!sessionHandler) {
@@ -10991,7 +11171,7 @@ class ApplePayService {
             this.applePayQrOpened.next();
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ApplePayService, deps: [{ token: windowToken }, { token: SummaryFinanceDetailsAdapterService }, { token: BraintreeHandler }, { token: CheckoutHandler }, { token: ApplePayParamsBuilderService }, { token: LoggerService }, { token: ApplePaySdkService }, { token: ApplePayExternalWindowCommunicationService }, { token: UserBehaviourAnalyticsService }, { token: SettingsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ApplePayService, deps: [{ token: windowToken }, { token: SummaryFinanceDetailsAdapterService }, { token: BraintreeHandler }, { token: CheckoutHandler }, { token: ApplePayParamsBuilderService }, { token: LoggerService }, { token: ApplePaySdkService }, { token: ApplePayExternalWindowCommunicationService }, { token: SettingsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ApplePayService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: ApplePayService, decorators: [{
@@ -11002,7 +11182,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [windowToken]
-                }] }, { type: SummaryFinanceDetailsAdapterService }, { type: BraintreeHandler }, { type: CheckoutHandler }, { type: ApplePayParamsBuilderService }, { type: LoggerService }, { type: ApplePaySdkService }, { type: ApplePayExternalWindowCommunicationService }, { type: UserBehaviourAnalyticsService }, { type: SettingsService }] });
+                }] }, { type: SummaryFinanceDetailsAdapterService }, { type: BraintreeHandler }, { type: CheckoutHandler }, { type: ApplePayParamsBuilderService }, { type: LoggerService }, { type: ApplePaySdkService }, { type: ApplePayExternalWindowCommunicationService }, { type: SettingsService }] });
 
 /*
  * Public API Surface of core-library