@xsolla/payment-client-core 0.2.10 → 0.2.11

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

@@ -5726,7 +5726,12 @@ class PaymentService {
         else {
             type = 'sync';
         }
-        this._formResponse$.next({ type, data, token: this.settingsService.token });
+        this._formResponse$.next({
+            type,
+            data,
+            token: this.settingsService.token,
+            isSandbox: this.settingsService.isSandboxMode(),
+        });
     }
 }
 PaymentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: PaymentService, deps: [{ token: InitializeService }, { token: SubmitService }, { token: SyncService }, { token: FormService }, { token: StatusService }, { token: FinanceDetailsService }, { token: CreditCardStateService }, { token: NextActionService }, { token: ControlConfigService }, { token: ThreeDsService }, { token: FormMessagesService }, { token: SettingsService }, { token: CountryService }, { token: CheckStatusActionCreator }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -6479,6 +6484,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
         }] });
 
 const applePayVersion = 3;
+const safariVersionForIframeIntegration = 17;
 
 const agreementsGroup = [
     FieldNames.termsAndConditions,
@@ -6840,6 +6846,17 @@ class UserAgentService {
     get isSafari() {
         return this._browserName === 'Apple Safari';
     }
+    get safariVersion() {
+        if (!this.isSafari) {
+            return null;
+        }
+        const versionRegExp = new RegExp('(Version)\\/(.+)\\s');
+        const version = versionRegExp.exec(this.userAgent);
+        if (!version) {
+            return null;
+        }
+        return Number(version[2].split('.')[0]);
+    }
     get iOsVersion() {
         if (this.osType !== 'ios') {
             return null;
@@ -7073,7 +7090,7 @@ class ApplePayService {
             this.emitError(ApplePayErrors.deviceIsNotCapableError);
         }
     }
-    redirectToPaymentPage(parameters, token) {
+    redirectToPaymentPage(parameters, token, isSandbox) {
         const route = pagesRoutes.get(applePayId);
         if (!route) {
             return;
@@ -7088,8 +7105,8 @@ class ApplePayService {
         if (this.order) {
             query.append('order', this.order);
         }
-        const url = `${route}?${query.toString()}`;
-        return url;
+        const payStationUrl = isSandbox ? sandboxPayStationUrl : payStation4Url;
+        return `${payStationUrl}/en${route}?${query.toString()}`;
     }
     setOrder(data) {
         const summary = data?.paymentForm?.summary;
@@ -7140,6 +7157,7 @@ class ApplePayService {
                 })
                     .catch((error) => {
                     console.error('apple pay: merchant validation error', error);
+                    this.emitError(ApplePayErrors.paymentError);
                     session.abort();
                 });
             };
@@ -7155,6 +7173,7 @@ class ApplePayService {
                 })
                     .catch((error) => {
                     console.error('apple pay: payment authorization error', error);
+                    this.emitError(ApplePayErrors.paymentError);
                     session.completePayment(this.window.ApplePaySession.STATUS_FAILURE);
                 });
             };
@@ -7227,7 +7246,7 @@ class ApplePayService {
     }
     emitIntegrationType() {
         let integrationType;
-        if (this.paymentClient && this.isDeviceCapable()) {
+        if (this.paymentClient && this.isDeviceCapable() && this.canUseSdk()) {
             integrationType = 'sdk';
         }
         else if (this.userAgentService.isSafari) {
@@ -7238,6 +7257,10 @@ class ApplePayService {
         }
         this.integrationType.next(integrationType);
     }
+    canUseSdk() {
+        return !!(this.userAgentService.safariVersion &&
+            this.userAgentService.safariVersion >= safariVersionForIframeIntegration);
+    }
 }
 ApplePayService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: ApplePayService, deps: [{ token: windowToken }, { token: UserAgentService }, { token: SummaryFinanceDetailsAdapterService }], target: i0.ɵɵFactoryTarget.Injectable });
 ApplePayService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: ApplePayService, providedIn: 'root' });