@xsolla/payment-client-core 0.5.2 → 0.5.4

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

@@ -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.5.2';
+const PAYMENT_CLIENT_CORE_VERSION = '0.5.4';
 
 class TranslateHelper {
     static init(service) {
@@ -7434,30 +7434,29 @@ class DfpCollectService {
         this.formName = 'formDFP';
     }
     collectDfpStatus(threeDsForm) {
-        if (threeDsForm.waitCallback) {
-            this.openIframeWithPostRequest(threeDsForm, false);
-        }
-        else {
-            this.openIframeWithPostRequest(threeDsForm, true);
-        }
-    }
-    /*
-     * This method create invisible iframe with required params and after that it submit form in iframe
-     * */
-    openIframeWithPostRequest(threeDsForm, isNeedNotifyAfterLoad) {
         this.window.document.getElementById(this.iframeName)?.remove();
         this.window.document.getElementById(this.formName)?.remove();
-        this.createIframe(isNeedNotifyAfterLoad, threeDsForm.threeDSTrXid);
+        /*
+         * With waitCallback (e.g. GPayments) the DFP URL is loaded directly into the
+         * iframe as its src, and the result is delivered back via the websocket
+         * callback instead of an onload notification. The legacy EMV 3DS Method flow
+         * posts threeDSMethodData to a blank iframe and notifies on load.
+         */
+        if (threeDsForm.waitCallback) {
+            this.createIframe(false, threeDsForm.threeDSTrXid, threeDsForm.threeDSMethod);
+            return;
+        }
+        this.createIframe(true, threeDsForm.threeDSTrXid);
         this.postFormToIframe(threeDsForm.threeDSMethod, threeDsForm.threeDSMethodData);
     }
     /*
      * isNeedNotifyAfterLoad is need to send notification of dft to server
      * */
-    createIframe(isNeedNotifyAfterLoad, threeDsTrXid) {
+    createIframe(isNeedNotifyAfterLoad, threeDsTrXid, src = 'about:blank') {
         const attributes = {
             name: this.iframeName,
             id: this.iframeName,
-            src: 'about:blank',
+            src,
             style: 'display:none',
         };
         const iFrame = this.window.document.createElement('iframe');
@@ -7583,6 +7582,7 @@ class ThreeDs20Service {
         this.latestDfpParameters = null;
         this.notifyDfpTimerId = 'notify-dfp';
         this.notifyDfpTimeoutMs = 10000;
+        this.waitCallbackNotifyDfpTimeoutMs = 20000;
         this.statusThreeDsTimerId = 'status-three-ds';
         this.statusThreeDsTimeoutMs = 180000;
     }
@@ -7593,7 +7593,9 @@ class ThreeDs20Service {
         this.clearLatestDfpParameters();
         this.reinsuranceCheckService.addTimer({
             id: this.notifyDfpTimerId,
-            timeoutMs: this.notifyDfpTimeoutMs,
+            timeoutMs: threeDsForm.waitCallback
+                ? this.waitCallbackNotifyDfpTimeoutMs
+                : this.notifyDfpTimeoutMs,
             callback: () => {
                 const threeDsTransactionId = this.latestDfpParameters?.threeDSTrXid ?? threeDsForm.threeDSTrXid;
                 this.notifyDfpStatusService.request(threeDsTransactionId, false);
@@ -10140,7 +10142,11 @@ class GooglePayCheckoutPaymentService {
         const checkoutData = this.checkout.request.form.fields;
         const paymentDataRequest = JSON.parse(checkoutData.paymentDataRequest);
         const isReadyToPayRequest = JSON.parse(checkoutData.isReadyToPayRequest);
-        const result = { paymentDataRequest, isReadyToPayRequest };
+        const result = {
+            paymentDataRequest,
+            isReadyToPayRequest,
+            environment: checkoutData.environment,
+        };
         if (checkoutData.amexCardNotification) {
             result.amexCardNotification = JSON.parse(checkoutData.amexCardNotification);
         }
@@ -10353,6 +10359,8 @@ class GooglePayService {
         this.analyticsEvent = new Subject();
         this.paymentInProgress = false;
         this.googlePaymentClient = null;
+        this.googlePayClientEnvironment = null;
+        this.serverEnvironment = null;
         this.paymentService = null;
     }
     get readyToPay$() {
@@ -10405,6 +10413,8 @@ class GooglePayService {
                 this.loggerService.error(new TaggedError('No initialization data', [ErrorTags.GOOGLEPAY]));
                 throw new AppError('Google Pay: no initialization data');
             }
+            this.serverEnvironment = initData.environment ?? null;
+            this.setupGooglePayClient();
             this.googlePaymentClient
                 .isReadyToPay(initData.isReadyToPayRequest)
                 .then((response) => {
@@ -10429,6 +10439,7 @@ class GooglePayService {
         });
     }
     async proceedCheckout() {
+        this.setupGooglePayClient();
         if (!this.googlePaymentClient) {
             this.loggerService.error(new TaggedError('Google payment client is not initialized to proceed checkout', [ErrorTags.GOOGLEPAY]));
             throw new AppError(`Google Pay. proceedCheckout: no google payment client`);
@@ -10503,6 +10514,12 @@ class GooglePayService {
             buttonLocale: this.getLocaleForButton(configuration.locale),
         });
     }
+    resolveGooglePayEnvironment() {
+        if (this.serverEnvironment) {
+            return this.serverEnvironment;
+        }
+        return this.initParams.isSandbox ? 'TEST' : 'PRODUCTION';
+    }
     setupGooglePayClient() {
         if (!this.window.google) {
             this.loggerService.error(new TaggedError('Google Pay library is not available on window', [
@@ -10510,7 +10527,11 @@ class GooglePayService {
             ]));
             return;
         }
-        const environment = this.initParams.isSandbox ? 'TEST' : 'PRODUCTION';
+        const environment = this.resolveGooglePayEnvironment();
+        if (this.googlePaymentClient &&
+            this.googlePayClientEnvironment === environment) {
+            return;
+        }
         const googlePaymentClientData = {
             environment,
         };
@@ -10522,6 +10543,7 @@ class GooglePayService {
         }
         this.googlePaymentClient =
             new this.window.google.payments.api.PaymentsClient(googlePaymentClientData);
+        this.googlePayClientEnvironment = environment;
     }
     onLoadScript() {
         if (!this.window.google) {