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

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

@@ -261,7 +261,9 @@ 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)) {
@@ -483,11 +485,11 @@ class PaymentConfigService {
     }
     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;
@@ -498,7 +500,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 }]; } });
 
@@ -951,7 +953,7 @@ class StatusUpdatedAction {
             isCanceled: status.isCanceled,
             group: status.group,
             isSavePaymentMethodMode,
-            savePaymentMethodStatus
+            savePaymentMethodStatus,
         };
     }
 }
@@ -1596,7 +1598,9 @@ 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)
@@ -1630,7 +1634,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: [{
@@ -4732,7 +4736,7 @@ SavedPaymentAccountChangesService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersi
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: SavedPaymentAccountChangesService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: SettingsService }, { type: SecureApiClient }]; } });
 
@@ -4747,26 +4751,28 @@ class SavePaymentMethodStatusService {
     }
     getStatus(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.listenStatusSubscription) {
-                this.listenStatusSubscription.unsubscribe();
-                this.listenStatusService.stopListening();
+            if (!this.accountData || !this.status) {
+                this.statusRequestService.setRequestParams(params);
+                this.statusRequestService.request();
+                const statusResponse = yield firstValueFrom(this.statusRequestService.response$);
+                this.status = statusResponse.status;
+                this.status.isSavePaymentAccount = true;
+                this.accountData = yield this.getPaymentAccountData(params.invoice);
             }
-            this.statusRequestService.setRequestParams(params);
-            this.statusRequestService.request();
-            const statusResponse = yield firstValueFrom(this.statusRequestService.response$);
-            statusResponse.status.isSavePaymentAccount = true;
-            // this.listenStatusService.stopListening();
-            const accountData = yield this.getPaymentAccountData(params.invoice);
-            if (this.savingFailedOrCancel(statusResponse === null || statusResponse === void 0 ? void 0 : statusResponse.status) || this.savingSuccessful(accountData, statusResponse === null || statusResponse === void 0 ? void 0 : statusResponse.status)) {
-                return statusResponse.status;
+            if (this.savingFailedOrCancel(this.status) ||
+                (this.accountData && this.savingSuccessful(this.accountData, this.status))) {
+                return this.status;
             }
             if (!this.statusChecked) {
                 this.checkStatus(params);
-                statusResponse.status.statusState = StatusEnum.processing;
-                return statusResponse.status;
+                this.status.statusState = StatusEnum.processing;
+                return this.status;
             }
-            statusResponse.status.statusState = StatusEnum.error;
-            return statusResponse.status;
+            this.statusChecked = false;
+            this.status.statusState = StatusEnum.error;
+            const outStatus = Object.assign({}, this.status);
+            this.status = null;
+            return outStatus;
         });
     }
     checkStatus(params) {
@@ -4776,137 +4782,45 @@ class SavePaymentMethodStatusService {
         this.startWaitingStatusUpdates(params.invoice);
         this.statusRequestService.request();
     }
-    getStatusOld(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            console.log('getStatus', params);
-            this.statusRequestService.setRequestParams(params);
-            // this.startWaitingStatusUpdates(params.invoice);
-            this.statusRequestService.request();
-            const statusResponse = yield firstValueFrom(this.statusRequestService.response$);
-            this.checkStatusService.setRequestParams(params.invoice);
-            this.checkStatusService.request();
-            const checkStatusResponse = yield 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 = yield this.getPaymentAccountData(params.invoice);
-            if (!this.savingFailedOrCancel(statusResponse === null || statusResponse === void 0 ? void 0 : statusResponse.status) && !this.savingSuccessful(accountData, statusResponse === null || statusResponse === void 0 ? void 0 : statusResponse.status)) {
-                // todo is proccessing
-                this.startWaitingStatusUpdates(params.invoice);
-                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 === null || status === void 0 ? void 0 : status.titleClass) === TitleClass.cancel || (status === null || status === void 0 ? void 0 : status.titleClass) === TitleClass.cancelUser;
+        return ((status === null || status === void 0 ? void 0 : status.titleClass) === TitleClass.cancel ||
+            (status === null || status === void 0 ? void 0 : status.titleClass) === TitleClass.cancelUser);
     }
     savingSuccessful(accountData, status, checkStatus) {
-        return !!((status === null || status === void 0 ? void 0 : status.titleClass) === TitleClass.done && ((accountData === null || accountData === void 0 ? void 0 : accountData.new_account) || (checkStatus === null || checkStatus === void 0 ? void 0 : checkStatus.isPaymentAccountAttached)));
+        return !!((status === null || status === void 0 ? void 0 : status.titleClass) === TitleClass.done &&
+            ((accountData === null || accountData === void 0 ? void 0 : accountData.new_account) || (checkStatus === null || checkStatus === void 0 ? void 0 : checkStatus.isPaymentAccountAttached)));
     }
     getPaymentAccountData(invoice) {
-        return this.savedPaymentAccountChangesService
-            .request(invoice);
-        // .then((accountChanges: SavedPaymentAccountChanges) => {
-        //   if (accountChanges) {
-        //     this.handleSavingStatus(status, accountChanges.new_account);
-        //   }
-        // });
+        return this.savedPaymentAccountChangesService.request(invoice);
     }
     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 === null || statusSettings === void 0 ? void 0 : statusSettings.statusResponse.status)) {
-                    this.loadNewPaymentAccountData(statusSettings === null || statusSettings === void 0 ? void 0 : statusSettings.statusResponse.status, checkStatusResponse);
-                }
+        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.checkStatusService.request();
-            // const checkStatusResponse = await firstValueFrom(
-            //   this.checkStatusService.response$
-            // );
-        });
-        // this.statusRequestService.request();
     }
     loadNewPaymentAccountData(status, checkStatus) {
         if (!status.invoice) {
             return;
         }
-        void this.savedPaymentAccountChangesService
-            .request(status.invoice)
-            .then((accountChanges) => {
+        void this.getPaymentAccountData(status.invoice).then((accountChanges) => {
             if (accountChanges) {
+                this.accountData = accountChanges;
                 this.handleSavingStatus(status, accountChanges, checkStatus);
             }
         });
     }
     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;
         }
@@ -4915,10 +4829,7 @@ class SavePaymentMethodStatusService {
         }
         this.listenStatusService.stopListening();
         this.listenStatusSubscription.unsubscribe();
-        // 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.nextActionService.emitFlowUpdates(new StatusUpdatedAction(status, isSavePaymentMethod, this.savePaymentMethodStatus));
     }
 }
@@ -4927,7 +4838,7 @@ SavePaymentMethodStatusService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion:
 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 }]; } });
 
@@ -4942,11 +4853,9 @@ class StatusService {
     }
     getStatus(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            // todo: если params.savePaymentMethod, то надо выполнить логику для
-            // account status
             const isSavePaymentMethodMode = !!(params === null || params === void 0 ? void 0 : params.isSavePaymentAccount);
             if (isSavePaymentMethodMode) {
-                return this.savePaymentMethodStatusService.getStatus(params); // todo: saveMethodStatus.getStatus();
+                return this.savePaymentMethodStatusService.getStatus(params);
             }
             this.statusRequestService.setRequestParams(params);
             this.startWaitingStatusUpdates(params.invoice);
@@ -4959,7 +4868,6 @@ class StatusService {
     getStatusWithUrlSearchParams(url) {
         return __awaiter(this, void 0, void 0, function* () {
             const searchParams = this.getRequestParamsFromUrl(url);
-            console.log('searchParams', searchParams);
             if (!searchParams) {
                 throw new Error('No required search params to get status');
             }
@@ -5512,8 +5420,6 @@ 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 = yield this.submitService.request(this.fields, this.form);
             this.data = submitResponse;
@@ -5575,8 +5481,6 @@ class PaymentService {
                 locale: (_d = (_c = this.data.fields.find((field) => field.name === 'locale')) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : 'en',
                 isSavePaymentAccount: this.isSavingMethodMode ? 1 : 0,
             };
-            console.log('this.data', this.data);
-            console.log('getStatus', params);
             return this.statusService.getStatus(params);
         });
     }