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

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

@@ -250,7 +250,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)) {
@@ -454,16 +456,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;
@@ -474,7 +476,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 }]; } });
 
@@ -924,7 +926,7 @@ class StatusUpdatedAction {
             isCanceled: status.isCanceled,
             group: status.group,
             isSavePaymentMethodMode,
-            savePaymentMethodStatus
+            savePaymentMethodStatus,
         };
     }
 }
@@ -1570,7 +1572,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)
@@ -1602,7 +1606,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,
@@ -4619,7 +4623,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 }]; } });
 
@@ -4633,26 +4637,28 @@ class SavePaymentMethodStatusService {
         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.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);
-            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 = { ...this.status };
+        this.status = null;
+        return outStatus;
     }
     checkStatus(params) {
         if (!this.statusChecked) {
@@ -4661,135 +4667,45 @@ class SavePaymentMethodStatusService {
         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);
-            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;
+        return (status?.titleClass === TitleClass.cancel ||
+            status?.titleClass === TitleClass.cancelUser);
     }
     savingSuccessful(accountData, status, checkStatus) {
-        return !!(status?.titleClass === TitleClass.done && (accountData?.new_account || checkStatus?.isPaymentAccountAttached));
+        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);
-        //   }
-        // });
+        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?.statusResponse.status) {
-                    this.loadNewPaymentAccountData(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;
         }
@@ -4798,10 +4714,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));
     }
 }
@@ -4810,7 +4723,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 }]; } });
 
@@ -4824,11 +4737,9 @@ class StatusService {
         this.savePaymentMethodStatusService = savePaymentMethodStatusService;
     }
     async getStatus(params) {
-        // todo: если params.savePaymentMethod, то надо выполнить логику для
-        // account status
         const isSavePaymentMethodMode = !!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);
@@ -4839,7 +4750,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');
         }
@@ -5372,8 +5282,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 = await this.submitService.request(this.fields, this.form);
         this.data = submitResponse;
@@ -5430,8 +5338,6 @@ class PaymentService {
                 'en',
             isSavePaymentAccount: this.isSavingMethodMode ? 1 : 0,
         };
-        console.log('this.data', this.data);
-        console.log('getStatus', params);
         return this.statusService.getStatus(params);
     }
     getFieldConfig(field) {