@xsolla/payment-client-core 0.1.14-test11 → 0.1.14-test12

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

@@ -4631,17 +4631,48 @@ class SavePaymentMethodStatusService {
         this.nextActionService = nextActionService;
     }
     async getStatus(params) {
+        console.log('getStatus', params);
         this.statusRequestService.setRequestParams(params);
-        this.startWaitingStatusUpdates(params.invoice);
+        // todo: get account
+        const accountData = await this.getPaymentAccountData(params.invoice);
+        // this.startWaitingStatusUpdates(params.invoice);
         this.statusRequestService.request();
         const statusResponse = await firstValueFrom(this.statusRequestService.response$);
-        if (!this.savePaymentMethodStatus) {
+        // const savingFailedOrCancel = statusResponse.status?.titleClass === TitleClass.cancel || statusResponse.status?.titleClass === TitleClass.cancelUser;
+        // const savingSuccessful = statusResponse.status?.titleClass === TitleClass.done && accountData?.new_account;
+        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;
+        // 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) {
+        return !!(status?.titleClass === TitleClass.done && accountData?.new_account);
+    }
+    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();
+        }
         this.listenStatusService.listen(invoice);
         this.listenStatusSubscription = this.listenStatusService.statusUpdated$
             .subscribe(({ statusResponse }) => {
@@ -4658,20 +4689,22 @@ class SavePaymentMethodStatusService {
             .request(status.invoice)
             .then((accountChanges) => {
             if (accountChanges) {
-                this.handleSavingStatus(status, accountChanges.new_account);
+                this.handleSavingStatus(status, accountChanges);
             }
         });
     }
     handleSavingStatus(status, account) {
-        this.listenStatusService.stopListening();
-        this.listenStatusSubscription.unsubscribe();
-        const updatingIsProcessing = status?.titleClass !== TitleClass.cancel && status?.titleClass !== TitleClass.cancelUser && !account;
-        if (updatingIsProcessing) {
+        // 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;
         }
-        const paymentAccountWasSaved = status?.titleClass === TitleClass.done && account !== null;
+        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.savePaymentMethodStatus = this.savingFailedOrCancel(status) ? SavePaymentMethodStatus.success : SavePaymentMethodStatus.failed;
         this.nextActionService.emitFlowUpdates(new StatusUpdatedAction(status, isSavePaymentMethod, this.savePaymentMethodStatus));
     }
 }