@xsolla/payment-client-core 0.1.14-test15 → 0.1.14-test17

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

@@ -1,11 +1,11 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, Injectable, Inject, Pipe, isDevMode, NgModule } from '@angular/core';
-import { firstValueFrom, lastValueFrom, map, Subject, BehaviorSubject, filter as filter$1, takeUntil, catchError, skip, throwError } from 'rxjs';
+import { firstValueFrom, lastValueFrom, map, Subject, 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 JSEncrypt from 'jsencrypt';
 import { UntypedFormGroup, Validators, UntypedFormControl, ReactiveFormsModule } from '@angular/forms';
-import { filter, map as map$1, tap, catchError as catchError$1 } from 'rxjs/operators';
+import { filter, map as map$1, tap, catchError } from 'rxjs/operators';
 import * as i1$1 from '@angular/router';
 import { CommonModule } from '@angular/common';
 
@@ -3890,7 +3890,7 @@ const checkStatusResponseFactoryProvider = {
     useValue: (...args) => new CheckStatusResponse(...args),
 };
 
-let CheckStatusService$1 = class CheckStatusService extends XpsApiPart {
+class CheckStatusService extends XpsApiPart {
     constructor(xpsApiService, settingsService, xpsResponseErrorsMappingService, requestFactory, responseFactory) {
         super();
         this.xpsApiService = xpsApiService;
@@ -3919,10 +3919,10 @@ let CheckStatusService$1 = class CheckStatusService extends XpsApiPart {
             throw new ResponseError(error.message);
         });
     }
-};
-CheckStatusService$1.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CheckStatusService$1, deps: [{ token: XpsApiService }, { token: SettingsService }, { token: XpsResponseErrorsMappingService }, { token: checkStatusRequestFactoryToken }, { token: checkStatusResponseFactoryToken }], target: i0.ɵɵFactoryTarget.Injectable });
-CheckStatusService$1.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CheckStatusService$1, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CheckStatusService$1, decorators: [{
+}
+CheckStatusService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CheckStatusService, deps: [{ token: XpsApiService }, { token: SettingsService }, { token: XpsResponseErrorsMappingService }, { token: checkStatusRequestFactoryToken }, { token: checkStatusResponseFactoryToken }], target: i0.ɵɵFactoryTarget.Injectable });
+CheckStatusService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CheckStatusService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CheckStatusService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -4559,14 +4559,14 @@ class ListenStatusService {
         this.websocketOpenedSubject.next(statusSettings);
     }
 }
-ListenStatusService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: ListenStatusService, deps: [{ token: StatusRequestService }, { token: CheckStatusService$1 }, { token: WebsocketStatusService }], target: i0.ɵɵFactoryTarget.Injectable });
+ListenStatusService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: ListenStatusService, deps: [{ token: StatusRequestService }, { token: CheckStatusService }, { token: WebsocketStatusService }], target: i0.ɵɵFactoryTarget.Injectable });
 ListenStatusService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: ListenStatusService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: ListenStatusService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: StatusRequestService }, { type: CheckStatusService$1 }, { type: WebsocketStatusService }]; } });
+        }], ctorParameters: function () { return [{ type: StatusRequestService }, { type: CheckStatusService }, { type: WebsocketStatusService }]; } });
 
 var TitleClass;
 (function (TitleClass) {
@@ -4623,98 +4623,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: SettingsService }, { type: SecureApiClient }]; } });
 
-// import { SessionService } from '../session/session.service';
-// import { StateService } from '../state.service';
-// import { ElkLoggerService } from '../analytics/elk-logger.service';
-// import { AppError } from '../../../models/app-error.model';
-// import { SerializationHelper } from '../../../helpers/serialization.helper';
-// import { AppConfig } from '../../../models/app-config.model';
-// import { Observable } from 'rxjs/Observable';
-// import { ApiOptions } from './api-options.interface';
-// import { defaultApiUrl, sandboxApiUrl } from './api-url.const';
-class CheckStatusService {
-    constructor(http) {
-        this.http = http;
-        this.apiUrl = sandboxApiUrl;
-    }
-    // public getRequestParams() {
-    //   return this.session.getRequest();
-    // }
-    /**
-     * Запрос
-     * @param route
-     * @param params
-     * @param options
-     * @returns {Observable<any>}
-     */
-    request(route, params = {}, options = {}) {
-        params = Object.assign({}, params);
-        Object.keys(params).forEach((key) => {
-            if (!params[key]) {
-                delete params[key];
-            }
-        });
-        // const postData = SerializationHelper.paramSerializerJQLike(params);
-        // const postData = params;
-        const postData = new URLSearchParams(params);
-        const observable$ = this.http.post(this.apiUrl + route, postData, {
-            headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded; charset=utf-8'),
-            responseType: 'json'
-        }).pipe(map((data) => {
-            const newData = { ...data };
-            if ((data.api || {}).ver !== '1.0.1') {
-                // Non PayStation API answer
-                // this.elkLoggerService.sendHttpError('Invalid PayStation API answer', data);
-                throw new Error();
-            }
-            delete newData.api;
-            return newData;
-        }), catchError((response) => {
-            // HTTP Error, Fatal PayStation API error
-            // this.elkLoggerService.sendHttpError('HTTP Error', response);
-            throw {
-                errors: response.error && response.error.errors,
-                httpCode: response.status
-            };
-        }));
-        // .catch((response: any) => {
-        //   // HTTP Error, Fatal PayStation API error
-        //   this.elkLoggerService.sendHttpError('HTTP Error', response);
-        //   throw {
-        //     errors: response.error && response.error.errors,
-        //     httpCode: response.status
-        //   };
-        // });
-        // if (options.catchError) {
-        //   observable$.catch((reason) => {
-        //     this.state.showError((reason || {}).errors ||
-        //       (new AppError(this.translate.instant('api_error_message'), '10000001')));
-        //
-        //     return Observable.of();
-        //   });
-        // }
-        return observable$;
-    }
-    /**
-     * Запрос
-     * @param route
-     * @param params
-     * @param options
-     * @returns {Promise<any>}
-     */
-    requestPromise(route, params = {}, options = {}) {
-        return this.request(route, params, options).toPromise();
-    }
-}
-CheckStatusService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CheckStatusService, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-CheckStatusService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CheckStatusService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: CheckStatusService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }]; } });
-
 class SavePaymentMethodStatusService {
     constructor(statusRequestService, listenStatusService, savedPaymentAccountChangesService, nextActionService, checkStatusService) {
         this.statusRequestService = statusRequestService;
@@ -4724,28 +4632,39 @@ class SavePaymentMethodStatusService {
         this.checkStatusService = checkStatusService;
     }
     async getStatus(params) {
-        console.log('getStatus', params);
         this.statusRequestService.setRequestParams(params);
-        const paramsCheck = {
-            section: 'getstatus',
-            action: 'getstatus',
-            // invoice: params.invoice,
-            ...params,
-            access_token: params.token
-        };
-        const check = await this.checkStatusService.requestPromise('directpayment', paramsCheck);
-        console.log('requestPromise', check);
-        // todo: get account
+        this.statusRequestService.request();
+        const statusResponse = await firstValueFrom(this.statusRequestService.response$);
+        statusResponse.status.isSavePaymentAccount = true;
         const accountData = await this.getPaymentAccountData(params.invoice);
+        if (this.savingFailedOrCancel(statusResponse?.status) || this.savingSuccessful(accountData, statusResponse?.status)) {
+            return statusResponse.status;
+        }
+        this.checkStatus(params);
+        statusResponse.status.isSavePaymentAccount = true;
+        return statusResponse.status;
+    }
+    checkStatus(params) {
+        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$);
-        // 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;
-        // }
+        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);
@@ -4753,6 +4672,46 @@ class SavePaymentMethodStatusService {
         }
         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;
         // }
@@ -4762,8 +4721,8 @@ class SavePaymentMethodStatusService {
     savingFailedOrCancel(status) {
         return status?.titleClass === TitleClass.cancel || status?.titleClass === TitleClass.cancelUser;
     }
-    savingSuccessful(accountData, status) {
-        return !!(status?.titleClass === TitleClass.done && accountData?.new_account);
+    savingSuccessful(accountData, status, checkStatus) {
+        return !!(status?.titleClass === TitleClass.done && (accountData?.new_account || checkStatus?.isPaymentAccountAttached));
     }
     getPaymentAccountData(invoice) {
         return this.savedPaymentAccountChangesService
@@ -4779,15 +4738,30 @@ class SavePaymentMethodStatusService {
             this.listenStatusSubscription.unsubscribe();
             this.listenStatusService.stopListening();
         }
+        // debugger
         this.listenStatusService.listen(invoice);
         this.listenStatusSubscription = this.listenStatusService.statusUpdated$
-            .subscribe(({ statusResponse }) => {
-            if (statusResponse.status) {
-                this.loadNewPaymentAccountData(statusResponse.status);
-            }
+            .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.statusRequestService.request();
     }
-    loadNewPaymentAccountData(status) {
+    loadNewPaymentAccountData(status, checkStatus) {
         if (!status.invoice) {
             return;
         }
@@ -4795,22 +4769,26 @@ class SavePaymentMethodStatusService {
             .request(status.invoice)
             .then((accountChanges) => {
             if (accountChanges) {
-                this.handleSavingStatus(status, accountChanges);
+                this.handleSavingStatus(status, accountChanges, checkStatus);
             }
         });
     }
-    handleSavingStatus(status, account) {
+    handleSavingStatus(status, account, checkStatus) {
         // const savingFailedOrCancel = status?.titleClass === TitleClass.cancel || status?.titleClass === TitleClass.cancelUser;
         //
         // const savingSuccessful = status?.titleClass === TitleClass.done && account;
-        if (!this.savingFailedOrCancel(status) && !this.savingSuccessful(account, status)) {
-            return;
+        if (this.savingSuccessful(account, status, checkStatus)) {
+            this.savePaymentMethodStatus = SavePaymentMethodStatus.success;
+        }
+        else {
+            this.savePaymentMethodStatus = SavePaymentMethodStatus.failed;
         }
         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;
+        // this.savePaymentMethodStatus = this.savingFailedOrCancel(status) ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;
+        console.log(status, isSavePaymentMethod, this.savePaymentMethodStatus);
         this.nextActionService.emitFlowUpdates(new StatusUpdatedAction(status, isSavePaymentMethod, this.savePaymentMethodStatus));
     }
 }
@@ -5778,7 +5756,7 @@ class HttpExceptionsInterceptor {
         this.router = router;
     }
     intercept(req, next) {
-        return next.handle(req).pipe(catchError$1((error) => {
+        return next.handle(req).pipe(catchError((error) => {
             return throwError(() => new HttpError(error, req));
         }));
     }