@xsolla/payment-client-core 0.2.53 → 0.2.55

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

@@ -8305,7 +8305,7 @@ class BraintreeHandler extends ApplePaySessionHandlerAbstract {
     setClient(client) {
         this.paymentClient = client;
     }
-    startSession(params, additionalParams) {
+    startSession(params, additionalParams, applePayFinallyCallback) {
         if (!this.paymentClient) {
             console.error(ApplePayErrors.braintreeInitializeError);
             this.elkLoggerService.log(ApplePayErrors.braintreeInitializeError, [
@@ -8353,6 +8353,7 @@ class BraintreeHandler extends ApplePaySessionHandlerAbstract {
                 .catch((error) => {
                 console.error(ApplePayErrors.merchantValidationError, error);
                 session.abort();
+                applePayFinallyCallback();
             });
         };
         session.onpaymentauthorized = (event) => {
@@ -8370,11 +8371,13 @@ class BraintreeHandler extends ApplePaySessionHandlerAbstract {
                 .catch((error) => {
                 console.error('Apple Pay: Tokenization error', error);
                 session.completePayment(this.window.ApplePaySession.STATUS_FAILURE);
+                applePayFinallyCallback();
             });
         };
         session.oncancel = (event) => {
             console.error(ApplePayErrors.cancelled, event);
             this.emitError(ApplePayErrors.cancelled);
+            applePayFinallyCallback();
         };
         session.begin();
     }
@@ -8395,7 +8398,7 @@ class CheckoutHandler extends ApplePaySessionHandlerAbstract {
         this.http = http;
         this.applePayCartService = applePayCartService;
     }
-    startSession(params, additionalParams) {
+    startSession(params, additionalParams, applePayFinallyCallback) {
         const request = this.buildPaymentRequest(params);
         const session = new this.window.ApplePaySession(applePayVersion, request);
         session.onshippingcontactselected = (event) => {
@@ -8439,6 +8442,7 @@ class CheckoutHandler extends ApplePaySessionHandlerAbstract {
                 error: (error) => {
                     console.error(ApplePayErrors.merchantValidationError, error);
                     session.abort();
+                    applePayFinallyCallback();
                 },
             });
         };
@@ -8454,6 +8458,7 @@ class CheckoutHandler extends ApplePaySessionHandlerAbstract {
         session.oncancel = (event) => {
             console.error(ApplePayErrors.cancelled, event);
             this.emitError(ApplePayErrors.cancelled);
+            applePayFinallyCallback();
         };
         session.begin();
     }
@@ -9146,6 +9151,95 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
                 }]
         }] });
 
+class ApplePaySdkService {
+    constructor(window, loggerService) {
+        this.window = window;
+        this.loggerService = loggerService;
+        this.sdkLoaded = false;
+        this.jsSdk = 'https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js';
+        this.sdkSuccessfulPayment = new Subject();
+        this.windowClosing = new Subject();
+        this.successPaymentType = 'successClose';
+        this.windowClosingType = 'windowclosing';
+        this.needToAddApplePayJs = !this.window.ApplePaySession;
+    }
+    get windowClosing$() {
+        return this.windowClosing.asObservable();
+    }
+    emitWindowClosing() {
+        return this.windowClosing.next();
+    }
+    addApplePaySdkJs() {
+        const isApplePayJsAdded = this.isAppleSdkExist();
+        if (!this.needToAddApplePayJs) {
+            if (isApplePayJsAdded) {
+                this.sdkLoaded = true;
+            }
+            return;
+        }
+        const listenApplePayPostMessages = () => {
+            this.applePaySdkPostMessagesListener = (event) => {
+                /* istanbul ignore if */
+                if (!event.origin.includes('apple')) {
+                    return;
+                }
+                /* istanbul ignore if */
+                if (event.data.messageType === this.windowClosingType) {
+                    this.emitWindowClosing();
+                }
+                /* istanbul ignore if */
+                if (event.data.messageType === this.successPaymentType) {
+                    this.sdkSuccessfulPayment.next();
+                }
+            };
+            this.window.addEventListener('message', this.applePaySdkPostMessagesListener);
+        };
+        if (isApplePayJsAdded && this.window.ApplePaySession) {
+            this.sdkLoaded = true;
+            listenApplePayPostMessages();
+            return;
+        }
+        const firstScriptElement = this.window.document.getElementsByTagName('script')[0];
+        const script = this.window.document.createElement('script');
+        script.async = true;
+        script.crossOrigin = 'anonymous';
+        script.src = `${this.jsSdk}`;
+        firstScriptElement?.parentNode?.insertBefore(script, firstScriptElement);
+        script.onload = () => {
+            this.sdkLoaded = true;
+            listenApplePayPostMessages();
+        };
+        script.onerror = (error) => {
+            this.loggerService.log('Apple pay: script sdk loading error', [ErrorTags.APPLEPAY], 
+            // @ts-expect-error error type
+            { error: error?.message ? error.toString() : JSON.stringify(error) });
+            console.error('Apple pay: script sdk loading error', error);
+        };
+    }
+    /* istanbul ignore next */
+    removeListeners() {
+        if (!this.applePaySdkPostMessagesListener) {
+            return;
+        }
+        this.window.removeEventListener('message', this.applePaySdkPostMessagesListener);
+    }
+    isAppleSdkExist() {
+        const scriptsElements = this.window.document.querySelectorAll('script');
+        return Array.from(scriptsElements).some((element) => element.src === this.jsSdk);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ApplePaySdkService, deps: [{ token: windowToken }, { token: ElkLoggerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ApplePaySdkService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ApplePaySdkService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [windowToken]
+                }] }, { type: ElkLoggerService }] });
+
 class ApplePayService {
     get paymentParameters() {
         return this.applePayParams;
@@ -9156,26 +9250,43 @@ class ApplePayService {
     get error$() {
         return this.error.asObservable();
     }
+    /* istanbul ignore next */
+    get applePayQrOpened$() {
+        return this.applePayQrOpened.asObservable();
+    }
+    /* istanbul ignore next */
+    get windowClosing$() {
+        return this.applePaySdkService.windowClosing$;
+    }
     get integrationType$() {
         return this.integrationType.asObservable();
     }
-    constructor(window, userAgentService, summaryFinanceDetailsAdapterService, braintreeHandler, checkoutHandler, appleParamsBuilder, elkLoggerService) {
+    constructor(window, summaryFinanceDetailsAdapterService, braintreeHandler, checkoutHandler, appleParamsBuilder, elkLoggerService, applePaySdkService) {
         this.window = window;
-        this.userAgentService = userAgentService;
         this.summaryFinanceDetailsAdapterService = summaryFinanceDetailsAdapterService;
         this.braintreeHandler = braintreeHandler;
         this.checkoutHandler = checkoutHandler;
         this.appleParamsBuilder = appleParamsBuilder;
         this.elkLoggerService = elkLoggerService;
+        this.applePaySdkService = applePaySdkService;
         this.payment = new Subject();
         this.error = new Subject();
         this.integrationType = new Subject();
+        this.applePayQrOpened = new Subject();
         this.paymentClient = null;
         this.applePayParams = null;
         this.order = null;
         this.api = this.loadBraintree();
         this.subscribeToHandlers();
     }
+    /* istanbul ignore next */
+    addApplePaySdkJs() {
+        this.applePaySdkService.addApplePaySdkJs();
+    }
+    /* istanbul ignore next */
+    removeListeners() {
+        this.applePaySdkService.removeListeners();
+    }
     setApplePayParams(data) {
         const paymentForm = data?.paymentForm;
         const formFields = paymentForm?.fields;
@@ -9249,8 +9360,9 @@ class ApplePayService {
         }
     }
     get isDeviceCapable() {
-        if (!this.userAgentService.isSafari)
-            return false;
+        if (this.applePaySdkService.needToAddApplePayJs) {
+            return true;
+        }
         try {
             return Boolean(this.window.ApplePaySession?.supportsVersion(applePayVersion) &&
                 this.window.ApplePaySession?.canMakePayments());
@@ -9277,7 +9389,8 @@ class ApplePayService {
             console.error('Apple Pay: Unsupported acquirer:', parameters.acquirer);
             return;
         }
-        sessionHandler.startSession(parameters, additionalParams);
+        sessionHandler.startSession(parameters, additionalParams, () => this.applePaySdkService.emitWindowClosing());
+        this.emitApplePayOpened();
     }
     getSessionHandler(acquirer) {
         switch (acquirer) {
@@ -9297,10 +9410,7 @@ class ApplePayService {
         this.error.next(error);
     }
     emitIntegrationType() {
-        const integration = this.isDeviceCapable
-            ? ApplePayIntegrationType.native
-            : ApplePayIntegrationType.redirect;
-        this.integrationType.next(integration);
+        this.integrationType.next(this.getIntegrationType());
     }
     subscribeToHandlers() {
         const handlers = [this.braintreeHandler, this.checkoutHandler];
@@ -9311,7 +9421,19 @@ class ApplePayService {
             });
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ApplePayService, deps: [{ token: windowToken }, { token: UserAgentService }, { token: SummaryFinanceDetailsAdapterService }, { token: BraintreeHandler }, { token: CheckoutHandler }, { token: ApplePayParamsBuilderService }, { token: ElkLoggerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    getIntegrationType() {
+        /* istanbul ignore next */
+        return this.isDeviceCapable
+            ? ApplePayIntegrationType.native
+            : ApplePayIntegrationType.redirect;
+    }
+    emitApplePayOpened() {
+        if (this.getIntegrationType() === ApplePayIntegrationType.native &&
+            this.applePaySdkService.needToAddApplePayJs) {
+            this.applePayQrOpened.next();
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ApplePayService, deps: [{ token: windowToken }, { token: SummaryFinanceDetailsAdapterService }, { token: BraintreeHandler }, { token: CheckoutHandler }, { token: ApplePayParamsBuilderService }, { token: ElkLoggerService }, { token: ApplePaySdkService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ApplePayService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ApplePayService, decorators: [{
@@ -9322,7 +9444,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [windowToken]
-                }] }, { type: UserAgentService }, { type: SummaryFinanceDetailsAdapterService }, { type: BraintreeHandler }, { type: CheckoutHandler }, { type: ApplePayParamsBuilderService }, { type: ElkLoggerService }] });
+                }] }, { type: SummaryFinanceDetailsAdapterService }, { type: BraintreeHandler }, { type: CheckoutHandler }, { type: ApplePayParamsBuilderService }, { type: ElkLoggerService }, { type: ApplePaySdkService }] });
 
 /*
  * Public API Surface of core-library