@xsolla/payment-client-core 0.3.11 → 0.3.13

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, skip, take, of, interval, throwError, share } from 'rxjs';
+import { firstValueFrom, lastValueFrom, map, Subject, BehaviorSubject, filter as filter$1, takeUntil, take, of, interval, throwError, share } 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.3.11';
+const PAYMENT_CLIENT_CORE_VERSION = '0.3.13';
 
 class TranslateHelper {
     static init(service) {
@@ -54,29 +54,45 @@ const windowToken = new InjectionToken('window');
 const defaultApiUrl = 'https://secure.xsolla.com/paystation2/api/';
 const sandboxApiUrl = 'https://sandbox-secure.xsolla.com/paystation2/api/';
 
+const tokenPrefixParamName = 'rlp';
+const tokenPrefixLength = 4;
+
 class SecureApiClient {
     constructor(httpClient, window) {
         this.httpClient = httpClient;
         this.window = window;
         this.isSandboxMode = false;
+        this.token = '';
     }
     setSandboxMode(isSandboxMode) {
         this.isSandboxMode = isSandboxMode;
     }
+    setToken(token) {
+        this.token = token;
+    }
     get(url, options) {
-        return this.httpClient.get(`${this.baseUrl}${url}`, options);
+        return this.httpClient.get(this.buildUrl(url), options);
     }
     post(url, body, options) {
-        return this.httpClient.post(`${this.baseUrl}${url}`, body, options);
+        return this.httpClient.post(this.buildUrl(url), body, options);
     }
     patch(url, body, options) {
-        return this.httpClient.patch(`${this.baseUrl}${url}`, body, options);
+        return this.httpClient.patch(this.buildUrl(url), body, options);
     }
     put(url, body, options) {
-        return this.httpClient.put(`${this.baseUrl}${url}`, body, options);
+        return this.httpClient.put(this.buildUrl(url), body, options);
     }
     delete(url, options) {
-        return this.httpClient.delete(`${this.baseUrl}${url}`, options);
+        return this.httpClient.delete(this.buildUrl(url), options);
+    }
+    buildUrl(url) {
+        const fullUrl = `${this.baseUrl}${url}`;
+        const tokenPrefix = this.token.slice(0, tokenPrefixLength);
+        if (!tokenPrefix) {
+            return fullUrl;
+        }
+        const separator = fullUrl.includes('?') ? '&' : '?';
+        return `${fullUrl}${separator}${tokenPrefixParamName}=${tokenPrefix}`;
     }
     get baseUrl() {
         let predefinedBaseUrl = null;
@@ -218,6 +234,7 @@ class SettingsService {
     async sendRequest(token) {
         const params = new HttpParams().set('access_token', token);
         this.secureApi.setSandboxMode(this.isSandboxMode());
+        this.secureApi.setToken(token);
         this.response = await firstValueFrom(this.secureApi.get('utils', { params }));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: SettingsService, deps: [{ token: SecureApiClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -6732,6 +6749,8 @@ class ListenStatusService {
     }
     stopListening() {
         this.isListening = false;
+        this.listenInvoice = null;
+        this.websocketInvoice = null;
         this.websocketStatusService.closeWebSocket();
         this.destroy$.next();
         this.destroy$.complete();
@@ -7025,6 +7044,11 @@ class StatusService {
     listenFinalStatus(invoice) {
         return this.listenStatusService.listen(invoice);
     }
+    stopWaitingStatusUpdates() {
+        this.listenStatusSubscription?.unsubscribe();
+        this.listenStatusSubscription = null;
+        this.listenStatusService.stopListening();
+    }
     getRequestParamsFromUrl(url) {
         const searchParams = this.urlService.getSearchParams(url ?? '');
         const keys = new Set(Object.keys(searchParams));
@@ -7042,13 +7066,23 @@ class StatusService {
             return;
         }
         this.listenStatusService.listen(invoice);
+        let isFirstStatus = true;
         this.listenStatusSubscription?.unsubscribe();
-        this.listenStatusSubscription = this.listenStatusService.statusUpdated$
-            .pipe(skip(1))
-            .subscribe(({ statusResponse }) => {
-            this.financeDetailsService.emitWithStatus(statusResponse.status);
-            this.nextActionService.emitFlowUpdates(this.statusUpdatedActionCreator.getActionData({ statusResponse }));
-        });
+        this.listenStatusSubscription =
+            this.listenStatusService.statusUpdated$.subscribe(({ statusResponse }) => {
+                const isTerminalStatus = [
+                    StatusEnum.done,
+                    StatusEnum.error,
+                    StatusEnum.canceled,
+                ].includes(statusResponse.status.statusState);
+                if (isFirstStatus && !isTerminalStatus) {
+                    isFirstStatus = false;
+                    return;
+                }
+                isFirstStatus = false;
+                this.financeDetailsService.emitWithStatus(statusResponse.status);
+                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.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: StatusService, providedIn: 'root' }); }
@@ -7893,6 +7927,8 @@ class PaymentService {
         this.isSavingMethodMode = false;
     }
     async initialize(config) {
+        this.threeDsService.stopChecking();
+        this.statusService.stopWaitingStatusUpdates();
         this.destroy$ = new Subject();
         this.formDestroy$ = new Subject();
         this.isSubmitAttempted = false;
@@ -9337,6 +9373,7 @@ var ApplePayErrors;
     ApplePayErrors["cancelled"] = "Apple Pay: payment cancelled";
     ApplePayErrors["merchantValidationError"] = "Apple Pay: merchant validation error";
     ApplePayErrors["braintreeInitializeError"] = "Apple Pay: Braintree library is not initialized";
+    ApplePayErrors["createPaySessionError"] = "Apple Pay: Could not create pay session";
 })(ApplePayErrors || (ApplePayErrors = {}));
 
 class ApplePaySessionHandlerAbstract {
@@ -9492,7 +9529,19 @@ class BraintreeHandler extends ApplePaySessionHandlerAbstract {
         }
         const request = this.buildPaymentRequest(params);
         const applePayRequest = this.paymentClient.createPaymentRequest(request);
-        const session = new this.window.ApplePaySession(applePayVersion, applePayRequest);
+        let session = null;
+        try {
+            session = new this.window.ApplePaySession(applePayVersion, applePayRequest);
+        }
+        catch (error) {
+            const errorMessage = typeof error === 'string'
+                ? error
+                : ApplePayErrors.createPaySessionError;
+            console.error(errorMessage);
+            this.loggerService.error(new TaggedError(errorMessage, [ErrorTags.APPLEPAY]));
+        }
+        if (!session)
+            return;
         const { isApplePayInstantFlowEnabled, topLevelDomain } = additionalParams;
         this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayBraintreeStartSession, 'manual');
         session.onshippingcontactselected = (event) => {
@@ -9581,16 +9630,29 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
                 }] }, { type: LoggerService }, { type: ApplePayCartService }, { type: UserBehaviourAnalyticsService }] });
 
 class CheckoutHandler extends ApplePaySessionHandlerAbstract {
-    constructor(window, http, applePayCartService, userBehaviourAnalyticsService) {
+    constructor(window, http, loggerService, applePayCartService, userBehaviourAnalyticsService) {
         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);
-        const session = new this.window.ApplePaySession(applePayVersion, request);
+        let session = null;
+        try {
+            session = new this.window.ApplePaySession(applePayVersion, request);
+        }
+        catch (error) {
+            const errorMessage = typeof error === 'string'
+                ? error
+                : ApplePayErrors.createPaySessionError;
+            console.error(errorMessage);
+            this.loggerService.error(new TaggedError(errorMessage, [ErrorTags.APPLEPAY]));
+        }
+        if (!session)
+            return;
         session.onshippingcontactselected = (event) => {
             this.userBehaviourAnalyticsService.send(UserBehaviourEventName.applePayCheckoutSelectShipping, 'manual');
             this.applePayCartService.cartSuccessfulRecalculated$
@@ -9662,7 +9724,7 @@ class CheckoutHandler extends ApplePaySessionHandlerAbstract {
         };
         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: 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 }, { token: UserBehaviourAnalyticsService }], 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: [{
@@ -9670,7 +9732,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [windowToken]
-                }] }, { type: i1.HttpClient }, { type: ApplePayCartService }, { type: UserBehaviourAnalyticsService }] });
+                }] }, { type: i1.HttpClient }, { type: LoggerService }, { type: ApplePayCartService }, { type: UserBehaviourAnalyticsService }] });
 
 class PaymentBehaviourModule {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: PaymentBehaviourModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
@@ -10109,13 +10171,14 @@ class GooglePayService {
     get googlePaymentClientWasInitialized() {
         return !!this.googlePaymentClient;
     }
-    constructor(window, loggerService, paymentSystemProcessingService, googlePayCheckoutPaymentService, googlePayInstantPaymentService, injector) {
+    constructor(window, loggerService, paymentSystemProcessingService, googlePayCheckoutPaymentService, googlePayInstantPaymentService, injector, userBehaviourAnalyticsService) {
         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();
@@ -10208,6 +10271,9 @@ class GooglePayService {
         if (this.paymentInProgress) {
             return Promise.resolve(null);
         }
+        if (this.initParams.isInstantPayFlow) {
+            this.userBehaviourAnalyticsService.send(UserBehaviourEventName.sysInstantFlowOpen, userBehaviourEventTypes.open, { instanceId: googlePay });
+        }
         const paymentDataRequest = this.paymentService.getPaymentRequest();
         if (!paymentDataRequest) {
             this.loggerService.error(new TaggedError('No data for payment data request', [
@@ -10354,7 +10420,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 }], 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 }, { token: UserBehaviourAnalyticsService }], 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: [{
@@ -10365,7 +10431,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: LoggerService }, { type: PaymentSystemProcessingService }, { type: GooglePayCheckoutPaymentService }, { type: GooglePayInstantPaymentService }, { type: i0.Injector }, { type: UserBehaviourAnalyticsService }] });
 
 var ApplePayIntegrationType;
 (function (ApplePayIntegrationType) {