@xsolla/payment-client-core 0.2.91 → 0.2.92

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

@@ -1353,6 +1353,7 @@ var FieldNames;
     FieldNames["payViaCheckoutUrl"] = "payViaCheckoutUrl";
     FieldNames["googlePayInitData"] = "googlePayInitData";
     FieldNames["googlePayPaymentData"] = "googlePayPaymentData";
+    FieldNames["googlePay3dsRedirect"] = "googlePay3DSRedirect";
     FieldNames["externalCardIssuerCountry"] = "externalCardIssuerCountry";
     FieldNames["pmId"] = "pm_id";
 })(FieldNames || (FieldNames = {}));
@@ -1592,6 +1593,12 @@ const fieldsAllowedToExternalChange = new Set([
     FieldNames.pmId,
 ]);
 
+const googlePayPid = 3431;
+
+const isGooglePaySettingsGuard = (settings) => {
+    return settings.paymentMethodId === googlePayPid;
+};
+
 const masterCardAndVisaPaymentMethodId = 26;
 const maestroPaymentMethodId = 490;
 // eslint-disable-next-line @typescript-eslint/no-magic-numbers
@@ -1608,6 +1615,10 @@ const cardsWith3ds = new Set([
     creditCardPaymentMethodId,
 ]);
 
+const isCreditCardSettingsGuard = (settings) => {
+    return settings.paymentMethodId === creditCardPaymentMethodId;
+};
+
 const initializeResponseFactoryToken = new InjectionToken('InitializeResponse');
 const initializeResponseFactoryProvider = {
     provide: initializeResponseFactoryToken,
@@ -1734,13 +1745,6 @@ class RedirectActionCreator {
         return (response.currentCommand === XpsCommand.checkout &&
             Boolean(response.parameters.checkout));
     }
-    getRedirect(submitResponse) {
-        return {
-            redirectUrl: this.getRedirectUrl(submitResponse),
-            isNewWindowRequired: this.getIsNewWindowRequired(submitResponse),
-            data: submitResponse.parameters.checkout.data,
-        };
-    }
     getRedirectUrl(submitResponse) {
         const responseRedirectUrl = submitResponse.parameters.checkout.action;
         const pid = submitResponse?.fields?.find(({ name }) => name === 'fix_pid')?.value;
@@ -1753,6 +1757,14 @@ class RedirectActionCreator {
         }
         return this.preparePagesUrl(pagesPath);
     }
+    getRedirect(submitResponse) {
+        return {
+            redirectUrl: this.getRedirectUrl(submitResponse),
+            isNewWindowRequired: this.getIsNewWindowRequired(submitResponse),
+            isSameWindowRequired: this.getIsSameWindowRequired(submitResponse),
+            data: submitResponse.parameters.checkout?.data ?? {},
+        };
+    }
     getIsNewWindowRequired(submitResponse) {
         if (!cardsWith3ds.has(submitResponse?.parameters?.pid)) {
             return false;
@@ -1763,6 +1775,13 @@ class RedirectActionCreator {
         const isJapanCard = cardBinCountry === 'JP';
         return isAcquirerWithRedirectInNewWindow || isJapanCard;
     }
+    getIsSameWindowRequired(submitResponse) {
+        if (this.getIsNewWindowRequired(submitResponse)) {
+            return false;
+        }
+        // 3DS with redirect case
+        return cardsWith3ds.has(submitResponse?.parameters?.pid);
+    }
     preparePagesUrl(pagesPath) {
         const isSandbox = this.settingsService.isSandboxMode();
         const token = this.settingsService.token;
@@ -2027,8 +2046,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
             type: Injectable
         }] });
 
-const googlePayPid = 3431;
-
 class SpecialButtonActionCreator {
     constructor() {
         this.type = 'special_button';
@@ -2168,8 +2185,25 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
             type: Injectable
         }] });
 
+class GoogleThreeDsRedirectActionCreator extends RedirectActionCreator {
+    isSuitable(response) {
+        return (response.currentCommand === XpsCommand.checkout &&
+            !response.parameters.checkout &&
+            Boolean(response.parameters.form?.googlePay3DSRedirect?.value));
+    }
+    getRedirectUrl(submitResponse) {
+        return (String(submitResponse.parameters.form?.googlePay3DSRedirect?.value) ?? '');
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: GoogleThreeDsRedirectActionCreator, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: GoogleThreeDsRedirectActionCreator }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: GoogleThreeDsRedirectActionCreator, decorators: [{
+            type: Injectable
+        }] });
+
 const nextActionsToken = new InjectionToken('Action');
 const nextActions = [
+    GoogleThreeDsRedirectActionCreator,
     ShowFieldsActionCreator,
     CheckStatusActionCreator,
     SpecialButtonActionCreator,
@@ -3011,11 +3045,13 @@ class PaymentSettingsService {
         if (!config?.paymentMethodSettings) {
             return {};
         }
-        const settings = config.paymentMethodSettings;
         const params = {};
-        params.useSingleExpirationDateField = this.toXps(settings.useSingleExpirationDateField);
-        params.useExternalVault = this.toXps(settings.useExternalVault);
-        params.isPaymentViaSavedMethod = this.toXps(settings.isPaymentViaSavedMethod);
+        if (isCreditCardSettingsGuard(config)) {
+            const settings = config.paymentMethodSettings;
+            params.useSingleExpirationDateField = this.toXps(settings.useSingleExpirationDateField);
+            params.useExternalVault = this.toXps(settings.useExternalVault);
+            params.isPaymentViaSavedMethod = this.toXps(settings.isPaymentViaSavedMethod);
+        }
         return params;
     }
     toXps(value) {
@@ -3632,7 +3668,6 @@ function convertedEmailValidator() {
 }
 
 function convertedRequiredValidator() {
-    console.log();
     return convert(Validators.required, TranslateHelper.t('errors.validation.required', 'Required'));
 }
 
@@ -7488,7 +7523,10 @@ class PaymentService {
         this.fields = this.getFields();
         this.form = this.formService.createForm(this.fields);
         this.syncService.setup(this.form, this.fields, this.config);
-        return submitResponse;
+        return {
+            response: submitResponse,
+            nextAction: this.nextActionService.getNextAction(submitResponse),
+        };
     }
     setupInitialFieldValues() {
         const fieldsToOverride = this.config.overrideFormFields;
@@ -7530,6 +7568,9 @@ class PaymentService {
             throw new Error('Should submit form first');
         }
         const sdkPaymentData = this.getSdkPaymentDataFromResponse(this.data);
+        const shouldHandleUserBackRedirectOnSdkSide = isGooglePaySettingsGuard(this.config)
+            ? !!this.config.paymentMethodSettings?.useSdkHandlerForUserBackRedirect
+            : false;
         return Promise.resolve({
             data: sdkPaymentData.checkoutData,
             sandbox: this.settingsService.isSandboxMode()
@@ -7540,6 +7581,7 @@ class PaymentService {
             submitResponse: isSubmitResponse(this.data) ? this.data : null,
             summary: sdkPaymentData.summary,
             locale: this.translateService.getCurrentLang(),
+            shouldHandleUserBackRedirectOnSdkSide,
         });
     }
     getQrCode() {
@@ -7646,8 +7688,8 @@ class PaymentService {
     }
     externalChangeFieldValue(name, value) {
         const isFieldAllowedForExternalChange = fieldsAllowedToExternalChange.has(name);
-        const isExternalVault = this.config.paymentMethodSettings?.useExternalVault &&
-            this.config.paymentMethodId === creditCardPaymentMethodId;
+        const isExternalVault = isCreditCardSettingsGuard(this.config) &&
+            this.config.paymentMethodSettings?.useExternalVault;
         if (!isFieldAllowedForExternalChange || !isExternalVault)
             return;
         const formControl = this.form?.get(name);