@xsolla/payment-client-core 0.0.14 → 0.1.0

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

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, Injectable, Inject, isDevMode, NgModule } from '@angular/core';
-import { firstValueFrom, lastValueFrom, map, Subject, BehaviorSubject, filter as filter$1, takeUntil, skip, throwError } from 'rxjs';
+import { firstValueFrom, lastValueFrom, map, Subject, tap, BehaviorSubject, filter as filter$1, takeUntil, skip, throwError } from 'rxjs';
 import * as i1 from '@angular/common/http';
 import { HttpParams, HttpHeaders, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { UntypedFormGroup, Validators, UntypedFormControl, ReactiveFormsModule } from '@angular/forms';
@@ -407,6 +407,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
 
 class UrlService {
     addSearchParams(url, params = {}) {
+        if (!url) {
+            return '';
+        }
         const urlObject = new URL(url);
         for (const [key, value] of Object.entries(params)) {
             urlObject.searchParams.set(key, value);
@@ -414,6 +417,9 @@ class UrlService {
         return urlObject.toString();
     }
     getSearchParams(url) {
+        if (!url) {
+            return {};
+        }
         const urlObject = new URL(url);
         const searchParams = {};
         for (const [key, value] of urlObject.searchParams) {
@@ -437,6 +443,9 @@ class PaymentConfigService {
         this.settingsService = settingsService;
     }
     enrich(config) {
+        if (!config.returnUrl) {
+            throw new Error('URL is not provided in payment config');
+        }
         return {
             ...config,
             returnUrl: this.enrichReturnUrl(config.returnUrl),
@@ -564,6 +573,15 @@ const isSubmitResponse = (value) => {
     return value instanceof SubmitResponse;
 };
 
+class ShowErrorsAction {
+    constructor(errors) {
+        this.type = 'show_errors';
+        this.data = {
+            errors,
+        };
+    }
+}
+
 class InitializeResponse {
     constructor(response) {
         this.paymentForm = null;
@@ -613,12 +631,199 @@ const initializeResponseFactoryProvider = {
     useValue: (...args) => new InitializeResponse(...args),
 };
 
+class ShowFieldsAction {
+    constructor(submitResponse) {
+        this.type = 'show_fields';
+        this.data = {
+            fields: [],
+            errors: [],
+            messages: [],
+            order: {},
+        };
+        this.data.fields = submitResponse.fields.filter((field) => field?.isVisible === "1" /* XpsBoolean.true */);
+        this.data.errors = submitResponse.errors;
+        this.data.messages = submitResponse.messages;
+        this.data.order = submitResponse.summary;
+    }
+}
+
+const showFieldsActionFactoryToken = new InjectionToken('ShowFieldsAction');
+const showFieldsActionFactoryProvider = {
+    provide: showFieldsActionFactoryToken,
+    useValue: {
+        factory: (...args) => new ShowFieldsAction(...args),
+        isSuitable: (response) => {
+            return response.currentCommand === XpsCommand.check;
+        },
+    },
+};
+
+class CheckStatusAction {
+    constructor(submitResponse) {
+        this.type = 'check_status';
+        const status = submitResponse.parameters.status;
+        this.data = {
+            invoice: status?.invoice,
+            signature: submitResponse.parameters.form.signature?.value,
+            locale: submitResponse.parameters.form.locale?.value,
+            testPs: submitResponse.parameters.form.testPs?.value,
+            testXsolla: submitResponse.parameters.form.testXsolla?.value,
+            testProject: submitResponse.parameters.form.testProject?.value,
+            userReturnStatus: submitResponse.parameters.form.userReturnStatus?.value,
+        };
+    }
+}
+
+const checkStatusActionFactoryToken = new InjectionToken('CheckStatusAction');
+const checkStatusActionFactoryProvider = {
+    provide: checkStatusActionFactoryToken,
+    useValue: {
+        factory: (...args) => new CheckStatusAction(...args),
+        isSuitable: (response) => {
+            return response.currentCommand === XpsCommand.status;
+        },
+    },
+};
+
+class StatusUpdatedAction {
+    constructor(statusResponse) {
+        this.type = 'status_updated';
+        this.data = {
+            statusState: statusResponse.status.statusState,
+            invoice: statusResponse.status.invoice,
+            isSuccess: statusResponse.status.isSuccess,
+            isCanceled: statusResponse.status.isCanceled,
+            group: statusResponse.status.group,
+        };
+    }
+}
+
+const statusUpdatedActionFactoryToken = new InjectionToken('StatusUpdatedAction');
+const statusUpdatedActionFactoryProvider = {
+    provide: statusUpdatedActionFactoryToken,
+    useValue: {
+        factory: (...args) => new StatusUpdatedAction(...args),
+        isSuitable: () => false,
+    },
+};
+
+class RedirectAction {
+    constructor(submitResponse) {
+        this.type = 'redirect';
+        this.data = {
+            fields: submitResponse.fields,
+            errors: submitResponse.errors,
+            messages: submitResponse.messages,
+            order: submitResponse.summary,
+            invoiceId: submitResponse.fixInvoice,
+            redirect: this.getRedirect(submitResponse),
+        };
+    }
+    getRedirect(submitResponse) {
+        return {
+            redirectUrl: submitResponse.parameters.checkout.action,
+            data: submitResponse.parameters.checkout.data,
+        };
+    }
+}
+
+const redirectActionFactoryToken = new InjectionToken('RedirectAction');
+const redirectActionFactoryProvider = {
+    provide: redirectActionFactoryToken,
+    useValue: {
+        factory: (...args) => new RedirectAction(...args),
+        isSuitable: (response) => {
+            return (response.currentCommand === XpsCommand.account ||
+                (response.currentCommand === XpsCommand.checkout &&
+                    Boolean(response.parameters.checkout)));
+        },
+    },
+};
+
+const showErrorsActionFactoryToken = new InjectionToken('ShowErrorsAction');
+const showErrorsActionFactoryProvider = {
+    provide: showErrorsActionFactoryToken,
+    useValue: {
+        factory: (...args) => new ShowErrorsAction(...args),
+        isSuitable: (response) => {
+            return Boolean(response.errors?.length);
+        },
+    },
+};
+
+const nextActionsToken = new InjectionToken('Action');
+const nextActions = [
+    showFieldsActionFactoryProvider,
+    checkStatusActionFactoryProvider,
+    redirectActionFactoryProvider,
+];
+const flowUpdateNextActions = [
+    statusUpdatedActionFactoryProvider,
+    showErrorsActionFactoryProvider,
+];
+
+class NextActionService {
+    get flowUpdates$() {
+        return this.flowUpdatesSubject.asObservable();
+    }
+    constructor(nextActionTokens, injector) {
+        this.nextActionTokens = nextActionTokens;
+        this.injector = injector;
+        this.flowUpdatesSubject = new Subject();
+        this.nextActionsList = [];
+        this.fillNextActionsList();
+    }
+    getNextAction(submitResponse) {
+        if (submitResponse.errors?.length) {
+            this.emitFlowUpdates(new ShowErrorsAction(submitResponse.errors));
+        }
+        if (!submitResponse.currentCommand) {
+            return null;
+        }
+        const nextActionFactory = this.findNextAction(submitResponse);
+        if (nextActionFactory) {
+            return nextActionFactory(submitResponse);
+        }
+        throw new Error('Next action is undefined.');
+    }
+    emitFlowUpdates(action) {
+        this.flowUpdatesSubject.next(action);
+    }
+    fillNextActionsList() {
+        this.nextActionTokens.forEach((nextAction) => {
+            const item = this.injector.get(nextAction.provide);
+            this.nextActionsList.push(item);
+        });
+    }
+    findNextAction(submitResponse) {
+        const actionType = this.nextActionsList.find((nextAction) => {
+            return nextAction.isSuitable(submitResponse);
+        });
+        if (!actionType) {
+            return;
+        }
+        return actionType.factory;
+    }
+}
+NextActionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: NextActionService, deps: [{ token: nextActionsToken }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
+NextActionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: NextActionService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: NextActionService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [nextActionsToken]
+                }] }, { type: i0.Injector }]; } });
+
 class InitializeService {
-    constructor(responseFactory, secureApi, settingsService, countryService) {
+    constructor(responseFactory, secureApi, settingsService, countryService, nextActionService) {
         this.responseFactory = responseFactory;
         this.secureApi = secureApi;
         this.settingsService = settingsService;
         this.countryService = countryService;
+        this.nextActionService = nextActionService;
         this.apiRoute = 'directpayment';
         // TODO PAYMENTS-15743: replace with new refer id for headless core
         this.ps4ReferId = '22';
@@ -636,12 +841,16 @@ class InitializeService {
             headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded; charset=utf-8'),
             responseType: 'json',
         })
-            .pipe(map((response) => this.responseFactory(response)))).catch((error) => {
+            .pipe(map((response) => this.responseFactory(response)), tap((response) => {
+            if (response.paymentForm?.errors?.length) {
+                this.nextActionService.emitFlowUpdates(new ShowErrorsAction(response.paymentForm.errors));
+            }
+        }))).catch((error) => {
             throw new ResponseError(error.message);
         });
     }
 }
-InitializeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: InitializeService, deps: [{ token: initializeResponseFactoryToken }, { token: SecureApiClient }, { token: SettingsService }, { token: CountryService }], target: i0.ɵɵFactoryTarget.Injectable });
+InitializeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: InitializeService, deps: [{ token: initializeResponseFactoryToken }, { token: SecureApiClient }, { token: SettingsService }, { token: CountryService }, { token: NextActionService }], target: i0.ɵɵFactoryTarget.Injectable });
 InitializeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: InitializeService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: InitializeService, decorators: [{
             type: Injectable,
@@ -651,7 +860,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [initializeResponseFactoryToken]
-                }] }, { type: SecureApiClient }, { type: SettingsService }, { type: CountryService }]; } });
+                }] }, { type: SecureApiClient }, { type: SettingsService }, { type: CountryService }, { type: NextActionService }]; } });
 
 class XpsApiPartRequest {
     addXpsParameters(parameters) {
@@ -997,11 +1206,12 @@ const syncResponseFactoryProvider = {
 };
 
 class SyncService extends EmitDataService {
-    constructor(requestFactory, responseFactory, secureApi, settingsService) {
+    constructor(requestFactory, responseFactory, secureApi, nextActionService, settingsService) {
         super();
         this.requestFactory = requestFactory;
         this.responseFactory = responseFactory;
         this.secureApi = secureApi;
+        this.nextActionService = nextActionService;
         this.settingsService = settingsService;
         this.apiRoute = 'directpayment';
         this.prevFieldSyncStates = {};
@@ -1061,6 +1271,9 @@ class SyncService extends EmitDataService {
             headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded; charset=utf-8'),
             responseType: 'json',
         })).then((response) => {
+            if (response.errors?.length) {
+                this.nextActionService.emitFlowUpdates(new ShowErrorsAction(response.errors));
+            }
             this.emit(response);
             return this.responseFactory(field, response);
         });
@@ -1077,7 +1290,7 @@ class SyncService extends EmitDataService {
         this.prevFieldSyncStates[field.name] = { value, result };
     }
 }
-SyncService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SyncService, deps: [{ token: syncRequestFactoryToken }, { token: syncResponseFactoryToken }, { token: SecureApiClient }, { token: SettingsService }], target: i0.ɵɵFactoryTarget.Injectable });
+SyncService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SyncService, deps: [{ token: syncRequestFactoryToken }, { token: syncResponseFactoryToken }, { token: SecureApiClient }, { token: NextActionService }, { token: SettingsService }], target: i0.ɵɵFactoryTarget.Injectable });
 SyncService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SyncService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SyncService, decorators: [{
             type: Injectable,
@@ -1090,7 +1303,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [syncResponseFactoryToken]
-                }] }, { type: SecureApiClient }, { type: SettingsService }]; } });
+                }] }, { type: SecureApiClient }, { type: NextActionService }, { type: SettingsService }]; } });
 
 class ControlConfig {
     constructor() {
@@ -1373,19 +1586,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
             type: Injectable
         }], ctorParameters: function () { return [{ type: ControlConfigService }]; } });
 
-class StatusUpdatedAction {
-    constructor(statusResponse) {
-        this.type = 'status_updated';
-        this.data = {
-            statusState: statusResponse.status.statusState,
-            invoice: statusResponse.status.invoice,
-            isSuccess: statusResponse.status.isSuccess,
-            isCanceled: statusResponse.status.isCanceled,
-            group: statusResponse.status.group,
-        };
-    }
-}
-
 var StatusSearchParam;
 (function (StatusSearchParam) {
     StatusSearchParam["token"] = "token";
@@ -2439,162 +2639,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: StatusRequestService }, { type: CheckStatusService }, { type: WebsocketStatusService }]; } });
 
-class ShowFieldsAction {
-    constructor(submitResponse) {
-        this.type = 'show_fields';
-        this.data = {
-            fields: [],
-            errors: [],
-            messages: [],
-            order: {},
-        };
-        this.data.fields = submitResponse.fields.filter((field) => field?.isVisible === "1" /* XpsBoolean.true */);
-        this.data.errors = submitResponse.errors;
-        this.data.messages = submitResponse.messages;
-        this.data.order = submitResponse.summary;
-    }
-}
-
-const showFieldsActionFactoryToken = new InjectionToken('ShowFieldsAction');
-const showFieldsActionFactoryProvider = {
-    provide: showFieldsActionFactoryToken,
-    useValue: {
-        factory: (...args) => new ShowFieldsAction(...args),
-        isSuitable: (response) => {
-            return response.currentCommand === XpsCommand.check;
-        },
-    },
-};
-
-class CheckStatusAction {
-    constructor(submitResponse) {
-        this.type = 'check_status';
-        const status = submitResponse.parameters.status;
-        this.data = {
-            invoice: status?.invoice,
-            signature: submitResponse.parameters.form.signature?.value,
-            locale: submitResponse.parameters.form.locale?.value,
-            testPs: submitResponse.parameters.form.testPs?.value,
-            testXsolla: submitResponse.parameters.form.testXsolla?.value,
-            testProject: submitResponse.parameters.form.testProject?.value,
-            userReturnStatus: submitResponse.parameters.form.userReturnStatus?.value,
-        };
-    }
-}
-
-const checkStatusActionFactoryToken = new InjectionToken('CheckStatusAction');
-const checkStatusActionFactoryProvider = {
-    provide: checkStatusActionFactoryToken,
-    useValue: {
-        factory: (...args) => new CheckStatusAction(...args),
-        isSuitable: (response) => {
-            return response.currentCommand === XpsCommand.status;
-        },
-    },
-};
-
-const statusUpdatedActionFactoryToken = new InjectionToken('StatusUpdatedAction');
-const statusUpdatedActionFactoryProvider = {
-    provide: statusUpdatedActionFactoryToken,
-    useValue: {
-        factory: (...args) => new StatusUpdatedAction(...args),
-        isSuitable: () => false,
-    },
-};
-
-class RedirectAction {
-    constructor(submitResponse) {
-        this.type = 'redirect';
-        this.data = {
-            fields: submitResponse.fields,
-            errors: submitResponse.errors,
-            messages: submitResponse.messages,
-            order: submitResponse.summary,
-            invoiceId: submitResponse.fixInvoice,
-            redirect: this.getRedirect(submitResponse),
-        };
-    }
-    getRedirect(submitResponse) {
-        return {
-            redirectUrl: submitResponse.parameters.checkout.action,
-            data: submitResponse.parameters.checkout.data,
-        };
-    }
-}
-
-const redirectActionFactoryToken = new InjectionToken('RedirectAction');
-const redirectActionFactoryProvider = {
-    provide: redirectActionFactoryToken,
-    useValue: {
-        factory: (...args) => new RedirectAction(...args),
-        isSuitable: (response) => {
-            return (response.currentCommand === XpsCommand.account ||
-                (response.currentCommand === XpsCommand.checkout &&
-                    Boolean(response.parameters.checkout)));
-        },
-    },
-};
-
-const nextActionsToken = new InjectionToken('Action');
-const nextActions = [
-    showFieldsActionFactoryProvider,
-    checkStatusActionFactoryProvider,
-    statusUpdatedActionFactoryProvider,
-    redirectActionFactoryProvider,
-];
-
-class NextActionService {
-    get flowUpdates$() {
-        return this.flowUpdatesSubject.asObservable();
-    }
-    constructor(nextActionTokens, injector) {
-        this.nextActionTokens = nextActionTokens;
-        this.injector = injector;
-        this.flowUpdatesSubject = new Subject();
-        this.nextActionsList = [];
-        this.fillNextActionsList();
-    }
-    getNextAction(submitResponse) {
-        if (!submitResponse.currentCommand) {
-            return null;
-        }
-        const nextActionFactory = this.findNextAction(submitResponse);
-        if (nextActionFactory) {
-            return nextActionFactory(submitResponse);
-        }
-        throw new Error('Next action is undefined.');
-    }
-    emitFlowUpdates(action) {
-        this.flowUpdatesSubject.next(action);
-    }
-    fillNextActionsList() {
-        this.nextActionTokens.forEach((nextAction) => {
-            const item = this.injector.get(nextAction.provide);
-            this.nextActionsList.push(item);
-        });
-    }
-    findNextAction(submitResponse) {
-        const actionType = this.nextActionsList.find((nextAction) => {
-            return nextAction.isSuitable(submitResponse);
-        });
-        if (!actionType) {
-            return;
-        }
-        return actionType.factory;
-    }
-}
-NextActionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: NextActionService, deps: [{ token: nextActionsToken }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
-NextActionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: NextActionService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: NextActionService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [nextActionsToken]
-                }] }, { type: i0.Injector }]; } });
-
 class StatusService {
     constructor(urlService, statusRequestService, listenStatusService, nextActionService) {
         this.urlService = urlService;
@@ -2956,6 +3000,7 @@ class PaymentService {
         this.data = await this.initializeService.request(config);
         this.fields = this.getFields();
         this.form = this.formService.createForm(this.fields);
+        this.listenSyncValidationErrors(this.form);
         this.emitFinanceDetails(this.data.paymentForm?.summary);
         this.setupSyncService(this.form, this.fields);
         return this.fields.filter((field) => field?.isVisible === "1" /* XpsBoolean.true */);
@@ -3029,6 +3074,31 @@ class PaymentService {
             .pipe(takeUntil(this.destroy$))
             .subscribe((financeDetails) => (this.financeDetails = financeDetails));
     }
+    listenSyncValidationErrors(form) {
+        form.statusChanges.subscribe(() => {
+            const controls = this.form?.controls;
+            if (controls) {
+                const invalidControls = Object.entries(controls).filter(([key]) => controls[key].invalid);
+                if (invalidControls.length) {
+                    const syncValidationErrors = invalidControls
+                        .map(([controlName, control]) => {
+                        const error = control.errors?.['rewritableError'];
+                        if (!error) {
+                            return null;
+                        }
+                        return {
+                            code: 101,
+                            fieldValidationError: error?.code,
+                            message: error?.message ?? '',
+                            element_name: controlName,
+                        };
+                    })
+                        .filter(Boolean);
+                    this.nextActionService.emitFlowUpdates(new ShowErrorsAction(syncValidationErrors));
+                }
+            }
+        });
+    }
 }
 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: NextActionService }, { token: ControlConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
 PaymentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: PaymentService, providedIn: 'root' });
@@ -3316,6 +3386,7 @@ CoreLibraryModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", versi
             useValue: nextActions,
         },
         ...nextActions,
+        ...flowUpdateNextActions,
     ], imports: [HttpClientModule, FormModule] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CoreLibraryModule, decorators: [{
             type: NgModule,
@@ -3346,6 +3417,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
                             useValue: nextActions,
                         },
                         ...nextActions,
+                        ...flowUpdateNextActions,
                     ],
                 }]
         }] });