@xsolla/payment-client-core 0.1.14-test21 → 0.1.14-test3

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

@@ -555,9 +555,15 @@ var FieldNames;
 class SubmitResponse {
     constructor(parameters, responseNumber = 0) {
         this.responseNumber = responseNumber;
+        this.isSavingMethodMode = false;
         /* Todo split into properties */
         this.parameters = parameters;
-        this.fields = Object.keys(parameters.form).map((key) => parameters.form[key]);
+        this.fields = Object.keys(parameters.form).map((key) => {
+            if (key === 'save_payment_account_only') {
+                this.isSavingMethodMode = parameters.form[key].value === "1" /* XpsBoolean.true */;
+            }
+            return parameters.form[key];
+        });
         if (parameters.onlineBanking) {
             this.onlineBanking = {
                 url: parameters.onlineBanking.value,
@@ -2960,7 +2966,7 @@ var StatusSearchParam;
     StatusSearchParam["testPs"] = "fix_testPs";
     StatusSearchParam["testXsolla"] = "fix_testXsolla";
     StatusSearchParam["userReturnStatus"] = "fix_userReturnStatus";
-    StatusSearchParam["isSavePaymentAccount"] = "isSavePaymentAccount";
+    StatusSearchParam["savePaymentMethod"] = "savePaymentMethod";
 })(StatusSearchParam || (StatusSearchParam = {}));
 
 const requiredStatusSearchParams = [
@@ -3041,9 +3047,9 @@ const statusSearchParamsMap = new Map([
         },
     ],
     [
-        StatusSearchParam.isSavePaymentAccount,
+        StatusSearchParam.savePaymentMethod,
         {
-            key: 'isSavePaymentAccount',
+            key: 'savePaymentMethod',
             converter: numberConverter,
         },
     ],
@@ -4615,166 +4621,39 @@ class SavedPaymentAccountChangesService {
     }
 }
 SavedPaymentAccountChangesService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SavedPaymentAccountChangesService, deps: [{ token: SettingsService }, { token: SecureApiClient }], target: i0.ɵɵFactoryTarget.Injectable });
-SavedPaymentAccountChangesService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SavedPaymentAccountChangesService, providedIn: 'root' });
+SavedPaymentAccountChangesService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SavedPaymentAccountChangesService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SavedPaymentAccountChangesService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
+            type: Injectable
         }], ctorParameters: function () { return [{ type: SettingsService }, { type: SecureApiClient }]; } });
 
 class SavePaymentMethodStatusService {
-    constructor(statusRequestService, listenStatusService, savedPaymentAccountChangesService, nextActionService, checkStatusService) {
+    constructor(statusRequestService, listenStatusService, savedPaymentAccountChangesService, nextActionService) {
         this.statusRequestService = statusRequestService;
         this.listenStatusService = listenStatusService;
         this.savedPaymentAccountChangesService = savedPaymentAccountChangesService;
         this.nextActionService = nextActionService;
-        this.checkStatusService = checkStatusService;
-        this.statusChecked = false;
     }
     async getStatus(params) {
-        if (this.listenStatusSubscription) {
-            this.listenStatusSubscription.unsubscribe();
-            this.listenStatusService.stopListening();
-        }
         this.statusRequestService.setRequestParams(params);
-        this.statusRequestService.request();
-        const statusResponse = await firstValueFrom(this.statusRequestService.response$);
-        statusResponse.status.isSavePaymentAccount = true;
-        // this.listenStatusService.stopListening();
-        const accountData = await this.getPaymentAccountData(params.invoice);
-        if (this.savingFailedOrCancel(statusResponse?.status) || this.savingSuccessful(accountData, statusResponse?.status)) {
-            return statusResponse.status;
-        }
-        if (!this.statusChecked) {
-            this.checkStatus(params);
-            statusResponse.status.statusState = StatusEnum.processing;
-            return statusResponse.status;
-        }
-        statusResponse.status.statusState = StatusEnum.error;
-        return statusResponse.status;
-    }
-    checkStatus(params) {
-        if (!this.statusChecked) {
-            this.statusChecked = true;
-        }
         this.startWaitingStatusUpdates(params.invoice);
         this.statusRequestService.request();
-    }
-    async getStatusOld(params) {
-        console.log('getStatus', params);
-        this.statusRequestService.setRequestParams(params);
-        // this.startWaitingStatusUpdates(params.invoice);
-        this.statusRequestService.request();
         const statusResponse = await firstValueFrom(this.statusRequestService.response$);
-        this.checkStatusService.setRequestParams(params.invoice);
-        this.checkStatusService.request();
-        const checkStatusResponse = await firstValueFrom(this.checkStatusService.response$);
-        if (!checkStatusResponse.final) {
-            this.startWaitingStatusUpdates(params.invoice);
-            statusResponse.status.isSavePaymentAccount = true;
-            statusResponse.status.statusState = StatusEnum.processing;
-            return statusResponse.status;
-        }
-        // todo: get account
-        const accountData = await this.getPaymentAccountData(params.invoice);
-        if (!this.savingFailedOrCancel(statusResponse?.status) && !this.savingSuccessful(accountData, statusResponse?.status)) {
-            // todo is proccessing
-            this.startWaitingStatusUpdates(params.invoice);
+        if (!this.savePaymentMethodStatus) {
             statusResponse.status.statusState = StatusEnum.processing;
         }
-        statusResponse.status.isSavePaymentAccount = true;
         return statusResponse.status;
-        // this.listenStatusService.listen(params.invoice);
-        // this.statusRequestService.request();
-        // const paramsCheck = {
-        //   section: 'getstatus',
-        //   action: 'getstatus',
-        //   // invoice: params.invoice,
-        //   ...params,
-        //   access_token: params.token || '8sogPLisB328Snf9M9aChSwkZn4IzOzf_lc_en'
-        // };
-        // // const check = await this.checkStatusService.requestPromise('directpayment', paramsCheck);
-        // // console.log('requestPromise', check);
-        // // todo: get account
-        // // const accountData = await this.getPaymentAccountData(params.invoice);
-        // // this.startWaitingStatusUpdates(params.invoice);
-        // // this.listenStatusService.statusUpdated$
-        // this.startWaitingStatusUpdates(params.invoice);
-        // this.statusRequestService.request();
-        // this.checkStatusService.setRequestParams(params.invoice);
-        // this.checkStatusService.request();
-        // this.checkStatusService.response$.subscribe((resp) => {
-        //   console.log('checkSt', resp);
-        // });
-        // const statusResponse = await firstValueFrom(
-        //   this.statusRequestService.response$
-        // );
-        // const savingFailedOrCancel = statusResponse.status?.titleClass === TitleClass.cancel || statusResponse.status?.titleClass === TitleClass.cancelUser;
-        // const savingSuccessful = statusResponse.status?.titleClass === TitleClass.done && accountData?.new_account;
-        // if (!accountData) {
-        //   this.startWaitingStatusUpdates(params.invoice);
-        //   statusResponse.status.statusState = StatusEnum.processing;
-        // }
-        // if (!this.savingFailedOrCancel(statusResponse?.status) && !this.savingSuccessful(accountData, statusResponse?.status)) {
-        //   // todo is proccessing
-        //
-        //   // this.startWaitingStatusUpdates(params.invoice);
-        //   statusResponse.status.statusState = StatusEnum.processing;
-        // }
-        // statusResponse.status.isSavePaymentAccount = true;
-        // return statusResponse.status;
-        // return null;
-        // if (!this.savePaymentMethodStatus) {
-        //   statusResponse.status.statusState = StatusEnum.processing;
-        // }
-        // statusResponse.status.isSavePaymentAccount = true;
-        // return statusResponse.status;
-    }
-    savingFailedOrCancel(status) {
-        return status?.titleClass === TitleClass.cancel || status?.titleClass === TitleClass.cancelUser;
-    }
-    savingSuccessful(accountData, status, checkStatus) {
-        return !!(status?.titleClass === TitleClass.done && (accountData?.new_account || checkStatus?.isPaymentAccountAttached));
-    }
-    getPaymentAccountData(invoice) {
-        return this.savedPaymentAccountChangesService
-            .request(invoice);
-        // .then((accountChanges: SavedPaymentAccountChanges) => {
-        //   if (accountChanges) {
-        //     this.handleSavingStatus(status, accountChanges.new_account);
-        //   }
-        // });
     }
     startWaitingStatusUpdates(invoice) {
-        if (this.listenStatusSubscription) {
-            this.listenStatusSubscription.unsubscribe();
-            this.listenStatusService.stopListening();
-        }
-        // debugger
         this.listenStatusService.listen(invoice);
-        this.listenStatusSubscription = this.listenStatusService.statusUpdated$
-            .subscribe((statusSettings) => {
-            // this.checkStatusService.response$.subscribe((res) => {
-            //   if (res.final) {
-            //     if (statusSettings?.statusResponse.status) {
-            //       this.loadNewPaymentAccountData(statusSettings?.statusResponse.status, res)
-            //     }
-            //   }
-            // });
-            void firstValueFrom(this.checkStatusService.response$).then((checkStatusResponse) => {
-                if (checkStatusResponse.final && statusSettings?.statusResponse.status) {
-                    this.loadNewPaymentAccountData(statusSettings?.statusResponse.status, checkStatusResponse);
-                }
-            });
-            // this.checkStatusService.request();
-            // const checkStatusResponse = await firstValueFrom(
-            //   this.checkStatusService.response$
-            // );
+        this.listenStatusService.statusUpdated$
+            .pipe(skip(1))
+            .subscribe(({ statusResponse }) => {
+            if (statusResponse.status) {
+                this.loadNewPaymentAccountData(statusResponse.status);
+            }
         });
-        // this.statusRequestService.request();
     }
-    loadNewPaymentAccountData(status, checkStatus) {
+    loadNewPaymentAccountData(status) {
         if (!status.invoice) {
             return;
         }
@@ -4782,37 +4661,26 @@ class SavePaymentMethodStatusService {
             .request(status.invoice)
             .then((accountChanges) => {
             if (accountChanges) {
-                this.handleSavingStatus(status, accountChanges, checkStatus);
+                this.handleSavingStatus(status, accountChanges.new_account);
             }
         });
     }
-    handleSavingStatus(status, account, checkStatus) {
-        // const savingFailedOrCancel = status?.titleClass === TitleClass.cancel || status?.titleClass === TitleClass.cancelUser;
-        //
-        // const savingSuccessful = status?.titleClass === TitleClass.done && account;
-        if (this.savingSuccessful(account, status, checkStatus)) {
-            this.savePaymentMethodStatus = SavePaymentMethodStatus.success;
-        }
-        else {
-            this.savePaymentMethodStatus = SavePaymentMethodStatus.failed;
-        }
+    handleSavingStatus(status, account) {
         this.listenStatusService.stopListening();
-        this.listenStatusSubscription.unsubscribe();
-        // const paymentAccountWasSaved = status?.titleClass === TitleClass.done && account !== null;
+        const paymentAccountWasSaved = status?.titleClass === TitleClass.done && account !== null;
         const isSavePaymentMethod = true;
-        // this.savePaymentMethodStatus = this.savingFailedOrCancel(status) ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;
-        console.log(status, isSavePaymentMethod, this.savePaymentMethodStatus);
+        this.savePaymentMethodStatus = paymentAccountWasSaved ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;
         this.nextActionService.emitFlowUpdates(new StatusUpdatedAction(status, isSavePaymentMethod, this.savePaymentMethodStatus));
     }
 }
-SavePaymentMethodStatusService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SavePaymentMethodStatusService, deps: [{ token: StatusRequestService }, { token: ListenStatusService }, { token: SavedPaymentAccountChangesService }, { token: NextActionService }, { token: CheckStatusService }], target: i0.ɵɵFactoryTarget.Injectable });
+SavePaymentMethodStatusService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SavePaymentMethodStatusService, deps: [{ token: StatusRequestService }, { token: ListenStatusService }, { token: SavedPaymentAccountChangesService }, { token: NextActionService }], target: i0.ɵɵFactoryTarget.Injectable });
 SavePaymentMethodStatusService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SavePaymentMethodStatusService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SavePaymentMethodStatusService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: StatusRequestService }, { type: ListenStatusService }, { type: SavedPaymentAccountChangesService }, { type: NextActionService }, { type: CheckStatusService }]; } });
+        }], ctorParameters: function () { return [{ type: StatusRequestService }, { type: ListenStatusService }, { type: SavedPaymentAccountChangesService }, { type: NextActionService }]; } });
 
 class StatusService {
     constructor(urlService, statusRequestService, financeDetailsService, listenStatusService, nextActionService, savePaymentMethodStatusService) {
@@ -4826,7 +4694,7 @@ class StatusService {
     async getStatus(params) {
         // todo: если params.savePaymentMethod, то надо выполнить логику для
         // account status
-        const isSavePaymentMethodMode = !!params?.isSavePaymentAccount;
+        const isSavePaymentMethodMode = !!params?.savePaymentMethod;
         if (isSavePaymentMethodMode) {
             return this.savePaymentMethodStatusService.getStatus(params); // todo: saveMethodStatus.getStatus();
         }
@@ -4839,7 +4707,6 @@ class StatusService {
     }
     async getStatusWithUrlSearchParams(url) {
         const searchParams = this.getRequestParamsFromUrl(url);
-        console.log('searchParams', searchParams);
         if (!searchParams) {
             throw new Error('No required search params to get status');
         }
@@ -5346,7 +5213,6 @@ class PaymentService {
         this.destroy$ = new Subject();
         this.formDestroy$ = new Subject();
         this.formFieldsStatusSubject = new BehaviorSubject(null);
-        this.isSavingMethodMode = false;
     }
     async initialize(config) {
         this.destroy$ = new Subject();
@@ -5372,12 +5238,9 @@ class PaymentService {
             this.emitFormFieldsStatus(this.form);
             return;
         }
-        console.log('this.fields', this.fields);
-        console.log('this.form', this.form);
-        this.isSavingMethodMode = this.fields.some(({ name, value }) => name === 'savePsAccountOnly' && value === "1" /* XpsBoolean.true */);
         const submitResponse = await this.submitService.request(this.fields, this.form);
         this.data = submitResponse;
-        if (!this.isSavingMethodMode) {
+        if (!submitResponse.isSavingMethodMode) {
             this.emitFinanceDetails(submitResponse.summary);
         }
         this.emitFormMessages(submitResponse.messages);
@@ -5428,10 +5291,8 @@ class PaymentService {
             signature: this.data.signature ?? '',
             locale: this.data.fields.find((field) => field.name === 'locale')?.value ??
                 'en',
-            isSavePaymentAccount: this.isSavingMethodMode ? 1 : 0,
+            savePaymentMethod: this.data.isSavingMethodMode ? 1 : 0,
         };
-        console.log('this.data', this.data);
-        console.log('getStatus', params);
         return this.statusService.getStatus(params);
     }
     getFieldConfig(field) {