@xsolla/payment-client-core 0.2.97 → 0.2.98

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

@@ -1778,21 +1778,28 @@ class RedirectActionCreator {
         };
     }
     getIsNewWindowRequired(submitResponse) {
-        if (!cardsWith3ds.has(submitResponse?.parameters?.pid)) {
+        const pid = submitResponse?.parameters?.pid;
+        if (!cardsWith3ds.has(pid) && pid !== googlePayPid) {
             return false;
         }
         const acquirer = submitResponse?.userSession?.payment_method_contr_id ?? null;
         const isAcquirerWithRedirectInNewWindow = acquirer && acquirersWithRedirectInNewWindow.has(acquirer);
         const cardBinCountry = submitResponse.parameters.cardBinCountry;
         const isJapanCard = cardBinCountry === 'JP';
-        return isAcquirerWithRedirectInNewWindow || isJapanCard;
+        const isThreeDsIndependentWindow = this.settingsService.settings.is_three_ds_independent_windows ?? false;
+        return (isAcquirerWithRedirectInNewWindow ||
+            isJapanCard ||
+            isThreeDsIndependentWindow);
     }
     getIsSameWindowRequired(submitResponse) {
         if (this.getIsNewWindowRequired(submitResponse)) {
             return false;
         }
+        const pid = submitResponse?.parameters?.pid;
+        const isCorrectPids = cardsWith3ds.has(pid) || googlePayPid === pid;
         // 3DS with redirect case
-        return cardsWith3ds.has(submitResponse?.parameters?.pid);
+        return (isCorrectPids &&
+            !this.settingsService.settings.is_three_ds_independent_windows);
     }
     preparePagesUrl(pagesPath) {
         const isSandbox = this.settingsService.isSandboxMode();
@@ -2039,24 +2046,38 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
         }] });
 
 class ThreeDsActionCreator {
-    constructor() {
+    constructor(settingsService) {
+        this.settingsService = settingsService;
         this.type = '3DS';
     }
     getActionData(actionData) {
         return {
             type: this.type,
-            data: actionData,
+            data: this.enrichWithRedirectParams(actionData),
         };
     }
     isSuitable() {
         return false;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ThreeDsActionCreator, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    enrichWithRedirectParams(actionData) {
+        return {
+            ...actionData,
+            data: {
+                ...actionData.data,
+                redirect: {
+                    isNewWindowRequired: this.settingsService.settings.is_three_ds_independent_windows ??
+                        false,
+                    isSameWindowRequired: !this.settingsService.settings.is_three_ds_independent_windows,
+                },
+            },
+        };
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ThreeDsActionCreator, deps: [{ token: SettingsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ThreeDsActionCreator }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ThreeDsActionCreator, decorators: [{
             type: Injectable
-        }] });
+        }], ctorParameters: () => [{ type: SettingsService }] });
 
 class SpecialButtonActionCreator {
     constructor() {
@@ -2120,9 +2141,20 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
             type: Injectable
         }] });
 
+const payPayId = 3669;
+const linePayId = 3677;
+const auPayId = 3686;
+const docomoId = 3692;
+const softbankId = 3693;
+const auEasyPaymentId = 3694;
+const yMobileId = 3697;
+const mobilePaymentMethodId = 1738;
+const mobilePaymentMethodId2 = 2015;
+
 class ShowMobilePaymentScreenActionCreator {
     constructor() {
         this.type = 'show_mobile_payment_screen';
+        this.pids = [mobilePaymentMethodId, mobilePaymentMethodId2];
     }
     getActionData(response) {
         const submitButtonText = response.parameters.buyData.value;
@@ -2134,7 +2166,8 @@ class ShowMobilePaymentScreenActionCreator {
         };
     }
     isSuitable(response) {
-        return response.currentCommand === XpsCommand.create;
+        return (response.currentCommand === XpsCommand.create &&
+            this.pids.includes(response.pid));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ShowMobilePaymentScreenActionCreator, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ShowMobilePaymentScreenActionCreator }); }
@@ -7621,6 +7654,7 @@ class PaymentService {
             summary: sdkPaymentData.summary,
             locale: this.translateService.getCurrentLang(),
             shouldHandleUserBackRedirectOnSdkSide,
+            isThreeDsIndependentWindows: this.settingsService.settings.is_three_ds_independent_windows ?? false,
         });
     }
     getQrCode() {
@@ -7987,14 +8021,6 @@ const euCountries = new Set([
     'SE',
 ]);
 
-const payPayId = 3669;
-const linePayId = 3677;
-const auPayId = 3686;
-const docomoId = 3692;
-const softbankId = 3693;
-const auEasyPaymentId = 3694;
-const yMobileId = 3697;
-
 const sctlLinkUsa = 'https://xsolla.com/ja/sctl/xsolla-usa';
 const sctlLinkJapan = 'https://xsolla.com/ja/sctl/xsolla-japan';
 const sctlLinkMap = new Map([