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

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

@@ -250,9 +250,7 @@ class PaymentMethodsService {
         const requestParams = {
             access_token: this.settingsService.token,
             country: this.countryService.getCountry(),
-            save_payment_account_only: isSaveMethodMode
-                ? "1" /* XpsBoolean.true */
-                : "0" /* XpsBoolean.false */,
+            save_payment_account_only: isSaveMethodMode ? "1" /* XpsBoolean.true */ : "0" /* XpsBoolean.false */
         };
         const cacheKey = JSON.stringify(requestParams);
         if (!this.cache.has(cacheKey)) {
@@ -456,16 +454,16 @@ class PaymentConfigService {
         }
         return {
             ...config,
-            returnUrl: this.enrichReturnUrl(config.returnUrl, !!config.savePaymentMethod),
+            returnUrl: this.enrichReturnUrl(config.returnUrl, !!config.savePaymentMethod)
         };
     }
     enrichReturnUrl(returnUrl, savePaymentMethod) {
         let enrichedUrl = this.urlService.addSearchParams(returnUrl, {
-            token: this.settingsService.token,
+            token: this.settingsService.token
         });
         if (savePaymentMethod) {
             enrichedUrl = this.urlService.addSearchParams(returnUrl, {
-                isSavePaymentAccount: "1" /* XpsBoolean.true */,
+                isSavePaymentAccount: "1" /* XpsBoolean.true */
             });
         }
         return enrichedUrl;
@@ -476,7 +474,7 @@ PaymentConfigService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0",
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: PaymentConfigService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root',
+                    providedIn: 'root'
                 }]
         }], ctorParameters: function () { return [{ type: UrlService }, { type: SettingsService }]; } });
 
@@ -557,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,
@@ -926,7 +930,7 @@ class StatusUpdatedAction {
             isCanceled: status.isCanceled,
             group: status.group,
             isSavePaymentMethodMode,
-            savePaymentMethodStatus,
+            savePaymentMethodStatus
         };
     }
 }
@@ -1572,9 +1576,7 @@ class InitializeService {
                 ? "1" /* XpsBoolean.true */
                 : "0" /* XpsBoolean.false */,
             saved_method_id: config.savedMethodId,
-            save_payment_account_only: !!config.savePaymentMethod
-                ? "1" /* XpsBoolean.true */
-                : "0" /* XpsBoolean.false */,
+            save_payment_account_only: !!config.savePaymentMethod ? "1" /* XpsBoolean.true */ : "0" /* XpsBoolean.false */
         };
         return this.xpsApiService
             .directPaymentRequest(requestParams)
@@ -1606,7 +1608,7 @@ InitializeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", ve
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: InitializeService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root',
+                    providedIn: 'root'
                 }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
@@ -2964,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 = [
@@ -3045,9 +3047,9 @@ const statusSearchParamsMap = new Map([
         },
     ],
     [
-        StatusSearchParam.isSavePaymentAccount,
+        StatusSearchParam.savePaymentMethod,
         {
-            key: 'isSavePaymentAccount',
+            key: 'savePaymentMethod',
             converter: numberConverter,
         },
     ],
@@ -4619,113 +4621,66 @@ 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.accountData || !this.status) {
-            this.statusRequestService.setRequestParams(params);
-            this.statusRequestService.request();
-            const statusResponse = await firstValueFrom(this.statusRequestService.response$);
-            this.status = statusResponse.status;
-            this.status.isSavePaymentAccount = true;
-            this.accountData = await this.getPaymentAccountData(params.invoice);
-        }
-        if (this.savingFailedOrCancel(this.status) ||
-            (this.accountData && this.savingSuccessful(this.accountData, this.status))) {
-            return this.status;
-        }
-        if (!this.statusChecked) {
-            this.checkStatus(params);
-            this.status.statusState = StatusEnum.processing;
-            return this.status;
-        }
-        this.statusChecked = false;
-        this.status.statusState = StatusEnum.error;
-        const outStatus = { ...this.status };
-        this.status = null;
-        return outStatus;
-    }
-    checkStatus(params) {
-        if (!this.statusChecked) {
-            this.statusChecked = true;
-        }
+        this.statusRequestService.setRequestParams(params);
         this.startWaitingStatusUpdates(params.invoice);
         this.statusRequestService.request();
-    }
-    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);
+        const statusResponse = await firstValueFrom(this.statusRequestService.response$);
+        if (!this.savePaymentMethodStatus) {
+            statusResponse.status.statusState = StatusEnum.processing;
+        }
+        return statusResponse.status;
     }
     startWaitingStatusUpdates(invoice) {
-        if (this.listenStatusSubscription) {
-            this.listenStatusSubscription.unsubscribe();
-            this.listenStatusService.stopListening();
-        }
         this.listenStatusService.listen(invoice);
-        this.listenStatusSubscription =
-            this.listenStatusService.statusUpdated$.subscribe(({ statusResponse }) => {
-                this.status = statusResponse.status;
-                void firstValueFrom(this.checkStatusService.response$).then((checkStatusResponse) => {
-                    if (checkStatusResponse.final && statusResponse.status) {
-                        this.loadNewPaymentAccountData(statusResponse.status, checkStatusResponse);
-                    }
-                });
-            });
+        this.listenStatusService.statusUpdated$
+            .pipe(skip(1))
+            .subscribe(({ statusResponse }) => {
+            if (statusResponse.status) {
+                this.loadNewPaymentAccountData(statusResponse.status);
+            }
+        });
     }
-    loadNewPaymentAccountData(status, checkStatus) {
+    loadNewPaymentAccountData(status) {
         if (!status.invoice) {
             return;
         }
-        void this.getPaymentAccountData(status.invoice).then((accountChanges) => {
+        void this.savedPaymentAccountChangesService
+            .request(status.invoice)
+            .then((accountChanges) => {
             if (accountChanges) {
-                this.accountData = accountChanges;
-                this.handleSavingStatus(status, accountChanges, checkStatus);
+                this.handleSavingStatus(status, accountChanges.new_account);
             }
         });
     }
-    handleSavingStatus(status, account, checkStatus) {
-        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 isSavePaymentMethod = true;
+        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',
+                    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) {
@@ -4737,9 +4692,11 @@ class StatusService {
         this.savePaymentMethodStatusService = savePaymentMethodStatusService;
     }
     async getStatus(params) {
-        const isSavePaymentMethodMode = !!params?.isSavePaymentAccount;
+        // todo: если params.savePaymentMethod, то надо выполнить логику для
+        // account status
+        const isSavePaymentMethodMode = !!params?.savePaymentMethod;
         if (isSavePaymentMethodMode) {
-            return this.savePaymentMethodStatusService.getStatus(params);
+            return this.savePaymentMethodStatusService.getStatus(params); // todo: saveMethodStatus.getStatus();
         }
         this.statusRequestService.setRequestParams(params);
         this.startWaitingStatusUpdates(params.invoice);
@@ -5256,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();
@@ -5282,10 +5238,9 @@ class PaymentService {
             this.emitFormFieldsStatus(this.form);
             return;
         }
-        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);
@@ -5336,7 +5291,7 @@ 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,
         };
         return this.statusService.getStatus(params);
     }